architwin 1.16.3 → 1.16.5

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

@@ -278,7 +278,8 @@ i18n
                 "CannotBackDrawingMode": "Cannot go back while drawing mode is active.",
                 "PleaseOffDrawingMode": "Action cannot be done, please turn off drawing mode.",
                 "IotCategoryRequired": "IoT Category is required",
-                "SuccessUpdatedFloorLevel": "Updated the partition's floor level"
+                "SuccessUpdatedFloorLevel": "Updated the partition's floor level",
+                "DuplicatePartitionName": "This partition name is already used in this room. Please choose a different name."
             }
         },
         ja: {
@@ -551,7 +552,8 @@ i18n
                 "PleaseOffDrawingMode": "操作を行う前に、描画モードをオフにしてください。",
                 "Successfully Deleted Tag": "タグを削除しました",
                 "IotCategoryRequired": "IoTカテゴリは必須です",
-                "SuccessUpdatedFloorLevel": "区画のフロアオフセット値が更新されました"
+                "SuccessUpdatedFloorLevel": "区画のフロアオフセット値が更新されました",
+                "DuplicatePartitionName": "このパーティション名は既にこの部屋で使用されています。別の名前を選択してください。"
             }
         }
     },

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import i18n from '../i18n';
 import { SPACE_EVENTS } from "../../../../types";
-import { batchAddEventListenerByClassName } from "../../../events";
+import { batchAddEventListenerByClassName, notyf } from "../../../events";
 import { startDraw, cancelDraw, disposeModel, _3DXObjects, getCurrentPolygon, dispatchSpaceEvent, enableVerticeControls, setCurrentPolygon, setMeshChildrenMaterialProperty, get3DXObjects, getChildrenOfModel, clearSelectedObject, renderPolygon, setWallBaseHeight, clearWallBaseHeight, setDrawingConfig, resetDrawingConfig, goToPosition, partitionHistory } from '../../../../architwin';
 import { generateUUID, extractUUID } from '../../../../utils';
 import { getCurrentEditRoomData } from './roomTreePane';
@@ -437,9 +437,16 @@ function displayPartitions(partitions) {
         confirmEditPartitionName.style.display = 'none';
         if (newPartitionName) {
             // Update the name of the partition in the array
-            const partitionIndex = currentPartitionDataArray.findIndex(partition => partition.uuid === currentPartitionData.uuid);
-            if (partitionIndex !== -1) {
-                currentPartitionDataArray[partitionIndex].name = newPartitionName;
+            const roomChildren = currentEditRoomData.children;
+            const nameFound = roomChildren.find(child => child.name === newPartitionName && child.uuid != currentPartitionData.uuid);
+            if (nameFound != undefined) {
+                notyf.error(`${i18n.t('DuplicatePartitionName')}`);
+            }
+            else {
+                const partitionIndex = currentPartitionDataArray.findIndex(partition => partition.uuid === currentPartitionData.uuid);
+                if (partitionIndex !== -1) {
+                    currentPartitionDataArray[partitionIndex].name = newPartitionName;
+                }
             }
         }
         else {

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

@@ -352,27 +352,30 @@ function toggleSelectedPartition() {
     }));
     batchAddEventListenerByClassName('at_child_visible_btn', (event) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const target = event.target;
-        const li = target.closest('li');
-        if ((_a = li === null || li === void 0 ? void 0 : li.getAttribute('id')) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes('window')) {
-            event.stopPropagation();
-            handleWindowVisibility(target, true);
+        const btn = event.target;
+        const li = btn.closest('li');
+        const isWindow = (_a = li === null || li === void 0 ? void 0 : li.id) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes('window');
+        const polygonId = btn.id;
+        const wallId = btn.getAttribute('polygon-item-id');
+        event.stopPropagation();
+        if (isWindow) {
+            handleWindowVisibility(btn, true);
+            return;
         }
-        else {
-            const parentVisibleState = yield handlePolygonVisibility(target.id);
-            yield new Promise(resolve => setTimeout(resolve, 0));
-            yield new Promise(resolve => requestAnimationFrame(resolve));
-            const wallId = target.getAttribute('polygon-item-id');
-            const windowItems = document.querySelectorAll(`li.at_window_row_item[wall-id="${wallId}"]`);
-            if (windowItems && windowItems.length > 0) {
-                windowItems.forEach((windowLi) => {
-                    const visibilityBtn = windowLi.querySelector('.at_child_visible_btn');
-                    if (visibilityBtn) {
-                        handleWindowVisibility(visibilityBtn, false, parentVisibleState);
-                    }
-                });
+        const parentVisibleState = yield handlePolygonVisibility(polygonId);
+        // no DOM reads after this point that depend on btn/li meaning
+        yield new Promise(resolve => {
+            requestAnimationFrame(() => resolve());
+        });
+        if (!wallId)
+            return;
+        const windowItems = document.querySelectorAll(`li.at_window_row_item[wall-id="${wallId}"]`);
+        windowItems.forEach((windowLi) => {
+            const visibilityBtn = windowLi.querySelector('.at_child_visible_btn');
+            if (visibilityBtn) {
+                handleWindowVisibility(visibilityBtn, false, parentVisibleState);
             }
-        }
+        });
     }));
     batchAddEventListenerByClassName('at_partition_wall_row_item', (event) => __awaiter(this, void 0, void 0, function* () {
         event.stopPropagation();

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, _thisVertexPath,
+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, setPolygonPath,
 // polygonHistory
  } from "../architwin";
 import { Notyf } from 'notyf';
@@ -2303,7 +2303,9 @@ function handleCancelPartition() {
                 if (!roomNode.children)
                     return roomNode;
                 return Object.assign(Object.assign({}, roomNode), { children: roomNode.children.filter((child) => child.uuid !== partition.uuid) });
-            }).filter((roomNode) => !roomNode.children || roomNode.children.length > 0);
+            });
+            // Commented this out to fix disappearing issue of existing empty room #16173
+            // .filter((roomNode) => !roomNode.children || roomNode.children.length > 0);
             log.info("filteredRoomNodes", filteredRoomNodes);
             // set node to update room tree
             yield setSpacePartitionNodes(filteredRoomNodes);
@@ -2353,6 +2355,7 @@ function handleCancelPartition() {
                                     return point;
                                 });
                                 log.info("polyJson with lastFloorLevel", polyJson);
+                                setPolygonPath(obj.object.id, polyJson.path);
                             }
                             const payload = {
                                 uuid: currentPartition.uuid,
@@ -2635,7 +2638,7 @@ function handleMarkFloor() {
                                 return path;
                             });
                             renderPolygon(updatedPath);
-                            notyf.success("Updated the current partition's floor level");
+                            notyf.success(`${i18n.t('SuccessUpdatedFloorLevel')}`);
                         }
                         else {
                             log.warn("No matching uuid for the polygon");

package/lib/loaders/polydrawerLoader.js

@@ -774,7 +774,9 @@ export class BufferGeometry {
                         }, []);
                         //this.renderWindows(windowsPolyData)
                         for (let i = 0; i < polyData.walls.length; i++) {
-                            this.renderWindows(polyData.walls[i].windows);
+                            if (!walls[i].options.is_deleted) {
+                                this.renderWindows(polyData.walls[i].windows);
+                            }
                         }
                     }
                 }
@@ -1052,7 +1054,12 @@ export class BufferGeometry {
             const wallCanvas = this.createLabelCanvas(`${i18n.t('Wall')} ${i + 1}${wallMaterial ? '_' + wallMaterial : ' (' + i18n.t('Area') + ')'}: ${wallArea.toFixed(2)}m²`);
             // const wallCanvas = this.createLabelCanvas(`${i18n.t('Wall')} ${i+1}_Wood: ${wallArea.toFixed(2)}m²`)
             // Create floor edge label
-            const floorCanvas = this.createLabelCanvas(`${i18n.t('Wall')} ${i + 1} (${i18n.t('Edge')}): ${wallLength.toFixed(2)}m`);
+            let floorCanvas;
+            if (metadata === null || metadata === void 0 ? void 0 : metadata.walls) {
+                if (!metadata.walls[i].options.is_deleted) {
+                    floorCanvas = this.createLabelCanvas(`${i18n.t('Wall')} ${i + 1} (${i18n.t('Edge')}): ${wallLength.toFixed(2)}m`);
+                }
+            }
             const midPoint = {
                 x: (startPoint.x + endPoint.x) / 2,
                 y: (startPoint.y + endPoint.y) / 2,

package/package.json

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