architwin 1.18.10 → 1.18.12

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

@@ -213,11 +213,13 @@ export function displayPartitionItems(partitionItems, partitionId, object, paren
         // This is for the walls
         partitionItems.forEach((wall, index) => {
             log.info("__@ partition item: ", wall);
+            if (!wall || !wall.name || !(object === null || object === void 0 ? void 0 : object[index]))
+                return;
             if (!wall.options.is_deleted) {
                 if (!wall.hide) {
                     // Split wall name to localize
                     const match = wall.name.match(/wall-(\d+)$/);
-                    const wallNumber = parseInt(match[1]) + 1;
+                    const wallNumber = match ? parseInt(match[1]) + 1 : index + 1;
                     const isVisible = wall.options.is_visible;
                     const objName = object[index].name.includes('_') ? object[index].name : `${partitionId}_${object[index].name}`;
                     log.info("__@ objName: ", objName);

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

@@ -274,6 +274,11 @@ export function renderTags(tags, showOwnTagsOnly = false) {
                     console.log("TAG DELETE", tagId, _tags);
                     const targetTag = _tags.find(tag => tag.json_data.id.toString() == tagId);
                     yield disposeTag({ tagId: tagId });
+                    if (targetTag) {
+                        const tagType = targetTag.tag_type || TAG_TYPE.MP;
+                        delete tagVisibility[tagType][tagId];
+                        updateShowAllButton();
+                    }
                     const tagRow = document.getElementById(`at-tag-row-${tagId}`);
                     tagRow.remove();
                     const payload = { tag: targetTag };
@@ -488,7 +493,13 @@ export function addClickEventToTagRow(tag) {
             if (tag) {
                 const tagId = tag.getAttribute('tag-id');
                 if (tagId && tagId !== null) {
+                    const deletedTag = _tags.find(t => t.json_data.id.toString() === tagId);
                     yield disposeTag({ tagId: tagId });
+                    if (deletedTag) {
+                        const tagType = deletedTag.tag_type || TAG_TYPE.MP;
+                        delete tagVisibility[tagType][tagId];
+                        updateShowAllButton();
+                    }
                     const tagRow = document.getElementById(`at-tag-row-${tagId}`);
                     tagRow.remove();
                     notify.success(i18n.t('Successfully deleted tag'));

package/lib/atwinui/events.js

@@ -181,7 +181,13 @@ function toggleDisplayPane(targetId) {
                     if (tag) {
                         const tagId = tag.getAttribute('tag-id');
                         if (tagId && tagId !== null) {
+                            const deletedTag = _tags.find(t => t.json_data.id.toString() === tagId);
                             yield disposeTag({ tagId: tagId });
+                            if (deletedTag) {
+                                const tagType = deletedTag.tag_type || TAG_TYPE.MP;
+                                delete tagVisibility[tagType][tagId];
+                                updateShowAllButton();
+                            }
                             const tagRow = document.getElementById(`at-tag-row-${tagId}`);
                             log.info("tagRow", tagRow);
                             tagRow.remove();
@@ -817,6 +823,15 @@ function handlePlaceTag() {
                             const tags = getMpTags();
                             _tags[tags.length - 1].category_uuid = payload.tagSubcategoryId;
                             currentTag = _tags[_tags.length - 1];
+                            if (currentTag) {
+                                const tagType = currentTag.tag_type || TAG_TYPE.MP;
+                                const tagId = currentTag.json_data.id;
+                                if (!tagVisibility[tagType])
+                                    tagVisibility[tagType] = {};
+                                tagVisibility[tagType][tagId] = true;
+                                updateShowAllButton();
+                                saveTagVisibilityToStorage(tagVisibility);
+                            }
                             log.info('_tags', _tags);
                             log.info("Last Tag Pushed", currentTag);
                             cancelTagPlacementPrompt.style.display = 'none';
@@ -850,6 +865,15 @@ function handlePlaceTag() {
                             notyf.success(`${i18n.t('SuccessAddTagToSpace')}`);
                             const tags = getMpTags();
                             currentTag = tags[tags.length - 1];
+                            if (currentTag) {
+                                const tagType = currentTag.tag_type || TAG_TYPE.MP;
+                                const tagId = currentTag.json_data.id;
+                                if (!tagVisibility[tagType])
+                                    tagVisibility[tagType] = {};
+                                tagVisibility[tagType][tagId] = true;
+                                updateShowAllButton();
+                                saveTagVisibilityToStorage(tagVisibility);
+                            }
                             log.info("Last Tag Pushed", tags[tags.length - 1]);
                             cancelTagPlacementPrompt.style.display = 'none';
                             isPlacingTag = false;
@@ -907,6 +931,14 @@ function handlePlaceTag() {
                             if (index !== -1) {
                                 log.info("tag found");
                                 _tags[index].category_uuid = payload.tagSubcategoryId;
+                                const newTag = _tags[index];
+                                const tagType = newTag.tag_type || TAG_TYPE.MP;
+                                const tagId = newTag.json_data.id;
+                                if (!tagVisibility[tagType])
+                                    tagVisibility[tagType] = {};
+                                tagVisibility[tagType][tagId] = true;
+                                updateShowAllButton();
+                                saveTagVisibilityToStorage(tagVisibility);
                             }
                             else {
                                 log.info("tag not found");
@@ -946,6 +978,14 @@ function handlePlaceTag() {
                             if (index !== -1) {
                                 log.info("tag found");
                                 _tags[index].category_uuid = payload.tagSubcategoryId;
+                                const newTag = _tags[index];
+                                const tagType = newTag.tag_type || TAG_TYPE.MP;
+                                const tagId = newTag.json_data.id;
+                                if (!tagVisibility[tagType])
+                                    tagVisibility[tagType] = {};
+                                tagVisibility[tagType][tagId] = true;
+                                updateShowAllButton();
+                                saveTagVisibilityToStorage(tagVisibility);
                             }
                             else {
                                 log.info("tag not found");
@@ -975,7 +1015,13 @@ function onDisposeTag() {
             if (tag) {
                 const tagId = tag.getAttribute('tag-id');
                 if (tagId && tagId !== null) {
+                    const deletedTag = _tags.find(t => t.json_data.id.toString() === tagId);
                     yield disposeTag({ tagId: tagId });
+                    if (deletedTag) {
+                        const tagType = deletedTag.tag_type || TAG_TYPE.MP;
+                        delete tagVisibility[tagType][tagId];
+                        updateShowAllButton();
+                    }
                     const tagRow = document.getElementById(`at-tag-row-${tagId}`);
                     log.info("tagRow", tagRow);
                     tagRow.remove();
@@ -994,7 +1040,13 @@ function onDisposeTag() {
         }
         cancelMoveTag();
         if (iTag !== null) {
+            const deletedTag = _tags.find(t => t.id.toString() === iTag.id.toString());
             yield disposeTag({ tagId: iTag.id });
+            if (deletedTag) {
+                const tagType = deletedTag.tag_type || TAG_TYPE.MP;
+                delete tagVisibility[tagType][iTag.id.toString()];
+                updateShowAllButton();
+            }
         }
         iTag = null;
         if (cancelTagPlacementPrompt) {
@@ -1230,7 +1282,7 @@ function handleToggleVisibilityTags() {
     const updateAll = (visible) => __awaiter(this, void 0, void 0, function* () {
         // Determine which tags to update based on current mode
         const tagsToUpdate = currentTagPaneMode
-            ? _tags.filter(tag => tag.tag_type === currentTagPaneMode)
+            ? _tags.filter(tag => (tag.tag_type || TAG_TYPE.MP) === currentTagPaneMode)
             : _tags;
         for (const tag of tagsToUpdate) {
             const tagType = tag.tag_type || TAG_TYPE.MP;
@@ -3540,6 +3592,15 @@ function handlePlaceIotTag() {
                             const tags = getMpTags();
                             currentTag = _tags[tags.length - 1];
                             _tags[tags.length - 1].category_uuid = payload.tagCategoryId;
+                            if (currentTag) {
+                                const tagType = currentTag.tag_type || TAG_TYPE.IOT;
+                                const tagId = currentTag.json_data.id;
+                                if (!tagVisibility[tagType])
+                                    tagVisibility[tagType] = {};
+                                tagVisibility[tagType][tagId] = true;
+                                updateShowAllButton();
+                                saveTagVisibilityToStorage(tagVisibility);
+                            }
                             cancelTagPlacementPrompt.style.display = 'none';
                             isPlacingTag = false;
                         });
@@ -3571,6 +3632,15 @@ function handlePlaceIotTag() {
                             notyf.success(`${i18n.t('SuccessAddTagToSpace')}`);
                             const tags = getMpTags();
                             currentTag = tags[tags.length - 1];
+                            if (currentTag) {
+                                const tagType = currentTag.tag_type || TAG_TYPE.IOT;
+                                const tagId = currentTag.json_data.id;
+                                if (!tagVisibility[tagType])
+                                    tagVisibility[tagType] = {};
+                                tagVisibility[tagType][tagId] = true;
+                                updateShowAllButton();
+                                saveTagVisibilityToStorage(tagVisibility);
+                            }
                             log.info("Last IoT Tag Pushed", tags[tags.length - 1]);
                             cancelTagPlacementPrompt.style.display = 'none';
                             isPlacingTag = false;

package/lib/loaders/planeGeometry.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { _mpConfig } from "../architwin";
 import { _3DXObjects } from "../architwin";
 import { socketEmit } from '../socketio';
+import pdfjs from 'pdfjs-dist/build/pdf';
 export class Plane {
     constructor(sdk) {
         this.disposables = [];
@@ -112,10 +113,10 @@ export class Plane {
                     this.texture = new THREE.TextureLoader().load(this.inputs.url);
                     break;
                 case 'pdf':
-                    const pdfjs = yield import('pdfjs-dist/build/pdf');
-                    const pdfjsWorker = yield import('pdfjs-dist/build/pdf.worker.entry');
                     const pdfPages = [];
-                    pdfjs.GlobalWorkerOptions.workerSrc = pdfjsWorker;
+                    // pdf.worker.entry is a webpack-only shim that breaks Vite consumers; use a
+                    // bundler-agnostic CDN worker pinned to the installed pdfjs-dist version.
+                    pdfjs.GlobalWorkerOptions.workerSrc = `https://cdn.jsdelivr.net/npm/pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.js`;
                     const pdfDoc = yield pdfjs.getDocument(this.inputs.url).promise;
                     const numPages = pdfDoc.numPages;
                     for (let pageNum = 1; pageNum <= numPages; pageNum++) {

package/lib/loaders/planeGeometry2.js

@@ -883,10 +883,10 @@ class PlanePdf {
             // const geometry = new THREE.PlaneGeometry(1.0, 1.0)
             // @ts-ignore
             const pdfjs = yield import('pdfjs-dist/build/pdf');
-            // @ts-ignore
-            const pdfjsWorker = yield import('pdfjs-dist/build/pdf.worker.entry');
             const pdfPages = [];
-            pdfjs.GlobalWorkerOptions.workerSrc = pdfjsWorker;
+            // pdf.worker.entry is a webpack-only shim that breaks Vite consumers; use a
+            // bundler-agnostic CDN worker pinned to the installed pdfjs-dist version.
+            pdfjs.GlobalWorkerOptions.workerSrc = `https://cdn.jsdelivr.net/npm/pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.js`;
             const pdfDoc = yield pdfjs.getDocument(this.inputs.url).promise;
             const numPages = pdfDoc.numPages;
             for (let pageNum = 1; pageNum <= numPages; pageNum++) {

package/lib/loaders/polydrawerLoader.js

@@ -621,11 +621,13 @@ export class BufferGeometry {
             // }
         };
         this.renderPolygon = () => {
-            var _a;
+            var _a, _b, _c, _d;
             const THREE = this.context.three;
+            if (!this.inputs.path || this.inputs.path.length === 0)
+                return;
             const polyData = this.inputs.polygonData;
             console.log("polyData ", polyData);
-            const WALL_HEIGHT = polyData && polyData.walls[0].wall_height ? polyData.walls[0].wall_height : this.inputs.wallHeight;
+            const WALL_HEIGHT = (_c = (_b = (_a = polyData === null || polyData === void 0 ? void 0 : polyData.walls) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.wall_height) !== null && _c !== void 0 ? _c : this.inputs.wallHeight;
             this.groupedMesh = new THREE.Group();
             let floorDataArray = [];
             let wallDataArray = [];
@@ -637,7 +639,7 @@ export class BufferGeometry {
                 return point;
             });
             let floorLevel;
-            console.log("floorLevel polyData.floor.floor_level", (_a = polyData === null || polyData === void 0 ? void 0 : polyData.floor) === null || _a === void 0 ? void 0 : _a.floor_level);
+            console.log("floorLevel polyData.floor.floor_level", (_d = polyData === null || polyData === void 0 ? void 0 : polyData.floor) === null || _d === void 0 ? void 0 : _d.floor_level);
             floorLevel = this.inputs.path[0].y;
             console.log("floorLevel ", floorLevel);
             console.log("floorLevel this.inputs.path[0].y", this.inputs.path[0].y);

package/lib/minimap.js

@@ -57,6 +57,29 @@ let notyf = new Notyf({ position: { x: 'left', y: 'bottom' }, duration: 4500, ty
 //Map placement presets
 const mapPositions = ['topLeft', 'topRight', 'bottomLeft', 'bottomRight'];
 setInterval(locateAvatar, 5000);
+function setActiveMinimapSweep(currentSweep, sweepIds, sweepLegacyIds) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (activeSweep !== null) {
+            const swp = document.getElementById('p' + activeSweep);
+            if (swp)
+                swp.classList.remove('active');
+        }
+        activeSweep = currentSweep.id;
+        if (_isInitialLoad) {
+            log.info('=== minimap: initial load; will delay activating current sweep; to resolve timing issues ');
+            yield new Promise(resolve => setTimeout(resolve, 2000));
+        }
+        const mapConfig = getMapConfig();
+        if (mapConfig && mapConfig.showDirection) {
+            showDirection();
+        }
+        const sweepBtn = document.getElementById('p' + activeSweep);
+        if (sweepBtn) {
+            sweepBtn.classList.add('active');
+            log.info('Entering Sweep - API ID:' + currentSweep.id + ' (#' + sweepIds[currentSweep.id] + ') - Legacy SDK ID: ' + sweepLegacyIds[currentSweep.id]);
+        }
+    });
+}
 function setMap(mpSdk, appKey, mapId, openOnLoad) {
     return __awaiter(this, void 0, void 0, function* () {
         log.info('setMap(mpSdk: MpSdk)', mpSdk);
@@ -102,31 +125,7 @@ function setMap(mpSdk, appKey, mapId, openOnLoad) {
             return __awaiter(this, void 0, void 0, function* () {
                 // Change to the current sweep has occurred.
                 if (currentSweep.id !== '') {
-                    if (activeSweep !== null) {
-                        const swp = document.getElementById('p' + activeSweep);
-                        if (swp)
-                            swp.classList.remove('active');
-                    }
-                    activeSweep = currentSweep.id;
-                    if (_isInitialLoad) {
-                        log.info('=== minimap: initial load; will delay activating current sweep; to resolve timing issues ');
-                        yield new Promise(resolve => setTimeout(resolve, 2000));
-                        const mapConfig = getMapConfig();
-                        if (mapConfig && mapConfig.showDirection) {
-                            showDirection();
-                        }
-                    }
-                    else {
-                        const mapConfig = getMapConfig();
-                        if (mapConfig && mapConfig.showDirection) {
-                            showDirection();
-                        }
-                    }
-                    const sweepBtn = document.getElementById('p' + activeSweep);
-                    if (sweepBtn) {
-                        sweepBtn.classList.add('active');
-                        log.info('Entering Sweep - API ID:' + currentSweep.id + ' (#' + sweepIds[currentSweep.id] + ') - Legacy SDK ID: ' + sweepLegacyIds[currentSweep.id]);
-                    }
+                    setActiveMinimapSweep(currentSweep, sweepIds, sweepLegacyIds);
                     // document.getElementById('p' + activeSweep).classList.add('active');
                     // log.info('Entering Sweep - API ID:' + currentSweep.id + ' (#' + sweepIds[currentSweep.id] + ') - Legacy SDK ID: ' + sweepLegacyIds[currentSweep.id]);
                 }
@@ -286,7 +285,7 @@ function setMap(mpSdk, appKey, mapId, openOnLoad) {
             onCollectionUpdated: function (collection) {
                 log.info('default the entire up-to-date collection', collection);
                 _minimapSweepCollection = collection;
-                if (_currentFloor) {
+                if (_currentFloor !== undefined) {
                     toggleSweepMarkerFloors(_currentFloor);
                 }
                 dispatchSpaceEvent(SPACE_EVENTS.MINIMAP_SWEEPS_RENDERED);
@@ -340,6 +339,11 @@ function setMap(mpSdk, appKey, mapId, openOnLoad) {
         // Show Minimap when Tour Starts Playing.
         yield mpSdk.App.state.waitUntil((appState) => appState.phase == 'appphase.playing');
         document.body.classList.add('minimap');
+        //Tying to fix the issue where the minimap is not showing up on initial load. The minimap is not showing up because the current floor is not being set when the app starts. This is a workaround to set the current floor when the app starts.
+        const currentFloor = getCurrentFloor();
+        toggleSweepMarkerFloors(currentFloor.sequence);
+        const currentSweep = getCurrentSweep();
+        setActiveMinimapSweep(currentSweep, sweepIds, sweepLegacyIds);
         _isInitialLoad = false;
     });
 }
@@ -1307,7 +1311,7 @@ function generateCustomMinimap(mpSdk) {
                 onCollectionUpdated: function (collection) {
                     log.info('custom map: the entire up-to-date collection', collection);
                     _minimapSweepCollection = collection;
-                    if (_currentFloor) {
+                    if (_currentFloor !== undefined) {
                         toggleSweepMarkerFloors(_currentFloor);
                     }
                     // Convert object to array

package/package.json

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