architwin 1.16.1 → 1.16.3

package/lib/atwinui/components/toolbar/i18n.js

@@ -277,7 +277,8 @@ i18n
                 "Window": "Window",
                 "CannotBackDrawingMode": "Cannot go back while drawing mode is active.",
                 "PleaseOffDrawingMode": "Action cannot be done, please turn off drawing mode.",
-                "IotCategoryRequired": "IoT Category is required"
+                "IotCategoryRequired": "IoT Category is required",
+                "SuccessUpdatedFloorLevel": "Updated the partition's floor level"
             }
         },
         ja: {
@@ -549,7 +550,8 @@ i18n
                 "CannotBackDrawingMode": "描画モードがアクティブな間は戻ることができません。",
                 "PleaseOffDrawingMode": "操作を行う前に、描画モードをオフにしてください。",
                 "Successfully Deleted Tag": "タグを削除しました",
-                "IotCategoryRequired": "IoTカテゴリは必須です"
+                "IotCategoryRequired": "IoTカテゴリは必須です",
+                "SuccessUpdatedFloorLevel": "区画のフロアオフセット値が更新されました"
             }
         }
     },

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

@@ -1,5 +1,4 @@
 import { FORM_MODE, PartitionNode, PolygonData, WallPolyData, IObjectData } from "../../../../types";
-export declare let isEditWindow: boolean;
 export declare function renderRoomFormPane(): HTMLDivElement;
 /**
  * Toggles the state of the partition drawing functionality.
@@ -31,6 +30,7 @@ export declare function displayPartitionFormMode(): void;
  */
 export declare function handlePartitionRowEditBtnClickEvent(partitions: Array<PartitionNode>, targetElement: HTMLElement): void;
 export declare function displayWall(wall: WallPolyData): HTMLElement;
+export declare function setDrawConfig(drawMode: 'window' | 'partition'): void;
 /**
  * Clears the partition form by resetting UI elements and internal data.
  * - Navigates back to the partition list view.
@@ -123,3 +123,6 @@ export declare function handlePartitionWallEditBtn(wallUuid: string): Promise<vo
 export declare function getTempCurrentRoomEditData(): Array<PartitionNode>;
 export declare function setTempCurrentRoomEditData(roomEditData: Array<PartitionNode>): void;
 export declare function getCurrentWall(): WallPolyData;
+export declare function getIsEditWindow(): boolean;
+export declare function setIsEditWindow(value: boolean): void;
+export declare function setCurrentEditWindowIndex(value: number): void;

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

@@ -44,7 +44,7 @@ let wallMaterial = '';
 let currentEditWindowIndex = null;
 let currentWindowIndex = null;
 let tempCurrentEditRoom = null;
-export let isEditWindow = false;
+let isEditWindow = false;
 export function renderRoomFormPane() {
     log.info("__@ renderRoomFormPane: ", roomFormMode);
     const element = document.createElement('div');
@@ -939,18 +939,7 @@ function setupEditWindow(element, window) {
         currentEditWindowIndex = window.index;
         drawingMode = 'window';
         toggleDrawWindowButton();
-        log.info("currentObject ", currentObject);
-        setCurrentPolygon(currentObject);
-        const drawConfig = {
-            lineTypeComponentConfig: {
-                renderPolygonOnAdd: false,
-                drawingMode: drawingMode,
-                polygonData: currentObject.object.object_data.json_data,
-                targetUUID: currentWall.uuid,
-                targetIndex: currentEditWindowIndex
-            }
-        };
-        setDrawingConfig(drawConfig);
+        setDrawConfig('window');
         // @ts-ignore
         const windowComponent = {
             inputs: {
@@ -997,6 +986,20 @@ function setupEditWindow(element, window) {
         toggleUndoRedoButtons(false, false);
     });
 }
+export function setDrawConfig(drawMode) {
+    log.info("currentObject ", currentObject);
+    setCurrentPolygon(currentObject);
+    const drawConfig = {
+        lineTypeComponentConfig: {
+            renderPolygonOnAdd: false,
+            drawingMode: drawMode,
+            polygonData: currentObject.object.object_data.json_data,
+            targetUUID: currentWall.uuid,
+            targetIndex: currentEditWindowIndex
+        }
+    };
+    setDrawingConfig(drawConfig);
+}
 function saveWallChanges() {
     log.info("currentWall", currentWall);
     updateWallInPolygon(currentWall);
@@ -1608,7 +1611,7 @@ function updatePartitionDataArray(payload, currentPartitionDataArray) {
     else if (drawingMode === 'window') {
         log.info("currentPartitionData", currentPartitionData);
         // Update current partition data
-        currentPartitionData.polygon_json = JSON.stringify(payload.polygon_json);
+        currentPartitionData.polygon_json = payload.polygon_json;
         // Update current partition data array
         const currentPartitionDataIndex = currentPartitionDataArray.findIndex(partitionData => partitionData.uuid == currentPartitionData.uuid);
         currentPartitionDataArray[currentPartitionDataIndex] = currentPartitionData;
@@ -1822,3 +1825,12 @@ export function setTempCurrentRoomEditData(roomEditData) {
 export function getCurrentWall() {
     return currentWall;
 }
+export function getIsEditWindow() {
+    return isEditWindow;
+}
+export function setIsEditWindow(value) {
+    isEditWindow = value;
+}
+export function setCurrentEditWindowIndex(value) {
+    currentEditWindowIndex = value;
+}

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

@@ -35,6 +35,11 @@ export declare function updateParentVisibility(isPartition: boolean, currentBtn:
  * @returns An array of room nodes.
  */
 export declare function getRoomData(): PartitionNode[];
+/**
+ * Sets the current room data being edited based on the provided ID.
+ * @param id - The unique identifier of the room to be edited.
+ */
+export declare function setCurrentEditRoomData(id: string): void;
 /**
  * Retrieves the current room data being edited.
  * @returns The current room node being edited.

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

@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { getBundleVersion, extractUUID } from "../../../../utils";
 import { batchAddEventListenerByClassName, handleDeletePartition, handlePartitionVisibility, handlePolygonVisibility, handleWindowVisibility, toggleDisplayPane } from "../../../events";
 import i18n from "../i18n";
-import { getCurrentPolygonData, handlePartitionRowEditBtnClickEvent, handlePartitionWallEditBtn, setPartitionFormMode } from "./roomFormPane";
+import { getCurrentPolygonData, handlePartitionRowEditBtnClickEvent, handlePartitionWallEditBtn, setCurrentEditWindowIndex, setDrawConfig, setDrawingMode, setIsEditWindow, setPartitionFormMode } from "./roomFormPane";
 import { SPACE_EVENTS } from "../../../../types";
-import { _3DXObjects, dispatchSpaceEvent, getChildrenOfModel, goToModel, goToPosition, renderPolygon, setSelectedObject } from "../../../../architwin";
+import { _3DXObjects, dispatchSpaceEvent, enableVerticeControls, getChildrenOfModel, goToModel, goToPosition, renderPolygon, setSelectedObject } from "../../../../architwin";
 import log from 'loglevel';
 import { getShortcutTooltipHTML } from "../static/common";
 let roomDataArray = [];
@@ -550,7 +550,11 @@ export function getRoomData() {
  * Sets the current room data being edited based on the provided ID.
  * @param id - The unique identifier of the room to be edited.
  */
-function setCurrentEditRoomData(id) {
+export function setCurrentEditRoomData(id) {
+    if (!id) {
+        currentEditRoomData = null;
+        return;
+    }
     const roomUUID = extractUUID(id);
     currentEditRoomData = getRoomData().find(room => room.uuid === roomUUID);
 }
@@ -773,11 +777,13 @@ function displayWindows(wall, partitionId, parentId) {
             if (!window.options.is_deleted) {
                 const windowCoords = JSON.stringify(window.edges);
                 const windowCoordsEncoded = btoa(windowCoords);
+                const windowPath = JSON.stringify(window.path);
+                const windowPathEncoded = btoa(windowPath);
                 itemsHTML += `
                 <li window-coords="${windowCoordsEncoded}" partition-id="${partitionId}" id="window-${wall.uuid}-${window.index}" wall-id="${wall.uuid}" window-name="${window.name}" window-index="${window.index}" class="at_window_row_item">
                     <div>${window.name}</div>
                     <div>
-                        <span window-coords="${windowCoordsEncoded}" partition-id="${partitionId}" partition-parent-uuid="${parentId}" polygon-item-id="${wall.uuid}" index="${window.index}"  class="mdi mdi-pencil at_window_edit_btn"></span>
+                        <span window-path="${windowPathEncoded}" window-coords="${windowCoordsEncoded}" partition-id="${partitionId}" partition-parent-uuid="${parentId}" polygon-item-id="${wall.uuid}" index="${window.index}"  class="mdi mdi-pencil at_window_edit_btn"></span>
                         <span id="${window.name}" partition-id="${partitionId}" partition-parent-uuid="${parentId}" polygon-item-id="${wall.uuid}" class="mdi ${window.options.is_visible ? 'mdi-eye ' : 'mdi-eye-off'} at_child_visible_btn"></span>
                     </div>
                 </li>
@@ -818,6 +824,9 @@ function openPartitionChildEdit(targetElement, parentRoomElement, parentRoomUuid
 function openWindowEdit(targetElement, parentRoomElement, parentRoomUuid, partitionId) {
     return __awaiter(this, void 0, void 0, function* () {
         const index = targetElement.getAttribute('index');
+        const windowPathEncoded = targetElement.getAttribute('window-path');
+        const windowPathJSON = atob(windowPathEncoded);
+        const windowPath = JSON.parse(windowPathJSON);
         yield openPartitionChildEdit(targetElement, parentRoomElement, parentRoomUuid, partitionId, true);
         yield new Promise(resolve => requestAnimationFrame(resolve));
         const editBtn = document.querySelector(`#at-edit-window-btn-${index}`);
@@ -834,6 +843,17 @@ function openWindowEdit(targetElement, parentRoomElement, parentRoomUuid, partit
             editBtn.style.display = "none";
             confirmBtn.style.display = "flex";
             inputName.focus();
+            setIsEditWindow(true);
+            setCurrentEditWindowIndex(Number(index));
+            setDrawConfig('window');
+            // @ts-ignore
+            const windowComponent = {
+                inputs: {
+                    path: windowPath
+                }
+            };
+            enableVerticeControls(windowComponent);
+            setDrawingMode(true);
         }
     });
 }

package/lib/atwinui/components/toolbar/tagListPane.js

@@ -414,7 +414,7 @@ export function renderTagRow(tag, tagIconUrl, tag_type = null) {
         <td>
             <div class="at_table_button_row">
                 <span class="mdi mdi-eye at_visibility_tag_btn ${isGenerallyDisabled ? 'at_disabled' : ''}" id="at-visibility-tag-${tag.id}" data-cy="at-visibility-tag-${tag.id}" tag-id="${tag.id}" tag-id="${tag.id}"></span>
-                <span class="mdi mdi-pencil at_edit_tag_btn ${isGenerallyDisabled ? 'at_disabled' : ''}" id="at-edit-tag-${tag.id}" data-cy="at-edit-tag-${tag.id}" tag-id="${tag.id}" target-pane="at-tag-form-pane"></span>
+                <span class="mdi mdi-pencil at_edit_tag_btn ${isGenerallyDisabled ? 'at_disabled' : ''}" id="at-edit-tag-${tag.id}" data-cy="at-edit-tag-${tag.id}" tag-id="${tag.id}" target-pane="${isIoT ? 'at-tag-iot-form-pane' : 'at-tag-form-pane'}"></span>
                 <span class="mdi mdi-content-copy at_copy_tag_btn ${isTagReadOnly ? 'at_disabled' : ''} id="at-edit-tag-${tag.id}""  id="at-copy-tag-${tag.id}" data-cy="at-copy-tag-${tag.id}" tag-id="${tag.id}"></span>
                 <span class="mdi mdi-message at_message_tag_btn ${isIoT ? 'at_hidden' : ''}" id="at-message-tag-${tag.id}"  data-cy="at-message-tag-${tag.id}" tag-id="${tag.id}" target-pane="at-tag-messaging-pane"></span>
                 <span class="mdi mdi-map-marker at_locate_tag_btn ${!isIoT ? 'at_hidden' : ''} ${isIotTagReadOnly ? 'at_disabled' : ''}" id="at-relocate-tag-${tag.id}"  data-cy="at-relocate-tag-${tag.id}" tag-id="${tag.id}"></span>

package/lib/atwinui/events.js

@@ -25,7 +25,7 @@ import { isValidUrl, debounce, isElementVisible, extractUUID, showLoader, isVec3
 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 { getCurrentEditRoomData, displayRoomTree, updatePartitionVisibilityUI, getSelectedPartitionId, updatePolygonVisibilityData, toggleVisibilityState, setFilteredDisplay, updateRoomVisibilityUI, highlightSelectedPartitionChild, highlightSelectedWindow, getRoomData, setCurrentEditRoomData } from "./components/toolbar/spacePartition/roomTreePane";
 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";
@@ -65,6 +65,7 @@ let _currentSandboxId = undefined;
 let isNotyfExecuted = false; // flag for notification
 let pipeColor = "";
 let allTagsVisible = true;
+let lastFloorLevel = undefined;
 function batchAddEventListenerByClassName(className, callback) {
     if (className) {
         const elements = document.querySelectorAll(`.${className}`);
@@ -2241,6 +2242,8 @@ function handleSavePartition() {
         clearSelectedObject();
         clearFloorBaseHeight();
         setTempCurrentRoomEditData(null);
+        setCurrentEditRoomData(null);
+        lastFloorLevel = undefined;
         notyf.success(`${i18n.t('SuccessRoomSaved')}`);
     });
 }
@@ -2342,6 +2345,15 @@ function handleCancelPartition() {
                             obj.children = [];
                         }
                         if (polyJson && polyJson.path) {
+                            log.info("lastFloorLevel before", lastFloorLevel);
+                            if (lastFloorLevel) {
+                                setSelectedObject(obj.object, obj.node, obj.component, obj.type);
+                                polyJson.path = polyJson.path.map(point => {
+                                    point.y = lastFloorLevel;
+                                    return point;
+                                });
+                                log.info("polyJson with lastFloorLevel", polyJson);
+                            }
                             const payload = {
                                 uuid: currentPartition.uuid,
                                 polygon_json: polyJson
@@ -2377,7 +2389,9 @@ function handleCancelPartition() {
         clearPartitionForm();
         clearSelectedObject();
         clearFloorBaseHeight();
+        setCurrentEditRoomData(null);
         toggleDisplayPane('at-cancel-room-form-btn');
+        lastFloorLevel = undefined;
     }));
 }
 /**
@@ -2535,23 +2549,26 @@ function handleFloorLevelInputChange() {
             notyf.success(`${i18n.t('SuccessBaseHeight')}`);
             const objects = get3DXObjects();
             const latestObj = objects[objects.length - 1];
-            const currentPartitionData = getCurrentEditRoomData();
+            const currentRoomData = getCurrentEditRoomData();
             const currentPolygon = getCurrentPolygon();
             log.info("latestObj ", latestObj);
-            if (currentPartitionData) {
+            if (currentRoomData) {
                 let partitionsUUIDs = [];
-                partitionsUUIDs = currentPartitionData.children.map(child => child.uuid);
+                partitionsUUIDs = currentRoomData.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 adjustedFloorBaseHeight = getFloorBaseHeight();
                     const polyJson = target.object.object_data.json_data;
-                    const updatedPath = polyJson.path.map(path => {
+                    const formMode = getPartitionFormMode();
+                    if (formMode == "EDIT" /* FORM_MODE.EDIT */)
+                        lastFloorLevel = polyJson.path[0].y;
+                    const updatedPath = polyJson.path.map((path, index) => {
                         path.y = adjustedFloorBaseHeight;
                         return path;
                     });
                     renderPolygon(updatedPath);
-                    notyf.success("Updated the partition's floor level");
+                    notyf.success(`${i18n.t('SuccessUpdatedFloorLevel')}`);
                 }
                 else {
                     log.error("No matching uuid for the polygon");
@@ -2561,12 +2578,15 @@ function handleFloorLevelInputChange() {
                 setSelectedObject(currentPolygon.object, currentPolygon.node, currentPolygon.component, currentPolygon.type);
                 const adjustedFloorBaseHeight = getFloorBaseHeight();
                 const polyJson = latestObj.object.object_data.json_data;
-                const updatedPath = polyJson.path.map(path => {
+                const formMode = getPartitionFormMode();
+                if (formMode == "EDIT" /* FORM_MODE.EDIT */)
+                    lastFloorLevel = polyJson.path[0].y;
+                const updatedPath = polyJson.path.map((path, index) => {
                     path.y = adjustedFloorBaseHeight;
                     return path;
                 });
                 renderPolygon(updatedPath);
-                notyf.success("Updated the partition's floor level");
+                notyf.success(`${i18n.t('SuccessUpdatedFloorLevel')}`);
             }
             else {
                 log.warn("currentPartitionData and latestObj value is undefined or its type is not valid");
@@ -2588,7 +2608,7 @@ function handleMarkFloor() {
             });
             yield getTargetPosition((coord) => {
                 const objects = get3DXObjects();
-                const currentPartitionData = getCurrentEditRoomData();
+                const currentRoomData = getCurrentEditRoomData();
                 const currentPolygon = getCurrentPolygon();
                 log.info("coord ", coord);
                 if (coord.y < -1) {
@@ -2600,14 +2620,17 @@ function handleMarkFloor() {
                 if (Math.sign(coord.y) == 1 || coord.y > -0.9) {
                     setFloorBaseHeight(coord.y);
                     const adjustedHeight = getFloorBaseHeight();
-                    if (currentPartitionData) {
+                    if (currentRoomData) {
                         let partitionsUUIDs = [];
-                        partitionsUUIDs = currentPartitionData.children.map(child => child.uuid);
+                        partitionsUUIDs = currentRoomData.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 => {
+                            const formMode = getPartitionFormMode();
+                            if (formMode == "EDIT" /* FORM_MODE.EDIT */)
+                                lastFloorLevel = polyJson.path[0].y;
+                            const updatedPath = polyJson.path.map((path, index) => {
                                 path.y = adjustedHeight;
                                 return path;
                             });
@@ -2622,12 +2645,15 @@ function handleMarkFloor() {
                         //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 => {
+                        const formMode = getPartitionFormMode();
+                        if (formMode == "EDIT" /* FORM_MODE.EDIT */)
+                            lastFloorLevel = polyJson.path[0].y;
+                        const updatedPath = polyJson.path.map((path, index) => {
                             path.y = adjustedHeight;
                             return path;
                         });
                         renderPolygon(updatedPath);
-                        notyf.success("Updated the partition's floor level");
+                        notyf.success(`${i18n.t('SuccessUpdatedFloorLevel')}`);
                     }
                     else {
                         log.warn("currentPolygon is undefined");

package/lib/loaders/planeGeometry2.js

@@ -539,10 +539,10 @@ class PlaneVideo {
                 });
                 // socketEmit({socketEvent: IO_SPACE_EVENTS.MEDIA_SCREEN, data: {event: IO_MEDIASCREEN_EVENTS.PAUSE, mediaViewerId: this.inputs.mediaViewerId }})
             }
-            else if (this.audio === 'unmuted' && eventData['collider'].name == 'muteBtn') {
+            else if (this.audio === 'unmuted' && eventData['collider'].name == 'unmuteBtn') {
                 this.planeElement.muted = true;
-                this.muteButtonModel.visible = false;
-                this.unmuteButtonModel.visible = true;
+                this.muteButtonModel.visible = true;
+                this.unmuteButtonModel.visible = false;
                 this.audio = 'muted';
                 const { duration, currentTime } = getVideoMetadata(this.planeElement);
                 dispatchSpaceEvent(SPACE_EVENTS.MEDIA_MUTE, {
@@ -555,10 +555,10 @@ class PlaneVideo {
                 });
                 // socketEmit({socketEvent: IO_SPACE_EVENTS.MEDIA_SCREEN, data: {event: IO_MEDIASCREEN_EVENTS.MUTE, mediaViewerId: this.inputs.mediaViewerId }})
             }
-            else if (this.audio === 'muted' && eventData['collider'].name == 'unmuteBtn') {
+            else if (this.audio === 'muted' && eventData['collider'].name == 'muteBtn') {
                 this.planeElement.muted = false;
-                this.muteButtonModel.visible = true;
-                this.unmuteButtonModel.visible = false;
+                this.muteButtonModel.visible = false;
+                this.unmuteButtonModel.visible = true;
                 this.audio = 'unmuted';
                 const { duration, currentTime } = getVideoMetadata(this.planeElement);
                 dispatchSpaceEvent(SPACE_EVENTS.MEDIA_UNMUTE, {
@@ -692,6 +692,7 @@ class PlaneVideo {
             transparent: true,
             alphaTest: 0.5
         }));
+        this.muteButtonModel.visible = false;
         this.muteButtonModel.name = "muteBtn";
         this.mesh.add(this.muteButtonModel);
     }
@@ -707,7 +708,6 @@ class PlaneVideo {
             transparent: true,
             alphaTest: 0.5
         }));
-        this.unmuteButtonModel.visible = false;
         this.unmuteButtonModel.name = "unmuteBtn";
         this.mesh.add(this.unmuteButtonModel);
     }

package/package.json

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