architwin 1.18.11 → 1.18.12

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/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.11",
+  "version": "1.18.12",
   "description": "ArchiTwin Library for Matterport",
   "main": "./lib/architwin.js",
   "types": "./lib/architwin.d.ts",