architwin 1.16.0 → 1.16.1

package/lib/atwinui/components/toolbar/spacePartition/roomFormPane.d.ts

@@ -1,7 +1,5 @@
-import { FORM_MODE, PartitionNode, PolygonData, WallPolyData, IObjectData, WindowPolyData } from "../../../../types";
+import { FORM_MODE, PartitionNode, PolygonData, WallPolyData, IObjectData } from "../../../../types";
 export declare let isEditWindow: boolean;
-export declare let currentEditWindowIndex: number;
-export declare let currentWindow: WindowPolyData;
 export declare function renderRoomFormPane(): HTMLDivElement;
 /**
  * Toggles the state of the partition drawing functionality.
@@ -105,7 +103,7 @@ export declare function getCurrentPolygonData(): PolygonData;
  * Sets the partition data, including updating the floor level and generating a new
  * partition with its corresponding UUID, space UUID, and polygon data.
  */
-export declare function setCurrentPartitionData(): Promise<void>;
+export declare function setCurrentPartitionData(payload: PolygonData | undefined): Promise<void>;
 export declare function removeWindow(index?: number): void;
 export declare function toggleUndoRedoButtons(undo: boolean, redo: boolean): void;
 export declare function getCurrentPartitionData(): PartitionNode;

package/lib/atwinui/components/toolbar/spacePartition/roomFormPane.js

@@ -41,10 +41,10 @@ let inputFloorMaterial;
 let floorMaterial = '';
 let inputWallMaterial;
 let wallMaterial = '';
-export let isEditWindow = false;
-export let currentEditWindowIndex = null;
-export let currentWindow = null;
+let currentEditWindowIndex = null;
+let currentWindowIndex = null;
 let tempCurrentEditRoom = null;
+export let isEditWindow = false;
 export function renderRoomFormPane() {
     log.info("__@ renderRoomFormPane: ", roomFormMode);
     const element = document.createElement('div');
@@ -228,10 +228,11 @@ export function toggleDrawPartitionButton() {
         isEditPartition = false;
         previousPartitionData = null;
     }
-    // toggleUndoRedoButtons(false, false)
+    partitionHistory.clearHistory();
+    toggleUndoRedoButtons(false, false);
 }
 export function toggleDrawWindowButton() {
-    var _a, _b;
+    var _a, _b, _c;
     log.info("toggleDrawWindowButton()", getCurrentPolygon(), _3DXObjects);
     setCurrentPolygon(undefined);
     const addDoorButton = document.getElementById('at-add-window-door-btn');
@@ -246,6 +247,7 @@ export function toggleDrawWindowButton() {
                 ${i18n.t('DoneDrawing')}
                 <span class="mdi mdi-check-bold"></span>
             `;
+            currentWindowIndex = (_a = currentWall.windows) === null || _a === void 0 ? void 0 : _a.length;
         }
         const objectIndex = _3DXObjects.findIndex(obj => obj.object.id == currentObject.object.id);
         log.info("objectIndex", objectIndex);
@@ -253,7 +255,7 @@ export function toggleDrawWindowButton() {
             lineTypeComponentConfig: {
                 renderPolygonOnAdd: false,
                 drawingMode: drawingMode,
-                targetIndex: (_b = currentEditWindowIndex !== null && currentEditWindowIndex !== void 0 ? currentEditWindowIndex : (_a = currentWall.windows) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0,
+                targetIndex: (_c = currentEditWindowIndex !== null && currentEditWindowIndex !== void 0 ? currentEditWindowIndex : (_b = currentWall.windows) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0,
                 polygonData: currentPolygonData,
                 targetUUID: currentWall.uuid,
                 objectIndex: objectIndex
@@ -266,6 +268,7 @@ export function toggleDrawWindowButton() {
     else {
         isDrawing = false;
         drawingMode = null;
+        currentWindowIndex = null;
         currentPartitionData.polygon_json = JSON.stringify(currentPolygonData);
         addDoorButton.classList.remove('at_add_window_door_btn_active');
         addDoorButton.classList.add('at_add_window_door_btn');
@@ -290,16 +293,17 @@ export function toggleDrawWindowButton() {
             log.info("objectIndex", objectIndex);
             if (_3DXObjects[objectIndex].children) {
                 _3DXObjects[objectIndex].children.map((win) => __awaiter(this, void 0, void 0, function* () {
-                    var _c;
+                    var _d;
                     log.info("WIND", win);
-                    if (win.index == ((_c = currentWall.windows) === null || _c === void 0 ? void 0 : _c.length) - 1 && win.wallUUID == currentWall.uuid) {
+                    if (win.index == ((_d = currentWall.windows) === null || _d === void 0 ? void 0 : _d.length) - 1 && win.wallUUID == currentWall.uuid) {
                         yield disposeModel(win);
                     }
                 }));
             }
         }
     }
-    // toggleUndoRedoButtons(false, false)
+    partitionHistory.clearHistory();
+    toggleUndoRedoButtons(false, false);
 }
 /**
  * Displays the partition form based on the current form mode.
@@ -919,7 +923,6 @@ function setupEditWindow(element, window) {
     const confirmBtn = element.querySelector(`#at-confirm-edit-window-${window.index}`);
     if (!editBtn || !editNameContainer || !inputName || !nameLabel || !editMaterialContainer || !inputMaterial)
         return;
-    currentWindow = window;
     // Show inputs when edit icon is clicked
     editBtn.addEventListener("click", () => {
         if (isDrawing) {
@@ -956,17 +959,7 @@ function setupEditWindow(element, window) {
         };
         enableVerticeControls(windowComponent);
         isDrawing = true;
-        let data;
-        if (currentPartitionData) {
-            data = {
-                polygon: {
-                    uuid: currentPartitionData.uuid,
-                    polygon_json: currentPolygonData
-                },
-                verticePath: window.path,
-            };
-        }
-        // partitionHistory.setCurrent(data)
+        // partitionHistory.setCurrent(window.path)
     });
     // // Confirm edit name and material
     confirmBtn.addEventListener("click", () => {
@@ -977,7 +970,7 @@ function setupEditWindow(element, window) {
         nameLabel.textContent = window.name;
         editNameContainer.style.display = "none";
         const newMaterial = inputMaterial.value.trim();
-        window.material = newMaterial || window.material;
+        window.material = newMaterial;
         editMaterialContainer.style.display = "none";
         editBtn.style.display = "flex";
         confirmBtn.style.display = "none";
@@ -1001,7 +994,7 @@ function setupEditWindow(element, window) {
         isDrawing = false;
         isEditWindow = false;
         partitionHistory.clearHistory();
-        // toggleUndoRedoButtons(false, false)
+        toggleUndoRedoButtons(false, false);
     });
 }
 function saveWallChanges() {
@@ -1457,38 +1450,42 @@ export function clearTempCurrentPolygon() {
  */
 export function setPolygonData(payload) {
     console.log('setPolygonData()', payload);
-    // Helper function to round numbers to 2 decimals
-    function roundToFourDecimals(value) {
-        if (typeof value === "number") {
-            return Math.round(value * 10000) / 10000; // Round to 4 decimals
+    if (payload != undefined) {
+        // Helper function to round numbers to 2 decimals
+        function roundToFourDecimals(value) {
+            if (typeof value === "number") {
+                return Math.round(value * 10000) / 10000; // Round to 4 decimals
+            }
+            else if (Array.isArray(value)) {
+                return value.map(roundToFourDecimals); // Recursively round each item in the array
+            }
+            else if (typeof value === "object" && value !== null) {
+                return Object.keys(value).reduce((acc, key) => {
+                    acc[key] = roundToFourDecimals(value[key]); // Recursively process each object property
+                    return acc;
+                }, {});
+            }
+            return value;
         }
-        else if (Array.isArray(value)) {
-            return value.map(roundToFourDecimals); // Recursively round each item in the array
+        // Round numbers in the polygon JSON recursively
+        if (payload) {
+            payload = roundToFourDecimals(payload);
         }
-        else if (typeof value === "object" && value !== null) {
-            return Object.keys(value).reduce((acc, key) => {
-                acc[key] = roundToFourDecimals(value[key]); // Recursively process each object property
-                return acc;
-            }, {});
+        // Set floor UUID and name
+        if (payload.floor) {
+            payload.floor.uuid = payload.floor.uuid || generateUUID();
+            payload.floor.name = `floor`;
         }
-        return value;
-    }
-    // Round numbers in the polygon JSON recursively
-    if (payload) {
-        payload = roundToFourDecimals(payload);
-    }
-    // Set floor UUID and name
-    if (payload.floor) {
-        payload.floor.uuid = payload.floor.uuid || generateUUID();
-        payload.floor.name = `floor`;
+        // Iterate over walls to set UUID and names
+        if (payload.walls && payload.walls.length > 0) {
+            payload.walls = payload.walls.map((wall, index) => (Object.assign(Object.assign({}, roundToFourDecimals(wall)), { name: `wall-${index}`, uuid: wall.uuid || generateUUID() })));
+        }
+        currentPolygonData = payload;
+        setCurrentPartitionData(payload);
     }
-    // Iterate over walls to set UUID and names
-    if (payload.walls && payload.walls.length > 0) {
-        payload.walls = payload.walls.map((wall, index) => (Object.assign(Object.assign({}, roundToFourDecimals(wall)), { name: `wall-${index}`, uuid: wall.uuid || generateUUID() })));
+    else {
+        setCurrentPartitionData(undefined);
     }
-    currentPolygonData = payload;
-    console.log("setPolygonData() currentPolygonData:", currentPolygonData);
-    setCurrentPartitionData();
 }
 /**
  * Returns current polygon data
@@ -1501,10 +1498,10 @@ export function getCurrentPolygonData() {
  * Sets the partition data, including updating the floor level and generating a new
  * partition with its corresponding UUID, space UUID, and polygon data.
  */
-export function setCurrentPartitionData() {
+export function setCurrentPartitionData(payload) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        console.log('setCurrentPartitionData()');
+        console.log('setCurrentPartitionData()', payload);
         const floorLevel = ((_a = document.getElementById('at-room-floor-level-input')) === null || _a === void 0 ? void 0 : _a.value) || null;
         const currentUrl = window.location.href;
         const spaceUUID = extractUUID(currentUrl);
@@ -1519,7 +1516,9 @@ export function setCurrentPartitionData() {
                     resolve();
                 }
                 if (currentObjectData == undefined) {
-                    currentPolygonData = null;
+                    if (drawingMode === 'partition') {
+                        currentPolygonData = null;
+                    }
                     clearInterval(interval);
                     resolve();
                 }
@@ -1530,7 +1529,7 @@ export function setCurrentPartitionData() {
                 }
             }, 50); // Check every 50ms
         });
-        if (currentPolygonData) {
+        if (payload) {
             let polygonData = currentPolygonData;
             polygonData.floor.floor_level = Number(floorLevel); // Set the floor level from the input
             // Create a new partition data payload
@@ -1546,13 +1545,11 @@ export function setCurrentPartitionData() {
             }
             if (isEditPartition) {
                 newPayload.name = currentPartitionData.name;
-                console.log("newPayload.name", newPayload.name);
             }
             if (currentHighlightedFace) {
                 setMeshChildrenMaterialProperty(currentHighlightedFace.component, currentHighlightedFace.name, currentHighlightedFace.type, currentHighlightedFace.value);
             }
             updatePartitionDataArray(newPayload, currentPartitionDataArray);
-            log.info("if currentPartitionDataArray", currentPartitionDataArray);
             if (drawingMode === 'partition') {
                 displayFaces(currentPolygonData);
             }
@@ -1569,13 +1566,19 @@ export function setCurrentPartitionData() {
         else {
             const faceVertexContainer = document.getElementById('at-face-vertex-container');
             faceVertexContainer.innerHTML = '';
-            if (currentPartitionData) {
-                const target = _3DXObjects.find(obj => obj.object.object_data.uuid === currentPartitionData.uuid);
-                disposeModel(target);
-                currentPartitionDataArray = currentPartitionDataArray.filter(partition => partition.uuid != currentPartitionData.uuid);
-                dispatchSpaceEvent(SPACE_EVENTS.PARTITION_DISPOSED, currentPartitionData);
-                currentPartitionData = null;
-                log.info("else currentPartitionDataArray", currentPartitionDataArray);
+            if (drawingMode === 'partition') {
+                if (currentPartitionData) {
+                    currentPartitionDataArray = currentPartitionDataArray.filter(partition => partition.uuid != currentPartitionData.uuid);
+                    dispatchSpaceEvent(SPACE_EVENTS.PARTITION_DISPOSED, currentPartitionData);
+                    currentPartitionData = null;
+                    log.info("else currentPartitionDataArray", currentPartitionDataArray);
+                }
+            }
+            else if (drawingMode === 'window') {
+                if (currentWall === null || currentWall === void 0 ? void 0 : currentWall.windows) {
+                    currentWall.windows.splice(currentWindowIndex, 1);
+                    faceVertexContainer.append(displayWall(currentWall));
+                }
             }
         }
     });

package/lib/atwinui/events.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { actionBar, renderObjectCards, renderLibraryCards, renderTags, renderTagRow, getTagFormData, addClickEventToTagRow, setActiveCard, setActiveMenu, removeObjectCard, clearActiveMenu, setTagCategoriesOption, toggleDropdown, tagFormMode, selectedTag, renderRecepientOptions, renderTagMessages, createTagMessage, setTagLink, setTagMessagingDetails, renderCategoryDropdownOptions, clearTagFormDropdown, clearActiveActionBtn, clearActiveCard, toggleActionBarButtons, selectedCategoryFilterId, selectedSubCategoryFilterId, filterTagList, toggleModal, setModalAction, } from "./components/toolbar";
-import { getTargetPosition, addMediaScreen, _3DXObjects, selectedObject, setTransformControls, copyObject, revertTransform, clearSelectedObject, removeTransformControls, getLibrary, getMpTags, renderTag, captureSpaceScreenshot, moveTag, subscribeSpaceEvent, setModelVisibility, disposeModel, disposeTag, _tags, _tagCategories, dispatchSpaceEvent, editTagLabel, editTagDescription, setTagMessageRecepients, setTagMessages, setSelectedTagUuid, renderMeetingSidebar, setTagIcon, setObjectTransformation, getSelectedObject, _atwin, isCdnMapDataAvailable, captureScreenshotAndCameraDetails, _mpConfig, cancelModelPlacement, _modelDetails, actionHistory, get3DXObjects, transformHistory, goToModel, themeManager, _partitionNodes, setSpacePartitionNodes, getSpaceId, setFloorBaseHeight, toggleWallVisibility, getChildrenOfModel, toggleFloorVisibility, renderPolygon, getCurrentPolygon, getFloorBaseHeight, setSelectedObject, redoDrawAction, undoDrawAction, setWallBaseHeight, clearWallBaseHeight, clearFloorBaseHeight, isToolbarFeatureEnabled, captureCurrentView, getCurrentFloor, _spaceUsers, setPipeCategories, setPipes, detachTagMedia, getTagDataCollection, setVertexPath, _screenSharingHostUser, toggleVisibilityTag, _tagIotCategoryTypes, getIoTDeviceTagIcons, toggleMeshChildrenVisibility, set3DXObjects, partitionHistory,
+import { getTargetPosition, addMediaScreen, _3DXObjects, selectedObject, setTransformControls, copyObject, revertTransform, clearSelectedObject, removeTransformControls, getLibrary, getMpTags, renderTag, captureSpaceScreenshot, moveTag, subscribeSpaceEvent, setModelVisibility, disposeModel, disposeTag, _tags, _tagCategories, dispatchSpaceEvent, editTagLabel, editTagDescription, setTagMessageRecepients, setTagMessages, setSelectedTagUuid, renderMeetingSidebar, setTagIcon, setObjectTransformation, getSelectedObject, _atwin, isCdnMapDataAvailable, captureScreenshotAndCameraDetails, _mpConfig, cancelModelPlacement, _modelDetails, actionHistory, get3DXObjects, transformHistory, goToModel, themeManager, _partitionNodes, setSpacePartitionNodes, getSpaceId, setFloorBaseHeight, toggleWallVisibility, getChildrenOfModel, toggleFloorVisibility, renderPolygon, getCurrentPolygon, getFloorBaseHeight, setSelectedObject, redoDrawAction, undoDrawAction, setWallBaseHeight, clearWallBaseHeight, clearFloorBaseHeight, isToolbarFeatureEnabled, captureCurrentView, getCurrentFloor, _spaceUsers, setPipeCategories, setPipes, detachTagMedia, getTagDataCollection, setVertexPath, _screenSharingHostUser, toggleVisibilityTag, _tagIotCategoryTypes, getIoTDeviceTagIcons, toggleMeshChildrenVisibility, set3DXObjects, partitionHistory, _thisVertexPath,
 // polygonHistory
  } from "../architwin";
 import { Notyf } from 'notyf';
@@ -26,7 +26,7 @@ import log from 'loglevel';
 import * as minimap from '../minimap';
 import { clearActiveThemeCard, getSelectedTheme } from "./components/toolbar/themePane";
 import { getCurrentEditRoomData, displayRoomTree, updatePartitionVisibilityUI, getSelectedPartitionId, updatePolygonVisibilityData, toggleVisibilityState, setFilteredDisplay, updateRoomVisibilityUI, highlightSelectedPartitionChild, highlightSelectedWindow, getRoomData } from "./components/toolbar/spacePartition/roomTreePane";
-import { toggleDrawPartitionButton, displayPartitionFormMode, setPartitionFormMode, clearPartitionForm, setPolygonData, getPartitionFormData, getPartitionSavingMode, setPartitionSavingMode, getPartitionFormMode, getNewlyAddedPartition, setCurrentPartitionData, getCurrentPartitionData, getTempCurrentPolygon, clearTempCurrentPolygon, toggleDrawWindowButton, getIsDrawing, getDrawingMode, getCurrentPolygonData, setTempCurrentRoomEditData, toggleUndoRedoButtons, getCurrentWall, currentWindow } from "./components/toolbar/spacePartition/roomFormPane";
+import { toggleDrawPartitionButton, displayPartitionFormMode, setPartitionFormMode, clearPartitionForm, setPolygonData, getPartitionFormData, getPartitionSavingMode, setPartitionSavingMode, getPartitionFormMode, getNewlyAddedPartition, getCurrentPartitionData, getTempCurrentPolygon, clearTempCurrentPolygon, toggleDrawWindowButton, getIsDrawing, getDrawingMode, getCurrentPolygonData, setTempCurrentRoomEditData, toggleUndoRedoButtons } from "./components/toolbar/spacePartition/roomFormPane";
 import { actionSettingsSelectOption, getTempCoordinateSystem, getTempMeasurementUnit, getTempRotationUnit, setCoordinateSystem, setMeasurementUnit, setRotationUnit, initSettingsValues, setTempCoordinateSystem, setTempMeasurementUnit, setTempRotationUnit, toggleActionSettingsDropdown, toggleCalibrateBasepoint, setScaleFactor, getTempScaleFactor, setTempScaleFactor, setBasepoint, getTempBasepoint, setTempBasepoint, getBasepoint, toggleActionSettings, getBasepointObjectPayload, displayConvertedCoordinates, getCoordinateSystem, getScaleFactor, getMeasurementUnit, getRotationUnit, setBasepointObjectPayload } from "./components/toolbar/actionSettingsPane";
 import { getBasepointCalibrateBpCoordinateValues, getBasepointCalibrateMpCoordinateValues, initBsepointCalibratePane, toggleBasepointCalibratePane } from "./components/toolbar/basepointCalibratePane";
 import { toggleGeneralMapOptions, initGeneralSelectedMap, getSelectedMapOption } from './components/toolbar/generalSettingsMenuPane';
@@ -40,7 +40,6 @@ import { PipeForm } from "./components/toolbar/pipeFormPane";
 import { toggleIoTCategoryOptions, toggleIoTDevicesOptions, setSelectedIoTSystemRadio, clearIoTDropdowns, initIoTFormData, setIotCategoryOptions, getIotTagFormData, iotTagFormMode, selectedIotTag, clearIotFields, getIotCategoryOption } from './components/toolbar/tagIotFormPane';
 import { getTheseTagMessages, timedoutComment, unsendComment } from "./components/toolbar/tagMessagingPane";
 import { handleScreenShareResponsiveChanges, handleScreenShareAcceptRequest, handleScreenShareBackUserListPane, handleScreenShareEndSessionEvent, handleScreenShareUsersUpdated, renderScreenShareLeaveConfirmationModal } from "./components/toolbar/screenSharePane";
-import _ from "lodash";
 const pipeList = new PipeList();
 const pipeForm = new PipeForm();
 let activeToolbarItem, activeActionItem, activePane, activeActionPane, cancelTagPlacementPrompt, cancelModelPlacementPrompt;
@@ -1584,28 +1583,9 @@ function setupSpaceEventSubscriptions() {
 }
 function handleVertexDragEnd(payload) {
     log.info("handleVertexDragEnd()", payload);
-    setCurrentPartitionData();
     if (isToolbarFeatureEnabled("roomCreation")) {
-        let data;
-        const currentPartitionData = _.cloneDeep(getCurrentPartitionData());
-        const currentPolygonData = _.cloneDeep(getCurrentPolygonData());
-        const currentWall = getCurrentWall();
-        const wallIndex = currentPolygonData.walls.findIndex(w => w.uuid == currentWall.uuid);
-        if (currentPartitionData) {
-            data = {
-                polygon: {
-                    uuid: currentPartitionData.uuid,
-                    polygon_json: currentPolygonData
-                },
-                verticePath: currentPolygonData.walls[wallIndex].windows[currentWindow.index].path
-            };
-            partitionHistory.addToHistory(JSON.parse(JSON.stringify(data)));
-        }
-        log.info("all history", partitionHistory.getAllHistory());
+        partitionHistory.addToHistory([..._thisVertexPath]);
     }
-    // partitionHistory.addToHistory(data)
-    // polygonHistory.addToHistory(payload)
-    // toggleUndoRedoButtons(polygonHistory.canUndo(), polygonHistory.canRedo())
 }
 function handlePartitionColiderClickSelected(payload) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -1678,6 +1658,9 @@ function handleDragEnd(payload) {
 function handleVertexPlace(payload) {
     console.log("handleVertexPlace ==>", payload);
     if (isToolbarFeatureEnabled('roomCreation')) {
+        if (payload.path.length <= 2) {
+            setPolygonData(undefined);
+        }
         toggleUndoRedoButtons(partitionHistory.canUndo(), partitionHistory.canRedo());
     }
     if (isToolbarFeatureEnabled('pipe')) {
@@ -1685,6 +1668,7 @@ function handleVertexPlace(payload) {
     }
 }
 function handlePathUpdated(payload) {
+    log.info("handlePathUpdated", payload);
     setVertexPath(payload.path);
     handleVertexPlace(payload);
 }
@@ -2621,6 +2605,7 @@ function handleMarkFloor() {
                         partitionsUUIDs = currentPartitionData.children.map(child => child.uuid);
                         const target = objects.find(obj => partitionsUUIDs.includes(obj.object.object_data.uuid));
                         if (target) {
+                            setSelectedObject(target.object, target.node, target.component, target.type);
                             const polyJson = target.object.object_data.json_data;
                             const updatedPath = polyJson.path.map(path => {
                                 path.y = adjustedHeight;
@@ -2635,6 +2620,7 @@ function handleMarkFloor() {
                     }
                     else if (currentPolygon) {
                         //setSelectedObject(currentPolygon.object,currentPolygon.node,currentPolygon.component,currentPolygon.type)
+                        setSelectedObject(currentPolygon.object, currentPolygon.node, currentPolygon.component, currentPolygon.type);
                         const polyJson = currentPolygon.object.object_data.json_data;
                         const updatedPath = polyJson.path.map(path => {
                             path.y = adjustedHeight;

package/lib/loaders/polydrawerLoader.js

@@ -63,7 +63,9 @@ export class TubeLine {
                 //this.renderGUI();
             }
             if (this.inputs.path.length > 1) {
-                this.renderTubeLine();
+                if (isToolbarFeatureEnabled('pipes')) {
+                    this.renderTubeLine();
+                }
             }
         };
         this.onInputsUpdated = (prevInputs) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "architwin",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "description": "ArchiTwin Library for Matterport",
   "main": "./lib/architwin.js",
   "types": "./lib/architwin.d.ts",