architwin 1.13.6 → 1.13.8

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

@@ -30,10 +30,14 @@ export function renderViewingRemoteSpace() {
  */
 export function renderRemoteSpaceViewing(user) {
     var _a;
+    const screenSharePane = document.getElementById('at-screen-share-pane');
     const container = document.getElementById('at-sharing-user-container');
     const maincontainer = document.getElementById('at-viewing-remote-space-pane');
     if (!container && !maincontainer)
         return;
+    if (screenSharePane) {
+        screenSharePane.style.display = 'none';
+    }
     maincontainer.style.display = 'block';
     maincontainer.style.zIndex = '2';
     container.innerHTML = '';
@@ -51,23 +55,23 @@ export function renderRemoteSpaceViewing(user) {
     const statusText = document.createElement('div');
     statusText.className = 'at_text_sm at_text_white';
     statusText.innerHTML = `
-        ${i18n.t('Is sharing their space')} <${(_currentSpace === null || _currentSpace === void 0 ? void 0 : _currentSpace.name) || i18n.t('SPACE_NAME')}> ${i18n.t('to you')}
+        ${i18n.t('Is sharing their space')} ${(_currentSpace === null || _currentSpace === void 0 ? void 0 : _currentSpace.name) || i18n.t('SPACE_NAME')} ${i18n.t('to you')}
     `;
     infoWrapper.appendChild(userNameEl);
     infoWrapper.appendChild(statusText);
     // Right: Green dot
-    const dot = document.createElement('div');
-    dot.className = 'at_circle at_w-2 at_h-2 at_bg_green_500';
-    const circle = document.createElement('span');
-    circle.style.width = '15px';
-    circle.style.height = '15px';
-    circle.style.borderRadius = '50%';
-    circle.style.backgroundColor = user.onlineStatus == 'online' || user.onlineStatus == 'in_session' ? '#22c55e' : '#ffffff';
-    circle.style.border = '1px solid #ccc';
-    circle.style.marginRight = '10px';
+    // const dot = document.createElement('div')
+    // dot.className = 'at_circle at_w-2 at_h-2 at_bg_green_500'
+    // const circle = document.createElement('span')
+    // circle.style.width = '15px'
+    // circle.style.height = '15px'
+    // circle.style.borderRadius = '50%'
+    // circle.style.backgroundColor = user.onlineStatus == 'online' || user.onlineStatus == 'in_session' ? '#22c55e' : '#ffffff'
+    // circle.style.border = '1px solid #ccc'
+    // circle.style.marginRight = '10px'
     // Combine into card
     cardContent.appendChild(infoWrapper);
-    cardContent.appendChild(circle);
+    // cardContent.appendChild(circle)
     card.appendChild(cardContent);
     container.appendChild(card);
     // === Instructional Text ===

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, setPipeCategories, setPipes, detachTagMedia, getTagDataCollection } from "../architwin";
+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, setPipeCategories, setPipes, detachTagMedia, getTagDataCollection, setVertexPath } from "../architwin";
 import { Notyf } from 'notyf';
 import 'notyf/notyf.min.css';
 import { SPACE_EVENTS, COORDINATE_SYSTEM, UNITS, DEGREE, MAP_OPTIONS, sortTagOptions, sortObjectOptions, CUSTOM_MAP_MODE } from "../types";
@@ -1334,6 +1334,7 @@ function setupSpaceEventSubscriptions() {
     subscribeSpaceEvent(SPACE_EVENTS.DRAW_HISTORY, handleDrawHistory);
     subscribeSpaceEvent(SPACE_EVENTS.FLOOR_IMAGE_UPLOADED, handleCustomMapFloorImageUploaded);
     subscribeSpaceEvent(SPACE_EVENTS.FLOOR_IMAGE_UPLOAD_FAILED, handleCustomMapFloorUploadFailed);
+    subscribeSpaceEvent(SPACE_EVENTS.PATH_UPDATED, handlePathUpdated);
 }
 function handleDragEnd(payload) {
     console.log("handleDragEnd payload", payload);
@@ -1420,6 +1421,10 @@ function handleVertexPlace(payload) {
         pipeForm.setPipeVertices(payload.path);
     }
 }
+function handlePathUpdated(payload) {
+    setVertexPath(payload.path);
+    handleVertexPlace(payload);
+}
 function handleMouseClickObject(object) {
     var _a, _b, _c;
     log.info("handleMouseClickObject()", object);
@@ -2925,10 +2930,12 @@ function handleClearSearchTagName() {
             const tags = getMpTags();
             const filteredTags = filterTagList(tags);
             if (selectedCategoryFilterId || selectedSubCategoryFilterId) {
-                renderTags(filteredTags);
+                const sortedTags = sortTags(filteredTags, { by: 'label', order: 'asc' });
+                renderTags(sortedTags);
             }
             else if (tags.length > 0) {
-                renderTags(tags, true);
+                const sortedTags = sortTags(tags, { by: 'label', order: 'asc' });
+                renderTags(sortedTags, true);
             }
         });
     }

package/lib/loaders/pathLoader.js

@@ -25,7 +25,7 @@ export class PathLine {
             radialSegments: 20,
             fillColor: 'none',
             textColor: 'rgb(255,255,255)',
-            text: '➡︎',
+            text: '➞',
             font: '48px sans-serif',
             radius: 0.05,
             scrollSpeed: 1.35,

package/lib/loaders/polydrawerLoader.js

@@ -28,7 +28,7 @@ export class TubeLine {
             radialSegments: 20,
             fillColor: 'rgb(0,255,0)',
             textColor: 'rgb(255,255,255)',
-            text: '➡︎',
+            text: '➞',
             font: '48px sans-serif',
             radius: 0.05,
             scrollSpeed: 1.35,

package/lib/types.d.ts

@@ -437,6 +437,7 @@ export interface ComponentOptions {
     fillColor?: string | undefined;
     radius?: number | undefined;
     scrollSpeed?: number | undefined;
+    radialSegments?: number | undefined;
     node?: MpSdk.Scene.INode | undefined;
     tubes?: MpSdk.Scene.IObject | undefined;
     active?: boolean | undefined;

package/package.json

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

package/static/atwinui.css

@@ -77,60 +77,31 @@
     --button-font-weight: normal;
 
     --bg-dark-gray: rgb(48, 48, 48);
-        /* pipe color category */
-    --bg-dark-red: rgb(130, 0, 0); 
-    --bg-red: rgb(255, 0, 0);
-    --bg-amber: rgb(250, 170, 0);
-    --bg-chartreuse: rgb(251, 255, 0);
-    --bg-light-chartreuse: rgb(237, 255, 0, 1);
-    --bg-light-green:rgb(137, 255, 0);
-    --bg-dark-green: rgb(0, 138, 0);
-    --bg-sky-blue:  rgb(169, 229, 255, 1);
-    --bg-purple: rgb(109, 0, 255);
-    --bg-dark-purple: rgb(56, 0, 152);
-
+    
+    /* pipe color category */
+    --bg-blue: rgb(77, 129, 163);
+    --bg-green: rgb(50, 107, 75);
+    --bg-gray: rgb(166, 166, 166);
+    --bg-silver: rgb(192, 192, 192);
+    --bg-red: rgb(183, 31, 51);
+    --bg-yellow: rgb(255, 186, 0);
+    --bg-black: rgb(38, 38, 38);
+    --bg-brown: rgb(176, 103, 72);
+    --bg-pink: rgb(208, 123, 157);
+    --bg-orange: rgb(168, 155, 148);
 }
 
 /*pipe  color  category*/
-.at_pipe_category-bg-dark-red {
-    background-color: var(--bg-dark-red);
-}
-
-.at_pipe_category-bg-red {
-    background-color: var(--bg-red);
-}
-
-.at_pipe_category-bg-amber {
-    background-color: var(--bg-amber);
-}
-
-.at_pipe_category-bg-light-chartreuse {
-    background-color: var(--bg-light-chartreuse);
-}
-
-.at_pipe_category-bg-chartreuse {
-    background-color: var(--bg-chartreuse);
-}
-
-.at_pipe_category-bg-light-green {
-    background-color: var(--bg-light-green);
-}
-
-.at_pipe_category-bg-dark-green {
-    background-color: var(--bg-dark-green);
-}
-
-.at_pipe_category-bg-sky-blue {
-    background-color: var(--bg-sky-blue);
-}
-
-.at_pipe_category-bg-purple {
-    background-color: var(--bg-purple);
-}
-
-.at_pipe_category-bg-dark-purple {
-    background-color: var(--bg-dark-purple);
-}
+.at_pipe_category-bg-blue { background-color: var(--bg-blue); }
+.at_pipe_category-bg-green { background-color: var(--bg-green); }
+.at_pipe_category-bg-gray { background-color: var(--bg-gray); }
+.at_pipe_category-bg-silver { background-color: var(--bg-silver); }
+.at_pipe_category-bg-red { background-color: var(--bg-red); }
+.at_pipe_category-bg-yellow { background-color: var(--bg-yellow); }
+.at_pipe_category-bg-black { background-color: var(--bg-black); }
+.at_pipe_category-bg-brown { background-color: var(--bg-brown); }
+.at_pipe_category-bg-pink { background-color: var(--bg-pink); }
+.at_pipe_category-bg-orange { background-color: var(--bg-orange); }
 
 /* end pipe color category  */