fix: update stroke wrong when redo

F-star · Mar 5, 2024 · 29afd94 · 29afd94
1 parent a0c75aa
commit 29afd94
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/packages/suika/src/components/Cards/FillCard/FillCard.tsx b/packages/suika/src/components/Cards/FillCard/FillCard.tsx
@@ -67,15 +67,15 @@ export const FillCard: FC = () => {
   const pushToHistory = (
     cmdDesc: string,
     selectedElements: Graph[],
-    newStroke: ITexture[],
+    newPaints: ITexture[],
   ) => {
     if (!editor) return;
 
     editor.commandManager.pushCommand(
       new SetGraphsAttrsCmd(
         cmdDesc,
         selectedElements,
-        { fill: newStroke },
+        { fill: newPaints },
         // prev value
         selectedElements.map((_, i) => ({
           fill: cloneDeep(prevFills.current[i]),

diff --git a/packages/suika/src/components/Cards/StrokeCard/StrokeCard.tsx b/packages/suika/src/components/Cards/StrokeCard/StrokeCard.tsx
@@ -23,9 +23,9 @@ export const StrokeCard: FC = () => {
 
   useEffect(() => {
     if (editor) {
-      prevStrokes.current = editor.selectedElements
-        .getItems()
-        .map((el) => cloneDeep(el.attrs.stroke ?? []));
+      const updatePrevStroke = (els: Graph[]) => {
+        prevStrokes.current = els.map((el) => cloneDeep(el.attrs.stroke ?? []));
+      };
 
       const updateInfo = () => {
         const selectedElements = editor.selectedElements.getItems();
@@ -59,11 +59,15 @@ export const StrokeCard: FC = () => {
         }
       };
 
-      updateInfo(); // init
+      // init
+      updateInfo();
+      updatePrevStroke(editor.selectedElements.getItems());
 
       editor.sceneGraph.on('render', updateInfo);
+      editor.selectedElements.on('itemsChange', updatePrevStroke);
       return () => {
         editor.sceneGraph.off('render', updateInfo);
+        editor.selectedElements.off('itemsChange', updatePrevStroke);
       };
     }
   }, [editor]);
@@ -162,7 +166,7 @@ export const StrokeCard: FC = () => {
     );
 
     prevStrokes.current = selectedElements.map((el) =>
-      cloneDeep(el.attrs.fill ?? []),
+      cloneDeep(el.attrs.stroke ?? []),
     );
   };