@vkontakte/vkui 4.35.3 → 4.36.0

package/src/components/ChipsInputBase/ChipsInputBase.css

@@ -0,0 +1,73 @@
+.ChipsInputBase {
+  flex-grow: 1;
+  flex-shrink: 1;
+  position: relative;
+  display: flex;
+  flex-wrap: wrap;
+  max-width: 100%;
+  padding: 3px;
+  z-index: 6;
+  overflow: hidden;
+}
+
+.ChipsInputBase__chip {
+  max-width: 100%;
+  margin: 2px;
+}
+
+.ChipsInputBase__label {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  margin: 2px;
+  margin-left: 10px;
+}
+
+.ChipsInputBase__el {
+  position: relative;
+  width: 100%;
+  margin-bottom: 2px;
+  padding: 0;
+  /* Визуальная компенсация - центрируем строчные буквы */
+  font-size: 15px;
+  line-height: 26px;
+  color: var(--text_primary, var(--vkui--color_text_primary));
+  background: transparent;
+  border: none;
+  box-shadow: none;
+  appearance: none;
+  z-index: 2;
+}
+
+.ChipsInputBase__el:focus {
+  min-width: 64px;
+}
+
+.ChipsInputBase__el::-ms-clear {
+  display: none;
+}
+
+.ChipsInputBase__el:disabled {
+  opacity: var(--vkui--opacity_disable_accessibility);
+}
+
+.ChipsInputBase__el::placeholder {
+  color: var(--field_text_placeholder, var(--vkui--color_text_secondary));
+  /* Для Firefox */
+  opacity: 1;
+}
+
+.ChipsInputBase__el:disabled::placeholder {
+  color: var(--text_secondary, var(--vkui--color_text_secondary));
+}
+
+.ChipsInputBase__el[readonly] {
+  cursor: default;
+}
+
+/**
+ * sizeY COMPACT
+ */
+.ChipsInputBase--sizeY-compact {
+  padding: 1px;
+}

package/src/components/ChipsInputBase/ChipsInputBase.tsx

@@ -0,0 +1,206 @@
+import * as React from "react";
+import { HasAlign, HasRef, HasRootRef } from "../../types";
+import { classNames } from "../../lib/classNames";
+import { Chip, ChipOption, ChipValue, RenderChip } from "../Chip/Chip";
+import { noop } from "../../lib/utils";
+import { useChipsInput } from "../../hooks/useChipsInput";
+import { useAdaptivity } from "../../hooks/useAdaptivity";
+import { prefixClass } from "../../lib/prefixClass";
+import { useExternRef } from "../../hooks/useExternRef";
+import "./ChipsInputBase.css";
+
+export interface ChipsInputBaseProps<Option extends ChipOption>
+  extends Omit<
+      React.InputHTMLAttributes<HTMLInputElement>,
+      "value" | "onChange"
+    >,
+    HasRef<HTMLInputElement>,
+    HasRootRef<HTMLDivElement>,
+    HasAlign {
+  value: Option[];
+  inputValue?: string;
+  onChange?: (o: Option[]) => void;
+  onInputChange?: (e?: React.ChangeEvent<HTMLInputElement>) => void;
+  getOptionValue?: (o?: Option) => ChipValue;
+  getOptionLabel?: (o?: Option) => string;
+  getNewOptionData?: (v?: ChipValue, l?: string) => Option;
+  renderChip?: (props?: RenderChip<Option>) => React.ReactNode;
+  inputAriaLabel?: string;
+}
+
+export const chipsInputDefaultProps: ChipsInputBaseProps<any> = {
+  onChange: noop,
+  onInputChange: noop,
+  onKeyDown: noop,
+  onBlur: noop,
+  onFocus: noop,
+  value: [],
+  inputValue: "",
+  inputAriaLabel: "Введите ваше значение...",
+  getOptionValue: (option) => option.value,
+  getOptionLabel: (option) => option.label,
+  getNewOptionData: (_, label) => ({
+    value: label,
+    label,
+  }),
+  renderChip(props) {
+    if (!props) {
+      return null;
+    }
+
+    const { disabled, value, label, ...rest } = props;
+    return (
+      <Chip value={value} removable={!disabled} {...rest}>
+        {label}
+      </Chip>
+    );
+  },
+};
+
+export const ChipsInputBase = <Option extends ChipOption>(
+  props: ChipsInputBaseProps<Option>
+) => {
+  const propsWithDefault = { ...chipsInputDefaultProps, ...props };
+  const {
+    style,
+    className,
+    getRootRef,
+    value,
+    onChange,
+    onInputChange,
+    onKeyDown,
+    onBlur,
+    onFocus,
+    children,
+    inputValue,
+    getRef,
+    placeholder,
+    getOptionValue,
+    getOptionLabel,
+    getNewOptionData,
+    renderChip,
+    inputAriaLabel,
+    ...restProps
+  } = propsWithDefault;
+  const { sizeY } = useAdaptivity();
+
+  const [focused, setFocused] = React.useState(false);
+  const {
+    fieldValue,
+    addOptionFromInput,
+    removeOption,
+    selectedOptions,
+    handleInputChange,
+  } = useChipsInput(propsWithDefault);
+  const inputRef = useExternRef(getRef);
+
+  const isDisabled = restProps.disabled || restProps.readOnly;
+
+  const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    if (isDisabled) {
+      e.preventDefault();
+      return;
+    }
+
+    onKeyDown!(e);
+
+    if (
+      e.key === "Backspace" &&
+      !e.defaultPrevented &&
+      !fieldValue &&
+      selectedOptions.length
+    ) {
+      removeOption(
+        getOptionValue!(selectedOptions[selectedOptions.length - 1])
+      );
+      e.preventDefault();
+    }
+
+    if (e.key === "Enter" && !e.defaultPrevented && fieldValue) {
+      addOptionFromInput();
+      e.preventDefault();
+    }
+  };
+
+  const handleBlur = (e: React.FocusEvent<HTMLInputElement>) => {
+    if (focused) {
+      setFocused(false);
+    }
+    onBlur!(e);
+  };
+
+  const handleFocus = (e: React.FocusEvent<HTMLInputElement>) => {
+    if (!focused) {
+      setFocused(true);
+    }
+    onFocus!(e);
+  };
+
+  const handleChipRemove = (
+    _: React.MouseEvent | undefined,
+    value: ChipValue | undefined
+  ) => {
+    if (value !== undefined) {
+      removeOption(value);
+    }
+  };
+
+  const handleClick = (e: React.MouseEvent<HTMLDivElement>) => {
+    if (isDisabled) {
+      e.preventDefault();
+      return;
+    }
+
+    if (inputRef?.current !== null && !focused) {
+      inputRef.current.focus();
+    }
+  };
+
+  return (
+    <div
+      vkuiClass={classNames("ChipsInputBase", `ChipsInputBase--sizeY-${sizeY}`)}
+      onClick={handleClick}
+      role="presentation"
+      style={style}
+      className={className}
+      ref={getRootRef}
+    >
+      {selectedOptions.map((option: Option) => {
+        const value = getOptionValue!(option);
+        const label = getOptionLabel!(option);
+
+        return (
+          <React.Fragment key={`${typeof value}-${value}`}>
+            {renderChip!({
+              option,
+              value,
+              label,
+              onRemove: handleChipRemove,
+              disabled: Boolean(restProps.disabled),
+              className: prefixClass("ChipsInputBase__chip"),
+            })}
+          </React.Fragment>
+        );
+      })}
+      <label vkuiClass="ChipsInputBase__label" aria-label={inputAriaLabel}>
+        <input
+          type="text"
+          autoCapitalize="none"
+          autoComplete="off"
+          autoCorrect="off"
+          spellCheck={false}
+          aria-autocomplete="list"
+          vkuiClass="ChipsInputBase__el"
+          {...restProps}
+          ref={inputRef}
+          value={fieldValue}
+          onChange={handleInputChange}
+          onKeyDown={handleKeyDown}
+          onFocus={handleFocus}
+          onBlur={handleBlur}
+          placeholder={selectedOptions.length ? undefined : placeholder}
+        />
+      </label>
+    </div>
+  );
+};

package/src/components/ChipsSelect/ChipsSelect.css

@@ -2,6 +2,14 @@
   position: relative;
 }
 
+.ChipsSelect__dropdown {
+  cursor: pointer;
+}
+
+.ChipsSelect__icon {
+  pointer-events: none;
+}
+
 .ChipsSelect__empty {
   padding: 12px 0;
   text-align: center;

package/src/components/ChipsSelect/ChipsSelect.tsx

@@ -1,20 +1,17 @@
 import * as React from "react";
 import { DropdownIcon } from "../DropdownIcon/DropdownIcon";
 import { classNames } from "../../lib/classNames";
+import { ChipOption, ChipValue, RenderChip } from "../Chip/Chip";
+import { ChipsInputProps } from "../ChipsInput/ChipsInput";
 import {
-  ChipsInput,
-  ChipsInputOption,
-  ChipsInputProps,
-  ChipsInputValue,
-  RenderChip,
+  ChipsInputBase,
   chipsInputDefaultProps,
-} from "../ChipsInput/ChipsInput";
+} from "../ChipsInputBase/ChipsInputBase";
 import {
   CustomSelectOption,
   CustomSelectOptionProps,
 } from "../CustomSelectOption/CustomSelectOption";
-import { useChipsSelect } from "./useChipsSelect";
-import { withAdaptivity, AdaptivityProps } from "../../hoc/withAdaptivity";
+import { useChipsSelect } from "../../hooks/useChipsSelect";
 import { noop } from "../../lib/utils";
 import { useDOM } from "../../lib/dom";
 import { Caption } from "../Typography/Caption/Caption";
@@ -24,11 +21,12 @@ import { useGlobalEventListener } from "../../hooks/useGlobalEventListener";
 import { defaultFilterFn } from "../../lib/select";
 import { Placement } from "../Popper/Popper";
 import { CustomSelectDropdown } from "../CustomSelectDropdown/CustomSelectDropdown";
+import { FormField } from "../FormField/FormField";
+import { IconButton } from "../IconButton/IconButton";
 import "./ChipsSelect.css";
 
-export interface ChipsSelectProps<Option extends ChipsInputOption>
-  extends ChipsInputProps<Option>,
-    AdaptivityProps {
+export interface ChipsSelectProps<Option extends ChipOption>
+  extends Omit<ChipsInputProps<Option>, "after"> {
   popupDirection?: "top" | "bottom";
   options?: Option[];
   filterFn?:
@@ -96,7 +94,10 @@ const chipsSelectDefaultProps: ChipsSelectProps<any> = {
   },
 };
 
-const ChipsSelectComponent = <Option extends ChipsInputOption>(
+/**
+ * @see https://vkcom.github.io/VKUI/#/ChipsSelect
+ */
+export const ChipsSelect = <Option extends ChipOption>(
   props: ChipsSelectProps<Option>
 ) => {
   const propsWithDefault = { ...chipsSelectDefaultProps, ...props };
@@ -123,10 +124,9 @@ const ChipsSelectComponent = <Option extends ChipsInputOption>(
     filterFn,
     inputValue,
     creatableText,
-    sizeY,
     closeAfterSelect,
     onChangeStart,
-    after,
+    before,
     options,
     ...restProps
   } = propsWithDefault;
@@ -166,11 +166,9 @@ const ChipsSelectComponent = <Option extends ChipsInputOption>(
   };
 
   const handleClickOutside = (e: MouseEvent) => {
-    const { current: rootNode } = rootRef;
     if (
-      rootNode &&
-      e.target !== rootNode &&
-      !rootNode.contains(e.target as Node)
+      e.target !== rootRef.current &&
+      !rootRef.current?.contains(e.target as Node)
     ) {
       setOpened(false);
     }
@@ -323,7 +321,7 @@ const ChipsSelectComponent = <Option extends ChipsInputOption>(
     }
     const onRemoveWrapper = (
       e: React.MouseEvent | undefined,
-      value: ChipsInputValue | undefined
+      value: ChipValue | undefined
     ) => {
       e?.preventDefault();
       e?.stopPropagation();
@@ -355,14 +353,39 @@ const ChipsSelectComponent = <Option extends ChipsInputOption>(
     [rootRef, scrollBoxRef]
   );
 
+  const toggleOpened = () => {
+    setOpened((prevOpened) => !prevOpened);
+  };
+
   return (
-    <div
-      vkuiClass={classNames("ChipsSelect", `ChipsSelect--sizeY-${sizeY}`)}
-      ref={rootRef}
+    <FormField
+      vkuiClass={classNames(
+        "ChipsSelect",
+        opened && "Select--open",
+        opened && (isPopperDirectionTop ? "Select--pop-up" : "Select--pop-down")
+      )}
+      getRootRef={rootRef}
       style={style}
       className={className}
+      disabled={disabled}
+      role="application"
+      aria-disabled={disabled}
+      aria-readonly={restProps.readOnly}
+      after={
+        <IconButton
+          vkuiClass="ChipsSelect__dropdown"
+          activeMode=""
+          hoverMode=""
+          // TODO: add label customization
+          aria-label={opened ? "Скрыть" : "Развернуть"}
+          onClick={toggleOpened}
+        >
+          <DropdownIcon vkuiClass="ChipsSelect__icon" opened={opened} />
+        </IconButton>
+      }
+      before={before}
     >
-      <ChipsInput
+      <ChipsInputBase
         {...restProps}
         tabIndex={tabIndex}
         value={selectedOptions}
@@ -374,15 +397,9 @@ const ChipsSelectComponent = <Option extends ChipsInputOption>(
         onFocus={handleFocus}
         onKeyDown={handleKeyDown}
         placeholder={placeholder}
-        vkuiClass={classNames(
-          opened && "Select--open",
-          opened &&
-            (isPopperDirectionTop ? "Select--pop-up" : "Select--pop-down")
-        )}
         getRef={getRef}
         disabled={disabled}
         onInputChange={handleInputChange}
-        after={<DropdownIcon />}
       />
       {opened && (
         <CustomSelectDropdown
@@ -452,15 +469,6 @@ const ChipsSelectComponent = <Option extends ChipsInputOption>(
           )}
         </CustomSelectDropdown>
       )}
-    </div>
+    </FormField>
   );
 };
-
-/**
- * @see https://vkcom.github.io/VKUI/#/ChipsSelect
- */
-export const ChipsSelect = withAdaptivity(ChipsSelectComponent, {
-  sizeY: true,
-});
-
-ChipsSelect.displayName = "ChipsSelect";

package/src/components/CustomSelect/CustomSelect.css

@@ -2,6 +2,7 @@
   width: 100%;
   position: relative;
   display: block;
+  cursor: pointer;
 }
 
 .CustomSelect__control {

package/src/components/CustomSelect/CustomSelect.tsx

@@ -101,7 +101,6 @@ const filter = (
 };
 
 const defaultOptions: CustomSelectOptionInterface[] = [];
-const defaultIcon = <DropdownIcon />;
 
 type SelectValue = React.SelectHTMLAttributes<HTMLSelectElement>["value"];
 
@@ -175,6 +174,7 @@ export interface CustomSelectProps
 type MouseEventHandler = (event: React.MouseEvent<HTMLElement>) => void;
 
 function CustomSelectComponent(props: CustomSelectProps) {
+  const [opened, setOpened] = React.useState(false);
   const {
     before,
     name,
@@ -201,7 +201,7 @@ function CustomSelectComponent(props: CustomSelectProps) {
     options: optionsProp = defaultOptions,
     emptyText = "Ничего не найдено",
     filterFn = defaultFilterFn,
-    icon = defaultIcon,
+    icon = <DropdownIcon opened={opened} />,
     dropdownOffsetDistance = 0,
     fixDropdownWidth = true,
     ...restProps
@@ -233,7 +233,6 @@ function CustomSelectComponent(props: CustomSelectProps) {
   const [selectedOptionIndex, setSelectedOptionIndex] = React.useState<
     number | undefined
   >(findSelectedIndex(optionsProp, props.value ?? props.defaultValue));
-  const [opened, setOpened] = React.useState(false);
 
   React.useEffect(() => {
     setIsControlledOutside(props.value !== undefined);

package/src/components/CustomSelect/Readme.md

@@ -154,7 +154,11 @@ const CustomSearchLogicSelect = () => {
       onInputChange={onCustomSearchInputChange}
       renderOption={({ option, ...restProps }) => (
         <CustomSelectOption
-          style={option.value === "0" ? { color: "var(--accent)" } : {}}
+          style={
+            option.value === "0"
+              ? { color: "var(--vkui--color_background_accent)" }
+              : {}
+          }
           {...restProps}
         >
           {option.label}
@@ -263,7 +267,9 @@ const AsyncCustomSelect = () => {
   const renderDropdown = ({ defaultDropdownContent }) => {
     if (remoteQuery.length < 3) {
       return (
-        <Text style={{ padding: 12, color: "var(--text_secondary)" }}>
+        <Text
+          style={{ padding: 12, color: "var(--vkui--color_text_secondary)" }}
+        >
           Нужно ввести хотя бы три символа
         </Text>
       );

package/src/components/DateInput/DateInput.css

@@ -3,7 +3,7 @@
   margin-left: 10px;
   margin-right: 14px;
   font-size: 16px;
-  z-index: 2;
+  z-index: 6;
   cursor: text;
   white-space: nowrap;
   user-select: text;

package/src/components/DateInput/DateInput.tsx

@@ -6,7 +6,7 @@ import { Popper, Placement } from "../Popper/Popper";
 import { multiRef } from "../../lib/utils";
 import { IconButton } from "../IconButton/IconButton";
 import { classNames } from "../../lib/classNames";
-import { FormField } from "../FormField/FormField";
+import { FormField, FormFieldProps } from "../FormField/FormField";
 import { HasRootRef } from "../../types";
 import { useDateInput } from "../../hooks/useDateInput";
 import { InputLike } from "../InputLike/InputLike";
@@ -47,11 +47,13 @@ export interface DateInputProps
       | "prevMonthIcon"
       | "nextMonthIcon"
     >,
-    HasRootRef<HTMLDivElement> {
+    HasRootRef<HTMLDivElement>,
+    FormFieldProps {
   calendarPlacement?: Placement;
   closeOnChange?: boolean;
   clearFieldAriaLabel?: string;
   showCalendarAriaLabel?: string;
+  disableCalendar?: boolean;
 }
 
 const elementsConfig = (index: number) => {
@@ -133,6 +135,7 @@ export const DateInput = ({
   onPrevMonth,
   prevMonthIcon,
   nextMonthIcon,
+  disableCalendar = false,
   ...props
 }: DateInputProps) => {
   const daysRef = React.useRef<HTMLSpanElement>(null);
@@ -298,7 +301,7 @@ export const DateInput = ({
           </React.Fragment>
         )}
       </span>
-      {open && (
+      {open && !disableCalendar && (
         <Popper
           targetRef={rootRef}
           offsetDistance={8}

package/src/components/DateInput/Readme.md

@@ -1,5 +1,8 @@
 Компонент выбора даты.
 
+- Если нужен календарь без поля ввода, используйте [Calendar](#!/Calendar).
+- Если нужен выбор диапазона дат, используйте [DateRangeInput](#!/DateRangeInput).
+
 > ⚠️ Данный компонент предназначен для использования на desktop. При использовании на ios/android работа компонента не гарантируется
 
 ```jsx { "props": { "layout": false, "iframe": false } }
@@ -13,6 +16,7 @@ const Example = () => {
   const [disablePickers, setDisablePickers] = useState(false);
   const [closeOnChange, setCloseOnChange] = useState(true);
   const [showNeighboringMonth, setShowNeighboringMonth] = useState(false);
+  const [disableCalendar, setDisableCalendar] = useState(false);
   const [locale, setLocale] = useState("ru");
 
   return (
@@ -66,6 +70,14 @@ const Example = () => {
             Включено
           </Checkbox>
         </FormItem>
+        <FormItem top="Отключить отображение выпадающего календаря">
+          <Checkbox
+            checked={disableCalendar}
+            onChange={(e) => setDisableCalendar(e.target.checked)}
+          >
+            Включено
+          </Checkbox>
+        </FormItem>
         <FormItem top="Локаль">
           <Select
             style={{ width: 100 }}
@@ -103,6 +115,7 @@ const Example = () => {
                 closeOnChange={closeOnChange}
                 disablePickers={disablePickers}
                 showNeighboringMonth={showNeighboringMonth}
+                disableCalendar={disableCalendar}
               />
             </LocaleProviderContext.Provider>
           </div>

package/src/components/DateRangeInput/DateRangeInput.css

@@ -3,7 +3,7 @@
   margin-left: 10px;
   margin-right: 14px;
   font-size: 16px;
-  z-index: 2;
+  z-index: 6;
   cursor: text;
   white-space: nowrap;
   user-select: text;

package/src/components/DateRangeInput/DateRangeInput.tsx

@@ -12,7 +12,7 @@ import { useDateInput } from "../../hooks/useDateInput";
 import { useAdaptivity } from "../../hooks/useAdaptivity";
 import { classNames } from "../../lib/classNames";
 import { multiRef } from "../../lib/utils";
-import { FormField } from "../FormField/FormField";
+import { FormField, FormFieldProps } from "../FormField/FormField";
 import { InputLike } from "../InputLike/InputLike";
 import { InputLikeDivider } from "../InputLike/InputLikeDivider";
 import { callMultiple } from "../../lib/callMultiple";
@@ -37,7 +37,8 @@ export interface DateRangeInputProps
       | "prevMonthIcon"
       | "nextMonthIcon"
     >,
-    HasRootRef<HTMLDivElement> {
+    HasRootRef<HTMLDivElement>,
+    FormFieldProps {
   calendarPlacement?: Placement;
   closeOnChange?: boolean;
   clearFieldAriaLabel?: string;
@@ -48,6 +49,7 @@ export interface DateRangeInputProps
   changeEndDayAriaLabel?: string;
   changeEndMonthAriaLabel?: string;
   changeEndYearAriaLabel?: string;
+  disableCalendar?: boolean;
 }
 
 const elementsConfig = (index: number) => {
@@ -125,6 +127,7 @@ export const DateRangeInput = ({
   showCalendarAriaLabel = "Показать календарь",
   prevMonthIcon,
   nextMonthIcon,
+  disableCalendar = false,
   ...props
 }: DateRangeInputProps) => {
   const daysStartRef = React.useRef<HTMLSpanElement>(null);
@@ -329,7 +332,7 @@ export const DateRangeInput = ({
           aria-label={changeEndYearAriaLabel}
         />
       </span>
-      {open && (
+      {open && !disableCalendar && (
         <Popper
           targetRef={rootRef}
           offsetDistance={8}