@neurodyn/react-room-viewer 0.0.8 → 0.0.10

package/dist/index.js

@@ -2245,10 +2245,6 @@ var __webpack_modules__ = {
     background-color: var(--v-button-dark);
   }
 
-  .bg-button-light {
-    background-color: var(--v-button-light);
-  }
-
   .bg-button-white {
     background-color: var(--v-button-white);
   }
@@ -3741,14 +3737,6 @@ var __webpack_modules__ = {
       background-color: var(--v-borders-dark);
     }
 
-    .hover\\:bg-button-dark-hover:hover {
-      background-color: var(--v-button-dark-hover);
-    }
-
-    .hover\\:bg-button-light-hover:hover {
-      background-color: var(--v-button-light-hover);
-    }
-
     .hover\\:bg-button-white:hover {
       background-color: var(--v-button-white);
     }
@@ -3985,14 +3973,6 @@ var __webpack_modules__ = {
     background-color: var(--v-backgrounds-base-3);
   }
 
-  .active\\:bg-button-dark-pressed:active {
-    background-color: var(--v-button-dark-pressed);
-  }
-
-  .active\\:bg-button-light-pressed:active {
-    background-color: var(--v-button-light-pressed);
-  }
-
   .active\\:bg-button-outline-pressed:active {
     background-color: var(--v-button-outline-pressed);
   }
@@ -9405,7 +9385,18 @@ function useRoomViewerTenant() {
     const language = i18n.resolvedLanguage ?? i18n.language;
     return 'ru' === language ? 'arizo' : 'vizbl';
 }
-function buildRoomViewerArUrl({ height, language, name, src, tenantConfig, tinuuid, placement, type, width, widgetSessionToken }) {
+function isAbsoluteUrl(value) {
+    return /^[a-z][a-z0-9+.-]*:/i.test(value) || value.startsWith('//');
+}
+function resolveTextureSrc(src, pageUrl) {
+    if (!pageUrl || isAbsoluteUrl(src)) return src;
+    try {
+        return new URL(src, pageUrl).href;
+    } catch  {
+        return src;
+    }
+}
+function buildRoomViewerArUrl({ height, language, name, src, tenantConfig, tinuuid, placement, type, width, widgetSessionToken, pageUrl }) {
     if ('floor' === placement && tinuuid) {
         const url = new URL(tenantConfig.ROOM_URL);
         url.searchParams.set('type', type);
@@ -9416,7 +9407,7 @@ function buildRoomViewerArUrl({ height, language, name, src, tenantConfig, tinuu
         return url.toString();
     }
     const url = new URL(tenantConfig.POSTER_URL);
-    if (src) url.searchParams.set('texture', src);
+    if (src) url.searchParams.set('texture', resolveTextureSrc(src, pageUrl));
     url.searchParams.set('texture_width', (100 * width).toString());
     url.searchParams.set('texture_height', (100 * height).toString());
     if (widgetSessionToken) url.searchParams.set('widgetSessionToken', widgetSessionToken);
@@ -9447,7 +9438,8 @@ function AR({ className, buttonClassName, buttonLeadingIcon, buttonLabel, button
             placement,
             type,
             width,
-            widgetSessionToken: handoffWidgetSessionToken
+            widgetSessionToken: handoffWidgetSessionToken,
+            pageUrl: "u" < typeof window ? void 0 : window.location.href
         }), [
         src,
         tinuuid,
@@ -10131,21 +10123,27 @@ function patchShader(shader, patch) {
           return 1.0 - step(0.5, abs(id - uActiveId));
         }
 
+        // uPlaneIds is a low-res nearest-filtered id map, so its edges are blocky.
+        // A single-texel tent filter isn't wide enough to hide that — it just
+        // softens each block's corner, which reads as a staircase. Supersample
+        // a wider neighbourhood (5x5 taps, 2-texel radius) with Gaussian-like
+        // falloff so the boundary is both denser-sampled and properly blurred.
         float neurodynRoomScenePlaneCoverage(vec2 uv) {
           vec2 texel = 1.0 / uPlaneIdsSize;
-          float coverage = neurodynRoomScenePlaneMatch(uv) * 4.0;
+          float coverage = 0.0;
+          float totalWeight = 0.0;
 
-          coverage += neurodynRoomScenePlaneMatch(uv + vec2(texel.x, 0.0)) * 2.0;
-          coverage += neurodynRoomScenePlaneMatch(uv - vec2(texel.x, 0.0)) * 2.0;
-          coverage += neurodynRoomScenePlaneMatch(uv + vec2(0.0, texel.y)) * 2.0;
-          coverage += neurodynRoomScenePlaneMatch(uv - vec2(0.0, texel.y)) * 2.0;
+          for (int y = -2; y <= 2; y++) {
+            for (int x = -2; x <= 2; x++) {
+              vec2 offset = vec2(float(x), float(y));
+              float weight = 1.0 / (1.0 + dot(offset, offset));
 
-          coverage += neurodynRoomScenePlaneMatch(uv + vec2(texel.x, texel.y));
-          coverage += neurodynRoomScenePlaneMatch(uv + vec2(texel.x, -texel.y));
-          coverage += neurodynRoomScenePlaneMatch(uv + vec2(-texel.x, texel.y));
-          coverage += neurodynRoomScenePlaneMatch(uv - vec2(texel.x, texel.y));
+              coverage += neurodynRoomScenePlaneMatch(uv + offset * texel) * weight;
+              totalWeight += weight;
+            }
+          }
 
-          return coverage / 16.0;
+          return coverage / totalWeight;
         }
         #endif
       `);
@@ -10247,6 +10245,7 @@ function RugRotationControl({ resourceBounds }) {
         const resource = resourceRef.current;
         if (!resource || !isRugRotationControlPrimaryHit(event.object, event.intersections.map((intersection)=>intersection.object))) return;
         event.stopPropagation();
+        event.nativeEvent.stopPropagation();
         const pointerTarget = event.target;
         pointerTarget.setPointerCapture(event.pointerId);
         resource.updateWorldMatrix(true, false);
@@ -10309,6 +10308,10 @@ function RugRotationControl({ resourceBounds }) {
     });
 }
 const FLOOR_RESOURCE_ROTATION_X = Math.PI / 2;
+function releaseDragCapture(event) {
+    const pointerTarget = event.target;
+    if (pointerTarget.hasPointerCapture(event.pointerId)) pointerTarget.releasePointerCapture(event.pointerId);
+}
 function FloorResource({ glbUrl, position, quaternion, materialPatch }) {
     const { type } = useRoomViewerMetadata();
     const { resourceRef, rotation, setIsDragging } = useRoomViewerSceneState();
@@ -10341,9 +10344,19 @@ function FloorResource({ glbUrl, position, quaternion, materialPatch }) {
         ref: resourceRef,
         position: position,
         quaternion: quaternion,
-        onPointerDown: ()=>setIsDragging(true),
-        onPointerUp: ()=>setIsDragging(false),
-        onPointerLeave: ()=>setIsDragging(false),
+        onPointerDown: (event)=>{
+            event.nativeEvent.stopPropagation();
+            event.target.setPointerCapture(event.pointerId);
+            setIsDragging(true);
+        },
+        onPointerUp: (event)=>{
+            releaseDragCapture(event);
+            setIsDragging(false);
+        },
+        onPointerCancel: (event)=>{
+            releaseDragCapture(event);
+            setIsDragging(false);
+        },
         children: /*#__PURE__*/ jsxs("group", {
             "rotation-z": rotationRadians,
             children: [
@@ -10966,7 +10979,7 @@ function CanvasWrapper({ className, ref, captureRef, onSizeChange, ...props }) {
         className: utils_cn('size-full flex items-center justify-center sm:pt-21 sm:pb-12', className),
         ...props,
         children: size && /*#__PURE__*/ jsx_runtime_jsx(Canvas, {
-            className: "bg-transparent",
+            className: "touch-none bg-transparent",
             frameloop: "demand",
             camera: ROOM_CAMERA_CONFIG,
             gl: {
@@ -11577,7 +11590,7 @@ function FloorSceneChrome({ actions, canShowAr, companyName, hasActiveError, mat
                         children: [
                             /*#__PURE__*/ jsxs(Button, {
                                 type: "button",
-                                variant: "contrast",
+                                variant: "secondary",
                                 "aria-label": t('floor.scene.share'),
                                 disabled: !canShare || isSharing,
                                 onClick: handleShare,
@@ -11594,7 +11607,7 @@ function FloorSceneChrome({ actions, canShowAr, companyName, hasActiveError, mat
                             }),
                             /*#__PURE__*/ jsxs(Button, {
                                 type: "button",
-                                variant: "contrast",
+                                variant: "secondary",
                                 "aria-label": t('floor.scene.download'),
                                 disabled: isDownloading,
                                 onClick: handleDownload,
@@ -11613,7 +11626,7 @@ function FloorSceneChrome({ actions, canShowAr, companyName, hasActiveError, mat
                                 asChild: true,
                                 children: /*#__PURE__*/ jsxs(Button, {
                                     type: "button",
-                                    variant: "contrast",
+                                    variant: "secondary",
                                     "aria-label": t('close'),
                                     className: "size-10 rounded-full px-0 lg:h-9 lg:w-auto lg:rounded-xl lg:px-3.5",
                                     children: [
@@ -11690,7 +11703,7 @@ function FloorSceneChrome({ actions, canShowAr, companyName, hasActiveError, mat
                         ]
                     }),
                     canShowAr && /*#__PURE__*/ jsxs("div", {
-                        className: "pointer-events-auto flex h-24 w-[280px] items-center gap-4 overflow-hidden rounded-2xl bg-button-dark p-4 text-text-white shadow-[var(--shadow-login)]",
+                        className: "pointer-events-auto 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-testid": "floor-ar-card",
                         children: [
                             /*#__PURE__*/ jsx_runtime_jsx("img", {
@@ -11705,10 +11718,10 @@ function FloorSceneChrome({ actions, canShowAr, companyName, hasActiveError, mat
                                         buttonLabel: t('floor.scene.tryAtHome'),
                                         buttonVariant: "secondary",
                                         buttonSize: "sm",
-                                        buttonClassName: "w-fit bg-button-light text-text-dark hover:bg-button-light-hover active:bg-button-light-pressed"
+                                        buttonClassName: "w-fit"
                                     }),
                                     /*#__PURE__*/ jsx_runtime_jsx("div", {
-                                        className: "typo-base-12 truncate font-medium text-text-white",
+                                        className: "typo-base-12 truncate font-medium text-text-light",
                                         children: t('floor.scene.tryAtHomeBody')
                                     })
                                 ]
@@ -11782,9 +11795,9 @@ function FloorSceneChrome({ actions, canShowAr, companyName, hasActiveError, mat
                                 buttonLeadingIcon: /*#__PURE__*/ jsx_runtime_jsx(Vizbl, {
                                     className: "size-5"
                                 }),
-                                buttonVariant: "contrast",
+                                buttonVariant: "secondary",
                                 buttonSize: "default",
-                                buttonClassName: "h-9 w-full rounded-xl bg-button-dark text-text-white hover:bg-button-dark-hover active:bg-button-dark-pressed"
+                                buttonClassName: "h-9 w-full rounded-xl"
                             })
                         ]
                     })
@@ -11855,9 +11868,9 @@ function FloorSceneChrome({ actions, canShowAr, companyName, hasActiveError, mat
                                 buttonLeadingIcon: /*#__PURE__*/ jsx_runtime_jsx(Vizbl, {
                                     className: "size-6"
                                 }),
-                                buttonVariant: "contrast",
+                                buttonVariant: "secondary",
                                 buttonSize: "lg",
-                                buttonClassName: "h-11 w-full rounded-xl bg-button-dark text-text-white hover:bg-button-dark-hover active:bg-button-dark-pressed"
+                                buttonClassName: "h-11 w-full rounded-xl"
                             })
                         ]
                     })
@@ -14375,6 +14388,7 @@ function RoomViewerDialog({ type, src, tinuuid, width, height, dimensionUnit, di
                     themeRoot && /*#__PURE__*/ jsx_runtime_jsx(ThemeProvider, {
                         root: themeRoot,
                         storageKey: "neurodyn-theme",
+                        defaultTheme: "light",
                         children: /*#__PURE__*/ jsx_runtime_jsx(I18nextProvider, {
                             i18n: roomViewerI18n,
                             children: 'floor' === placement ? shouldRenderRoomViewerRoot && roomViewerRoot : /*#__PURE__*/ jsx_runtime_jsx(Dialog, {
@@ -14439,6 +14453,7 @@ function RoomViewer({ type, src, tinuuid, name, language, width, height, dimensi
                         children: themeRoot && /*#__PURE__*/ jsx_runtime_jsx(ThemeProvider, {
                             root: themeRoot,
                             storageKey: "neurodyn-theme",
+                            defaultTheme: "light",
                             children: /*#__PURE__*/ jsx_runtime_jsx(I18nextProvider, {
                                 i18n: roomViewerI18n,
                                 children: /*#__PURE__*/ jsx_runtime_jsx(RoomViewerRoot, {

package/package.json

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