@redocly/theme 0.52.0 → 0.53.0-next.1

package/lib/core/hooks/menu/use-nested-menu.js

@@ -58,7 +58,7 @@ function useNestedMenu({ item, labelRef, nestedMenuRef }) {
     }, [labelRef, isExpanded, item.active]);
     const handleExpand = (0, react_1.useCallback)(() => __awaiter(this, void 0, void 0, function* () {
         if (item.expanded === 'always' ||
-            (item.link && item.hasActiveSubItem && item.link !== location.pathname)) {
+            (item.link && item.hasActiveSubItem && item.link !== (0, utils_1.withoutPathPrefix)(location.pathname))) {
             return;
         }
         const [firstChild] = item.items;

package/lib/core/utils/menu.js

@@ -36,7 +36,7 @@ const buildLanguagesGroup = (locales, defaultLocale, currentLocale) => {
         items: locales
             .filter((locale) => locale.code !== currentLocale)
             .map((locale) => {
-            const newLangPathname = (0, utils_1.withPathPrefix)((0, utils_1.getPathnameForLocale)((0, utils_1.withoutPathPrefix)(location.pathname), defaultLocale, locale.code, locales));
+            const newLangPathname = (0, utils_1.getPathnameForLocale)((0, utils_1.withoutPathPrefix)(location.pathname), defaultLocale, locale.code, locales);
             const newUrlWithLanguage = `${newLangPathname}${location.search}${location.hash}`;
             return {
                 type: 'link',

package/lib/core/utils/urls.d.ts

@@ -25,10 +25,17 @@ export declare function slash(path: string): string;
 export declare function addTrailingSlash(url: string): string;
 /**
  * Adds locale to pathname, or replaces current locale in pathname with a new one
- * @param originalPathname - Pathname without api prefix
+ * @param originalPathname - Pathname without path prefix
  * @param defaultLocale - Default locale code
  * @param newLocale - New locale code to apply
  * @param allLocales - Array of all available locales
  */
 export declare function getPathnameForLocale(originalPathname: string, defaultLocale: string, newLocale: string, allLocales: Locale[]): string;
+/**
+ * Extracts the locale code from a pathname
+ * @param pathname - URL pathname to extract locale from without path prefix
+ * @param defaultLocale - Default locale code to return if no locale found in pathname
+ * @param allLocales - Array of all available locales to check against
+ * @returns The locale code from the pathname, or the default locale if none found
+ */
 export declare function getLocaleFromPathname(pathname: string, defaultLocale?: string, allLocales?: Locale[]): string;

package/lib/core/utils/urls.js

@@ -84,7 +84,7 @@ function addTrailingSlash(url) {
 }
 /**
  * Adds locale to pathname, or replaces current locale in pathname with a new one
- * @param originalPathname - Pathname without api prefix
+ * @param originalPathname - Pathname without path prefix
  * @param defaultLocale - Default locale code
  * @param newLocale - New locale code to apply
  * @param allLocales - Array of all available locales
@@ -100,9 +100,15 @@ function getPathnameForLocale(originalPathname, defaultLocale, newLocale, allLoc
     const newLocalePrefix = newLocale === defaultLocale ? '' : '/' + newLocale;
     return `${newLocalePrefix.toLowerCase()}${pathnameWithoutLocale}`;
 }
+/**
+ * Extracts the locale code from a pathname
+ * @param pathname - URL pathname to extract locale from without path prefix
+ * @param defaultLocale - Default locale code to return if no locale found in pathname
+ * @param allLocales - Array of all available locales to check against
+ * @returns The locale code from the pathname, or the default locale if none found
+ */
 function getLocaleFromPathname(pathname, defaultLocale = constants_1.DEFAULT_LOCALE_PLACEHOLDER, allLocales = []) {
-    var _a;
-    const maybeLocale = (_a = withoutPathPrefix(pathname)) === null || _a === void 0 ? void 0 : _a.split('/')[1];
+    const maybeLocale = pathname === null || pathname === void 0 ? void 0 : pathname.split('/')[1];
     const locale = allLocales.find((locale) => locale.code.toLowerCase() === maybeLocale);
     return (locale === null || locale === void 0 ? void 0 : locale.code) || defaultLocale;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/theme",
-  "version": "0.52.0",
+  "version": "0.53.0-next.1",
   "description": "Shared UI components lib",
   "keywords": [
     "theme",
@@ -88,7 +88,7 @@
     "react-calendar": "4.2.1",
     "react-date-picker": "10.0.3",
     "timeago.js": "4.0.2",
-    "@redocly/config": "0.23.0"
+    "@redocly/config": "0.24.0"
   },
   "scripts": {
     "watch": "tsc -p tsconfig.build.json && (concurrently \"tsc -w -p tsconfig.build.json\" \"tsc-alias -w -p tsconfig.build.json\")",

package/src/core/hooks/menu/use-nested-menu.ts

@@ -4,7 +4,7 @@ import { useCallback, useEffect, useState } from 'react';
 import type { MenuItemProps } from '@redocly/theme/core/types';
 
 import { useMenuItemExpanded, useCollapse } from '@redocly/theme/core/hooks';
-import { loadAndNavigate } from '@redocly/theme/core/utils';
+import { loadAndNavigate, withoutPathPrefix } from '@redocly/theme/core/utils';
 
 type NestedMenuProps = MenuItemProps & {
   labelRef?: React.RefObject<HTMLElement>;
@@ -61,7 +61,7 @@ export function useNestedMenu({ item, labelRef, nestedMenuRef }: NestedMenuProps
   const handleExpand = useCallback(async () => {
     if (
       item.expanded === 'always' ||
-      (item.link && item.hasActiveSubItem && item.link !== location.pathname)
+      (item.link && item.hasActiveSubItem && item.link !== withoutPathPrefix(location.pathname))
     ) {
       return;
     }

package/src/core/utils/menu.ts

@@ -64,13 +64,11 @@ export const buildLanguagesGroup = (
     items: locales
       .filter((locale) => locale.code !== currentLocale)
       .map((locale) => {
-        const newLangPathname = withPathPrefix(
-          getPathnameForLocale(
-            withoutPathPrefix(location.pathname),
-            defaultLocale,
-            locale.code,
-            locales,
-          ),
+        const newLangPathname = getPathnameForLocale(
+          withoutPathPrefix(location.pathname),
+          defaultLocale,
+          locale.code,
+          locales,
         );
         const newUrlWithLanguage = `${newLangPathname}${location.search}${location.hash}`;
         return {

package/src/core/utils/urls.ts

@@ -88,7 +88,7 @@ export function addTrailingSlash(url: string): string {
 
 /**
  * Adds locale to pathname, or replaces current locale in pathname with a new one
- * @param originalPathname - Pathname without api prefix
+ * @param originalPathname - Pathname without path prefix
  * @param defaultLocale - Default locale code
  * @param newLocale - New locale code to apply
  * @param allLocales - Array of all available locales
@@ -115,12 +115,19 @@ export function getPathnameForLocale(
   return `${newLocalePrefix.toLowerCase()}${pathnameWithoutLocale}`;
 }
 
+/**
+ * Extracts the locale code from a pathname
+ * @param pathname - URL pathname to extract locale from without path prefix
+ * @param defaultLocale - Default locale code to return if no locale found in pathname
+ * @param allLocales - Array of all available locales to check against
+ * @returns The locale code from the pathname, or the default locale if none found
+ */
 export function getLocaleFromPathname(
   pathname: string,
   defaultLocale: string = DEFAULT_LOCALE_PLACEHOLDER,
   allLocales: Locale[] = [],
 ) {
-  const maybeLocale = withoutPathPrefix(pathname)?.split('/')[1];
+  const maybeLocale = pathname?.split('/')[1];
   const locale = allLocales.find((locale) => locale.code.toLowerCase() === maybeLocale);
 
   return locale?.code || defaultLocale;