From b4cde15cdbb1f18250702f5561af4c7e3c163f38 Mon Sep 17 00:00:00 2001
From: Kermit <kermitlx@outlook.com>
Date: Fri, 4 Jun 2021 20:59:13 -0700
Subject: [PATCH] remove defaultProps from picker of components (#31644)

Summary:
Remove `defaultProps` from `Picker` of components, replace it with destructuring assignment.

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[JavaScript] [Changed] - Remove defaultProps from picker

close https://github.com/facebook/react-native/issues/31603

Pull Request resolved: https://github.com/facebook/react-native/pull/31644

Test Plan: all test suite and CI passes.

Reviewed By: TheSavior

Differential Revision: D28886320

Pulled By: lunaleaps

fbshipit-source-id: d88a922dffeebe2bce019250d460b5e43a0af562
---
 Libraries/Components/Picker/Picker.js                  | 10 ++++------
 .../Picker/__tests__/__snapshots__/Picker-test.js.snap |  2 --
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Libraries/Components/Picker/Picker.js b/Libraries/Components/Picker/Picker.js
index bb5416b45e..43404c44a6 100644
--- a/Libraries/Components/Picker/Picker.js
+++ b/Libraries/Components/Picker/Picker.js
@@ -166,24 +166,22 @@ class Picker extends React.Component<PickerProps> {
 
   static Item: typeof PickerItem = PickerItem;
 
-  static defaultProps: {|mode: $TEMPORARY$string<'dialog'>|} = {
-    mode: MODE_DIALOG,
-  };
-
   render(): React.Node {
+    const {mode = MODE_DIALOG, children, ...rest} = this.props;
+
     if (Platform.OS === 'ios') {
       /* $FlowFixMe[prop-missing] (>=0.81.0 site=react_native_ios_fb) This
        * suppression was added when renaming suppression sites. */
       /* $FlowFixMe[incompatible-type] (>=0.81.0 site=react_native_ios_fb) This
        * suppression was added when renaming suppression sites. */
-      return <PickerIOS {...this.props}>{this.props.children}</PickerIOS>;
+      return <PickerIOS {...rest}>{children}</PickerIOS>;
     } else if (Platform.OS === 'android') {
       return (
         /* $FlowFixMe[incompatible-type] (>=0.81.0 site=react_native_android_fb) This
          * suppression was added when renaming suppression sites. */
         /* $FlowFixMe[prop-missing] (>=0.81.0 site=react_native_android_fb) This
          * suppression was added when renaming suppression sites. */
-        <PickerAndroid {...this.props}>{this.props.children}</PickerAndroid>
+        <PickerAndroid mode={mode}>{children} </PickerAndroid>
       );
     } else {
       return <UnimplementedView />;
diff --git a/Libraries/Components/Picker/__tests__/__snapshots__/Picker-test.js.snap b/Libraries/Components/Picker/__tests__/__snapshots__/Picker-test.js.snap
index 32c40aa992..af39b089a3 100644
--- a/Libraries/Components/Picker/__tests__/__snapshots__/Picker-test.js.snap
+++ b/Libraries/Components/Picker/__tests__/__snapshots__/Picker-test.js.snap
@@ -64,7 +64,6 @@ exports[`<Picker /> should render as expected: should deep render when not mocke
 
 exports[`<Picker /> should render as expected: should shallow render as <Picker /> when mocked 1`] = `
 <Picker
-  mode="dialog"
   onValueChange={[MockFunction]}
   selectedValue="foo"
 >
@@ -81,7 +80,6 @@ exports[`<Picker /> should render as expected: should shallow render as <Picker
 
 exports[`<Picker /> should render as expected: should shallow render as <Picker /> when not mocked 1`] = `
 <Picker
-  mode="dialog"
   onValueChange={[MockFunction]}
   selectedValue="foo"
 >