Update interface.js

interface.js

@@ -1,26 +1,13 @@
 // interface.js
 // ==============================
 
-// Store a reference to the <script> tag that loaded this file
+// Store reference to this script tag
 const currentScriptTag = document.currentScript;
 
 (async function() {
-  alert("[interface.js] SCRIPT BEGIN");
-
-  // 1. Locate the <script> and read 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')) {
-        scriptTag = scripts[i];
-        break;
-      }
-    }
-    if (!scriptTag && scripts.length > 0) {
-      scriptTag = scripts[scripts.length - 1];
-    }
-  }
+  // 1. Locate script tag and fetch config
+  let scriptTag = currentScriptTag || document.querySelector('script[src*="interface.js"][data-config]');
+  if (!scriptTag) return;
 
   const configUrl = scriptTag.getAttribute('data-config');
   let config = {};
@@ -28,77 +15,58 @@ const currentScriptTag = document.currentScript;
     try {
       const response = await fetch(configUrl);
       config = await response.json();
-      alert("[interface.js] Config loaded successfully");
     } catch (error) {
-      alert("[interface.js] ERROR: Config failed to load: " + error);
       return;
     }
   } else {
-    alert("[interface.js] ERROR: No config file provided.");
     return;
   }
 
-  // 2. If config.css_url is provided, inject a <link> to that CSS
+  // 2. Inject CSS if provided
   if (config.css_url) {
     const linkEl = document.createElement('link');
     linkEl.rel = "stylesheet";
     linkEl.href = config.css_url;
     document.head.appendChild(linkEl);
-    alert("[interface.js] CSS injected");
   }
 
-  // 3. Generate a unique instanceId for this widget
+  // 3. Generate unique instanceId
   const instanceId = Math.random().toString(36).substr(2, 8);
 
-  // 4. Compute the aspect ratio (padding-bottom %)
+  // 4. Compute aspect ratio padding-bottom
   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);
+      aspectPercent = (h / w * 100) + "%";
     } else {
-      const aspectValue = parseFloat(config.aspect);
-      if (!isNaN(aspectValue) && aspectValue > 0) {
-        aspectPercent = (100 / aspectValue) + "%";
-      }
-    }
-  } else {
-    const parentContainer = scriptTag.parentNode;
-    const containerWidth  = parentContainer.offsetWidth;
-    const containerHeight = parentContainer.offsetHeight;
-    if (containerWidth > 0 && containerHeight > 0) {
-      aspectPercent = (containerHeight / containerWidth * 100) + "%";
+      aspectPercent = (100 / parseFloat(config.aspect)) + "%";
     }
   }
 
-  // 5. Create the widget container (no GIF preview, no close button)
+  // 5. Create widget container
   const widgetContainer = document.createElement('div');
   widgetContainer.id = 'ply-widget-container-' + instanceId;
   widgetContainer.classList.add('ply-widget-container');
   widgetContainer.style.height = "0";
   widgetContainer.style.paddingBottom = aspectPercent;
-  widgetContainer.setAttribute('data-original-aspect', aspectPercent);
 
-  // Conditionally include the “tooltips-toggle” button only if config.tooltips_url is defined
+  // iOS-specific touch-action fix on container
+  widgetContainer.style.touchAction = "none";
+
+  // Tooltip button (if tooltips_url)
   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="Toggle 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="viewer-container-${instanceId}" class="viewer-container" style="touch-action:none">
       <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">
-        <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>
@@ -109,16 +77,13 @@ const currentScriptTag = document.currentScript;
       <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;" />
+        <img id="tooltip-image" class="tooltip-image" src="" style="display: none;" />
       </div>
     </div>
   `;
-
-  // Append the widget container immediately after the <script> tag
   scriptTag.parentNode.appendChild(widgetContainer);
-  alert("[interface.js] Widget HTML injected");
 
-  // 6. Grab references to new DOM elements
+  // 6. Grab DOM references
   const viewerContainerElem = document.getElementById('viewer-container-' + instanceId);
   const fullscreenToggle    = document.getElementById('fullscreen-toggle-' + instanceId);
   const helpToggle          = document.getElementById('help-toggle-' + instanceId);
@@ -127,283 +92,130 @@ 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
-  const isIOS    = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
+  // Detect mobile (iOS)
+  const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
-  // Conditionally include the French tooltip instruction line if tooltips_url exists
-  const tooltipInstruction = config.tooltips_url
-    ? '- Cliquez sur ⦿ pour afficher/masquer les tooltips.<br>'
-    : '';
-
-  // Fill help text with instructions plus the two new French lines
-  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>';
-  }
-
-  // Ensure instructions panel is visible by default
-  menuContent.style.display = 'block';
-  viewerContainerElem.style.display = 'block';
-
-  // Variable to hold the drag-hide listener reference
-  let dragHide = null;
-
-  // Utilities to hide panels
-  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
+  // 7. Help text
+  const tooltipsLine = config.tooltips_url ? '- Cliquez sur ⦿ pour afficher/masquer les tooltips.<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>
+        ${tooltipsLine}
+        - ⟲ 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>
+        ${tooltipsLine}
+        - ⟲ Réinitialise la caméra.<br>
+        - ⇱ Passe en plein écran.<br>`;
+
+  // 8. Dynamically load viewer.js
   let viewerModule;
   try {
     viewerModule = await import('https://mikafil-viewer-gs.static.hf.space/viewer.js');
-    alert("[interface.js] viewer.js module loaded");
     await viewerModule.initializeViewer(config, instanceId);
-    alert("[interface.js] viewer.js initializeViewer() returned");
   } catch (err) {
-    alert("[interface.js] ERROR: Failed to load or init viewer.js: " + err);
     return;
   }
+  const canvasEl = document.getElementById('canvas-' + instanceId);
 
-  const canvasId = 'canvas-' + instanceId;
-  const canvasEl = document.getElementById(canvasId);
-
-  // 8. Conditional display of tooltips-toggle button
-  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'; });
-    }
-  }
-
-  // 9. Fullscreen / state-preservation logic
-  let isFullscreen = false;
-  let savedState = null;
-
-  function saveCurrentState() {
-    if (isFullscreen) return;
-    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,
-        maxWidth: widgetContainer.style.maxWidth,
-        maxHeight:widgetContainer.style.maxHeight,
-        paddingBottom: widgetContainer.style.paddingBottom || originalAspect,
-        margin:   widgetContainer.style.margin,
-      },
-      viewer: {
-        borderRadius: viewerContainerElem.style.borderRadius,
-        border:       viewerContainerElem.style.border,
-      }
-    };
-  }
-
-  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.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 || "";
-
-    if (viewerModule.app) {
-      viewerModule.app.resizeCanvas(
-        viewerContainerElem.clientWidth,
-        viewerContainerElem.clientHeight
-      );
-    }
-
-    savedState = null;
-  }
-
-  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.paddingBottom = '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';
-
-    if (viewerModule.app) {
-      viewerModule.app.resizeCanvas(window.innerWidth, window.innerHeight);
-    }
-
-    fullscreenToggle.textContent = '⇲';
-    isFullscreen = true;
-  }
-
-  function enterFullscreen() {
-    alert("[interface.js] Entering fullscreen");
-    if (!savedState) saveCurrentState();
-    if (isIOS) {
-      applyFullscreenStyles();
-      widgetContainer.classList.add('fake-fullscreen');
-    } else if (widgetContainer.requestFullscreen) {
-      widgetContainer.requestFullscreen()
-        .then(applyFullscreenStyles)
-        .catch(() => {
-          applyFullscreenStyles();
-          widgetContainer.classList.add('fake-fullscreen');
-        });
-    } else {
-      applyFullscreenStyles();
-      widgetContainer.classList.add('fake-fullscreen');
-    }
-  }
-
-  function exitFullscreen() {
-    alert("[interface.js] Exiting fullscreen");
-    if (document.fullscreenElement === widgetContainer && document.exitFullscreen) {
-      document.exitFullscreen().catch(() => {});
-    }
-    widgetContainer.classList.remove('fake-fullscreen');
-    restoreOriginalStyles();
-    isFullscreen = false;
+  // iOS-specific CSS/touch fixes on canvas
+  if (canvasEl) {
+    canvasEl.style.touchAction = "none";
+    canvasEl.style.webkitTouchCallout = "none";
+    canvasEl.setAttribute('tabindex', '0');
+    // Prevent all zoom gestures
+    canvasEl.addEventListener('gesturestart', e => e.preventDefault());
+    canvasEl.addEventListener('gesturechange', e => e.preventDefault());
+    canvasEl.addEventListener('gestureend', e => e.preventDefault());
+    canvasEl.addEventListener('dblclick', e => e.preventDefault());
   }
 
-  // 10. Hook up event listeners
-  fullscreenToggle.addEventListener('click', () => {
-    hideTooltipPanel();
-    isFullscreen ? exitFullscreen() : enterFullscreen();
-  });
-  document.addEventListener('fullscreenchange', () => {
-    if (!document.fullscreenElement && isFullscreen) {
-      isFullscreen = false;
-      restoreOriginalStyles();
-    }
-  });
-
-  helpToggle.addEventListener('click', (e) => {
-    hideTooltipPanel();
-    e.stopPropagation();
-    menuContent.style.display = menuContent.style.display === 'block' ? 'none' : 'block';
-  });
-  helpCloseBtn.addEventListener('click', hideHelpPanel);
-
-  resetCameraBtn.addEventListener('click', () => {
-    hideTooltipPanel();
-    alert("[interface.js] Reset camera button clicked");
-    if (viewerModule.resetViewerCamera) {
-      viewerModule.resetViewerCamera();
-    }
-  });
-
+  // 9. Tooltip toggle logic
   if (tooltipsToggleBtn) {
     let tooltipsVisible = !!config.showTooltipsDefault;
     tooltipsToggleBtn.style.opacity = tooltipsVisible ? '1' : '0.5';
-    tooltipsToggleBtn.addEventListener('click', () => {
-      hideTooltipPanel();
+    tooltipsToggleBtn.onclick = () => {
       tooltipsVisible = !tooltipsVisible;
       tooltipsToggleBtn.style.opacity = tooltipsVisible ? '1' : '0.5';
-      alert("[interface.js] Tooltips toggle clicked. Now: " + (tooltipsVisible ? "ON" : "OFF"));
       document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: tooltipsVisible } }));
+    };
+    // Keyboard accessibility (Enter/Space toggles)
+    tooltipsToggleBtn.addEventListener('keydown', (e) => {
+      if (e.key === ' ' || e.key === 'Enter') {
+        e.preventDefault();
+        tooltipsToggleBtn.click();
+      }
     });
   }
 
-  tooltipCloseBtn.addEventListener('click', hideTooltipPanel);
+  // 10. Fullscreen logic
+  fullscreenToggle.onclick = () => {
+    if (document.fullscreenElement !== widgetContainer) {
+      widgetContainer.requestFullscreen().catch(() => {
+        // fallback: fake fullscreen (mobile)
+        widgetContainer.style.position = 'fixed';
+        widgetContainer.style.top = widgetContainer.style.left = 0;
+        widgetContainer.style.width = '100vw';
+        widgetContainer.style.height = '100vh';
+        widgetContainer.style.paddingBottom = '0';
+        widgetContainer.style.zIndex = 99999;
+      });
+    } else {
+      document.exitFullscreen();
+      // remove fake fullscreen
+      widgetContainer.style.position = "";
+      widgetContainer.style.width = "";
+      widgetContainer.style.height = "";
+      widgetContainer.style.paddingBottom = aspectPercent;
+      widgetContainer.style.zIndex = "";
+    }
+  };
+
+  // 11. Reset camera
+  resetCameraBtn.onclick = () => {
+    viewerModule.resetViewerCamera && viewerModule.resetViewerCamera();
+  };
 
-  document.addEventListener('tooltip-selected', (evt) => {
+  // 12. Help events
+  helpToggle.onclick = (e) => {
+    menuContent.style.display = menuContent.style.display === 'block' ? 'none' : 'block';
+    e.stopPropagation();
+  };
+  helpCloseBtn.onclick = () => menuContent.style.display = 'none';
+
+  // 13. Tooltip panel events
+  tooltipCloseBtn.onclick = () => tooltipPanel.style.display = 'none';
+
+  document.addEventListener('tooltip-selected', evt => {
     const { title, description, imgUrl } = evt.detail;
     tooltipTextDiv.innerHTML = `<strong>${title}</strong><br>${description}`;
     if (imgUrl) {
       tooltipImage.src = imgUrl;
       tooltipImage.style.display = 'block';
-    } else {
-      tooltipImage.style.display = 'none';
-    }
+    } else tooltipImage.style.display = 'none';
     tooltipPanel.style.display = 'flex';
-    dragHide = (e) => {
-      if ((e.pointerType === 'mouse' && e.buttons !== 0) || e.pointerType === 'touch') {
-        hideTooltipPanel();
-      }
-    };
-    viewerContainerElem.addEventListener('pointermove', dragHide);
+  });
+  document.addEventListener('hide-tooltip', () => {
+    tooltipPanel.style.display = 'none';
   });
 
+  // Hide tooltip panel on any interaction with canvas
   if (canvasEl) {
-    canvasEl.addEventListener('wheel', hideTooltipPanel, { passive: true });
+    canvasEl.addEventListener('pointerdown', () => { tooltipPanel.style.display = 'none'; });
+    canvasEl.addEventListener('wheel', () => { tooltipPanel.style.display = 'none'; }, { passive: true });
   }
-  document.addEventListener('keydown', (e) => {
-    if ((e.key === 'Escape' || e.key === 'Esc') && isFullscreen) exitFullscreen();
-  });
-  window.addEventListener('resize', () => {
-    if (viewerModule.app) {
-      if (isFullscreen) {
-        viewerModule.app.resizeCanvas(window.innerWidth, window.innerHeight);
-      } else {
-        viewerModule.app.resizeCanvas(
-          viewerContainerElem.clientWidth,
-          viewerContainerElem.clientHeight
-        );
-      }
-    }
-  });
 
+  // 14. Initial tooltips visibility if any
   setTimeout(() => {
-    saveCurrentState();
     document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: !!config.showTooltipsDefault } }));
-    alert("[interface.js] Widget setup complete!");
   }, 200);
-
 })();