@fibery/ui-kit 1.40.0 → 1.40.2

package/src/select/select-in-popover.tsx

@@ -25,10 +25,10 @@ import {
   OnChangeValue,
   OptionsOrGroups,
   PropsValue,
-  Select as ReactSelect,
+  SelectComponent as ReactSelect,
   SelectProps,
   StylesConfig,
-} from "./index";
+} from "./select";
 import {SelectControlSettingsProvider} from "./select-control-settings-context";
 import {ButtonColor, ButtonVariant} from "../button/base-button";
 import {makeSelectInPopoverStyles} from "./styles";
@@ -131,6 +131,7 @@ export type SelectInPopoverRef<T, U extends boolean, V extends GroupBase<T>> = {
 
 type Props<T, U extends boolean, V extends GroupBase<T>> = {
   value?: PropsValue<T>;
+  isSearchable?: boolean;
   menuIsOpen?: boolean;
   autoFocus?: boolean;
   virtualized?: boolean;
@@ -139,6 +140,7 @@ type Props<T, U extends boolean, V extends GroupBase<T>> = {
   noOptionsMessage?: () => string | JSX.Element | null;
   options: OptionsOrGroups<T, V>;
   filterOption?: SelectProps<T, U, V>["filterOption"];
+  menuPortalTarget?: SelectProps<T, U, V>["menuPortalTarget"];
   inputValue?: string;
   disabled?: boolean;
   isCollectionMode?: U;
@@ -203,7 +205,11 @@ function SelectInPopoverInner<T, U extends boolean, V extends GroupBase<T>>(
     otherSelectProps,
     forbidValuesClearInCollnMode,
     isOptionDisabled,
+    isSearchable = true,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    menuPortalTarget,
     popoverPlacement = "bottom-start",
+    ...rest
   } = props;
   const [visible, setVisible] = useControllableState({
     value: menuIsOpen,
@@ -381,9 +387,10 @@ function SelectInPopoverInner<T, U extends boolean, V extends GroupBase<T>>(
           {/*So in dom react-select will be a child of popover. */}
           <SelectControlSettingsProvider inPopover={true} getPopupContainerElement={undefined}>
             <ReactSelect<T, U, V>
+              {...rest}
               ref={selectRef}
               styles={styles}
-              isSearchable={true}
+              isSearchable={isSearchable}
               onKeyDown={onKeyDown}
               autoFocus={autoFocus}
               onBlur={onBlur}
@@ -408,6 +415,7 @@ function SelectInPopoverInner<T, U extends boolean, V extends GroupBase<T>>(
               isClearable={!isCollectionMode && isClearable}
               formatGroupLabel={formatGroupLabel}
               formatOptionLabel={formatOptionLabel}
+              menuShouldBlockScroll={false}
               {...otherSelectProps}
               components={selectComponents}
               forbidValuesClearInCollnMode={forbidValuesClearInCollnMode}

package/src/select/select.tsx

@@ -0,0 +1,288 @@
+/* eslint-disable no-use-before-define */
+import {useComposedRefs} from "@fibery/react/src/use-composed-refs";
+import {ForwardedRef, forwardRef, RefObject, useCallback, useMemo, useRef, useState} from "react";
+import BaseSelect, {
+  ActionMeta,
+  components as reactSelectComponents,
+  createFilter,
+  MenuListProps,
+  MenuProps,
+  ControlProps,
+  mergeStyles,
+  MultiValue,
+  MultiValueProps,
+  OnChangeValue,
+  OptionProps,
+  OptionsOrGroups,
+  Props as BaseSelectProps,
+  PropsValue,
+  SelectInstance,
+  SingleValue,
+  SingleValueProps,
+  StylesConfig,
+} from "react-select";
+import BaseCreatableSelect, {CreatableProps} from "react-select/creatable";
+import {ClearIndicator, NoClearIndicator} from "./components/clear-indicator";
+import {DropdownIndicator} from "./components/drop-down-indicator";
+import {GroupHeading} from "./components/group-heading";
+import {Menu} from "./components/menu";
+import {MenuListVirtualized} from "./components/menu-list-virtualized";
+import {NoOptionsMessage} from "./components/no-option-message";
+import {Option, OptionSlow} from "./components/option";
+import {useSelectControlSettings} from "./select-control-settings-context";
+import {makeComponentsStyles, makeNonVirtualizedStyles, makeVirtualizedStyles, makeZIndexStyles} from "./styles";
+import {countOptions, GroupBase, ReactSelectRefContext} from "./util";
+import _ from "lodash";
+
+export type {
+  ActionMeta,
+  GroupBase,
+  MenuListProps,
+  MenuProps,
+  ControlProps,
+  MultiValue,
+  MultiValueProps,
+  OnChangeValue,
+  OptionProps,
+  OptionsOrGroups,
+  PropsValue,
+  SingleValue,
+  SingleValueProps,
+  StylesConfig,
+  SelectInstance,
+  BaseSelectProps,
+};
+
+export {reactSelectComponents as components, MenuListVirtualized, createFilter};
+
+function GroupVirtualized() {
+  return null;
+}
+
+export function combineStyles<T, U extends boolean, V extends GroupBase<T>>(styles: StylesConfig<T, U, V>[]) {
+  return styles.reduce(mergeStyles, {});
+}
+
+export type SelectProps<T = unknown, U extends boolean = boolean, V extends GroupBase<T> = GroupBase<T>> = Omit<
+  Omit<Omit<BaseSelectProps<T, U, V>, "isMulti">, "backspaceRemovesValue">,
+  "isDisabled"
+> & {
+  virtualized?: boolean;
+  title?: string;
+  isCollectionMode?: U;
+  disabled?: boolean;
+  forbidValuesClearInCollnMode?: boolean;
+};
+
+const FAST_OPTION_USAGE_THRESHOLD = 200;
+
+function useSelectComponents<T, U extends boolean, V extends GroupBase<T>>({
+  components,
+  optionsCount,
+  virtualized,
+  isCollectionMode,
+  forbidValuesClearInCollnMode,
+}: {
+  components: SelectProps<T, U, V>["components"];
+  optionsCount: number;
+  virtualized: boolean;
+  isCollectionMode?: U;
+  forbidValuesClearInCollnMode?: boolean;
+}) {
+  const shouldUseFastOption = optionsCount > FAST_OPTION_USAGE_THRESHOLD;
+  const shouldHideMultiValueRemove = isCollectionMode && forbidValuesClearInCollnMode;
+
+  return {
+    Menu,
+    DropdownIndicator,
+    ClearIndicator,
+    MultiValueRemove: shouldHideMultiValueRemove ? NoClearIndicator : ClearIndicator,
+    NoOptionsMessage,
+    GroupHeading,
+    Option: shouldUseFastOption ? Option : OptionSlow,
+    ...components,
+    Group: virtualized ? GroupVirtualized : components?.Group ? components.Group : reactSelectComponents.Group,
+    MenuList: virtualized
+      ? MenuListVirtualized
+      : components?.MenuList
+      ? components.MenuList
+      : reactSelectComponents.MenuList,
+  };
+}
+
+function useSelectStyles<T, U extends boolean, V extends GroupBase<T>>({
+  virtualized,
+  zIndex,
+  styles,
+}: {
+  virtualized: boolean;
+  zIndex?: number;
+  styles?: SelectProps<T, U, V>["styles"];
+}) {
+  return useMemo(() => {
+    return combineStyles<T, U, V>(
+      _.compact([
+        makeComponentsStyles<T, U, V>(),
+        virtualized ? makeVirtualizedStyles<T, U, V>() : makeNonVirtualizedStyles<T, U, V>(),
+        zIndex ? makeZIndexStyles<T, U, V>(zIndex) : null,
+        styles,
+      ])
+    );
+  }, [styles, virtualized, zIndex]);
+}
+
+export const SelectComponent = forwardRef(function Select<
+  T = unknown,
+  U extends boolean = boolean,
+  V extends GroupBase<T> = GroupBase<T>
+>(
+  {
+    components,
+    isCollectionMode,
+    menuPortalTarget,
+    onKeyDown,
+    styles,
+    virtualized = true,
+    onMenuOpen,
+    onMenuClose,
+    onChange,
+    forbidValuesClearInCollnMode,
+    ...rest
+  }: SelectProps<T, U, V>,
+  forwardedRef: ForwardedRef<SelectInstance<T, U, V>>
+) {
+  const {getPopupContainerElement, zIndex} = useSelectControlSettings();
+  const [menuOpenState, setMenuOpenState] = useState(rest.defaultMenuIsOpen);
+  const optionsCount = useMemo(() => countOptions(rest.options), [rest.options]);
+
+  const onMenuOpenWrapped = useCallback(() => {
+    setMenuOpenState(true);
+    onMenuOpen && onMenuOpen();
+  }, [onMenuOpen]);
+
+  const onMenuCloseWrapped = useCallback(() => {
+    setMenuOpenState(false);
+    onMenuClose && onMenuClose();
+  }, [onMenuClose]);
+
+  const handleKeyDown: React.KeyboardEventHandler<HTMLInputElement> = useCallback(
+    (e) => {
+      switch (e.key) {
+        case "Escape":
+          // we can't rely on "menuIsOpen" prop here, as user may not pass this prop and rely on internal component behavior instead.
+          if (menuOpenState) {
+            e.stopPropagation();
+          }
+          break;
+        case "Home":
+          e.preventDefault();
+          if (e.shiftKey) {
+            (e.target as HTMLInputElement).selectionStart = 0;
+          } else {
+            (e.target as HTMLInputElement).setSelectionRange(0, 0);
+          }
+          break;
+        case "End": {
+          e.preventDefault();
+          const len = (e.target as HTMLInputElement).value.length;
+          if (e.shiftKey) {
+            (e.target as HTMLInputElement).selectionEnd = len;
+          } else {
+            (e.target as HTMLInputElement).setSelectionRange(len, len);
+          }
+          break;
+        }
+        default:
+      }
+      onKeyDown && onKeyDown(e);
+    },
+    [onKeyDown, menuOpenState]
+  );
+
+  const selectRef = useRef<SelectInstance<T, U, V> | null>(null);
+  const composedRef = useComposedRefs(forwardedRef, selectRef);
+
+  const selectComponents = useSelectComponents({
+    components,
+    optionsCount,
+    virtualized,
+    isCollectionMode,
+    forbidValuesClearInCollnMode,
+  });
+
+  const combinedStyles = useSelectStyles({virtualized, zIndex, styles});
+
+  return (
+    <ReactSelectRefContext.Provider value={selectRef as RefObject<SelectInstance>}>
+      <BaseSelect<T, U, V>
+        ref={composedRef}
+        // There are places, where it is useful to override menuPortalTarget globally for all selects.
+        // When you are already in some popup. e.g. user input in buttons, relation filter popover.
+        menuPortalTarget={getPopupContainerElement ? getPopupContainerElement() : menuPortalTarget}
+        menuPlacement={"auto"}
+        styles={combinedStyles}
+        isMulti={isCollectionMode}
+        backspaceRemovesValue={isCollectionMode && !forbidValuesClearInCollnMode}
+        tabSelectsValue={false}
+        components={selectComponents}
+        {...rest}
+        onKeyDown={handleKeyDown}
+        onMenuOpen={onMenuOpenWrapped}
+        onMenuClose={onMenuCloseWrapped}
+        onChange={rest.disabled ? undefined : onChange}
+        isDisabled={rest.disabled}
+      />
+    </ReactSelectRefContext.Provider>
+  );
+}) as <Option = unknown, IsMulti extends boolean = boolean, Group extends GroupBase<Option> = GroupBase<Option>>(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  props: SelectProps<Option, IsMulti, Group> & {ref?: any}
+) => JSX.Element;
+
+function CreatableSelectInner<T = unknown, U extends boolean = boolean, V extends GroupBase<T> = GroupBase<T>>(
+  {
+    components,
+    isCollectionMode,
+    menuPortalTarget,
+    styles = {},
+    virtualized = true,
+    forbidValuesClearInCollnMode,
+    ...rest
+  }: CreatableProps<T, U, V> & SelectProps<T, U, V>,
+  ref: ForwardedRef<SelectInstance<T, U, V>>
+) {
+  const optionsCount = useMemo(() => countOptions(rest.options), [rest.options]);
+
+  const selectComponents = useSelectComponents({
+    components,
+    optionsCount,
+    virtualized,
+    isCollectionMode,
+    forbidValuesClearInCollnMode,
+  });
+
+  const combinedStyles = useSelectStyles({virtualized, styles});
+
+  return (
+    <BaseCreatableSelect
+      ref={ref}
+      menuPortalTarget={menuPortalTarget}
+      menuPlacement={"auto"}
+      styles={combinedStyles}
+      isMulti={isCollectionMode}
+      backspaceRemovesValue={isCollectionMode}
+      tabSelectsValue={false}
+      components={selectComponents}
+      {...rest}
+      isDisabled={rest.disabled}
+    />
+  );
+}
+
+export const CreatableSelect = forwardRef(CreatableSelectInner) as <
+  T = unknown,
+  U extends boolean = boolean,
+  V extends GroupBase<T> = GroupBase<T>
+>(
+  props: CreatableProps<T, U, V> & SelectProps<T, U, V>
+) => ReturnType<typeof CreatableSelectInner>;

package/src/toast/toast.tsx

@@ -48,7 +48,7 @@ const rootCss = css`
   box-sizing: border-box;
   min-height: 44px;
   min-width: 320px;
-  max-width: min(calc(100vw - 40px), 400px);
+  max-width: min(calc(100vw - 40px), 480px);
 `;
 
 const rootLineCss = css`

package/src/toggle-button/toggle-button.tsx

@@ -13,8 +13,6 @@ export const toggleButtonCss = css`
   box-sizing: border-box;
   display: flex;
   align-items: center;
-  min-height: 24px;
-  font-size: ${textStyles.small.fontSize}px;
   border-radius: ${border.radius8}px;
 
   transition-property: border, background-color, color, opacity, box-shadow;
@@ -23,8 +21,6 @@ export const toggleButtonCss = css`
   color: ${themeVars.textColor};
   ${iconColorVar}: ${themeVars.colorIconButtonGhostNeutral};
 
-  ${iconSizeVar}: 16px;
-
   border: 1.5px solid ${themeVars.colorBorderReactionsHover};
   background-color: ${themeVars.colorBgReactionsDefault};
 
@@ -37,13 +33,29 @@ export const toggleButtonCss = css`
   line-height: 16px;
   user-select: none;
 
+  &[data-size="small"] {
+    font-size: ${textStyles.small.fontSize}px;
+    line-height: 16px;
+    min-height: 24px;
+
+    ${iconSizeVar}: 16px;
+  }
+
   &[data-size="medium"] {
+    font-size: ${textStyles.regular.fontSize}px;
+    line-height: 20px;
     min-height: 28px;
+
+    ${iconSizeVar}: 18px;
   }
 
   &[data-size="large"] {
+    font-size: ${textStyles.regular.fontSize}px;
+    line-height: 20px;
     min-height: 32px;
     padding-inline: 7px;
+
+    ${iconSizeVar}: 18px;
   }
 
   &:not(:disabled, [aria-readonly="true"]) {

package/src/toggle-on-off.tsx

@@ -3,6 +3,7 @@ import {FC, ComponentProps, useMemo} from "react";
 import {ThemeColors} from "./design-system";
 import {useTheme} from "./theme-provider";
 import {Toggle} from "./toggle";
+import {useIsPhone} from "./use-is-phone";
 
 const getBackgroundColors = (accentColor: string | undefined, theme: ThemeColors) => {
   return accentColor && chroma.valid(accentColor)
@@ -21,9 +22,17 @@ interface ToggleOnOffProps extends Omit<ComponentProps<typeof Toggle>, "backgrou
 }
 
 export const ToggleOnOff: FC<ToggleOnOffProps> = ({value, color, ...rest}) => {
+  const isPhone = useIsPhone();
   const theme = useTheme();
   const {enabledColor, disabledColor} = useMemo(() => getBackgroundColors(color, theme), [color, theme]);
-  return <Toggle value={Boolean(value)} backgroundColor={value ? enabledColor : disabledColor} {...rest} />;
+  return (
+    <Toggle
+      value={Boolean(value)}
+      size={isPhone ? "large" : "medium"}
+      backgroundColor={value ? enabledColor : disabledColor}
+      {...rest}
+    />
+  );
 };
 
 interface ReduxFormToggleOnOffProps extends ToggleOnOffProps {