@lasterp/shared 1.0.0-alpha.17 → 1.0.0-alpha.18

package/dist/node/index.js

@@ -466,7 +466,7 @@ var useFrappeUpdateDoc = () => {
   };
 };
 // src/hooks/use-variant-selector/hook.ts
-import { useMemo as useMemo2, useState as useState5 } from "react";
+import { useCallback as useCallback4, useMemo as useMemo2, useState as useState5 } from "react";
 
 // src/hooks/use-variant-selector/utils.ts
 function findVariant(variants, specs, caseInsensitive) {
@@ -515,14 +515,18 @@ var useVariantSelector = (props) => {
   }, [variants, selectedSpecs, attributes]);
   const options = useMemo2(() => {
     const result = {};
-    attributes.forEach((attr) => {
+    attributes.forEach((attr, attrIndex) => {
+      const constraints = {};
+      for (let i = 0;i < attrIndex; i++) {
+        const key = attributes[i]?.key;
+        if (key && selectedSpecs[key])
+          constraints[key] = selectedSpecs[key];
+      }
+      const matchingVariants = findVariants(variants, constraints);
+      const availableValues = new Set(matchingVariants.map((v) => v.specs[attr.key]));
       result[attr.key] = attr.values.map((value) => {
         const isSelected = selectedSpecs[attr.key] === value;
-        const specs = { ...selectedSpecs };
-        delete specs[attr.key];
-        const matchingVariants = findVariants(variants, specs);
-        const availableValuesForAttr = new Set(matchingVariants.map((v) => v.specs[attr.key]));
-        const isAvailable = availableValuesForAttr.has(value);
+        const isAvailable = availableValues.has(value);
         return {
           key: attr.key,
           value,
@@ -532,13 +536,34 @@ var useVariantSelector = (props) => {
     });
     return result;
   }, [variants, attributes, selectedSpecs]);
-  const onOptionSelect = (key, value) => {
+  const onOptionSelect = useCallback4((key, value) => {
     setSelectedSpecs((prev) => {
-      const specs = { ...prev };
-      specs[key] = value;
-      return specs;
+      const newSpecs = { ...prev, [key]: value };
+      const attrIndex = attributes.findIndex((a) => a.key === key);
+      for (let i = attrIndex + 1;i < attributes.length; i++) {
+        const downstreamAttr = attributes[i];
+        if (!downstreamAttr)
+          continue;
+        const constraints = {};
+        for (let j = 0;j < i; j++) {
+          const k = attributes[j]?.key;
+          if (k && newSpecs[k])
+            constraints[k] = newSpecs[k];
+        }
+        const matching = findVariants(variants, constraints);
+        const availableValues = new Set(matching.map((v) => v.specs[downstreamAttr.key]));
+        if (!availableValues.has(newSpecs[downstreamAttr.key])) {
+          const firstAvailable = downstreamAttr.values.find((v) => availableValues.has(v));
+          if (firstAvailable) {
+            newSpecs[downstreamAttr.key] = firstAvailable;
+          } else {
+            delete newSpecs[downstreamAttr.key];
+          }
+        }
+      }
+      return newSpecs;
     });
-  };
+  }, [attributes, variants]);
   return {
     variantId,
     onOptionSelect,

package/dist/rn/index.js

@@ -466,7 +466,7 @@ var useFrappeUpdateDoc = () => {
   };
 };
 // src/hooks/use-variant-selector/hook.ts
-import { useMemo as useMemo2, useState as useState5 } from "react";
+import { useCallback as useCallback4, useMemo as useMemo2, useState as useState5 } from "react";
 
 // src/hooks/use-variant-selector/utils.ts
 function findVariant(variants, specs, caseInsensitive) {
@@ -515,14 +515,18 @@ var useVariantSelector = (props) => {
   }, [variants, selectedSpecs, attributes]);
   const options = useMemo2(() => {
     const result = {};
-    attributes.forEach((attr) => {
+    attributes.forEach((attr, attrIndex) => {
+      const constraints = {};
+      for (let i = 0;i < attrIndex; i++) {
+        const key = attributes[i]?.key;
+        if (key && selectedSpecs[key])
+          constraints[key] = selectedSpecs[key];
+      }
+      const matchingVariants = findVariants(variants, constraints);
+      const availableValues = new Set(matchingVariants.map((v) => v.specs[attr.key]));
       result[attr.key] = attr.values.map((value) => {
         const isSelected = selectedSpecs[attr.key] === value;
-        const specs = { ...selectedSpecs };
-        delete specs[attr.key];
-        const matchingVariants = findVariants(variants, specs);
-        const availableValuesForAttr = new Set(matchingVariants.map((v) => v.specs[attr.key]));
-        const isAvailable = availableValuesForAttr.has(value);
+        const isAvailable = availableValues.has(value);
         return {
           key: attr.key,
           value,
@@ -532,13 +536,34 @@ var useVariantSelector = (props) => {
     });
     return result;
   }, [variants, attributes, selectedSpecs]);
-  const onOptionSelect = (key, value) => {
+  const onOptionSelect = useCallback4((key, value) => {
     setSelectedSpecs((prev) => {
-      const specs = { ...prev };
-      specs[key] = value;
-      return specs;
+      const newSpecs = { ...prev, [key]: value };
+      const attrIndex = attributes.findIndex((a) => a.key === key);
+      for (let i = attrIndex + 1;i < attributes.length; i++) {
+        const downstreamAttr = attributes[i];
+        if (!downstreamAttr)
+          continue;
+        const constraints = {};
+        for (let j = 0;j < i; j++) {
+          const k = attributes[j]?.key;
+          if (k && newSpecs[k])
+            constraints[k] = newSpecs[k];
+        }
+        const matching = findVariants(variants, constraints);
+        const availableValues = new Set(matching.map((v) => v.specs[downstreamAttr.key]));
+        if (!availableValues.has(newSpecs[downstreamAttr.key])) {
+          const firstAvailable = downstreamAttr.values.find((v) => availableValues.has(v));
+          if (firstAvailable) {
+            newSpecs[downstreamAttr.key] = firstAvailable;
+          } else {
+            delete newSpecs[downstreamAttr.key];
+          }
+        }
+      }
+      return newSpecs;
     });
-  };
+  }, [attributes, variants]);
   return {
     variantId,
     onOptionSelect,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lasterp/shared",
-  "version": "1.0.0-alpha.17",
+  "version": "1.0.0-alpha.18",
   "description": "Shared repo for webapp and native app",
   "license": "MIT",
   "files": [