Fix for onChange (#10)

* proppy: tests failing onChange * more tests… * proppy: fix for onChange
fahad19 · Jun 9, 2018 · 71b93ba · 71b93ba
1 parent 1372872
commit 71b93ba
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/packages/proppy/src/onChange.spec.ts b/packages/proppy/src/onChange.spec.ts
@@ -43,7 +43,17 @@ describe('proppy :: onChange', () => {
     expect(p.props.counter).toEqual(0);
 
     p.props.setCounter(5);
+    expect(p.props.counter).toEqual(5);
     expect(p.props.foo).toEqual('changed foo with counter 5');
+
+    // should still be same since no change
+    p.props.setCounter(5);
+    expect(p.props.counter).toEqual(5);
+    expect(p.props.foo).toEqual('changed foo with counter 5');
+
+    p.props.setCounter(10);
+    expect(p.props.counter).toEqual(10);
+    expect(p.props.foo).toEqual('changed foo with counter 10');
   });
 
   test('changes by string, returning async props', () => {

diff --git a/packages/proppy/src/onChange.ts b/packages/proppy/src/onChange.ts
@@ -5,6 +5,7 @@ export function onChange(propName, fn): ProppyFactory {
   return create({
     initialize() {
       this._prevProps = this.props;
+      this._own = {};
 
       this._i = false;
     },
@@ -20,14 +21,22 @@ export function onChange(propName, fn): ProppyFactory {
         ? (p, n) => p[propName] !== n[propName]
         : propName;
 
+      this.set(Object.assign({}, parentProps, this._own));
+
+      const cb = newProps => {
+        this._own = newProps;
+        this.set(newProps);
+      };
+
       if (detector(this._prevProps, parentProps)) {
-        const cb = newProps => this.set(newProps);
         const result = fn(parentProps, this.providers, cb);
 
         if (result) {
-          this.set(result);
+          cb(result);
         }
       }
+
+      this._prevProps = this.props;
     },
   });
 }