Update interface.js

interface.js

@@ -1,7 +1,6 @@
 // interface.js
 // ==============================
 
-// Store a reference to the <script> tag that loaded this file
 const currentScriptTag = document.currentScript;
 
 (async function() {
@@ -24,15 +23,12 @@ const currentScriptTag = document.currentScript;
   let config = {};
   if (configUrl) {
     try {
-      const response = await fetch(configUrl);
+      const response = await fetch(configUrl, { cache: 'no-store' }); // iOS fix: avoid cache/cors issues
       config = await response.json();
     } catch (error) {
-      // Silent fail, but log in dev environments
-      // console.error("Error loading config file:", error);
       return;
     }
   } else {
-    // console.error("No config file provided. Please set a data-config attribute on the <script> tag.");
     return;
   }
 
@@ -72,7 +68,7 @@ const currentScriptTag = document.currentScript;
     }
   }
 
-  // 5. Create the widget container (no GIF preview, no close button)
+  // 5. Create the widget container
   const widgetContainer = document.createElement('div');
   widgetContainer.id = 'ply-widget-container-' + instanceId;
   widgetContainer.classList.add('ply-widget-container');
@@ -80,20 +76,18 @@ const currentScriptTag = document.currentScript;
   widgetContainer.style.paddingBottom = aspectPercent;
   widgetContainer.setAttribute('data-original-aspect', aspectPercent);
 
-  // Conditionally include the “tooltips-toggle” button only if config.tooltips_url is defined
   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" aria-label="Tooltips">⦿</button>`
     : '';
 
-  // Add the 3D-viewer HTML + tooltip + help HTML (all HTML in a template literal!)
   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" aria-label="Fullscreen">⇱</button>
+      <button id="help-toggle-${instanceId}" class="widget-button help-toggle" aria-label="Help">?</button>
+      <button id="reset-camera-btn-${instanceId}" class="widget-button reset-camera-btn" aria-label="Reset Camera">
         <span class="reset-icon">⟲</span>
       </button>
       ${tooltipsButtonHTML}
@@ -111,7 +105,7 @@ const currentScriptTag = document.currentScript;
     </div>
   `;
 
-  // Append the widget container immediately after the <script> tag
+  // Append the widget container after the <script> tag
   scriptTag.parentNode.appendChild(widgetContainer);
 
   // 6. Grab references to new DOM elements
@@ -123,14 +117,12 @@ 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
+  // 6a. Device detection
   const isIOS    = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
@@ -139,9 +131,9 @@ const currentScriptTag = document.currentScript;
     ? '- Cliquez sur ⦿ pour afficher/masquer les tooltips.<br>'
     : '';
 
-  // Fill help text with instructions plus the two new French lines
+  // Fill help text with instructions plus French lines
   if (isMobile) {
-    helpTextDiv.innerHTML = 
+    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>' +
@@ -149,7 +141,7 @@ const currentScriptTag = document.currentScript;
       '- ⟲ Réinitialise la caméra.<br>' +
       '- ⇱ Passe en plein écran.<br>';
   } else {
-    helpTextDiv.innerHTML = 
+    helpTextDiv.innerHTML =
       '- orbitez avec le clic droit<br>' +
       '- zoomez avec la molette<br>' +
       '- déplacez vous avec le clic gauche<br>' +
@@ -158,14 +150,12 @@ const currentScriptTag = document.currentScript;
       '- ⇱ Passe en plein écran.<br>';
   }
 
-  // Ensure instructions panel is visible by default
+  // Show help panel by default
   menuContent.style.display = 'block';
   viewerContainerElem.style.display = 'block';
 
-  // Variable to hold the drag-hide listener reference
+  // Drag-to-hide reference
   let dragHide = null;
-
-  // Utilities to hide panels
   function hideTooltipPanel() {
     if (dragHide) {
       viewerContainerElem.removeEventListener('pointermove', dragHide);
@@ -180,17 +170,17 @@ const currentScriptTag = document.currentScript;
   // 7. Dynamically load viewer.js
   let viewerModule;
   try {
+    // --- iOS model loading fix: set up custom fetch to ensure PLY loads as ArrayBuffer, not text ---
+    window.PLY_FORCE_ARRAYBUFFER = true;
     viewerModule = await import('https://mikafil-viewer-gs.static.hf.space/viewer.js');
     await viewerModule.initializeViewer(config, instanceId);
   } catch (err) {
-    // Do not break UI, but don't continue
     return;
   }
-
   const canvasId = 'canvas-' + instanceId;
   const canvasEl = document.getElementById(canvasId);
 
-  // 8. Conditional display of tooltips-toggle button
+  // 8. Tooltips button display: robust logic
   if (tooltipsToggleBtn) {
     if (!config.tooltips_url) {
       tooltipsToggleBtn.style.display = 'none';
@@ -226,7 +216,6 @@ const currentScriptTag = document.currentScript;
       }
     };
   }
-
   function restoreOriginalStyles() {
     if (!savedState) return;
     const aspectToUse = savedState.widget.paddingBottom;
@@ -260,7 +249,6 @@ const currentScriptTag = document.currentScript;
 
     savedState = null;
   }
-
   function applyFullscreenStyles() {
     widgetContainer.style.position      = 'fixed';
     widgetContainer.style.top           = '0';
@@ -286,7 +274,6 @@ const currentScriptTag = document.currentScript;
     fullscreenToggle.textContent = '⇲';
     isFullscreen = true;
   }
-
   function enterFullscreen() {
     if (!savedState) saveCurrentState();
     if (isIOS) {
@@ -304,7 +291,6 @@ const currentScriptTag = document.currentScript;
       widgetContainer.classList.add('fake-fullscreen');
     }
   }
-
   function exitFullscreen() {
     if (document.fullscreenElement === widgetContainer && document.exitFullscreen) {
       document.exitFullscreen().catch(() => {});
@@ -340,13 +326,16 @@ const currentScriptTag = document.currentScript;
     }
   });
 
+  // Tooltips toggle: robust UI state
   if (tooltipsToggleBtn) {
     let tooltipsVisible = !!config.showTooltipsDefault;
     tooltipsToggleBtn.style.opacity = tooltipsVisible ? '1' : '0.5';
+    tooltipsToggleBtn.setAttribute('aria-pressed', tooltipsVisible ? 'true' : 'false');
     tooltipsToggleBtn.addEventListener('click', () => {
       hideTooltipPanel();
       tooltipsVisible = !tooltipsVisible;
       tooltipsToggleBtn.style.opacity = tooltipsVisible ? '1' : '0.5';
+      tooltipsToggleBtn.setAttribute('aria-pressed', tooltipsVisible ? 'true' : 'false');
       document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: tooltipsVisible } }));
     });
   }
@@ -371,6 +360,8 @@ const currentScriptTag = document.currentScript;
     viewerContainerElem.addEventListener('pointermove', dragHide);
   });
 
+  document.addEventListener('hide-tooltip', hideTooltipPanel);
+
   if (canvasEl) {
     canvasEl.addEventListener('wheel', hideTooltipPanel, { passive: true });
   }