@shopware-ag/dive 1.16.10 → 1.16.12

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@shopware-ag/dive",
-    "version": "1.16.10",
+    "version": "1.16.12",
     "description": "Shopware Spatial Framework",
     "type": "module",
     "main": "./build/dive.cjs",

package/src/com/Communication.ts

@@ -444,6 +444,13 @@ export class DIVECommunication {
 
         this.registered.delete(payload.id);
 
+        // detach from parent
+        Array.from(this.registered.values()).forEach((object) => {
+            if (!object.parentId) return;
+            if (object.parentId !== payload.id) return;
+            object.parentId = null;
+        });
+
         this.scene.DeleteSceneObject(deletedObject);
 
         return true;

package/src/group/Group.ts

@@ -12,7 +12,11 @@ import { type DIVESceneObject } from '../types';
 export class DIVEGroup extends DIVENode {
     readonly isDIVEGroup: true = true;
 
-    private _members: Object3D[]; // lines to children
+    private _members: Object3D[]; // children objects
+
+    public get members(): Object3D[] {
+        return this._members;
+    }
 
     private _lines: Line[]; // lines to children
 

package/src/scene/root/Root.ts

@@ -329,7 +329,7 @@ export class DIVERoot extends Object3D {
 
         this.detachTransformControls(sceneObject);
 
-        this.remove(sceneObject);
+        sceneObject.parent!.remove(sceneObject);
     }
 
     private deleteModel(model: Partial<COMModel> & { id: string }): void {
@@ -343,7 +343,7 @@ export class DIVERoot extends Object3D {
 
         this.detachTransformControls(sceneObject);
 
-        this.remove(sceneObject);
+        sceneObject.parent!.remove(sceneObject);
     }
 
     private deletePrimitive(
@@ -359,11 +359,11 @@ export class DIVERoot extends Object3D {
 
         this.detachTransformControls(sceneObject);
 
-        this.remove(sceneObject);
+        sceneObject.parent!.remove(sceneObject);
     }
 
     private deleteGroup(group: Partial<COMGroup> & { id: string }): void {
-        const sceneObject = this.GetSceneObject(group);
+        const sceneObject = this.GetSceneObject<DIVEGroup>(group);
         if (!sceneObject) {
             console.warn(
                 `DIVERoot.deleteGroup: Group with id ${group.id} not found`,
@@ -373,8 +373,8 @@ export class DIVERoot extends Object3D {
 
         this.detachTransformControls(sceneObject);
 
-        for (let i = sceneObject.children.length - 1; i >= 0; i--) {
-            this.attach(sceneObject.children[i]);
+        for (let i = sceneObject.members.length - 1; i >= 0; i--) {
+            this.attach(sceneObject.members[i]);
         }
 
         sceneObject.parent!.remove(sceneObject);

package/src/scene/root/__test__/Root.test.ts

@@ -870,6 +870,13 @@ describe('DIVE/scene/root/DIVERoot', () => {
         expect(spyConsoleWarn).toHaveBeenCalled();
 
         spyConsoleWarn.mockClear();
+        root['detachTransformControls'] = jest.fn();
+        jest.spyOn(root, 'GetSceneObject').mockReturnValueOnce({
+            members: [new Object3D()],
+            parent: {
+                remove: jest.fn(),
+            },
+        } as unknown as DIVESceneObject);
         expect(() =>
             root.DeleteSceneObject({
                 id: 'id',
@@ -883,6 +890,7 @@ describe('DIVE/scene/root/DIVERoot', () => {
         const firstFind = root.GetSceneObject({ id: 'id' });
         jest.spyOn(root, 'GetSceneObject').mockReturnValueOnce({
             ...firstFind,
+            members: [new Object3D()],
             parent: sceneParent,
             children: [
                 {