@redocly/theme 0.42.3 → 0.44.0

package/src/components/Select/Select.tsx

@@ -1,34 +1,14 @@
-import React, { useRef, useState } from 'react';
+import React, { Fragment, useEffect, useId, useRef, useState } from 'react';
 import styled from 'styled-components';
 
-import { useOutsideClick } from '@redocly/theme/core/hooks';
-import { ChevronDownIcon } from '@redocly/theme/icons/ChevronDownIcon/ChevronDownIcon';
-import { ChevronUpIcon } from '@redocly/theme/icons/ChevronUpIcon/ChevronUpIcon';
-import { CheckmarkIcon } from '@redocly/theme/icons/CheckmarkIcon/CheckmarkIcon';
+import type { SelectOption, SelectProps } from '@redocly/theme/core/types/select';
 
-export type SelectProps<T = any> = {
-  value: T;
-  options: {
-    element: React.ReactNode | JSX.Element | string;
-    value: T;
-    label?: string;
-  }[];
-  dataAttributes?: Record<string, string>;
-  className?: string;
-  withArrow?: boolean;
-  triggerEvent?: 'click' | 'hover';
-  onChange?: (value: any) => void;
-  placement?: 'top' | 'bottom';
-  alignment?: 'start' | 'end';
-  icon?: React.ReactNode;
-  onlyIcon?: boolean;
-  placeholder?: string;
-  disabled?: boolean;
-  hideCheckmarkIcon?: boolean;
-  dataTestId?: string;
-  renderInput?: (props: { isOpen: boolean }) => React.ReactElement;
-  renderDivider?: () => React.ReactElement;
-};
+import { CheckmarkIcon } from '@redocly/theme/icons/CheckmarkIcon/CheckmarkIcon';
+import { SelectInput } from '@redocly/theme/components/Select/SelectInput';
+import { Dropdown } from '@redocly/theme/components/Dropdown/Dropdown';
+import { DropdownMenu } from '@redocly/theme/components/Dropdown/DropdownMenu';
+import { DropdownMenuItem } from '@redocly/theme/components/Dropdown/DropdownMenuItem';
+import { useOutsideClick } from '@redocly/theme/core/hooks';
 
 export function Select<T>(props: SelectProps<T>): JSX.Element {
   const {
@@ -38,7 +18,6 @@ export function Select<T>(props: SelectProps<T>): JSX.Element {
     dataAttributes,
     withArrow = true,
     triggerEvent = 'click',
-    onChange,
     placement,
     alignment,
     icon,
@@ -46,102 +25,229 @@ export function Select<T>(props: SelectProps<T>): JSX.Element {
     disabled,
     placeholder,
     hideCheckmarkIcon,
+    checkmarkIconPosition,
+    dataTestId = 'select',
+    multiple,
+    searchable,
+    clearable,
+    footer,
+    onChange,
+    onSearch,
     renderInput,
     renderDivider,
-    dataTestId = 'select',
   } = props;
 
-  const containerRef = useRef<HTMLDivElement | null>(null);
+  const getSelectedOptionsFromPropsValue = () => {
+    const values = Array.isArray(value) ? value : [value];
+    return values
+      .map((value) => {
+        const selectedOption = options.find((option) => option.value === value);
+        return selectedOption || typeof value === 'string'
+          ? ({ value } as SelectOption<T>)
+          : (value as SelectOption<T>);
+      })
+      .filter((option) => !!option);
+  };
 
-  const [isOpen, setIsOpen] = useState<boolean>(false);
-  // const [selectedIdx, setSelectedIdx] = useState<React.ReactNode | string>(selected);
+  const [selectedOptions, setSelectedOptions] = useState<SelectOption<T>[]>(
+    getSelectedOptionsFromPropsValue(),
+  );
+  const selectRef = useRef<HTMLDivElement | null>(null);
+  const [searchValue, setSearchValue] = useState<string | null>(null);
+  const [dropdownActive, setDropdownActive] = useState<boolean | undefined>(false);
+  const [filteredOptions, setFilteredOptions] = useState<SelectOption<T>[]>(options);
+  const [stickyInputValue, setStickyInputValue] = useState<string>(placeholder || '');
+  const inputId = useId();
 
-  const handleOpen = () => {
-    setIsOpen(true);
+  useOutsideClick(selectRef, () => {
+    setDropdownActive(false);
+  });
+
+  useEffect(() => {
+    setFilteredOptions(options);
+  }, [options]);
+
+  useEffect(() => {
+    setSelectedOptions(getSelectedOptionsFromPropsValue());
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [multiple, value]);
+
+  useEffect(() => {
+    if (onSearch) {
+      onSearch?.(searchValue as T);
+    } else {
+      if (typeof searchValue === 'string') {
+        const filteredOptions = options.filter((option) => {
+          const valueForSearch = String(option.label ?? option.value ?? '');
+          return (
+            !valueForSearch || valueForSearch.toLowerCase().indexOf(searchValue.toLowerCase()) > -1
+          );
+        });
+        setFilteredOptions(filteredOptions);
+      } else {
+        setFilteredOptions(options);
+      }
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [searchValue]);
+
+  const selectHandler = (selectedOption: SelectOption<T>) => {
+    const newSelectedOptions = multiple
+      ? isSelected(selectedOption)
+        ? selectedOptions.filter((option) => option.value !== selectedOption.value)
+        : [...selectedOptions, selectedOption]
+      : [selectedOption];
+
+    const newSelectedValues = newSelectedOptions.length
+      ? multiple
+        ? newSelectedOptions.map((o) => o.value)
+        : newSelectedOptions[0].value
+      : multiple
+      ? []
+      : ('' as T);
+
+    setSelectedOptions(newSelectedOptions);
+    onChange?.(newSelectedValues);
+    setSearchValue(null);
+    setDropdownActive(false);
+    if (!multiple) {
+      setStickyInputValue('');
+    }
   };
 
-  const handleClose = () => {
-    setIsOpen(false);
+  const searchHandler = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const targetValue = e.target.value;
+    setSearchValue(targetValue);
+    setDropdownActive(true);
   };
 
-  const handleToggle = () => {
-    setIsOpen(!isOpen);
+  const clearHandler = (option?: SelectOption<T>) => {
+    if (option) {
+      selectHandler(option);
+    } else {
+      if (!multiple) {
+        setStickyInputValue('');
+      }
+      setSelectedOptions([]);
+      onChange?.(multiple ? [] : ('' as T));
+    }
   };
 
-  const handleSelect = (value: T) => {
-    // setSelectedIdx(options.findIndex(o => o.value === value));
-    setIsOpen(false);
-    onChange?.(value);
+  const inputBlurHandler = (e: React.FocusEvent) => {
+    const relatedTarget = e.relatedTarget as HTMLElement;
+    const isDropdownItem =
+      relatedTarget?.attributes.getNamedItem('data-component-name')?.value ===
+      'Dropdown/DropdownMenuItem';
+    if (!isDropdownItem) {
+      if (!e.relatedTarget || e.relatedTarget?.id !== inputId) {
+        setDropdownActive(false);
+      }
+      setSearchValue(null);
+      setStickyInputValue('');
+    }
   };
 
-  useOutsideClick(containerRef, handleClose);
-
-  // useEffect(() => {
-  //   handleSelect(selected);
-  //   // eslint-disable-next-line react-hooks/exhaustive-deps
-  // }, [selected]);
-
-  const selectedOption = options.find((option) => option.value === value);
-
-  const renderDefaultInput = () => (
-    <SelectInput>
-      {!onlyIcon && (
-        <SelectInputValue>
-          {selectedOption?.label || selectedOption?.element || placeholder}
-        </SelectInputValue>
-      )}
-      {icon}
-      {withArrow ? isOpen ? <ChevronUpIcon size="14px" /> : <ChevronDownIcon size="14px" /> : null}
-    </SelectInput>
-  );
+  const inputFocusHandler = () => {
+    if (!multiple && selectedOptions.length) {
+      setStickyInputValue(selectedOptions[0].label || (selectedOptions[0].value as string));
+    }
+  };
+
+  const inputClickHandler = () => {
+    setDropdownActive(!dropdownActive);
+  };
+
+  const isSelected = (option: SelectOption<T>) => {
+    return !!selectedOptions.find(
+      (selectOption) => selectOption.value === option.value || selectOption.value === option.label,
+    );
+  };
+
+  const renderDefaultInput = () => {
+    return (
+      <SelectInput
+        id={inputId}
+        selectedOptions={selectedOptions}
+        searchValue={searchValue}
+        placeholder={placeholder}
+        stickyValue={stickyInputValue}
+        multiple={multiple}
+        searchable={searchable}
+        clearable={clearable}
+        customIcon={icon}
+        onlyIcon={onlyIcon}
+        clearHandler={clearHandler}
+        searchHandler={searchHandler}
+        inputBlurHandler={inputBlurHandler}
+        inputFocusHandler={inputFocusHandler}
+        clickHandler={inputClickHandler}
+      />
+    );
+  };
 
   return (
-    <SelectContainer
+    <SelectWrapper
       data-component-name="Select/Select"
+      ref={selectRef}
       {...dataAttributes}
       disabled={disabled}
       data-testid={dataTestId}
       className={className}
-      ref={containerRef}
-      onPointerEnter={triggerEvent === 'hover' ? handleOpen : undefined}
-      onPointerLeave={triggerEvent === 'hover' ? handleClose : undefined}
-      onClick={triggerEvent === 'click' ? handleToggle : undefined}
     >
-      {renderInput ? renderInput({ isOpen }) : renderDefaultInput()}
-      {isOpen && (
-        <SelectList placement={placement} alignment={alignment}>
-          {options.map((option, index) => {
-            const selected = option.value === value;
-            return (
-              <>
-                <SelectListItem
-                  key={index}
-                  onClick={() => handleSelect(option.value)}
-                  selected={selected}
-                >
-                  {typeof option.element === 'string' ? (
-                    <div>{option.element}</div>
-                  ) : (
-                    option.element
-                  )}
-                  {!hideCheckmarkIcon && selected && <CheckmarkIcon />}
-                </SelectListItem>
-                {renderDivider && index !== options.length - 1 ? renderDivider() : null}
-              </>
-            );
-          })}
-        </SelectList>
-      )}
-    </SelectContainer>
+      <SelectDropdown
+        closeOnClick={!multiple}
+        withArrow={withArrow}
+        trigger={renderInput ? renderInput() : renderDefaultInput()}
+        triggerEvent={triggerEvent}
+        placement={placement}
+        alignment={alignment}
+        active={!renderInput ? dropdownActive : undefined}
+      >
+        <SelectDropdownMenu footer={footer}>
+          {filteredOptions.length === 0 ? (
+            <DropdownMenuItem disabled>No results</DropdownMenuItem>
+          ) : (
+            filteredOptions.map((option, index) => {
+              return (
+                <Fragment key={index}>
+                  <DropdownMenuItem
+                    onAction={() => selectHandler(option)}
+                    prefix={
+                      !hideCheckmarkIcon &&
+                      (checkmarkIconPosition ? checkmarkIconPosition === 'start' : false) &&
+                      isSelected(option) && <CheckmarkIcon />
+                    }
+                    suffix={
+                      !hideCheckmarkIcon &&
+                      (checkmarkIconPosition ? checkmarkIconPosition === 'end' : true) &&
+                      isSelected(option) && <CheckmarkIcon />
+                    }
+                  >
+                    {typeof option.element === 'string' ? (
+                      <div>{option.element}</div>
+                    ) : (
+                      option.element
+                    )}
+                  </DropdownMenuItem>
+                  {renderDivider && index !== options.length - 1 ? renderDivider() : null}
+                </Fragment>
+              );
+            }) || 'No results'
+          )}
+        </SelectDropdownMenu>
+      </SelectDropdown>
+    </SelectWrapper>
   );
 }
 
-export const SelectContainer = styled.div<{ disabled?: boolean }>`
+export const SelectWrapper = styled.div<{ disabled?: boolean }>`
+  display: flex;
   position: relative;
   font-size: var(--select-font-size);
   font-weight: var(--select-font-weight);
   line-height: var(--select-line-height);
   border-radius: var(--select-border-radius);
+  border: var(--select-border);
   color: var(--select-text-color);
   min-width: 0;
 
@@ -151,71 +257,16 @@ export const SelectContainer = styled.div<{ disabled?: boolean }>`
     opacity: 0.59;
     pointer-events: none;
   `}
-  a {
-    display: block;
-    text-decoration: none;
-    color: var(--select-text-color);
-  }
-`;
-
-export const SelectInput = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: var(--select-input-border-radius);
-  padding: var(--select-input-padding);
-  cursor: pointer;
-  gap: 8px;
 `;
 
-export const SelectInputValue = styled.div`
-  pointer-events: none;
-  min-width: 0;
-  text-overflow: ellipsis;
-  overflow: hidden;
-`;
-
-export const SelectList = styled.ul<{ placement?: string; alignment?: string }>`
-  position: absolute;
-  top: ${({ placement }) => (placement === 'top' ? 'auto' : '100%')};
-  bottom: ${({ placement }) => (placement === 'top' ? '100%' : 'auto')};
-  left: ${({ alignment }) => (alignment === 'start' ? '0' : 'auto')};
-  right: ${({ alignment }) => (alignment === 'end' ? '0' : 'auto')};
-  margin: 0;
-  min-width: var(--select-list-min-width);
-  max-width: var(--select-list-max-width);
-  padding: var(--select-list-padding);
-  background-color: var(--select-list-bg-color);
-  border-radius: var(--select-list-border-radius);
-  box-shadow: var(--select-list-box-shadow);
-  list-style-type: none;
-  cursor: pointer;
-  white-space: nowrap;
-  overflow: hidden;
-  z-index: 1;
-`;
+const SelectDropdown = styled(Dropdown)`
+  width: 100%;
 
-export const SelectListItem = styled.li<{ selected: boolean }>`
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: var(--select-list-item-border-radius);
-  gap: var(--select-list-item-gap);
-  padding: var(--select-list-item-padding);
-  ${({ selected }) =>
-    selected &&
-    `
-      font-weight: var(--select-list-item-font-weight-active);
-      background-color: var(--select-list-item-bg-color-active);
-      &:hover { background-color: var(--select-list-item-bg-color-active)};
-    `}
-
-  & > * {
-    overflow: hidden;
-    text-overflow: ellipsis;
+  > * {
+    width: 100%;
   }
+`;
 
-  &:hover {
-    background-color: var(--select-list-item-bg-color-hover);
-  }
+const SelectDropdownMenu = styled(DropdownMenu)`
+  width: 100%;
 `;

package/src/components/Select/SelectInput.tsx

@@ -0,0 +1,201 @@
+import styled from 'styled-components';
+import React, { useRef } from 'react';
+
+import type { SelectOption } from '@redocly/theme/core/types/select';
+
+import { Tag } from '@redocly/theme/components/Tag/Tag';
+import { CloseIcon } from '@redocly/theme/icons/CloseIcon/CloseIcon';
+import { Button } from '@redocly/theme/components/Button/Button';
+
+type SelectInputProps<T> = {
+  id?: string;
+  selectedOptions: SelectOption<T>[];
+  searchValue: any;
+  stickyValue: any;
+  onlyIcon?: boolean;
+  icon?: React.ReactNode;
+  customIcon?: React.ReactNode;
+  placeholder?: string;
+  multiple?: boolean;
+  searchable?: boolean;
+  clearable?: boolean;
+  clearHandler?: (value?: any) => void;
+  inputBlurHandler?: (e?: any) => void;
+  inputFocusHandler?: (e?: any) => void;
+  searchHandler?: (e?: any) => void;
+  clickHandler?: (e?: any) => void;
+};
+
+export function SelectInput<T>(props: SelectInputProps<T>): React.ReactNode {
+  const {
+    id,
+    onlyIcon,
+    icon,
+    customIcon,
+    selectedOptions,
+    placeholder,
+    stickyValue,
+    multiple,
+    searchable,
+    clearable,
+    clearHandler,
+    searchHandler,
+    clickHandler,
+    searchValue,
+    inputBlurHandler,
+    inputFocusHandler,
+  } = props;
+  const inputRef = useRef<HTMLInputElement | null>(null);
+
+  const onChangeHandler = (e: any) => {
+    searchHandler?.(e);
+    inputRef.current?.focus();
+  };
+
+  const onKeyDownHandler = (e: any) => {
+    e.stopPropagation();
+    if (e.key === 'Backspace' && !searchValue && selectedOptions.length) {
+      clearHandler?.(selectedOptions[selectedOptions.length - 1]);
+      inputRef.current?.focus();
+    }
+  };
+
+  const onClickHandler = (e: React.MouseEvent) => {
+    clickHandler?.(e);
+  };
+
+  const onFocusHandler = (e: React.FocusEvent<HTMLDivElement>) => {
+    inputFocusHandler?.(e);
+    inputRef.current?.focus();
+  };
+
+  const onBlurHandler = (e: React.FocusEvent<HTMLDivElement>) => {
+    inputBlurHandler?.(e);
+  };
+
+  const onClearAllHandler = (e: React.MouseEvent) => {
+    e.stopPropagation();
+    clearHandler?.();
+  };
+
+  const selectTags = selectedOptions.map((option, index) => (
+    <SelectInputTag
+      closable
+      key={index}
+      onClose={() => {
+        clearHandler?.(option);
+        inputRef.current?.focus();
+      }}
+    >
+      {option.label || (option.value as string) || option.element}
+    </SelectInputTag>
+  ));
+
+  const selectInput = (
+    <SelectInternalInput
+      value={
+        searchValue ||
+        (!multiple && !stickyValue && selectedOptions.length
+          ? selectedOptions[0].label || selectedOptions[0].value
+          : '')
+      }
+      placeholder={
+        searchValue || (multiple && selectedOptions.length) ? '' : stickyValue || placeholder
+      }
+      onChange={onChangeHandler}
+      onKeyDown={onKeyDownHandler}
+      onBlur={onBlurHandler}
+      ref={inputRef}
+      width={multiple ? (!searchValue && selectedOptions.length ? '10px' : 'auto') : '100%'}
+    />
+  );
+
+  const simpleValue = selectedOptions.length ? (
+    selectedOptions[0].label || selectedOptions[0].element || (selectedOptions[0].value as string)
+  ) : (
+    <SelectInternalInputPlaceholder>{placeholder}</SelectInternalInputPlaceholder>
+  );
+
+  const multipleValues = selectedOptions.length ? (
+    selectTags
+  ) : (
+    <SelectInternalInputPlaceholder>{placeholder}</SelectInternalInputPlaceholder>
+  );
+
+  return (
+    <SelectInputWrapper {...props} id={id} onFocus={onFocusHandler} onClick={onClickHandler}>
+      {!onlyIcon && (
+        <>
+          <SelectInputValue>
+            {multiple ? (
+              searchable ? (
+                <>
+                  {selectTags}
+                  {selectInput}
+                </>
+              ) : (
+                multipleValues
+              )
+            ) : searchable ? (
+              selectInput
+            ) : (
+              simpleValue
+            )}
+          </SelectInputValue>
+          {!!(clearable && selectedOptions.length) && (
+            <Button size="small" variant="text" icon={<CloseIcon />} onClick={onClearAllHandler} />
+          )}
+        </>
+      )}
+      {customIcon || icon}
+    </SelectInputWrapper>
+  );
+}
+
+export const SelectInputWrapper = styled.div`
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: var(--select-input-border-radius);
+  padding: var(--select-input-padding);
+  cursor: pointer;
+  gap: var(--select-input-gap);
+`;
+
+const SelectInputValue = styled.div`
+  width: calc(100% - 20px);
+  display: flex;
+  min-width: 0;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  flex-wrap: wrap;
+  gap: var(--select-input-value-gap);
+`;
+
+const SelectInputTag = styled(Tag)`
+  --tag-content-padding: 0;
+`;
+
+const SelectInternalInput = styled.input.attrs(() => ({
+  type: 'text',
+}))<{ width?: string }>`
+  outline: none;
+  border-radius: var(--select-input-border-radius);
+  border: none;
+  font-size: var(--select-input-font-size);
+  font-weight: var(--select-input-font-weight);
+  line-height: var(--select-input-line-height);
+  background-color: var(--select-input-bg-color);
+
+  &::placeholder {
+    color: var(--select-input-placeholder-color);
+  }
+
+  width: ${({ width }) => width || 'auto'};
+`;
+
+const SelectInternalInputPlaceholder = styled.div`
+  color: var(--select-input-placeholder-color);
+  padding-left: 8px;
+`;

package/src/components/Select/variables.ts

@@ -9,10 +9,19 @@ export const select = css`
   --select-line-height: var(--line-height-base); // @presenter LineHeight
   --select-text-color: var(--text-color-secondary); // @presenter Color
   --select-border-radius: var(--border-radius); // @presenter BorderRadius
+  --select-border: var(--border-width) var(--border-style) var(--border-color-primary); // @presenter Border
+  
   --select-input-padding-vertical: 6px; // @presenter Spacing
-  --select-input-padding-horizontal: 16px; // @presenter Spacing
+  --select-input-padding-horizontal: 6px; // @presenter Spacing
   --select-input-padding: var(--select-input-padding-vertical) var(--select-input-padding-horizontal);
+  --select-input-gap: var(--spacing-xs); // @presenter Spacing
+  --select-input-value-gap: var(--spacing-unit); // @presenter Spacing
   --select-input-border-radius: var(--border-radius); // @presenter BorderRadius
+  --select-input-font-size: var(--font-size-base); // @presenter FontSize
+  --select-input-font-weight: var(--font-weight-regular); // @presenter FontWeight
+  --select-input-line-height: var(--line-height-base); // @presenter LineHeight
+  --select-input-bg-color: var(--bg-color); // @presenter Color
+  --select-input-placeholder-color: var(--input-content-placeholder-color); // @presenter Color
 
   --select-list-min-width: 100px;
   --select-list-max-width: 300px;
@@ -30,5 +39,7 @@ export const select = css`
   --select-list-item-bg-color-active: transparent; // @presenter Color
   --select-list-item-bg-color-hover: var(--menu-item-bg-color-hover); // @presenter Color
   --select-list-item-font-weight-active: var(--font-weight-medium); // @presenter Color  
+
+  --select-placeholder-color: var(--color-warm-grey-6); // @presenter Color
   // @tokens End
 `;

package/src/components/SidebarActions/ChangeViewButton.tsx

@@ -25,7 +25,7 @@ export const ChangeViewButton = ({
 
   return (
     <StyledChangeViewButton
-      title={translate('theme.sidebar.actions.changeLayout', 'Change layout')}
+      title={translate('sidebar.actions.changeLayout', 'Change layout')}
       onClick={onClick}
       collapsedSidebar={collapsedSidebar}
     >

package/src/components/SidebarActions/SidebarActions.tsx

@@ -53,8 +53,8 @@ export const SidebarActions = ({
           }}
           title={
             collapsedSidebar
-              ? translate('theme.sidebar.actions.show', 'Show sidebar')
-              : translate('theme.sidebar.actions.hide', 'Hide sidebar')
+              ? translate('sidebar.actions.show', 'Show sidebar')
+              : translate('sidebar.actions.hide', 'Hide sidebar')
           }
           size="small"
           variant="outlined"

package/src/components/TableOfContent/TableOfContent.tsx

@@ -48,8 +48,8 @@ export function TableOfContent(props: TableOfContentProps): JSX.Element | null {
       <TableOfContentMenu data-component-name="TableOfContent/TableOfContent" className={className}>
         <TableOfContentItems ref={sidebar}>
           {displayedHeadings.length ? (
-            <TableOfContentHeader data-translation-key="theme.toc.header">
-              {translate('theme.toc.header', toc.header || 'On this page')}
+            <TableOfContentHeader data-translation-key="toc.header">
+              {translate('toc.header', toc.header || 'On this page')}
             </TableOfContentHeader>
           ) : null}
           {displayedHeadings.map((heading: MdHeading | null, idx: number) => {