@redocly/theme 0.6.4 → 0.7.0

package/src/Feedback/Thumbs.tsx

@@ -0,0 +1,116 @@
+import * as React from 'react';
+import styled from 'styled-components';
+
+export const ThumbUp = ({ text }: { text?: string }) => (
+  <Wrapper style={{ alignItems: 'normal' }}>
+    <Icon>
+      <svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 512 512">
+        <g>
+          <g>
+            <g>
+              <path
+                d="M495.736,290.773C509.397,282.317,512,269.397,512,260.796c0-22.4-18.253-47.462-42.667-47.462H349.918
+              c-4.284-0.051-25.651-1.51-25.651-25.6c0-4.71-3.814-8.533-8.533-8.533s-8.533,3.823-8.533,8.533
+              c0,33.749,27.913,42.667,42.667,42.667h119.467c14.182,0,25.6,16.631,25.6,30.396c0,4.437,0,17.946-26.53,20.855
+              c-4.506,0.495-7.834,4.42-7.586,8.951c0.239,4.523,3.985,8.064,8.516,8.064c14.114,0,25.6,11.486,25.6,25.6
+              s-11.486,25.6-25.6,25.6h-17.067c-4.719,0-8.533,3.823-8.533,8.533s3.814,8.533,8.533,8.533c14.114,0,25.6,11.486,25.6,25.6
+              s-11.486,25.6-25.6,25.6h-25.6c-4.719,0-8.533,3.823-8.533,8.533s3.814,8.533,8.533,8.533c8.934,0,17.067,8.132,17.067,17.067
+              c0,8.61-8.448,17.067-17.067,17.067h-128c-35.627,0-48.444-7.074-63.292-15.258c-12.553-6.921-26.786-14.763-54.963-18.79
+              c-4.668-0.674-8.994,2.577-9.66,7.236c-0.666,4.668,2.569,8.994,7.236,9.66c25.105,3.584,37.325,10.325,49.152,16.845
+              c15.497,8.542,31.505,17.374,71.526,17.374h128c17.869,0,34.133-16.273,34.133-34.133c0-6.229-1.775-12.134-4.83-17.229
+              c21.794-1.877,38.963-20.224,38.963-42.505c0-10.829-4.062-20.736-10.735-28.271C500.42,358.212,512,342.571,512,324.267
+              C512,310.699,505.634,298.59,495.736,290.773z"
+              />
+              <path
+                d="M76.8,443.733c9.412,0,17.067-7.654,17.067-17.067S86.212,409.6,76.8,409.6c-9.412,0-17.067,7.654-17.067,17.067
+              S67.388,443.733,76.8,443.733z"
+              />
+              <path
+                d="M179.2,247.467c25.353,0,57.429-28.297,74.3-45.167c36.634-36.634,36.634-82.167,36.634-151.1
+              c0-5.342,3.191-8.533,8.533-8.533c29.508,0,42.667,13.158,42.667,42.667v102.4c0,4.71,3.814,8.533,8.533,8.533
+              s8.533-3.823,8.533-8.533v-102.4c0-39.083-20.659-59.733-59.733-59.733c-14.831,0-25.6,10.769-25.6,25.6
+              c0,66.978,0,107.401-31.633,139.034C216.661,215.006,192.811,230.4,179.2,230.4c-4.719,0-8.533,3.823-8.533,8.533
+              S174.481,247.467,179.2,247.467z"
+              />
+              <path
+                d="M145.067,213.333H8.533c-4.719,0-8.533,3.823-8.533,8.533v256c0,4.71,3.814,8.533,8.533,8.533h136.533
+              c4.719,0,8.533-3.823,8.533-8.533v-256C153.6,217.156,149.786,213.333,145.067,213.333z M136.533,469.333H17.067V230.4h119.467
+              V469.333z"
+              />
+            </g>
+          </g>
+        </g>
+      </svg>
+    </Icon>
+    <span>{text || 'Yes'}</span>
+  </Wrapper>
+);
+
+export const ThumbDown = ({ text }: { text?: string }) => (
+  <Wrapper style={{ alignItems: 'end' }}>
+    <Icon>
+      <svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 512 512">
+        <g>
+          <g>
+            <g>
+              <path
+                d="M76.8,247.467c9.412,0,17.067-7.654,17.067-17.067c0-9.412-7.654-17.067-17.067-17.067
+				c-9.412,0-17.067,7.654-17.067,17.067C59.733,239.812,67.388,247.467,76.8,247.467z"
+              />
+              <path
+                d="M495.736,221.227C505.634,213.41,512,201.301,512,187.733c0-18.295-11.58-33.946-27.802-39.996
+				c6.673-7.535,10.735-17.434,10.735-28.271c0-22.281-17.169-40.627-38.963-42.505c3.055-5.094,4.83-10.999,4.83-17.229
+				c0-17.86-16.265-34.133-34.133-34.133h-128c-40.021,0-56.03,8.832-71.526,17.374c-11.827,6.519-24.047,13.261-49.152,16.845
+				c-4.668,0.666-7.902,4.992-7.236,9.66c0.666,4.659,4.949,7.885,9.66,7.236c28.177-4.028,42.411-11.87,54.963-18.79
+				c14.848-8.183,27.665-15.258,63.292-15.258h128c8.619,0,17.067,8.456,17.067,17.067c0,8.934-8.132,17.067-17.067,17.067
+				c-4.719,0-8.533,3.823-8.533,8.533s3.814,8.533,8.533,8.533h25.6c14.114,0,25.6,11.486,25.6,25.6s-11.486,25.6-25.6,25.6
+				c-4.719,0-8.533,3.823-8.533,8.533c0,4.71,3.814,8.533,8.533,8.533h17.067c14.114,0,25.6,11.486,25.6,25.6
+				s-11.486,25.6-25.6,25.6c-4.531,0-8.277,3.541-8.516,8.064c-0.247,4.531,3.081,8.457,7.586,8.951
+				c26.53,2.91,26.53,16.418,26.53,20.847c0,13.773-11.418,30.404-25.6,30.404H349.867c-14.763,0-42.667,8.917-42.667,42.667
+				c0,4.71,3.814,8.533,8.533,8.533s8.533-3.823,8.533-8.533c0-24.09,21.367-25.549,25.6-25.6h119.467
+				c24.414,0,42.667-25.054,42.667-47.471C512,242.603,509.397,229.683,495.736,221.227z"
+              />
+              <path
+                d="M349.867,315.733c-4.719,0-8.533,3.823-8.533,8.533v102.4c0,29.508-13.158,42.667-42.667,42.667
+				c-5.342,0-8.533-3.192-8.533-8.533c0-68.932,0-114.466-36.634-151.1c-16.87-16.87-48.947-45.167-74.3-45.167
+				c-4.719,0-8.533,3.823-8.533,8.533s3.814,8.533,8.533,8.533c13.611,0,37.461,15.394,62.234,40.166
+				c31.633,31.633,31.633,72.055,31.633,139.034c0,14.831,10.769,25.6,25.6,25.6c39.074,0,59.733-20.651,59.733-59.733v-102.4
+				C358.4,319.556,354.586,315.733,349.867,315.733z"
+              />
+              <path
+                d="M145.067,25.6H8.533C3.814,25.6,0,29.423,0,34.133v256c0,4.71,3.814,8.533,8.533,8.533h136.533
+				c4.719,0,8.533-3.823,8.533-8.533v-256C153.6,29.423,149.786,25.6,145.067,25.6z M136.533,281.6H17.067V42.667h119.467V281.6z"
+              />
+            </g>
+          </g>
+        </g>
+      </svg>
+    </Icon>
+    <span>{text || 'No'}</span>
+  </Wrapper>
+);
+
+const Wrapper = styled.div`
+  font-family: var(--font-family-base);
+  display: flex;
+  color: var(--color-primary-500);
+  &:hover {
+    color: var(--color-primary-600);
+    svg {
+      > g {
+        fill: var(--color-primary-600);
+      }
+    }
+  }
+`;
+
+const Icon = styled.div`
+  width: 18px;
+  height: 18px;
+  margin-right: 5px;
+  > svg {
+    > g {
+      fill: var(--color-primary-500);
+    }
+  }
+`;

package/src/Feedback/index.ts

@@ -0,0 +1,5 @@
+export { Rating } from '@theme/Feedback/Rating';
+export { Sentiment } from '@theme/Feedback/Sentiment';
+export { Comment } from '@theme/Feedback/Comment';
+export { Reasons } from '@theme/Feedback/Reasons';
+export * from './types';

package/src/Feedback/types.ts

@@ -0,0 +1,63 @@
+export type RatingProps = {
+  onSubmit: (value: { score: number; comment?: string; reasons?: string[] }) => void;
+  settings?: {
+    label?: string;
+    max?: number;
+    submitText?: string;
+    comment?: {
+      enable: boolean;
+      label?: string;
+    };
+    reasons?: {
+      enable: boolean;
+      label?: string;
+      multi?: boolean;
+      items: string[];
+    };
+  };
+};
+
+export type SentimentProps = {
+  onSubmit: (value: { score: number; comment?: string; reasons?: string[] }) => void;
+  settings?: {
+    label?: string;
+    submitText?: string;
+    comment?: {
+      enable: boolean;
+      likeLabel?: string;
+      dislikeLabel?: string;
+    };
+    reasons?: {
+      enable: boolean;
+      label?: string;
+      multi?: boolean;
+      items: string[];
+    };
+  };
+};
+
+export type CommentProps = {
+  onSubmit: (value: { comment: string }) => void;
+  settings?: {
+    label?: string;
+    submitText?: string;
+  };
+};
+
+export type ReasonsProps = {
+  onSubmit: (value: { reasons: string[] }) => void;
+  settings: {
+    label?: string;
+    multi?: boolean;
+    items: string[];
+    submitText?: string;
+    buttonText?: string;
+  };
+};
+
+export type ProblemProps = {
+  onSubmit: (value: string, location: string) => void; // TODO: maybe we don't need location here
+  settings?: {
+    label?: string;
+  };
+};

package/src/Markdown/MarkdownLayout.tsx

@@ -11,6 +11,7 @@ import { useThemeConfig } from '@theme/hooks';
 type MarkdownLayoutProps = {
   tableOfContent: React.ReactNode;
   markdownWrapper: React.ReactNode;
+  feedback: React.ReactNode;
   editPage?: {
     to: string;
     text: string;
@@ -23,13 +24,14 @@ type MarkdownLayoutProps = {
 export function MarkdownLayout({
   tableOfContent,
   markdownWrapper,
+  feedback,
   editPage,
   lastModified,
 }: MarkdownLayoutProps): JSX.Element {
   const { markdown } = useThemeConfig();
   const { editPage: themeEditPage } = markdown || {};
 
-  const mergedConf = editPage ? { ...editPage, ...themeEditPage } : undefined;
+  const mergedConf = editPage ? { ...themeEditPage, ...editPage } : undefined;
 
   return (
     <PageWrapper data-component-name="Markdown/MarkdownLayout">
@@ -41,6 +43,7 @@ export function MarkdownLayout({
           )}
         </LayoutTop>
         {markdownWrapper}
+        <LayoutBottom>{feedback}</LayoutBottom>
         <PageNavigation />
       </ContainerWrapper>
       {tableOfContent}
@@ -53,3 +56,9 @@ const LayoutTop = styled.div`
   justify-content: space-between;
   flex-flow: row nowrap;
 `;
+
+const LayoutBottom = styled(LayoutTop)`
+  > * {
+    margin: 25px 5px;
+  }
+`;

package/src/Markdown/Tabs/Tab.tsx

@@ -23,15 +23,21 @@ export function Tab({ activeTab, label, onClick }: TabProps): JSX.Element {
 const TabItem = styled.li<{ active: boolean }>`
   display: inline-block;
   list-style: none;
-  margin-bottom: -1px;
   padding: 0.75rem 1rem;
   cursor: pointer;
 
   ${({ active }) =>
-    active &&
+    active
+      ? `
+      background-color: var(--background-color);
+      border: solid var(--md-tabs-active-tab-border-color);
+      border-width: 0 0 1px 0;
+      color: var(--text-color);
     `
-    background-color: white;
-    border: solid #ccc;
-    border-width: 1px 1px 0 1px;
+      : `
+    &:hover {
+      border: solid var(--md-tabs-hover-tab-border-color);
+      border-width: 0 0 1px 0;
+    }
   `}
 `;

package/src/Markdown/Tabs/Tabs.tsx

@@ -31,17 +31,26 @@ export function Tabs({ children }: TabsProps): JSX.Element {
 
 const TabsContainer = styled.div`
   margin: 10px 0;
+
+  ol[class^='Tabs__TabList'] {
+    margin: 0;
+    padding: 0;
+  }
 `;
 
 const TabList = styled.ol`
-  border-bottom: 1px solid #ccc;
+  color: var(--md-tabs-tab-text-color);
   padding: 0;
   margin-block-end: 0;
+  border: solid var(--color-secondary-400);
+  border-width: 0 0 1px 0;
+
+  li[class^='Tab__TabItem'] {
+    margin: 0;
+    margin-bottom: -1px;
+  }
 `;
 
 const TabContent = styled.div`
-  padding: 10px 5px;
-  border: 1px solid #ccc;
-  border-top: none;
-  padding: 1rem;
+  padding: 1rem 0;
 `;

package/src/Navbar/Navbar.tsx

@@ -3,6 +3,7 @@ import styled from 'styled-components';
 
 import { NavbarMenu } from '@theme/Navbar';
 import { useMobileMenu } from '@theme/hooks/useMobileMenu';
+import { isEmptyArray, isPrimitive } from '@theme/utils';
 import { MobileNavbarMenuButton } from '@theme/Navbar/MobileNavbarMenuButton';
 import { MobileNavbarMenu } from '@theme/Navbar/MobileNavbarMenu';
 import { ColorModeSwitcher } from '@theme/ColorModeSwitcher/ColorModeSwitcher';
@@ -18,9 +19,10 @@ interface NavbarProps {
 
 export function Navbar({ menu, logo, search, profile }: NavbarProps): JSX.Element | null {
   const [isOpen, setIsOpen] = useMobileMenu(false);
-  const { search: searchSettings, navbar } = useThemeConfig();
+  const { search: searchSettings, navbar, userProfile: userProfileSettings } = useThemeConfig();
   const hideSearch =
     searchSettings?.hide || (searchSettings?.placement && searchSettings?.placement !== 'navbar');
+  const hideUserProfile = userProfileSettings?.hide;
 
   if (navbar?.hide) {
     return null;
@@ -29,9 +31,12 @@ export function Navbar({ menu, logo, search, profile }: NavbarProps): JSX.Elemen
   const openMobileMenu = () => setIsOpen(true);
   const closeMobileMenu = () => setIsOpen(false);
 
+  const menuItemsExist = !isPrimitive(menu) && !isEmptyArray(menu);
+
   return (
     <NavbarContainer data-component-name="Navbar/Navbar">
-      <MobileNavbarMenuButton onClick={openMobileMenu} />
+      {menuItemsExist && <MobileNavbarMenuButton onClick={openMobileMenu} />}
+
       {isOpen && (
         <MobileNavbarMenu
           closeMenu={closeMobileMenu}
@@ -43,7 +48,7 @@ export function Navbar({ menu, logo, search, profile }: NavbarProps): JSX.Elemen
         {logo}
         <NavbarMenu menuItems={menu} />
         {hideSearch ? null : search}
-        {profile}
+        {hideUserProfile ? null : profile}
         <ColorModeSwitcher />
       </NavbarRow>
     </NavbarContainer>

package/src/Pages/Forbidden.tsx

@@ -0,0 +1,42 @@
+import React from 'react';
+import styled from 'styled-components';
+
+import { Button } from '@theme/Button';
+
+export function Forbidden(): JSX.Element {
+  return (
+    <Wrapper data-component-name="Pages/Forbidden">
+      <Header>403</Header>
+      <Description>Access forbidden</Description>
+      <HomeButton color="primary" size="large" to="/">
+        Open Homepage
+      </HomeButton>
+    </Wrapper>
+  );
+}
+
+const Wrapper = styled.div`
+  margin: 25px auto;
+  font-family: var(--page-403-font-family);
+  text-align: center;
+`;
+
+const Header = styled.div`
+  color: var(--page-403-header-text-color);
+  margin: var(--page-403-header-margin);
+  font-size: var(--page-403-header-font-size);
+  line-height: var(--page-403-header-line-height);
+  font-weight: var(--page-403-header-font-weight);
+`;
+
+const Description = styled.div`
+  color: var(--page-403-description-text-color);
+  margin: var(--page-403-description-margin);
+  font-size: var(--page-403-description-font-size);
+  line-height: var(--page-403-description-line-height);
+  font-weight: var(--page-403-description-font-weight);
+`;
+
+const HomeButton = styled(Button)`
+  margin-top: var(--page-403-button-margin);
+`;

package/src/Pages/NotFound.tsx

@@ -0,0 +1,42 @@
+import React from 'react';
+import styled from 'styled-components';
+
+import { Button } from '@theme/Button';
+
+export function NotFound(): JSX.Element {
+  return (
+    <Wrapper data-component-name="Pages/NotFound">
+      <Header>404</Header>
+      <Description>It looks like you&apos;re lost</Description>
+      <HomeButton color="primary" size="large" to="/">
+        Open Homepage
+      </HomeButton>
+    </Wrapper>
+  );
+}
+
+const Wrapper = styled.div`
+  margin: 25px auto;
+  font-family: var(--page-404-font-family);
+  text-align: center;
+`;
+
+const Header = styled.div`
+  color: var(--page-404-header-text-color);
+  margin: var(--page-404-header-margin);
+  font-size: var(--page-404-header-font-size);
+  line-height: var(--page-404-header-line-height);
+  font-weight: var(--page-404-header-font-weight);
+`;
+
+const Description = styled.div`
+  color: var(--page-404-description-text-color);
+  margin: var(--page-404-description-margin);
+  font-size: var(--page-404-description-font-size);
+  line-height: var(--page-404-description-line-height);
+  font-weight: var(--page-404-description-font-weight);
+`;
+
+const HomeButton = styled(Button)`
+  margin-top: var(--page-404-button-margin);
+`;

package/src/Pages/index.ts

@@ -0,0 +1 @@
+export * from '@theme/Pages/NotFound';

package/src/Profile/LoginLink.tsx

@@ -0,0 +1,29 @@
+import React from 'react';
+import styled from 'styled-components';
+
+import { useThemeConfig } from '@theme/hooks/useThemeConfig';
+
+export interface LoginLinkProps {
+  href: string;
+}
+
+export function LoginLink({ href }: LoginLinkProps): JSX.Element {
+  const { userProfile } = useThemeConfig();
+  return <StyledLink href={href}>{userProfile?.loginLabel || 'Login'}</StyledLink>;
+}
+
+const StyledLink = styled.a.attrs(() => ({
+  'data-component-name': 'Profile/LoginLink',
+}))`
+  display: inline-block;
+  color: var(--navbar-text-color);
+  text-decoration: none;
+  padding: 0 var(--navbar-item-padding-horizontal);
+  text-align: center;
+  line-height: 1;
+  font-size: var(--navbar-item-font-size);
+  font-weight: var(--navbar-item-font-weight);
+  &:hover {
+    color: var(--navbar-item-hover-text-color);
+  }
+`;

package/src/Profile/Profile.tsx

@@ -44,7 +44,9 @@ function ProfileComponent({ name, imageUrl, onClick, color }: ProfileProps): JSX
 
 export const Profile = memo<ProfileProps>(ProfileComponent);
 
-const ProfileWrapper = styled.div`
+const ProfileWrapper = styled.div.attrs(() => ({
+  'data-component-name': 'Profile/Profile',
+}))`
   display: flex;
   align-items: center;
   cursor: pointer;

package/src/Profile/UserProfile.tsx

@@ -0,0 +1,101 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+
+import { Link } from '@portal/Link';
+import { Profile } from '@theme/Profile/Profile';
+import { Tooltip } from '@theme/Tooltip/Tooltip';
+import { useThemeConfig } from '@theme/hooks/useThemeConfig';
+
+export interface UserProfileProps {
+  userInfo: {
+    isAuthenticated: boolean;
+    name: string;
+    picture: string;
+    logoutDisabled?: boolean;
+  };
+  handleLogout: (logoutRedirect?: string) => void;
+  hasDeveloperOnboarding?: boolean;
+  hasApiLogs?: boolean;
+}
+
+export function UserProfile({
+  userInfo,
+  handleLogout,
+  hasDeveloperOnboarding = false,
+  hasApiLogs = false,
+}: UserProfileProps): JSX.Element {
+  const [isOpened, setIsOpened] = useState<boolean>(false);
+
+  const { userProfile: userProfileSettings } = useThemeConfig();
+
+  const logoutRedirect = userProfileSettings?.logoutRedirect || '/';
+
+  return (
+    <StyledTooltip
+      isOpen={isOpened}
+      withArrow={false}
+      className="copy-button"
+      placement="bottom"
+      width="100%"
+      tip={
+        <StyledUl>
+          {hasDeveloperOnboarding ? (
+            <Link to="/apps">
+              <StyledLi>My Apps</StyledLi>
+            </Link>
+          ) : null}
+          {hasApiLogs ? (
+            <Link to="/api-logs">
+              <StyledLi>API logs</StyledLi>
+            </Link>
+          ) : null}
+          <StyledLi onClick={() => handleLogout(logoutRedirect)}>
+            {userProfileSettings?.logoutLabel || 'Log out'}
+          </StyledLi>
+        </StyledUl>
+      }
+    >
+      <Profile
+        name={userInfo.name}
+        imageUrl={userInfo.picture}
+        onClick={userInfo.logoutDisabled ? undefined : () => setIsOpened(!isOpened)}
+      />
+    </StyledTooltip>
+  );
+}
+
+const StyledTooltip = styled(Tooltip)`
+  > span {
+    padding: 0;
+  }
+`;
+
+const StyledUl = styled.ul`
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  text-align: left;
+  background-color: var(--search-modal-background);
+  color: var(--search-modal-text-color);
+  min-width: 100px;
+  a {
+    text-decoration: none;
+    &:hover {
+      color: inherit;
+    }
+    &:visited {
+      color: inherit;
+    }
+  }
+`;
+
+const StyledLi = styled.li`
+  cursor: pointer;
+  font-size: 16px;
+  list-style: none;
+  padding: 15px 20px;
+  transition: background-color 0.25s ease 0s;
+  &:hover {
+    background-color: rgba(0, 0, 0, 0.1);
+  }
+`;

package/src/Profile/index.ts

@@ -1,2 +1,6 @@
 export { Profile } from './Profile';
 export type { ProfileProps } from './Profile';
+export { LoginLink } from './LoginLink';
+export type { LoginLinkProps } from './LoginLink';
+export { UserProfile } from './UserProfile';
+export type { UserProfileProps } from './UserProfile';

package/src/Search/Autocomplete.tsx

@@ -1,11 +1,13 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import styled from 'styled-components';
+import hotkeys from 'hotkeys-js';
 
 import type { ChangeEvent, KeyboardEvent, ReactNode, SyntheticEvent } from 'react';
 
 import { FormInput } from '@theme/Search/Input';
 import { Popover } from '@theme/Search/Popover';
+import { ShortcutKey } from '@theme/Search/ShortcutKey';
 import type { ActiveItem } from '@portal/types';
 
 interface AutocompleteProps<T> {
@@ -16,6 +18,8 @@ interface AutocompleteProps<T> {
   change(value: string): void;
   select(item: T): void;
   children?(isOpen: boolean, close: () => void): ReactNode;
+  inputRef?: React.RefObject<HTMLInputElement>;
+  keyShortcuts?: string[];
 }
 
 export function Autocomplete<T>({
@@ -26,12 +30,28 @@ export function Autocomplete<T>({
   select,
   renderItem,
   children,
+  keyShortcuts,
 }: AutocompleteProps<T>): JSX.Element {
   const location = useLocation();
   const [isOpen, setIsOpen] = useState(false);
   const [activeIdx, setActiveIdx] = useState(-1);
+  const refInput = useRef<HTMLInputElement>(null);
+
+  const hotkeysKeys = keyShortcuts?.join(',');
+
+  useEffect(() => {
+    if (hotkeysKeys) {
+      hotkeys(hotkeysKeys, (ev) => {
+        refInput.current?.focus();
+        ev.preventDefault();
+      });
+
+      return () => hotkeys.unbind(hotkeysKeys as string);
+    }
+  }, [hotkeysKeys]);
 
   const open = () => setIsOpen(true);
+
   const close = () => {
     setIsOpen(false);
     setActiveIdx(-1);
@@ -65,6 +85,7 @@ export function Autocomplete<T>({
         break;
       case 'Enter':
         if (activeIdx > -1) {
+          reset();
           select(items[activeIdx]);
         }
         break;
@@ -82,15 +103,18 @@ export function Autocomplete<T>({
     <Wrapper data-component-name="Search/Autocomplete">
       {isOpen ? <Overlay onClick={close} /> : null}
       <AutocompleteBox onKeyDown={onKeydown}>
+        {children?.(isOpen, reset)}
+
         <FormInput
           value={value}
           placeholder={placeholder}
           onChange={onChange}
           onFocus={open}
           onClick={stopPropagation}
+          ref={refInput}
         />
 
-        {children?.(isOpen, reset)}
+        {!isOpen && <ShortcutKey keyShortcuts={keyShortcuts} />}
 
         {isOpen && value ? (
           <Popover>{items.length ? items.map(mapItem) : <Message>No results</Message>}</Popover>

package/src/Search/ClearIcon.tsx

@@ -24,7 +24,7 @@ export const ClearIcon = styled(Icon).attrs(() => ({
   cursor: pointer;
   width: 0.5em;
   height: 0.5em;
-  right: 1.2em;
+  left: 1.2em;
   fill: var(--search-input-text-color);
 
   ${({ theme }) => theme.mediaQueries.medium} {

package/src/Search/Input.tsx

@@ -3,7 +3,7 @@ import styled from 'styled-components';
 export const FormInput = styled.input.attrs(() => ({
   'data-component-name': 'Search/Input',
 }))`
-  padding: 1em 2.5em 1em 1em;
+  padding: 1em 2.5em 1em 2.5em;
   background-color: var(--search-input-background-color);
   border-radius: var(--search-input-border-radius);
   border: var(--search-input-border);