Reset root node coordinates directly from file load etc instead of in…

…directly by passing prop to DisplayedDocument
gnomearcy · Mar 12, 2023 · 4686b0b · 4686b0b
1 parent 30973d6
commit 4686b0b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 21 deletions.
diff --git a/src/components/App.ts b/src/components/App.ts
@@ -156,7 +156,7 @@ function App(): m.Component {
                     onFileContentsRead: (fileContents) => {
                         importFile(fileContents);
                         state.ui.setCurrentModal('none');
-                        state.ui.setResetDueToNewDoc(true);
+                        state.canvasState.resetRootNodeCoords();
 
                         // This state change was triggered by an async fileReader
                         // operation, not a DOM event, thus we need to trigger
@@ -182,7 +182,7 @@ function App(): m.Component {
                                 documentAsJson,
                             );
                             state.ui.setCurrentModal('none');
-                            state.ui.setResetDueToNewDoc(true);
+                            state.canvasState.resetRootNodeCoords();
                         }
                     },
                 },
@@ -254,8 +254,6 @@ function App(): m.Component {
         view: (): m.Vnode => {
             const documentName = state.doc.getDocName();
             const hasUnsavedChanges = state.doc.hasUnsavedChanges();
-            const resetCanvasTranslation = state.ui.getResetDueToNewDoc();
-            state.ui.setResetDueToNewDoc(false);
 
             return m(
                 'div',
@@ -267,7 +265,6 @@ function App(): m.Component {
                         DisplayedDocument,
                         {
                             documentDimensions: getDocumentDimensions(),
-                            resetCanvasTranslation,
                         },
                     ),
                     m(Menu),

diff --git a/src/components/DisplayedDocument/DisplayedDocument.ts b/src/components/DisplayedDocument/DisplayedDocument.ts
@@ -31,7 +31,6 @@ interface Attrs {
         height: number,
         width: number,
     },
-    resetCanvasTranslation: boolean,
 }
 
 /**
@@ -117,10 +116,6 @@ function DisplayedDocument(): m.Component<Attrs> {
         },
 
         onupdate: (vnode) => {
-            if (vnode.attrs.resetCanvasTranslation) {
-                canvasState.resetRootNodeCoords();
-            }
-
             // Canvas elements reset their scale and translation when their
             // dimensions change, so reset when that happens
             if (

diff --git a/src/components/menus/FileMenu.ts b/src/components/menus/FileMenu.ts
@@ -1,4 +1,4 @@
-// Copyright 2022 Glen Reesor
+// Copyright 2023 Glen Reesor
 //
 // This file is part of m3 Mind Mapper.
 //
@@ -175,13 +175,13 @@ function onFileNewButtonClick() {
             onYesButtonClick: () => {
                 state.doc.replaceCurrentDocWithNewEmptyDoc();
                 state.ui.setCurrentModal('none');
-                state.ui.setResetDueToNewDoc(true);
+                state.canvasState.resetRootNodeCoords();
             },
             onNoButtonClick: () => state.ui.setCurrentModal('none'),
         });
     } else {
         state.doc.replaceCurrentDocWithNewEmptyDoc();
-        state.ui.setResetDueToNewDoc(true);
+        state.canvasState.resetRootNodeCoords();
     }
 }
 

diff --git a/src/state/uiState.ts b/src/state/uiState.ts
@@ -1,4 +1,4 @@
-// Copyright 2022 Glen Reesor
+// Copyright 2023 Glen Reesor
 //
 // This file is part of m3 Mind Mapper.
 //
@@ -50,7 +50,6 @@ export default (() => {
         currentMenu: MenuType,
         currentModal: ModalType,
         fontSize: number,
-        resetDueToNewDoc: boolean,
         sidebarIsVisible: boolean,
     }
 
@@ -59,7 +58,6 @@ export default (() => {
         currentMenu: 'edit',
         currentModal: 'none',
         fontSize: 14,
-        resetDueToNewDoc: false,
         sidebarIsVisible: false,
     };
 
@@ -84,10 +82,5 @@ export default (() => {
         setSidebarVisibility: (visible: boolean) => {
             state.sidebarIsVisible = visible;
         },
-
-        getResetDueToNewDoc: () => state.resetDueToNewDoc,
-        setResetDueToNewDoc: (value: boolean) => {
-            state.resetDueToNewDoc = value;
-        },
     };
 })();