From f2fc20f8e369df97c9fdc5d0824127cd20f97411 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Thu, 4 Apr 2019 15:49:18 +0200
Subject: [PATCH] fix: connected components should recompute store props
 properly

---
 src/store.ts        |  6 ++++++
 tests/store.test.ts | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/store.ts b/src/store.ts
index 93af6529..de4cbf21 100644
--- a/src/store.ts
+++ b/src/store.ts
@@ -30,6 +30,12 @@ export function connect(mapStateToProps) {
         super.willUnmount();
       }
       updateProps(nextProps, forceUpdate) {
+        if (this.__widget__.ownProps !== nextProps) {
+          this.__widget__.currentStoreProps = mapStateToProps(
+            this.env.store.state,
+            nextProps
+          );
+        }
         this.__widget__.ownProps = nextProps;
         const mergedProps = Object.assign(
           {},
diff --git a/tests/store.test.ts b/tests/store.test.ts
index adbcccb9..0da265a1 100644
--- a/tests/store.test.ts
+++ b/tests/store.test.ts
@@ -193,4 +193,32 @@ describe("connecting a component to store", () => {
       "<div><span>jupiler</span><span>hoegaarden</span></div>"
     );
   });
+
+  test("connected component is updated when props are updated", async () => {
+    class Beer extends Component<any, any, any> {
+      inlineTemplate = `<span><t t-esc="props.name"/></span>`;
+    }
+    const ConnectedBeer = connect((state, props) => {
+      return state.beers[props.id];
+    })(Beer);
+
+    class App extends Component<any, any, any> {
+      inlineTemplate = `<div>
+            <t t-widget="ConnectedBeer" t-props="{id: state.beerId}"/>
+        </div>`;
+      widgets = { ConnectedBeer };
+      state = { beerId: 1 };
+    }
+
+    const state = { beers: { 1: { name: "jupiler" }, 2: { name: "kwak" } } };
+    const store = new Store({ state });
+    (<any>env).store = store;
+    const app = new App(env);
+
+    await app.mount(fixture);
+    expect(fixture.innerHTML).toBe("<div><span>jupiler</span></div>");
+
+    await app.updateState({ beerId: 2 });
+    expect(fixture.innerHTML).toBe("<div><span>kwak</span></div>");
+  });
 });