Update interface.js

interface.js

@@ -1,11 +1,9 @@
 // interface.js
-// ==============================
 
-// Store a reference to the <script> tag that loaded this file
 const currentScriptTag = document.currentScript;
 
 (async function() {
-  // 1. Locate the <script> and read data-config
+  // 1. Locate script tag and read data-config
   let scriptTag = currentScriptTag;
   if (!scriptTag) {
     const scripts = document.getElementsByTagName('script');
@@ -26,14 +24,12 @@ const currentScriptTag = document.currentScript;
     try {
       const response = await fetch(configUrl);
       config = await response.json();
-    } catch (error) {
-      return;
-    }
+    } catch (error) { return; }
   } else {
     return;
   }
 
-  // 2. If config.css_url is provided, inject a <link> to that CSS
+  // 2. CSS injection
   if (config.css_url) {
     const linkEl = document.createElement('link');
     linkEl.rel = "stylesheet";
@@ -41,24 +37,18 @@ const currentScriptTag = document.currentScript;
     document.head.appendChild(linkEl);
   }
 
-  // 3. Generate a unique instanceId for this widget
+  // 3. Unique instanceId
   const instanceId = Math.random().toString(36).substr(2, 8);
 
-  // 4. Compute the aspect ratio (padding-bottom %)
+  // 4. Aspect ratio calc
   let aspectPercent = "100%";
   if (config.aspect) {
     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) + "%";
-      }
+      const [w, h] = config.aspect.split(":").map(Number);
+      if (w > 0 && h > 0) aspectPercent = (h / w * 100) + "%";
     } else {
       const aspectValue = parseFloat(config.aspect);
-      if (!isNaN(aspectValue) && aspectValue > 0) {
-        aspectPercent = (100 / aspectValue) + "%";
-      }
+      if (!isNaN(aspectValue) && aspectValue > 0) aspectPercent = (100 / aspectValue) + "%";
     }
   } else {
     const parentContainer = scriptTag.parentNode;
@@ -69,7 +59,7 @@ const currentScriptTag = document.currentScript;
     }
   }
 
-  // 5. Create the widget container
+  // 5. Widget container
   const widgetContainer = document.createElement('div');
   widgetContainer.id = 'ply-widget-container-' + instanceId;
   widgetContainer.classList.add('ply-widget-container');
@@ -77,29 +67,42 @@ const currentScriptTag = document.currentScript;
   widgetContainer.style.paddingBottom = aspectPercent;
   widgetContainer.setAttribute('data-original-aspect', aspectPercent);
 
+  // 5a. Ensure touch-action disables iOS Safari pinch/zoom/scroll on viewer
+  widgetContainer.style.touchAction = 'none';
+
+  // 5b. Set iOS meta viewport to prevent zoom
+  if (!document.querySelector('meta[name="viewport"]')) {
+    const meta = document.createElement('meta');
+    meta.name = "viewport";
+    meta.content = "width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0";
+    document.head.appendChild(meta);
+  }
+
+  // Tooltips toggle button (if configured)
   const tooltipsButtonHTML = config.tooltips_url
-    ? `<button id="tooltips-toggle-${instanceId}" class="widget-button tooltips-toggle">⦿</button>`
+    ? `<button id="tooltips-toggle-${instanceId}" class="widget-button tooltips-toggle" tabindex="0" aria-label="Afficher/masquer tooltips">⦿</button>`
     : '';
 
+  // Viewer HTML
   widgetContainer.innerHTML = `
     <div id="viewer-container-${instanceId}" class="viewer-container">
       <div id="progress-dialog-${instanceId}" class="progress-dialog">
         <progress id="progress-indicator-${instanceId}" max="100" value="0"></progress>
       </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">
+      <button id="fullscreen-toggle-${instanceId}" class="widget-button fullscreen-toggle" tabindex="0" aria-label="Plein écran">⇱</button>
+      <button id="help-toggle-${instanceId}" class="widget-button help-toggle" tabindex="0" aria-label="Aide">?</button>
+      <button id="reset-camera-btn-${instanceId}" class="widget-button reset-camera-btn" tabindex="0" aria-label="Réinitialiser caméra">
         <span class="reset-icon">⟲</span>
       </button>
       ${tooltipsButtonHTML}
       <div id="menu-content-${instanceId}" class="menu-content">
-        <span id="help-close-${instanceId}" class="help-close">×</span>
+        <span id="help-close-${instanceId}" class="help-close" tabindex="0" aria-label="Fermer">×</span>
         <div class="help-text"></div>
       </div>
     </div>
     <div id="tooltip-panel" class="tooltip-panel" style="display: none;">
       <div class="tooltip-content">
-        <span id="tooltip-close" class="tooltip-close">×</span>
+        <span id="tooltip-close" class="tooltip-close" tabindex="0" aria-label="Fermer">×</span>
         <div id="tooltip-text" class="tooltip-text"></div>
         <img id="tooltip-image" class="tooltip-image" src="" alt="" style="display: none;" />
       </div>
@@ -108,7 +111,7 @@ const currentScriptTag = document.currentScript;
 
   scriptTag.parentNode.appendChild(widgetContainer);
 
-  // 6. Grab references to new DOM elements
+  // 6. DOM references
   const viewerContainerElem = document.getElementById('viewer-container-' + instanceId);
   const fullscreenToggle    = document.getElementById('fullscreen-toggle-' + instanceId);
   const helpToggle          = document.getElementById('help-toggle-' + instanceId);
@@ -117,53 +120,25 @@ const currentScriptTag = document.currentScript;
   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');
 
-  // Tooltip panel elements
-  const tooltipPanel       = document.getElementById('tooltip-panel');
-  const tooltipTextDiv     = document.getElementById('tooltip-text');
-  const tooltipImage       = document.getElementById('tooltip-image');
-  const tooltipCloseBtn    = document.getElementById('tooltip-close');
-
-  // 6a. Detect mobile vs. desktop
+  // Platform detection
   const isIOS    = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
-  // Prevent iOS pinch-zoom and double-tap zoom on the container
-  if (isIOS) {
-    widgetContainer.style.touchAction = "none";
-    widgetContainer.addEventListener('touchmove', function(e) {
-      // Prevent all default browser zooms/scrolls on the widget area
-      if (e.touches.length > 1) e.preventDefault();
-    }, { passive: false });
-  }
-
-  // French help/instructions
+  // Help text
   const tooltipInstruction = config.tooltips_url
     ? '- Cliquez sur ⦿ pour afficher/masquer les tooltips.<br>'
     : '';
-
-  if (isMobile) {
-    helpTextDiv.innerHTML =
-      '- Pour vous déplacer, glissez deux doigts sur l\'écran.<br>' +
-      '- Pour orbiter, utilisez un doigt.<br>' +
-      '- Pour zoomer, pincez avec deux doigts.<br>' +
-      tooltipInstruction +
-      '- ⟲ Réinitialise la caméra.<br>' +
-      '- ⇱ Passe en 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>' +
-      tooltipInstruction +
-      '- ⟲ Réinitialise la caméra.<br>' +
-      '- ⇱ Passe en plein écran.<br>';
-  }
-
+  helpTextDiv.innerHTML = isMobile
+    ? '- Pour vous déplacer, glissez deux doigts sur l\'écran.<br>- Pour orbiter, utilisez un doigt.<br>- Pour zoomer, pincez avec deux doigts.<br>' + tooltipInstruction + '- ⟲ Réinitialise la caméra.<br>- ⇱ Passe en plein écran.<br>'
+    : '- orbitez avec le clic droit<br>- zoomez avec la molette<br>- déplacez vous avec le clic gauche<br>' + tooltipInstruction + '- ⟲ Réinitialise la caméra.<br>- ⇱ Passe en plein écran.<br>';
   menuContent.style.display = 'block';
   viewerContainerElem.style.display = 'block';
 
-  // Variable to hold the drag-hide listener reference
   let dragHide = null;
 
   function hideTooltipPanel() {
@@ -173,35 +148,29 @@ const currentScriptTag = document.currentScript;
     }
     tooltipPanel.style.display = 'none';
   }
-  function hideHelpPanel() {
-    menuContent.style.display = 'none';
-  }
+  function hideHelpPanel() { menuContent.style.display = 'none'; }
 
-  // 7. Dynamically load viewer.js
+  // 7. Load viewer.js
   let viewerModule;
   try {
     viewerModule = await import('https://mikafil-viewer-gs.static.hf.space/viewer.js');
     await viewerModule.initializeViewer(config, instanceId);
-  } catch (err) {
-    return;
-  }
+  } catch (err) { return; }
 
   const canvasId = 'canvas-' + instanceId;
   const canvasEl = document.getElementById(canvasId);
 
-  // Prevent iOS double-tap to zoom on the canvas
-  if (isIOS && canvasEl) {
-    let lastTouch = 0;
-    canvasEl.addEventListener('touchend', function(e) {
-      const now = new Date().getTime();
-      if (now - lastTouch <= 400) {
-        e.preventDefault();
-      }
-      lastTouch = now;
-    }, { passive: false });
+  // 7b. Fix for iOS: always use correct canvas style and prevent double-scaling
+  if (canvasEl) {
+    canvasEl.style.touchAction = 'none';
+    canvasEl.style.width = '100%';
+    canvasEl.style.height = '100%';
+    canvasEl.style.display = 'block';
+    // Remove any tab focus from canvas to prevent scroll-zoom
+    canvasEl.setAttribute('tabindex', '-1');
   }
 
-  // 8. Conditional display of tooltips-toggle button
+  // 8. Tooltips button conditional display
   if (tooltipsToggleBtn) {
     if (!config.tooltips_url) {
       tooltipsToggleBtn.style.display = 'none';
@@ -212,10 +181,9 @@ const currentScriptTag = document.currentScript;
     }
   }
 
-  // 9. Fullscreen / state-preservation logic
+  // 9. Fullscreen/state logic
   let isFullscreen = false;
   let savedState = null;
-
   function saveCurrentState() {
     if (isFullscreen) return;
     const originalAspect = widgetContainer.getAttribute('data-original-aspect') || aspectPercent;
@@ -237,7 +205,6 @@ const currentScriptTag = document.currentScript;
       }
     };
   }
-
   function restoreOriginalStyles() {
     if (!savedState) return;
     const aspectToUse = savedState.widget.paddingBottom;
@@ -268,10 +235,8 @@ const currentScriptTag = document.currentScript;
         viewerContainerElem.clientHeight
       );
     }
-
     savedState = null;
   }
-
   function applyFullscreenStyles() {
     widgetContainer.style.position      = 'fixed';
     widgetContainer.style.top           = '0';
@@ -297,7 +262,6 @@ const currentScriptTag = document.currentScript;
     fullscreenToggle.textContent = '⇲';
     isFullscreen = true;
   }
-
   function enterFullscreen() {
     if (!savedState) saveCurrentState();
     if (isIOS) {
@@ -315,7 +279,6 @@ const currentScriptTag = document.currentScript;
       widgetContainer.classList.add('fake-fullscreen');
     }
   }
-
   function exitFullscreen() {
     if (document.fullscreenElement === widgetContainer && document.exitFullscreen) {
       document.exitFullscreen().catch(() => {});
@@ -325,7 +288,7 @@ const currentScriptTag = document.currentScript;
     isFullscreen = false;
   }
 
-  // 10. Hook up event listeners
+  // 10. Event listeners
   fullscreenToggle.addEventListener('click', () => {
     hideTooltipPanel();
     isFullscreen ? exitFullscreen() : enterFullscreen();
@@ -361,7 +324,6 @@ const currentScriptTag = document.currentScript;
       document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: tooltipsVisible } }));
     });
   }
-
   tooltipCloseBtn.addEventListener('click', hideTooltipPanel);
 
   document.addEventListener('tooltip-selected', (evt) => {
@@ -383,16 +345,15 @@ const currentScriptTag = document.currentScript;
   });
 
   if (canvasEl) {
-    // Prevent pinch-zoom and double-tap zoom on iOS (extra guard)
-    if (isIOS) {
-      canvasEl.style.touchAction = "none";
-      canvasEl.addEventListener('gesturestart', e => e.preventDefault());
-      canvasEl.addEventListener('gesturechange', e => e.preventDefault());
-      canvasEl.addEventListener('gestureend', e => e.preventDefault());
-    }
     canvasEl.addEventListener('wheel', hideTooltipPanel, { passive: true });
-  }
 
+    // iOS pinch zoom prevention
+    canvasEl.addEventListener('touchmove', function(e) {
+      if (e.touches.length > 1) {
+        e.preventDefault();
+      }
+    }, { passive: false });
+  }
   document.addEventListener('keydown', (e) => {
     if ((e.key === 'Escape' || e.key === 'Esc') && isFullscreen) exitFullscreen();
   });
@@ -409,9 +370,45 @@ const currentScriptTag = document.currentScript;
     }
   });
 
+  // iOS: unlock WebGL/audio on first user gesture (if needed)
+  if (isIOS && canvasEl) {
+    let firstUserAction = false;
+    function unlockWebGLAndAudio() {
+      if (!firstUserAction) {
+        if (viewerModule.app && viewerModule.app.graphicsDevice && viewerModule.app.graphicsDevice.canvas) {
+          // iOS hack: force focus and dummy audio play
+          viewerModule.app.graphicsDevice.canvas.focus && viewerModule.app.graphicsDevice.canvas.focus();
+          try {
+            const ctx = new AudioContext();
+            const buffer = ctx.createBuffer(1, 1, 22050);
+            const src = ctx.createBufferSource();
+            src.buffer = buffer;
+            src.connect(ctx.destination);
+            src.start(0);
+          } catch {}
+        }
+        firstUserAction = true;
+      }
+    }
+    canvasEl.addEventListener('touchstart', unlockWebGLAndAudio, { once: true });
+    canvasEl.addEventListener('mousedown', unlockWebGLAndAudio, { once: true });
+  }
+
   setTimeout(() => {
     saveCurrentState();
     document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: !!config.showTooltipsDefault } }));
   }, 200);
 
+  // Ensure ResizeObserver always triggers a correct canvas resize (iOS)
+  if (canvasEl && window.ResizeObserver) {
+    const resizeObs = new ResizeObserver(() => {
+      if (viewerModule.app) {
+        viewerModule.app.resizeCanvas(
+          viewerContainerElem.clientWidth,
+          viewerContainerElem.clientHeight
+        );
+      }
+    });
+    resizeObs.observe(viewerContainerElem);
+  }
 })();