@neurodyn/react-room-viewer 0.0.28 → 0.0.30

package/dist/index.d.ts

@@ -52,6 +52,8 @@ declare const resources: {
                 readonly viewInPlace: "View in place";
                 readonly scanQrCode: "Scan this QR code with your phone's camera to view the object in Augmented Reality";
                 readonly deviceRequirementsDisclaimer: "*Requires AR-supported device and browser. We recommend iOS 18 or later with Safari, or Android 7.0 or later with Chrome.";
+                readonly appClipScanTitle: "Scan with your phone camera";
+                readonly appClipRequirement: "AR view works on iOS 18 or later";
             };
             readonly legal: {
                 readonly termsOfUse: "Terms of Use";
@@ -190,6 +192,8 @@ declare const resources: {
                 readonly viewInPlace: "Примерить в комнате";
                 readonly scanQrCode: "Отсканируйте этот QR-код камерой телефона, чтобы просмотреть объект в дополненной реальности";
                 readonly deviceRequirementsDisclaimer: "*Требуется устройство и браузер с поддержкой AR. Рекомендуем iOS 18 или новее с Safari либо Android 7.0 или новее с Chrome.";
+                readonly appClipScanTitle: "Наведите камеру телефона";
+                readonly appClipRequirement: "AR-просмотр работает на iOS 18 и новее";
             };
             readonly legal: {
                 readonly termsOfUse: "Условия использования";

package/dist/index.js

@@ -6672,7 +6672,9 @@ const ns1 = {
     ar: {
         viewInPlace: 'View in place',
         scanQrCode: 'Scan this QR code with your phone\'s camera to view the object in Augmented Reality',
-        deviceRequirementsDisclaimer: '*Requires AR-supported device and browser. We recommend iOS 18 or later with Safari, or Android 7.0 or later with Chrome.'
+        deviceRequirementsDisclaimer: '*Requires AR-supported device and browser. We recommend iOS 18 or later with Safari, or Android 7.0 or later with Chrome.',
+        appClipScanTitle: 'Scan with your phone camera',
+        appClipRequirement: 'AR view works on iOS 18 or later'
     },
     legal: {
         termsOfUse: 'Terms of Use',
@@ -6809,7 +6811,9 @@ const ns1_ns1 = {
     ar: {
         viewInPlace: 'Примерить в комнате',
         scanQrCode: 'Отсканируйте этот QR-код камерой телефона, чтобы просмотреть объект в дополненной реальности',
-        deviceRequirementsDisclaimer: '*Требуется устройство и браузер с поддержкой AR. Рекомендуем iOS 18 или новее с Safari либо Android 7.0 или новее с Chrome.'
+        deviceRequirementsDisclaimer: '*Требуется устройство и браузер с поддержкой AR. Рекомендуем iOS 18 или новее с Safari либо Android 7.0 или новее с Chrome.',
+        appClipScanTitle: 'Наведите камеру телефона',
+        appClipRequirement: 'AR-просмотр работает на iOS 18 и новее'
     },
     legal: {
         termsOfUse: 'Условия использования',
@@ -7665,18 +7669,25 @@ function sendWidgetEvent(session, event, options = {}) {
 }
 async function getRoomViewerPublicApiHeaders(options) {
     const headers = {
-        'x-api-key': options.apiKey
+        'x-api-key': options.apiKey,
+        ...getRoomViewerLanguageHeaders(options)
     };
     const token = await options.widgetSession?.getTokenForRequest();
     if (token) headers[WIDGET_SESSION_TOKEN_HEADER] = token;
     return headers;
 }
+function getRoomViewerLanguageHeaders(options) {
+    return options.language ? {
+        Lang: options.language
+    } : void 0;
+}
 function roomViewerObjectQueryKey(tinuuid, options) {
     return [
         'room-viewer',
         'object',
         {
             apiKey: options.apiKey ?? null,
+            language: options.language ?? null,
             source: options.source,
             tinuuid: tinuuid ?? null,
             resourceType: options.resourceType ?? null
@@ -7689,6 +7700,7 @@ function roomViewerOwnerObjectsQueryKey(ownerUuid, options) {
         'public-objects',
         {
             apiKey: options.apiKey ?? null,
+            language: options.language ?? null,
             ownerUuid: ownerUuid ?? null,
             resourceType: options.resourceType ?? null,
             source: options.source
@@ -7701,6 +7713,7 @@ function roomViewerKitObjectsQueryKey(kitUuid, ownerUuid, options) {
         'kit-objects',
         {
             apiKey: options.apiKey ?? null,
+            language: options.language ?? null,
             kitUuid: kitUuid ?? null,
             ownerUuid: ownerUuid ?? null,
             resourceType: options.resourceType ?? null,
@@ -7712,6 +7725,7 @@ async function fetchRoomViewerObject(tinuuid, options) {
     if (!shouldUseRoomViewerPublicApi(options)) return objFetch({
         tinuuid
     }, {
+        headers: getRoomViewerLanguageHeaders(options),
         signal: options.signal
     });
     const { query, config } = getRoomViewerPublicApiQuery(options);
@@ -7735,6 +7749,7 @@ async function fetchRoomViewerOwnerObjects(ownerUuid, page, options) {
         ...data,
         productType: getRoomViewerBackendProductType(options)
     }, {
+        headers: getRoomViewerLanguageHeaders(options),
         signal: options.signal
     });
     const { query, config } = getRoomViewerPublicApiQuery(options);
@@ -7762,6 +7777,7 @@ async function fetchRoomViewerKitObjects(kitUuid, _ownerUuid, page, options) {
         page
     }, {
         baseURL: getRoomViewerBackendApiBaseUrl(options.baseURL),
+        headers: getRoomViewerLanguageHeaders(options),
         signal: options.signal
     });
     return {
@@ -7776,6 +7792,7 @@ function roomViewerRoomsQueryKey(options) {
         'rooms',
         {
             apiKey: options.apiKey ?? null,
+            language: options.language ?? null,
             source: options.source,
             resourceType: options.resourceType ?? null,
             widgetSessionId: options.widgetSession?.sid ?? null
@@ -8900,17 +8917,19 @@ function getRoomViewerOwnerObjectsNextPage(lastPage, lastPageParam) {
     return lastPageParam + 1;
 }
 function useRoomViewerWallResourceMaterialOptions() {
-    const { material, setMaterial, setTinuuid, apiKey, baseURL, source, widgetSession } = useRoomViewerResource();
+    const { material, setMaterial, setTinuuid, apiKey, baseURL, language, source, widgetSession } = useRoomViewerResource();
     const queries = useQueries({
         queries: RAM_TINUUIDS.map((tinuuid)=>({
                 queryKey: roomViewerObjectQueryKey(tinuuid, {
                     apiKey,
                     baseURL,
+                    language,
                     source
                 }),
                 queryFn: ({ signal })=>fetchRoomViewerObject(tinuuid, {
                         apiKey,
                         baseURL,
+                        language,
                         signal,
                         source,
                         widgetSession
@@ -8963,13 +8982,14 @@ function useRoomViewerWallResourceMaterialOptions() {
     };
 }
 function useRoomViewerMaterialCatalog({ includeEmbeddedObject = false } = {}) {
-    const { material, tinuuid, embeddedObject, selectedObject, setMaterial, setTinuuid, apiKey, baseURL, source, widgetSession, setAccessError, setLoadError } = useRoomViewerResource();
+    const { material, tinuuid, embeddedObject, selectedObject, setMaterial, setTinuuid, apiKey, baseURL, language, source, widgetSession, setAccessError, setLoadError } = useRoomViewerResource();
     const { type, name } = useRoomViewerMetadata();
     const ownerUuid = embeddedObject?.owner?.uuid;
     const { data, error, isFetchingNextPage, fetchNextPage, hasNextPage, isLoading } = useInfiniteQuery({
         queryKey: roomViewerOwnerObjectsQueryKey(ownerUuid, {
             apiKey,
             baseURL,
+            language,
             source,
             resourceType: type
         }),
@@ -8979,6 +8999,7 @@ function useRoomViewerMaterialCatalog({ includeEmbeddedObject = false } = {}) {
             return fetchRoomViewerOwnerObjects(ownerUuid, pageParam, {
                 apiKey,
                 baseURL,
+                language,
                 signal,
                 source,
                 widgetSession,
@@ -9006,12 +9027,14 @@ function useRoomViewerMaterialCatalog({ includeEmbeddedObject = false } = {}) {
                 queryKey: roomViewerObjectQueryKey(object.tinuuid, {
                     apiKey,
                     baseURL,
+                    language,
                     source,
                     resourceType: type
                 }),
                 queryFn: ({ signal })=>fetchRoomViewerObject(object.tinuuid, {
                         apiKey,
                         baseURL,
+                        language,
                         signal,
                         source,
                         widgetSession,
@@ -14892,13 +14915,14 @@ function panelModelQuery(url) {
     };
 }
 function usePanelMaterials(currentObject, enabled) {
-    const { apiKey, baseURL, source, widgetSession } = useRoomViewerResource();
+    const { apiKey, baseURL, language, source, widgetSession } = useRoomViewerResource();
     const { type } = useRoomViewerMetadata();
     const kitUuid = currentObject?.kit?.uuid;
     const ownerUuid = currentObject?.owner?.uuid;
     const options = {
         apiKey,
         baseURL,
+        language,
         source,
         widgetSession,
         resourceType: type
@@ -17911,6 +17935,10 @@ const os = parser.getOS();
 const isIOS = 'iOS' === os.name;
 const isAndroid = 'Android' === os.name;
 const device_isMobile = 'mobile' === device.type;
+function isArEntryOffered(handoff, tinuuid) {
+    if (!handoff || isAndroid && device_isMobile || isAndroid && 'appclip' === handoff.ar) return false;
+    return 'floor' !== handoff.destination || Boolean(tinuuid);
+}
 function isAbsoluteUrl(value1) {
     return /^[a-z][a-z0-9+.-]*:/i.test(value1) || value1.startsWith('//');
 }
@@ -18066,7 +18094,8 @@ function AR({ className, buttonClassName, buttonLeadingIcon, buttonLabel, button
         usdzUrl,
         glbUrl
     ]);
-    if (!handoff || isAndroid && device_isMobile || 'floor' === handoff.destination && !tinuuid) return null;
+    if (!isArEntryOffered(handoff, tinuuid)) return null;
+    const isAppClip = 'appclip' === handoff.ar;
     return /*#__PURE__*/ jsxs("div", {
         className: utils_cn(className),
         ...props,
@@ -18098,15 +18127,31 @@ function AR({ className, buttonClassName, buttonLeadingIcon, buttonLabel, button
                                 data: url ?? ''
                             })
                         }),
-                        /*#__PURE__*/ jsx_runtime_jsx("p", {
+                        isAppClip ? /*#__PURE__*/ jsxs("div", {
+                            className: "grid gap-2 text-center",
+                            children: [
+                                /*#__PURE__*/ jsx_runtime_jsx("p", {
+                                    className: "text-lg text-text-sub font-medium",
+                                    children: t('ar.appClipScanTitle')
+                                }),
+                                /*#__PURE__*/ jsx_runtime_jsx("p", {
+                                    className: "text-sm text-text-light",
+                                    children: t('ar.appClipRequirement')
+                                })
+                            ]
+                        }) : /*#__PURE__*/ jsx_runtime_jsx("p", {
                             className: "text-lg text-center text-text-sub font-medium",
                             children: t('ar.scanQrCode')
                         }),
                         /*#__PURE__*/ jsxs("p", {
                             className: "text-xs text-center text-text-light",
                             children: [
-                                t('ar.deviceRequirementsDisclaimer'),
-                                /*#__PURE__*/ jsx_runtime_jsx("br", {}),
+                                !isAppClip && /*#__PURE__*/ jsxs(Fragment, {
+                                    children: [
+                                        t('ar.deviceRequirementsDisclaimer'),
+                                        /*#__PURE__*/ jsx_runtime_jsx("br", {})
+                                    ]
+                                }),
                                 /*#__PURE__*/ jsx_runtime_jsx("a", {
                                     href: tenantConfig.TERMS_URL,
                                     target: "_blank",
@@ -19286,8 +19331,9 @@ const CARD_TEST_IDS = {
 function ArCardSlot({ band, slot, presentation }) {
     const { t } = useTranslation();
     const { room } = useRoomViewerRooms();
+    const { type } = useRoomViewerMetadata();
     const { tinuuid } = useRoomViewerResource();
-    if (!tinuuid || isAndroid && device_isMobile) return null;
+    if (!isArEntryOffered(resolveResourceProfile(type).handoff, tinuuid)) return null;
     if ('card' === presentation.appearance) return /*#__PURE__*/ jsxs("div", {
         className: "flex h-24 w-[280px] items-center gap-4 overflow-hidden rounded-2xl bg-background-containers p-4 text-text-dark shadow-[var(--shadow-login)]",
         "data-chrome-slot": slot,
@@ -19359,7 +19405,7 @@ function getNextVariantsPage(lastPage, lastPageParam) {
     return lastPage.objs?.length ? lastPageParam + 1 : void 0;
 }
 function useRoomViewerVariantCatalog() {
-    const { tinuuid, selectedObject, selectResourceVariant, apiKey, baseURL, source, widgetSession } = useRoomViewerResource();
+    const { tinuuid, selectedObject, selectResourceVariant, apiKey, baseURL, language, source, widgetSession } = useRoomViewerResource();
     const { type } = useRoomViewerMetadata();
     const { decodeVariant } = resolveProductCompositionAnswers(type);
     const kitUuid = selectedObject?.kit?.uuid;
@@ -19368,6 +19414,7 @@ function useRoomViewerVariantCatalog() {
         queryKey: roomViewerKitObjectsQueryKey(kitUuid, ownerUuid, {
             apiKey,
             baseURL,
+            language,
             source,
             resourceType: type
         }),
@@ -19377,6 +19424,7 @@ function useRoomViewerVariantCatalog() {
             return fetchRoomViewerKitObjects(kitUuid, ownerUuid, pageParam, {
                 apiKey,
                 baseURL,
+                language,
                 signal,
                 source,
                 widgetSession,
@@ -21230,6 +21278,11 @@ function useFrameWidthOptions() {
         t
     ]);
 }
+function useRoomViewerLanguage() {
+    const { i18n } = useTranslation();
+    const language = i18n.resolvedLanguage ?? i18n.language;
+    return 'ru' === language ? 'ru' : 'en';
+}
 function isBlankArtworkSource(src) {
     return 'string' != typeof src || 0 === src.trim().length;
 }
@@ -21262,6 +21315,7 @@ function mergeRuntimeRooms(currentRooms, currentSourceRooms, nextSourceRooms) {
 function RoomViewerProvider({ children, src, tinuuid: initialTinuuid, roomId: configuredRoomId, type, viewerSurface, dialogPortalContainer = null, viewerDialogOpen = true, onViewerDialogOpenChange, width, height, displayUnit, name, apiKey, baseURL, source, externalWidgetSession }) {
     const frameWidthOptions = useFrameWidthOptions();
     const mattingOptions = useMattingOptions(displayUnit);
+    const language = useRoomViewerLanguage();
     const identity = resolveResourceIdentityAnswers(type);
     const initialRoomId = 'immersive-room' === resolveResourceProfile(type).chrome ? configuredRoomId?.trim() || void 0 : void 0;
     const hasPanelFinishes = 'finish' === resolveResourceProfile(type).materialRole;
@@ -21363,6 +21417,7 @@ function RoomViewerProvider({ children, src, tinuuid: initialTinuuid, roomId: co
         queryKey: roomViewerRoomsQueryKey({
             apiKey,
             baseURL,
+            language,
             source,
             widgetSession,
             resourceType: type
@@ -21373,6 +21428,7 @@ function RoomViewerProvider({ children, src, tinuuid: initialTinuuid, roomId: co
                 return await fetchRoomViewerRooms({
                     apiKey,
                     baseURL,
+                    language,
                     signal,
                     source,
                     widgetSession,
@@ -21434,6 +21490,7 @@ function RoomViewerProvider({ children, src, tinuuid: initialTinuuid, roomId: co
         queryKey: roomViewerObjectQueryKey(initialTinuuid ?? void 0, {
             apiKey,
             baseURL,
+            language,
             source,
             resourceType: type
         }),
@@ -21443,6 +21500,7 @@ function RoomViewerProvider({ children, src, tinuuid: initialTinuuid, roomId: co
             return fetchRoomViewerObject(initialTinuuid, {
                 apiKey,
                 baseURL,
+                language,
                 signal,
                 source,
                 widgetSession,
@@ -21454,6 +21512,7 @@ function RoomViewerProvider({ children, src, tinuuid: initialTinuuid, roomId: co
         queryKey: roomViewerObjectQueryKey(tinuuid ?? void 0, {
             apiKey,
             baseURL,
+            language,
             source,
             resourceType: type
         }),
@@ -21464,6 +21523,7 @@ function RoomViewerProvider({ children, src, tinuuid: initialTinuuid, roomId: co
             return fetchRoomViewerObject(tinuuid, {
                 apiKey,
                 baseURL,
+                language,
                 signal,
                 source,
                 widgetSession,
@@ -21681,6 +21741,7 @@ function RoomViewerProvider({ children, src, tinuuid: initialTinuuid, roomId: co
             setMaterial,
             apiKey,
             baseURL,
+            language,
             source,
             widgetSession,
             hasRooms,
@@ -21700,6 +21761,7 @@ function RoomViewerProvider({ children, src, tinuuid: initialTinuuid, roomId: co
         selectResourceVariant,
         apiKey,
         baseURL,
+        language,
         source,
         widgetSession,
         hasRooms,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@neurodyn/react-room-viewer",
   "type": "module",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "publishConfig": {
     "access": "public"
   },