architwin 1.18.0 → 1.18.1

package/lib/atwinui/components/toolbar/card.d.ts

@@ -3,7 +3,7 @@ import { I3DObject } from "../../../types";
 import { Scene } from "../../../../bundle/sdk";
 export declare function renderObjectCard(payload: IShowcaseObject, objectComponent?: Scene.IComponent): HTMLDivElement;
 export declare function renderObjectRow(payload: IShowcaseObject, objectComponent?: Scene.IComponent): HTMLDivElement;
-export declare function setActiveCard(cardId: string): Promise<void>;
+export declare function setActiveCard(cardId: string, moveToObject?: boolean): Promise<void>;
 export declare function clearActiveCard(): void;
 export declare function renderLibraryCard(payload: I3DObject): HTMLDivElement;
 export declare function renderLibraryRow(payload: I3DObject): HTMLDivElement;

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

@@ -32,6 +32,7 @@ export function renderObjectCard(payload, objectComponent) {
     element.classList.add('at_mx-w-16');
     element.setAttribute('id', `at-card-${payload.id}`);
     element.setAttribute('data-cy', `at-card-${payload.id}`);
+    element.setAttribute('card-id', `${payload.id}`);
     let object_data = {};
     object_data = payload.object_data;
     if (object_data.upload_file != null) {
@@ -56,7 +57,7 @@ export function renderObjectCard(payload, objectComponent) {
     }
     element.innerHTML = `
         <img class="at_image at_object_image" src="${thumbnail}" alt="Property Image" id="at-card-image-${payload.id}" data-cy="at-card-image-${payload.id}" card-id="${payload.id}" style="min-width: 100%;">
-        <div class="at_card-body" id="at-object-card-body-${payload.id}" card-id="${payload.id}">
+        <div class="at_card-body" id="at-card-body-${payload.id}" card-id="${payload.id}">
             ${payload.object_data.name ?
         `<div class="at_card-title">
                 <h2 class="at_title" id="at-card-title-${payload.id}" card-id="${payload.id}" data-cy="at-card-title-${payload.id}">${payload.object_data.name}</h2>
@@ -92,6 +93,7 @@ export function renderObjectRow(payload, objectComponent) {
     element.classList.add('at_card');
     element.classList.add('at_mx-w-16');
     element.setAttribute('id', `at-card-${payload.id}`);
+    element.setAttribute('card-id', `${payload.id}`);
     let object_data = {};
     object_data = payload.object_data;
     let isObjectVisible = true;
@@ -102,7 +104,7 @@ export function renderObjectRow(payload, objectComponent) {
         console.log("isObjectVisible: ", isObjectVisible);
     }
     element.innerHTML = `
-        <div class="at_card-body" id="at-card-row-body-${payload.id}" card-id="${payload.id}">
+        <div class="at_card-body" id="at-card-body-${payload.id}" card-id="${payload.id}">
             ${payload.object_data.name ?
         `<div class="at_card-title" card-id="${payload.id}">
                 <h2 class="at_list_title" id="at-card-row-title-${payload.id}" card-id="${payload.id}" data-cy="at-card-title-${payload.id}">${payload.object_data.name}</h2>
@@ -127,7 +129,7 @@ export function renderObjectRow(payload, objectComponent) {
     `;
     return element;
 }
-export function setActiveCard(cardId) {
+export function setActiveCard(cardId, moveToObject = true) {
     return __awaiter(this, void 0, void 0, function* () {
         const target = document.getElementById(cardId);
         console.log("Card id", cardId);
@@ -153,7 +155,7 @@ export function setActiveCard(cardId) {
         }
         // await goTo3dx(Number.parseInt(objId))
         const viewMode = getViewMode();
-        if (viewMode && viewMode != "mode.floorplan") {
+        if (viewMode && viewMode != "mode.floorplan" && moveToObject) {
             yield goToModel(Number.parseInt(objId));
         }
         const parent = target.parentElement;

package/lib/atwinui/events.js

@@ -1721,7 +1721,7 @@ function handleMouseClickObject(object) {
         }
         toggleActionBar('show');
         toggleModelControl(false);
-        setActiveCard(`at-card-image-${objectId}`);
+        setActiveCard(`at-card-body-${objectId}`);
         handleScrollToView('at-object-cards', `at-card-${objectId}`);
         // clearActiveActionBtn()
         //setActiveActionBtn('at-translate-action-btn')
@@ -1757,6 +1757,10 @@ function handleSetModelsView() {
         const objectComponents = _3DXObjects.map(obj => obj.component);
         const sortedObjects = sortShowcaseObjects(spaceObjects, selectedObjectSortOption);
         renderObjectCards(sortedObjects, objectComponents);
+        log.info("selectedObject", selectedObject);
+        if (selectedObject) {
+            setActiveCard(`at-card-body-${selectedObject.object.id}`, false);
+        }
     });
     modelsListViewBtn.addEventListener('click', () => {
         modelsListViewBtn.classList.add('at_ghost_active');
@@ -1767,6 +1771,9 @@ function handleSetModelsView() {
         const objectComponents = _3DXObjects.map(obj => obj.component);
         const sortedObjects = sortShowcaseObjects(spaceObjects, selectedObjectSortOption);
         renderObjectList(sortedObjects, objectComponents);
+        if (selectedObject) {
+            setActiveCard(`at-card-body-${selectedObject.object.id}`, false);
+        }
     });
 }
 function handleSetLibraryModelsView() {
@@ -2614,7 +2621,8 @@ function handleMarkFloor() {
                         message: `${i18n.t('WarnLowFloor')}`
                     });
                 }
-                if (Math.sign(coord.y) == 1 || coord.y > -0.9) {
+                //old condition Math.sign(coord.y) == 1 || coord.y > -0.9
+                if (Math.sign(coord.y) == 1 || coord.y > -100) {
                     setFloorBaseHeight(coord.y);
                     const adjustedHeight = getFloorBaseHeight();
                     if (currentRoomData) {

package/package.json

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