@neurodyn/react-room-viewer 0.0.25 → 0.0.27

package/dist/index.d.ts

@@ -309,9 +309,9 @@ declare const resources: {
     };
 };
 
-export declare function RoomViewer({ type, src, tinuuid, name, language, width, height, dimensionUnit, displayUnit, apiKey, source, widgetSession, className, ...props }: RoomViewerProps & React_2.ComponentProps<'div'>): JSX.Element;
+export declare function RoomViewer({ type, src, tinuuid, roomId, name, language, width, height, dimensionUnit, displayUnit, apiKey, source, widgetSession, className, ...props }: RoomViewerProps & React_2.ComponentProps<'div'>): JSX.Element;
 
-export declare function RoomViewerDialog({ type, src, tinuuid, width, height, dimensionUnit, displayUnit, name, language, apiKey, source, widgetSession, disableClose, open, defaultOpen, onOpenChange, }: RoomViewerDialogProps): JSX.Element;
+export declare function RoomViewerDialog({ type, src, tinuuid, roomId, width, height, dimensionUnit, displayUnit, name, language, apiKey, source, widgetSession, disableClose, open, defaultOpen, onOpenChange, }: RoomViewerDialogProps): JSX.Element;
 
 declare interface RoomViewerDialogProps extends Omit<RoomViewerRootProps, 'showDialogCloseButton' | 'viewerSurface' | 'dialogPortalContainer' | 'viewerDialogOpen' | 'onViewerDialogOpenChange'>, Omit<DialogProps, 'children' | 'modal'> {
     /** Hide close controls and prevent user dismissal for rugs and flooring. Defaults to false. */
@@ -378,6 +378,12 @@ declare interface RoomViewerRootProps {
     src?: string;
     /** The object's tinuuid. Used for modelled products (`rugs`, `flooring`, `wall-panel`). */
     tinuuid?: string;
+    /**
+     * Initial Room from the available catalog. Skips the new layout's initial chooser.
+     * Changed nonempty values select another Room; empty values do nothing.
+     * Ignored by the legacy poster layout.
+     */
+    roomId?: string;
     /** Title shown in the dialog header. */
     name: string;
     /**

package/dist/index.js

@@ -7423,6 +7423,19 @@ async function inferenceControllerRunRoomPlanesRaw(data, config = {}) {
     });
     return res.data;
 }
+async function layoutControllerReadLayoutConfig(headers, config = {}) {
+    const { client: request = node_client_node_client, ...requestConfig } = config;
+    const res = await request({
+        method: "POST",
+        url: "/layout/GetConfig",
+        ...requestConfig,
+        headers: {
+            ...headers,
+            ...requestConfig.headers
+        }
+    });
+    return res.data;
+}
 async function publicApiControllerActivateWallart(params, config = {}) {
     const { client: request = node_client_node_client, ...requestConfig } = config;
     const res = await request({
@@ -17432,17 +17445,6 @@ function Room() {
         ]
     });
 }
-async function layoutGetConfig(data, config = {}) {
-    const { client: request = client_client, ...requestConfig } = config;
-    const requestData = data;
-    const res = await request({
-        method: "POST",
-        url: "/layout/GetConfig",
-        data: requestData,
-        ...requestConfig
-    });
-    return res.data;
-}
 const HDR_NEUTRAL_LINK_TYPE = 'hdr_neutral';
 const ROOM_VIEWER_CONFIG_QUERY_KEY = [
     'room-viewer',
@@ -17462,7 +17464,7 @@ function getNeutralHdrUrl(config) {
 function RemoteNeutralHdrEnvironment() {
     const configQuery = react_query_useQuery({
         queryKey: ROOM_VIEWER_CONFIG_QUERY_KEY,
-        queryFn: ()=>layoutGetConfig(),
+        queryFn: ()=>layoutControllerReadLayoutConfig(),
         staleTime: 1 / 0
     });
     if (configQuery.isPending) return null;
@@ -18014,6 +18016,9 @@ function AR({ className, buttonClassName, buttonLeadingIcon, buttonLabel, button
             clone.updateMatrix();
             clone.updateMatrixWorld(true);
             if (isIOS) {
+                clone.rotation.set(-Math.PI / 2, 0, 0);
+                clone.updateMatrix();
+                clone.updateMatrixWorld(true);
                 const usdzExporter = new USDZExporter();
                 const usdzBuffer = await usdzExporter.parseAsync(clone, {
                     ar: {
@@ -19998,6 +20003,20 @@ function getInitialFloorViewerFlowState(viewerSurface) {
 }
 function reduceFloorViewerFlow(state, action) {
     switch(action.type){
+        case 'clear-interior-selection':
+            return {
+                ...state,
+                step: 'interior-selection',
+                hasSceneSelection: false,
+                automaticRoomId: action.automaticRoomId
+            };
+        case 'select-initial-room':
+            return {
+                step: 'scene',
+                hasSceneSelection: true,
+                sceneResetKey: state.sceneResetKey + 1,
+                automaticRoomId: action.roomId
+            };
         case 'open-interior-selection':
             return {
                 ...state,
@@ -20409,8 +20428,18 @@ function useCustomInteriorIntakeFlow({ apiOptions, floorFlow, commitCustomInteri
         uploadRetryRequestId
     ]);
 }
-function useFloorViewerFlow(viewerSurface, resetHandlers) {
+function useFloorViewerFlow(viewerSurface, resetHandlers, initialRoomSelection) {
     const [state, dispatch] = (0, __rspack_external_react.useReducer)(reduceFloorViewerFlow, viewerSurface, getInitialFloorViewerFlowState);
+    const [appliedInitialRoomId, setAppliedInitialRoomId] = (0, __rspack_external_react.useState)();
+    if (!initialRoomSelection?.isPending && appliedInitialRoomId !== initialRoomSelection?.roomId) {
+        setAppliedInitialRoomId(initialRoomSelection?.roomId);
+        if (initialRoomSelection) dispatch(initialRoomSelection.isAvailable ? {
+            type: 'select-initial-room',
+            roomId: initialRoomSelection.roomId
+        } : {
+            type: 'clear-interior-selection'
+        });
+    }
     const commitInteriorSelection = (0, __rspack_external_react.useCallback)((applySelection)=>{
         applySelection();
         resetSceneState(resetHandlers);
@@ -20440,6 +20469,14 @@ function useFloorViewerFlow(viewerSurface, resetHandlers) {
             type: 'return-to-interior-selection'
         });
     }, []);
+    const clearInteriorSelection = (0, __rspack_external_react.useCallback)(()=>{
+        dispatch({
+            type: 'clear-interior-selection',
+            automaticRoomId: state.automaticRoomId
+        });
+    }, [
+        state.automaticRoomId
+    ]);
     const startCustomInteriorProcessing = (0, __rspack_external_react.useCallback)(()=>{
         dispatch({
             type: 'start-custom-interior-processing'
@@ -20452,6 +20489,7 @@ function useFloorViewerFlow(viewerSurface, resetHandlers) {
             openInteriorSelection,
             recoverToScene,
             returnToInteriorSelection,
+            clearInteriorSelection,
             startCustomInteriorProcessing
         }), [
         commitInteriorSelection,
@@ -20459,11 +20497,15 @@ function useFloorViewerFlow(viewerSurface, resetHandlers) {
         openInteriorSelection,
         recoverToScene,
         returnToInteriorSelection,
+        clearInteriorSelection,
         startCustomInteriorProcessing,
         state
     ]);
 }
 function useRoomViewerFloorFlow(viewerSurface) {
+    const { initialRoomId, room, sourceRooms } = useRoomViewerRooms();
+    const { isViewerAccessPending, loadError, setLoadError } = useRoomViewerResource();
+    const { type } = useRoomViewerMetadata();
     const { patchSceneLoad, setAngle, setRotation } = useRoomViewerSceneState();
     const resetHandlers = (0, __rspack_external_react.useMemo)(()=>({
             patchSceneLoad,
@@ -20474,7 +20516,27 @@ function useRoomViewerFloorFlow(viewerSurface) {
         setAngle,
         setRotation
     ]);
-    return useFloorViewerFlow(viewerSurface, resetHandlers);
+    const initialRoom = sourceRooms.find((room)=>room.id === initialRoomId);
+    const isAvailable = Boolean(initialRoom) && (!initialRoom?.scene || getAllowedRoomScenePlanes(initialRoom.scene, resolveResourceSurfaces(type)).length > 0);
+    const floorFlow = useFloorViewerFlow(viewerSurface, resetHandlers, initialRoomId ? {
+        roomId: initialRoomId,
+        isAvailable,
+        isPending: isViewerAccessPending
+    } : void 0);
+    const { automaticRoomId, clearInteriorSelection } = floorFlow;
+    (0, __rspack_external_react.useEffect)(()=>{
+        if (automaticRoomId && room.id === automaticRoomId && 'room-load-failed' === loadError) {
+            clearInteriorSelection();
+            setLoadError(null);
+        }
+    }, [
+        automaticRoomId,
+        clearInteriorSelection,
+        loadError,
+        room.id,
+        setLoadError
+    ]);
+    return floorFlow;
 }
 function useRoomViewerFloorInteriorSelectionCommands(options) {
     const { room, setRoomId, setRooms } = useRoomViewerRooms();
@@ -21197,10 +21259,11 @@ function mergeRuntimeRooms(currentRooms, currentSourceRooms, nextSourceRooms) {
         ...nextSourceRooms
     ] : nextSourceRooms;
 }
-function RoomViewerProvider({ children, src, tinuuid: initialTinuuid, type, viewerSurface, dialogPortalContainer = null, viewerDialogOpen = true, onViewerDialogOpenChange, width, height, displayUnit, name, apiKey, baseURL, source, externalWidgetSession }) {
+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 identity = resolveResourceIdentityAnswers(type);
+    const initialRoomId = 'immersive-room' === resolveResourceProfile(type).chrome ? configuredRoomId?.trim() || void 0 : void 0;
     const hasPanelFinishes = 'finish' === resolveResourceProfile(type).materialRole;
     const { offersSizeVariants } = resolveProductCompositionAnswers(type);
     const defaultRooms = resolveRoomPresets(resolveResourceProfile(type).roomPresets);
@@ -21343,7 +21406,18 @@ function RoomViewerProvider({ children, src, tinuuid: initialTinuuid, type, view
     }, [
         sourceRooms
     ]);
-    const [roomId, setRoomId] = (0, __rspack_external_react.useState)(()=>defaultRooms[0].id);
+    const [roomId, setRoomId] = (0, __rspack_external_react.useState)(()=>initialRoomId ?? defaultRooms[0].id);
+    const [previousInitialRoomId, setPreviousInitialRoomId] = (0, __rspack_external_react.useState)(initialRoomId);
+    if (previousInitialRoomId !== initialRoomId) {
+        setPreviousInitialRoomId(initialRoomId);
+        if (initialRoomId) {
+            setRoomId(initialRoomId);
+            setAngle(0);
+            setRotation(0);
+            setSceneLoad(getInitialSceneLoadState(identity));
+            setLoadError((current)=>'room-load-failed' === current ? null : current);
+        }
+    }
     const selectedRoom = rooms.find((currentRoom)=>currentRoom.id === roomId);
     const room = selectedRoom ?? rooms[0] ?? defaultRooms[0];
     const resetsRotationOnRoomChange = 'rotate-on-floor' === resolveResourceProfile(type).manipulation;
@@ -21586,10 +21660,12 @@ function RoomViewerProvider({ children, src, tinuuid: initialTinuuid, type, view
             sourceRooms,
             setRooms,
             room,
+            initialRoomId,
             setRoomId
         }), [
         rooms,
         room,
+        initialRoomId,
         setRooms,
         sourceRooms
     ]);
@@ -21728,7 +21804,7 @@ const root_queryClient = new QueryClient({
         }
     }
 });
-function RoomViewerRoot({ type, src, tinuuid, name, height, width, language, dimensionUnit = "m", displayUnit = "cm", apiKey, source = 'default', showDialogCloseButton = false, viewerSurface = 'inline', dialogPortalContainer = null, viewerDialogOpen = true, onViewerDialogOpenChange, widgetSession }) {
+function RoomViewerRoot({ type, src, tinuuid, roomId, name, height, width, language, dimensionUnit = "m", displayUnit = "cm", apiKey, source = 'default', showDialogCloseButton = false, viewerSurface = 'inline', dialogPortalContainer = null, viewerDialogOpen = true, onViewerDialogOpenChange, widgetSession }) {
     const { i18n } = useTranslation();
     const normalizedApiKey = normalizeRoomViewerApiKey(apiKey);
     const normalizedTinuuid = normalizeRoomViewerTinuuid(tinuuid);
@@ -21751,6 +21827,7 @@ function RoomViewerRoot({ type, src, tinuuid, name, height, width, language, dim
         children: /*#__PURE__*/ jsx_runtime_jsx(RoomViewerProvider, {
             src: src ?? null,
             tinuuid: normalizedTinuuid ?? null,
+            roomId: roomId,
             type: resourceType,
             viewerSurface: viewerSurface,
             dialogPortalContainer: dialogPortalContainer,
@@ -21776,7 +21853,7 @@ configureApiClient({
 configureNodeApiClient({
     baseURL: config_env.NODE_API_BASE_URL
 });
-function RoomViewerDialog({ type, src, tinuuid, width, height, dimensionUnit, displayUnit, name, language, apiKey, source, widgetSession, disableClose = false, open, defaultOpen, onOpenChange }) {
+function RoomViewerDialog({ type, src, tinuuid, roomId, width, height, dimensionUnit, displayUnit, name, language, apiKey, source, widgetSession, disableClose = false, open, defaultOpen, onOpenChange }) {
     const [themeRoot, setThemeRoot] = (0, __rspack_external_react.useState)(null);
     const isCloseDisabled = 'immersive-room' === resolveResourceProfile(normalizeResourceType(type)).chrome && disableClose;
     const [uncontrolledOpen, setUncontrolledOpen] = (0, __rspack_external_react.useState)(defaultOpen ?? false);
@@ -21797,6 +21874,7 @@ function RoomViewerDialog({ type, src, tinuuid, width, height, dimensionUnit, di
         type: type,
         src: src,
         tinuuid: tinuuid,
+        roomId: roomId,
         name: name,
         height: height,
         width: width,
@@ -21848,7 +21926,7 @@ function RoomViewerDialog({ type, src, tinuuid, width, height, dimensionUnit, di
         ]
     });
 }
-function RoomViewer({ type, src, tinuuid, name, language, width, height, dimensionUnit, displayUnit, apiKey, source, widgetSession, className, ...props }) {
+function RoomViewer({ type, src, tinuuid, roomId, name, language, width, height, dimensionUnit, displayUnit, apiKey, source, widgetSession, className, ...props }) {
     const [themeRoot, setThemeRoot] = (0, __rspack_external_react.useState)(null);
     return /*#__PURE__*/ jsxs(Fragment, {
         children: [
@@ -21884,6 +21962,7 @@ function RoomViewer({ type, src, tinuuid, name, language, width, height, dimensi
                                     type: type,
                                     src: src,
                                     tinuuid: tinuuid,
+                                    roomId: roomId,
                                     name: name,
                                     language: language,
                                     width: width,

package/package.json

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