Update interface.js

interface.js

@@ -3,8 +3,8 @@
 
 const currentScriptTag = document.currentScript;
 
-(async function() {
-  // 1. Locate the <script> and read data-config
+(async function () {
+  // 1) Retrouver la balise <script> porteuse de data-config
   let scriptTag = currentScriptTag;
   if (!scriptTag) {
     const scripts = document.getElementsByTagName('script');
@@ -18,7 +18,9 @@ const currentScriptTag = document.currentScript;
       scriptTag = scripts[scripts.length - 1];
     }
   }
+  if (!scriptTag) return;
 
+  // 2) Charger la config
   const configUrl = scriptTag.getAttribute('data-config');
   let config = {};
   if (configUrl) {
@@ -26,49 +28,55 @@ const currentScriptTag = document.currentScript;
       const response = await fetch(configUrl);
       config = await response.json();
     } catch (error) {
+      console.error('[interface.js] Failed to load config:', error);
       return;
     }
   } else {
+    console.warn('[interface.js] No data-config provided.');
     return;
   }
 
+  // 3) CSS optionnel
   if (config.css_url) {
     const linkEl = document.createElement('link');
-    linkEl.rel = "stylesheet";
+    linkEl.rel = 'stylesheet';
     linkEl.href = config.css_url;
     document.head.appendChild(linkEl);
   }
 
+  // 4) ID d’instance
   const instanceId = Math.random().toString(36).substr(2, 8);
 
-  let aspectPercent = "100%";
+  // 5) Calcul de l’aspect
+  let aspectPercent = '100%';
   if (config.aspect) {
-    if (config.aspect.includes(":")) {
-      const parts = config.aspect.split(":");
+    if (config.aspect.includes(':')) {
+      const parts = config.aspect.split(':');
       const w = parseFloat(parts[0]);
       const h = parseFloat(parts[1]);
       if (!isNaN(w) && !isNaN(h) && w > 0) {
-        aspectPercent = (h / w * 100) + "%";
+        aspectPercent = (h / w * 100) + '%';
       }
     } else {
       const aspectValue = parseFloat(config.aspect);
       if (!isNaN(aspectValue) && aspectValue > 0) {
-        aspectPercent = (100 / aspectValue) + "%";
+        aspectPercent = (100 / aspectValue) + '%';
       }
     }
   } else {
     const parentContainer = scriptTag.parentNode;
-    const containerWidth  = parentContainer.offsetWidth;
+    const containerWidth = parentContainer.offsetWidth;
     const containerHeight = parentContainer.offsetHeight;
     if (containerWidth > 0 && containerHeight > 0) {
-      aspectPercent = (containerHeight / containerWidth * 100) + "%";
+      aspectPercent = (containerHeight / containerWidth * 100) + '%';
     }
   }
 
+  // 6) Conteneur widget
   const widgetContainer = document.createElement('div');
   widgetContainer.id = 'ply-widget-container-' + instanceId;
   widgetContainer.classList.add('ply-widget-container');
-  widgetContainer.style.height = "0";
+  widgetContainer.style.height = '0';
   widgetContainer.style.paddingBottom = aspectPercent;
   widgetContainer.setAttribute('data-original-aspect', aspectPercent);
 
@@ -76,6 +84,14 @@ const currentScriptTag = document.currentScript;
     ? `<button id="tooltips-toggle-${instanceId}" class="widget-button tooltips-toggle">⦿</button>`
     : '';
 
+  // IDs uniques pour le panneau tooltips
+  const tooltipIds = {
+    panel: `tooltip-panel-${instanceId}`,
+    close: `tooltip-close-${instanceId}`,
+    text: `tooltip-text-${instanceId}`,
+    image: `tooltip-image-${instanceId}`
+  };
+
   widgetContainer.innerHTML = `
     <div id="viewer-container-${instanceId}" class="viewer-container">
       <div id="progress-dialog-${instanceId}" class="progress-dialog">
@@ -83,40 +99,41 @@ const currentScriptTag = document.currentScript;
       </div>
       <button id="fullscreen-toggle-${instanceId}" class="widget-button fullscreen-toggle">⇱</button>
       <button id="help-toggle-${instanceId}" class="widget-button help-toggle">?</button>
-      <button id="reset-camera-btn-${instanceId}" class="widget-button reset-camera-btn">
-        <span class="reset-icon">⟲</span>
-      </button>
+      <button id="reset-camera-btn-${instanceId}" class="widget-button reset-camera-btn"><span class="reset-icon">⟲</span></button>
       ${tooltipsButtonHTML}
       <div id="menu-content-${instanceId}" class="menu-content">
         <span id="help-close-${instanceId}" class="help-close">×</span>
         <div class="help-text"></div>
       </div>
     </div>
-    <div id="tooltip-panel" class="tooltip-panel" style="display: none;">
+    <div id="${tooltipIds.panel}" class="tooltip-panel" style="display: none;">
       <div class="tooltip-content">
-        <span id="tooltip-close" class="tooltip-close">×</span>
-        <div id="tooltip-text" class="tooltip-text"></div>
-        <img id="tooltip-image" class="tooltip-image" src="" alt="" style="display: none;" />
+        <span id="${tooltipIds.close}" class="tooltip-close">×</span>
+        <div id="${tooltipIds.text}" class="tooltip-text"></div>
+        <img id="${tooltipIds.image}" class="tooltip-image" src="" alt="" style="display: none;" />
       </div>
     </div>
   `;
 
   scriptTag.parentNode.appendChild(widgetContainer);
 
+  // 7) Sélecteurs
   const viewerContainerElem = document.getElementById('viewer-container-' + instanceId);
-  const fullscreenToggle    = document.getElementById('fullscreen-toggle-' + instanceId);
-  const helpToggle          = document.getElementById('help-toggle-' + instanceId);
-  const helpCloseBtn        = document.getElementById('help-close-' + instanceId);
-  const resetCameraBtn      = document.getElementById('reset-camera-btn-' + instanceId);
-  const tooltipsToggleBtn   = document.getElementById('tooltips-toggle-' + instanceId);
-  const menuContent         = document.getElementById('menu-content-' + instanceId);
-  const helpTextDiv         = menuContent.querySelector('.help-text');
-  const tooltipPanel        = document.getElementById('tooltip-panel');
-  const tooltipTextDiv      = document.getElementById('tooltip-text');
-  const tooltipImage        = document.getElementById('tooltip-image');
-  const tooltipCloseBtn     = document.getElementById('tooltip-close');
-
-  const isIOS    = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
+  const fullscreenToggle = document.getElementById('fullscreen-toggle-' + instanceId);
+  const helpToggle = document.getElementById('help-toggle-' + instanceId);
+  const helpCloseBtn = document.getElementById('help-close-' + instanceId);
+  const resetCameraBtn = document.getElementById('reset-camera-btn-' + instanceId);
+  const tooltipsToggleBtn = document.getElementById('tooltips-toggle-' + instanceId);
+  const menuContent = document.getElementById('menu-content-' + instanceId);
+  const helpTextDiv = menuContent.querySelector('.help-text');
+
+  // Tooltips (IDs uniques)
+  const tooltipPanel = document.getElementById(tooltipIds.panel);
+  const tooltipTextDiv = document.getElementById(tooltipIds.text);
+  const tooltipImage = document.getElementById(tooltipIds.image);
+  const tooltipCloseBtn = document.getElementById(tooltipIds.close);
+
+  const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
   const tooltipInstruction = config.tooltips_url
@@ -124,7 +141,7 @@ const currentScriptTag = document.currentScript;
     : '';
 
   if (isMobile) {
-    helpTextDiv.innerHTML = 
+    helpTextDiv.innerHTML =
       '- Déplacez vous en glissant deux doigts sur l\'écran.<br>' +
       '- Orbitez en glissant un doigt.<br>' +
       '- Zoomez en pinçant avec deux doigts.<br>' +
@@ -132,7 +149,7 @@ const currentScriptTag = document.currentScript;
       '- Cliquez sur ⟲ pour réinitialiser la caméra.<br>' +
       '- Cliquez sur ⇱ pour passer en plein écran.<br>';
   } else {
-    helpTextDiv.innerHTML = 
+    helpTextDiv.innerHTML =
       '- Orbitez avec le clic droit ou shift + ←↑↓→<br>' +
       '- Zoomez avec la molette ou ctrl + ↑↓<br>' +
       '- Déplacez vous avec le clic gauche ou ←↑↓→<br>' +
@@ -141,33 +158,33 @@ const currentScriptTag = document.currentScript;
       '- Cliquez sur ⇱ pour passer en plein écran.<br>';
   }
 
-  // --- DYNAMIC MENU SIZING ---
+  // Menu responsive
   function setMenuContentMaxSize() {
     if (!isMobile) {
-      menuContent.style.maxWidth  = "";
-      menuContent.style.maxHeight = "";
-      menuContent.style.width     = "";
-      menuContent.style.height    = "";
-      menuContent.style.overflowY = "";
-      menuContent.style.overflowX = "";
+      menuContent.style.maxWidth = '';
+      menuContent.style.maxHeight = '';
+      menuContent.style.width = '';
+      menuContent.style.height = '';
+      menuContent.style.overflowY = '';
+      menuContent.style.overflowX = '';
       return;
     }
-    let parent = viewerContainerElem;
+    const parent = viewerContainerElem;
     if (parent) {
       const vw = parent.offsetWidth;
       const vh = parent.offsetHeight;
       if (vw && vh) {
-        menuContent.style.maxWidth = Math.round(vw * 0.8) + "px";
-        menuContent.style.maxHeight = Math.round(vh * 0.8) + "px";
-        menuContent.style.width = "";  // Let it shrink if smaller
-        menuContent.style.height = "";
-        menuContent.style.overflowY = "auto";
-        menuContent.style.overflowX = "auto";
+        menuContent.style.maxWidth = Math.round(vw * 0.8) + 'px';
+        menuContent.style.maxHeight = Math.round(vh * 0.8) + 'px';
+        menuContent.style.width = '';
+        menuContent.style.height = '';
+        menuContent.style.overflowY = 'auto';
+        menuContent.style.overflowX = 'auto';
       } else {
-        menuContent.style.maxWidth = "80vw";
-        menuContent.style.maxHeight = "80vh";
-        menuContent.style.overflowY = "auto";
-        menuContent.style.overflowX = "auto";
+        menuContent.style.maxWidth = '80vw';
+        menuContent.style.maxHeight = '80vh';
+        menuContent.style.overflowY = 'auto';
+        menuContent.style.overflowX = 'auto';
       }
     }
   }
@@ -176,13 +193,12 @@ const currentScriptTag = document.currentScript;
   document.addEventListener('fullscreenchange', setMenuContentMaxSize);
   window.addEventListener('orientationchange', setMenuContentMaxSize);
 
-  // --- HELP PANEL DEFAULT VISIBILITY ---
+  // Afficher l’aide par défaut
   menuContent.style.display = 'block';
-
   viewerContainerElem.style.display = 'block';
 
+  // Fonctions panneau tooltips / aide
   let dragHide = null;
-
   function hideTooltipPanel() {
     if (dragHide) {
       viewerContainerElem.removeEventListener('pointermove', dragHide);
@@ -194,18 +210,21 @@ const currentScriptTag = document.currentScript;
     menuContent.style.display = 'none';
   }
 
-  // 7. Dynamically load viewer.js
+  // 8) Charger viewer.js (anti-cache multi-instance via query param)
   let viewerModule;
   try {
-    viewerModule = await import('https://mikafil-viewer-sgos.static.hf.space/viewer.js');
+    const viewerUrl = `https://mikafil-viewer-sgos.static.hf.space/viewer.js?i=${instanceId}`;
+    viewerModule = await import(viewerUrl);
     await viewerModule.initializeViewer(config, instanceId);
   } catch (err) {
+    console.error('[interface.js] Failed to init viewer:', err);
     return;
   }
 
   const canvasId = 'canvas-' + instanceId;
   const canvasEl = document.getElementById(canvasId);
 
+  // Si tooltips non dispo, masquer le bouton
   if (tooltipsToggleBtn) {
     if (!config.tooltips_url) {
       tooltipsToggleBtn.style.display = 'none';
@@ -216,6 +235,7 @@ const currentScriptTag = document.currentScript;
     }
   }
 
+  // 9) Plein écran
   let isFullscreen = false;
   let savedState = null;
 
@@ -225,18 +245,18 @@ const currentScriptTag = document.currentScript;
     savedState = {
       widget: {
         position: widgetContainer.style.position,
-        top:      widgetContainer.style.top,
-        left:     widgetContainer.style.left,
-        width:    widgetContainer.style.width,
-        height:   widgetContainer.style.height,
+        top: widgetContainer.style.top,
+        left: widgetContainer.style.left,
+        width: widgetContainer.style.width,
+        height: widgetContainer.style.height,
         maxWidth: widgetContainer.style.maxWidth,
-        maxHeight:widgetContainer.style.maxHeight,
+        maxHeight: widgetContainer.style.maxHeight,
         paddingBottom: widgetContainer.style.paddingBottom || originalAspect,
-        margin:   widgetContainer.style.margin,
+        margin: widgetContainer.style.margin
       },
       viewer: {
         borderRadius: viewerContainerElem.style.borderRadius,
-        border:       viewerContainerElem.style.border,
+        border: viewerContainerElem.style.border
       }
     };
   }
@@ -244,26 +264,27 @@ const currentScriptTag = document.currentScript;
   function restoreOriginalStyles() {
     if (!savedState) return;
     const aspectToUse = savedState.widget.paddingBottom;
-    widgetContainer.style.position     = savedState.widget.position || "";
-    widgetContainer.style.top          = savedState.widget.top || "";
-    widgetContainer.style.left         = savedState.widget.left || "";
-    widgetContainer.style.width        = "100%";
-    widgetContainer.style.height       = "0";
-    widgetContainer.style.maxWidth     = savedState.widget.maxWidth || "";
-    widgetContainer.style.maxHeight    = savedState.widget.maxHeight || "";
-    widgetContainer.style.paddingBottom= aspectToUse;
-    widgetContainer.style.margin       = savedState.widget.margin || "";
+
+    widgetContainer.style.position = savedState.widget.position || '';
+    widgetContainer.style.top = savedState.widget.top || '';
+    widgetContainer.style.left = savedState.widget.left || '';
+    widgetContainer.style.width = '100%';
+    widgetContainer.style.height = '0';
+    widgetContainer.style.maxWidth = savedState.widget.maxWidth || '';
+    widgetContainer.style.maxHeight = savedState.widget.maxHeight || '';
+    widgetContainer.style.paddingBottom = aspectToUse;
+    widgetContainer.style.margin = savedState.widget.margin || '';
     widgetContainer.classList.remove('fake-fullscreen');
 
-    viewerContainerElem.style.position      = "absolute";
-    viewerContainerElem.style.top           = "0";
-    viewerContainerElem.style.left          = "0";
-    viewerContainerElem.style.right         = "0";
-    viewerContainerElem.style.bottom        = "0";
-    viewerContainerElem.style.width         = "100%";
-    viewerContainerElem.style.height        = "100%";
-    viewerContainerElem.style.borderRadius  = savedState.viewer.borderRadius || "";
-    viewerContainerElem.style.border        = savedState.viewer.border || "";
+    viewerContainerElem.style.position = 'absolute';
+    viewerContainerElem.style.top = '0';
+    viewerContainerElem.style.left = '0';
+    viewerContainerElem.style.right = '0';
+    viewerContainerElem.style.bottom = '0';
+    viewerContainerElem.style.width = '100%';
+    viewerContainerElem.style.height = '100%';
+    viewerContainerElem.style.borderRadius = savedState.viewer.borderRadius || '';
+    viewerContainerElem.style.border = savedState.viewer.border || '';
 
     if (viewerModule.app) {
       viewerModule.app.resizeCanvas(
@@ -279,22 +300,22 @@ const currentScriptTag = document.currentScript;
   }
 
   function applyFullscreenStyles() {
-    widgetContainer.style.position      = 'fixed';
-    widgetContainer.style.top           = '0';
-    widgetContainer.style.left          = '0';
-    widgetContainer.style.width         = '100vw';
-    widgetContainer.style.height        = '100vh';
-    widgetContainer.style.maxWidth      = '100vw';
-    widgetContainer.style.maxHeight     = '100vh';
+    widgetContainer.style.position = 'fixed';
+    widgetContainer.style.top = '0';
+    widgetContainer.style.left = '0';
+    widgetContainer.style.width = '100vw';
+    widgetContainer.style.height = '100vh';
+    widgetContainer.style.maxWidth = '100vw';
+    widgetContainer.style.maxHeight = '100vh';
     widgetContainer.style.paddingBottom = '0';
-    widgetContainer.style.margin        = '0';
-    widgetContainer.style.border        = 'none';
-    widgetContainer.style.borderRadius  = '0';
+    widgetContainer.style.margin = '0';
+    widgetContainer.style.border = 'none';
+    widgetContainer.style.borderRadius = '0';
 
-    viewerContainerElem.style.width       = '100%';
-    viewerContainerElem.style.height      = '100%';
-    viewerContainerElem.style.borderRadius= '0';
-    viewerContainerElem.style.border      = 'none';
+    viewerContainerElem.style.width = '100%';
+    viewerContainerElem.style.height = '100%';
+    viewerContainerElem.style.borderRadius = '0';
+    viewerContainerElem.style.border = 'none';
 
     if (viewerModule.app) {
       viewerModule.app.resizeCanvas(window.innerWidth, window.innerHeight);
@@ -307,6 +328,7 @@ const currentScriptTag = document.currentScript;
 
   function enterFullscreen() {
     if (!savedState) saveCurrentState();
+
     if (isIOS) {
       applyFullscreenStyles();
       widgetContainer.classList.add('fake-fullscreen');
@@ -325,7 +347,7 @@ const currentScriptTag = document.currentScript;
 
   function exitFullscreen() {
     if (document.fullscreenElement === widgetContainer && document.exitFullscreen) {
-      document.exitFullscreen().catch(() => {});
+      document.exitFullscreen().catch(() => { /* noop */ });
     }
     widgetContainer.classList.remove('fake-fullscreen');
     restoreOriginalStyles();
@@ -350,10 +372,10 @@ const currentScriptTag = document.currentScript;
     setMenuContentMaxSize();
   });
 
+  // 10) Aide / reset
   helpToggle.addEventListener('click', (e) => {
     hideTooltipPanel();
     e.stopPropagation();
-    // Toggle menu panel
     if (menuContent.style.display === 'block') {
       menuContent.style.display = 'none';
     } else {
@@ -370,6 +392,7 @@ const currentScriptTag = document.currentScript;
     }
   });
 
+  // 11) Tooltips (bouton)
   if (tooltipsToggleBtn) {
     let tooltipsVisible = !!config.showTooltipsDefault;
     tooltipsToggleBtn.style.opacity = tooltipsVisible ? '1' : '0.5';
@@ -377,33 +400,64 @@ const currentScriptTag = document.currentScript;
       hideTooltipPanel();
       tooltipsVisible = !tooltipsVisible;
       tooltipsToggleBtn.style.opacity = tooltipsVisible ? '1' : '0.5';
-      document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: tooltipsVisible } }));
+
+      // Envoi global (compat actuel tooltips.js)
+      document.dispatchEvent(new CustomEvent('toggle-tooltips', {
+        detail: { visible: tooltipsVisible }
+      }));
+
+      // Envoi namespacé (si tu mets à jour tooltips.js pour l'écouter)
+      document.dispatchEvent(new CustomEvent(`toggle-tooltips-${instanceId}`, {
+        detail: { visible: tooltipsVisible, instanceId }
+      }));
     });
   }
 
+  // 12) Panneau tooltips : fermeture
   tooltipCloseBtn.addEventListener('click', hideTooltipPanel);
 
+  // 13) Gestion évènements "tooltip-selected"
+  // a) Évènement namespacé (préféré si tooltips.js est mis à jour)
+  const namespacedEvtName = `tooltip-selected-${instanceId}`;
+  document.addEventListener(namespacedEvtName, (evt) => {
+    const { title, description, imgUrl } = (evt.detail || {});
+    showTooltipPanel(title, description, imgUrl);
+  });
+
+  // b) Fallback évènement global (tooltips.js actuel)
+  //    Pour éviter les collisions multi-instances, on ne réagit que si
+  //    le pointeur survole VOTRE canvas au moment du clic.
+  let isPointerOver = false;
+  if (canvasEl) {
+    const enter = () => { isPointerOver = true; };
+    const leave = () => { isPointerOver = false; };
+    canvasEl.addEventListener('pointerenter', enter);
+    canvasEl.addEventListener('pointerleave', leave);
+    canvasEl.addEventListener('mouseenter', enter);
+    canvasEl.addEventListener('mouseleave', leave);
+  }
   document.addEventListener('tooltip-selected', (evt) => {
-    // Always show panel, cancel hide first
+    if (!isPointerOver) return; // ignorer les autres viewers
+    const { title, description, imgUrl } = (evt.detail || {});
+    showTooltipPanel(title, description, imgUrl);
+  });
+
+  function showTooltipPanel(title, description, imgUrl) {
+    // Annuler un éventuel handler différé
     if (dragHide) {
       viewerContainerElem.removeEventListener('pointermove', dragHide);
       dragHide = null;
     }
-    const { title, description, imgUrl } = evt.detail;
-    tooltipTextDiv.innerHTML = `<strong>${title}</strong><br>${description}`;
-    // Force a repaint: clear src before setting, for repeated images
+    tooltipTextDiv.innerHTML = `<strong>${title || ''}</strong><br>${description || ''}`;
     tooltipImage.style.display = 'none';
     tooltipImage.src = '';
     if (imgUrl) {
-      tooltipImage.onload = () => {
-        tooltipImage.style.display = 'block';
-      };
+      tooltipImage.onload = () => { tooltipImage.style.display = 'block'; };
       tooltipImage.src = imgUrl;
-    } else {
-      tooltipImage.style.display = 'none';
     }
     tooltipPanel.style.display = 'flex';
-    // --- DELAYED pointermove handler ---
+
+    // Cacher si on “traîne” (drag) ou touche
     setTimeout(() => {
       dragHide = (e) => {
         if ((e.pointerType === 'mouse' && e.buttons !== 0) || e.pointerType === 'touch') {
@@ -412,8 +466,9 @@ const currentScriptTag = document.currentScript;
       };
       viewerContainerElem.addEventListener('pointermove', dragHide);
     }, 100);
-  });
+  }
 
+  // 14) Divers
   if (canvasEl) {
     canvasEl.addEventListener('wheel', hideTooltipPanel, { passive: true });
   }
@@ -434,10 +489,13 @@ const currentScriptTag = document.currentScript;
     setMenuContentMaxSize();
   });
 
+  // 15) Init état par défaut
   setTimeout(() => {
     saveCurrentState();
-    document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: !!config.showTooltipsDefault } }));
+    // Toggler initial des tooltips
+    const initVisible = !!config.showTooltipsDefault;
+    document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: initVisible } }));
+    document.dispatchEvent(new CustomEvent(`toggle-tooltips-${instanceId}`, { detail: { visible: initVisible, instanceId } }));
     setMenuContentMaxSize();
   }, 200);
-
 })();