@ppg_pl/tinting 0.0.2 → 0.0.4

package/dist/cjs/modal-header_9.cjs.entry.js

@@ -2569,10 +2569,21 @@ const fetchColors = async (filters) => {
     return [];
   }
 };
+const getSampleSortForProduct = (sample, productId) => {
+  var _a, _b;
+  const link = (_a = sample === null || sample === void 0 ? void 0 : sample.Products) === null || _a === void 0 ? void 0 : _a.find((p) => p.Product_id === productId);
+  // put null/undefined at the end
+  return (_b = link === null || link === void 0 ? void 0 : link.sort) !== null && _b !== void 0 ? _b : Number.POSITIVE_INFINITY;
+};
 const fetchSamplesColors = async (filters) => {
   try {
+    // you already include Products.* in the query
+    const { id: productId } = filters;
     const response = await ApiService.getData(`items/Sample?${fetchColorsQuery(Object.assign({}, filters))}`);
-    return (response === null || response === void 0 ? void 0 : response.data) || [];
+    const data = (response === null || response === void 0 ? void 0 : response.data) || [];
+    // order by junction sort
+    const ordered = [...data].sort((a, b) => getSampleSortForProduct(a, productId) - getSampleSortForProduct(b, productId));
+    return ordered;
   }
   catch (error) {
     console.error('Error fetching samples colors:', error);
@@ -6617,8 +6628,6 @@ const Modal = class {
     return sortedColors;
   }
   getColorHueGroup(hex) {
-    if (!hex || !chroma.valid(hex))
-      return 'other';
     const color = chroma(hex);
     const hue = color.get('hsl.h');
     const saturation = color.get('hsl.s');
@@ -6649,9 +6658,6 @@ const Modal = class {
   sortColorsByHueAndSimilarity(colors) {
     if ((colors === null || colors === void 0 ? void 0 : colors.length) <= 1)
       return colors;
-    // Separate valid and invalid hex colors
-    const validColors = colors.filter(c => typeof c.hex === 'string' && c.hex && chroma.valid(c.hex));
-    const invalidColors = colors.filter(c => !c.hex || !chroma.valid(c.hex));
     // Group valid colors by their hue family
     const colorGroups = {
       red: [],
@@ -6665,7 +6671,7 @@ const Modal = class {
       white: [],
       other: [],
     };
-    validColors.forEach(color => {
+    colors.forEach(color => {
       const group = this.getColorHueGroup(color.hex);
       colorGroups[group].push(color);
     });
@@ -6678,10 +6684,10 @@ const Modal = class {
       }
     });
     // Combine all sorted groups, then append invalid colors at the end
-    return [...sortedGroups.flat(), ...invalidColors];
+    return sortedGroups.flat();
   }
   async fetchColorsData({ reset = false } = {}) {
-    if (this.loading)
+    if (this.loading && !reset)
       return;
     this.loading = true;
     try {