@neurodyn/react-model-viewer 0.0.10 → 0.0.12

package/dist/index.d.ts

@@ -29,7 +29,15 @@ declare type ModelViewerBackground = 'default' | 'transparent';
 
 export declare function ModelViewerDialog({ tinuuid, apiKey, apiBaseUrl, legacyApiBaseUrl, initialWidgetSessionToken, handoffUrl, hid, sizeType, dimensionAxes, ...props }: ModelViewerDialogProps): JSX.Element;
 
-declare interface ModelViewerDialogProps extends Pick<ModelViewerRootProps, 'apiBaseUrl' | 'apiKey' | 'dimensionAxes' | 'handoffUrl' | 'hid' | 'initialWidgetSessionToken' | 'legacyApiBaseUrl' | 'sizeType' | 'tinuuid'>, Omit<DialogProps, 'children'> {
+declare interface ModelViewerDialogProps extends Pick<ModelViewerRootProps, 'apiBaseUrl' | 'apiKey' | 'dimensionAxes' | 'handoffUrl' | 'hid' | 'initialWidgetSessionToken' | 'legacyApiBaseUrl' | 'sizeType' | 'tinuuid'>, Omit<DialogProps, 'children' | 'open' | 'defaultOpen' | 'onOpenChange' | 'modal'> {
+    /** The controlled open state of the dialog. Use with `onOpenChange`. */
+    open?: DialogProps['open'];
+    /** The initial open state when the dialog is uncontrolled. */
+    defaultOpen?: DialogProps['defaultOpen'];
+    /** Called when the dialog's open state changes. */
+    onOpenChange?: DialogProps['onOpenChange'];
+    /** Whether interaction outside the dialog is disabled. Defaults to `true`. */
+    modal?: DialogProps['modal'];
 }
 
 export declare type ModelViewerLanguage = 'en' | 'ru';
@@ -42,7 +50,6 @@ export declare interface ModelViewerProps extends Omit<ModelViewerRootProps, 'sh
 declare interface ModelViewerRootProps {
     /** The unique identifier of a Vizbl object. */
     tinuuid: string;
-    /** Public API key. Without it, the viewer uses the legacy `/obj/Fetch` API. */
     apiKey?: string | null;
     /** App Clip bundle used by automatic Advanced AR handoffs. */
     appClipBundleId?: string;

package/dist/index.js

@@ -7040,6 +7040,9 @@ function resolveDirectArExperience(mode, arExperience) {
     if ('advanced-ar-view' === mode || 'ar-viewer' === mode || 'embedded-3d-viewer' === mode) return 'advanced';
     if ('qr-code' === mode) return arExperience;
 }
+function shouldAutoLaunchDirectAr(mode) {
+    return 'ar-viewer' !== mode && 'embedded-3d-viewer' !== mode;
+}
 function getUserAgent() {
     if ("u" < typeof navigator) return '';
     return navigator.userAgent || navigator.vendor || '';
@@ -7074,13 +7077,17 @@ function buildNativeArUrl(glbUrl, usdzUrl, objectType, ios = isIOSDevice()) {
     const verticalPlacement = 'wall' === objectType || 'ceiling' === objectType ? '&enable_vertical_placement=true' : '';
     return `intent://arvr.google.com/scene-viewer/1.0?file=${encodeURIComponent(new URL(glbUrl).toString())}&resizable=false${verticalPlacement}&mode=ar_preferred#Intent;scheme=https;package=com.google.android.googlequicksearchbox;action=android.intent.action.VIEW;end;`;
 }
-function launchDirectAr(options, openAppClipInNewTab = false) {
-    if ('advanced' === options.experience && isSupportedAppClipDevice()) {
-        const appClipUrl = buildAppClipUrl(options.appClipBundleId, options.tinuuid, options.hostname, options.hid);
-        if (openAppClipInNewTab) window.open(appClipUrl, '_blank');
-        else window.location.assign(appClipUrl);
-        return;
-    }
+function navigateToAppClip(url) {
+    try {
+        if (window.top && window.top !== window) {
+            window.top.location.href = url;
+            return;
+        }
+    } catch  {}
+    window.location.assign(url);
+}
+function launchDirectAr(options) {
+    if ('advanced' === options.experience && isSupportedAppClipDevice()) return void navigateToAppClip(buildAppClipUrl(options.appClipBundleId, options.tinuuid, options.hostname, options.hid));
     const link = document.createElement('a');
     const image = document.createElement('img');
     link.rel = 'ar';
@@ -7192,7 +7199,7 @@ function AR({ disabled, onClick, onBeforeActivateAr, size = 'lg', ...props }) {
         widgetSessionToken
     ]);
     useEffect(()=>{
-        if (!directArLaunchOptions || isLoading || !isMobileArDevice()) return;
+        if (!directArLaunchOptions || isLoading || !shouldAutoLaunchDirectAr(mode) || !isMobileArDevice()) return;
         const launchKey = [
             widgetSessionSid ?? 'legacy',
             directArLaunchOptions.tinuuid,
@@ -7219,6 +7226,7 @@ function AR({ disabled, onClick, onBeforeActivateAr, size = 'lg', ...props }) {
         isLoading,
         launchAr,
         material?.hid,
+        mode,
         trackEvent,
         widgetSessionSid
     ]);
@@ -7227,11 +7235,6 @@ function AR({ disabled, onClick, onBeforeActivateAr, size = 'lg', ...props }) {
         if (await launchArOverride(launchAr, arTarget)) return void onBeforeActivateAr?.();
         if (directArLaunchOptions && isMobileArDevice()) {
             onBeforeActivateAr?.();
-            if ('advanced' === directArLaunchOptions.experience && isSupportedAppClipDevice()) {
-                launchDirectAr(directArLaunchOptions, true);
-                trackEvent('ar_launched');
-                return;
-            }
             await flushWidgetEvent(trackEvent('ar_launched'));
             launchDirectAr(directArLaunchOptions);
         } else if (modelViewerEl.canActivateAR) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@neurodyn/react-model-viewer",
   "type": "module",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "publishConfig": {
     "access": "public"
   },