@redocly/theme 0.6.2-beta.3 → 0.6.3-beta.1

package/lib/Navbar/MobileNavbarMenu.d.ts

@@ -1,6 +1,7 @@
-/// <reference types="react" />
+import React from 'react';
 import type { ResolvedConfigLinks } from '@theme/types/portal';
-export declare function MobileNavbarMenu({ menuItems, closeMenu, }: {
+export declare function MobileNavbarMenu({ menuItems, closeMenu, search, }: {
     menuItems: ResolvedConfigLinks;
+    search: React.ReactNode | undefined;
     closeMenu: () => void;
 }): JSX.Element | null;

package/lib/Navbar/MobileNavbarMenu.js

@@ -10,14 +10,16 @@ const NavbarItem_1 = require("../Navbar/NavbarItem");
 const MobileNavbarItem_1 = require("../Navbar/MobileNavbarItem");
 const NavbarDropdown_1 = require("../Navbar/NavbarDropdown");
 const utils_1 = require("../utils");
-function MobileNavbarMenu({ menuItems, closeMenu, }) {
+function MobileNavbarMenu({ menuItems, closeMenu, search, }) {
     if ((0, utils_1.isPrimitive)(menuItems) || (0, utils_1.isEmptyArray)(menuItems)) {
         return null;
     }
     return (react_1.default.createElement(NavbarItemsWrapper, { "data-component-name": "Navbar/MobileNavbarMenu" },
-        react_1.default.createElement(NavbarItemsContainer, null, menuItems.map((navItem, index) => {
-            return (react_1.default.createElement(MobileNavbarItem_1.MobileNavbarItem, { key: `${navItem.label}_${index}`, "data-cy": navItem.label, navItem: navItem }));
-        })),
+        react_1.default.createElement(NavbarItemsContainer, null,
+            react_1.default.createElement(MobileSearchWrapper, null, search || null),
+            menuItems.map((navItem, index) => {
+                return (react_1.default.createElement(MobileNavbarItem_1.MobileNavbarItem, { key: `${navItem.label}_${index}`, "data-cy": navItem.label, navItem: navItem }));
+            })),
         react_1.default.createElement(NavbarItemsClosableArea, { onClick: closeMenu })));
 }
 exports.MobileNavbarMenu = MobileNavbarMenu;
@@ -89,4 +91,14 @@ const NavbarItemsContainer = styled_components_1.default.ul `
     position: relative;
   }
 `;
+const MobileSearchWrapper = styled_components_1.default.div `
+  padding: var(--navbar-item-padding-horizontal);
+  > div {
+    display: block;
+    width: 100%;
+  }
+  input {
+    width: 100%;
+  }
+`;
 //# sourceMappingURL=MobileNavbarMenu.js.map

package/lib/Navbar/Navbar.js

@@ -23,7 +23,7 @@ function Navbar({ menu, logo, search, profile }) {
     const closeMobileMenu = () => setIsOpen(false);
     return (react_1.default.createElement(exports.NavbarContainer, { "data-component-name": "Navbar/Navbar" },
         react_1.default.createElement(MobileNavbarMenuButton_1.MobileNavbarMenuButton, { onClick: openMobileMenu }),
-        isOpen && react_1.default.createElement(MobileNavbarMenu_1.MobileNavbarMenu, { closeMenu: closeMobileMenu, menuItems: menu }),
+        isOpen && (react_1.default.createElement(MobileNavbarMenu_1.MobileNavbarMenu, { closeMenu: closeMobileMenu, menuItems: menu, search: hideSearch ? null : search })),
         react_1.default.createElement(exports.NavbarRow, null,
             logo,
             react_1.default.createElement(Navbar_1.NavbarMenu, { menuItems: menu }),
@@ -33,6 +33,8 @@ function Navbar({ menu, logo, search, profile }) {
 }
 exports.Navbar = Navbar;
 exports.NavbarContainer = styled_components_1.default.nav `
+  --text-color: var(--navbar-text-color);
+
   height: var(--navbar-height);
   box-sizing: border-box;
   display: flex;

package/lib/Profile/Profile.js

@@ -51,6 +51,11 @@ const ProfileWrapper = styled_components_1.default.div `
 `;
 const StyledUserName = styled_components_1.default.span `
   color: ${({ color }) => color || 'var(--navbar-text-color)'};
+  display: none;
+
+  ${({ theme }) => { var _a; return (_a = theme.mediaQueries) === null || _a === void 0 ? void 0 : _a.medium; }} {
+    display: block;
+  }
 `;
 const AvatarWrapper = styled_components_1.default.div `
   width: 40px;

package/lib/Search/Autocomplete.js

@@ -48,6 +48,7 @@ function Autocomplete({ placeholder, value, items, change, select, renderItem, c
     const stopPropagation = (event) => event.stopPropagation();
     const onChange = (event) => {
         setActiveIdx(-1);
+        setIsOpen(true);
         change(event.target.value);
     };
     const onKeydown = (event) => {

package/lib/Search/Popover.js

@@ -13,7 +13,6 @@ exports.Popover = styled_components_1.default.div.attrs(() => ({
   right: 0;
   z-index: 100;
   min-width: 100%;
-  width: 550px;
   max-width: 90vw;
   max-height: 400px;
   overflow-y: auto;
@@ -22,5 +21,14 @@ exports.Popover = styled_components_1.default.div.attrs(() => ({
   list-style: none;
   border-radius: var(--search-popover-border-radius);
   border: var(--search-popover-border);
+  width: 100%;
+
+  ${({ theme }) => { var _a; return (_a = theme.mediaQueries) === null || _a === void 0 ? void 0 : _a.small; }} {
+    width: 400px;
+  }
+
+  ${({ theme }) => { var _a; return (_a = theme.mediaQueries) === null || _a === void 0 ? void 0 : _a.medium; }} {
+    width: 550px;
+  }
 `;
 //# sourceMappingURL=Popover.js.map

package/lib/Search/Search.js

@@ -1,10 +1,33 @@
 "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;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Search = void 0;
-const react_1 = __importDefault(require("react"));
+const React = __importStar(require("react"));
 const styled_components_1 = __importDefault(require("styled-components"));
 const usePreloadHistory_1 = require("../mocks/usePreloadHistory");
 const search_1 = require("../mocks/search");
@@ -17,11 +40,21 @@ function Search() {
     const { query, setQuery, items } = (0, search_1.useFuseSearch)();
     // TODO: ask somebody about typings
     const navigate = (item) => history.push(item.url);
-    return (react_1.default.createElement(Wrapper, { "data-component-name": "Search/Search" },
-        react_1.default.createElement(Autocomplete_1.Autocomplete, { items: items, value: query, change: setQuery, select: navigate, placeholder: "Search the docs", renderItem: (item) => react_1.default.createElement(SearchItem_1.SearchItem, { key: item.id, item: item }) }, (isOpen, reset) => (isOpen ? react_1.default.createElement(ClearIcon_1.ClearIcon, { onClick: reset }) : react_1.default.createElement(SearchIcon_1.SearchIcon, null)))));
+    const renderAutocomplete = () => (React.createElement(Autocomplete_1.Autocomplete, { items: items, value: query, change: setQuery, select: navigate, placeholder: "Search the docs", renderItem: (item) => React.createElement(SearchItem_1.SearchItem, { key: item.id, item: item }) }, (isOpen, reset) => (isOpen ? React.createElement(ClearIcon_1.ClearIcon, { onClick: reset }) : React.createElement(SearchIcon_1.SearchIcon, null))));
+    return React.createElement(Wrapper, { "data-component-name": "Search/Search" }, renderAutocomplete());
 }
 exports.Search = Search;
 const Wrapper = styled_components_1.default.div `
-  margin: 0 auto;
+  margin-left: auto;
+
+  display: none;
+
+  ${({ theme }) => { var _a; return (_a = theme.mediaQueries) === null || _a === void 0 ? void 0 : _a.small; }} {
+    display: block;
+  }
+
+  ${({ theme }) => { var _a; return (_a = theme.mediaQueries) === null || _a === void 0 ? void 0 : _a.medium; }} {
+    margin: 0 auto;
+  }
 `;
 //# sourceMappingURL=Search.js.map

package/lib/ui/Burger.js

@@ -14,7 +14,8 @@ function BurgerComponent({ onClick, className }) {
 }
 const Button = styled_components_1.default.button `
   all: unset;
-  max-width: 30px;
+  max-width: 20px;
+  min-width: 20px;
   width: 100%;
   min-width: 10px;
   display: block;
@@ -24,7 +25,7 @@ const Line = styled_components_1.default.div `
   margin: 4px 0;
   width: 100%;
   height: 2px;
-  background: #fff;
+  background: var(--text-color);
   border-radius: 1px;
 `;
 exports.Burger = (0, styled_components_1.default)(BurgerComponent) ``;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/theme",
-  "version": "0.6.2-beta.3",
+  "version": "0.6.3-beta.1",
   "description": "Shared UI components",
   "author": "team@redocly.com",
   "license": "SEE LICENSE IN LICENSE",
@@ -115,7 +115,10 @@
         ]
       },
       "test": {
-        "outputs": []
+        "outputs": [
+          "{projectRoot}/coverage",
+          "{projectRoot}/report.json"
+        ]
       }
     }
   }

package/src/Navbar/MobileNavbarMenu.tsx

@@ -10,8 +10,10 @@ import type { ResolvedConfigLinks, ResolvedNavItem } from '@theme/types/portal';
 export function MobileNavbarMenu({
   menuItems,
   closeMenu,
+  search,
 }: {
   menuItems: ResolvedConfigLinks;
+  search: React.ReactNode | undefined;
   closeMenu: () => void;
 }): JSX.Element | null {
   if (isPrimitive(menuItems) || isEmptyArray(menuItems)) {
@@ -21,6 +23,7 @@ export function MobileNavbarMenu({
   return (
     <NavbarItemsWrapper data-component-name="Navbar/MobileNavbarMenu">
       <NavbarItemsContainer>
+        <MobileSearchWrapper>{search || null}</MobileSearchWrapper>
         {(menuItems as ResolvedNavItem[]).map((navItem, index) => {
           return (
             <MobileNavbarItem
@@ -106,3 +109,14 @@ const NavbarItemsContainer = styled.ul`
     position: relative;
   }
 `;
+
+const MobileSearchWrapper = styled.div`
+  padding: var(--navbar-item-padding-horizontal);
+  > div {
+    display: block;
+    width: 100%;
+  }
+  input {
+    width: 100%;
+  }
+`;

package/src/Navbar/Navbar.tsx

@@ -32,7 +32,13 @@ export function Navbar({ menu, logo, search, profile }: NavbarProps): JSX.Elemen
   return (
     <NavbarContainer data-component-name="Navbar/Navbar">
       <MobileNavbarMenuButton onClick={openMobileMenu} />
-      {isOpen && <MobileNavbarMenu closeMenu={closeMobileMenu} menuItems={menu} />}
+      {isOpen && (
+        <MobileNavbarMenu
+          closeMenu={closeMobileMenu}
+          menuItems={menu}
+          search={hideSearch ? null : search}
+        />
+      )}
       <NavbarRow>
         {logo}
         <NavbarMenu menuItems={menu} />
@@ -45,6 +51,8 @@ export function Navbar({ menu, logo, search, profile }: NavbarProps): JSX.Elemen
 }
 
 export const NavbarContainer = styled.nav`
+  --text-color: var(--navbar-text-color);
+
   height: var(--navbar-height);
   box-sizing: border-box;
   display: flex;

package/src/Profile/Profile.tsx

@@ -54,6 +54,11 @@ const ProfileWrapper = styled.div`
 
 const StyledUserName = styled.span`
   color: ${({ color }) => color || 'var(--navbar-text-color)'};
+  display: none;
+
+  ${({ theme }) => theme.mediaQueries?.medium} {
+    display: block;
+  }
 `;
 
 const AvatarWrapper = styled.div<{ background?: string }>`

package/src/Search/Autocomplete.tsx

@@ -46,6 +46,7 @@ export function Autocomplete<T>({
 
   const onChange = (event: ChangeEvent<HTMLInputElement>) => {
     setActiveIdx(-1);
+    setIsOpen(true);
     change(event.target.value);
   };
 

package/src/Search/Popover.tsx

@@ -8,7 +8,6 @@ export const Popover = styled.div.attrs(() => ({
   right: 0;
   z-index: 100;
   min-width: 100%;
-  width: 550px;
   max-width: 90vw;
   max-height: 400px;
   overflow-y: auto;
@@ -17,4 +16,13 @@ export const Popover = styled.div.attrs(() => ({
   list-style: none;
   border-radius: var(--search-popover-border-radius);
   border: var(--search-popover-border);
+  width: 100%;
+
+  ${({ theme }) => theme.mediaQueries?.small} {
+    width: 400px;
+  }
+
+  ${({ theme }) => theme.mediaQueries?.medium} {
+    width: 550px;
+  }
 `;

package/src/Search/Search.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import styled from 'styled-components';
 
 import { usePreloadHistory } from '@portal/usePreloadHistory';
@@ -33,22 +33,32 @@ export function Search(): JSX.Element {
   // TODO: ask somebody about typings
   const navigate = (item: SearchDocument) => history.push(item.url);
 
-  return (
-    <Wrapper data-component-name="Search/Search">
-      <Autocomplete
-        items={items}
-        value={query}
-        change={setQuery}
-        select={navigate}
-        placeholder="Search the docs"
-        renderItem={(item) => <SearchItem key={item.id} item={item} />}
-      >
-        {(isOpen, reset) => (isOpen ? <ClearIcon onClick={reset} /> : <SearchIcon />)}
-      </Autocomplete>
-    </Wrapper>
+  const renderAutocomplete = () => (
+    <Autocomplete
+      items={items}
+      value={query}
+      change={setQuery}
+      select={navigate}
+      placeholder="Search the docs"
+      renderItem={(item) => <SearchItem key={item.id} item={item} />}
+    >
+      {(isOpen, reset) => (isOpen ? <ClearIcon onClick={reset} /> : <SearchIcon />)}
+    </Autocomplete>
   );
+
+  return <Wrapper data-component-name="Search/Search">{renderAutocomplete()}</Wrapper>;
 }
 
 const Wrapper = styled.div`
-  margin: 0 auto;
+  margin-left: auto;
+
+  display: none;
+
+  ${({ theme }) => theme.mediaQueries?.small} {
+    display: block;
+  }
+
+  ${({ theme }) => theme.mediaQueries?.medium} {
+    margin: 0 auto;
+  }
 `;

package/src/ui/Burger.tsx

@@ -20,7 +20,8 @@ function BurgerComponent({ onClick, className }: BurgerProps): JSX.Element {
 
 const Button = styled.button`
   all: unset;
-  max-width: 30px;
+  max-width: 20px;
+  min-width: 20px;
   width: 100%;
   min-width: 10px;
   display: block;
@@ -31,7 +32,7 @@ const Line = styled.div`
   margin: 4px 0;
   width: 100%;
   height: 2px;
-  background: #fff;
+  background: var(--text-color);
   border-radius: 1px;
 `;