#49 Run activate inside componentDidUpdate too when VM is being chang…

…ed. (#50) * #49 Run activate inside componentDidUpdate too when VM is being changed. * #49 Better naming Co-authored-by: Michal Kopecký <[email protected]>
eManPrague · Sep 30, 2021 · b395e8b · b395e8b
1 parent ed0ec28
commit b395e8b
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/packages/views/src/view.tsx b/packages/views/src/view.tsx
@@ -28,11 +28,12 @@ export default class View extends React.PureComponent<ViewProps, ViewState> {
   }
 
   componentDidMount() {
-    if (this.props.useLifecycle) {
-      const { vm } = this.props;
-      if (vm && isActivatable(vm)) {
-        vm.activate();
-      }
+    this.tryActivateViewModel();
+  }
+
+  componentDidUpdate(prevProps: ViewProps) {
+    if (prevProps.vm !== this.props.vm) {
+      this.tryActivateViewModel();
     }
   }
 
@@ -68,4 +69,13 @@ export default class View extends React.PureComponent<ViewProps, ViewState> {
 
     return <FoundView vm={vm} />;
   }
+
+  protected tryActivateViewModel() {
+    if (this.props.useLifecycle) {
+      const { vm } = this.props;
+      if (vm && isActivatable(vm)) {
+        vm.activate();
+      }
+    }
+  }
 }