architwin 1.15.4 → 1.15.5

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

@@ -387,14 +387,14 @@ i18n
                 "SuccessPartitionDelete": "削除しました",
                 "NoPartitionDeleted": "削除できる区画がありません",
                 "Saving": "保存",
-                "DeletePartition": "パーティション削除",
+                "DeletePartition": "区画削除",
                 "ModifyPartition": "パーティションの変更",
                 "InvalidNaN": "値が不正です。正しい数値を入力してくさい。",
                 "CannotPlaceInArea": "ここには設定できません。位置を変えて試してください。",
                 "SuccessWallHeight": "壁の高さが正常に更新されました",
                 "Edge": "辺長",
                 "Area": "面積",
-                "DeleteWall": "ウォール削除",
+                "DeleteWall": "壁削除",
                 "SuccessWallDelete": "削除しました",
                 "WarnLowFloor": "Tマークされたエリアは、スペースの床よりも低い場合があります",
                 "Settings": "BIM/CAD設定",

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

@@ -13,7 +13,7 @@ export function renderPreviewModal() {
     element.setAttribute('id', 'at-preview-modal-overlay');
     element.setAttribute('data-cy', 'at-preview-modal-overlay');
     element.innerHTML = `
-        <div class="at_preview_modal">
+        <div class="at_preview_modal" id="at-preview-modal">
             <div class="at_preview_modal-header">
                 <h2 class="at_preview_modal-title" id="at-preview-modal-content-heading" data-cy="at-preview-modal-content-heading"></h2>
                 <button class="at_preview_modal-close-btn" data-cy="at-preview-modal-close-btn">&times;</button>
@@ -22,6 +22,14 @@ export function renderPreviewModal() {
                 <div class="at_preview_modal-content" id="at-preview-modal-content-subheading" data-cy="at-preview-modal-content-subheading">
                 </div>
             </div>
+            <div class="at_preview_modal-resize-handle at_preview_modal-resize-handle--top" data-resize-direction="top"></div>
+            <div class="at_preview_modal-resize-handle at_preview_modal-resize-handle--right" data-resize-direction="right"></div>
+            <div class="at_preview_modal-resize-handle at_preview_modal-resize-handle--bottom" data-resize-direction="bottom"></div>
+            <div class="at_preview_modal-resize-handle at_preview_modal-resize-handle--left" data-resize-direction="left"></div>
+            <div class="at_preview_modal-resize-handle at_preview_modal-resize-handle--top-left" data-resize-direction="top-left"></div>
+            <div class="at_preview_modal-resize-handle at_preview_modal-resize-handle--top-right" data-resize-direction="top-right"></div>
+            <div class="at_preview_modal-resize-handle at_preview_modal-resize-handle--bottom-left" data-resize-direction="bottom-left"></div>
+            <div class="at_preview_modal-resize-handle at_preview_modal-resize-handle--bottom-right" data-resize-direction="bottom-right"></div>
         </div>
     `;
     document.body.appendChild(element);

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

@@ -1,4 +1,4 @@
-import { FORM_MODE, PartitionNode, PolygonData, IObjectData } from "../../../../types";
+import { FORM_MODE, PartitionNode, PolygonData, WallPolyData, IObjectData } from "../../../../types";
 export declare let isEditWindow: boolean;
 export declare function renderRoomFormPane(): HTMLDivElement;
 /**
@@ -30,6 +30,7 @@ export declare function displayPartitionFormMode(): void;
  * @param event - The click event from the edit button, used to identify which partition to edit
  */
 export declare function handlePartitionRowEditBtnClickEvent(partitions: Array<PartitionNode>, targetElement: HTMLElement): void;
+export declare function displayWall(wall: WallPolyData): HTMLElement;
 /**
  * Clears the partition form by resetting UI elements and internal data.
  * - Navigates back to the partition list view.
@@ -103,6 +104,7 @@ export declare function getCurrentPolygonData(): PolygonData;
  * partition with its corresponding UUID, space UUID, and polygon data.
  */
 export declare function setCurrentPartitionData(): Promise<void>;
+export declare function removeWindow(index?: number): void;
 export declare function getCurrentPartitionData(): PartitionNode;
 export declare function getNewlyAddedPartition(): Array<PartitionNode>;
 export declare function getDeletedSavedPartitionArray(): Array<PartitionNode>;

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

@@ -10,7 +10,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 { startDraw, cancelDraw, disposeModel, _3DXObjects, getCurrentPolygon, dispatchSpaceEvent, enableVerticeControls, setCurrentPolygon, setMeshChildrenMaterialProperty, get3DXObjects, getChildrenOfModel, clearSelectedObject, renderPolygon, addUndoDrawActions, setWallBaseHeight, clearWallBaseHeight, setDrawingConfig, resetDrawingConfig, goToPosition, clearFloorBaseHeight } from '../../../../architwin';
+import { startDraw, cancelDraw, disposeModel, _3DXObjects, getCurrentPolygon, dispatchSpaceEvent, enableVerticeControls, setCurrentPolygon, setMeshChildrenMaterialProperty, get3DXObjects, getChildrenOfModel, clearSelectedObject, renderPolygon, addUndoDrawActions, setWallBaseHeight, clearWallBaseHeight, setDrawingConfig, resetDrawingConfig, goToPosition, clearFloorBaseHeight, clearDrawActionHistory } from '../../../../architwin';
 import { generateUUID, extractUUID } from '../../../../utils';
 import { getCurrentEditRoomData } from './roomTreePane';
 import { toggleModal, setModalAction } from "../modal";
@@ -798,7 +798,7 @@ function displayFaces(polygon) {
         wallConfirmMaterial.style.display = "inline-flex";
     });
 }
-function displayWall(wall) {
+export function displayWall(wall) {
     log.info("displayWall()", wall);
     // Extract the wall name from the format "_wall-{number}" using regex
     const match = wall.name.match(/wall-(\d+)$/);
@@ -1161,7 +1161,7 @@ function displayFloor(floor, walls, floorModel) {
                 <span class="mdi mdi-chevron-up" id="at-expand-btn-${floor.uuid}" data-cy="at-expand-btn-${floor.uuid}" model-id="${floorModelUUID}"></span>
             </div>
             <div class="at_subitem_right">
-                <span class="mdi mdi-delete-outline"></span>
+                <!-- <span class="mdi mdi-delete-outline"></span> -->
             </div>
         </div>
     
@@ -1522,7 +1522,7 @@ export function setCurrentPartitionData() {
                 if (drawingMode === 'partition') {
                     displayFaceLists();
                     currentObject = currentObjectData;
-                    log.info("JAMES currentObject", currentObject);
+                    log.info("currentObject", currentObject);
                 }
             }, 50); // Check every 50ms
         });
@@ -1628,10 +1628,6 @@ function onModeDetectFloorInput(event) {
         floorConfirmMaterial.style.display = "none";
     }
 }
-function setFloorMaterial(material) {
-    console.log('setFloorMaterial()', material);
-    floorMaterial = material;
-}
 function onModeDetectWallInput(event) {
     console.log('onModeDetectWallInput()', event);
     const target = event.target;
@@ -1648,6 +1644,21 @@ function onModeDetectWallInput(event) {
         wallConfirmMaterial.style.display = "none";
     }
 }
+export function removeWindow(index = -1) {
+    if (index <= -1) {
+        currentWall.windows.pop();
+    }
+    else {
+        currentWall.windows.splice(index, 1);
+    }
+    const faceVertexContainer = document.getElementById('at-face-vertex-container');
+    faceVertexContainer.innerHTML = '';
+    faceVertexContainer.append(displayWall(currentWall));
+}
+function setFloorMaterial(material) {
+    console.log('setFloorMaterial()', material);
+    floorMaterial = material;
+}
 function setWallMaterial(material) {
     console.log('setWallMaterial()');
     wallMaterial = material;
@@ -1774,6 +1785,7 @@ export function handlePartitionWallEditBtn(wallUuid) {
         currentPolygonData = JSON.parse(currentPartitionData.polygon_json);
         setDrawingMode(false);
         cancelDrawing();
+        clearDrawActionHistory();
     });
 }
 export function getTempCurrentRoomEditData() {

package/lib/atwinui/events.js

@@ -530,6 +530,7 @@ function setupIndividualEventListeners() {
     handlePipeForm();
     handlePipeList();
     handleResponsiveChanges();
+    handlePreviewModalResize();
 }
 //================ OBJECT EVENT HANDLERS ===============//s
 function handleResponsiveChanges() {
@@ -1586,7 +1587,7 @@ function handleDragEnd(payload) {
     setCurrentTransformationValues(transformValues);
 }
 function handleDrawHistory(payload) {
-    console.log("payload", payload);
+    console.log("handleDrawHistory", payload);
     const undoCount = (payload.undoDrawActions).length;
     const redoCount = (payload.redoDrawActions).length;
     if (undoCount == 0) {
@@ -3896,6 +3897,94 @@ function clearActivePane() {
         paneElement.style.display = 'none';
     }
 }
+function handlePreviewModalResize() {
+    const modal = document.getElementById('at-preview-modal');
+    const resizeHandles = document.querySelectorAll('.at_preview_modal-resize-handle');
+    if (!modal || !resizeHandles.length)
+        return;
+    let isResizing = false;
+    let currentHandle = null;
+    let startX = 0;
+    let startY = 0;
+    let startWidth = 0;
+    let startHeight = 0;
+    let startLeft = 0;
+    let startTop = 0;
+    const minWidth = 400;
+    const minHeight = 300;
+    const maxWidth = window.innerWidth * 0.95;
+    const maxHeight = window.innerHeight * 0.95;
+    resizeHandles.forEach((handle) => {
+        handle.addEventListener('mousedown', (e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            isResizing = true;
+            currentHandle = handle;
+            startX = e.clientX;
+            startY = e.clientY;
+            const rect = modal.getBoundingClientRect();
+            startWidth = rect.width;
+            startHeight = rect.height;
+            startLeft = rect.left;
+            startTop = rect.top;
+            document.body.style.cursor = window.getComputedStyle(handle).cursor;
+            document.body.style.userSelect = 'none';
+        });
+    });
+    document.addEventListener('mousemove', (e) => {
+        if (!isResizing || !currentHandle)
+            return;
+        const direction = currentHandle.getAttribute('data-resize-direction');
+        const deltaX = e.clientX - startX;
+        const deltaY = e.clientY - startY;
+        let newWidth = startWidth;
+        let newHeight = startHeight;
+        let newLeft = startLeft;
+        let newTop = startTop;
+        // Handle horizontal resizing
+        if (direction === null || direction === void 0 ? void 0 : direction.includes('right')) {
+            newWidth = Math.max(minWidth, Math.min(maxWidth, startWidth + deltaX));
+        }
+        else if (direction === null || direction === void 0 ? void 0 : direction.includes('left')) {
+            const potentialWidth = startWidth - deltaX;
+            if (potentialWidth >= minWidth && potentialWidth <= maxWidth) {
+                newWidth = potentialWidth;
+                newLeft = startLeft + deltaX;
+            }
+        }
+        // Handle vertical resizing
+        if (direction === null || direction === void 0 ? void 0 : direction.includes('bottom')) {
+            newHeight = Math.max(minHeight, Math.min(maxHeight, startHeight + deltaY));
+        }
+        else if (direction === null || direction === void 0 ? void 0 : direction.includes('top')) {
+            const potentialHeight = startHeight - deltaY;
+            if (potentialHeight >= minHeight && potentialHeight <= maxHeight) {
+                newHeight = potentialHeight;
+                newTop = startTop + deltaY;
+            }
+        }
+        // Apply new dimensions
+        modal.style.width = `${newWidth}px`;
+        modal.style.height = `${newHeight}px`;
+        modal.style.maxWidth = `${newWidth}px`;
+        modal.style.maxHeight = `${newHeight}px`;
+        // For top/left resizing, we need to reposition the modal
+        if ((direction === null || direction === void 0 ? void 0 : direction.includes('left')) || (direction === null || direction === void 0 ? void 0 : direction.includes('top'))) {
+            modal.style.position = 'fixed';
+            modal.style.left = `${newLeft}px`;
+            modal.style.top = `${newTop}px`;
+            modal.style.transform = 'none';
+        }
+    });
+    document.addEventListener('mouseup', () => {
+        if (isResizing) {
+            isResizing = false;
+            currentHandle = null;
+            document.body.style.cursor = '';
+            document.body.style.userSelect = '';
+        }
+    });
+}
 export { 
 //state
 activeToolbarItem, activeActionItem, cancelModelPlacementPrompt, isCustomMapControlsVisible, pipeColor, 

package/lib/loaders/polydrawerLoader.js

@@ -1,5 +1,5 @@
 import { Pane } from 'tweakpane';
-import { dispatchSpaceEvent, renderPolygon, getPolygonFloorOffset, getCurrentFloor, getWallBaseHeight, getFloorBaseHeight, isToolbarFeatureEnabled } from "../architwin";
+import { dispatchSpaceEvent, renderPolygon, getPolygonFloorOffset, getCurrentFloor, getWallBaseHeight, getFloorBaseHeight, isToolbarFeatureEnabled, getDrawingConfig, getVertexPath } from "../architwin";
 import { SPACE_EVENTS } from "../types";
 import { getPolygonArea } from "../utils";
 import { PolygonCalculator, WallCalculator } from "../math";
@@ -373,7 +373,7 @@ export class Vertice {
             position: null,
             fillColor: 'rgb(0,255,0)',
             hoverColor: 'rgb(255,0,0)',
-            ringVisibility: false
+            ringVisibility: false,
         };
         this.emits = {
             active: true,
@@ -424,12 +424,39 @@ export class Vertice {
             //this.pointerIntersection.object  === 'intersectedobject.model'
             if (this.pointerIntersection.object) {
                 let e = Object.assign({}, this.pointerIntersection.position);
-                const floorLevel = getFloorBaseHeight();
-                if (floorLevel != undefined) {
-                    e.y = floorLevel;
+                const drawingConfig = getDrawingConfig();
+                // Apply floor level constraint only for non-window modes
+                if (!drawingConfig || drawingConfig.lineTypeComponentConfig.drawingMode !== 'window') {
+                    const floorLevel = getFloorBaseHeight();
+                    if (floorLevel != undefined) {
+                        e.y = floorLevel;
+                    }
+                    else {
+                        e.y = this.mesh.position.y;
+                    }
                 }
-                else {
-                    e.y = this.mesh.position.y;
+                if (drawingConfig && drawingConfig.lineTypeComponentConfig.drawingMode == 'window') {
+                    const firstVertex = getVertexPath()[0];
+                    // Skip constraint for first vertex (index 0) - it defines the wall plane
+                    if (this.inputs.index !== 0 && firstVertex && this.pointerIntersection.normal) {
+                        const THREE = this.context.three;
+                        // Get wall normal from pointer intersection
+                        const wallNormal = new THREE.Vector3(this.pointerIntersection.normal.x, this.pointerIntersection.normal.y, this.pointerIntersection.normal.z).normalize();
+                        // First vertex position defines a point on the wall plane
+                        const planePoint = new THREE.Vector3(firstVertex.x, firstVertex.y, firstVertex.z);
+                        // Current drag position
+                        const dragPosition = new THREE.Vector3(e.x, e.y, e.z);
+                        // Vector from plane point to drag position
+                        const vecToPoint = new THREE.Vector3().subVectors(dragPosition, planePoint);
+                        // Calculate distance from point to plane along normal
+                        const distanceToPlane = vecToPoint.dot(wallNormal);
+                        // Project point onto plane by removing the perpendicular component
+                        const projectedPosition = new THREE.Vector3().subVectors(dragPosition, wallNormal.clone().multiplyScalar(distanceToPlane));
+                        // Update e with constrained position (stays on wall plane)
+                        e.x = projectedPosition.x;
+                        e.y = projectedPosition.y;
+                        e.z = projectedPosition.z;
+                    }
                 }
                 this.mesh.position.set(e.x, e.y, e.z);
                 //this.mesh.children[0].position.set(e.x, e.y, e.z)
@@ -1209,9 +1236,11 @@ export class BufferGeometry {
                         }
                         // Calculate window area using the projected 2D coordinates
                         const windowDimension = this.calculateWindowDimensions(windows[i].path);
-                        let windowLabelText = windows[i].name ? `${windows[i].name}` : windowMesh.name;
+                        const windowLabel = windows[i].name.split(" ");
+                        const windowName = windowLabel[0] == 'Window' ? i18n.t('Window') + ' ' + windowLabel[1] : windows[i].name;
+                        let windowLabelText = windows[i].name ? `${windowName}` : windowMesh.name;
                         windowLabelText = windows[i].material ? `${windowLabelText}_${windows[i].material}: ${windowDimension.area.toFixed(2)}m²` : `${windowLabelText}: ${windowDimension.area.toFixed(2)}m²`;
-                        log.info("windowLabelText ", windowLabelText);
+                        log.info("windowLabelText ", windowLabelText, windows[i].name, windowMesh.name, i18n.t('Window'));
                         const windowCanvas = this.createLabelCanvas(windowLabelText);
                         const windowArea = Math.abs(twiceSignedArea * 0.5);
                         const labelWidth = Math.max(0.5, Math.min(2, Math.sqrt(Math.max(0.0001, windowArea))));

package/package.json

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

package/static/atwinui.css

@@ -1386,6 +1386,76 @@
     flex-shrink: 0;
 }
 
+/* Resize handles for preview modal */
+.at_preview_modal-resize-handle {
+    position: absolute;
+    z-index: 10;
+}
+
+.at_preview_modal-resize-handle--top,
+.at_preview_modal-resize-handle--bottom {
+    left: 8px;
+    right: 8px;
+    height: 8px;
+    cursor: ns-resize;
+}
+
+.at_preview_modal-resize-handle--left,
+.at_preview_modal-resize-handle--right {
+    top: 8px;
+    bottom: 8px;
+    width: 8px;
+    cursor: ew-resize;
+}
+
+.at_preview_modal-resize-handle--top {
+    top: 0;
+}
+
+.at_preview_modal-resize-handle--right {
+    right: 0;
+}
+
+.at_preview_modal-resize-handle--bottom {
+    bottom: 0;
+}
+
+.at_preview_modal-resize-handle--left {
+    left: 0;
+}
+
+.at_preview_modal-resize-handle--top-left,
+.at_preview_modal-resize-handle--top-right,
+.at_preview_modal-resize-handle--bottom-left,
+.at_preview_modal-resize-handle--bottom-right {
+    width: 16px;
+    height: 16px;
+}
+
+.at_preview_modal-resize-handle--top-left {
+    top: 0;
+    left: 0;
+    cursor: nwse-resize;
+}
+
+.at_preview_modal-resize-handle--top-right {
+    top: 0;
+    right: 0;
+    cursor: nesw-resize;
+}
+
+.at_preview_modal-resize-handle--bottom-left {
+    bottom: 0;
+    left: 0;
+    cursor: nesw-resize;
+}
+
+.at_preview_modal-resize-handle--bottom-right {
+    bottom: 0;
+    right: 0;
+    cursor: nwse-resize;
+}
+
 @keyframes slide-down {
     from {
         transform: translateY(-100%);