fix: revert back withViewModel render modification

Author: js2me

src/hoc/with-view-model.test.tsx

@@ -232,8 +232,6 @@ describe('withViewModel', () => {
       children,
       model,
     }: PropsWithChildren & ViewModelProps<VM1>) => {
-      expect(model.isMounted).toBeTruthy();
-      expect(model.spies.mount).toBeCalledTimes(1);
       return <div data-testid={`vm-${model.vm1Value}`}>{children}</div>;
     });
 
@@ -244,8 +242,6 @@ describe('withViewModel', () => {
       children,
       model,
     }: PropsWithChildren & ViewModelProps<VM2>) => {
-      expect(model.isMounted).toBeTruthy();
-      expect(model.spies.mount).toBeCalledTimes(1);
       return (
         <div
           data-testid={`vm-${model.vm2Value}-${model.parentViewModel.vm1Value}`}
@@ -262,8 +258,6 @@ describe('withViewModel', () => {
       children,
       model,
     }: PropsWithChildren & ViewModelProps<VM3>) => {
-      expect(model.isMounted).toBeTruthy();
-      expect(model.spies.mount).toBeCalledTimes(1);
       return (
         <div
           data-testid={`vm-${model.vm3Value}-${model.parentViewModel.vm2Value}`}

src/hoc/with-view-model.tsx

@@ -137,17 +137,17 @@ export function withViewModel(
           new Model(configCreate);
 
         instances.set(id, instance);
+      }
+
+      const instance: ViewModel = instances.get(id)!;
 
+      useEffect(() => {
         if (viewModels) {
           viewModels.attach(instance);
         } else {
           instance.mount();
         }
-      }
-
-      const instance: ViewModel = instances.get(id)!;
 
-      useEffect(() => {
         return () => {
           if (viewModels) {
             viewModels.detach(id);
@@ -166,10 +166,7 @@ export function withViewModel(
 
       config?.reactHooks?.(allProps);
 
-      if (
-        (!viewModels || viewModels.isAbleToRenderView(id)) &&
-        instance.isMounted
-      ) {
+      if ((!viewModels || viewModels.isAbleToRenderView(id)) && instance) {
         return (
           <ActiveViewModelContext.Provider value={instance}>
             <Component {...(componentProps as any)} model={instance} />