From 67356255b9c3c45638b872b0962b972e5e864f15 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Sat, 27 Jun 2020 11:18:47 +1000
Subject: [PATCH] Added map settings change cache to improve editing
 performance

---
 src/components/map/MapTiles.js        | 31 +++++++++--------
 src/components/map/SelectMapButton.js |  6 +---
 src/modals/SelectMapModal.js          | 50 +++++++++++++++++++++------
 3 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/src/components/map/MapTiles.js b/src/components/map/MapTiles.js
index bae2a30..88d7961 100644
--- a/src/components/map/MapTiles.js
+++ b/src/components/map/MapTiles.js
@@ -58,20 +58,23 @@ function MapTiles({
           >
             <AddIcon large />
           </Flex>
-          {maps.map((map) => (
-            <MapTile
-              key={map.id}
-              map={map}
-              mapState={
-                selectedMap && map.id === selectedMap.id && selectedMapState
-              }
-              isSelected={selectedMap && map.id === selectedMap.id}
-              onMapSelect={onMapSelect}
-              onMapRemove={onMapRemove}
-              onMapReset={onMapReset}
-              onDone={onDone}
-            />
-          ))}
+          {maps.map((map) => {
+            const isSelected = selectedMap && map.id === selectedMap.id;
+            return (
+              <MapTile
+                key={map.id}
+                // TODO: Move to selected map here and fix url error
+                // when done is clicked
+                map={map}
+                mapState={isSelected && selectedMapState}
+                isSelected={isSelected}
+                onMapSelect={onMapSelect}
+                onMapRemove={onMapRemove}
+                onMapReset={onMapReset}
+                onDone={onDone}
+              />
+            );
+          })}
         </Flex>
       </SimpleBar>
       {databaseStatus === "disabled" && (
diff --git a/src/components/map/SelectMapButton.js b/src/components/map/SelectMapButton.js
index fb8c81f..799a1dd 100644
--- a/src/components/map/SelectMapButton.js
+++ b/src/components/map/SelectMapButton.js
@@ -19,12 +19,9 @@ function SelectMapButton({
     currentMapState && updateMapState(currentMapState.mapId, currentMapState);
     setIsModalOpen(true);
   }
-  function closeModal() {
-    setIsModalOpen(false);
-  }
 
   function handleDone() {
-    closeModal();
+    setIsModalOpen(false);
   }
 
   return (
@@ -38,7 +35,6 @@ function SelectMapButton({
       </IconButton>
       <SelectMapModal
         isOpen={isModalOpen}
-        onRequestClose={closeModal}
         onDone={handleDone}
         onMapChange={onMapChange}
         onMapStateChange={onMapStateChange}
diff --git a/src/modals/SelectMapModal.js b/src/modals/SelectMapModal.js
index bebe250..ebf59e7 100644
--- a/src/modals/SelectMapModal.js
+++ b/src/modals/SelectMapModal.js
@@ -12,6 +12,8 @@ import blobToBuffer from "../helpers/blobToBuffer";
 import MapDataContext from "../contexts/MapDataContext";
 import AuthContext from "../contexts/AuthContext";
 
+import { isEmpty } from "../helpers/shared";
+
 const defaultMapSize = 22;
 const defaultMapProps = {
   // Grid type
@@ -22,7 +24,6 @@ const defaultMapProps = {
 
 function SelectMapModal({
   isOpen,
-  onRequestClose,
   onDone,
   onMapChange,
   onMapStateChange,
@@ -147,7 +148,8 @@ function SelectMapModal({
     }
   }
 
-  function handleMapSelect(map) {
+  async function handleMapSelect(map) {
+    await applyMapChanges();
     setSelectedMapId(map.id);
   }
 
@@ -161,8 +163,8 @@ function SelectMapModal({
 
   async function handleDone() {
     if (selectedMapId) {
-      onMapChange(selectedMap, selectedMapState);
-      onDone();
+      await applyMapChanges();
+      onMapChange(selectedMapWithChanges, selectedMapStateWithChanges);
     }
     onDone();
   }
@@ -171,17 +173,43 @@ function SelectMapModal({
    * Map settings
    */
   const [showMoreSettings, setShowMoreSettings] = useState(false);
+  // Local cache of map setting changes
+  // Applied when done is clicked or map selection is changed
+  const [mapSettingChanges, setMapSettingChanges] = useState({});
+  const [mapStateSettingChanges, setMapStateSettingChanges] = useState({});
 
   async function handleMapSettingsChange(key, value) {
-    await updateMap(selectedMapId, { [key]: value });
+    setMapSettingChanges((prevChanges) => ({ ...prevChanges, [key]: value }));
   }
 
   async function handleMapStateSettingsChange(key, value) {
-    await updateMapState(selectedMapId, { [key]: value });
+    setMapStateSettingChanges((prevChanges) => ({
+      ...prevChanges,
+      [key]: value,
+    }));
   }
 
+  async function applyMapChanges() {
+    if (
+      selectedMapId &&
+      (!isEmpty(mapSettingChanges) || !isEmpty(mapStateSettingChanges))
+    ) {
+      await updateMap(selectedMapId, mapSettingChanges);
+      await updateMapState(selectedMapId, mapStateSettingChanges);
+
+      setMapSettingChanges({});
+      setMapStateSettingChanges({});
+    }
+  }
+
+  const selectedMapWithChanges = { ...selectedMap, ...mapSettingChanges };
+  const selectedMapStateWithChanges = {
+    ...selectedMapState,
+    ...mapStateSettingChanges,
+  };
+
   return (
-    <Modal isOpen={isOpen} onRequestClose={onRequestClose}>
+    <Modal isOpen={isOpen} onRequestClose={handleDone}>
       <ImageDrop onDrop={handleImagesUpload} dropText="Drop map to upload">
         <input
           onChange={(event) => handleImagesUpload(event.target.files)}
@@ -203,15 +231,15 @@ function SelectMapModal({
             maps={ownedMaps}
             onMapAdd={openImageDialog}
             onMapRemove={handleMapRemove}
-            selectedMap={selectedMap}
-            selectedMapState={selectedMapState}
+            selectedMap={selectedMapWithChanges}
+            selectedMapState={selectedMapStateWithChanges}
             onMapSelect={handleMapSelect}
             onMapReset={handleMapReset}
             onDone={handleDone}
           />
           <MapSettings
-            map={selectedMap}
-            mapState={selectedMapState}
+            map={selectedMapWithChanges}
+            mapState={selectedMapStateWithChanges}
             onSettingsChange={handleMapSettingsChange}
             onStateSettingsChange={handleMapStateSettingsChange}
             showMore={showMoreSettings}