@redocly/theme 0.35.5 → 0.35.7

package/lib/components/Catalog/useCatalog.d.ts

@@ -2,6 +2,5 @@ import type { ResolvedNavItem } from '../../types/portal';
 import type { FilteredCatalog } from '../../types/portal/src/shared/types/catalog';
 import type { CatalogConfig } from '../../config';
 export declare function useCatalog(items: ResolvedNavItem[], config: CatalogConfig): FilteredCatalog;
-export declare function fillSearchParams(filterProperty: string, filterValues: Set<string>, searchParams: URLSearchParams): URLSearchParams;
-export declare function handleFilterInput(filterTerm: string): URLSearchParams;
+export declare function fillSearchParams(filterProperty: string, filterValues: Set<string>, searchParams: URLSearchParams): void;
 export declare function getFilterValues(filterValues: any): Set<string>;

package/lib/components/Catalog/useCatalog.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFilterValues = exports.handleFilterInput = exports.fillSearchParams = exports.useCatalog = void 0;
+exports.getFilterValues = exports.fillSearchParams = exports.useCatalog = void 0;
 const React = __importStar(require("react"));
 const react_router_dom_1 = require("react-router-dom");
 const telemetry_1 = require("../../mocks/telemetry");
@@ -90,14 +90,15 @@ function useCatalog(items, config) {
         window.scrollTo(0, 0);
     }, [filtersWithOptions]);
     const handleSearchParams = () => {
-        let newSearchParams = handleFilterInput(filterTerm);
+        const newSearchParams = new URLSearchParams(Array.from(searchParams.entries()));
+        filterTerm ? searchParams.set('filter', filterTerm) : searchParams.delete('filter');
         filtersState.forEach((filterValues, filterIdx) => {
             var _a;
             const filter = (_a = config.filters) === null || _a === void 0 ? void 0 : _a[filterIdx];
             if (!filter)
                 return;
             const values = getFilterValues(filterValues);
-            newSearchParams = fillSearchParams(filter.property, values, newSearchParams);
+            fillSearchParams(filter.property, values, newSearchParams);
         });
         const newSearch = newSearchParams.toString();
         if (newSearch === location.search.substring(1))
@@ -309,22 +310,13 @@ function mapFilterValues(value, mapping) {
         : mapping[String(value)] || value;
 }
 function fillSearchParams(filterProperty, filterValues, searchParams) {
+    // Clear old values of the filter before repopulating
+    searchParams.delete(filterProperty);
     filterValues.forEach((value) => {
-        if (!searchParams.has(filterProperty, value))
-            searchParams.append(filterProperty, value);
+        searchParams.append(filterProperty, value);
     });
-    return searchParams;
 }
 exports.fillSearchParams = fillSearchParams;
-function handleFilterInput(filterTerm) {
-    const searchParams = new URLSearchParams();
-    if (filterTerm)
-        searchParams.set('filter', filterTerm);
-    else
-        searchParams.delete('filter');
-    return searchParams;
-}
-exports.handleFilterInput = handleFilterInput;
 function getFilterValues(filterValues) {
     const values = new Set();
     if (filterValues instanceof Set)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/theme",
-  "version": "0.35.5",
+  "version": "0.35.7",
   "description": "Shared UI components lib",
   "keywords": [
     "theme",
@@ -89,7 +89,7 @@
     "react-calendar": "4.2.1",
     "react-date-picker": "10.0.3",
     "timeago.js": "^4.0.2",
-    "@redocly/config": "0.1.4"
+    "@redocly/config": "0.1.5"
   },
   "scripts": {
     "start": "npm-run-all --parallel storybook storybook:tokens:watch",

package/src/components/Catalog/useCatalog.ts

@@ -86,13 +86,15 @@ export function useCatalog(items: ResolvedNavItem[], config: CatalogConfig): Fil
   );
 
   const handleSearchParams = () => {
-    let newSearchParams = handleFilterInput(filterTerm);
+    const newSearchParams = new URLSearchParams(Array.from(searchParams.entries()));
+
+    filterTerm ? searchParams.set('filter', filterTerm) : searchParams.delete('filter');
 
     filtersState.forEach((filterValues, filterIdx) => {
       const filter = config.filters?.[filterIdx];
       if (!filter) return;
       const values = getFilterValues(filterValues);
-      newSearchParams = fillSearchParams(filter.property, values, newSearchParams);
+      fillSearchParams(filter.property, values, newSearchParams);
     });
 
     const newSearch = newSearchParams.toString();
@@ -371,20 +373,11 @@ export function fillSearchParams(
   filterValues: Set<string>,
   searchParams: URLSearchParams,
 ) {
+  // Clear old values of the filter before repopulating
+  searchParams.delete(filterProperty);
   filterValues.forEach((value) => {
-    if (!searchParams.has(filterProperty, value)) searchParams.append(filterProperty, value);
+    searchParams.append(filterProperty, value);
   });
-
-  return searchParams;
-}
-
-export function handleFilterInput(filterTerm: string) {
-  const searchParams = new URLSearchParams();
-
-  if (filterTerm) searchParams.set('filter', filterTerm);
-  else searchParams.delete('filter');
-
-  return searchParams;
 }
 
 export function getFilterValues(filterValues: any) {

package/src/mocks/hooks/index.ts

@@ -79,7 +79,7 @@ export function useCatalog(_items: ResolvedNavItem[], _config: CatalogConfig): F
 }
 
 export const useTranslate = (): { translate: TFunction } => ({
-  translate: (value?: string, options?: { defaultValue: string } | string) =>
+  translate: (value?: string, options?: { defaultValue?: string } | string) =>
     (typeof options === 'string' ? options : options?.defaultValue) || value || '',
 });