Revert "feat(@formatjs/intl): remove default hour/minute option set i…

…n formatTime" This reverts commit 0140cea.
formatjs · Dec 16, 2020 · 044c906 · 044c906
1 parent e37f131
commit 044c906
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 26 deletions.
diff --git a/packages/intl-datetimeformat/BUILD b/packages/intl-datetimeformat/BUILD
@@ -144,9 +144,9 @@ ts_node(
     ],
     data = CLDR_DEPS,
     output_dir = True,
-    visibility = [
-        "//packages/intl:__subpackages__",
-    ],
+    visibility=[
+        "//packages/intl:__subpackages__"
+    ]
 )
 
 [generate_src_file(
@@ -274,9 +274,9 @@ ts_node(
         "@npm//tslib",
         "@tzdata//:zdumps",
     ],
-    visibility = [
-        "//packages/intl:__subpackages__",
-    ],
+    visibility=[
+        "//packages/intl:__subpackages__"
+    ]
 )
 
 # add-golden-tz

diff --git a/packages/intl/BUILD b/packages/intl/BUILD
@@ -56,8 +56,6 @@ ts_compile(
 jest_test(
     name = "unit",
     srcs = SRCS + TESTS + [
-        "//packages/intl-datetimeformat:locale-data",
-        "//packages/intl-datetimeformat:add-all-tz",
         "//packages/intl-numberformat:locale-data",
         "//packages/intl-displaynames:polyfill-locales.js",
     ],

diff --git a/packages/intl/src/dateTime.ts b/packages/intl/src/dateTime.ts
@@ -60,6 +60,16 @@ export function getFormatter(
     defaults
   );
 
+  if (
+    type === 'time' &&
+    !filteredOptions.hour &&
+    !filteredOptions.minute &&
+    !filteredOptions.second
+  ) {
+    // Add default formatting options if hour, minute, or second isn't defined.
+    filteredOptions = {...filteredOptions, hour: 'numeric', minute: 'numeric'};
+  }
+
   return getDateTimeFormat(locale, filteredOptions);
 }
 

diff --git a/packages/intl/tests/formatPlural.test.ts → packages/intl/tests/formatPlural.ts b/packages/intl/tests/formatPlural.test.ts → packages/intl/tests/formatPlural.ts
diff --git a/packages/intl/tests/formatTime.test.ts b/packages/intl/tests/formatTime.test.ts
@@ -1,19 +1,13 @@
 /* eslint-disable @typescript-eslint/camelcase */
-import {DateTimeFormat} from '@formatjs/ecma402-abstract';
 import {formatTime as formatTimeFn} from '../src/dateTime';
-import {OptionalIntlConfig, IntlFormatters, Formatters} from '../src/types';
-import '@formatjs/intl-datetimeformat/polyfill';
-import '@formatjs/intl-datetimeformat/locale-data/en';
-import '@formatjs/intl-datetimeformat/add-all-tz';
+import {OptionalIntlConfig, IntlFormatters} from '../src/types';
 
 describe('format API', () => {
   const {NODE_ENV} = process.env;
 
   let config: OptionalIntlConfig<any>;
 
-  let getDateTimeFormat: Formatters['getDateTimeFormat'] = (
-    ...args: ConstructorParameters<typeof Intl.DateTimeFormat>
-  ) => new Intl.DateTimeFormat(...args) as DateTimeFormat;
+  let getDateTimeFormat: any;
   beforeEach(() => {
     config = {
       locale: 'en',
@@ -35,6 +29,10 @@ describe('format API', () => {
 
       onError: jest.fn(),
     };
+
+    getDateTimeFormat = jest
+      .fn()
+      .mockImplementation((...args) => new Intl.DateTimeFormat(...args));
   });
 
   afterEach(() => {
@@ -52,23 +50,13 @@ describe('format API', () => {
       });
       // @ts-ignore
       formatTime = formatTimeFn.bind(null, config, getDateTimeFormat);
-      (config.onError as jest.Mock).mockClear();
     });
 
     it('render now if no value is provided', () => {
       // @ts-ignore
       expect(formatTime()).toBe(df.format());
     });
 
-    it('should not inject additional hour/minute when dateStyle/timeStyle are used', function () {
-      expect(config.onError).not.toHaveBeenCalled();
-      formatTimeFn(config as any, getDateTimeFormat, new Date(), {
-        dateStyle: 'short',
-      });
-
-      expect(config.onError).not.toHaveBeenCalled();
-    });
-
     it('falls back and warns when a non-finite value is provided', () => {
       expect(formatTime(NaN)).toBe('NaN');
       // @ts-ignore