Merge remote-tracking branch 'origin/main-dev' into main-demo

app/src/modules/builder/point/point.tsx

@@ -631,7 +631,8 @@ function Point({ point }: { readonly point: Point }) {
                         uuid={point.pointUuid}
                         name={`${point.pointType}-Point`}
                         position={[...point.position]}
-                        onClick={() => {
+                        onClick={(e) => {
+                            e.stopPropagation();
                             handlePointClick(point);
                         }}
                         onPointerOver={(e) => {

app/src/modules/scene/controls/undoRedoControls/handlers/useRedoHandler.ts

@@ -338,7 +338,7 @@ function useRedoHandler() {
             // SOCKET
 
             const data = {
-                aisleData: updatedData,
+                ...updatedData,
                 projectId,
                 versionId: selectedVersion?.versionId || '',
                 userId,

app/src/modules/scene/controls/undoRedoControls/handlers/useUndoHandler.ts

@@ -339,7 +339,7 @@ function useUndoHandler() {
             // SOCKET
 
             const data = {
-                aisleData: updatedData,
+                ...updatedData,
                 projectId,
                 versionId: selectedVersion?.versionId || '',
                 userId,