@primestyleai/tryon 5.8.12 → 5.8.14

package/dist/react/index.js

@@ -6831,50 +6831,71 @@ function SectionDetailView({
   }, [section, sizeColIdx, sizeHeader]);
   const displaySize = selectedSize || recSize;
   const isRecommended = displaySize === recSize;
-  const chartRangeFor = useCallback((measurement, size) => {
-    const b = measurement.toLowerCase().trim();
-    const preferCm = unitLbl === "cm" || unitLbl === "";
-    let mc = -1;
+  const columnUnits = useMemo(() => {
+    const units = [];
     for (let i = 0; i < section.headers.length; i++) {
-      const a = section.headers[i].toLowerCase().trim();
-      if (a === b) {
-        mc = i;
-        break;
+      const h = (section.headers[i] || "").toLowerCase();
+      if (/\(cm\)|centimeter/i.test(h)) {
+        units.push("cm");
+        continue;
       }
-      if (a.includes(b) || b.includes(a.replace(/\s*\(.*?\)\s*/g, "").trim())) {
-        const hasCm = /\(cm\)|centimeter/i.test(a);
-        const hasIn = /\(in\)|inch/i.test(a);
-        if (preferCm && hasCm) {
-          mc = i;
+      if (/\(in\)|\(inch|inch/i.test(h)) {
+        units.push("in");
+        continue;
+      }
+      let inferred = null;
+      for (const row of section.rows) {
+        const cell = String(cellValFn(row, i, section.headers[i]) || "").trim();
+        if (!cell) continue;
+        if (/cm\b|centimeter/i.test(cell)) {
+          inferred = "cm";
           break;
         }
-        if (!preferCm && hasIn) {
-          mc = i;
+        if (/in\b|inch|"$/i.test(cell)) {
+          inferred = "in";
           break;
         }
-        if (mc < 0) mc = i;
+      }
+      units.push(inferred);
+    }
+    return units;
+  }, [section]);
+  const chartRangeFor = useCallback((measurement, size) => {
+    const b = measurement.toLowerCase().trim();
+    const preferCm = unitLbl === "cm" || unitLbl === "";
+    const wantUnit = preferCm ? "cm" : "in";
+    const candidates = [];
+    for (let i = 0; i < section.headers.length; i++) {
+      const a = (section.headers[i] || "").toLowerCase().trim();
+      if (a === b) {
+        candidates.push(i);
+        continue;
+      }
+      const aBare = a.replace(/\s*\(.*?\)\s*/g, "").trim();
+      if (aBare === b || a.includes(b) || b.includes(aBare)) {
+        candidates.push(i);
       }
     }
-    if (mc < 0) return null;
+    if (candidates.length === 0) return null;
+    let mc = candidates.find((i) => columnUnits[i] === wantUnit);
+    if (mc == null) mc = candidates[0];
     const mHeader = section.headers[mc];
     const row = section.rows.find((r) => cellValFn(r, sizeColIdx, sizeHeader) === size);
     if (!row) return null;
     const val = cellValFn(row, mc, mHeader);
     if (!val) return null;
     const parsed = pRangeFn(val);
-    const colHdr = section.headers[mc].toLowerCase();
-    const colIsInch = /\(in\)|inch/i.test(colHdr);
-    const colIsCm = /\(cm\)|centimeter/i.test(colHdr);
-    if (colIsInch && preferCm) {
+    const colUnit = columnUnits[mc];
+    if (colUnit === "in" && preferCm) {
       const toCm = (v) => +(v * 2.54).toFixed(1);
       return { range: String(toCm(parsed.min)) + (parsed.min !== parsed.max ? "–" + String(toCm(parsed.max)) : ""), min: toCm(parsed.min), max: toCm(parsed.max) };
     }
-    if (colIsCm && !preferCm) {
+    if (colUnit === "cm" && !preferCm) {
       const toIn = (v) => +(v / 2.54).toFixed(1);
       return { range: String(toIn(parsed.min)) + (parsed.min !== parsed.max ? "–" + String(toIn(parsed.max)) : ""), min: toIn(parsed.min), max: toIn(parsed.max) };
     }
     return { range: val, ...parsed };
-  }, [section, sizeColIdx, sizeHeader, unitLbl]);
+  }, [section, sizeColIdx, sizeHeader, unitLbl, columnUnits]);
   const fitRows = useMemo(() => {
     const mainDetails = sectionResult?.matchDetails || [];
     const lengthDetails = lengthEntry?.secResult?.matchDetails || [];
@@ -7321,40 +7342,73 @@ function SizeResultView({
     if (sizeColIdx < 0 || !sizeGuide?.rows) return [];
     return sizeGuide.rows.map((r) => cellVal(r, sizeColIdx, sizeHeader)).filter(Boolean);
   }, [sizeGuide, sizeColIdx, sizeHeader, cellVal]);
+  const sizeGuideColumnUnits = useMemo(() => {
+    if (!sizeGuide?.headers || !sizeGuide?.rows) return [];
+    const units = [];
+    for (let i = 0; i < sizeGuide.headers.length; i++) {
+      const h = (sizeGuide.headers[i] || "").toLowerCase();
+      if (/\(cm\)|centimeter/i.test(h)) {
+        units.push("cm");
+        continue;
+      }
+      if (/\(in\)|\(inch|inch/i.test(h)) {
+        units.push("in");
+        continue;
+      }
+      let inferred = null;
+      for (const row of sizeGuide.rows) {
+        const cell = String(cellVal(row, i, sizeGuide.headers[i]) || "").trim();
+        if (!cell) continue;
+        if (/cm\b|centimeter/i.test(cell)) {
+          inferred = "cm";
+          break;
+        }
+        if (/in\b|inch|"$/i.test(cell)) {
+          inferred = "in";
+          break;
+        }
+      }
+      units.push(inferred);
+    }
+    return units;
+  }, [sizeGuide, cellVal]);
   const chartRangeFor = useCallback((measurement, size) => {
     if (!sizeGuide?.headers || !sizeGuide?.rows || sizeColIdx < 0) return null;
     const b = measurement.toLowerCase().trim();
     const preferCm = unitLbl === "cm" || unitLbl === "";
-    let mc = -1;
+    const wantUnit = preferCm ? "cm" : "in";
+    const candidates = [];
     for (let i = 0; i < sizeGuide.headers.length; i++) {
-      const a = sizeGuide.headers[i].toLowerCase().trim();
+      const a = (sizeGuide.headers[i] || "").toLowerCase().trim();
       if (a === b) {
-        mc = i;
-        break;
+        candidates.push(i);
+        continue;
       }
-      if (a.includes(b) || b.includes(a.replace(/\s*\(.*?\)\s*/g, "").trim())) {
-        const hasCm = /\(cm\)|centimeter/i.test(a);
-        const hasIn = /\(in\)|inch/i.test(a);
-        if (preferCm && hasCm) {
-          mc = i;
-          break;
-        }
-        if (!preferCm && hasIn) {
-          mc = i;
-          break;
-        }
-        if (mc < 0) mc = i;
+      const aBare = a.replace(/\s*\(.*?\)\s*/g, "").trim();
+      if (aBare === b || a.includes(b) || b.includes(aBare)) {
+        candidates.push(i);
       }
     }
-    if (mc < 0) return null;
+    if (candidates.length === 0) return null;
+    let mc = candidates.find((i) => sizeGuideColumnUnits[i] === wantUnit);
+    if (mc == null) mc = candidates[0];
     const mHeader = sizeGuide.headers[mc];
     const row = sizeGuide.rows.find((r) => cellVal(r, sizeColIdx, sizeHeader) === size);
     if (!row) return null;
     const val = cellVal(row, mc, mHeader);
     if (!val) return null;
     const parsed = pRange(val);
+    const colUnit = sizeGuideColumnUnits[mc];
+    if (colUnit === "in" && preferCm) {
+      const toCm = (v) => +(v * 2.54).toFixed(1);
+      return { range: String(toCm(parsed.min)) + (parsed.min !== parsed.max ? "–" + String(toCm(parsed.max)) : ""), min: toCm(parsed.min), max: toCm(parsed.max) };
+    }
+    if (colUnit === "cm" && !preferCm) {
+      const toIn = (v) => +(v / 2.54).toFixed(1);
+      return { range: String(toIn(parsed.min)) + (parsed.min !== parsed.max ? "–" + String(toIn(parsed.max)) : ""), min: toIn(parsed.min), max: toIn(parsed.max) };
+    }
     return { range: val, ...parsed };
-  }, [sizeGuide, sizeColIdx, sizeHeader, unitLbl, cellVal, pRange]);
+  }, [sizeGuide, sizeColIdx, sizeHeader, unitLbl, cellVal, pRange, sizeGuideColumnUnits]);
   const origSize = sizingResult?.recommendedSize || "";
   const activeSize = origSize;
   useMemo(() => {
@@ -9531,7 +9585,7 @@ function ImageOptionCard({
   );
 }
 const MALE_STEPS = ["basics", "chest", "midsection", "seat"];
-const FEMALE_STEPS = ["basics", "bra", "midsection", "seat", "hips"];
+const FEMALE_STEPS = ["basics", "midsection", "seat", "hips", "bra"];
 const BAND_SIZES = {
   US: ["28", "30", "32", "34", "36", "38", "40", "42", "44", "46", "48", "50", "52", "54", "56"],
   UK: ["28", "30", "32", "34", "36", "38", "40", "42", "44", "46", "48", "50", "52", "54", "56"],

package/dist/storefront/primestyle-tryon.js

@@ -16255,50 +16255,71 @@ function SectionDetailView({
   }, [section, sizeColIdx, sizeHeader]);
   const displaySize = selectedSize || recSize;
   const isRecommended = displaySize === recSize;
-  const chartRangeFor = reactExports.useCallback((measurement, size) => {
-    const b = measurement.toLowerCase().trim();
-    const preferCm = unitLbl === "cm" || unitLbl === "";
-    let mc2 = -1;
+  const columnUnits = reactExports.useMemo(() => {
+    const units = [];
     for (let i = 0; i < section.headers.length; i++) {
-      const a = section.headers[i].toLowerCase().trim();
-      if (a === b) {
-        mc2 = i;
-        break;
+      const h = (section.headers[i] || "").toLowerCase();
+      if (/\(cm\)|centimeter/i.test(h)) {
+        units.push("cm");
+        continue;
       }
-      if (a.includes(b) || b.includes(a.replace(/\s*\(.*?\)\s*/g, "").trim())) {
-        const hasCm = /\(cm\)|centimeter/i.test(a);
-        const hasIn = /\(in\)|inch/i.test(a);
-        if (preferCm && hasCm) {
-          mc2 = i;
+      if (/\(in\)|\(inch|inch/i.test(h)) {
+        units.push("in");
+        continue;
+      }
+      let inferred = null;
+      for (const row of section.rows) {
+        const cell = String(cellValFn(row, i, section.headers[i]) || "").trim();
+        if (!cell) continue;
+        if (/cm\b|centimeter/i.test(cell)) {
+          inferred = "cm";
           break;
         }
-        if (!preferCm && hasIn) {
-          mc2 = i;
+        if (/in\b|inch|"$/i.test(cell)) {
+          inferred = "in";
           break;
         }
-        if (mc2 < 0) mc2 = i;
       }
+      units.push(inferred);
     }
-    if (mc2 < 0) return null;
+    return units;
+  }, [section]);
+  const chartRangeFor = reactExports.useCallback((measurement, size) => {
+    const b = measurement.toLowerCase().trim();
+    const preferCm = unitLbl === "cm" || unitLbl === "";
+    const wantUnit = preferCm ? "cm" : "in";
+    const candidates = [];
+    for (let i = 0; i < section.headers.length; i++) {
+      const a = (section.headers[i] || "").toLowerCase().trim();
+      if (a === b) {
+        candidates.push(i);
+        continue;
+      }
+      const aBare = a.replace(/\s*\(.*?\)\s*/g, "").trim();
+      if (aBare === b || a.includes(b) || b.includes(aBare)) {
+        candidates.push(i);
+      }
+    }
+    if (candidates.length === 0) return null;
+    let mc2 = candidates.find((i) => columnUnits[i] === wantUnit);
+    if (mc2 == null) mc2 = candidates[0];
     const mHeader = section.headers[mc2];
     const row = section.rows.find((r2) => cellValFn(r2, sizeColIdx, sizeHeader) === size);
     if (!row) return null;
     const val = cellValFn(row, mc2, mHeader);
     if (!val) return null;
     const parsed = pRangeFn(val);
-    const colHdr = section.headers[mc2].toLowerCase();
-    const colIsInch = /\(in\)|inch/i.test(colHdr);
-    const colIsCm = /\(cm\)|centimeter/i.test(colHdr);
-    if (colIsInch && preferCm) {
+    const colUnit = columnUnits[mc2];
+    if (colUnit === "in" && preferCm) {
       const toCm = (v2) => +(v2 * 2.54).toFixed(1);
       return { range: String(toCm(parsed.min)) + (parsed.min !== parsed.max ? "–" + String(toCm(parsed.max)) : ""), min: toCm(parsed.min), max: toCm(parsed.max) };
     }
-    if (colIsCm && !preferCm) {
+    if (colUnit === "cm" && !preferCm) {
       const toIn = (v2) => +(v2 / 2.54).toFixed(1);
       return { range: String(toIn(parsed.min)) + (parsed.min !== parsed.max ? "–" + String(toIn(parsed.max)) : ""), min: toIn(parsed.min), max: toIn(parsed.max) };
     }
     return { range: val, ...parsed };
-  }, [section, sizeColIdx, sizeHeader, unitLbl]);
+  }, [section, sizeColIdx, sizeHeader, unitLbl, columnUnits]);
   const fitRows = reactExports.useMemo(() => {
     const mainDetails = sectionResult?.matchDetails || [];
     const lengthDetails = lengthEntry?.secResult?.matchDetails || [];
@@ -16745,40 +16766,73 @@ function SizeResultView({
     if (sizeColIdx < 0 || !sizeGuide?.rows) return [];
     return sizeGuide.rows.map((r2) => cellVal(r2, sizeColIdx, sizeHeader)).filter(Boolean);
   }, [sizeGuide, sizeColIdx, sizeHeader, cellVal]);
+  const sizeGuideColumnUnits = reactExports.useMemo(() => {
+    if (!sizeGuide?.headers || !sizeGuide?.rows) return [];
+    const units = [];
+    for (let i = 0; i < sizeGuide.headers.length; i++) {
+      const h = (sizeGuide.headers[i] || "").toLowerCase();
+      if (/\(cm\)|centimeter/i.test(h)) {
+        units.push("cm");
+        continue;
+      }
+      if (/\(in\)|\(inch|inch/i.test(h)) {
+        units.push("in");
+        continue;
+      }
+      let inferred = null;
+      for (const row of sizeGuide.rows) {
+        const cell = String(cellVal(row, i, sizeGuide.headers[i]) || "").trim();
+        if (!cell) continue;
+        if (/cm\b|centimeter/i.test(cell)) {
+          inferred = "cm";
+          break;
+        }
+        if (/in\b|inch|"$/i.test(cell)) {
+          inferred = "in";
+          break;
+        }
+      }
+      units.push(inferred);
+    }
+    return units;
+  }, [sizeGuide, cellVal]);
   const chartRangeFor = reactExports.useCallback((measurement, size) => {
     if (!sizeGuide?.headers || !sizeGuide?.rows || sizeColIdx < 0) return null;
     const b = measurement.toLowerCase().trim();
     const preferCm = unitLbl === "cm" || unitLbl === "";
-    let mc2 = -1;
+    const wantUnit = preferCm ? "cm" : "in";
+    const candidates = [];
     for (let i = 0; i < sizeGuide.headers.length; i++) {
-      const a = sizeGuide.headers[i].toLowerCase().trim();
+      const a = (sizeGuide.headers[i] || "").toLowerCase().trim();
       if (a === b) {
-        mc2 = i;
-        break;
+        candidates.push(i);
+        continue;
       }
-      if (a.includes(b) || b.includes(a.replace(/\s*\(.*?\)\s*/g, "").trim())) {
-        const hasCm = /\(cm\)|centimeter/i.test(a);
-        const hasIn = /\(in\)|inch/i.test(a);
-        if (preferCm && hasCm) {
-          mc2 = i;
-          break;
-        }
-        if (!preferCm && hasIn) {
-          mc2 = i;
-          break;
-        }
-        if (mc2 < 0) mc2 = i;
+      const aBare = a.replace(/\s*\(.*?\)\s*/g, "").trim();
+      if (aBare === b || a.includes(b) || b.includes(aBare)) {
+        candidates.push(i);
       }
     }
-    if (mc2 < 0) return null;
+    if (candidates.length === 0) return null;
+    let mc2 = candidates.find((i) => sizeGuideColumnUnits[i] === wantUnit);
+    if (mc2 == null) mc2 = candidates[0];
     const mHeader = sizeGuide.headers[mc2];
     const row = sizeGuide.rows.find((r2) => cellVal(r2, sizeColIdx, sizeHeader) === size);
     if (!row) return null;
     const val = cellVal(row, mc2, mHeader);
     if (!val) return null;
     const parsed = pRange(val);
+    const colUnit = sizeGuideColumnUnits[mc2];
+    if (colUnit === "in" && preferCm) {
+      const toCm = (v2) => +(v2 * 2.54).toFixed(1);
+      return { range: String(toCm(parsed.min)) + (parsed.min !== parsed.max ? "–" + String(toCm(parsed.max)) : ""), min: toCm(parsed.min), max: toCm(parsed.max) };
+    }
+    if (colUnit === "cm" && !preferCm) {
+      const toIn = (v2) => +(v2 / 2.54).toFixed(1);
+      return { range: String(toIn(parsed.min)) + (parsed.min !== parsed.max ? "–" + String(toIn(parsed.max)) : ""), min: toIn(parsed.min), max: toIn(parsed.max) };
+    }
     return { range: val, ...parsed };
-  }, [sizeGuide, sizeColIdx, sizeHeader, unitLbl, cellVal, pRange]);
+  }, [sizeGuide, sizeColIdx, sizeHeader, unitLbl, cellVal, pRange, sizeGuideColumnUnits]);
   const origSize = sizingResult?.recommendedSize || "";
   const activeSize = origSize;
   reactExports.useMemo(() => {
@@ -18955,7 +19009,7 @@ function ImageOptionCard({
   );
 }
 const MALE_STEPS = ["basics", "chest", "midsection", "seat"];
-const FEMALE_STEPS = ["basics", "bra", "midsection", "seat", "hips"];
+const FEMALE_STEPS = ["basics", "midsection", "seat", "hips", "bra"];
 const BAND_SIZES = {
   US: ["28", "30", "32", "34", "36", "38", "40", "42", "44", "46", "48", "50", "52", "54", "56"],
   UK: ["28", "30", "32", "34", "36", "38", "40", "42", "44", "46", "48", "50", "52", "54", "56"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primestyleai/tryon",
-  "version": "5.8.12",
+  "version": "5.8.14",
   "description": "PrimeStyle Virtual Try-On SDK — React component & Web Component",
   "type": "module",
   "main": "dist/primestyle-tryon.js",