@redocly/theme 0.7.4 → 0.8.0

package/lib/Sidebar/MenuGroup.js

@@ -64,7 +64,7 @@ const MenuWrapper = styled_components_1.default.div `
   padding-left: var(--sidebar-item-nested-offset);
   overflow: hidden;
   ${(props) => props.isExpanded
-    ? `max-height: 9999px;
+    ? `max-height: 99999px;
         transition: max-height .8s cubic-bezier(0.5, 0, 1, 0) 0s;`
     : `max-height: 0px;
 	      transition: max-height .8s cubic-bezier(0, 1, 0, 1) -.1s;`};

package/lib/Sidebar/Sidebar.d.ts

@@ -1,4 +1,5 @@
 interface SidebarProps {
+    isNavbar: boolean;
     opened?: boolean;
     animate?: boolean;
 }

package/lib/Sidebar/Sidebar.js

@@ -18,13 +18,16 @@ exports.Sidebar = styled_components_1.default.aside.attrs(() => ({
   font-size: var(--sidebar-item-font-size);
   font-family: var(--sidebar-item-font-family);
   color: var(--sidebar-item-text-color);
-  top: var(--navbar-height);
-  height: calc(100vh - var(--navbar-height));
   display: flex;
   flex-direction: column;
   width: 100%;
   -webkit-font-smoothing: antialiased;
 
+  ${({ isNavbar }) => `
+    top: ${isNavbar ? 'var(--navbar-height)' : '0'};
+    height: calc(100vh ${isNavbar ? '- var(--navbar-height)' : ''});
+  `};
+
   ${({ opened, animate }) => `
     opacity: ${opened ? '1' : '0'};
     pointer-events: ${opened ? 'auto' : 'none'};

package/lib/Sidebar/SidebarLayout.d.ts

@@ -2,6 +2,11 @@ import React from 'react';
 interface SidebarLayoutProps {
     versions: React.ReactNode;
     menu: React.ReactNode;
+    backLink?: {
+        label: string;
+        slug: string;
+    };
+    isNavbar: boolean;
 }
-export declare function SidebarLayout({ versions, menu }: SidebarLayoutProps): JSX.Element | null;
+export declare function SidebarLayout({ versions, menu, backLink, isNavbar, }: SidebarLayoutProps): JSX.Element | null;
 export {};

package/lib/Sidebar/SidebarLayout.js

@@ -12,7 +12,9 @@ const MobileSidebarButton_1 = require("../Sidebar/MobileSidebarButton");
 const MenuContainer_1 = require("../Sidebar/MenuContainer");
 const SidebarSearch_1 = require("../Search/SidebarSearch");
 const useThemeConfig_1 = require("../hooks/useThemeConfig");
-function SidebarLayout({ versions, menu }) {
+const ArrowBack_1 = require("../Sidebar/ArrowBack");
+const Link_1 = require("../mocks/Link");
+function SidebarLayout({ versions, menu, backLink, isNavbar, }) {
     const [isOpen, setIsOpen] = (0, useMobileMenu_1.useMobileMenu)();
     const toggleMenu = () => setIsOpen(!isOpen);
     const { search, sidebar } = (0, useThemeConfig_1.useThemeConfig)();
@@ -22,10 +24,33 @@ function SidebarLayout({ versions, menu }) {
     return (react_1.default.createElement(Wrapper, { "data-component-name": "Sidebar/SidebarLayout" },
         react_1.default.createElement(MobileSidebarButton_1.MobileSidebarButton, { opened: isOpen, onClick: toggleMenu }),
         !(search === null || search === void 0 ? void 0 : search.hide) && (search === null || search === void 0 ? void 0 : search.placement) === 'sidebar' ? react_1.default.createElement(SidebarSearch_1.SidebarSearch, null) : null,
-        react_1.default.createElement(Sidebar_1.Sidebar, { animate: true, opened: isOpen },
+        react_1.default.createElement(Sidebar_1.Sidebar, { animate: true, opened: isOpen, isNavbar: isNavbar },
+            (backLink && (react_1.default.createElement(BackLinkWrapper, null,
+                react_1.default.createElement(Link_1.Link, { to: backLink.slug },
+                    react_1.default.createElement(ArrowBack_1.ArrowBack, null),
+                    "Back to ",
+                    backLink.label)))) ||
+                null,
             versions,
             react_1.default.createElement(MenuContainer_1.MenuContainer, null, menu))));
 }
 exports.SidebarLayout = SidebarLayout;
+const BackLinkWrapper = styled_components_1.default.div `
+  padding: var(--sidebar-offset-top) var(--sidebar-item-padding-horizontal)
+    var(--sidebar-item-padding-horizontal)
+    calc(var(--sidebar-offset-left) + var(--sidebar-item-padding-horizontal));
+
+  a {
+    color: var(--sidebar-back-button-text-color);
+    font-size: var(--sidebar-back-button-font-size);
+    font-family: var(--sidebar-back-button-font-family);
+    text-decoration: none;
+    &:hover {
+      color: var(--sidebar-back-button-hover-text-color);
+    }
+  }
+
+  border-bottom: 1px solid var(--sidebar-border-color);
+`;
 const Wrapper = styled_components_1.default.div ``;
 //# sourceMappingURL=SidebarLayout.js.map

package/lib/TableOfContent/TableOfContent.js

@@ -104,6 +104,6 @@ const TableOfContentItems = styled_components_1.default.div `
   max-height: calc(100vh - var(--navbar-height) - var(--toc-offset-top));
   border-left: 1px solid var(--toc-border-color);
   overflow-y: auto;
-  width: var(--toc-width); ;
+  width: var(--toc-width);
 `;
 //# sourceMappingURL=TableOfContent.js.map

package/lib/config.js

@@ -123,7 +123,7 @@ exports.ThemeConfig = zod_1.z
             .object({
             buttonText: zod_1.z.string().default('Copy').optional(),
             tooltipText: zod_1.z.string().default('Copy to clipboard').optional(),
-            toasterText: zod_1.z.string().default('Copied').optional(),
+            toasterText: zod_1.z.string().default('Copied!').optional(),
             toasterDuration: zod_1.z.number().default(1500).optional(),
         })
             .extend(HideConfig.shape)
@@ -136,7 +136,7 @@ exports.ThemeConfig = zod_1.z
         })
             .extend(HideConfig.shape)
             .optional()
-            .default({}),
+            .default({ hide: true }),
     })
         .strict()
         .default({})

package/lib/globalStyle.js

@@ -202,7 +202,7 @@ const headingsTypography = (0, styled_components_1.css) `
   --h2-font-weight: var(--heading-font-weight); // @presenter FontWeight
   --h2-font-size: 28px; // @presenter FontSize
   --h2-line-height: 28px; // @presenter LineHeight
-  --h2-margin-top: 0; // @presenter Spacing
+  --h2-margin-top: var(--heading-margin-top); // @presenter Spacing
   --h2-margin-bottom: var(--heading-margin-bottom); // @presenter Spacing
   --h2-text-color: var(--heading-text-color); // @presenter Color
 
@@ -512,7 +512,7 @@ const sidebar = (0, styled_components_1.css) `
   --sidebar-back-button-font-family: var(--sidebar-item-font-family);
   --sidebar-back-button-font-size: var(--sidebar-item-font-size);
   --sidebar-back-button-transform: inherit;
-  --sidebar-back-button-text-color: var(--sidebar-item-text-color);
+  --sidebar-back-button-text-color: var(--link-text-color);
   --sidebar-back-button-background-color: transparent;
   --sidebar-back-button-hover-text-color: var(--sidebar-item-active-color);
   --sidebar-back-button-hover-background-color: transparent;
@@ -1687,7 +1687,7 @@ const inputs = (0, styled_components_1.css) `
   --input-border: none; // @presenter Border
   --input-border-radius: var(--border-radius); // @presenter BorderRadius
   --input-font-size: var(--font-size-base); // @presenter FontSize
-  --input-font-family: var(--code-font-family); // @presenter FontFamily
+  --input-font-family: var(--font-family-base); // @presenter FontFamily
   --input-line-height: 1.15em; // @presenter LineHeight
   --input-padding: 8px;
 
@@ -1697,6 +1697,8 @@ const inputs = (0, styled_components_1.css) `
   --input-focus-text-color: var(--text-color-inverse); // @presenter Color
   --input-placeholder-text-color: var(--text-color-inverse); // @presenter Color
 
+  --checkbox-backround-color: var(--background-color);
+  --checkbox-checked-backround-color: var(--color-primary-500);
   // @tokens End
 `;
 const markdown = (0, styled_components_1.css) `
@@ -1899,7 +1901,7 @@ const pages = (0, styled_components_1.css) `
 
   --page-404-font-family: var(--font-family-base); // @presenter FontFamily
 
-  --page-404-header-text-color: #000; 
+  --page-404-header-text-color: #000;
   --page-404-header-font-size: 14em; // @presenter FontSize
   --page-404-header-font-weight: 600; // @presenter FontWeight
   --page-404-header-line-height: 1.2; // @presenter LineHeight
@@ -1919,30 +1921,30 @@ const pages = (0, styled_components_1.css) `
   * @tokens 403 Page
   * @presenter Color
   */
- 
+
    --page-403-font-family: var(--font-family-base); // @presenter FontFamily
- 
+
    --page-403-header-text-color: #000;
    --page-403-header-font-size: 14em; // @presenter FontSize
    --page-403-header-font-weight: 600; // @presenter FontWeight
    --page-403-header-line-height: 1.2; // @presenter LineHeight
    --page-403-header-margin: 0; // @presenter Spacing
- 
+
    --page-403-description-text-color: #000;
    --page-403-description-font-size: 2em; // @presenter FontSize
    --page-403-description-font-weight: 400; // @presenter FontWeight
    --page-403-description-line-height: 1; // @presenter LineHeight
    --page-403-description-margin: 0; // @presenter Spacing
- 
+
    --page-403-button-margin: 4em; // @presenter Spacing
- 
+
    // @tokens End
 `;
 const modal = (0, styled_components_1.css) `
-  body:has([id='modal']) {
+  body:has(.modal) {
     overflow: hidden;
   }
-  
+
   --modal-box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.6);
   --modal-overlay-background-color: rgba(206, 206, 206, 0.49);
   --modal-background-color: var(--background-color);

package/lib/hooks/useActiveHeading.js

@@ -7,7 +7,7 @@ function useActiveHeading(contentElement, displayedHeaders) {
     const [heading, setHeading] = (0, react_1.useState)(displayedHeaders.length > 1 ? displayedHeaders[0] : undefined);
     const [headingElements, setHeadingElements] = (0, react_1.useState)([]);
     const headingElementsRef = (0, react_1.useRef)({});
-    const history = (0, react_router_dom_1.useHistory)();
+    const location = (0, react_router_dom_1.useLocation)();
     const getVisibleHeadings = () => {
         const visibleHeadings = [];
         for (const key in headingElementsRef.current) {
@@ -56,12 +56,7 @@ function useActiveHeading(contentElement, displayedHeaders) {
             return;
         }
         setHeadingElements(findHeaders(contentElement));
-        const unlisten = history.listen(() => {
-            setHeadingElements(findHeaders(contentElement));
-        });
-        return () => unlisten();
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [contentElement]);
+    }, [contentElement, location]);
     (0, react_1.useEffect)(() => {
         if (!(headingElements === null || headingElements === void 0 ? void 0 : headingElements.length)) {
             return;

package/lib/hooks/useActiveSectionId.js

@@ -33,7 +33,7 @@ function useActiveSectionId(location, hasOverviewPage = false) {
         window.addEventListener('scroll', scrollListener, { capture: false });
         setTimeout(() => {
             scrollListener();
-        }, 0);
+        }, 10);
         return () => {
             window.removeEventListener('scroll', scrollListener);
         };

package/lib/hooks/useMobileMenu.js

@@ -4,7 +4,7 @@ exports.useMobileMenu = void 0;
 const react_1 = require("react");
 const react_router_dom_1 = require("react-router-dom");
 function useMobileMenu(initialState = false) {
-    const { location } = (0, react_router_dom_1.useHistory)();
+    const location = (0, react_router_dom_1.useLocation)();
     const [isOpen, setIsOpen] = (0, react_1.useState)(initialState);
     (0, react_1.useEffect)(() => setIsOpen(false), [location.pathname]);
     return [isOpen, setIsOpen];

package/lib/mocks/hooks/index.d.ts

@@ -1,4 +1,6 @@
 import type { ThemeUIConfig } from '../../config';
+import type { ResolvedNavItem } from '@theme/types/portal';
+import type { CatalogConfig, FilteredCatalog } from '@theme/types/portal/src/shared/types/catalog';
 interface PageLink {
     label: string;
     link: string;
@@ -9,4 +11,6 @@ export declare function useSidebarSiblingsData(): {
     nextPage: PageLink | null;
     prevPage: PageLink | null;
 };
+export declare function usePageSharedData<T = unknown>(_id: string): T;
+export declare function useCatalog(_items: ResolvedNavItem[], _config: CatalogConfig): FilteredCatalog;
 export {};

package/lib/mocks/hooks/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSidebarSiblingsData = exports.useThemeConfig = void 0;
+exports.useCatalog = exports.usePageSharedData = exports.useSidebarSiblingsData = exports.useThemeConfig = void 0;
 function useThemeConfig() {
     return {
         search: {
@@ -61,4 +61,12 @@ function useSidebarSiblingsData() {
     };
 }
 exports.useSidebarSiblingsData = useSidebarSiblingsData;
+function usePageSharedData(_id) {
+    throw new Error('Mock not implemented yet.');
+}
+exports.usePageSharedData = usePageSharedData;
+function useCatalog(_items, _config) {
+    throw new Error('Mock not implemented yet.');
+}
+exports.useCatalog = useCatalog;
 //# sourceMappingURL=index.js.map

package/lib/ui/Checkbox.d.ts

@@ -0,0 +1 @@
+export declare const Checkbox: import("styled-components").StyledComponent<"input", any, {}, never>;

package/lib/ui/Checkbox.js

@@ -0,0 +1,70 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Checkbox = void 0;
+const styled_components_1 = __importDefault(require("styled-components"));
+exports.Checkbox = styled_components_1.default.input `
+  position: absolute;
+  opacity: 0;
+
+  & + label {
+    position: relative;
+    cursor: pointer;
+    padding: 0;
+    display: flex;
+
+    div {
+      margin-top: 1px;
+    }
+    p {
+      line-height: 1.2;
+    }
+
+    &::before {
+      content: '';
+      margin-right: 10px;
+      display: inline-block;
+      vertical-align: top;
+      width: 18px;
+      height: 18px;
+      background: var(--checkbox-backround-color);
+      border: 1px solid rgba(0, 0, 0, 0.23);
+      border-radius: 2px;
+      flex-shrink: 0;
+    }
+  }
+
+  &:focus + label:before {
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.12);
+  }
+
+  &:checked + label {
+    &::before {
+      background: var(--checkbox-checked-backround-color);
+    }
+    &::after {
+      content: '';
+      position: absolute;
+      left: 5px;
+      top: 10px;
+      background: var(--checkbox-backround-color);
+      width: 2px;
+      height: 2px;
+      box-shadow: 2px 0 0 white, 4px 0 0 white, 4px -2px 0 white, 4px -4px 0 white, 4px -6px 0 white,
+        4px -8px 0 white;
+      transform: rotate(45deg);
+    }
+  }
+
+  &:disabled + label {
+    color: #b8b8b8;
+    cursor: auto;
+    &::before {
+      box-shadow: none;
+      background: #ddd;
+    }
+  }
+`;
+//# sourceMappingURL=Checkbox.js.map

package/lib/ui/Highlight.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export declare const HighlightContext: React.Context<string[]>;
+export declare function Highlight(props: {
+    children: React.ReactChildren | string;
+}): JSX.Element;

package/lib/ui/Highlight.js

@@ -0,0 +1,63 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Highlight = exports.HighlightContext = void 0;
+const React = __importStar(require("react"));
+const highlight_words_core_1 = require("highlight-words-core");
+exports.HighlightContext = React.createContext([]);
+function Highlight(props) {
+    const { children } = props;
+    const searchWords = React.useContext(exports.HighlightContext);
+    if (!searchWords.length) {
+        return React.createElement(React.Fragment, null, "children") || null;
+    }
+    function highlight(str, childIdx = 0) {
+        const chunks = (0, highlight_words_core_1.findAll)({
+            searchWords,
+            textToHighlight: str,
+        });
+        return (React.createElement(React.Fragment, { key: childIdx }, chunks.map((chunk, idx) => {
+            const { end, highlight, start } = chunk;
+            const text = str.substr(start, end - start);
+            if (highlight) {
+                return React.createElement("mark", { key: idx }, text);
+            }
+            else {
+                return text;
+            }
+        })));
+    }
+    if (typeof children === 'string') {
+        return highlight(children);
+    }
+    else if (Array.isArray(children)) {
+        return (React.createElement(React.Fragment, null, children.map((child, idx) => typeof children === 'string' ? highlight(child, idx) : child || null)));
+    }
+    else {
+        return React.createElement(React.Fragment, null, "children") || null;
+    }
+}
+exports.Highlight = Highlight;
+//# sourceMappingURL=Highlight.js.map

package/lib/ui/Jumbotron.js

@@ -14,8 +14,8 @@ exports.Jumbotron = (0, styled_components_1.default)(Background_1.Background).at
   flex-direction: column;
   padding-top: ${({ pt }) => pt || '0'};
   padding-bottom: ${({ pb }) => pb || '8em'};
-  padding-left: ${({ pl }) => pl || '0'};
-  padding-right: ${({ pr }) => pr || '0'};
+  padding-left: ${({ pl }) => pl || '1rem'};
+  padding-right: ${({ pr }) => pr || '1rem'};
   ${({ bgColor }) => bgColor && `background: ${bgColor}`};
   ${({ bgImage, bgColor }) => bgImage &&
     `

package/lib/ui/darkColors.js

@@ -62,12 +62,14 @@ exports.darkMode = (0, styled_components_1.css) `
   --tooltip-text-color: #fff;
   --md-table-head-background-color: var(--color-secondary-300);
   --md-tabs-hover-tab-border-color: var(--color-secondary-500);
-  --wide-tile-background-color: #000000;
-  --thin-tile-background-color: #000000;
+  --thin-tile-background-color: #1d242d;
+  --wide-tile-background-color: #1d242d;
   --page-404-header-text-color: #fff;
   --page-404-description-text-color: #fff;
   --page-403-header-text-color: #fff;
   --page-403-description-text-color: #fff;
+  --checkbox-backround-color: var(--color-secondary-900);
+  --checkbox-checked-backround-color: var(--color-primary-400);
 
   background-color: var(--background-color);
   color: var(--text-color);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/theme",
-  "version": "0.7.4",
+  "version": "0.8.0",
   "description": "Shared UI components lib",
   "author": "team@redocly.com",
   "license": "SEE LICENSE IN LICENSE",
@@ -39,8 +39,7 @@
     "prismjs": "^1.28.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-router": "^5.3.0",
-    "react-router-dom": "^5.3.0",
+    "react-router-dom": "^6.4.4",
     "styled-components": "^5.3.6",
     "styled-system": "^5.1.5",
     "zod": ">=3.19.1"
@@ -63,6 +62,7 @@
     "@testing-library/react": "^12.1.4",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^13.5.0",
+    "@types/highlight-words-core": "^1.2.1",
     "@types/jest": "^29.2.1",
     "@types/jest-when": "^3.5.2",
     "@types/lodash.throttle": "^4.1.7",
@@ -70,8 +70,6 @@
     "@types/prismjs": "^1.26.0",
     "@types/react": "^17.0.43",
     "@types/react-dom": "^17.0.14",
-    "@types/react-router-dom": "^5.3.3",
-    "@types/react-router": "^5.1.20",
     "@types/styled-components": "^5.1.26",
     "@types/styled-system": "^5.1.13",
     "@typescript-eslint/eslint-plugin": "^5.23.0",
@@ -86,8 +84,7 @@
     "lodash.throttle": "^4.1.1",
     "npm-run-all": "^4.1.5",
     "react-refresh": "^0.14.0",
-    "react-router": "^5.3.0",
-    "react-router-dom": "^5.3.0",
+    "react-router-dom": "^6.4.4",
     "storybook-addon-pseudo-states": "^1.15.1",
     "storybook-design-token": "^2.7.1",
     "styled-components": "^5.3.6",
@@ -103,7 +100,8 @@
   },
   "dependencies": {
     "hotkeys-js": "^3.10.1",
-    "timeago.js": "^4.0.2"
+    "timeago.js": "^4.0.2",
+    "highlight-words-core": "^1.2.2"
   },
   "nx": {
     "namedInputs": {