architwin 1.14.12 → 1.14.14

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

@@ -223,6 +223,8 @@ i18n
                 "ConfirmLeaveSessionReminder": "",
                 "InSession": "In Session",
                 "Leave": "Leave",
+                "You are sharing to this person": "You are sharing {space_name} to this person",
+                "Pointer": "Pointer",
                 "WindowsDoors": "Windows and Doors",
                 "AddWindowDoor": "Add Window/Door",
                 "EnterMaterialHere": "Enter window material",
@@ -231,7 +233,9 @@ i18n
                 "ConfirmDeleteWindow": "Are you sure you want to delete this window?",
                 "SuccessWindowDelete": "Succesfully deleted window",
                 "EnterFloorMaterial": "Enter floor material",
-                "EnterWallMaterial": "Enter wall material"
+                "EnterWallMaterial": "Enter wall material",
+                "Window": "Window",
+                "CannotBackDrawingMode": "Cannot go back while drawing mode is active."
             }
         },
         ja: {
@@ -454,6 +458,8 @@ i18n
                 "ConfirmLeaveSessionReminder": "",
                 "InSession": "共有中",
                 "Leave": "終了",
+                "You are sharing to this person": "{space_name} をこの方と共有中です",
+                "Pointer": "ポインター",
                 "WindowsDoors": "建具",
                 "AddWindowDoor": "建具を追加",
                 "EnterMaterialHere": "仕上げ（建具）を入力",
@@ -462,7 +468,9 @@ i18n
                 "ConfirmDeleteWindow": "本当にこの建具を削除しますか？",
                 "SuccessWindowDelete": "建具の削除が完了しました",
                 "EnterFloorMaterial": "仕上げ（床）を入力",
-                "EnterWallMaterial": "仕上げ（壁）を入力"
+                "EnterWallMaterial": "仕上げ（壁）を入力",
+                "Window": "建具",
+                "CannotBackDrawingMode": "描画モードがアクティブな間は戻ることができません。"
             }
         }
     },

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

@@ -183,11 +183,11 @@ export function renderSharingSpaceDetail(user) {
             <div class="at_screen_share_guest_card at_flex at_flex_row at_justify_between at_items_center">
                 <div class="at_flex at_flex_column at_justify_start">
                     <p class="at_bolder at_text_base">${user.name}</p>
-                    <span class="at_subtitle_text">Your are sharing <span class="at_bolder">${_currentSpace === null || _currentSpace === void 0 ? void 0 : _currentSpace.name}</span> to this person</span>
+                    <span class="at_subtitle_text">${i18n.t('You are sharing to this person').replace('{space_name}', (_currentSpace === null || _currentSpace === void 0 ? void 0 : _currentSpace.name) || '')}</span>
                 </div>
                 <div class="at_users_online_indicator"></div>
             </div>
-            <div class="at_bolder at_text_base">Pointer</div>
+            <div class="at_bolder at_text_base">${i18n.t('Pointer')}</div>
             <div class="at_flex at_flex_column at_justify_start">
                 <div class="at_screen_share_pointer_choices">
                     <select id="at_select_screen_share_pointer" name="at_screen_share_pointer">

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

@@ -41,6 +41,9 @@ let inputFloorMaterial;
 let floorMaterial = '';
 let inputWallMaterial;
 let wallMaterial = '';
+let isEditWindow = false;
+let currentEditWindowIndex = null;
+let newlyAddedWindow = null;
 export function renderRoomFormPane() {
     log.info("__@ renderRoomFormPane: ", roomFormMode);
     const element = document.createElement('div');
@@ -224,8 +227,8 @@ export function toggleDrawPartitionButton() {
     }
 }
 export function toggleDrawWindowButton() {
-    var _a;
-    log.info("toggleDrawWindowButton()", getCurrentPolygon());
+    var _a, _b;
+    log.info("toggleDrawWindowButton()", getCurrentPolygon(), _3DXObjects);
     setCurrentPolygon(undefined);
     const addDoorButton = document.getElementById('at-add-window-door-btn');
     if (!isDrawing) {
@@ -238,13 +241,16 @@ export function toggleDrawWindowButton() {
             ${i18n.t('DoneDrawing')}
             <span class="mdi mdi-check-bold"></span>
         `;
+        const objectIndex = _3DXObjects.findIndex(obj => obj.object.id == currentObject.object.id);
+        log.info("objectIndex", objectIndex);
         drawingConfig = {
             lineTypeComponentConfig: {
                 renderPolygonOnAdd: false,
                 drawingMode: drawingMode,
-                targetIndex: ((_a = currentWall.windows) === null || _a === void 0 ? void 0 : _a.length) || 0,
+                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,
                 polygonData: currentPolygonData,
-                targetUUID: currentWall.uuid
+                targetUUID: currentWall.uuid,
+                objectIndex: objectIndex
             }
         };
         log.info("drawingConfig", drawingConfig);
@@ -263,6 +269,19 @@ export function toggleDrawWindowButton() {
         `;
         cancelDraw();
         resetDrawingConfig();
+        setCurrentPolygon(currentObject);
+        let payload;
+        if (currentPartitionData) {
+            payload = {
+                uuid: currentPartitionData.uuid,
+                space_uuid: currentPartitionData.space_uuid,
+                name: currentPartitionData.name,
+                parent_uuid: currentPartitionData.parent_uuid,
+                polygon_json: currentPolygonData
+            };
+        }
+        // Re-render polygon    
+        renderPolygon(payload);
     }
 }
 /**
@@ -832,6 +851,9 @@ function displayWindows(window) {
         wallMaterial = currentWall.material;
         inputWallMaterial.value = currentWall.material;
     }
+    const isEditing = currentEditWindowIndex === window.index;
+    const editDisplay = isEditing ? 'none' : 'flex';
+    const confirmDisplay = isEditing ? 'flex' : 'none';
     element.innerHTML = `
         <div class="at_dropdown_subitem_container">
             <div class="at_subitem_left">
@@ -843,16 +865,16 @@ function displayWindows(window) {
                 <div class="at_distance">${window.area.toFixed(2)} m²</div>   
             </div>
             <div class="at_subitem_right">
-                <span class="mdi mdi-pencil" id="at-edit-window-btn-${window.index}"></span>        
-                <span class="mdi mdi-check" id="at-confirm-edit-window-${window.index}" data-cy="at-confirm-edit-window-${window.index}" style="display: none;"></span> 
+                <span class="mdi mdi-pencil" id="at-edit-window-btn-${window.index}" style="display: ${editDisplay};"></span>        
+                <span class="mdi mdi-check" id="at-confirm-edit-window-${window.index}" data-cy="at-confirm-edit-window-${window.index}" style="display: ${confirmDisplay};"></span> 
                 <span class="mdi mdi-delete-outline" id="at-delete-window-btn-${window.index}"></span>
             </div>
         </div>
-        <div class="at_edit_name" id="at-edit-window-name-${window.index}" data-index="${window.index}" style="display: none;">
+        <div class="at_edit_name" id="at-edit-window-name-${window.index}" data-index="${window.index}" style="display: ${confirmDisplay};">
             <input class="at_edit_name_input" type="text" id="at-edit-window-name-input-${window.index}" data-cy="at-edit-window-name-input-${window.index}" value="${windowName}" placeholder="${i18n.t('EnterNameHere')}">
         </div>
-        <div class="at_edit_material" id="at-edit-window-material-${window.index}" data-index="${window.index}" style="display: none;">
-            <input class="at_edit_material_input" type="text" id="at-edit-window-material-input-${window.index}" data-cy="at-edit-window-material-input-${window.index}"   value="${(_a = window.material) !== null && _a !== void 0 ? _a : ''}"  placeholder="${i18n.t('EnterMaterialHere')}">
+        <div class="at_edit_material" id="at-edit-window-material-${window.index}" data-index="${window.index}" style="display: ${confirmDisplay};">
+            <input class="at_edit_material_input"  type="text" id="at-edit-window-material-input-${window.index}" data-cy="at-edit-window-material-input-${window.index}" value="${(_a = window.material) !== null && _a !== void 0 ? _a : ''}"  placeholder="${i18n.t('EnterMaterialHere')}">
         </div>
     `;
     const nameElement = element.querySelector(`#at-window-name-${window.index}`);
@@ -885,16 +907,28 @@ function setupEditWindow(element, window) {
         return;
     // Show inputs when edit icon is clicked
     editBtn.addEventListener("click", () => {
+        log.info("window", window);
         editNameContainer.style.display = "flex";
         editMaterialContainer.style.display = "flex";
         editBtn.style.display = "none";
         confirmBtn.style.display = "flex";
         inputName.focus();
-        log.info("3DXOBJECT", get3DXObjects());
-        // enableVerticeControls(window.component)
+        isEditWindow = true;
+        currentEditWindowIndex = window.index;
+        // toggleDrawWindowButton()
+        // @ts-ignore
+        const windowComponent = {
+            inputs: {
+                path: window.path
+            }
+        };
+        log.info("currentObject ", currentObject);
+        // setCurrentPolygon(currentObject)
+        // enableVerticeControls(windowComponent)
     });
     // // Confirm edit name and material
     confirmBtn.addEventListener("click", () => {
+        log.info("3dxobject", _3DXObjects);
         // Update window name
         const newName = inputName.value.trim();
         window.name = newName || window.name;
@@ -907,12 +941,28 @@ function setupEditWindow(element, window) {
         confirmBtn.style.display = "none";
         const windowTooltip = document.getElementById(`at-window-name-tooltip-${window.index}`);
         windowTooltip.innerText = `${window.name}`;
+        isEditWindow = false;
+        currentEditWindowIndex = null;
+        currentWall.windows[window.index] = window;
+        const objectIndex = _3DXObjects.findIndex(obj => obj.object.object_id == currentObject.object.object_id);
+        if (_3DXObjects[objectIndex].children) {
+            _3DXObjects[objectIndex].children.map((win) => __awaiter(this, void 0, void 0, function* () {
+                log.info("WIND", win);
+                if (win.index == window.index && win.wallUUID == currentWall.uuid) {
+                    yield disposeModel(win);
+                }
+            }));
+        }
+        // toggleDrawWindowButton()
         saveWallChanges();
     });
 }
 function saveWallChanges() {
+    log.info("currentWall", currentWall);
     updateWallInPolygon(currentWall);
     updatePartitionData();
+    // 
+    log.info("currentObject", currentObject);
     setCurrentPolygon(currentObject);
     renderCurrentPartition();
     // dispatchSpaceEvent(SPACE_EVENTS.PARTITION_EDITED, { data: currentPartitionData });
@@ -940,6 +990,7 @@ function renderCurrentPartition() {
         parent_uuid: currentPartitionData.parent_uuid,
         polygon_json: currentPolygonData
     };
+    log.info("render paylaod", payload);
     renderPolygon(payload);
 }
 function setupDeleteWindow(element, window) {
@@ -968,6 +1019,18 @@ function setupDeleteWindow(element, window) {
                 currentWall = Object.assign(Object.assign({}, wall), { windows: wall.windows.filter((w) => w.index !== window.index) });
                 return currentWall;
             });
+            const objectIndex = _3DXObjects.findIndex(obj => obj.object.object_id == currentObject.object.object_id);
+            if (objectIndex != null) {
+                log.info("objectIndex", objectIndex);
+                if (_3DXObjects[objectIndex].children) {
+                    _3DXObjects[objectIndex].children.map((win) => __awaiter(this, void 0, void 0, function* () {
+                        log.info("WIND", win);
+                        if (win.index == window.index && win.wallUUID == currentWall.uuid) {
+                            yield disposeModel(win);
+                        }
+                    }));
+                }
+            }
             // Save + rerender window
             currentObject.object.object_data.json_data = currentPolygonData;
             saveWallChanges();
@@ -1007,6 +1070,10 @@ function goBackToPartitionList() {
 }
 function goBackToFloorWallList() {
     log.info("goBackToFloorWallList()");
+    if (isDrawing) {
+        notify.error(`${i18n.t('CannotBackDrawingMode')}`);
+        return;
+    }
     const elements = {
         'at-face-title': 'flex',
         'at-window-door-title': 'none',
@@ -1140,8 +1207,8 @@ export function clearPartitionForm() {
     displayElement('at-draw-partition-form-btn', 'block');
     hideElement('at-add-window-door-btn');
     hideElement('at-edit-wall-material');
-    resetDrawingConfig();
     cancelDrawing();
+    resetDrawingConfig();
     const partitionContainer = document.getElementById('at-partition-item-container');
     partitionContainer.style.display = 'none';
     const addDoorButton = document.getElementById('at-add-window-door-btn');
@@ -1165,6 +1232,8 @@ export function clearPartitionForm() {
     previousPartitionData = null;
     isDrawing = false;
     drawingMode = null;
+    currentEditWindowIndex = null;
+    isEditWindow = false;
 }
 /**
  * Cancels the drawing action for a partition.
@@ -1332,12 +1401,6 @@ export function clearTempCurrentPolygon() {
  */
 export function setPolygonData(payload) {
     console.log('setPolygonData()', payload);
-    // let currentObjectData = getCurrentPolygon()
-    // console.log('currentObjectData ', currentObjectData);
-    // if (currentObjectData) {
-    //     currentObjectData.object.object_data.json_data = payload
-    // }
-    // setCurrentPolygon(currentObjectData)
     // Helper function to round numbers to 2 decimals
     function roundToFourDecimals(value) {
         if (typeof value === "number") {
@@ -1436,9 +1499,9 @@ export function setCurrentPartitionData() {
                 displayFaces(currentPolygonData);
             }
             else if (drawingMode === 'window') {
-                log.info("current wall", currentWall);
                 // Update current edit wall display
                 currentWall = currentPolygonData.walls.find(wall => wall.uuid == currentWall.uuid);
+                log.info("current wall", currentWall, currentPolygonData);
                 const faceVertexContainer = document.getElementById('at-face-vertex-container');
                 faceVertexContainer.innerHTML = '';
                 faceVertexContainer.append(displayWall(currentWall));
@@ -1481,7 +1544,7 @@ function updatePartitionDataArray(payload, currentPartitionDataArray) {
     }
     else if (drawingMode === 'window') {
         // Update current partition data
-        currentPartitionData.polygon_json = JSON.stringify(currentPolygonData);
+        currentPartitionData.polygon_json = JSON.stringify(payload.polygon_json);
         // Update current partition data array
         const currentPartitionDataIndex = currentPartitionDataArray.findIndex(partitionData => partitionData.uuid = currentPartitionData.uuid);
         currentPartitionDataArray[currentPartitionDataIndex] = currentPartitionData;

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

@@ -1,4 +1,5 @@
 import { IObjectData, PartitionNode } from "../../../../types";
+import { Vector3 } from "../../../../../bundle/sdk";
 /**
  * Renders and returns the HTML element for the room tree pane.
  * @returns {HTMLElement} The HTML element representing the room tree pane.
@@ -69,8 +70,15 @@ export declare function setFilteredDisplay(type: String): void;
  */
 export declare function updateRoomVisibilityUI(parentId: string, isVisible: boolean): void;
 /**
- * Highlights the selected child element within a partition by toggling CSS classes.
+ * Highlights the selected child element and toggle expand indicator within a partition by toggling CSS classes.
  * @param partitionId - The unique identifier of the partition containing the child elements
  * @param name - The specific name/identifier of the child element to highlight
  */
 export declare function highlightSelectedPartitionChild(partitionId: string, name: string): void;
+export declare function toggeleExpandParitionWallChild(partitionId: string, name: string): void;
+export declare function highlightSelectedWallWindow(wallUuid: string, index: number | string): void;
+export declare function toggleHighlightedPartitionItem(): void;
+export declare function toggleHighlightedWindowItem(): void;
+export declare function calculateMidPoint(coords: Array<{
+    start: Vector3;
+}>): Vector3;