Fix blocking interface due to dataset selectors on mobile (#1764)

datalens-tech · Oct 31, 2024 · 5d8384c · 5d8384c
1 parent 4976e13
commit 5d8384c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 23 deletions.
diff --git a/src/ui/components/common/YCSelect/Items/Items.js b/src/ui/components/common/YCSelect/Items/Items.js
@@ -244,19 +244,6 @@ export class ItemsWrapper extends React.PureComponent {
         this._addUserItem();
     };
 
-    /**
-     * @param {object} opt
-     * @param {number} opt.scrollOffset
-     * @returns {void}
-     */
-    _onAutosizerListScroll = ({scrollOffset}) => {
-        const {setAllowHideOnContentScroll} = this.props;
-
-        if (setAllowHideOnContentScroll) {
-            setAllowHideOnContentScroll(scrollOffset === 0);
-        }
-    };
-
     _renderItem = (item, style = {}) => {
         const {innerValue} = this.props;
         const isSelected = innerValue.has(item.value);
@@ -493,7 +480,6 @@ export class ItemsWrapper extends React.PureComponent {
                             overscanCount={5}
                             estimatedItemSize={itemHeight}
                             onItemsRendered={this._onItemsRendered}
-                            onScroll={this._onAutosizerListScroll}
                         >
                             {this._itemRenderer}
                         </List>

diff --git a/src/ui/components/common/YCSelect/YCSelect.js b/src/ui/components/common/YCSelect/YCSelect.js
@@ -402,7 +402,6 @@ export class YCSelect extends React.PureComponent {
             isFetchingItems: false,
             isControlClicked: false,
             isItemsGrouped: YCSelect.isItemsGrouped(items),
-            allowHideOnContentScroll: false,
             fetchError: null,
         };
     }
@@ -695,10 +694,6 @@ export class YCSelect extends React.PureComponent {
         this.setState({popupWidth: width});
     };
 
-    setAllowHideOnContentScroll = (value) => {
-        this.setState({allowHideOnContentScroll: value});
-    };
-
     _handleSelectorScroll = _debounce((event) => {
         const {scrollTop} = event.target || {};
         this._publishEvent({eventId: 'selector-scroll', meta: {scrollTop}});
@@ -1511,7 +1506,6 @@ export class YCSelect extends React.PureComponent {
             selectOnlyCurrentItem: this.selectOnlyCurrentItem,
             setPopupWidth: this.setPopupWidth,
             errorContent,
-            ...(mobile && {setAllowHideOnContentScroll: this.setAllowHideOnContentScroll}),
         };
 
         if (selectedPopup) {
@@ -1634,7 +1628,7 @@ export class YCSelect extends React.PureComponent {
 
     _renderMobileContent() {
         const {label} = this.props;
-        const {showMainPopup, showSelectedPopup, allowHideOnContentScroll} = this.state;
+        const {showMainPopup, showSelectedPopup} = this.state;
 
         return (
             <React.Fragment>
@@ -1643,7 +1637,7 @@ export class YCSelect extends React.PureComponent {
                     title={label}
                     visible={showMainPopup}
                     contentClassName={bSheet(null, getModifier('mobile'))}
-                    allowHideOnContentScroll={allowHideOnContentScroll}
+                    allowHideOnContentScroll={false}
                     onClose={this._onOutsideMainPopupClick}
                 >
                     {this._renderPopupContent({isMobile: true})}
@@ -1653,7 +1647,7 @@ export class YCSelect extends React.PureComponent {
                     title={label}
                     visible={showSelectedPopup}
                     contentClassName={bSheet(null, getModifier('mobile'))}
-                    allowHideOnContentScroll={allowHideOnContentScroll}
+                    allowHideOnContentScroll={false}
                     onClose={this._onOutsideSelectedItemsPopupClick}
                 >
                     <div className={bPopup('select-title')}>{trans('selected_popup_title')}</div>