@vkontakte/vkui 4.22.0 → 4.24.0

package/dist/cjs/components/CustomScrollView/CustomScrollView.js

@@ -49,7 +49,7 @@ var CustomScrollView = /*#__PURE__*/function (_React$Component) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "clientHeight", 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "trackerHeight", 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "scrollHeight", 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "transformProp", '');
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "transformProp", "");
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "startY", 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "trackerTop", 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "box", (0, _utils.multiRef)(function (e) {
@@ -68,9 +68,9 @@ var CustomScrollView = /*#__PURE__*/function (_React$Component) {
       _this.trackerHeight = trackerHeight;
 
       if (ratio >= 1) {
-        _this.barY.current.style.display = 'none';
+        _this.barY.current.style.display = "none";
       } else {
-        _this.barY.current.style.display = '';
+        _this.barY.current.style.display = "";
         _this.trackerY.current.style.height = "".concat(trackerHeight, "px");
 
         _this.setTrackerPositionFromScroll(_this.box.current.scrollTop);
@@ -88,9 +88,9 @@ var CustomScrollView = /*#__PURE__*/function (_React$Component) {
       _this.startY = e.clientY;
       _this.trackerTop = _this.lastTrackerTop;
 
-      _this.props.document.addEventListener('mousemove', _this.onMove);
+      _this.props.document.addEventListener("mousemove", _this.onMove);
 
-      _this.props.document.addEventListener('mouseup', _this.onUp);
+      _this.props.document.addEventListener("mouseup", _this.onUp);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onMove", function (e) {
       e.preventDefault();
@@ -102,9 +102,9 @@ var CustomScrollView = /*#__PURE__*/function (_React$Component) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onUp", function (e) {
       e.preventDefault();
 
-      _this.props.document.removeEventListener('mousemove', _this.onMove);
+      _this.props.document.removeEventListener("mousemove", _this.onMove);
 
-      _this.props.document.removeEventListener('mouseup', _this.onUp);
+      _this.props.document.removeEventListener("mouseup", _this.onUp);
     });
     return _this;
   }
@@ -116,7 +116,7 @@ var CustomScrollView = /*#__PURE__*/function (_React$Component) {
       this.resize();
 
       if (this.props.windowResize) {
-        this.props.window.addEventListener('resize', this.resize);
+        this.props.window.addEventListener("resize", this.resize);
       }
     }
   }, {
@@ -127,18 +127,18 @@ var CustomScrollView = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      this.props.window.removeEventListener('resize', this.resize);
+      this.props.window.removeEventListener("resize", this.resize);
     }
   }, {
     key: "chooseTransformProp",
     value: function chooseTransformProp() {
       var style = this.trackerY.current.style;
-      var prop = '';
+      var prop = "";
 
-      if ('transform' in style) {
-        prop = 'transform';
-      } else if ('webkitTransform' in style) {
-        prop = 'webkitTransform';
+      if ("transform" in style) {
+        prop = "transform";
+      } else if ("webkitTransform" in style) {
+        prop = "webkitTransform";
       }
 
       this.transformProp = prop;
@@ -164,8 +164,12 @@ var CustomScrollView = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
+      var _this$props = this.props,
+          children = _this$props.children,
+          className = _this$props.className;
       return (0, _jsxRuntime.createScopedElement)("div", {
-        vkuiClass: "CustomScrollView"
+        vkuiClass: "CustomScrollView",
+        className: className
       }, (0, _jsxRuntime.createScopedElement)("div", {
         vkuiClass: "CustomScrollView__barY",
         ref: this.barY
@@ -178,7 +182,7 @@ var CustomScrollView = /*#__PURE__*/function (_React$Component) {
         tabIndex: -1,
         ref: this.box,
         onScroll: this.scroll
-      }, this.props.children));
+      }, children));
     }
   }]);
   return CustomScrollView;

package/dist/cjs/components/CustomScrollView/CustomScrollView.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/components/CustomScrollView/CustomScrollView.tsx"],"names":["CustomScrollView","NaN","e","props","boxRef","React","createRef","clientHeight","box","current","scrollHeight","ratio","trackerHeight","Math","max","barY","style","display","trackerY","height","setTrackerPositionFromScroll","scrollTop","preventDefault","startY","clientY","trackerTop","lastTrackerTop","document","addEventListener","onMove","onUp","diff","position","min","setScrollPositionFromTracker","removeEventListener","chooseTransformProp","resize","windowResize","window","prop","transformProp","progress","setTrackerPosition","onDragStart","scroll","children","Component"],"mappings":"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","sourcesContent":["import * as React from 'react';\nimport { DOMProps, withDOM } from '../../lib/dom';\nimport { multiRef, setRef } from '../../lib/utils';\nimport './CustomScrollView.css';\n\ninterface Props extends DOMProps {\n  windowResize?: boolean;\n  boxRef: React.Ref<HTMLDivElement>;\n}\n\nclass CustomScrollView extends React.Component<Props> {\n  private ratio = NaN;\n  private lastTrackerTop = 0;\n  private clientHeight = 0;\n  private trackerHeight = 0;\n  private scrollHeight = 0;\n  private transformProp = '';\n\n  private startY = 0;\n  private trackerTop = 0;\n\n  private readonly box = multiRef<HTMLDivElement>((e) => setRef(e, this.props.boxRef));\n  private readonly barY = React.createRef<HTMLDivElement>();\n  private readonly trackerY = React.createRef<HTMLDivElement>();\n\n  componentDidMount() {\n    this.chooseTransformProp();\n\n    this.resize();\n\n    if (this.props.windowResize) {\n      this.props.window.addEventListener('resize', this.resize);\n    }\n  }\n\n  componentDidUpdate() {\n    this.resize();\n  }\n\n  componentWillUnmount() {\n    this.props.window.removeEventListener('resize', this.resize);\n  }\n\n  chooseTransformProp() {\n    let style = this.trackerY.current.style;\n    let prop = '';\n\n    if ('transform' in style) {\n      prop = 'transform';\n    } else if ('webkitTransform' in style) {\n      prop = 'webkitTransform';\n    }\n\n    this.transformProp = prop;\n  }\n\n  resize = () => {\n    const clientHeight = this.box.current.clientHeight;\n    const scrollHeight = this.box.current.scrollHeight;\n    let ratio = clientHeight / scrollHeight;\n    let trackerHeight = Math.max(clientHeight * ratio, 40);\n\n    this.ratio = ratio;\n    this.clientHeight = clientHeight;\n    this.scrollHeight = scrollHeight;\n    this.trackerHeight = trackerHeight;\n\n    if (ratio >= 1) {\n      this.barY.current.style.display = 'none';\n    } else {\n      this.barY.current.style.display = '';\n      this.trackerY.current.style.height = `${trackerHeight}px`;\n\n      this.setTrackerPositionFromScroll(this.box.current.scrollTop);\n    }\n  };\n\n  scroll = () => {\n    if (this.ratio >= 1) {\n      return;\n    }\n\n    this.setTrackerPositionFromScroll(this.box.current.scrollTop);\n  };\n\n  setTrackerPosition(scrollTop: number) {\n    this.lastTrackerTop = scrollTop;\n    (this.trackerY.current.style as any)[this.transformProp] = `translate(0, ${scrollTop}px)`;\n  }\n\n  setTrackerPositionFromScroll(scrollTop: number) {\n    const progress = scrollTop / (this.scrollHeight - this.clientHeight);\n    this.setTrackerPosition((this.clientHeight - this.trackerHeight) * progress);\n  }\n\n  setScrollPositionFromTracker(trackerTop: number) {\n    const progress = trackerTop / (this.clientHeight - this.trackerHeight);\n    this.box.current.scrollTop = (this.scrollHeight - this.clientHeight) * progress;\n  }\n\n  onDragStart = (e: React.MouseEvent) => {\n    e.preventDefault();\n    this.startY = e.clientY;\n    this.trackerTop = this.lastTrackerTop;\n\n    this.props.document.addEventListener('mousemove', this.onMove);\n    this.props.document.addEventListener('mouseup', this.onUp);\n  };\n\n  onMove = (e: MouseEvent) => {\n    e.preventDefault();\n    const diff = e.clientY - this.startY;\n    const position = Math.min(Math.max(this.trackerTop + diff, 0), this.clientHeight - this.trackerHeight);\n\n    this.setScrollPositionFromTracker(position);\n  };\n\n  onUp = (e: MouseEvent) => {\n    e.preventDefault();\n    this.props.document.removeEventListener('mousemove', this.onMove);\n    this.props.document.removeEventListener('mouseup', this.onUp);\n  };\n\n  render() {\n    return <div vkuiClass=\"CustomScrollView\">\n      <div vkuiClass=\"CustomScrollView__barY\" ref={this.barY}>\n        <div vkuiClass=\"CustomScrollView__trackerY\" ref={this.trackerY} onMouseDown={this.onDragStart} />\n      </div>\n\n      <div vkuiClass=\"CustomScrollView__box\" tabIndex={-1} ref={this.box} onScroll={this.scroll}>\n        {this.props.children}\n      </div>\n    </div>;\n  }\n}\n\nexport default withDOM(CustomScrollView);\n"],"file":"CustomScrollView.js"}
+{"version":3,"sources":["../../../../src/components/CustomScrollView/CustomScrollView.tsx"],"names":["CustomScrollView","NaN","e","props","boxRef","React","createRef","clientHeight","box","current","scrollHeight","ratio","trackerHeight","Math","max","barY","style","display","trackerY","height","setTrackerPositionFromScroll","scrollTop","preventDefault","startY","clientY","trackerTop","lastTrackerTop","document","addEventListener","onMove","onUp","diff","position","min","setScrollPositionFromTracker","removeEventListener","chooseTransformProp","resize","windowResize","window","prop","transformProp","progress","setTrackerPosition","children","className","onDragStart","scroll","Component"],"mappings":"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","sourcesContent":["import * as React from \"react\";\nimport { DOMProps, withDOM } from \"../../lib/dom\";\nimport { multiRef, setRef } from \"../../lib/utils\";\nimport \"./CustomScrollView.css\";\n\ninterface Props extends DOMProps {\n  windowResize?: boolean;\n  boxRef: React.Ref<HTMLDivElement>;\n  className?: HTMLDivElement[\"className\"];\n}\n\nclass CustomScrollView extends React.Component<Props> {\n  private ratio = NaN;\n  private lastTrackerTop = 0;\n  private clientHeight = 0;\n  private trackerHeight = 0;\n  private scrollHeight = 0;\n  private transformProp = \"\";\n\n  private startY = 0;\n  private trackerTop = 0;\n\n  private readonly box = multiRef<HTMLDivElement>((e) =>\n    setRef(e, this.props.boxRef)\n  );\n  private readonly barY = React.createRef<HTMLDivElement>();\n  private readonly trackerY = React.createRef<HTMLDivElement>();\n\n  componentDidMount() {\n    this.chooseTransformProp();\n\n    this.resize();\n\n    if (this.props.windowResize) {\n      this.props.window.addEventListener(\"resize\", this.resize);\n    }\n  }\n\n  componentDidUpdate() {\n    this.resize();\n  }\n\n  componentWillUnmount() {\n    this.props.window.removeEventListener(\"resize\", this.resize);\n  }\n\n  chooseTransformProp() {\n    let style = this.trackerY.current.style;\n    let prop = \"\";\n\n    if (\"transform\" in style) {\n      prop = \"transform\";\n    } else if (\"webkitTransform\" in style) {\n      prop = \"webkitTransform\";\n    }\n\n    this.transformProp = prop;\n  }\n\n  resize = () => {\n    const clientHeight = this.box.current.clientHeight;\n    const scrollHeight = this.box.current.scrollHeight;\n    let ratio = clientHeight / scrollHeight;\n    let trackerHeight = Math.max(clientHeight * ratio, 40);\n\n    this.ratio = ratio;\n    this.clientHeight = clientHeight;\n    this.scrollHeight = scrollHeight;\n    this.trackerHeight = trackerHeight;\n\n    if (ratio >= 1) {\n      this.barY.current.style.display = \"none\";\n    } else {\n      this.barY.current.style.display = \"\";\n      this.trackerY.current.style.height = `${trackerHeight}px`;\n\n      this.setTrackerPositionFromScroll(this.box.current.scrollTop);\n    }\n  };\n\n  scroll = () => {\n    if (this.ratio >= 1) {\n      return;\n    }\n\n    this.setTrackerPositionFromScroll(this.box.current.scrollTop);\n  };\n\n  setTrackerPosition(scrollTop: number) {\n    this.lastTrackerTop = scrollTop;\n    (this.trackerY.current.style as any)[\n      this.transformProp\n    ] = `translate(0, ${scrollTop}px)`;\n  }\n\n  setTrackerPositionFromScroll(scrollTop: number) {\n    const progress = scrollTop / (this.scrollHeight - this.clientHeight);\n    this.setTrackerPosition(\n      (this.clientHeight - this.trackerHeight) * progress\n    );\n  }\n\n  setScrollPositionFromTracker(trackerTop: number) {\n    const progress = trackerTop / (this.clientHeight - this.trackerHeight);\n    this.box.current.scrollTop =\n      (this.scrollHeight - this.clientHeight) * progress;\n  }\n\n  onDragStart = (e: React.MouseEvent) => {\n    e.preventDefault();\n    this.startY = e.clientY;\n    this.trackerTop = this.lastTrackerTop;\n\n    this.props.document.addEventListener(\"mousemove\", this.onMove);\n    this.props.document.addEventListener(\"mouseup\", this.onUp);\n  };\n\n  onMove = (e: MouseEvent) => {\n    e.preventDefault();\n    const diff = e.clientY - this.startY;\n    const position = Math.min(\n      Math.max(this.trackerTop + diff, 0),\n      this.clientHeight - this.trackerHeight\n    );\n\n    this.setScrollPositionFromTracker(position);\n  };\n\n  onUp = (e: MouseEvent) => {\n    e.preventDefault();\n    this.props.document.removeEventListener(\"mousemove\", this.onMove);\n    this.props.document.removeEventListener(\"mouseup\", this.onUp);\n  };\n\n  render() {\n    const { children, className } = this.props;\n\n    return (\n      <div vkuiClass=\"CustomScrollView\" className={className}>\n        <div vkuiClass=\"CustomScrollView__barY\" ref={this.barY}>\n          <div\n            vkuiClass=\"CustomScrollView__trackerY\"\n            ref={this.trackerY}\n            onMouseDown={this.onDragStart}\n          />\n        </div>\n\n        <div\n          vkuiClass=\"CustomScrollView__box\"\n          tabIndex={-1}\n          ref={this.box}\n          onScroll={this.scroll}\n        >\n          {children}\n        </div>\n      </div>\n    );\n  }\n}\n\nexport default withDOM(CustomScrollView);\n"],"file":"CustomScrollView.js"}

package/dist/cjs/components/CustomSelect/CustomSelect.d.ts

@@ -1,10 +1,11 @@
-import * as React from 'react';
-import { NativeSelectProps } from '../NativeSelect/NativeSelect';
-import { CustomSelectOptionProps } from '../CustomSelectOption/CustomSelectOption';
-import { FormFieldProps } from '../FormField/FormField';
-import { HasPlatform } from '../../types';
-import './CustomSelect.css';
-declare type SelectValue = React.SelectHTMLAttributes<HTMLSelectElement>['value'];
+import * as React from "react";
+import { NativeSelectProps } from "../NativeSelect/NativeSelect";
+import { CustomSelectOptionProps } from "../CustomSelectOption/CustomSelectOption";
+import { FormFieldProps } from "../FormField/FormField";
+import { HasPlatform } from "../../types";
+import { Placement } from "../Popper/Popper";
+import "./CustomSelect.css";
+declare type SelectValue = React.SelectHTMLAttributes<HTMLSelectElement>["value"];
 export interface CustomSelectOptionInterface {
     value: SelectValue;
     label: string;
@@ -18,6 +19,7 @@ interface CustomSelectState {
     selectedOptionIndex?: number;
     nativeSelectValue?: SelectValue;
     options?: CustomSelectOptionInterface[];
+    popperPlacement?: Placement;
 }
 export interface CustomSelectProps extends NativeSelectProps, HasPlatform, FormFieldProps {
     /**
@@ -39,7 +41,7 @@ export interface CustomSelectProps extends NativeSelectProps, HasPlatform, FormF
      * Функция для кастомной фильтрации. По-умолчанию поиск производится по option.label.
      */
     filterFn?: false | ((value: string, option: CustomSelectOptionInterface, getOptionLabel?: (option: Partial<CustomSelectOptionInterface>) => string) => boolean);
-    popupDirection?: 'top' | 'bottom';
+    popupDirection?: "top" | "bottom";
     /**
      * Рендер-проп для кастомного рендера опции.
      * В объекте аргумента приходят [свойства опции](#/CustomSelectOption?id=props)
@@ -49,7 +51,7 @@ export interface CustomSelectProps extends NativeSelectProps, HasPlatform, FormF
      * Рендер-проп для кастомного рендера содержимого дропдауна.
      * В defaultDropdownContent содержится список опций в виде скроллящегося блока.
      */
-    renderDropdown?: ({ defaultDropdownContent }: {
+    renderDropdown?: ({ defaultDropdownContent, }: {
         defaultDropdownContent: React.ReactNode;
     }) => React.ReactNode;
     /**
@@ -68,6 +70,7 @@ declare class CustomSelect extends React.Component<CustomSelectProps, CustomSele
     private isControlledOutside;
     private selectEl;
     private readonly scrollBoxRef;
+    private readonly containerRef;
     private readonly resetKeyboardInput;
     private readonly getSelectedItem;
     get areOptionsShown(): boolean;
@@ -110,6 +113,7 @@ declare class CustomSelect extends React.Component<CustomSelectProps, CustomSele
     componentDidUpdate(prevProps: CustomSelectProps): void;
     renderOption: (option: CustomSelectOptionInterface, index: number) => JSX.Element;
     selectRef: (element: HTMLSelectElement) => void;
+    onPlacementChange: (placement?: import("@popperjs/core").Placement) => void;
     render(): JSX.Element;
 }
 declare const _default: typeof CustomSelect;

package/dist/cjs/components/CustomSelect/CustomSelect.js

@@ -37,8 +37,6 @@ var _utils = require("../../lib/utils");
 
 var _classNames = require("../../lib/classNames");
 
-var _CustomScrollView = _interopRequireDefault(require("../CustomScrollView/CustomScrollView"));
-
 var _withAdaptivity = require("../../hoc/withAdaptivity");
 
 var _withPlatform = require("../../hoc/withPlatform");
@@ -55,12 +53,12 @@ var _Caption = _interopRequireDefault(require("../Typography/Caption/Caption"));
 
 var _warnOnce = require("../../lib/warnOnce");
 
-var _Spinner = _interopRequireDefault(require("../Spinner/Spinner"));
-
 var _select = require("../../lib/select");
 
 var _is = require("../../lib/is");
 
+var _CustomSelectDropdown = require("../CustomSelectDropdown/CustomSelectDropdown");
+
 var _excluded = ["searchable", "name", "className", "getRef", "getRootRef", "popupDirection", "options", "sizeY", "platform", "style", "onChange", "onBlur", "onFocus", "onClick", "renderOption", "children", "emptyText", "onInputChange", "filterFn", "renderDropdown", "onOpen", "onClose", "fetching"],
     _excluded2 = ["option"];
 
@@ -96,13 +94,13 @@ var findIndexBefore = function findIndexBefore(options) {
   return result;
 };
 
-var warn = (0, _warnOnce.warnOnce)('CustomSelect');
+var warn = (0, _warnOnce.warnOnce)("CustomSelect");
 
 var checkOptionsValueType = function checkOptionsValueType(options) {
   if (new Set(options.map(function (item) {
     return (0, _typeof2.default)(item.value);
   })).size > 1) {
-    warn('Some values of your options have different types. CustomSelect onChange always returns a string type.');
+    warn("Some values of your options have different types. CustomSelect onChange always returns a string type.");
   }
 };
 
@@ -120,8 +118,9 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isControlledOutside", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "selectEl", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "scrollBoxRef", /*#__PURE__*/React.createRef());
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "containerRef", /*#__PURE__*/React.createRef());
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "resetKeyboardInput", function () {
-      _this.keyboardInput = '';
+      _this.keyboardInput = "";
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getSelectedItem", function () {
       var _this$state = _this.state,
@@ -135,7 +134,7 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
       return options[selectedOptionIndex];
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "filter", function (options, inputValue, filterFn) {
-      return typeof filterFn === 'function' ? options.filter(function (option) {
+      return typeof filterFn === "function" ? options.filter(function (option) {
         return filterFn(inputValue, option);
       }) : options;
     });
@@ -154,21 +153,21 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
         }
       });
 
-      typeof _this.props.onOpen === 'function' && _this.props.onOpen();
+      typeof _this.props.onOpen === "function" && _this.props.onOpen();
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "close", function () {
       _this.resetKeyboardInput();
 
       _this.setState(function () {
         return {
-          inputValue: '',
+          inputValue: "",
           opened: false,
           focusedOptionIndex: -1,
           options: _this.props.options
         };
       });
 
-      typeof _this.props.onClose === 'function' && _this.props.onClose();
+      typeof _this.props.onClose === "function" && _this.props.onClose();
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "selectFocused", function () {
       var focusedOptionIndex = _this.state.focusedOptionIndex;
@@ -185,7 +184,7 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
       _this.setState({
         nativeSelectValue: item.value
       }, function () {
-        var event = new Event('change', {
+        var event = new Event("change", {
           bubbles: true
         });
 
@@ -198,14 +197,14 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
       _this.state.opened ? _this.close() : _this.open();
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onFocus", function () {
-      var event = new Event('focus');
+      var event = new Event("focus");
 
       _this.selectEl.dispatchEvent(event);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onBlur", function () {
       _this.close();
 
-      var event = new Event('blur');
+      var event = new Event("blur");
 
       _this.selectEl.dispatchEvent(event);
     });
@@ -234,10 +233,10 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
       var focusedOptionIndex = _this.state.focusedOptionIndex;
       var index = focusedOptionIndex;
 
-      if (type === 'next') {
+      if (type === "next") {
         var nextIndex = findIndexAfter(_this.state.options, index);
         index = nextIndex === -1 ? findIndexAfter(_this.state.options) : nextIndex; // Следующий за index или первый валидный до index
-      } else if (type === 'prev') {
+      } else if (type === "prev") {
         var beforeIndex = findIndexBefore(_this.state.options, index);
         index = beforeIndex === -1 ? findIndexBefore(_this.state.options) : beforeIndex; // Предшествующий index или последний валидный после index
       }
@@ -301,8 +300,8 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
         var _options = _this.props.onInputChange(e, _this.props.options);
 
         if (_options) {
-          if (process.env.NODE_ENV === 'development') {
-            warn('This filtration method is deprecated. Return value of onInputChange will' + ' be ignored in v5.0.0. For custom filtration please update props.options by yourself or use filterFn property');
+          if (process.env.NODE_ENV === "development") {
+            warn("This filtration method is deprecated. Return value of onInputChange will" + " be ignored in v5.0.0. For custom filtration please update props.options by yourself or use filterFn property");
           }
 
           _this.setState({
@@ -326,23 +325,23 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
       }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onInputKeyDown", function (event) {
-      ['ArrowUp', 'ArrowDown', 'Escape', 'Enter'].includes(event.key) && _this.areOptionsShown && event.preventDefault();
+      ["ArrowUp", "ArrowDown", "Escape", "Enter"].includes(event.key) && _this.areOptionsShown && event.preventDefault();
 
       switch (event.key) {
-        case 'ArrowUp':
-          _this.areOptionsShown && _this.focusOption('prev');
+        case "ArrowUp":
+          _this.areOptionsShown && _this.focusOption("prev");
           break;
 
-        case 'ArrowDown':
-          _this.areOptionsShown && _this.focusOption('next');
+        case "ArrowDown":
+          _this.areOptionsShown && _this.focusOption("next");
           break;
 
-        case 'Escape':
+        case "Escape":
           _this.close();
 
           break;
 
-        case 'Enter':
+        case "Enter":
           _this.areOptionsShown && _this.selectFocused();
           break;
       }
@@ -350,41 +349,41 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleKeyDownSelect", function (event) {
       var opened = _this.state.opened;
 
-      if (event.key.length === 1 && event.key !== ' ') {
+      if (event.key.length === 1 && event.key !== " ") {
         _this.onKeyboardInput(event.key);
 
         return;
       }
 
-      ['ArrowUp', 'ArrowDown', 'Escape', 'Enter'].includes(event.key) && _this.areOptionsShown && event.preventDefault();
+      ["ArrowUp", "ArrowDown", "Escape", "Enter"].includes(event.key) && _this.areOptionsShown && event.preventDefault();
 
       switch (event.key) {
-        case 'ArrowUp':
+        case "ArrowUp":
           if (opened) {
-            _this.areOptionsShown && _this.focusOption('prev');
+            _this.areOptionsShown && _this.focusOption("prev");
           } else {
             _this.open();
           }
 
           break;
 
-        case 'ArrowDown':
+        case "ArrowDown":
           if (opened) {
-            _this.areOptionsShown && _this.focusOption('next');
+            _this.areOptionsShown && _this.focusOption("next");
           } else {
             _this.open();
           }
 
           break;
 
-        case 'Escape':
+        case "Escape":
           _this.close();
 
           break;
 
-        case 'Enter':
-        case 'Spacebar':
-        case ' ':
+        case "Enter":
+        case "Spacebar":
+        case " ":
           if (opened) {
             _this.areOptionsShown && _this.selectFocused();
           } else {
@@ -419,12 +418,19 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
       _this.selectEl = element;
       (0, _utils.setRef)(element, _this.props.getRef);
     });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onPlacementChange", function (placement) {
+      _this.setState(function () {
+        return {
+          popperPlacement: placement
+        };
+      });
+    });
     var _value = props.value,
         defaultValue = props.defaultValue;
     var initialValue = _value !== undefined ? _value : defaultValue;
-    _this.keyboardInput = '';
+    _this.keyboardInput = "";
 
-    if (process.env.NODE_ENV === 'development') {
+    if (process.env.NODE_ENV === "development") {
       checkOptionsValueType(props.options);
     }
 
@@ -434,7 +440,7 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
       selectedOptionIndex: _this.findSelectedIndex(props.options, initialValue),
       nativeSelectValue: initialValue,
       options: props.options,
-      inputValue: ''
+      inputValue: ""
     };
 
     if (props.value !== undefined) {
@@ -453,7 +459,7 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
     key: "findSelectedIndex",
     value: function findSelectedIndex(options, value) {
       return options.findIndex(function (item) {
-        value = typeof item.value === 'number' ? Number(value) : value;
+        value = typeof item.value === "number" ? Number(value) : value;
         return item.value === value;
       });
     }
@@ -491,7 +497,7 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
     value: function componentDidUpdate(prevProps) {
       // Внутри useEffect и так is, можно убрать
       if (!(0, _is.is)(prevProps.value, this.props.value) || prevProps.options !== this.props.options) {
-        if (process.env.NODE_ENV === 'development') {
+        if (process.env.NODE_ENV === "development") {
           checkOptionsValueType(this.props.options);
         }
 
@@ -511,9 +517,12 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
+      var _this$state$popperPla;
+
       var _this$state3 = this.state,
           opened = _this$state3.opened,
-          nativeSelectValue = _this$state3.nativeSelectValue;
+          nativeSelectValue = _this$state3.nativeSelectValue,
+          stateOptions = _this$state3.options;
       var _this$props = this.props,
           searchable = _this$props.searchable,
           name = _this$props.name,
@@ -541,41 +550,34 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
           restProps = (0, _objectWithoutProperties2.default)(_this$props, _excluded);
       var selected = this.getSelectedItem();
       var label = selected ? selected.label : undefined;
-      var defaultDropdownContent = (0, _jsxRuntime.createScopedElement)(_CustomScrollView.default, {
-        boxRef: this.scrollBoxRef
-      }, this.state.options.map(this.renderOption), this.state.options.length === 0 && (0, _jsxRuntime.createScopedElement)(_Caption.default, {
+      var defaultDropdownContent = stateOptions.length > 0 ? stateOptions.map(this.renderOption) : (0, _jsxRuntime.createScopedElement)(_Caption.default, {
         level: "1",
         weight: "regular",
         vkuiClass: "CustomSelect__empty"
-      }, this.props.emptyText));
+      }, this.props.emptyText);
       var resolvedContent;
 
-      if (typeof renderDropdown === 'function') {
+      if (typeof renderDropdown === "function") {
         resolvedContent = renderDropdown({
           defaultDropdownContent: defaultDropdownContent
         });
-      } else if (fetching) {
-        resolvedContent = (0, _jsxRuntime.createScopedElement)("div", {
-          vkuiClass: "CustomSelect__fetching"
-        }, (0, _jsxRuntime.createScopedElement)(_Spinner.default, {
-          size: "small"
-        }));
       } else {
         resolvedContent = defaultDropdownContent;
       }
 
+      var isPopperDirectionTop = (_this$state$popperPla = this.state.popperPlacement) === null || _this$state$popperPla === void 0 ? void 0 : _this$state$popperPla.includes("top");
       return (0, _jsxRuntime.createScopedElement)("label", {
-        vkuiClass: (0, _getClassName.getClassName)('CustomSelect', platform),
+        vkuiClass: (0, _getClassName.getClassName)("CustomSelect", platform),
         className: className,
         style: style,
-        ref: getRootRef,
+        ref: (0, _utils.multiRef)(this.containerRef, getRootRef),
         onClick: this.onLabelClick
       }, opened && searchable ? (0, _jsxRuntime.createScopedElement)(_Input.default, (0, _extends2.default)({}, restProps, {
         autoFocus: true,
         onBlur: this.onBlur,
         vkuiClass: (0, _classNames.classNames)({
-          'CustomSelect__open': opened,
-          'CustomSelect__open--popupDirectionTop': popupDirection === 'top'
+          CustomSelect__open: opened,
+          "CustomSelect__open--popupDirectionTop": isPopperDirectionTop
         }),
         value: this.state.inputValue,
         onKeyDown: this.onInputKeyDown,
@@ -594,8 +596,8 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
         onFocus: this.onFocus,
         onBlur: this.onBlur,
         vkuiClass: (0, _classNames.classNames)({
-          'CustomSelect__open': opened,
-          'CustomSelect__open--popupDirectionTop': popupDirection === 'top'
+          CustomSelect__open: opened,
+          "CustomSelect__open--popupDirectionTop": isPopperDirectionTop
         })
       }), label), (0, _jsxRuntime.createScopedElement)("select", {
         ref: this.selectRef,
@@ -612,11 +614,13 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
           key: "".concat(item.value),
           value: item.value
         });
-      })), opened && (0, _jsxRuntime.createScopedElement)("div", {
-        vkuiClass: (0, _classNames.classNames)('CustomSelect__options', "CustomSelect__options--sizeY-".concat(sizeY), {
-          'CustomSelect__options--popupDirectionTop': popupDirection === 'top'
-        }),
-        onMouseLeave: this.resetFocusedOption
+      })), opened && (0, _jsxRuntime.createScopedElement)(_CustomSelectDropdown.CustomSelectDropdown, {
+        targetRef: this.containerRef,
+        placement: popupDirection,
+        scrollBoxRef: this.scrollBoxRef,
+        onPlacementChange: this.onPlacementChange,
+        onMouseLeave: this.resetFocusedOption,
+        fetching: fetching
       }, resolvedContent));
     }
   }]);
@@ -631,7 +635,7 @@ var CustomSelect = /*#__PURE__*/function (_React$Component) {
     return (0, _jsxRuntime.createScopedElement)(_CustomSelectOption.default, props);
   },
   options: [],
-  emptyText: 'Ничего не найдено',
+  emptyText: "Ничего не найдено",
   filterFn: _select.defaultFilterFn
 });