@usereactify/search 5.6.0-beta.0 → 5.6.0-beta.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [5.6.0-beta.1](https://bitbucket.org/usereactify/reactify-search-ui/compare/beta-v5.6.0-beta.0...beta-v5.6.0-beta.1) (2022-10-10)
+
+
+### Bug Fixes
+
+* skip sort option logic for instant search ([4ef922f](https://bitbucket.org/usereactify/reactify-search-ui/commit/4ef922ffe553c51ee90cd5ae6de2f5292bbf6734))
+
 ## [5.6.0-beta.0](https://bitbucket.org/usereactify/reactify-search-ui/compare/beta-v5.2.2-beta.0...beta-v5.6.0-beta.0) (2022-10-10)
 
 

package/dist/package.json

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

package/dist/src/components/Sensor/SensorSort.js

@@ -15,6 +15,7 @@ const SensorSort = () => {
     const { sort, query } = react_1.default.useMemo(() => {
         return {
             sort: buildSort({
+                mode: options.mode,
                 globalCuration,
                 curation,
                 sortOption,
@@ -35,17 +36,19 @@ const SensorSort = () => {
 exports.SensorSort = SensorSort;
 const buildSort = (args) => {
     var _a;
-    const { curation, sortOption, collectionHandle, globalCuration } = args;
-    // return default sort option if unset
-    if (!sortOption) {
-        return collectionHandle
-            ? mapCollectionPositionSortClause(collectionHandle)
-            : ["_score"];
-    }
-    // curation positions are only applied for the default `collections.position` or `_score` sort
-    // if the sort is something else, apply a normal sort which applies what the user has requested
-    if (!["_score", "collections.position"].includes(sortOption.field)) {
-        return [{ [sortOption.field]: sortOption.direction }];
+    const { mode, curation, sortOption, collectionHandle, globalCuration } = args;
+    if (mode !== "instant-search") {
+        // return default sort option if unset
+        if (!sortOption) {
+            return collectionHandle
+                ? mapCollectionPositionSortClause(collectionHandle)
+                : ["_score"];
+        }
+        // curation positions are only applied for the default `collections.position` or `_score` sort
+        // if the sort is something else, apply a normal sort which applies what the user has requested
+        if (!["_score", "collections.position"].includes(sortOption.field)) {
+            return [{ [sortOption.field]: sortOption.direction }];
+        }
     }
     // no matching curation, return default sort clause
     if (!curation) {
@@ -58,7 +61,7 @@ const buildSort = (args) => {
     if (globalCuration && collectionHandle) {
         sorts.push(...mapCollectionPositionSortClause(collectionHandle));
     }
-    if (!globalCuration && curation.collectionHandle || curation.searchTerm) {
+    if ((!globalCuration && curation.collectionHandle) || curation.searchTerm) {
         sorts.push({
             "curations.position": {
                 unmapped_type: "long",

package/dist/src/components/Sensor/SensorSort.js.map

@@ -1 +1 @@
-{"version":3,"file":"SensorSort.js","sourceRoot":"","sources":["../../../../src/components/Sensor/SensorSort.tsx"],"names":[],"mappings":"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","sourcesContent":["import React from \"react\";\nimport ReactiveComponent from \"@appbaseio/reactivesearch/lib/components/basic/ReactiveComponent\";\n\nimport { ConfigCuration, ConfigSort } from \"../../types\";\nimport { useReactifySearchContext, useSortBy, useCuration } from \"../../hooks\";\n\nexport const SensorSort: React.FC = () => {\n  const { options, config } = useReactifySearchContext();\n  const { curation } = useCuration();\n  const globalCuration = curation?.id === \"global\";\n\n  const { sortOption } = useSortBy();\n\n  const { sort, query } = React.useMemo(() => {\n    return {\n      sort: buildSort({\n        globalCuration,\n        curation,\n        sortOption,\n        collectionHandle:\n          options.mode === \"collection\" ? options.collectionHandle : undefined,\n      }),\n      query: buildQuery({\n        sortOption,\n        curation,\n        globalCuration,\n      }),\n    };\n  }, [config, sortOption, curation]);\n\n  return (\n    <ReactiveComponent\n      componentId=\"SensorSort\"\n      customQuery={() => ({\n        sort,\n        query,\n      })}\n    />\n  );\n};\n\nconst buildSort = (args: {\n  globalCuration?: boolean;\n  curation?: ConfigCuration;\n  sortOption?: ConfigSort;\n  collectionHandle?: string;\n}): any[] => {\n  const { curation, sortOption, collectionHandle, globalCuration } = args;\n\n  // return default sort option if unset\n  if (!sortOption) {\n    return collectionHandle\n      ? mapCollectionPositionSortClause(collectionHandle)\n      : [\"_score\"];\n  }\n\n  // curation positions are only applied for the default `collections.position` or `_score` sort\n  // if the sort is something else, apply a normal sort which applies what the user has requested\n  if (![\"_score\", \"collections.position\"].includes(sortOption.field)) {\n    return [{ [sortOption.field]: sortOption.direction }];\n  }\n\n  // no matching curation, return default sort clause\n  if (!curation) {\n    return collectionHandle\n      ? mapCollectionPositionSortClause(collectionHandle)\n      : [\"_score\"];\n  }\n\n  const sorts = [];\n\n  // show pins first\n  if (globalCuration && collectionHandle) {\n    sorts.push(...mapCollectionPositionSortClause(collectionHandle));\n  }\n  if (!globalCuration && curation.collectionHandle || curation.searchTerm) {\n    sorts.push({\n      \"curations.position\": {\n        unmapped_type: \"long\",\n        order: \"asc\",\n        nested: {\n          path: \"curations\",\n          filter: {\n            term: {\n              [`curations.${\n                \"collection\" === curation.type\n                  ? \"collectionHandle\"\n                  : \"searchTerm\"\n              }.keyword`]:\n                \"collection\" === curation.type\n                  ? curation.collectionHandle\n                  : curation.searchTerm?.toLowerCase(),\n            },\n          },\n        },\n      },\n    });\n  }\n\n  if (0 < curation.boosting.groupings.length) {\n    const groupings = curation.boosting.groupings.sort((a, b) =>\n      a.position > b.position ? 1 : -1\n    );\n\n    for (const grouping of groupings) {\n      try {\n        const query = JSON.parse(grouping.query);\n        if (query) sorts.push(query);\n      } catch {\n        console.error(`query could not be parsed for boost grouping`, grouping);\n      }\n    }\n  }\n\n  if (0 < curation.boosting.sortings.length) {\n    const sortings = curation.boosting.sortings.sort((a, b) =>\n      a.position > b.position ? 1 : -1\n    );\n\n    for (const sorting of sortings) {\n      try {\n        const query = JSON.parse(sorting.query);\n        if (query) sorts.push(query);\n      } catch {\n        console.error(`query could not be parsed for boost sorting`, sorting);\n      }\n    }\n  }\n\n  // finally, for collections, if no other sorting is defined, sort by index order to provide\n  // a consistent order\n  if (\"collection\" === curation.type && sorts.length === 0) {\n    sorts.push(\"_doc\");\n  }\n\n  // finally, for search, sort by score\n  if (\"search\" === curation.type) {\n    sorts.push(\"_score\");\n  }\n\n  return sorts;\n};\n\n/**\n * Return a sort clause which sorts by position within the given collection.\n */\nfunction mapCollectionPositionSortClause(collectionHandle: string) {\n  return [\n    {\n      \"collections.position\": {\n        order: \"asc\",\n        nested: {\n          path: \"collections\",\n          filter: {\n            term: {\n              \"collections.handle.keyword\": collectionHandle,\n            },\n          },\n        },\n      },\n    },\n  ];\n}\n\nconst buildQuery = (args: {\n  sortOption?: ConfigSort;\n  curation?: ConfigCuration;\n  globalCuration?: boolean;\n}): Record<string, any> | undefined => {\n  const { curation, sortOption, globalCuration } = args;\n\n  if (!curation || globalCuration) {\n    return undefined;\n  }\n\n  return {\n    bool: {\n      must_not: [\n        {\n          nested: {\n            path: \"curations\",\n            query: {\n              bool: {\n                must: [\n                  {\n                    term: {\n                      [`curations.${\n                        \"collection\" === curation.type\n                          ? \"collectionHandle\"\n                          : \"searchTerm\"\n                      }.keyword`]:\n                        \"collection\" === curation.type\n                          ? curation.collectionHandle\n                          : curation.searchTerm?.toLowerCase(),\n                    },\n                  },\n                  {\n                    term: {\n                      \"curations.hidden\": true,\n                    },\n                  },\n                ],\n              },\n            },\n          },\n        },\n        // hide callout when not sorting by _score or collections.position\n        ...(sortOption &&\n        ![\"_score\", \"collections.position\"].includes(sortOption.field)\n          ? [\n              {\n                term: {\n                  type: \"callout\",\n                },\n              },\n            ]\n          : []),\n      ],\n    },\n  };\n};\n"]}
+{"version":3,"file":"SensorSort.js","sourceRoot":"","sources":["../../../../src/components/Sensor/SensorSort.tsx"],"names":[],"mappings":"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","sourcesContent":["import React from \"react\";\nimport ReactiveComponent from \"@appbaseio/reactivesearch/lib/components/basic/ReactiveComponent\";\n\nimport { ConfigCuration, ConfigSort } from \"../../types\";\nimport {\n  useReactifySearchContext,\n  useSortBy,\n  useCuration,\n  ReactifySearchMode,\n} from \"../../hooks\";\nimport { optionsToId } from \"react-intersection-observer/observe\";\n\nexport const SensorSort: React.FC = () => {\n  const { options, config } = useReactifySearchContext();\n  const { curation } = useCuration();\n  const globalCuration = curation?.id === \"global\";\n\n  const { sortOption } = useSortBy();\n\n  const { sort, query } = React.useMemo(() => {\n    return {\n      sort: buildSort({\n        mode: options.mode,\n        globalCuration,\n        curation,\n        sortOption,\n        collectionHandle:\n          options.mode === \"collection\" ? options.collectionHandle : undefined,\n      }),\n      query: buildQuery({\n        sortOption,\n        curation,\n        globalCuration,\n      }),\n    };\n  }, [config, sortOption, curation]);\n\n  return (\n    <ReactiveComponent\n      componentId=\"SensorSort\"\n      customQuery={() => ({\n        sort,\n        query,\n      })}\n    />\n  );\n};\n\nconst buildSort = (args: {\n  mode: ReactifySearchMode;\n  globalCuration: boolean;\n  curation?: ConfigCuration;\n  sortOption?: ConfigSort;\n  collectionHandle?: string;\n}): any[] => {\n  const { mode, curation, sortOption, collectionHandle, globalCuration } = args;\n\n  if (mode !== \"instant-search\") {\n    // return default sort option if unset\n    if (!sortOption) {\n      return collectionHandle\n        ? mapCollectionPositionSortClause(collectionHandle)\n        : [\"_score\"];\n    }\n\n    // curation positions are only applied for the default `collections.position` or `_score` sort\n    // if the sort is something else, apply a normal sort which applies what the user has requested\n    if (![\"_score\", \"collections.position\"].includes(sortOption.field)) {\n      return [{ [sortOption.field]: sortOption.direction }];\n    }\n  }\n\n  // no matching curation, return default sort clause\n  if (!curation) {\n    return collectionHandle\n      ? mapCollectionPositionSortClause(collectionHandle)\n      : [\"_score\"];\n  }\n\n  const sorts = [];\n\n  // show pins first\n  if (globalCuration && collectionHandle) {\n    sorts.push(...mapCollectionPositionSortClause(collectionHandle));\n  }\n  if ((!globalCuration && curation.collectionHandle) || curation.searchTerm) {\n    sorts.push({\n      \"curations.position\": {\n        unmapped_type: \"long\",\n        order: \"asc\",\n        nested: {\n          path: \"curations\",\n          filter: {\n            term: {\n              [`curations.${\n                \"collection\" === curation.type\n                  ? \"collectionHandle\"\n                  : \"searchTerm\"\n              }.keyword`]:\n                \"collection\" === curation.type\n                  ? curation.collectionHandle\n                  : curation.searchTerm?.toLowerCase(),\n            },\n          },\n        },\n      },\n    });\n  }\n\n  if (0 < curation.boosting.groupings.length) {\n    const groupings = curation.boosting.groupings.sort((a, b) =>\n      a.position > b.position ? 1 : -1\n    );\n\n    for (const grouping of groupings) {\n      try {\n        const query = JSON.parse(grouping.query);\n        if (query) sorts.push(query);\n      } catch {\n        console.error(`query could not be parsed for boost grouping`, grouping);\n      }\n    }\n  }\n\n  if (0 < curation.boosting.sortings.length) {\n    const sortings = curation.boosting.sortings.sort((a, b) =>\n      a.position > b.position ? 1 : -1\n    );\n\n    for (const sorting of sortings) {\n      try {\n        const query = JSON.parse(sorting.query);\n        if (query) sorts.push(query);\n      } catch {\n        console.error(`query could not be parsed for boost sorting`, sorting);\n      }\n    }\n  }\n\n  // finally, for collections, if no other sorting is defined, sort by index order to provide\n  // a consistent order\n  if (\"collection\" === curation.type && sorts.length === 0) {\n    sorts.push(\"_doc\");\n  }\n\n  // finally, for search, sort by score\n  if (\"search\" === curation.type) {\n    sorts.push(\"_score\");\n  }\n\n  return sorts;\n};\n\n/**\n * Return a sort clause which sorts by position within the given collection.\n */\nfunction mapCollectionPositionSortClause(collectionHandle: string) {\n  return [\n    {\n      \"collections.position\": {\n        order: \"asc\",\n        nested: {\n          path: \"collections\",\n          filter: {\n            term: {\n              \"collections.handle.keyword\": collectionHandle,\n            },\n          },\n        },\n      },\n    },\n  ];\n}\n\nconst buildQuery = (args: {\n  sortOption?: ConfigSort;\n  curation?: ConfigCuration;\n  globalCuration?: boolean;\n}): Record<string, any> | undefined => {\n  const { curation, sortOption, globalCuration } = args;\n\n  if (!curation || globalCuration) {\n    return undefined;\n  }\n\n  return {\n    bool: {\n      must_not: [\n        {\n          nested: {\n            path: \"curations\",\n            query: {\n              bool: {\n                must: [\n                  {\n                    term: {\n                      [`curations.${\n                        \"collection\" === curation.type\n                          ? \"collectionHandle\"\n                          : \"searchTerm\"\n                      }.keyword`]:\n                        \"collection\" === curation.type\n                          ? curation.collectionHandle\n                          : curation.searchTerm?.toLowerCase(),\n                    },\n                  },\n                  {\n                    term: {\n                      \"curations.hidden\": true,\n                    },\n                  },\n                ],\n              },\n            },\n          },\n        },\n        // hide callout when not sorting by _score or collections.position\n        ...(sortOption &&\n        ![\"_score\", \"collections.position\"].includes(sortOption.field)\n          ? [\n              {\n                term: {\n                  type: \"callout\",\n                },\n              },\n            ]\n          : []),\n      ],\n    },\n  };\n};\n"]}

package/dist/src/hooks/useReactifySearchContext.d.ts

@@ -1,9 +1,10 @@
 import React from "react";
 import { Config } from "../types";
+export declare type ReactifySearchMode = "search" | "collection" | "instant-search";
 export declare const ReactifySearchContext: React.Context<{
     config: Config;
     options: {
-        mode: "search" | "collection" | "instant-search";
+        mode: ReactifySearchMode;
         index: string;
         shopifyPermanentDomain: string;
         filtersHandle?: string | undefined;
@@ -39,7 +40,7 @@ export declare const ReactifySearchContext: React.Context<{
 export declare const useReactifySearchContext: () => {
     config: Config;
     options: {
-        mode: "search" | "collection" | "instant-search";
+        mode: ReactifySearchMode;
         index: string;
         shopifyPermanentDomain: string;
         filtersHandle?: string | undefined;

package/dist/src/hooks/useReactifySearchContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"useReactifySearchContext.js","sourceRoot":"","sources":["../../../src/hooks/useReactifySearchContext.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAIb,QAAA,qBAAqB,GAAG,eAAK,CAAC,aAAa,CA4CtD,SAAS,CAAC,CAAC;AAEN,MAAM,wBAAwB,GAAG,GAAG,EAAE,CAC3C,eAAK,CAAC,UAAU,CAAC,6BAAqB,CAAE,CAAC;AAD9B,QAAA,wBAAwB,4BACM","sourcesContent":["import React from \"react\";\n\nimport { Config } from \"../types\";\n\nexport const ReactifySearchContext = React.createContext<\n  | {\n      config: Config;\n      options: {\n        mode: \"search\" | \"collection\" | \"instant-search\";\n        index: string;\n        shopifyPermanentDomain: string;\n        filtersHandle?: string;\n        credentials: {\n          username: string;\n          password: string;\n          endpoint: string;\n        };\n        onRedirect?: (type: \"redirect\" | \"search\", url: string) => void;\n        theme: Record<string, unknown>;\n        additionalComponentIds?: Array<string>;\n        includeFields?: Array<string>;\n        excludeFields?: Array<string>;\n      } & (\n        | {\n            mode: \"search\";\n          }\n        | {\n            mode: \"collection\";\n            collectionHandle: string;\n          }\n        | {\n            mode: \"instant-search\";\n          }\n      );\n      search: {\n        searchTerm: string;\n        setSearchTerm: React.Dispatch<React.SetStateAction<string>>;\n        showInstantSearchResults: boolean;\n        setShowInstantSearchResults: React.Dispatch<\n          React.SetStateAction<boolean>\n        >;\n      };\n      sortby: {\n        sortOption: string;\n        setSortOption: React.Dispatch<React.SetStateAction<string>>;\n      };\n    }\n  | undefined\n>(undefined);\n\nexport const useReactifySearchContext = () =>\n  React.useContext(ReactifySearchContext)!;\n"]}
+{"version":3,"file":"useReactifySearchContext.js","sourceRoot":"","sources":["../../../src/hooks/useReactifySearchContext.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAMb,QAAA,qBAAqB,GAAG,eAAK,CAAC,aAAa,CA4CtD,SAAS,CAAC,CAAC;AAEN,MAAM,wBAAwB,GAAG,GAAG,EAAE,CAC3C,eAAK,CAAC,UAAU,CAAC,6BAAqB,CAAE,CAAC;AAD9B,QAAA,wBAAwB,4BACM","sourcesContent":["import React from \"react\";\n\nimport { Config } from \"../types\";\n\nexport type ReactifySearchMode = \"search\" | \"collection\" | \"instant-search\";\n\nexport const ReactifySearchContext = React.createContext<\n  | {\n      config: Config;\n      options: {\n        mode: ReactifySearchMode;\n        index: string;\n        shopifyPermanentDomain: string;\n        filtersHandle?: string;\n        credentials: {\n          username: string;\n          password: string;\n          endpoint: string;\n        };\n        onRedirect?: (type: \"redirect\" | \"search\", url: string) => void;\n        theme: Record<string, unknown>;\n        additionalComponentIds?: Array<string>;\n        includeFields?: Array<string>;\n        excludeFields?: Array<string>;\n      } & (\n        | {\n            mode: \"search\";\n          }\n        | {\n            mode: \"collection\";\n            collectionHandle: string;\n          }\n        | {\n            mode: \"instant-search\";\n          }\n      );\n      search: {\n        searchTerm: string;\n        setSearchTerm: React.Dispatch<React.SetStateAction<string>>;\n        showInstantSearchResults: boolean;\n        setShowInstantSearchResults: React.Dispatch<\n          React.SetStateAction<boolean>\n        >;\n      };\n      sortby: {\n        sortOption: string;\n        setSortOption: React.Dispatch<React.SetStateAction<string>>;\n      };\n    }\n  | undefined\n>(undefined);\n\nexport const useReactifySearchContext = () =>\n  React.useContext(ReactifySearchContext)!;\n"]}

package/package.json

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