architwin 1.17.4 → 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

@@ -17,6 +17,7 @@ import i18n from './i18n';
 import { getBasepoint, getCoordinateSystem, getMeasurementUnit, getMPBasepoint, getScaleFactor } from "./actionSettingsPane";
 import { convertYupScaleToZupScale } from "../../../worldConversion";
 import { toggleActionBarButtons } from "../../components/toolbar";
+import log from "loglevel";
 let activeCard, activeLibraryCard;
 let _basePath = '../../../../architwin/static';
 export function renderObjectCard(payload, objectComponent) {
@@ -31,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) {
@@ -55,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>
@@ -91,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;
@@ -101,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>
@@ -126,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);
@@ -152,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;
@@ -219,13 +222,13 @@ export function renderLibraryRow(payload) {
     let thumbnail;
     const element = document.createElement('div');
     element.classList.add('at_card');
-    element.classList.add('at_mx-w-8');
+    element.classList.add('at_mx-w-16');
     //element.setAttribute('id','some-id')
     element.innerHTML = `
         <div class="at_card-body at_library_card_body" card-id="${payload.id}">
             ${payload.name ?
-        `<div class="at_card-title at_library_card_title" id="at-library-card-title-${payload.id}" card-id="${payload.id}">
-                <h2 class="at_title" id="at-card-title-${payload.id}" data-cy="at-card-title-${payload.id}">${payload.name}.${payload.object_type}</h2>
+        `<div class="at_card-title at_library_card_title" id="at-library-card-title-${payload.id}">
+                <h2 class="at_title" id="at-card-title-${payload.id}" data-cy="at-card-title-${payload.id}" card-id="${payload.id}">${payload.name}.${payload.object_type}</h2>
                 </div>` :
         ``}
         </div>
@@ -244,6 +247,7 @@ export function setActiveLibraryCard(cardId) {
             activeLibraryCard.classList.remove('at_card_active');
         }
         const objId = target.getAttribute('card-id');
+        log.info("@@ objId", objId, target);
         let targetId;
         if (/[a-z]/.test(objId) || /[A-Z]/.test(objId)) {
             targetId = objId;

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

@@ -55,6 +55,7 @@ export function renderLibraryCards(cardList) {
     console.log("renderLibraryCards()");
     libraryCardContainer = document.getElementById('at-library-cards');
     if (cardList && cardList.length > 0) {
+        libraryCardContainer.classList.add('at_flex_tiles');
         console.log("Card numbers", cardList.length);
         libraryCardContainer.innerHTML = ``;
         cardList.forEach(list => {

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

@@ -102,7 +102,7 @@ export function initFormData(tagId) {
             });
             console.log('tagCategoryId', tagCategory, tagCategory.uuid);
             tagNameInput.value = targetTag.json_data.label;
-            tagDescriptionInput.value = targetTag.json_data.description;
+            tagDescriptionInput.value = targetTag.json_data.description.split('\n')[0];
             tagEmbedInput.value = targetTag.media_url && targetTag.media_url !== '' ? targetTag.media_url : '';
             const subcategories = getAllSubcategories();
             const selectectedSubcategory = subcategories.find(sub => sub.uuid === targetTag.category_uuid);
@@ -168,7 +168,7 @@ export function getTagFormData() {
     }
     if (tagNameInput) {
         const tagName = tagNameInput.value;
-        const tagDescription = tagDescriptionInput.value;
+        const tagDescription = tagDescriptionInput.value.split('\n')[0];
         const tagEmbed = tagEmbedInput.value;
         const formData = {
             tagName: tagName,

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, setPolygonPath,
+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, editMode,
 // polygonHistory
  } from "../architwin";
 import { Notyf } from 'notyf';
@@ -1654,7 +1654,8 @@ function handleVertexPlace(payload) {
         }
         toggleUndoRedoButtons(partitionHistory.canUndo(), partitionHistory.canRedo());
     }
-    if (isToolbarFeatureEnabled('pipe')) {
+    // add editmode condiition to prevent error of pipe form when vertex initialized without editmode and pipe feature enabled
+    if (editMode && isToolbarFeatureEnabled('pipe')) {
         pipeForm.setPipeVertices(payload.path);
     }
 }
@@ -1720,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')
@@ -1756,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');
@@ -1766,11 +1771,15 @@ 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() {
     const libraryModelsCardViewBtn = document.getElementById('at-library-models-card-view-btn');
     const libraryModelsListViewBtn = document.getElementById('at-library-models-list-view-btn');
+    const libraryCards = document.getElementById('at-library-cards');
     if (!libraryModelsCardViewBtn) {
         return;
     }
@@ -1780,6 +1789,7 @@ function handleSetLibraryModelsView() {
     libraryModelsCardViewBtn.addEventListener('click', () => __awaiter(this, void 0, void 0, function* () {
         libraryModelsCardViewBtn.classList.add('at_ghost_active');
         libraryModelsListViewBtn.classList.remove('at_ghost_active');
+        libraryCards.classList.add('at_flex_tiles');
         modelsView = 'card';
         log.info("libraryModelsCardViewBtn", modelsView);
         const checkAssetLibrary = yield getLibrary();
@@ -1796,6 +1806,7 @@ function handleSetLibraryModelsView() {
     libraryModelsListViewBtn.addEventListener('click', () => __awaiter(this, void 0, void 0, function* () {
         libraryModelsListViewBtn.classList.add('at_ghost_active');
         libraryModelsCardViewBtn.classList.remove('at_ghost_active');
+        libraryCards.classList.remove('at_flex_tiles');
         modelsView = 'list';
         log.info("libraryModelsListViewBtn", modelsView);
         const checkAssetLibrary = yield getLibrary();
@@ -2610,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/lib/loaders/polydrawerLoader.js

@@ -63,7 +63,7 @@ export class TubeLine {
                 //this.renderGUI();
             }
             if (this.inputs.path.length > 1) {
-                if (isToolbarFeatureEnabled('pipes')) {
+                if (isToolbarFeatureEnabled('pipe')) {
                     this.renderTubeLine();
                 }
             }

package/lib/types.d.ts

@@ -33,6 +33,7 @@ export interface ITag {
     sandboxId?: string;
     iot_tag?: IoTTagDetails;
     created_on?: string;
+    notion_page_url: string;
 }
 export interface IoTTagDetails {
     linked_system?: string;

package/package.json

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