@smarterplan/ngx-smarterplan-core 1.2.53 → 1.2.55

package/fesm2020/smarterplan-ngx-smarterplan-core.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { Injectable, Component, Input, Inject, EventEmitter, Output, Pipe, ViewChild, NgModule } from '@angular/core';
+import { Injectable, Component, Input, Inject, EventEmitter, isDevMode, Output, Pipe, ViewChild, NgModule } from '@angular/core';
 import * as i1 from '@ngx-translate/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { Subject, takeUntil, Observable } from 'rxjs';
@@ -1795,11 +1795,11 @@ class ZoneChangeService {
         this.zonesForUserChange = new Subject();
         this.floorHasChanged = new EventEmitter();
         this.zoneChange.subscribe((zone) => {
-            // console.log(`new zone ${JSON.stringify(zone)}`);
+            //console.log(`new zone ${JSON.stringify(zone)}`);
             this.currentZone = zone;
         });
         this.zonesForUserChange.subscribe((zones) => {
-            // console.log(`new zones ${JSON.stringify(zones)}`);
+            //console.log(`new zones ${JSON.stringify(zones)}`);
             this.currentZones = zones;
         });
     }
@@ -2757,26 +2757,108 @@ class MatterportService {
                         this.floors = Object.values(collection);
                     }.bind(this),
                 });
-                // on tag click open details page
-                this.sdk.on('tag.click', (sid) => {
-                    // get object of this tag
+                // Handler générique pour les sélections de tags
+                const handleTagSelection = async (sid, source, evt) => {
+                    if (isDevMode()) {
+                        console.log(`[MatterportService] handleTagSelection from ${source} for sid: ${sid}`, { evt });
+                    }
+                    // Exécution de l'action personnalisée (ouverture du panneau de détail via navigation)
                     try {
                         const mattertagData = this.dictionnaryTags.get(sid);
                         if (!mattertagData) {
-                            console.log('no mattertagData to display');
+                            if (isDevMode()) {
+                                console.log('no mattertagData to display', sid);
+                            }
                             return;
                         }
                         const url = tagService.getUrlForSeeDetails(mattertagData.getObject(), mattertagData.getType());
                         if (url !== '') {
+                            if (isDevMode()) {
+                                console.log(`[MatterportService] Navigating to detail URL: ${url}`);
+                            }
                             this.visibilityService.detailShowing.next(true);
                             this.ngZone.run(() => {
                                 this.router.navigate([url]);
                             });
                         }
                     }
-                    catch {
-                        console.log('Cannot show details for tag');
+                    catch (error) {
+                        if (isDevMode()) {
+                            console.log('Cannot show details for tag', error);
+                        }
+                    }
+                };
+                // Fonction pour désactiver les actions natives sur un tag (SDK v3)
+                const disableNativeActions = (sid) => {
+                    if (!this.sdk)
+                        return;
+                    try {
+                        if (this.sdk.Tag && this.sdk.Tag.allowAction) {
+                            // opening: false désactive le billboard natif
+                            // navigating: false désactive le déplacement de la caméra vers le tag
+                            this.sdk.Tag.allowAction(sid, { opening: false, navigating: false, docking: false });
+                            if (isDevMode()) {
+                                console.log(`[MatterportService] Disabled native actions for tag ${sid}`);
+                            }
+                        }
+                        else if (this.sdk.Mattertag && this.sdk.Mattertag.preventAction) {
+                            // Fallback ancienne API
+                            this.sdk.Mattertag.preventAction(sid, { opening: true, navigating: true });
+                            if (isDevMode()) {
+                                console.log(`[MatterportService] Prevented native actions (legacy) for tag ${sid}`);
+                            }
+                        }
+                    }
+                    catch (e) {
+                        if (isDevMode()) {
+                            console.warn(`[MatterportService] Error disabling actions for ${sid}`, e);
+                        }
+                    }
+                };
+                // Attendre que l'application soit en phase PLAYING
+                if (this.sdk.App && this.sdk.App.state) {
+                    if (isDevMode()) {
+                        console.log('[MatterportService] Waiting for App.Phase.PLAYING...');
+                    }
+                    this.sdk.App.state.waitUntil((s) => s.phase === this.sdk.App.Phase.PLAYING).then(() => {
+                        if (isDevMode()) {
+                            console.log('[MatterportService] App is PLAYING.');
+                        }
+                        // 1. Désactiver les actions natives pour tous les tags existants et futurs
+                        if (this.sdk.Tag && this.sdk.Tag.data) {
+                            this.sdk.Tag.data.subscribe({
+                                onAdded: (sid) => {
+                                    disableNativeActions(sid);
+                                },
+                                onUpdated: (sid) => {
+                                    disableNativeActions(sid);
+                                },
+                                onCollectionUpdated: (collection) => {
+                                    Object.keys(collection).forEach(sid => disableNativeActions(sid));
+                                }
+                            });
+                        }
+                        // 2. Écouter les sélections via l'observable openTags (Méthode moderne)
+                        if (this.sdk.Tag && this.sdk.Tag.openTags) {
+                            this.sdk.Tag.openTags.subscribe({
+                                onChanged: (newState) => {
+                                    if (newState.selected && newState.selected.size > 0) {
+                                        const sid = Array.from(newState.selected)[0];
+                                        handleTagSelection(sid, 'Tag.openTags.selected');
+                                    }
+                                }
+                            });
+                        }
+                    });
+                }
+                // Fallback pour l'événement global tag.click
+                this.sdk.on('tag.click', (sid) => {
+                    if (isDevMode()) {
+                        console.log(`[MatterportService] sdk.on('tag.click') received for sid: ${sid}`);
                     }
+                    handleTagSelection(sid, 'global.tag.click');
+                    // On s'assure qu'il est bien désactivé même si on a raté l'évènement d'ajout
+                    disableNativeActions(sid);
                 });
                 // Pointer trick
                 // Create a div that will appear when the cursor is still
@@ -4068,6 +4150,7 @@ class ViewerService {
         this.dataIsLoaded = new Subject();
         this.isLoaded = false;
         this.showingViewer = false;
+        this.goToTriggered = new Subject();
         this.toolboxStates = {
             dollhouse: {
                 stat: false,
@@ -10997,6 +11080,7 @@ class NavigationBarComponent {
             zone.parentID === parentZoneForVisit.id);
     }
     async goTo() {
+        this.viewerService.goToTriggered.next();
         if (this.selectedZone && !this.selectedZone.virtual) {
             this.sweepToGo = this.selectedZone.startSweepID
                 ? this.selectedZone.startSweepID