fix: remove params spread, potentially fix #1424

formatjs · Aug 21, 2019 · aeb177c · aeb177c
1 parent 0b3a16b
commit aeb177c
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 22 deletions.
diff --git a/examples/Injected.tsx b/examples/Injected.tsx
@@ -0,0 +1,41 @@
+import * as React from 'react';
+import {IntlProvider, useIntl, injectIntl, IntlShape} from '../';
+
+const Comp: React.FC<{}> = _ => {
+  const {formatDate} = useIntl();
+  return <h1>{formatDate(Date.now())}</h1>;
+};
+
+const Comp2: React.FC<{intl: IntlShape}> = ({
+  intl: {formatDate, formatTime},
+}) => {
+  return (
+    <>
+      <h1>{formatDate(new Date(), {month: 'long'})}</h1>
+      <h2>{formatTime(undefined)}</h2>
+    </>
+  );
+};
+
+const Comp2WithIntl = injectIntl(Comp2);
+
+interface Props {
+  currentTime?: Date | number;
+}
+
+const App: React.FC<Props> = _ => {
+  return (
+    <IntlProvider locale="en" timeZone="Asia/Tokyo">
+      <p>
+        <Comp />
+        <Comp2WithIntl />
+      </p>
+    </IntlProvider>
+  );
+};
+
+App.defaultProps = {
+  currentTime: new Date(),
+};
+
+export default App;
diff --git a/examples/TimeZone.tsx b/examples/TimeZone.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {FormattedDate, FormattedTime, IntlProvider} from '../dist';
+import {FormattedDate, FormattedTime, IntlProvider} from '../';
 
 interface Props {
   currentTime?: Date | number;

diff --git a/examples/index.html b/examples/index.html
@@ -1,14 +1,15 @@
-<!doctype html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>React Intl Explicit Example</title>        
-    </head>
-    <body>
-        <div id="timezone"></div>
-        <div id="messages"></div>
-        <div id="advanced"></div>
-        <script src="./index.tsx"></script>
-    </body>
-</html>
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>React Intl Explicit Example</title>        
+    </head>
+    <body>
+        <div id="timezone"></div>
+        <div id="messages"></div>
+        <div id="advanced"></div>
+        <div id="injected"></div>
+        <script src="./index.tsx"></script>
+    </body>
+</html>
diff --git a/examples/index.tsx b/examples/index.tsx
@@ -6,9 +6,11 @@ import * as ReactDOM from 'react-dom';
 import Timezone from './TimeZone';
 import Messages from './Messages';
 import Advanced from './Advanced';
+import Injected from './Injected';
 
 ReactDOM.render(<Timezone />, document.getElementById('timezone'));
 
 ReactDOM.render(<Messages />, document.getElementById('messages'));
 
 ReactDOM.render(<Advanced />, document.getElementById('advanced'));
+ReactDOM.render(<Injected />, document.getElementById('injected'));
diff --git a/src/format.ts b/src/format.ts
@@ -100,7 +100,8 @@ export function formatDate(
     timeZone,
   }: Pick<IntlConfig, 'locale' | 'formats' | 'onError' | 'timeZone'>,
   state: Formatters,
-  ...[value, options = {}]: Parameters<IntlFormatters['formatDate']>
+  value?: Parameters<IntlFormatters['formatDate']>[0],
+  options: Parameters<IntlFormatters['formatDate']>[1] = {}
 ) {
   const {format} = options;
   let defaults = {
@@ -130,7 +131,8 @@ export function formatTime(
     timeZone,
   }: Pick<IntlConfig, 'locale' | 'formats' | 'onError' | 'timeZone'>,
   state: Formatters,
-  ...[value, options = {}]: Parameters<IntlFormatters['formatTime']>
+  value?: Parameters<IntlFormatters['formatTime']>[0],
+  options: Parameters<IntlFormatters['formatTime']>[1] = {}
 ) {
   const {format} = options;
   let defaults = {
@@ -170,9 +172,9 @@ export function formatRelativeTime(
     onError,
   }: Pick<IntlConfig, 'locale' | 'formats' | 'onError'>,
   state: Formatters,
-  ...[value, unit = 'second', options = {}]: Parameters<
-    IntlFormatters['formatRelativeTime']
-  >
+  value: Parameters<IntlFormatters['formatRelativeTime']>[0],
+  unit: Parameters<IntlFormatters['formatRelativeTime']>[1] = 'second',
+  options: Parameters<IntlFormatters['formatRelativeTime']>[2] = {}
 ) {
   const {format} = options;
 
@@ -201,7 +203,8 @@ export function formatNumber(
     onError,
   }: Pick<IntlConfig, 'locale' | 'formats' | 'onError'>,
   state: Formatters,
-  ...[value, options = {}]: Parameters<IntlFormatters['formatNumber']>
+  value: Parameters<IntlFormatters['formatNumber']>[0],
+  options: Parameters<IntlFormatters['formatNumber']>[1] = {}
 ) {
   const {format} = options;
   let defaults =
@@ -220,7 +223,8 @@ export function formatNumber(
 export function formatPlural(
   {locale, onError}: Pick<IntlConfig, 'locale' | 'onError'>,
   state: Formatters,
-  ...[value, options = {}]: Parameters<IntlFormatters['formatPlural']>
+  value: Parameters<IntlFormatters['formatPlural']>[0],
+  options: Parameters<IntlFormatters['formatPlural']>[1] = {}
 ) {
   let filteredOptions = filterProps(options, PLURAL_FORMAT_OPTIONS);