Merge pull request #2031 from iamfaran/fix/2020-layers

[Fix]: #2020 dynamic layers issue

Author: raheeliftikhar5

client/packages/lowcoder/src/comps/comps/rootComp.tsx

@@ -100,7 +100,7 @@ const RootView = React.memo((props: RootViewProps) => {
           return (oldState ? changeEditorStateFn(oldState) : undefined)
         });
       }
-    });
+    }, undefined, isModuleRoot);
     editorStateRef.current = newEditorState;
     setEditorState(newEditorState);
 
@@ -109,7 +109,7 @@ const RootView = React.memo((props: RootViewProps) => {
         editorStateRef.current = undefined;
       }
     };
-  }, []);
+  }, [isModuleRoot]);
 
   useEffect(() => {
     if (!mountedRef.current || !editorState) return;

client/packages/lowcoder/src/comps/editorState.tsx

@@ -70,13 +70,17 @@ export class EditorState {
     rootComp: RootComp,
     setEditorState: (fn: (editorState: EditorState) => EditorState) => void,
     initialEditorModeStatus: string = getEditorModeStatus(),
+    isModuleRoot: boolean = false,
   ) {
     this.rootComp = rootComp;
     this.setEditorState = setEditorState;
     this.editorModeStatus = initialEditorModeStatus;
 
     // save collision status from app dsl to localstorage
-    saveCollisionStatus(this.getCollisionStatus());
+    // but only for apps, not for modules (to prevent modules from overwriting the app's setting)
+    if (!isModuleRoot) {
+      saveCollisionStatus(this.getCollisionStatus());
+    }
   }
 
   /**