MM-22041 Fix Keyboard flashing when entering keyboards screen (matter…

…most#4132) * MM-22041 Fix Keyboard flashing when entering keyboards screen * Update snapshots
supertomk · Apr 9, 2020 · 1486a55 · 1486a55
1 parent 9d0209f
commit 1486a55
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/...ings_mentions_keywords/__snapshots__/notification_settings_mentions_keywords.test.js.snap b/...ings_mentions_keywords/__snapshots__/notification_settings_mentions_keywords.test.js.snap
@@ -193,7 +193,6 @@ NotificationSettingsMentionsKeywords {
             <TextInputWithLocalizedPlaceholder
               autoCapitalize="none"
               autoCorrect={false}
-              autoFocus={true}
               blurOnSubmit={true}
               keyboardAppearance="light"
               multiline={true}

diff --git a/...ttings/notification_settings_mentions_keywords/notification_settings_mentions_keywords.js b/...ttings/notification_settings_mentions_keywords/notification_settings_mentions_keywords.js
@@ -36,6 +36,16 @@ export default class NotificationSettingsMentionsKeywords extends PureComponent
         this.navigationEventListener = Navigation.events().bindComponent(this);
     }
 
+    componentDidAppear() {
+        if (this.keywordsInput) {
+            this.keywordsInput.focus();
+        }
+    }
+
+    componentDidDisappear() {
+        this.props.onBack(this.state.keywords);
+    }
+
     handleSubmit = () => {
         popTopScreen();
     };
@@ -48,10 +58,6 @@ export default class NotificationSettingsMentionsKeywords extends PureComponent
         return this.setState({keywords});
     };
 
-    componentDidDisappear() {
-        this.props.onBack(this.state.keywords);
-    }
-
     render() {
         const {theme, isLandscape} = this.props;
         const {keywords} = this.state;
@@ -66,7 +72,6 @@ export default class NotificationSettingsMentionsKeywords extends PureComponent
                 >
                     <View style={style.inputContainer}>
                         <TextInputWithLocalizedPlaceholder
-                            autoFocus={true}
                             ref={this.keywordsRef}
                             value={keywords}
                             blurOnSubmit={true}