Update interface.js

interface.js

@@ -3,13 +3,17 @@
 
 const currentScriptTag = document.currentScript;
 
-(async function() {
-  // 1. Locate the <script> and read data-config
+(async function () {
+  // 1) Localiser la balise <script> et lire data-config
   let scriptTag = currentScriptTag;
+
   if (!scriptTag) {
     const scripts = document.getElementsByTagName('script');
     for (let i = 0; i < scripts.length; i++) {
-      if (scripts[i].src.includes('interface.js') && scripts[i].hasAttribute('data-config')) {
+      if (
+        scripts[i].src.includes('interface.js') &&
+        scripts[i].hasAttribute('data-config')
+      ) {
         scriptTag = scripts[i];
         break;
       }
@@ -21,61 +25,104 @@ const currentScriptTag = document.currentScript;
 
   const configUrl = scriptTag.getAttribute('data-config');
   let config = {};
+
   if (configUrl) {
     try {
       const response = await fetch(configUrl);
       config = await response.json();
     } catch (error) {
-      console.error("Could not load config: " + error);
       return;
     }
   } else {
-    console.error("No configUrl found for viewer");
+
+
+
+
+
+
+
+
     return;
   }
 
-  // 2. Inject CSS if specified
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  // 2) CSS optionnelle
   if (config.css_url) {
     const linkEl = document.createElement('link');
-    linkEl.rel = "stylesheet";
+    linkEl.rel = 'stylesheet';
     linkEl.href = config.css_url;
     document.head.appendChild(linkEl);
   }
 
-  // 3. Setup unique instanceId for this widget
+  // 3) ID d’instance
   const instanceId = Math.random().toString(36).substr(2, 8);
 
-  // 4. Calculate aspect ratio (for padding-bottom hack)
-  let aspectPercent = "100%";
+  // 4) Aspect ratio
+  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 {
-    // fallback: try to use parent container's aspect
     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 + '%';
     }
   }
 
-  // 5. Create the widget container and controls
+  // 5) 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);
 
@@ -83,6 +130,7 @@ const currentScriptTag = document.currentScript;
     ? `<button id="tooltips-toggle-${instanceId}" class="widget-button tooltips-toggle">⦿</button>`
     : '';
 
+  // HTML du widget (IDs spécifiques à l’instance)
   widgetContainer.innerHTML = `
     <div id="viewer-container-${instanceId}" class="viewer-container">
       <div id="progress-dialog-${instanceId}" class="progress-dialog">
@@ -99,155 +147,213 @@ const currentScriptTag = document.currentScript;
         <div class="help-text"></div>
       </div>
     </div>
-    <div id="tooltip-panel" class="tooltip-panel" style="display: none;">
+
+    <div id="tooltip-panel-${instanceId}" 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="tooltip-close-${instanceId}" class="tooltip-close">×</span>
+        <div id="tooltip-text-${instanceId}" class="tooltip-text"></div>
+        <img id="tooltip-image-${instanceId}" class="tooltip-image" src="" alt="" style="display: none;" />
       </div>
     </div>
   `;
 
+  // Insérer dans le DOM
   scriptTag.parentNode.appendChild(widgetContainer);
 
-  // 6. Grab references for UI controls
+  // 6) Références DOM de l’instance
   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');
+
+  const tooltipPanel = document.getElementById('tooltip-panel-' + instanceId);
+  const tooltipTextDiv = document.getElementById('tooltip-text-' + instanceId);
+  const tooltipImage = document.getElementById('tooltip-image-' + instanceId);
+  const tooltipCloseBtn = document.getElementById('tooltip-close-' + instanceId);
+
+  // 7) Aide / textes
+  const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
   const tooltipInstruction = config.tooltips_url
-    ? '- Cliquez sur ⦿ pour afficher/masquer les tooltips.<br>'
+    ? '- ⦿ : annotations.<br>'
     : '';
 
   if (isMobile) {
-    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>' +
+    helpTextDiv.innerHTML =
+      "- Déplacement avec deux doigts.<br>" +
+      "- Rotation avec un doigt.<br>" +
+      '- Zoom en pinçant avec deux doigts.<br>' +
       tooltipInstruction +
-      '- Cliquez sur ⟲ pour réinitialiser la caméra.<br>' +
-      '- Cliquez sur ⇱ pour passer en plein écran.<br>';
+      '- ⟲ réinitialisation de la caméra.<br>' +
+      '- ⇱ plein écran.<br>';
   } else {
-    helpTextDiv.innerHTML = 
-      '- Orbitez avec le clic droit<br>' +
-      '- Zoomez avec la molette<br>' +
-      '- Déplacez vous avec le clic gauche<br>' +
+    helpTextDiv.innerHTML =
+      '- Rotation avec le clic droit ou maj + ←↑↓→<br>' +
+      '- Zoom avec la molette ou ctrl + ↑↓<br>' +
+      '- Déplacement avec le clic gauche ou ←↑↓→<br>' +
       tooltipInstruction +
-      '- Cliquez sur ⟲ pour réinitialiser la caméra.<br>' +
-      '- Cliquez sur ⇱ pour passer en plein écran.<br>';
+      '- ⟲ réinitialisation de la caméra.<br>' +
+      '- ⇱ plein écran.<br>';
   }
 
-  // --- DYNAMIC MENU SIZING ---
+  // 8) Sizing dynamique du panneau d’aide
   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';
       }
     }
   }
+
+
   setMenuContentMaxSize();
   window.addEventListener('resize', setMenuContentMaxSize);
   document.addEventListener('fullscreenchange', setMenuContentMaxSize);
   window.addEventListener('orientationchange', setMenuContentMaxSize);
 
-  // --- HELP PANEL DEFAULT VISIBILITY ---
+  // 9) Aide visible par défaut
   menuContent.style.display = 'block';
-
   viewerContainerElem.style.display = 'block';
 
+  // 10) Gestion du panneau tooltips
   let dragHide = null;
 
   function hideTooltipPanel() {
     if (dragHide) {
       viewerContainerElem.removeEventListener('pointermove', dragHide);
       dragHide = null;
+
     }
     tooltipPanel.style.display = 'none';
   }
+
   function hideHelpPanel() {
     menuContent.style.display = 'none';
   }
 
-  // 7. Dynamically load viewer.js (modern ES2024 import, always fresh load)
+  // 11) Charger viewer.js (avec cache-busting par instance)
   let viewerModule;
   try {
-    viewerModule = await import('https://mikafil-viewer-sgos.static.hf.space/viewer.js?' + Date.now());
+    const viewerUrl = `https://mikafil-viewer-sgos.static.hf.space/viewer.js?inst=${instanceId}`;
+    viewerModule = await import(viewerUrl);
     await viewerModule.initializeViewer(config, instanceId);
   } catch (err) {
-    console.error("Could not load viewer.js: " + err);
     return;
   }
 
-  // 8. Canvas reference (for tooltips and resizing)
   const canvasId = 'canvas-' + instanceId;
   const canvasEl = document.getElementById(canvasId);
 
-  // 9. Tooltips toggle if any
+  // 12) Bouton tooltips : cacher si URL non valide
   if (tooltipsToggleBtn) {
     if (!config.tooltips_url) {
       tooltipsToggleBtn.style.display = 'none';
     } else {
       fetch(config.tooltips_url)
-        .then(resp => { if (!resp.ok) tooltipsToggleBtn.style.display = 'none'; })
-        .catch(() => { tooltipsToggleBtn.style.display = 'none'; });
+        .then((resp) => {
+          if (!resp.ok) tooltipsToggleBtn.style.display = 'none';
+        })
+        .catch(() => {
+          tooltipsToggleBtn.style.display = 'none';
+        });
     }
   }
 
+  // 13) Interactions locales / tooltips
+  if (canvasEl) {
+    canvasEl.addEventListener('wheel', hideTooltipPanel, { passive: true });
+  }
+
+  document.addEventListener('tooltip-selected', (evt) => {
+    // Toujours afficher le panneau, annuler un hide différé si présent
+    if (dragHide) {
+      viewerContainerElem.removeEventListener('pointermove', dragHide);
+      dragHide = null;
+    }
+
+    const { title, description, imgUrl } = evt.detail || {};
+    tooltipTextDiv.innerHTML = `<strong>${title || ''}</strong><br>${description || ''}`;
+
+    // Forcer un repaint : nettoyer src avant de réassigner
+    tooltipImage.style.display = 'none';
+    tooltipImage.src = '';
+
+    if (imgUrl) {
+      tooltipImage.onload = () => {
+        tooltipImage.style.display = 'block';
+      };
+      tooltipImage.src = imgUrl;
+    } else {
+      tooltipImage.style.display = 'none';
+    }
+
+    tooltipPanel.style.display = 'flex';
+
+    // Fermer en cas de drag (après un petit délai pour éviter un flicker)
+    setTimeout(() => {
+      dragHide = (e) => {
+        if (
+          (e.pointerType === 'mouse' && e.buttons !== 0) ||
+          e.pointerType === 'touch'
+        ) {
+          hideTooltipPanel();
+        }
+      };
+      viewerContainerElem.addEventListener('pointermove', dragHide);
+    }, 100);
+  });
+
+  // 14) Fullscreen
   let isFullscreen = false;
   let savedState = null;
 
   function saveCurrentState() {
     if (isFullscreen) return;
-    const originalAspect = widgetContainer.getAttribute('data-original-aspect') || aspectPercent;
+    const originalAspect =
+      widgetContainer.getAttribute('data-original-aspect') || aspectPercent;
+
     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
       }
     };
   }
@@ -255,26 +361,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(
@@ -289,28 +396,30 @@ const currentScriptTag = document.currentScript;
     setMenuContentMaxSize();
   }
 
+
   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);
     }
 
+
     if (fullscreenToggle) fullscreenToggle.textContent = '⇲';
     isFullscreen = true;
     setMenuContentMaxSize();
@@ -318,11 +427,13 @@ const currentScriptTag = document.currentScript;
 
   function enterFullscreen() {
     if (!savedState) saveCurrentState();
+
     if (isIOS) {
       applyFullscreenStyles();
       widgetContainer.classList.add('fake-fullscreen');
     } else if (widgetContainer.requestFullscreen) {
-      widgetContainer.requestFullscreen()
+      widgetContainer
+        .requestFullscreen()
         .then(applyFullscreenStyles)
         .catch(() => {
           applyFullscreenStyles();
@@ -361,10 +472,10 @@ const currentScriptTag = document.currentScript;
     setMenuContentMaxSize();
   });
 
+  // 15) Aide / boutons
   helpToggle.addEventListener('click', (e) => {
     hideTooltipPanel();
     e.stopPropagation();
-    // Toggle menu panel
     if (menuContent.style.display === 'block') {
       menuContent.style.display = 'none';
     } else {
@@ -372,6 +483,7 @@ const currentScriptTag = document.currentScript;
       setMenuContentMaxSize();
     }
   });
+
   helpCloseBtn.addEventListener('click', hideHelpPanel);
 
   resetCameraBtn.addEventListener('click', () => {
@@ -388,49 +500,21 @@ const currentScriptTag = document.currentScript;
       hideTooltipPanel();
       tooltipsVisible = !tooltipsVisible;
       tooltipsToggleBtn.style.opacity = tooltipsVisible ? '1' : '0.5';
-      document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: tooltipsVisible } }));
+      document.dispatchEvent(
+        new CustomEvent('toggle-tooltips', { detail: { visible: tooltipsVisible } })
+      );
     });
   }
 
   tooltipCloseBtn.addEventListener('click', hideTooltipPanel);
 
-  document.addEventListener('tooltip-selected', (evt) => {
-    // Always show panel, cancel hide first
-    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
-    tooltipImage.style.display = 'none';
-    tooltipImage.src = '';
-    if (imgUrl) {
-      tooltipImage.onload = () => {
-        tooltipImage.style.display = 'block';
-      };
-      tooltipImage.src = imgUrl;
-    } else {
-      tooltipImage.style.display = 'none';
+  // 16) Échappement / resize
+  document.addEventListener('keydown', (e) => {
+    if ((e.key === 'Escape' || e.key === 'Esc') && isFullscreen) {
+      exitFullscreen();
     }
-    tooltipPanel.style.display = 'flex';
-    // --- DELAYED pointermove handler ---
-    setTimeout(() => {
-      dragHide = (e) => {
-        if ((e.pointerType === 'mouse' && e.buttons !== 0) || e.pointerType === 'touch') {
-          hideTooltipPanel();
-        }
-      };
-      viewerContainerElem.addEventListener('pointermove', dragHide);
-    }, 100);
   });
 
-  if (canvasEl) {
-    canvasEl.addEventListener('wheel', hideTooltipPanel, { passive: true });
-  }
-  document.addEventListener('keydown', (e) => {
-    if ((e.key === 'Escape' || e.key === 'Esc') && isFullscreen) exitFullscreen();
-  });
   window.addEventListener('resize', () => {
     if (viewerModule.app) {
       if (isFullscreen) {
@@ -445,10 +529,14 @@ const currentScriptTag = document.currentScript;
     setMenuContentMaxSize();
   });
 
+  // 17) Init par défaut
   setTimeout(() => {
+    // Sauvegarder l’état non-fullscreen
     saveCurrentState();
-    document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: !!config.showTooltipsDefault } }));
+    // Propager l’état par défaut des tooltips
+    document.dispatchEvent(
+      new CustomEvent('toggle-tooltips', { detail: { visible: !!config.showTooltipsDefault } })
+    );
     setMenuContentMaxSize();
   }, 200);
-
-})();
+})();