fix(popup): fix UIWebView popup bugs

alfa-laboratory · Jul 24, 2017 · b74a4be · b74a4be
1 parent 7059dfd
commit b74a4be
Show file tree

Hide file tree

Showing 4 changed files with 167 additions and 70 deletions.
diff --git a/src/popup/fantasy/popup.css b/src/popup/fantasy/popup.css
@@ -141,6 +141,11 @@
             flex-direction: column;
             border-radius: 0;
         }
+
+        .popup__content {
+            /* чтобы контент с position:relative в UIWebView не исчезал при быстром скролле */
+            transform: translateZ(0);
+        }
     }
 }
 

diff --git a/src/popup/popup.css b/src/popup/popup.css
@@ -132,6 +132,11 @@
             flex-direction: column;
             height: 100%;
         }
+
+        .popup__content {
+            /* чтобы контент с position:relative в UIWebView не исчезал при быстром скролле */
+            transform: translateZ(0);
+        }
     }
 }
 

diff --git a/src/select/select.jsx b/src/select/select.jsx
@@ -438,6 +438,7 @@ class Select extends React.Component {
                 className={ cn('mobile-header') }
                 size={ this.props.size }
                 title={ this.props.mobileTitle || this.props.placeholder }
+                onCloseClick={ this.handlePopupCloseClick }
             />
         );
     }
@@ -653,6 +654,13 @@ class Select extends React.Component {
         this.setState({ isMobile: isMatched });
     }
 
+    @autobind
+    handlePopupCloseClick() {
+        this.setState({
+            opened: false
+        });
+    }
+
     /**
      * Устанавливает фокус на компонент.
      *
@@ -697,6 +705,8 @@ class Select extends React.Component {
     }
 
     focusOnMenu() {
+        if (this.state.isMobile && this.props.mobileMenuMode === 'popup') return;
+
         let scrollContainer = this.getScrollContainer();
 
         let posX = scrollContainer.scrollTop;