@salla.sa/twilight-theme-engine 1.0.90 → 1.0.92

package/tailwind/routes/product-listing/ProductListPage.tsx.txt

@@ -3,7 +3,7 @@ import { HookSlot, useStore } from '../../hooks';
 import { useTranslation } from '../../providers/I18nProvider';
 import { useNavigate, useLocation } from '../../providers/NavigationProvider';
 import { useTwilight } from '../../providers/TwilightProvider';
-import { sortOptions } from '../../utils/sort-options';
+import { availableSortIds, sortOptions } from '../../utils/sort-options';
 import { Drawer } from '../../components/drawer';
 import { Breadcrumb } from '../../components/common';
 import { SallaFilters } from '@salla.sa/twilight-components-react/filters';
@@ -56,7 +56,14 @@ export function ProductListPage({
   useReorderButtons(isReorder);
 
   // Generate sort options with translations
-  const sortOptionsWithTrans = useMemo(() => sortOptions(selectedSort, t), [selectedSort, t]);
+  const sortIds = availableSortIds(source.type, store?.settings?.product?.sort_options);
+  const sortOptionsWithTrans = useMemo(
+    () => sortOptions(selectedSort, t, sortIds),
+    [selectedSort, t, sortIds]
+  );
+  // The merchant may have turned off the sort the list is in (the default, or an old link's):
+  // show no choice rather than an option that does not describe the order.
+  const shownSort = sortOptionsWithTrans.some((option) => option.is_selected) ? selectedSort : '';
 
   // Get location from hook for consistent URL handling
   const location = useLocation();
@@ -221,9 +228,14 @@ export function ProductListPage({
                   <select
                     id="product-sort"
                     className="form-input pt-0 pb-1 rtl:md:pl-10 ltr:md:pr-10"
-                    value={selectedSort}
+                    value={shownSort}
                     onChange={handleSortChange}
                   >
+                    {shownSort === '' && (
+                      <option value="" disabled hidden>
+                        {t('pages.categories.sorting', 'Sort By')}
+                      </option>
+                    )}
                     {sortOptionsWithTrans.map((option) => (
                       <option key={option.id} value={option.id}>
                         {option.name}

package/tailwind/routes/product-listing/loader.ts.txt

@@ -7,6 +7,7 @@ import { notFound, orThrow, unauthorized } from '../../providers/NavigationProvi
 import { getAuthToken } from '../../api/client';
 import { getTwilightContext } from '../../twilight/context';
 import { RouteId } from '../../router/route-ids';
+import { SORT_IDS } from '../../utils/sort-options';
 
 const DEFAULT_SORT = 'ourSuggest';
 
@@ -44,7 +45,8 @@ export async function productListLoader(
   // A number is a page from an old Twig link; the API pages only by its own cursor.
   const page = search?.page ? String(search.page) : undefined;
   const cursor = page && Number.isNaN(Number(page)) ? page : undefined;
-  const sort = search?.sort ?? DEFAULT_SORT;
+  // A sort the API does not know is a 422 for the whole page; fall back to the default.
+  const sort = search?.sort && SORT_IDS.includes(search.sort) ? search.sort : DEFAULT_SORT;
 
   const sourceType = params.source ?? (params.id ? 'categories' : undefined);
 

package/dist/chunk-6Z4MOC4S.js

@@ -1,32 +0,0 @@
-// src/utils/sort-options.ts
-var sortOptions = (currentSort, t) => [
-  {
-    id: "ourSuggest",
-    name: t("pages.categories.sort_by_suggestions", "Our Suggestions"),
-    is_selected: currentSort === "ourSuggest"
-  },
-  {
-    id: "bestSell",
-    name: t("pages.categories.sort_by_sales", "Best Seller"),
-    is_selected: currentSort === "bestSell"
-  },
-  {
-    id: "topRated",
-    name: t("pages.categories.sort_by_rating", "Top Rated"),
-    is_selected: currentSort === "topRated"
-  },
-  {
-    id: "priceFromLowToTop",
-    name: t("pages.categories.sort_by_price_az", "Price Low to High"),
-    is_selected: currentSort === "priceFromLowToTop"
-  },
-  {
-    id: "priceFromTopToLow",
-    name: t("pages.categories.sort_by_price_za", "Price High to Low"),
-    is_selected: currentSort === "priceFromTopToLow"
-  }
-];
-
-export { sortOptions };
-//# sourceMappingURL=chunk-6Z4MOC4S.js.map
-//# sourceMappingURL=chunk-6Z4MOC4S.js.map

package/dist/chunk-6Z4MOC4S.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/utils/sort-options.ts"],"names":[],"mappings":";AAEO,IAAM,WAAA,GAAc,CAAC,WAAA,EAAqB,CAAA,KAAmB;AAAA,EAClE;AAAA,IACE,EAAA,EAAI,YAAA;AAAA,IACJ,IAAA,EAAM,CAAA,CAAE,sCAAA,EAAwC,iBAAiB,CAAA;AAAA,IACjE,aAAa,WAAA,KAAgB;AAAA,GAC/B;AAAA,EACA;AAAA,IACE,EAAA,EAAI,UAAA;AAAA,IACJ,IAAA,EAAM,CAAA,CAAE,gCAAA,EAAkC,aAAa,CAAA;AAAA,IACvD,aAAa,WAAA,KAAgB;AAAA,GAC/B;AAAA,EACA;AAAA,IACE,EAAA,EAAI,UAAA;AAAA,IACJ,IAAA,EAAM,CAAA,CAAE,iCAAA,EAAmC,WAAW,CAAA;AAAA,IACtD,aAAa,WAAA,KAAgB;AAAA,GAC/B;AAAA,EACA;AAAA,IACE,EAAA,EAAI,mBAAA;AAAA,IACJ,IAAA,EAAM,CAAA,CAAE,mCAAA,EAAqC,mBAAmB,CAAA;AAAA,IAChE,aAAa,WAAA,KAAgB;AAAA,GAC/B;AAAA,EACA;AAAA,IACE,EAAA,EAAI,mBAAA;AAAA,IACJ,IAAA,EAAM,CAAA,CAAE,mCAAA,EAAqC,mBAAmB,CAAA;AAAA,IAChE,aAAa,WAAA,KAAgB;AAAA;AAEjC","file":"chunk-6Z4MOC4S.js","sourcesContent":["type TranslateFn = (key: string, fallback: string) => string;\n\nexport const sortOptions = (currentSort: string, t: TranslateFn) => [\n  {\n    id: 'ourSuggest',\n    name: t('pages.categories.sort_by_suggestions', 'Our Suggestions'),\n    is_selected: currentSort === 'ourSuggest',\n  },\n  {\n    id: 'bestSell',\n    name: t('pages.categories.sort_by_sales', 'Best Seller'),\n    is_selected: currentSort === 'bestSell',\n  },\n  {\n    id: 'topRated',\n    name: t('pages.categories.sort_by_rating', 'Top Rated'),\n    is_selected: currentSort === 'topRated',\n  },\n  {\n    id: 'priceFromLowToTop',\n    name: t('pages.categories.sort_by_price_az', 'Price Low to High'),\n    is_selected: currentSort === 'priceFromLowToTop',\n  },\n  {\n    id: 'priceFromTopToLow',\n    name: t('pages.categories.sort_by_price_za', 'Price High to Low'),\n    is_selected: currentSort === 'priceFromTopToLow',\n  },\n];\n"]}

package/dist/chunk-PIXAIGO3.js

@@ -1,14 +0,0 @@
-import { lazy } from 'react';
-
-// src/components/cart/lazy.ts
-var LazyCartItem = lazy(() => import('./CartItem-AHUDNTQR.js').then((m) => ({ default: m.CartItem })));
-var LazyCartSummary = lazy(
-  () => import('./CartSummary-S67UB3AG.js').then((m) => ({ default: m.CartSummary }))
-);
-var LazySeoCartWidget = lazy(
-  () => import('./SeoCartWidget-SWCLBEG4.js').then((m) => ({ default: m.SeoCartWidget }))
-);
-
-export { LazyCartItem, LazyCartSummary, LazySeoCartWidget };
-//# sourceMappingURL=chunk-PIXAIGO3.js.map
-//# sourceMappingURL=chunk-PIXAIGO3.js.map