Merge pull request #229 from boostcampwm-2024/feature-historyState-fix

[Feature-history-state-fix] historyState 오류 해결

Author: kimnamheeee

client/src/components/MindMapCanvas/ToolMenu.tsx

@@ -33,7 +33,6 @@ export default function ToolMenu({ dimensions, zoomIn, zoomOut, dragmode, setDra
   };
 
   function handleAddButton() {
-    saveHistory(JSON.stringify(data));
     addNode(data, selectedNode, overrideNodeData, (newNodeId) => {
       selectNode({
         nodeId: newNodeId,
@@ -42,7 +41,6 @@ export default function ToolMenu({ dimensions, zoomIn, zoomOut, dragmode, setDra
     });
   }
   function handleDeleteButton() {
-    saveHistory(JSON.stringify(data));
     deleteNodes(JSON.stringify(data), selectedNode.nodeId, overrideNodeData);
     selectNode({ nodeId: 0, parentNodeId: 0 });
   }

client/src/components/MindMapCanvas/index.tsx

@@ -23,7 +23,6 @@ export default function MindMapCanvas({ showMinutes, handleShowMinutes }) {
     redoData: redo,
     updateNode,
     overrideNodeData,
-    saveHistory,
     loadingStatus,
     deleteSelectedNodes,
     selectedNode,
@@ -44,7 +43,6 @@ export default function MindMapCanvas({ showMinutes, handleShowMinutes }) {
       payload: initializeNodePosition(data),
       callback: (response) => {
         if (response) {
-          saveHistory(JSON.stringify(data));
           overrideNodeData(response);
         }
       },
@@ -54,7 +52,7 @@ export default function MindMapCanvas({ showMinutes, handleShowMinutes }) {
   useWindowEventListener("keydown", (e) => {
     e.preventDefault();
     if (e.metaKey || e.ctrlKey) {
-      if (e.shiftKey && e.code) redo();
+      if (e.shiftKey && e.code === "KeyZ") redo();
       switch (e.code) {
         case "KeyZ":
           undo();

client/src/components/MindMapMainSection/ControlSection/ListView/NodeItem.tsx

@@ -34,7 +34,7 @@ export default function NodeItem({ node, parentNodeId, open, handleAccordion, op
     handleKeyDown,
     handleDelete,
   } = useNodeActions(node.id, node.keyword);
-  const { data, saveHistory, selectedNode, overrideNodeData, selectNode } = useNodeListContext();
+  const { data, selectedNode, overrideNodeData, selectNode } = useNodeListContext();
   const inputRef = useRef<HTMLInputElement | null>(null);
   const parentNodes = getParentNodeKeys(selectedNode.nodeId, data);
   const isSelected = parentNodes.includes(node.id);
@@ -48,7 +48,6 @@ export default function NodeItem({ node, parentNodeId, open, handleAccordion, op
   }, [isSelected]);
 
   function handleAddButton() {
-    saveHistory(JSON.stringify(data));
     selectNode({ nodeId: node.id, parentNodeId: parentNodeId });
     addNode(data, { nodeId: node.id, parentNodeId: parentNodeId }, overrideNodeData, (newNodeId) => {
       selectNode({ nodeId: newNodeId, parentNodeId: node.id });

client/src/hooks/useNodeActions.ts

@@ -1,4 +1,3 @@
-import { addNode } from "@/konva_mindmap/events/addNode";
 import { deleteNodes } from "@/konva_mindmap/events/deleteNode";
 import { useNodeListContext } from "@/store/NodeListProvider";
 import { useConnectionStore } from "@/store/useConnectionStore";
@@ -8,7 +7,7 @@ export default function useNodeActions(nodeId: number, content: string) {
   const [hover, setHover] = useState<boolean>(false);
   const [isEditing, setIsEditing] = useState<boolean>(false);
   const [keyword, setKeyword] = useState(content);
-  const { data, saveHistory, overrideNodeData } = useNodeListContext();
+  const { data, overrideNodeData } = useNodeListContext();
   const handleSocketEvent = useConnectionStore((state) => state.handleSocketEvent);
   const currentJobStatus = useConnectionStore((state) => state.currentJobStatus);
 
@@ -24,7 +23,6 @@ export default function useNodeActions(nodeId: number, content: string) {
         actionType: "updateNode",
         payload: { ...data, [nodeId]: { ...data[nodeId], keyword: keyword, newNode: false } },
         callback: (response) => {
-          saveHistory(JSON.stringify(data));
           overrideNodeData(response);
         },
       });
@@ -62,7 +60,6 @@ export default function useNodeActions(nodeId: number, content: string) {
 
   function handleDelete() {
     const stringifiedData = JSON.stringify(data);
-    saveHistory(stringifiedData);
     deleteNodes(stringifiedData, nodeId, overrideNodeData);
   }
 

client/src/store/NodeListProvider.tsx

@@ -60,7 +60,7 @@ export default function NodeListProvider({ children }: { children: ReactNode })
       updateLoadingStatus({ type: "socketLoading", status: true });
       setTimeout(() => {
         setData({ ...initialData.nodeData });
-        overrideHistory(JSON.stringify(initialData));
+        overrideHistory(JSON.stringify(initialData.nodeData));
         initializeTitle(initialData);
         initializeContent(initialData);
         initializeAiCount(initialData);
@@ -115,6 +115,7 @@ export default function NodeListProvider({ children }: { children: ReactNode })
 
   function overrideNodeData(newData) {
     setData(newData);
+    saveHistory(JSON.stringify(newData));
   }
 
   function undoData() {