@usereactify/search 3.11.0-beta.0 → 3.12.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/filter/FilterStack.js +1 -1
- package/dist/hooks/reactivesearch/useReactiveFilterListProps.js +2 -2
- package/dist/hooks/reactivesearch/useReactiveReactProp.d.ts +1 -1
- package/dist/hooks/reactivesearch/useReactiveReactProp.js +6 -6
- package/dist/provider.d.ts +3 -3
- package/dist/provider.js +26 -17
- package/dist/types/firestore.d.ts +2 -0
- package/package.json +1 -1
|
@@ -14,7 +14,7 @@ const FilterStack = (props) => {
|
|
|
14
14
|
return null;
|
|
15
15
|
if (render)
|
|
16
16
|
return render(filters);
|
|
17
|
-
return (react_1.default.createElement(react_1.default.Fragment, null, filters.map((filter) => (react_1.default.createElement(FilterWithState, Object.assign({ key: filter.
|
|
17
|
+
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))))));
|
|
18
18
|
};
|
|
19
19
|
exports.FilterStack = FilterStack;
|
|
20
20
|
const FilterWithState = ({ filter, renderFilter, }) => {
|
|
@@ -7,7 +7,7 @@ exports.useReactiveFilterListProps = void 0;
|
|
|
7
7
|
const react_1 = __importDefault(require("react"));
|
|
8
8
|
const useReactiveReactProp_1 = require("./useReactiveReactProp");
|
|
9
9
|
const useReactiveFilterListProps = (filter) => {
|
|
10
|
-
const reactiveReactProp = (0, useReactiveReactProp_1.useReactiveReactProp)(filter.
|
|
10
|
+
const reactiveReactProp = (0, useReactiveReactProp_1.useReactiveReactProp)(filter.handle);
|
|
11
11
|
const nestedField = react_1.default.useMemo(() => {
|
|
12
12
|
const nestedFields = ["variants"];
|
|
13
13
|
const topField = filter.field.split(".")[0];
|
|
@@ -93,7 +93,7 @@ const useReactiveFilterListProps = (filter) => {
|
|
|
93
93
|
customQuery,
|
|
94
94
|
defaultQuery,
|
|
95
95
|
URLParams: true,
|
|
96
|
-
componentId: filter.
|
|
96
|
+
componentId: filter.handle,
|
|
97
97
|
dataField: filter.field,
|
|
98
98
|
filterLabel: filter.name,
|
|
99
99
|
react: reactiveReactProp,
|
|
@@ -8,18 +8,18 @@ const react_1 = __importDefault(require("react"));
|
|
|
8
8
|
const sensor_1 = require("../../sensor");
|
|
9
9
|
const useFilters_1 = require("../useFilters");
|
|
10
10
|
const provider_1 = require("../../provider");
|
|
11
|
-
const useReactiveReactProp = (
|
|
11
|
+
const useReactiveReactProp = (currentHandle) => {
|
|
12
12
|
const filters = (0, useFilters_1.useFilters)();
|
|
13
|
-
const {
|
|
13
|
+
const { additionalComponentHandles } = (0, provider_1.useContext)();
|
|
14
14
|
return react_1.default.useMemo(() => {
|
|
15
15
|
return {
|
|
16
16
|
and: [
|
|
17
17
|
"SearchInput",
|
|
18
18
|
...sensor_1.SENSOR_IDS,
|
|
19
|
-
...(
|
|
20
|
-
...filters.map((filter) => filter.
|
|
21
|
-
].filter((
|
|
19
|
+
...(additionalComponentHandles !== null && additionalComponentHandles !== void 0 ? additionalComponentHandles : []),
|
|
20
|
+
...filters.map((filter) => filter.handle),
|
|
21
|
+
].filter((handle) => handle !== currentHandle),
|
|
22
22
|
};
|
|
23
|
-
}, [filters,
|
|
23
|
+
}, [filters, currentHandle]);
|
|
24
24
|
};
|
|
25
25
|
exports.useReactiveReactProp = useReactiveReactProp;
|
package/dist/provider.d.ts
CHANGED
|
@@ -20,14 +20,14 @@ declare type Context = {
|
|
|
20
20
|
theme?: Theme;
|
|
21
21
|
curation?: ConfigCuration;
|
|
22
22
|
/** Array of additional component IDs managed outside of Reactify Search */
|
|
23
|
-
|
|
23
|
+
additionalComponentHandles?: string[];
|
|
24
24
|
};
|
|
25
25
|
declare const Context: React.Context<Context | undefined>;
|
|
26
26
|
declare type Props = {
|
|
27
27
|
index: string;
|
|
28
28
|
shopifyPermanentDomain: string;
|
|
29
29
|
configId?: string;
|
|
30
|
-
|
|
30
|
+
filterStackHandle?: string;
|
|
31
31
|
collection?: Collection;
|
|
32
32
|
noReactiveBase?: boolean;
|
|
33
33
|
instantSearch?: boolean;
|
|
@@ -35,7 +35,7 @@ declare type Props = {
|
|
|
35
35
|
credentials?: Credentials;
|
|
36
36
|
theme?: Theme;
|
|
37
37
|
/** Array of additional component IDs managed outside of Reactify Search */
|
|
38
|
-
|
|
38
|
+
additionalComponentHandles?: string[];
|
|
39
39
|
/**
|
|
40
40
|
* Optional render function to display a component when the config is loading.
|
|
41
41
|
*/
|
package/dist/provider.js
CHANGED
|
@@ -38,7 +38,7 @@ const Provider = (_a) => {
|
|
|
38
38
|
exports.Provider = Provider;
|
|
39
39
|
const ConfiguredProvider = (props) => {
|
|
40
40
|
var _a, _b;
|
|
41
|
-
const { index, config, children, collection, instantSearch,
|
|
41
|
+
const { index, config, children, collection, instantSearch, filterStackHandle, noReactiveBase, shopifyPermanentDomain, additionalComponentHandles, onRedirect, } = props;
|
|
42
42
|
const credentials = (_a = props.credentials) !== null && _a !== void 0 ? _a : defaultCredentials;
|
|
43
43
|
const theme = (_b = props.theme) !== null && _b !== void 0 ? _b : {
|
|
44
44
|
typography: {
|
|
@@ -107,7 +107,7 @@ const ConfiguredProvider = (props) => {
|
|
|
107
107
|
// do not attempt to resolve a filter stack if in instantSearch mode
|
|
108
108
|
const filterStack = instantSearch
|
|
109
109
|
? undefined
|
|
110
|
-
: useFilterStack(config, collection,
|
|
110
|
+
: useFilterStack(config, collection, filterStackHandle);
|
|
111
111
|
const curation = useCuration(config, collection, searchQuery);
|
|
112
112
|
const contextValue = react_1.default.useMemo(() => ({
|
|
113
113
|
index,
|
|
@@ -126,7 +126,7 @@ const ConfiguredProvider = (props) => {
|
|
|
126
126
|
setShowInstantSearchResults,
|
|
127
127
|
theme,
|
|
128
128
|
curation,
|
|
129
|
-
|
|
129
|
+
additionalComponentHandles,
|
|
130
130
|
instantSearch: !!instantSearch,
|
|
131
131
|
showInstantSearchResults: !!showInstantSearchResults && !!searchQuery,
|
|
132
132
|
}), [
|
|
@@ -143,7 +143,7 @@ const ConfiguredProvider = (props) => {
|
|
|
143
143
|
onRedirect,
|
|
144
144
|
submitSearch,
|
|
145
145
|
instantSearch,
|
|
146
|
-
|
|
146
|
+
additionalComponentHandles,
|
|
147
147
|
showInstantSearchResults,
|
|
148
148
|
theme,
|
|
149
149
|
]);
|
|
@@ -187,22 +187,31 @@ const useSortState = (config, collection) => {
|
|
|
187
187
|
// @todo we need a better name for the overall page like "Filter Stack" or something,
|
|
188
188
|
// each block is then called a filter so like Size would be a "Filter" and then each
|
|
189
189
|
// value within it is a "Filter Option"
|
|
190
|
-
const useFilterStack = (config, collection,
|
|
191
|
-
|
|
192
|
-
//
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
190
|
+
const useFilterStack = (config, collection, filterStackHandle) => react_1.default.useMemo(() => {
|
|
191
|
+
const type = !!collection ? "collection" : "search";
|
|
192
|
+
// exclude filters by type
|
|
193
|
+
const filterStacks = config.filters.filter((filter) => filter.type === type);
|
|
194
|
+
// select filter stack by handle if provided
|
|
195
|
+
if (filterStackHandle) {
|
|
196
|
+
const matchingFilterStack = filterStacks.find((filterStack) => filterStackHandle === filterStack.handle);
|
|
197
|
+
if (matchingFilterStack) {
|
|
198
|
+
return matchingFilterStack;
|
|
199
|
+
}
|
|
197
200
|
}
|
|
198
|
-
//
|
|
201
|
+
// select filter stack by collection if provided
|
|
199
202
|
if (collection === null || collection === void 0 ? void 0 : collection.handle) {
|
|
200
|
-
const
|
|
201
|
-
if (
|
|
202
|
-
return
|
|
203
|
+
const matchingFilterStack = filterStacks.find((filterStack) => { var _a; return (_a = filterStack.collections) === null || _a === void 0 ? void 0 : _a.includes(collection.handle); });
|
|
204
|
+
if (matchingFilterStack) {
|
|
205
|
+
return matchingFilterStack;
|
|
206
|
+
}
|
|
203
207
|
}
|
|
204
|
-
|
|
205
|
-
|
|
208
|
+
// select filter with "default" handle
|
|
209
|
+
const matchingFilterStack = filterStacks.find((filterStack) => filterStack.handle === "default");
|
|
210
|
+
if (matchingFilterStack) {
|
|
211
|
+
return matchingFilterStack;
|
|
212
|
+
}
|
|
213
|
+
// select any available filter as a last resort
|
|
214
|
+
return config.filters[0];
|
|
206
215
|
}, [config, collection]);
|
|
207
216
|
const useCuration = (config, collection, searchQuery) => react_1.default.useMemo(() => {
|
|
208
217
|
debug("resolveCuration.start", { config, collection, searchQuery });
|
|
@@ -116,6 +116,7 @@ export interface Sort {
|
|
|
116
116
|
export interface Filter {
|
|
117
117
|
id: string;
|
|
118
118
|
name: string;
|
|
119
|
+
handle: string;
|
|
119
120
|
enabled: boolean;
|
|
120
121
|
pageSize: number;
|
|
121
122
|
keywords: string[];
|
|
@@ -135,6 +136,7 @@ export interface FilterOption {
|
|
|
135
136
|
field: string;
|
|
136
137
|
id: string;
|
|
137
138
|
name: string;
|
|
139
|
+
handle: string;
|
|
138
140
|
position: number;
|
|
139
141
|
settingsCollapsedDesktop: boolean;
|
|
140
142
|
settingsCollapsedMobile: boolean;
|