@neurodyn/react-room-viewer 0.0.23 → 0.0.24

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;
@@ -7795,7 +7799,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 +7819,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 +7836,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 +7853,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 +8811,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 +8833,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 +8864,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 +8976,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 +9010,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 +9041,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 +14673,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
     });
 }

package/package.json

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