fix: update fill wrong when redo

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

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/packages/core/src/commands/set_elements_attrs.ts b/packages/core/src/commands/set_elements_attrs.ts
@@ -1,3 +1,5 @@
+import { cloneDeep } from '@suika/common';
+
 import { Graph, IPathItem } from '../graphs';
 import { ITexture } from '../texture';
 import { ICommand } from './type';
@@ -38,7 +40,7 @@ export class SetGraphsAttrsCmd implements ICommand {
       if (Array.isArray(attrs)) {
         elements[i].updateAttrs(attrs[i]);
       } else {
-        elements[i].updateAttrs(attrs);
+        elements[i].updateAttrs(cloneDeep(attrs));
       }
     }
   }

diff --git a/packages/suika/src/components/Cards/FillCard/FillCard.tsx b/packages/suika/src/components/Cards/FillCard/FillCard.tsx
@@ -90,10 +90,9 @@ export const FillCard: FC = () => {
 
   useEffect(() => {
     if (editor) {
-      prevFills.current = editor.selectedElements
-        .getItems()
-        .map((el) => cloneDeep(el.attrs.fill ?? []));
-
+      const updatePrevFill = (els: Graph[]) => {
+        prevFills.current = els.map((el) => cloneDeep(el.attrs.fill ?? []));
+      };
       const updateInfo = () => {
         const selectedElements = editor.selectedElements.getItems();
         if (selectedElements.length > 0) {
@@ -115,11 +114,15 @@ export const FillCard: FC = () => {
         }
       };
 
-      updateInfo(); // init
+      // init
+      updatePrevFill(editor.selectedElements.getItems());
+      updateInfo();
 
       editor.sceneGraph.on('render', updateInfo);
+      editor.selectedElements.on('itemsChange', updatePrevFill);
       return () => {
         editor.sceneGraph.off('render', updateInfo);
+        editor.selectedElements.off('itemsChange', updatePrevFill);
       };
     }
   }, [editor]);