refactor: forward ref to datepicker instance

devanshujain95 · Mar 31, 2023 · 4cdc921 · 4cdc921
1 parent 618d14e
commit 4cdc921
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/src/components/NewDatePicker/index.js b/src/components/NewDatePicker/index.js
@@ -128,13 +128,7 @@ class NewDatePicker extends React.Component {
                 <View style={[this.props.isSmallScreenWidth ? styles.flex2 : {}]}>
                     <TextInput
                         forceActiveLabel
-                        ref={(el) => {
-                            this.textInputRef = el;
-                            if (!_.isFunction(this.props.innerRef)) {
-                                return;
-                            }
-                            this.props.innerRef(el);
-                        }}
+                        ref={el => this.textInputRef = el}
                         icon={Expensicons.Calendar}
                         onPress={this.showPicker}
                         label={this.props.label}
@@ -177,7 +171,4 @@ class NewDatePicker extends React.Component {
 NewDatePicker.propTypes = propTypes;
 NewDatePicker.defaultProps = datePickerDefaultProps;
 
-export default withLocalize(React.forwardRef((props, ref) => (
-    /* eslint-disable-next-line react/jsx-props-no-spreading */
-    <NewDatePicker {...props} innerRef={ref} />
-)));
+export default withLocalize(NewDatePicker);
diff --git a/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.js b/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.js
@@ -52,6 +52,13 @@ class DateOfBirthPage extends Component {
 
     componentDidMount() {
         this.props.navigation.addListener('focus', this.getYearFromRouteParams);
+
+        setTimeout(() => {
+            if (!this.datePicker) {
+                return;
+            }
+            this.datePicker.showPicker();
+        }, 1);
     }
 
     componentWillUnmount() {
@@ -67,10 +74,7 @@ class DateOfBirthPage extends Component {
         if (params && params.year) {
             this.setState({selectedYear: params.year});
             if (this.datePicker) {
-                this.datePicker.focus();
-                if (_.isFunction(this.datePicker.click)) {
-                    this.datePicker.click();
-                }
+                this.datePicker.showPicker();
             }
         }
     }