@neurodyn/react-room-viewer 0.0.23 → 0.0.25

package/dist/index.js

@@ -5409,6 +5409,10 @@ var __webpack_modules__ = {
     color: var(--v-text-dark);
   }
 
+  .data-\\[variant\\=destructive\\]\\:\\[\\&_svg\\:not\\(\\[class\\*\\=text-\\]\\)\\]\\:text-inherit[data-variant="destructive"] svg:not([class*="text-"]) {
+    color: inherit;
+  }
+
   .\\[\\&_tr\\]\\:border-b tr {
     border-bottom-style: var(--tw-border-style);
     border-bottom-width: 1px;
@@ -7721,7 +7725,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),
@@ -7795,7 +7802,7 @@ const RESOURCE_TYPE_PROFILES = {
         chrome: 'immersive-room',
         presentation: 'immersive-panels',
         manipulation: 'panel-group',
-        catalogLabel: 'product-name',
+        productNameSource: 'collection',
         catalogTitle: 'wall-panel',
         introduction: 'focus-resource',
         identity: 'modelled-resource',
@@ -7815,7 +7822,7 @@ const RESOURCE_TYPE_PROFILES = {
         chrome: 'framed-scene',
         presentation: 'framed-default',
         manipulation: 'single-resource',
-        catalogLabel: 'material-name',
+        productNameSource: 'material',
         catalogTitle: 'title',
         introduction: null,
         identity: 'textured-resource',
@@ -7832,7 +7839,7 @@ const RESOURCE_TYPE_PROFILES = {
         chrome: 'immersive-room',
         presentation: 'immersive-default',
         manipulation: 'drag-with-rotation-handle',
-        catalogLabel: 'material-name',
+        productNameSource: 'collection',
         catalogTitle: 'rugs',
         introduction: null,
         identity: 'modelled-resource',
@@ -7849,7 +7856,7 @@ const RESOURCE_TYPE_PROFILES = {
         chrome: 'immersive-room',
         presentation: 'immersive-default',
         manipulation: 'rotate-on-floor',
-        catalogLabel: 'material-name',
+        productNameSource: 'collection',
         catalogTitle: 'flooring',
         introduction: null,
         identity: 'modelled-resource',
@@ -8807,13 +8814,7 @@ function getListingKey(object) {
     return object.kit?.uuid ?? object.uuid ?? object.tinuuid ?? '';
 }
 function getSizedDesignKey(object) {
-    const meta = decodeRugSizeMeta(object.description);
-    const name = object.name?.trim();
-    const sizeSuffix = meta ? ` — ${meta.size}` : null;
-    if (name && sizeSuffix && name.endsWith(sizeSuffix)) {
-        const designName = name.slice(0, -sizeSuffix.length).trim();
-        if (designName) return `rug-name:${designName}`;
-    }
+    if (object.kit?.uuid) return object.kit.uuid;
     return `object:${getListingKey(object)}`;
 }
 const PRODUCT_COMPOSITION_ANSWERS = {
@@ -8835,16 +8836,13 @@ const PRODUCT_COMPOSITION_ANSWERS = {
 };
 const MATERIAL_ROLE_ANSWERS = {
     'product-identity': {
-        catalogsEveryMaterial: true,
-        namesProduct: true
+        catalogsEveryMaterial: true
     },
     finish: {
-        catalogsEveryMaterial: false,
-        namesProduct: false
+        catalogsEveryMaterial: false
     },
     placeholder: {
-        catalogsEveryMaterial: false,
-        namesProduct: false
+        catalogsEveryMaterial: false
     }
 };
 function resolveProductCompositionAnswers(type) {
@@ -8869,8 +8867,7 @@ function resolveResourceIdentityAnswers(type) {
     return RESOURCE_IDENTITY_ANSWERS[resolveResourceProfile(type).identity];
 }
 function getResourceProductName(type, object, material, fallback = '') {
-    const { namesProduct } = resolveMaterialRoleAnswers(type);
-    return namesProduct ? material?.name ?? object?.name ?? object?.kit?.name ?? fallback : object?.kit?.name ?? object?.name ?? material?.name ?? fallback;
+    return 'material' === resolveResourceProfile(type).productNameSource ? material?.name ?? object?.name ?? object?.kit?.name ?? fallback : object?.kit?.name?.trim() || object?.name?.trim() || material?.name?.trim() || fallback;
 }
 function getMaterialId(material) {
     return material.hid ?? '';
@@ -8982,13 +8979,14 @@ function useRoomViewerMaterialCatalog({ includeEmbeddedObject = false } = {}) {
     const { requiresMaterialModel } = resolveResourceIdentityAnswers(type);
     const { getCollapseKey } = resolveProductCompositionAnswers(type);
     const { catalogsEveryMaterial } = resolveMaterialRoleAnswers(type);
-    const { catalogLabel, composition } = resolveResourceProfile(type);
+    const { composition, productNameSource } = resolveResourceProfile(type);
     const fetchedObjects = (0, __rspack_external_react.useMemo)(()=>data?.pages.flatMap((page)=>page.objs ?? []) ?? [], [
         data
     ]);
-    const unresolvedObjects = (0, __rspack_external_react.useMemo)(()=>'color-design' === composition ? fetchedObjects.filter((object)=>object.tinuuid && !object.kit?.uuid && object.materials?.[0]?.native?.glbUrl) : [], [
-        composition,
-        fetchedObjects
+    const unresolvedObjects = (0, __rspack_external_react.useMemo)(()=>'material' === productNameSource ? [] : fetchedObjects.filter((object)=>object.tinuuid && (!object.kit?.uuid || !object.kit.name?.trim()) && (!requiresMaterialModel || object.materials?.[0]?.native?.glbUrl)), [
+        fetchedObjects,
+        productNameSource,
+        requiresMaterialModel
     ]);
     const collectionQueries = useQueries({
         queries: unresolvedObjects.map((object)=>({
@@ -9015,7 +9013,10 @@ function useRoomViewerMaterialCatalog({ includeEmbeddedObject = false } = {}) {
         return [
             {
                 ...object,
-                kit: query?.data?.kit ?? object.kit
+                kit: query?.data?.kit ? {
+                    ...object.kit,
+                    ...query.data.kit
+                } : object.kit
             }
         ];
     });
@@ -9043,17 +9044,16 @@ function useRoomViewerMaterialCatalog({ includeEmbeddedObject = false } = {}) {
             return catalogMaterials?.map((material)=>{
                 const materialId = getMaterialId(material);
                 if (!materialId || !object.tinuuid) return null;
+                const productName = getResourceProductName(type, object, material, name);
                 return {
                     materialId,
-                    name: ('material-name' === catalogLabel ? material.name : object.kit?.name ?? object.name) ?? material.name ?? '',
-                    productName: getResourceProductName(type, object, material, name),
+                    productName,
                     material,
                     tinuuid: object.tinuuid
                 };
             }).filter((item)=>null !== item) ?? [];
         }), [
         catalogsEveryMaterial,
-        catalogLabel,
         composition,
         objects,
         type,
@@ -14676,7 +14676,7 @@ function dropdown_menu_DropdownMenuItem({ className, inset, variant = 'default',
         "data-slot": "dropdown-menu-item",
         "data-inset": inset,
         "data-variant": variant,
-        className: utils_cn('relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden hover:bg-background-base focus:bg-background-base data-[highlighted]:bg-background-base data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 data-[variant=destructive]:hover:bg-destructive/10 data-[highlighted][data-variant=destructive]:bg-destructive/10 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg:not([class*=text-])]:text-muted-foreground [&_svg]:pointer-events-none [&_svg]:shrink-0', inset && 'pl-8', className),
+        className: utils_cn('relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden hover:bg-background-base focus:bg-background-base data-[highlighted]:bg-background-base data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 data-[variant=destructive]:hover:bg-destructive/10 data-[highlighted][data-variant=destructive]:bg-destructive/10 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg:not([class*=text-])]:text-muted-foreground data-[variant=destructive]:[&_svg:not([class*=text-])]:text-inherit [&_svg]:pointer-events-none [&_svg]:shrink-0', inset && 'pl-8', className),
         ...props
     });
 }
@@ -14878,6 +14878,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}`;
 }
@@ -15046,7 +15160,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),
@@ -15056,7 +15171,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
@@ -17895,9 +18010,21 @@ 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) {
                 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.23",
+  "version": "0.0.25",
   "publishConfig": {
     "access": "public"
   },