From e7a4ad99de188c796794cc1c0bb886d6b7137192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20K=C3=BChn?= <aku@odoo.com>
Date: Fri, 29 Mar 2019 17:37:40 +0100
Subject: [PATCH] [FIX] connected child components with custom hooks

---
 src/store.ts        |  2 ++
 tests/store.test.ts | 48 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/src/store.ts b/src/store.ts
index cce288d9..1bc24d33 100644
--- a/src/store.ts
+++ b/src/store.ts
@@ -27,9 +27,11 @@ export function connect(mapStateToProps) {
             this.updateProps(nextProps, false);
           }
         });
+        super.mounted();
       }
       willUnmount() {
         this.env.store.off("update", this);
+        super.willUnmount();
       }
       updateProps(nextProps, forceUpdate) {
         nextProps = Object.assign(nextProps, this.__widget__.currentStoreProps);
diff --git a/tests/store.test.ts b/tests/store.test.ts
index 5fa3855d..4fed145c 100644
--- a/tests/store.test.ts
+++ b/tests/store.test.ts
@@ -106,4 +106,52 @@ describe("connecting a component to store", () => {
     await nextTick();
     expect(fixture.innerHTML).toMatchSnapshot();
   });
+
+  test("connected child components with custom hooks", async () => {
+    let steps: any = [];
+    class Child extends Component<any, any, any> {
+      inlineTemplate = `<div/>`;
+      mounted() {
+        steps.push('child:mounted');
+      }
+      willUnmount() {
+        steps.push('child:willUnmount')
+      }
+      destroyed() {
+        steps.push('child:destroyed');
+      }
+    }
+
+    const ConnectedChild = connect(s => s)(Child);
+
+    class Parent extends Component<any, any, any> {
+      inlineTemplate = `
+        <div>
+            <t t-if="state.child" t-widget="ConnectedChild"/>
+        </div>`;
+      widgets = { ConnectedChild };
+
+      constructor(env: Env) {
+        super(env);
+        this.state = { child: true };
+      }
+    }
+
+    const store = new Store({ state: {} });
+    (<any>env).store = store;
+    const parent = new Parent(env);
+
+    await parent.mount(fixture);
+    expect(steps).toEqual([
+      'child:mounted',
+    ]);
+
+    await parent.updateState({ child: false });
+    expect(steps).toEqual([
+      'child:mounted',
+      'child:willUnmount',
+      'child:destroyed',
+    ]);
+  });
+
 });