@usereactify/search 3.12.0-beta.1 → 3.12.0-beta.4

package/dist/filter/FilterStack.js

@@ -14,7 +14,7 @@ const FilterStack = (props) => {
         return null;
     if (render)
         return render(filters);
-    return (react_1.default.createElement(react_1.default.Fragment, null, filters.map((filter) => (react_1.default.createElement(FilterWithState, Object.assign({ key: filter.handle, filter: filter }, props))))));
+    return (react_1.default.createElement(react_1.default.Fragment, null, filters.map((filter) => (react_1.default.createElement(FilterWithState, Object.assign({ key: filter.id, filter: filter }, props))))));
 };
 exports.FilterStack = FilterStack;
 const FilterWithState = ({ filter, renderFilter, }) => {

package/dist/provider.d.ts

@@ -27,7 +27,7 @@ declare type Props = {
     index: string;
     shopifyPermanentDomain: string;
     configId?: string;
-    filterStackId?: string;
+    filterStackHandle?: string;
     collection?: Collection;
     noReactiveBase?: boolean;
     instantSearch?: boolean;

package/dist/provider.js

@@ -38,7 +38,7 @@ const Provider = (_a) => {
 exports.Provider = Provider;
 const ConfiguredProvider = (props) => {
     var _a, _b;
-    const { index, config, children, collection, instantSearch, filterStackId, noReactiveBase, shopifyPermanentDomain, additionalComponentHandles, onRedirect, } = props;
+    const { index, config, children, collection, instantSearch, filterStackHandle, noReactiveBase, shopifyPermanentDomain, additionalComponentHandles, onRedirect, } = props;
     const credentials = (_a = props.credentials) !== null && _a !== void 0 ? _a : defaultCredentials;
     const theme = (_b = props.theme) !== null && _b !== void 0 ? _b : {
         typography: {
@@ -77,13 +77,13 @@ const ConfiguredProvider = (props) => {
             setSearchQuery(searchQueryFromURL);
     }, [searchQueryFromURL]);
     react_1.default.useEffect(() => {
-        if (searchSortFromURL && (sortOption === null || sortOption === void 0 ? void 0 : sortOption.id) !== searchSortFromURL) {
+        if (searchSortFromURL && (sortOption === null || sortOption === void 0 ? void 0 : sortOption.handle) !== searchSortFromURL) {
             setSortOption(searchSortFromURL, true);
         }
     }, [searchSortFromURL]);
     react_1.default.useEffect(() => {
-        if (window.location.search === "" && (sortOption === null || sortOption === void 0 ? void 0 : sortOption.id)) {
-            setSortOption(sortOption.id, true);
+        if (window.location.search === "" && (sortOption === null || sortOption === void 0 ? void 0 : sortOption.handle)) {
+            setSortOption(sortOption.handle, true);
         }
     }, [window.location.href]);
     const [showInstantSearchResults, setShowInstantSearchResults] = react_1.default.useState(false);
@@ -107,7 +107,7 @@ const ConfiguredProvider = (props) => {
     // do not attempt to resolve a filter stack if in instantSearch mode
     const filterStack = instantSearch
         ? undefined
-        : useFilterStack(config, collection, filterStackId);
+        : useFilterStack(config, collection, filterStackHandle);
     const curation = useCuration(config, collection, searchQuery);
     const contextValue = react_1.default.useMemo(() => ({
         index,
@@ -167,7 +167,7 @@ const useSortState = (config, collection) => {
             .sort((a, b) => `${a.position}`.localeCompare(`${b.position}`))
             .filter(({ visibility }) => ["all", type].includes(visibility));
     }, [config, collection]);
-    const [sortOptionState, setSortOptionState] = react_1.default.useState((_a = sortOptions[0]) === null || _a === void 0 ? void 0 : _a.id);
+    const [sortOptionState, setSortOptionState] = react_1.default.useState((_a = sortOptions[0]) === null || _a === void 0 ? void 0 : _a.handle);
     const sortOption = react_1.default.useMemo(() => sortOptions.find(({ id }) => id === sortOptionState) || sortOptions[0], [sortOptions, sortOptionState]);
     const setSortOption = react_1.default.useCallback((sortOptionId, ignoreHistoryState = false) => {
         setSortOptionState(sortOptionId);
@@ -187,22 +187,37 @@ const useSortState = (config, collection) => {
 // @todo we need a better name for the overall page like "Filter Stack" or something,
 // each block is then called a filter so like Size would be a "Filter" and then each
 // value within it is a "Filter Option"
-const useFilterStack = (config, collection, filterStackId) => react_1.default.useMemo(() => {
-    var _a;
-    // manually select filter stack by ID if provided
-    if (filterStackId) {
-        const filterStack = config.filters.find((filter) => filterStackId === filter.handle);
-        if (filterStack)
-            return filterStack;
+const useFilterStack = (config, collection, filterStackHandle) => react_1.default.useMemo(() => {
+    const type = !!collection ? "collection" : "search";
+    // select filters by type
+    const matchingFilterStacks = config.filters.filter((filter) => filter.type === type);
+    // select filter stack by handle if provided
+    if (filterStackHandle) {
+        const matchingFilterStack = matchingFilterStacks.find((filterStack) => filterStackHandle === filterStack.handle);
+        if (matchingFilterStack) {
+            return matchingFilterStack;
+        }
     }
-    // automatically select filter stack by collection if provided
+    // select filter stack by collection if provided
     if (collection === null || collection === void 0 ? void 0 : collection.handle) {
-        const filterStack = config.filters.find((filter) => { var _a; return (_a = filter.collections) === null || _a === void 0 ? void 0 : _a.includes(collection.handle); });
-        if (filterStack)
-            return filterStack;
+        const matchingFilterStack = matchingFilterStacks.find((filterStack) => { var _a; return (_a = filterStack.collections) === null || _a === void 0 ? void 0 : _a.includes(collection.handle); });
+        if (matchingFilterStack) {
+            return matchingFilterStack;
+        }
     }
-    const type = !!collection ? "collection" : "search";
-    return ((_a = config.filters.find((filter) => type === filter.type)) !== null && _a !== void 0 ? _a : config.filters[0]);
+    // select filter with "default" handle
+    let matchingFilterStack = matchingFilterStacks.find((filterStack) => filterStack.handle === "default");
+    if (matchingFilterStack) {
+        return matchingFilterStack;
+    }
+    // select any filter with "default" handle
+    matchingFilterStack = config.filters.find((filterStack) => filterStack.handle === "default");
+    if (matchingFilterStack) {
+        return matchingFilterStack;
+    }
+    // select any available filter as a last resort
+    matchingFilterStack = config.filters[0];
+    return matchingFilterStack;
 }, [config, collection]);
 const useCuration = (config, collection, searchQuery) => react_1.default.useMemo(() => {
     debug("resolveCuration.start", { config, collection, searchQuery });

package/dist/types/firestore.d.ts

@@ -107,6 +107,7 @@ export interface DefinedField {
 export interface Sort {
     id: string;
     name: string;
+    handle: string;
     field: string;
     position: number;
     enabled: boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@usereactify/search",
   "description": "React UI library for Reactify Search",
-  "version": "3.12.0-beta.1",
+  "version": "3.12.0-beta.4",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",