@docusaurus/theme-search-algolia 0.0.0-4403 → 0.0.0-4416

package/lib/theme/SearchBar/index.js

@@ -27,6 +27,10 @@ function ResultsFooter({ state, onClose }) {
       See all {state.context.nbHits} results
     </Link>);
 }
+function mergeFacetFilters(f1, f2) {
+    const normalize = (f) => f instanceof Array ? f : [f];
+    return [...normalize(f1), ...normalize(f2)];
+}
 function DocSearch({ contextualSearch, externalUrlRegex, ...props }) {
     var _a, _b;
     const { siteMetadata } = useDocusaurusContext();
@@ -34,7 +38,7 @@ function DocSearch({ contextualSearch, externalUrlRegex, ...props }) {
     const configFacetFilters = (_b = (_a = props.searchParameters) === null || _a === void 0 ? void 0 : _a.facetFilters) !== null && _b !== void 0 ? _b : [];
     const facetFilters = contextualSearch
         ? // Merge contextual search filters with config filters
-            [...contextualSearchFacetFilters, ...configFacetFilters]
+            mergeFacetFilters(contextualSearchFacetFilters, configFacetFilters)
         : // ... or use config facetFilters
             configFacetFilters;
     // we let user override default searchParameters if he wants to
@@ -104,9 +108,9 @@ function DocSearch({ contextualSearch, externalUrlRegex, ...props }) {
             url: withBaseUrl(`${url.pathname}${url.hash}`),
         };
     })).current;
-    const resultsFooterComponent = useMemo(
+    const resultsFooterComponent = useMemo(() => 
     // eslint-disable-next-line react/no-unstable-nested-components
-    () => (footerProps) => <ResultsFooter {...footerProps} onClose={onClose}/>, [onClose]);
+    (footerProps) => <ResultsFooter {...footerProps} onClose={onClose}/>, [onClose]);
     const transformSearchClient = useCallback((searchClient) => {
         searchClient.addAlgoliaAgent('docusaurus', siteMetadata.docusaurusVersion);
         return searchClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-search-algolia",
-  "version": "0.0.0-4403",
+  "version": "0.0.0-4416",
   "description": "Algolia search component for Docusaurus.",
   "main": "lib/index.js",
   "exports": {
@@ -25,12 +25,12 @@
   },
   "dependencies": {
     "@docsearch/react": "^3.0.0-alpha.39",
-    "@docusaurus/core": "0.0.0-4403",
-    "@docusaurus/logger": "0.0.0-4403",
-    "@docusaurus/theme-common": "0.0.0-4403",
-    "@docusaurus/theme-translations": "0.0.0-4403",
-    "@docusaurus/utils": "0.0.0-4403",
-    "@docusaurus/utils-validation": "0.0.0-4403",
+    "@docusaurus/core": "0.0.0-4416",
+    "@docusaurus/logger": "0.0.0-4416",
+    "@docusaurus/theme-common": "0.0.0-4416",
+    "@docusaurus/theme-translations": "0.0.0-4416",
+    "@docusaurus/utils": "0.0.0-4416",
+    "@docusaurus/utils-validation": "0.0.0-4416",
     "algoliasearch": "^4.10.5",
     "algoliasearch-helper": "^3.5.5",
     "clsx": "^1.1.1",
@@ -40,7 +40,7 @@
     "utility-types": "^3.10.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4403",
+    "@docusaurus/module-type-aliases": "0.0.0-4416",
     "fs-extra": "^10.0.0"
   },
   "peerDependencies": {
@@ -50,5 +50,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "550d336db77e6225a4409a859f47e4f705a3908a"
+  "gitHead": "1e293693c98bbc0b8052e82ce35159807ec5eaa9"
 }

package/src/theme/SearchBar/index.tsx

@@ -64,6 +64,18 @@ function ResultsFooter({state, onClose}: ResultsFooterProps) {
   );
 }
 
+type FacetFilters = Required<
+  Required<DocSearchProps>['searchParameters']
+>['facetFilters'];
+
+function mergeFacetFilters(f1: FacetFilters, f2: FacetFilters): FacetFilters {
+  const normalize = (
+    f: FacetFilters,
+  ): readonly string[] | ReadonlyArray<readonly string[]> =>
+    f instanceof Array ? f : [f];
+  return [...normalize(f1), ...normalize(f2)] as FacetFilters;
+}
+
 function DocSearch({
   contextualSearch,
   externalUrlRegex,
@@ -71,18 +83,20 @@ function DocSearch({
 }: DocSearchProps) {
   const {siteMetadata} = useDocusaurusContext();
 
-  const contextualSearchFacetFilters = useAlgoliaContextualFacetFilters();
+  const contextualSearchFacetFilters =
+    useAlgoliaContextualFacetFilters() as FacetFilters;
 
-  const configFacetFilters = props.searchParameters?.facetFilters ?? [];
+  const configFacetFilters: FacetFilters =
+    props.searchParameters?.facetFilters ?? [];
 
-  const facetFilters = contextualSearch
+  const facetFilters: FacetFilters = contextualSearch
     ? // Merge contextual search filters with config filters
-      [...contextualSearchFacetFilters, ...configFacetFilters]
+      mergeFacetFilters(contextualSearchFacetFilters, configFacetFilters)
     : // ... or use config facetFilters
       configFacetFilters;
 
   // we let user override default searchParameters if he wants to
-  const searchParameters = {
+  const searchParameters: DocSearchProps['searchParameters'] = {
     ...props.searchParameters,
     facetFilters,
   };
@@ -167,12 +181,14 @@ function DocSearch({
       }),
   ).current;
 
-  const resultsFooterComponent = useMemo(
-    // eslint-disable-next-line react/no-unstable-nested-components
-    () => (footerProps: ResultsFooterProps) =>
-      <ResultsFooter {...footerProps} onClose={onClose} />,
-    [onClose],
-  );
+  const resultsFooterComponent: DocSearchProps['resultsFooterComponent'] =
+    useMemo(
+      () =>
+        // eslint-disable-next-line react/no-unstable-nested-components
+        (footerProps: Omit<ResultsFooterProps, 'onClose'>): JSX.Element =>
+          <ResultsFooter {...footerProps} onClose={onClose} />,
+      [onClose],
+    );
 
   const transformSearchClient = useCallback(
     (searchClient) => {

package/src/types.d.ts

@@ -8,3 +8,7 @@
 /// <reference types="@docusaurus/module-type-aliases" />
 /// <reference types="@docusaurus/theme-common" />
 /// <reference types="@docusaurus/theme-classic" />
+
+export type FacetFilters = Required<
+  Required<DocSearchProps>['searchParameters']
+>['facetFilters'];