Update date format to remove yesterday (#183)

Doist · Jan 23, 2020 · 74208c2 · 74208c2
1 parent 62e4512
commit 74208c2
Show file tree

Hide file tree

Showing 19 changed files with 62 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 Reactist follows [semantic versioning](https://semver.org/) and doesn't introduce breaking changes (API-wise) in minor or patch releases. However, the appearance of a component might change in a minor or patch release so keep an eye on redesigns and make sure your app still looks and feels like you expect it.
 
+## 2.0.2
+
+- [Tweak] Changed time formatting from `yesterday` to `1d`
+
 ## 2.0.1
 
 -   _Empty release_

diff --git a/dist/reactist.js b/dist/reactist.js
diff --git a/dist/reactist.map b/dist/reactist.map
diff --git a/docs/iframe.html b/docs/iframe.html
@@ -70,4 +70,4 @@
   }</script><style>#root[hidden],
       #docs-root[hidden] {
         display: none !important;
-      }</style></head><body><div class="sb-nopreview sb-wrapper"><div class="sb-nopreview_main"><h1 class="sb-nopreview_heading sb-heading">No Preview</h1><p>Sorry, but you either have no stories or none are selected somehow.</p><ul><li>Please check the Storybook config.</li><li>Try reloading the page.</li></ul><p>If the problem persists, check the browser console, or the terminal you've run Storybook from.</p></div></div><div class="sb-errordisplay sb-wrapper"><pre id="error-message" class="sb-heading"></pre><pre class="sb-errordisplay_code"><code id="error-stack"></code></pre></div><div id="root"></div><div id="docs-root"></div><script src="runtime~main.4d5e9381e44475509d3f.bundle.js"></script><script src="vendors~main.4d5e9381e44475509d3f.bundle.js"></script><script src="main.4d5e9381e44475509d3f.bundle.js"></script></body></html>
+      }</style></head><body><div class="sb-nopreview sb-wrapper"><div class="sb-nopreview_main"><h1 class="sb-nopreview_heading sb-heading">No Preview</h1><p>Sorry, but you either have no stories or none are selected somehow.</p><ul><li>Please check the Storybook config.</li><li>Try reloading the page.</li></ul><p>If the problem persists, check the browser console, or the terminal you've run Storybook from.</p></div></div><div class="sb-errordisplay sb-wrapper"><pre id="error-message" class="sb-heading"></pre><pre class="sb-errordisplay_code"><code id="error-stack"></code></pre></div><div id="root"></div><div id="docs-root"></div><script src="runtime~main.daebffa236aa977811c0.bundle.js"></script><script src="vendors~main.daebffa236aa977811c0.bundle.js"></script><script src="main.daebffa236aa977811c0.bundle.js"></script></body></html>
diff --git a/docs/main.4d5e9381e44475509d3f.bundle.js b/docs/main.4d5e9381e44475509d3f.bundle.js
diff --git a/docs/main.4d5e9381e44475509d3f.bundle.js.map b/docs/main.4d5e9381e44475509d3f.bundle.js.map
diff --git a/docs/main.daebffa236aa977811c0.bundle.js b/docs/main.daebffa236aa977811c0.bundle.js
diff --git a/docs/main.daebffa236aa977811c0.bundle.js.map b/docs/main.daebffa236aa977811c0.bundle.js.map
diff --git a/docs/runtime~main.4d5e9381e44475509d3f.bundle.js.map b/docs/runtime~main.4d5e9381e44475509d3f.bundle.js.map
diff --git a/...ntime~main.4d5e9381e44475509d3f.bundle.js → ...ntime~main.daebffa236aa977811c0.bundle.js b/...ntime~main.4d5e9381e44475509d3f.bundle.js → ...ntime~main.daebffa236aa977811c0.bundle.js
diff --git a/docs/runtime~main.daebffa236aa977811c0.bundle.js.map b/docs/runtime~main.daebffa236aa977811c0.bundle.js.map
diff --git a/...ndors~main.4d5e9381e44475509d3f.bundle.js → ...ndors~main.daebffa236aa977811c0.bundle.js b/...ndors~main.4d5e9381e44475509d3f.bundle.js → ...ndors~main.daebffa236aa977811c0.bundle.js
diff --git a/...s~main.4d5e9381e44475509d3f.bundle.js.map → ...s~main.daebffa236aa977811c0.bundle.js.map b/...s~main.4d5e9381e44475509d3f.bundle.js.map → ...s~main.daebffa236aa977811c0.bundle.js.map
diff --git a/lib/Time.js b/lib/Time.js
@@ -602,8 +602,8 @@ var TimeUtils = {
         shortFormatCurrentYear = _config$shortFormatCu === void 0 ? this.SHORT_FORMAT_CURRENT_YEAR : _config$shortFormatCu,
         _config$shortFormatPa = config.shortFormatPastYear,
         shortFormatPastYear = _config$shortFormatPa === void 0 ? this.SHORT_FORMAT_PAST_YEAR : _config$shortFormatPa,
-        _config$yesterday = config.yesterday,
-        yesterday = _config$yesterday === void 0 ? 'yesterday' : _config$yesterday,
+        _config$daysSuffix = config.daysSuffix,
+        daysSuffix = _config$daysSuffix === void 0 ? 'd' : _config$daysSuffix,
         _config$hoursSuffix = config.hoursSuffix,
         hoursSuffix = _config$hoursSuffix === void 0 ? 'h' : _config$hoursSuffix,
         _config$minutesSuffix = config.minutesSuffix,
@@ -624,7 +624,7 @@ var TimeUtils = {
         return date.format(shortFormatPastYear);
       }
     } else if (diffDays === 1) {
-      return yesterday;
+      return "".concat(diffDays).concat(daysSuffix);
     } else if (diffHours > 0 && diffHours <= 23) {
       return "".concat(diffHours).concat(hoursSuffix);
     } else if (diffMinutes > 0 && diffMinutes <= 59) {
@@ -835,7 +835,7 @@ Time_Time.propTypes = {
     shortFormatCurrentYear: external_prop_types_default.a.string,
     shortFormatPastYear: external_prop_types_default.a.string,
     fullFormat: external_prop_types_default.a.string,
-    yesterday: external_prop_types_default.a.string,
+    daysSuffix: external_prop_types_default.a.string,
     hoursSuffix: external_prop_types_default.a.string,
     minutesSuffix: external_prop_types_default.a.string,
     momentsAgo: external_prop_types_default.a.string
@@ -848,7 +848,7 @@ Time_Time.defaultProps = {
   refresh: true,
   config: {
     locale: 'en',
-    yesterday: 'yesterday',
+    daysSuffix: 'd',
     hoursSuffix: 'h',
     minutesSuffix: 'm',
     momentsAgo: 'moments ago'

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@doist/reactist",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "description": "Open source React components by Doist",
     "main": "./dist/reactist.js",
     "scripts": {

diff --git a/src/components/Time.jsx b/src/components/Time.jsx
@@ -129,7 +129,7 @@ Time.propTypes = {
         shortFormatCurrentYear: PropTypes.string,
         shortFormatPastYear: PropTypes.string,
         fullFormat: PropTypes.string,
-        yesterday: PropTypes.string,
+        daysSuffix: PropTypes.string,
         hoursSuffix: PropTypes.string,
         minutesSuffix: PropTypes.string,
         momentsAgo: PropTypes.string
@@ -142,7 +142,7 @@ Time.defaultProps = {
     refresh: true,
     config: {
         locale: 'en',
-        yesterday: 'yesterday',
+        daysSuffix: 'd',
         hoursSuffix: 'h',
         minutesSuffix: 'm',
         momentsAgo: 'moments ago'

diff --git a/src/components/utils/TimeUtils.js b/src/components/utils/TimeUtils.js
@@ -13,7 +13,7 @@ const TimeUtils = {
             locale = 'en',
             shortFormatCurrentYear = this.SHORT_FORMAT_CURRENT_YEAR,
             shortFormatPastYear = this.SHORT_FORMAT_PAST_YEAR,
-            yesterday = 'yesterday',
+            daysSuffix = 'd',
             hoursSuffix = 'h',
             minutesSuffix = 'm',
             momentsAgo = 'moments ago'
@@ -32,7 +32,7 @@ const TimeUtils = {
                 return date.format(shortFormatPastYear)
             }
         } else if (diffDays === 1) {
-            return yesterday
+            return `${diffDays}${daysSuffix}`
         } else if (diffHours > 0 && diffHours <= 23) {
             return `${diffHours}${hoursSuffix}`
         } else if (diffMinutes > 0 && diffMinutes <= 59) {

diff --git a/src/components/utils/__tests__/TimeUtils.test.js b/src/components/utils/__tests__/TimeUtils.test.js
@@ -47,6 +47,13 @@ describe('Time Utils', () => {
         expect(TimeUtils.timeAgo(testDate)).toBe('10h')
     })
 
+    it('timeAgo == 1d returns `1d`', () => {
+        const testDate = dayjs()
+            .subtract(1, 'days')
+            .unix()
+        expect(TimeUtils.timeAgo(testDate)).toBe('1d')
+    })
+
     it('timeAgo < 7d returns MM/DD/YYYY', () => {
         const testDate = dayjs()
             .subtract(2, 'days')