@redocly/theme 0.46.4 → 0.46.5

package/lib/components/Product/ProductPicker.js

@@ -17,14 +17,16 @@ function ProductPicker() {
     const { currentProduct, products, setProduct } = (0, hooks_1.useProductPicker)();
     const { useTranslate } = (0, hooks_1.useThemeHooks)();
     const { translate } = useTranslate();
-    const productComponents = products.map((product) => ({
-        content: react_1.default.createElement(Product_1.Product, { product: product }),
-        suffix: currentProduct === product && react_1.default.createElement(CheckmarkIcon_1.CheckmarkIcon, null),
-        onAction: () => {
-            setProduct(product);
-        },
-        active: product === currentProduct,
-    }));
+    const productComponents = products.map((product) => {
+        return {
+            content: react_1.default.createElement(Product_1.Product, { product: product }),
+            suffix: product.slug === (currentProduct === null || currentProduct === void 0 ? void 0 : currentProduct.slug) && react_1.default.createElement(CheckmarkIcon_1.CheckmarkIcon, null),
+            onAction: () => {
+                setProduct(product);
+            },
+            active: product.slug === (currentProduct === null || currentProduct === void 0 ? void 0 : currentProduct.slug),
+        };
+    });
     return products.length ? (react_1.default.createElement(ProductDropdown, { withArrow: true, trigger: react_1.default.createElement(Button_1.Button, { variant: "ghost" }, currentProduct ? (react_1.default.createElement(Product_1.Product, { product: currentProduct })) : (react_1.default.createElement("span", { "data-translation-key": "navbar.products" }, translate('navbar.products', 'Products')))), triggerEvent: "hover" },
         react_1.default.createElement(DropdownMenu_1.DropdownMenu, { items: productComponents }))) : null;
 }

package/lib/components/Search/SearchDialog.js

@@ -68,9 +68,11 @@ function SearchDialog({ onClose, className }) {
         }
     };
     const mapItem = (item, index) => {
+        var _a;
         let itemProduct;
         if (!product && item.document.product) {
-            const resolvedProduct = products.find((product) => { var _a; return product.slug.match(`/${(_a = item.document.product) === null || _a === void 0 ? void 0 : _a.folder}/`); });
+            const folder = (_a = item.document.product) === null || _a === void 0 ? void 0 : _a.folder;
+            const resolvedProduct = products.find((product) => product.slug.match(`/${folder.startsWith('./') ? folder.slice(2) : folder}/`));
             itemProduct = resolvedProduct
                 ? { name: resolvedProduct.name, icon: resolvedProduct.icon }
                 : undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/theme",
-  "version": "0.46.4",
+  "version": "0.46.5",
   "description": "Shared UI components lib",
   "keywords": [
     "theme",
@@ -79,7 +79,7 @@
     "timeago.js": "4.0.2",
     "i18next": "22.4.15",
     "nprogress": "0.2.0",
-    "@redocly/config": "0.19.2"
+    "@redocly/config": "0.19.3"
   },
   "scripts": {
     "watch": "tsc -p tsconfig.build.json && (concurrently \"tsc -w -p tsconfig.build.json\" \"tsc-alias -w -p tsconfig.build.json\")",

package/src/components/Product/ProductPicker.tsx

@@ -14,14 +14,16 @@ export function ProductPicker(): JSX.Element | null {
   const { useTranslate } = useThemeHooks();
   const { translate } = useTranslate();
 
-  const productComponents = products.map((product) => ({
-    content: <Product product={product} />,
-    suffix: currentProduct === product && <CheckmarkIcon />,
-    onAction: () => {
-      setProduct(product);
-    },
-    active: product === currentProduct,
-  }));
+  const productComponents = products.map((product) => {
+    return {
+      content: <Product product={product} />,
+      suffix: product.slug === currentProduct?.slug && <CheckmarkIcon />,
+      onAction: () => {
+        setProduct(product);
+      },
+      active: product.slug === currentProduct?.slug,
+    };
+  });
 
   return products.length ? (
     <ProductDropdown

package/src/components/Search/SearchDialog.tsx

@@ -71,8 +71,9 @@ export function SearchDialog({ onClose, className }: SearchDialogProps): JSX.Ele
   const mapItem = (item: SearchItemData, index: number) => {
     let itemProduct;
     if (!product && item.document.product) {
+      const folder = item.document.product?.folder;
       const resolvedProduct = products.find((product) =>
-        product.slug.match(`/${item.document.product?.folder}/`),
+        product.slug.match(`/${folder.startsWith('./') ? folder.slice(2) : folder}/`),
       );
       itemProduct = resolvedProduct
         ? { name: resolvedProduct.name, icon: resolvedProduct.icon }