Merge 3ee0f4b into 9371576

ndresx · May 8, 2021 · 7ba2590 · 7ba2590
2 parents 9371576 + 3ee0f4b
commit 7ba2590
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 32 deletions.
diff --git a/src/Countdown.test.tsx b/src/Countdown.test.tsx
@@ -178,7 +178,7 @@ describe('<Countdown />', () => {
     expect(api.isCompleted()).toBe(true);
   });
 
-  it('should only re-set time delta state when props have changed', () => {
+  it('should only reset time delta state when date prop is changing', () => {
     const root = document.createElement('div');
     wrapper = mount(<Countdown date={1000} />, { attachTo: root });
     const obj = wrapper.instance();
@@ -192,22 +192,22 @@ describe('<Countdown />', () => {
     expect(obj.setTimeDeltaState).toHaveBeenCalledTimes(1);
 
     wrapper.setProps(mergeProps({ intervalDelay: 999 }));
-    expect(obj.setTimeDeltaState).toHaveBeenCalledTimes(2);
+    expect(obj.setTimeDeltaState).toHaveBeenCalledTimes(1);
 
     wrapper.setProps(mergeProps({ date: 500 }));
-    expect(obj.setTimeDeltaState).toHaveBeenCalledTimes(2);
-
-    wrapper.setProps(mergeProps({ precision: NaN }));
-    expect(obj.setTimeDeltaState).toHaveBeenCalledTimes(3);
-
-    wrapper.setProps(mergeProps({ precision: NaN }));
-    expect(obj.setTimeDeltaState).toHaveBeenCalledTimes(3);
+    expect(obj.setTimeDeltaState).toHaveBeenCalledTimes(1);
 
     wrapper.setProps(mergeProps({ precision: 3 }));
-    expect(obj.setTimeDeltaState).toHaveBeenCalledTimes(4);
+    expect(obj.setTimeDeltaState).toHaveBeenCalledTimes(1);
 
     wrapper.setProps(mergeProps({ date: 750 }));
-    expect(obj.setTimeDeltaState).toHaveBeenCalledTimes(5);
+    expect(obj.setTimeDeltaState).toHaveBeenCalledTimes(2);
+
+    wrapper.setProps(mergeProps({ children: <div /> }));
+    expect(obj.setTimeDeltaState).toHaveBeenCalledTimes(2);
+
+    wrapper.setProps(mergeProps({ date: 1000 }));
+    expect(obj.setTimeDeltaState).toHaveBeenCalledTimes(3);
   });
 
   it('should not (try to) set state after component unmount', () => {

diff --git a/src/Countdown.tsx b/src/Countdown.tsx
@@ -144,12 +144,10 @@ export default class Countdown extends React.Component<CountdownProps, Countdown
       return;
     }
 
-    if (!this.shallowCompare(this.props, prevProps)) {
-      if (this.props.date !== prevProps.date) {
-        this.initialTimestamp = this.calcOffsetStartTimestamp();
-        this.offsetStartTimestamp = this.initialTimestamp;
-        this.offsetTime = 0;
-      }
+    if (this.props.date !== prevProps.date) {
+      this.initialTimestamp = this.calcOffsetStartTimestamp();
+      this.offsetStartTimestamp = this.initialTimestamp;
+      this.offsetTime = 0;
 
       this.setTimeDeltaState(this.calcTimeDelta());
     }
@@ -248,21 +246,6 @@ export default class Countdown extends React.Component<CountdownProps, Countdown
     return this.state.status === status;
   }
 
-  shallowCompare(objA: object, objB: object): boolean {
-    const keysA = Object.keys(objA);
-    return (
-      keysA.length === Object.keys(objB).length &&
-      !keysA.some(keyA => {
-        const valueA = objA[keyA];
-        const valueB = objB[keyA];
-        return (
-          !objB.hasOwnProperty(keyA) ||
-          !(valueA === valueB || (valueA !== valueA && valueB !== valueB)) // NaN !== NaN
-        );
-      })
-    );
-  }
-
   handleOnComplete = (timeDelta: CountdownTimeDelta): void => {
     if (this.props.onComplete) this.props.onComplete(timeDelta);
   };