@redocly/theme 0.70.0-next.2 → 0.70.0-next.3

package/src/core/utils/index.ts

@@ -49,3 +49,4 @@ export * from './tooltip-placement';
 export * from './telemetry/get-base-data-attributes';
 export * from './telemetry/generate-before-after-context';
 export * from './RenderWithLink';
+export * from './consent-settings-link-placement';

package/src/core/utils/mcp.ts

@@ -39,7 +39,7 @@ export function slugifyMcpServerName(name: string): string {
   return name
     .toLowerCase()
     .replace(/[^a-z0-9_-]+/g, '-')
-    .replace(/^-+|-+$/g, '');
+    .replace(/^-+|(?<!-)-+$/g, '');
 }
 
 export function generateClaudeCodeCommand(config: McpConnectionParams): string {

package/src/core/utils/menu.ts

@@ -24,10 +24,7 @@ export const mapNavbarItems = (
         ...(navItem.items && {
           items: mapNavbarItems(navItem.items, defaultLocale, currentLocale, locales, location),
         }),
-        ...('link' in navItem && { link: navItem.link || '/' }),
-        active:
-          'link' in navItem &&
-          isItemActive(navItem, defaultLocale, currentLocale, locales, location),
+        active: isItemActive(navItem, defaultLocale, currentLocale, locales, location),
         hasActiveSubItem: !!navItem.items?.find((item) =>
           isItemActive(item, defaultLocale, currentLocale, locales, location),
         ),
@@ -42,10 +39,12 @@ export const isItemActive = (
   locales: Locale[],
   location: Location,
 ): boolean => {
+  if (!item.link) return false;
+
   const pathHash = location.pathname + location.hash;
   const link = item.languageInsensitive
-    ? item.link || ''
-    : getPathnameForLocale(item.link || '/', defaultLocale, currentLocale, locales);
+    ? item.link
+    : getPathnameForLocale(item.link, defaultLocale, currentLocale, locales);
 
   return pathHash === withPathPrefix(link);
 };

package/src/core/utils/urls.ts

@@ -5,7 +5,9 @@ import { DEFAULT_LOCALE_PLACEHOLDER } from '../constants/common';
 export function combineUrls(baseURL: string, ...relativeURLs: (string | undefined)[]) {
   let res = baseURL;
   for (let relativeURL of relativeURLs) {
-    res = relativeURL ? res.replace(/[/\\]+$/, '') + '/' + relativeURL.replace(/^[/\\]+/, '') : res;
+    res = relativeURL
+      ? res.replace(/(?<![/\\])[/\\]+$/, '') + '/' + relativeURL.replace(/^[/\\]+/, '')
+      : res;
   }
 
   return res;

package/src/icons/ExpandCollapseIcon/ExpandCollapseIcon.tsx

@@ -0,0 +1,56 @@
+import React from 'react';
+import styled, { css } from 'styled-components';
+
+import type { IconProps } from '@redocly/theme/icons/types';
+
+import { getCssColorVariable } from '@redocly/theme/core/utils';
+
+const Icon = (props: IconProps) => (
+  <svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" {...props}>
+    <path
+      className="corner-top"
+      d="M12.2432 8.70703H11.2461L11.2422 4.75781L7.29297 4.75391V3.75781H12.2432V8.70703Z"
+    />
+    <path
+      className="corner-bottom"
+      d="M4.75781 11.2422L8.70703 11.2461V12.2432H3.75781V7.29297H4.75391L4.75781 11.2422Z"
+    />
+  </svg>
+);
+
+export const ExpandCollapseIcon = styled(Icon).attrs({
+  'data-component-name': 'icons/ExpandCollapseIcon/ExpandCollapseIcon',
+})<{ $collapse?: boolean }>`
+  path {
+    fill: ${({ color }) => getCssColorVariable(color)};
+    transform-box: view-box;
+    transition: transform 0.3s ease-in-out;
+
+    @media (prefers-reduced-motion: reduce) {
+      transition: none;
+    }
+  }
+
+  .corner-top {
+    transform-origin: 10.756px 5.244px;
+  }
+
+  .corner-bottom {
+    transform-origin: 5.244px 10.756px;
+  }
+
+  ${({ $collapse }) =>
+    $collapse &&
+    css`
+      .corner-top {
+        transform: rotate(180deg);
+      }
+
+      .corner-bottom {
+        transform: rotate(-180deg);
+      }
+    `}
+
+  height: ${({ size }) => size || '16px'};
+  width: ${({ size }) => size || '16px'};
+`;

package/src/index.ts

@@ -253,6 +253,7 @@ export * from '@redocly/theme/icons/LinkIcon/LinkIcon';
 export * from '@redocly/theme/icons/LaunchIcon/LaunchIcon';
 export * from '@redocly/theme/icons/MinimizeIcon/MinimizeIcon';
 export * from '@redocly/theme/icons/MaximizeIcon/MaximizeIcon';
+export * from '@redocly/theme/icons/ExpandCollapseIcon/ExpandCollapseIcon';
 export * from '@redocly/theme/icons/MarkdownFullIcon/MarkdownFullIcon';
 export * from '@redocly/theme/icons/DocumentBlankIcon/DocumentBlankIcon';
 export * from '@redocly/theme/icons/WarningSquareIcon/WarningSquareIcon';