@neurodyn/react-room-viewer 0.0.24 → 0.0.26

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({
@@ -7725,7 +7738,10 @@ async function fetchRoomViewerOwnerObjects(ownerUuid, page, options) {
         signal: options.signal
     });
     const { query, config } = getRoomViewerPublicApiQuery(options);
-    const response = await publicApiControllerGetPublicObjects(data, query, {
+    const response = await publicApiControllerGetPublicObjects({
+        ...data,
+        productType: getRoomViewerPublicApiProductType(options)
+    }, query, {
         ...config,
         baseURL: options.baseURL,
         headers: await getRoomViewerPublicApiHeaders(options),
@@ -14875,6 +14891,120 @@ function panelModelQuery(url) {
         retry: false
     };
 }
+function usePanelMaterials(currentObject, enabled) {
+    const { apiKey, baseURL, source, widgetSession } = useRoomViewerResource();
+    const { type } = useRoomViewerMetadata();
+    const kitUuid = currentObject?.kit?.uuid;
+    const ownerUuid = currentObject?.owner?.uuid;
+    const options = {
+        apiKey,
+        baseURL,
+        source,
+        widgetSession,
+        resourceType: type
+    };
+    const { data, hasNextPage, fetchNextPage, isFetching, isFetchNextPageError } = useInfiniteQuery({
+        queryKey: [
+            ...roomViewerKitObjectsQueryKey(kitUuid, ownerUuid, options),
+            'panel-materials'
+        ],
+        enabled: enabled && Boolean(kitUuid),
+        queryFn: async ({ pageParam, signal })=>{
+            try {
+                return await fetchRoomViewerKitObjects(kitUuid, ownerUuid ?? '', pageParam, {
+                    ...options,
+                    signal
+                });
+            } catch (error) {
+                if (0 === pageParam || signal.aborted) throw error;
+                return {
+                    objs: [],
+                    pages_count: void 0
+                };
+            }
+        },
+        initialPageParam: 0,
+        getNextPageParam: (lastPage, pages, page)=>{
+            const count = lastPage.pages_count ?? pages[0]?.pages_count;
+            return void 0 !== count ? page + 1 < count ? page + 1 : void 0 : lastPage.objs?.length ? page + 1 : void 0;
+        },
+        retry: false
+    });
+    (0, __rspack_external_react.useEffect)(()=>{
+        if (enabled && hasNextPage && !isFetching && !isFetchNextPageError) fetchNextPage({
+            cancelRefetch: false
+        });
+    }, [
+        data?.pages.length,
+        enabled,
+        fetchNextPage,
+        hasNextPage,
+        isFetching,
+        isFetchNextPageError
+    ]);
+    const siblings = (0, __rspack_external_react.useMemo)(()=>{
+        if (!enabled || !kitUuid) return [];
+        const objects = new Map();
+        for (const object of data?.pages.flatMap((page)=>page.objs ?? []) ?? [])if (object.tinuuid && object.tinuuid !== currentObject?.tinuuid) objects.set(object.tinuuid, object);
+        return Array.from(objects.values());
+    }, [
+        currentObject?.tinuuid,
+        data,
+        enabled,
+        kitUuid
+    ]);
+    const details = useQueries({
+        queries: siblings.map((object)=>({
+                queryKey: roomViewerObjectQueryKey(object.tinuuid, options),
+                queryFn: ({ signal })=>fetchRoomViewerObject(object.tinuuid, {
+                        ...options,
+                        signal
+                    }),
+                enabled,
+                retry: false
+            }))
+    });
+    const [resolvedResourceOrder, setResolvedResourceOrder] = (0, __rspack_external_react.useState)({
+        ids: []
+    });
+    const sameSelection = resolvedResourceOrder.resourceId === currentObject?.tinuuid && resolvedResourceOrder.kitUuid === kitUuid;
+    const previousIds = sameSelection ? resolvedResourceOrder.ids : [];
+    const knownIds = new Set(previousIds);
+    const resolvedMaterials = new Map(siblings.flatMap((object, index)=>{
+        const detail = details[index]?.data;
+        return detail ? [
+            [
+                object.tinuuid,
+                detail.materials ?? []
+            ]
+        ] : [];
+    }));
+    const newIds = Array.from(resolvedMaterials.keys()).filter((id)=>!knownIds.has(id));
+    const resourceIds = newIds.length ? [
+        ...previousIds,
+        ...newIds
+    ] : previousIds;
+    if (!sameSelection || newIds.length) setResolvedResourceOrder({
+        resourceId: currentObject?.tinuuid,
+        kitUuid,
+        ids: resourceIds
+    });
+    const allMaterials = enabled ? [
+        ...currentObject?.materials ?? [],
+        ...resourceIds.flatMap((id)=>resolvedMaterials.get(id) ?? [])
+    ] : [];
+    const seen = new Set();
+    return allMaterials.flatMap((material, index)=>{
+        if (!material.hid || !material.native?.glbUrl || seen.has(material.hid)) return [];
+        seen.add(material.hid);
+        return [
+            {
+                material,
+                number: index + 1
+            }
+        ];
+    });
+}
 function panelCellKey(cell) {
     return `${cell.x},${cell.y}`;
 }
@@ -15043,7 +15173,8 @@ function usePanelSession(enabled, introduce) {
     const firstMaterial = currentObject?.materials?.[0];
     const isPhone = useMediaQuery('(max-width: 639px)');
     const composition = usePanelComposition(tinuuid, firstMaterial?.hid ?? '', introduce && isPhone);
-    const materials = enabled ? currentObject?.materials?.filter((candidate)=>candidate.hid && candidate.native?.glbUrl) ?? [] : [];
+    const entries = usePanelMaterials(currentObject, enabled && viewerDialogOpen);
+    const materials = entries.map((entry)=>entry.material);
     const queries = useQueries({
         queries: materials.map((material)=>({
                 ...panelModelQuery(material.native.glbUrl),
@@ -15053,7 +15184,7 @@ function usePanelSession(enabled, introduce) {
     const base = queries[materials.findIndex((material)=>material.hid === firstMaterial?.hid)]?.data;
     const options = materials.map((material, index)=>({
             material,
-            number: (currentObject?.materials?.indexOf(material) ?? index) + 1,
+            number: entries[index].number,
             model: queries[index]?.data,
             loading: queries[index]?.isFetching ?? false,
             error: queries[index]?.isError ?? false
@@ -17314,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',
@@ -17344,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;
@@ -17892,9 +18012,24 @@ function AR({ className, buttonClassName, buttonLeadingIcon, buttonLabel, button
             setIsSceneExporting(true);
             const clone = sceneResource.clone(true);
             clone.position.set(0, 0, 0);
+            clone.quaternion.identity();
+            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);
+                const usdzBuffer = await usdzExporter.parseAsync(clone, {
+                    ar: {
+                        anchoring: {
+                            type: 'plane'
+                        },
+                        planeAnchoring: {
+                            alignment: 'vertical'
+                        }
+                    }
+                });
                 const usdzFile = new File([
                     usdzBuffer
                 ], 'scene.usdz', {

package/package.json

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