use getDOMAttribute instead of getAttribute to store the old value to…

… be sure we include only properties we set explicitely if we undo and then redo
3DStreet · Aug 29, 2024 · 9612ac5 · 9612ac5
1 parent 94d64c2
commit 9612ac5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/editor/lib/commands/ComponentRemoveCommand.js b/src/editor/lib/commands/ComponentRemoveCommand.js
@@ -16,7 +16,13 @@ export class ComponentRemoveCommand extends Command {
     }
     this.entityId = entity.id;
     this.component = payload.component;
-    this.value = entity.getAttribute(this.component);
+
+    const component =
+      entity.components[payload.component] ??
+      AFRAME.components[payload.component];
+    this.value = component.isSingleProperty
+      ? component.schema.stringify(entity.getAttribute(payload.component))
+      : entity.getDOMAttribute(payload.component);
   }
 
   execute() {

diff --git a/src/editor/lib/commands/EntityUpdateCommand.js b/src/editor/lib/commands/EntityUpdateCommand.js
@@ -49,15 +49,14 @@ export class EntityUpdateCommand extends Command {
           console.log(this.component, this.oldValue, this.newValue);
         }
       } else {
-        // If component.schema.stringify is undefined then it's multi-property component and value is an object.
-        this.newValue = component.schema.stringify
+        this.newValue = component.isSingleProperty
           ? component.schema.stringify(payload.value)
           : payload.value;
-        this.oldValue = component.schema.stringify
+        this.oldValue = component.isSingleProperty
           ? component.schema.stringify(
               payload.entity.getAttribute(payload.component)
             )
-          : payload.entity.getAttribute(payload.component);
+          : payload.entity.getDOMAttribute(payload.component);
         if (this.editor.debugUndoRedo) {
           console.log(this.component, this.oldValue, this.newValue);
         }