From 5020f1f06357c81294e6f24c3f0d4c4861a0efff Mon Sep 17 00:00:00 2001
From: dank074 <torresefrain10@gmail.com>
Date: Tue, 2 Nov 2021 20:46:48 -0500
Subject: [PATCH] update stuff to use mounteffect

---
 .../floorplan-editor/FloorplanEditorView.tsx      | 13 ++++++-------
 .../views/FloorplanCanvasView.tsx                 | 15 +++++++++------
 .../views/FloorplanImportExportView.tsx           |  8 ++++----
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/views/floorplan-editor/FloorplanEditorView.tsx b/src/views/floorplan-editor/FloorplanEditorView.tsx
index 2f057b67..48a7d34b 100644
--- a/src/views/floorplan-editor/FloorplanEditorView.tsx
+++ b/src/views/floorplan-editor/FloorplanEditorView.tsx
@@ -1,8 +1,8 @@
 import { FloorHeightMapEvent, NitroPoint, RoomEngineEvent, RoomVisualizationSettingsEvent, UpdateFloorPropertiesMessageComposer } from '@nitrots/nitro-renderer';
-import { FC, useCallback, useEffect, useState } from 'react';
+import { FC, useCallback, useState } from 'react';
 import { LocalizeText } from '../../api';
 import { FloorplanEditorEvent } from '../../events/floorplan-editor/FloorplanEditorEvent';
-import { CreateMessageHook, SendMessageHook, useRoomEngineEvent, useUiEvent } from '../../hooks';
+import { CreateMessageHook, SendMessageHook, UseMountEffect, useRoomEngineEvent, useUiEvent } from '../../hooks';
 import { NitroCardContentView, NitroCardHeaderView, NitroCardView, NitroLayoutFlex, NitroLayoutGrid, NitroLayoutGridColumn } from '../../layout';
 import { FloorplanEditor } from './common/FloorplanEditor';
 import { convertNumbersForSaving, convertSettingToNumber } from './common/Utils';
@@ -45,10 +45,10 @@ export const FloorplanEditorView: FC<{}> = props =>
     useUiEvent(FloorplanEditorEvent.SHOW_FLOORPLAN_EDITOR, onFloorplanEditorEvent);
     useUiEvent(FloorplanEditorEvent.TOGGLE_FLOORPLAN_EDITOR, onFloorplanEditorEvent);
 
-    useEffect(() =>
+    UseMountEffect(() =>
     {
         FloorplanEditor.instance.initialize();
-    }, []);
+    });
 
     const onRoomEngineEvent = useCallback((event: RoomEngineEvent) =>
     {
@@ -121,7 +121,7 @@ export const FloorplanEditorView: FC<{}> = props =>
     return (
         <>
             <FloorplanEditorContextProvider value={{ originalFloorplanSettings: originalFloorplanSettings, setOriginalFloorplanSettings: setOriginalFloorplanSettings, visualizationSettings: visualizationSettings, setVisualizationSettings: setVisualizationSettings }}>
-                {isVisible && <>
+                {isVisible &&
                     <NitroCardView className="nitro-floorplan-editor">
                         <NitroCardHeaderView headerText={LocalizeText('floor.plan.editor.title')} onCloseClick={() => setIsVisible(false)} />
                         <NitroCardContentView>
@@ -143,9 +143,8 @@ export const FloorplanEditorView: FC<{}> = props =>
                             </NitroLayoutGrid>
                         </NitroCardContentView>
                     </NitroCardView>
-                    {importExportVisible && <FloorplanImportExportView onCloseClick={ () => setImportExportVisible(false)}/>}
-                    </>
                 }
+                {importExportVisible && <FloorplanImportExportView onCloseClick={ () => setImportExportVisible(false)}/>}
             </FloorplanEditorContextProvider>
         </>
     );
diff --git a/src/views/floorplan-editor/views/FloorplanCanvasView.tsx b/src/views/floorplan-editor/views/FloorplanCanvasView.tsx
index f9640a2c..f68a9248 100644
--- a/src/views/floorplan-editor/views/FloorplanCanvasView.tsx
+++ b/src/views/floorplan-editor/views/FloorplanCanvasView.tsx
@@ -1,6 +1,6 @@
 import { GetOccupiedTilesMessageComposer, GetRoomEntryTileMessageComposer, NitroPoint, RoomEntryTileMessageEvent, RoomOccupiedTilesMessageEvent } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useRef, useState } from 'react';
-import { CreateMessageHook, SendMessageHook } from '../../../hooks';
+import { CreateMessageHook, SendMessageHook, UseMountEffect } from '../../../hooks';
 import { FloorplanEditor } from '../common/FloorplanEditor';
 import { useFloorplanEditorContext } from '../context/FloorplanEditorContext';
 
@@ -13,11 +13,6 @@ export const FloorplanCanvasView: FC<{}> = props =>
 
     useEffect(() =>
     {
-        SendMessageHook(new GetRoomEntryTileMessageComposer());
-        SendMessageHook(new GetOccupiedTilesMessageComposer());
-        FloorplanEditor.instance.tilemapRenderer.interactive = true;
-        elementRef.current.appendChild(FloorplanEditor.instance.renderer.view);
-
         return ( () =>
         {
             FloorplanEditor.instance.clear();
@@ -25,6 +20,14 @@ export const FloorplanCanvasView: FC<{}> = props =>
         });
     }, [originalFloorplanSettings.thicknessFloor, originalFloorplanSettings.thicknessWall, originalFloorplanSettings.wallHeight, setVisualizationSettings]);
 
+    UseMountEffect(() =>
+    {
+        SendMessageHook(new GetRoomEntryTileMessageComposer());
+        SendMessageHook(new GetOccupiedTilesMessageComposer());
+        FloorplanEditor.instance.tilemapRenderer.interactive = true;
+        elementRef.current.appendChild(FloorplanEditor.instance.renderer.view);
+    });
+
     const onRoomOccupiedTilesMessageEvent = useCallback((event: RoomOccupiedTilesMessageEvent) =>
     {
         const parser = event.getParser();
diff --git a/src/views/floorplan-editor/views/FloorplanImportExportView.tsx b/src/views/floorplan-editor/views/FloorplanImportExportView.tsx
index c707ff15..274d5ec6 100644
--- a/src/views/floorplan-editor/views/FloorplanImportExportView.tsx
+++ b/src/views/floorplan-editor/views/FloorplanImportExportView.tsx
@@ -1,7 +1,7 @@
 import { UpdateFloorPropertiesMessageComposer } from '@nitrots/nitro-renderer';
-import { FC, useCallback, useEffect, useState } from 'react';
+import { FC, useCallback, useState } from 'react';
 import { LocalizeText } from '../../../api';
-import { SendMessageHook } from '../../../hooks';
+import { SendMessageHook, UseMountEffect } from '../../../hooks';
 import { NitroCardContentView, NitroCardHeaderView, NitroCardView, NitroLayoutFlex, NitroLayoutGridColumn } from '../../../layout';
 import { convertNumbersForSaving } from '../common/Utils';
 import { useFloorplanEditorContext } from '../context/FloorplanEditorContext';
@@ -36,10 +36,10 @@ export const FloorplanImportExportView: FC<FloorplanImportExportViewProps> = pro
         ));
     }, [map, originalFloorplanSettings.entryPoint, originalFloorplanSettings.entryPointDir, originalFloorplanSettings.thicknessFloor, originalFloorplanSettings.thicknessWall, originalFloorplanSettings.wallHeight]);
 
-    useEffect(() =>
+    UseMountEffect(() =>
     {
         revertChanges();   
-    }, [revertChanges]);
+    });
 
     return (
         <NitroCardView simple={true} className="floorplan-import-export">