@draftbit/core 48.4.12-8fa8f1.2 → 48.4.12-ec076f.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commonjs/components/Picker/NativePicker.js +1 -1
- package/lib/commonjs/components/Picker/PickerInputContainer.js +1 -1
- package/lib/commonjs/components/Picker/dropdown/DropDownPicker.js +1 -1
- package/lib/typescript/src/components/Picker/NativePicker.d.ts +2 -4658
- package/lib/typescript/src/components/Picker/NativePicker.js +11 -9
- package/lib/typescript/src/components/Picker/NativePicker.js.map +1 -1
- package/lib/typescript/src/components/Picker/PickerCommon.d.ts +2 -8
- package/lib/typescript/src/components/Picker/PickerCommon.js.map +1 -1
- package/lib/typescript/src/components/Picker/PickerInputContainer.d.ts +1 -0
- package/lib/typescript/src/components/Picker/PickerInputContainer.js +2 -2
- package/lib/typescript/src/components/Picker/PickerInputContainer.js.map +1 -1
- package/lib/typescript/src/components/Picker/dropdown/DropDownPicker.js +4 -7
- package/lib/typescript/src/components/Picker/dropdown/DropDownPicker.js.map +1 -1
- package/lib/typescript/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/components/Picker/NativePicker.js +11 -9
- package/src/components/Picker/NativePicker.js.map +1 -1
- package/src/components/Picker/NativePicker.tsx +19 -16
- package/src/components/Picker/PickerCommon.js.map +1 -1
- package/src/components/Picker/PickerCommon.ts +2 -8
- package/src/components/Picker/PickerInputContainer.js +2 -2
- package/src/components/Picker/PickerInputContainer.js.map +1 -1
- package/src/components/Picker/PickerInputContainer.tsx +3 -1
- package/src/components/Picker/dropdown/DropDownPicker.js +4 -7
- package/src/components/Picker/dropdown/DropDownPicker.js.map +1 -1
- package/src/components/Picker/dropdown/DropDownPicker.tsx +4 -6
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@draftbit/core",
|
|
3
|
-
"version": "48.4.12-
|
|
3
|
+
"version": "48.4.12-ec076f.2+ec076f3",
|
|
4
4
|
"description": "Core (non-native) Components",
|
|
5
5
|
"main": "lib/commonjs/index.js",
|
|
6
6
|
"types": "lib/typescript/src/index.d.ts",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"dependencies": {
|
|
42
42
|
"@date-io/date-fns": "^1.3.13",
|
|
43
43
|
"@draftbit/react-theme-provider": "^2.1.1",
|
|
44
|
-
"@draftbit/types": "^48.4.12-
|
|
44
|
+
"@draftbit/types": "^48.4.12-ec076f.2+ec076f3",
|
|
45
45
|
"@expo/vector-icons": "^13.0.0",
|
|
46
46
|
"@material-ui/core": "^4.11.0",
|
|
47
47
|
"@material-ui/pickers": "^3.2.10",
|
|
@@ -102,5 +102,5 @@
|
|
|
102
102
|
],
|
|
103
103
|
"testEnvironment": "node"
|
|
104
104
|
},
|
|
105
|
-
"gitHead": "
|
|
105
|
+
"gitHead": "ec076f3fdd56f795d81ac3fb63136582d1c27823"
|
|
106
106
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
|
-
import {
|
|
2
|
+
import { StyleSheet, Platform, Keyboard } from "react-native";
|
|
3
3
|
import { SafeAreaView } from "react-native-safe-area-context";
|
|
4
4
|
import { Picker as NativePickerComponent } from "@react-native-picker/picker";
|
|
5
5
|
import Portal from "../Portal/Portal";
|
|
@@ -10,7 +10,7 @@ import PickerInputContainer from "./PickerInputContainer";
|
|
|
10
10
|
import { withTheme } from "../../theming";
|
|
11
11
|
const isIos = Platform.OS === "ios";
|
|
12
12
|
const isWeb = Platform.OS === "web";
|
|
13
|
-
const NativePicker = ({ options: optionsProp = [], onValueChange, Icon, placeholder, value, autoDismissKeyboard = true, theme, ...rest }) => {
|
|
13
|
+
const NativePicker = ({ options: optionsProp = [], onValueChange, Icon, placeholder, value, autoDismissKeyboard = true, theme, disabled, ...rest }) => {
|
|
14
14
|
const pickerRef = React.useRef(null);
|
|
15
15
|
const [pickerVisible, setPickerVisible] = React.useState(false);
|
|
16
16
|
const options = useDeepCompareMemo(() => {
|
|
@@ -28,21 +28,20 @@ const NativePicker = ({ options: optionsProp = [], onValueChange, Icon, placehol
|
|
|
28
28
|
if (!placeholder && options.length && !value && value !== options[0].value) {
|
|
29
29
|
onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange(options[0].value);
|
|
30
30
|
}
|
|
31
|
-
const renderNativePicker = () => (React.createElement(NativePickerComponent, { ref: pickerRef, selectedValue: value, onValueChange: (newValue) => {
|
|
31
|
+
const renderNativePicker = () => (React.createElement(NativePickerComponent, { ref: pickerRef, testID: "native-picker-component", selectedValue: value, onValueChange: (newValue) => {
|
|
32
32
|
if (newValue !== placeholder) {
|
|
33
33
|
onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange(newValue);
|
|
34
34
|
}
|
|
35
35
|
else if (newValue === placeholder) {
|
|
36
36
|
onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange("");
|
|
37
37
|
}
|
|
38
|
-
}, style: isIos ? styles.iosNativePicker : styles.nativePicker, onBlur: () => setPickerVisible(false) }, options.map((option) => (React.createElement(NativePickerComponent.Item, { label: option.label.toString(), value: option.value, key: option.value })))));
|
|
38
|
+
}, style: isIos ? styles.iosNativePicker : styles.nativePicker, onBlur: () => setPickerVisible(false) }, options.map((option) => (React.createElement(NativePickerComponent.Item, { testID: "native-picker-item", label: option.label.toString(), value: option.value, key: option.value })))));
|
|
39
39
|
const renderPicker = () => {
|
|
40
40
|
if (isIos) {
|
|
41
41
|
return (React.createElement(Portal, null,
|
|
42
|
-
React.createElement(SafeAreaView, { style: styles.
|
|
43
|
-
React.createElement(
|
|
44
|
-
|
|
45
|
-
renderNativePicker()))));
|
|
42
|
+
React.createElement(SafeAreaView, { style: styles.iosPickerContent },
|
|
43
|
+
React.createElement(Button, { Icon: Icon, onPress: () => setPickerVisible(!pickerVisible), style: [styles.iosButton, { color: theme.colors.primary }], title: "Close" }),
|
|
44
|
+
renderNativePicker())));
|
|
46
45
|
}
|
|
47
46
|
else {
|
|
48
47
|
return renderNativePicker();
|
|
@@ -59,7 +58,7 @@ const NativePicker = ({ options: optionsProp = [], onValueChange, Icon, placehol
|
|
|
59
58
|
Keyboard.dismiss();
|
|
60
59
|
}
|
|
61
60
|
}, [pickerVisible, autoDismissKeyboard]);
|
|
62
|
-
return (React.createElement(PickerInputContainer, { Icon: Icon, placeholder: placeholder, selectedValue: value, options: options, onPress: () => setPickerVisible(!pickerVisible), ...rest }, (pickerVisible || isWeb) && renderPicker()));
|
|
61
|
+
return (React.createElement(PickerInputContainer, { testID: "native-picker", Icon: Icon, placeholder: placeholder, selectedValue: value, options: options, onPress: () => setPickerVisible(!pickerVisible), disabled: disabled, ...rest }, (pickerVisible || isWeb) && !disabled && renderPicker()));
|
|
63
62
|
};
|
|
64
63
|
const styles = StyleSheet.create({
|
|
65
64
|
nativePicker: {
|
|
@@ -83,6 +82,9 @@ const styles = StyleSheet.create({
|
|
|
83
82
|
},
|
|
84
83
|
iosPickerContent: {
|
|
85
84
|
width: "100%",
|
|
85
|
+
position: "absolute",
|
|
86
|
+
bottom: 0,
|
|
87
|
+
backgroundColor: "white",
|
|
86
88
|
},
|
|
87
89
|
iosButton: {
|
|
88
90
|
backgroundColor: "transparent",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NativePicker.js","sourceRoot":"","sources":["NativePicker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"NativePicker.js","sourceRoot":"","sources":["NativePicker.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
|
-
import {
|
|
2
|
+
import { StyleSheet, Platform, Keyboard } from "react-native";
|
|
3
3
|
import { SafeAreaView } from "react-native-safe-area-context";
|
|
4
4
|
import { Picker as NativePickerComponent } from "@react-native-picker/picker";
|
|
5
5
|
import Portal from "../Portal/Portal";
|
|
@@ -12,14 +12,11 @@ import {
|
|
|
12
12
|
} from "./PickerCommon";
|
|
13
13
|
import PickerInputContainer from "./PickerInputContainer";
|
|
14
14
|
import { withTheme } from "../../theming";
|
|
15
|
-
import { Theme } from "../../styles/DefaultTheme";
|
|
16
15
|
|
|
17
16
|
const isIos = Platform.OS === "ios";
|
|
18
17
|
const isWeb = Platform.OS === "web";
|
|
19
18
|
|
|
20
|
-
const NativePicker: React.FC<
|
|
21
|
-
CommonPickerProps & SinglePickerProps & { theme: Theme }
|
|
22
|
-
> = ({
|
|
19
|
+
const NativePicker: React.FC<CommonPickerProps & SinglePickerProps> = ({
|
|
23
20
|
options: optionsProp = [],
|
|
24
21
|
onValueChange,
|
|
25
22
|
Icon,
|
|
@@ -27,6 +24,7 @@ const NativePicker: React.FC<
|
|
|
27
24
|
value,
|
|
28
25
|
autoDismissKeyboard = true,
|
|
29
26
|
theme,
|
|
27
|
+
disabled,
|
|
30
28
|
...rest
|
|
31
29
|
}) => {
|
|
32
30
|
const pickerRef = React.useRef<NativePickerComponent<string | number>>(null);
|
|
@@ -53,6 +51,7 @@ const NativePicker: React.FC<
|
|
|
53
51
|
const renderNativePicker = () => (
|
|
54
52
|
<NativePickerComponent
|
|
55
53
|
ref={pickerRef}
|
|
54
|
+
testID="native-picker-component"
|
|
56
55
|
selectedValue={value}
|
|
57
56
|
onValueChange={(newValue) => {
|
|
58
57
|
if (newValue !== placeholder) {
|
|
@@ -66,6 +65,7 @@ const NativePicker: React.FC<
|
|
|
66
65
|
>
|
|
67
66
|
{options.map((option) => (
|
|
68
67
|
<NativePickerComponent.Item
|
|
68
|
+
testID="native-picker-item"
|
|
69
69
|
label={option.label.toString()}
|
|
70
70
|
value={option.value}
|
|
71
71
|
key={option.value}
|
|
@@ -78,16 +78,14 @@ const NativePicker: React.FC<
|
|
|
78
78
|
if (isIos) {
|
|
79
79
|
return (
|
|
80
80
|
<Portal>
|
|
81
|
-
<SafeAreaView style={styles.
|
|
82
|
-
<
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
{renderNativePicker()}
|
|
90
|
-
</View>
|
|
81
|
+
<SafeAreaView style={styles.iosPickerContent}>
|
|
82
|
+
<Button
|
|
83
|
+
Icon={Icon}
|
|
84
|
+
onPress={() => setPickerVisible(!pickerVisible)}
|
|
85
|
+
style={[styles.iosButton, { color: theme.colors.primary }]}
|
|
86
|
+
title="Close"
|
|
87
|
+
/>
|
|
88
|
+
{renderNativePicker()}
|
|
91
89
|
</SafeAreaView>
|
|
92
90
|
</Portal>
|
|
93
91
|
);
|
|
@@ -110,15 +108,17 @@ const NativePicker: React.FC<
|
|
|
110
108
|
|
|
111
109
|
return (
|
|
112
110
|
<PickerInputContainer
|
|
111
|
+
testID="native-picker"
|
|
113
112
|
Icon={Icon}
|
|
114
113
|
placeholder={placeholder}
|
|
115
114
|
selectedValue={value}
|
|
116
115
|
options={options}
|
|
117
116
|
onPress={() => setPickerVisible(!pickerVisible)}
|
|
117
|
+
disabled={disabled}
|
|
118
118
|
{...rest}
|
|
119
119
|
>
|
|
120
120
|
{/* Web version is collapsed by default, always show to allow direct expand */}
|
|
121
|
-
{(pickerVisible || isWeb) && renderPicker()}
|
|
121
|
+
{(pickerVisible || isWeb) && !disabled && renderPicker()}
|
|
122
122
|
</PickerInputContainer>
|
|
123
123
|
);
|
|
124
124
|
};
|
|
@@ -145,6 +145,9 @@ const styles = StyleSheet.create({
|
|
|
145
145
|
},
|
|
146
146
|
iosPickerContent: {
|
|
147
147
|
width: "100%",
|
|
148
|
+
position: "absolute",
|
|
149
|
+
bottom: 0,
|
|
150
|
+
backgroundColor: "white",
|
|
148
151
|
},
|
|
149
152
|
iosButton: {
|
|
150
153
|
backgroundColor: "transparent",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PickerCommon.js","sourceRoot":"","sources":["PickerCommon.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"PickerCommon.js","sourceRoot":"","sources":["PickerCommon.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAkDlC,MAAM,UAAU,wBAAwB,CACtC,OAA6C;IAE7C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAE/B,IAAI,OAAO,WAAW,KAAK,CAAC,QAAQ,IAAI,QAAQ,CAAC,EAAE;QACjD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC9B,KAAK,EAAE,MAAyB;YAChC,KAAK,EAAE,MAAyB;SACjC,CAAC,CAAC,CAAC;KACL;IAED,IAAI,QAAQ,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,EAAE;QACnE,OAAQ,OAA0B,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAChD,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,KAAK,EAAE,MAAM,CAAC,KAAK;aACpB,CAAC;QACJ,CAAC,CAAC,CAAC;KACJ;IAED,MAAM,IAAI,KAAK,CACb,6IAA6I,CAC9I,CAAC;AACJ,CAAC"}
|
|
@@ -9,7 +9,7 @@ export interface PickerOption {
|
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
export interface PickerInputContainerProps extends IconSlot {
|
|
12
|
-
error?:
|
|
12
|
+
error?: boolean;
|
|
13
13
|
placeholder?: string;
|
|
14
14
|
disabled?: boolean;
|
|
15
15
|
style?: StyleProp<ViewStyle> | TextStyle;
|
|
@@ -27,6 +27,7 @@ export interface PickerInputContainerProps extends IconSlot {
|
|
|
27
27
|
export interface CommonPickerProps extends PickerInputContainerProps {
|
|
28
28
|
options: PickerOption[] | string[] | number[];
|
|
29
29
|
autoDismissKeyboard?: boolean;
|
|
30
|
+
theme: Theme;
|
|
30
31
|
}
|
|
31
32
|
|
|
32
33
|
export interface SinglePickerProps {
|
|
@@ -43,17 +44,10 @@ export interface CommonDropDownPickerProps extends CommonPickerProps {
|
|
|
43
44
|
selectedIconName?: string;
|
|
44
45
|
selectedIconColor?: string;
|
|
45
46
|
selectedIconSize?: number;
|
|
46
|
-
itemTextSize?: number;
|
|
47
|
-
itemTextColor?: string;
|
|
48
|
-
itemBackgroundColor?: string;
|
|
49
|
-
selectedItemTextSize?: number;
|
|
50
|
-
selectedItemTextColor?: string;
|
|
51
|
-
selectedItemBackgroundColor?: string;
|
|
52
47
|
dropDownBackgroundColor?: string;
|
|
53
48
|
dropDownBorderColor?: string;
|
|
54
49
|
dropDownBorderWidth?: number;
|
|
55
50
|
dropDownBorderRadius?: number;
|
|
56
|
-
theme: Theme;
|
|
57
51
|
}
|
|
58
52
|
|
|
59
53
|
export function normalizeToPickerOptions(
|
|
@@ -4,7 +4,7 @@ import omit from "lodash.omit";
|
|
|
4
4
|
import { extractSizeStyles, extractPositionStyles, extractFlexItemStyles, extractBorderAndMarginStyles, } from "../../utilities";
|
|
5
5
|
import TextField from "../TextField";
|
|
6
6
|
import Touchable from "../Touchable";
|
|
7
|
-
const PickerInputContainer = ({ options = [], onPress, Icon, style, selectedValue, disabled = false, zIndex, children, ...rest }) => {
|
|
7
|
+
const PickerInputContainer = ({ options = [], onPress, Icon, style, selectedValue, disabled = false, zIndex, children, testID, ...rest }) => {
|
|
8
8
|
var _a;
|
|
9
9
|
const containerStyle = StyleSheet.flatten([
|
|
10
10
|
extractSizeStyles(style),
|
|
@@ -28,7 +28,7 @@ const PickerInputContainer = ({ options = [], onPress, Icon, style, selectedValu
|
|
|
28
28
|
((_a = options
|
|
29
29
|
.find((option) => option.value === selectedValue)) === null || _a === void 0 ? void 0 : _a.label.toString()) || selectedValue;
|
|
30
30
|
}
|
|
31
|
-
return (React.createElement(View, { style: [containerStyle, { zIndex }] },
|
|
31
|
+
return (React.createElement(View, { testID: testID, style: [containerStyle, { zIndex }] },
|
|
32
32
|
React.createElement(TextField, { Icon: Icon, numberOfLines: 1, onChangeText: () => { }, value: selectedLabel === null || selectedLabel === void 0 ? void 0 : selectedLabel.toString(), editable: false, disabled: disabled, style: textFieldStyle, ...rest }),
|
|
33
33
|
React.createElement(Touchable, { style: StyleSheet.absoluteFillObject, disabled: disabled, onPress: onPress }),
|
|
34
34
|
children));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PickerInputContainer.js","sourceRoot":"","sources":["PickerInputContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACrB,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,iBAAiB,CAAC;AACzB,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,SAAS,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"PickerInputContainer.js","sourceRoot":"","sources":["PickerInputContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACrB,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,iBAAiB,CAAC;AACzB,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,SAAS,MAAM,cAAc,CAAC;AAcrC,MAAM,oBAAoB,GAEtB,CAAC,EACH,OAAO,GAAG,EAAE,EACZ,OAAO,EACP,IAAI,EACJ,KAAK,EACL,aAAa,EACb,QAAQ,GAAG,KAAK,EAChB,MAAM,EACN,QAAQ,EACR,MAAM,EACN,GAAG,IAAI,EACR,EAAE,EAAE;;IACH,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC;QACxC,iBAAiB,CAAC,KAAK,CAAC;QACxB,qBAAqB,CAAC,KAAK,CAAC;QAC5B,qBAAqB,CAAC,KAAK,CAAC;QAC5B,4BAA4B,CAAC,KAAK,CAAC,CAAC,YAAY;KACjD,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,IAAI,CACzB,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,EACzB,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAC5B,CAAC;IAEF,IAAI,aAAa,GAAgC,EAAE,CAAC;IACpD,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QAChC,aAAa,GAAG,aAAa;aAC1B,GAAG,CACF,CAAC,KAAK,EAAE,EAAE;;YACR,OAAA,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,KAAK,CAAC,0CAAE,KAAK,CAAC,QAAQ,EAAE;gBAClE,KAAK,CAAA;SAAA,CACR;aACA,IAAI,CAAC,IAAI,CAAC,CAAC;KACf;SAAM;QACL,aAAa;YACX,CAAA,MAAA,OAAO;iBACJ,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,aAAa,CAAC,0CAC/C,KAAK,CAAC,QAAQ,EAAE,KAAI,aAAa,CAAC;KACzC;IAED,OAAO,CACL,oBAAC,IAAI,IAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,CAAC;QACvD,oBAAC,SAAS,IACR,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,CAAC,EAChB,YAAY,EAAE,GAAG,EAAE,GAAE,CAAC,EACtB,KAAK,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,EAAE,EAChC,QAAQ,EAAE,KAAK,EACf,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,cAAc,KACjB,IAAI,GACR;QACF,oBAAC,SAAS,IACR,KAAK,EAAE,UAAU,CAAC,kBAAkB,EACpC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,GAChB;QACD,QAAQ,CACJ,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|
|
@@ -19,6 +19,7 @@ interface PickerInputContainerProps extends ExposedPickerInputContainerProps {
|
|
|
19
19
|
options: PickerOption[];
|
|
20
20
|
zIndex?: number;
|
|
21
21
|
onPress?: () => void;
|
|
22
|
+
testID?: string;
|
|
22
23
|
}
|
|
23
24
|
|
|
24
25
|
const PickerInputContainer: React.FC<
|
|
@@ -32,6 +33,7 @@ const PickerInputContainer: React.FC<
|
|
|
32
33
|
disabled = false,
|
|
33
34
|
zIndex,
|
|
34
35
|
children,
|
|
36
|
+
testID,
|
|
35
37
|
...rest
|
|
36
38
|
}) => {
|
|
37
39
|
const containerStyle = StyleSheet.flatten([
|
|
@@ -63,7 +65,7 @@ const PickerInputContainer: React.FC<
|
|
|
63
65
|
}
|
|
64
66
|
|
|
65
67
|
return (
|
|
66
|
-
<View style={[containerStyle, { zIndex }]}>
|
|
68
|
+
<View testID={testID} style={[containerStyle, { zIndex }]}>
|
|
67
69
|
<TextField
|
|
68
70
|
Icon={Icon}
|
|
69
71
|
numberOfLines={1}
|
|
@@ -12,12 +12,8 @@ const DropDownPicker = ({ theme, options: optionsProp = [], onValueChange, Icon,
|
|
|
12
12
|
const isMultiSelect = Array.isArray(value);
|
|
13
13
|
const pickerItemProps = React.useMemo(() => {
|
|
14
14
|
const children = flattenReactFragments(React.Children.toArray(childrenProp));
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
if (child.type === PickerItem) {
|
|
18
|
-
firstPickerItem = child;
|
|
19
|
-
}
|
|
20
|
-
}
|
|
15
|
+
// Only the props of the first PickerItem are used, any others are ignored
|
|
16
|
+
const firstPickerItem = children.find((child) => child.type === PickerItem);
|
|
21
17
|
return (firstPickerItem === null || firstPickerItem === void 0 ? void 0 : firstPickerItem.props) || {};
|
|
22
18
|
}, [childrenProp]);
|
|
23
19
|
const { viewStyles: pickerItemViewStyles, textStyles: pickerItemTextStyles } = extractStyles(pickerItemProps.style);
|
|
@@ -28,6 +24,7 @@ const DropDownPicker = ({ theme, options: optionsProp = [], onValueChange, Icon,
|
|
|
28
24
|
React.useEffect(() => {
|
|
29
25
|
onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange((isMultiSelect ? internalValue !== null && internalValue !== void 0 ? internalValue : [] : internalValue !== null && internalValue !== void 0 ? internalValue : "") // cannot determine if multiselect or not on compile time
|
|
30
26
|
);
|
|
27
|
+
// onValueChange excluded to prevent running on every re-render when using an anoymous function, which is the common case
|
|
31
28
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
32
29
|
}, [internalValue]);
|
|
33
30
|
React.useEffect(() => {
|
|
@@ -35,7 +32,7 @@ const DropDownPicker = ({ theme, options: optionsProp = [], onValueChange, Icon,
|
|
|
35
32
|
Keyboard.dismiss();
|
|
36
33
|
}
|
|
37
34
|
}, [pickerVisible, autoDismissKeyboard]);
|
|
38
|
-
return (React.createElement(PickerInputContainer, { Icon: Icon, placeholder: placeholder, selectedValue: value, options: options, onPress: () => setPickerVisible(!pickerVisible), zIndex: pickerVisible ? 100 : undefined, ...rest },
|
|
35
|
+
return (React.createElement(PickerInputContainer, { testID: "dropdown-picker", Icon: Icon, placeholder: placeholder, selectedValue: value, options: options, onPress: () => setPickerVisible(!pickerVisible), zIndex: pickerVisible ? 100 : undefined, ...rest },
|
|
39
36
|
React.createElement(DropDownPickerComponent, { open: pickerVisible, setOpen: setPickerVisible, value: (value || null), setValue: setInternalValue, items: options, placeholder: placeholder, listMode: "SCROLLVIEW", multiple: isMultiSelect, style: { display: "none" }, listItemLabelStyle: [
|
|
40
37
|
{ color: theme.colors.strong, fontSize: 14 },
|
|
41
38
|
pickerItemTextStyles,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DropDownPicker.js","sourceRoot":"","sources":["DropDownPicker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EACL,aAAa,EACb,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAIL,wBAAwB,GACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,oBAAoB,MAAM,yBAAyB,CAAC;AAC3D,OAAO,uBAAuB,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,UAA+B,MAAM,cAAc,CAAC;AAE3D,MAAM,cAAc,GAIhB,CAAC,EACH,KAAK,EACL,OAAO,EAAE,WAAW,GAAG,EAAE,EACzB,aAAa,EACb,IAAI,EACJ,WAAW,EACX,KAAK,EACL,mBAAmB,GAAG,IAAI,EAC1B,gBAAgB,GAAG,eAAe,EAClC,iBAAiB,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EACvC,gBAAgB,GAAG,EAAE,EACrB,uBAAuB,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,EACjD,mBAAmB,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,EAC1C,mBAAmB,GAAG,CAAC,EACvB,oBAAoB,GAAG,CAAC,EACxB,QAAQ,EAAE,YAAY,EACtB,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,KAAK,CAAC,QAAQ,EAErD,CAAC;IAEJ,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAE3C,MAAM,eAAe,GAAoB,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAC1D,MAAM,QAAQ,GAAG,qBAAqB,CACpC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAyB,CAC7D,CAAC;QAEF,
|
|
1
|
+
{"version":3,"file":"DropDownPicker.js","sourceRoot":"","sources":["DropDownPicker.tsx"],"names":[],"mappings":"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"}
|
|
@@ -50,12 +50,8 @@ const DropDownPicker: React.FC<
|
|
|
50
50
|
React.Children.toArray(childrenProp) as React.ReactElement[]
|
|
51
51
|
);
|
|
52
52
|
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
if (child.type === PickerItem) {
|
|
56
|
-
firstPickerItem = child;
|
|
57
|
-
}
|
|
58
|
-
}
|
|
53
|
+
// Only the props of the first PickerItem are used, any others are ignored
|
|
54
|
+
const firstPickerItem = children.find((child) => child.type === PickerItem);
|
|
59
55
|
|
|
60
56
|
return firstPickerItem?.props || {};
|
|
61
57
|
}, [childrenProp]);
|
|
@@ -76,6 +72,7 @@ const DropDownPicker: React.FC<
|
|
|
76
72
|
onValueChange?.(
|
|
77
73
|
(isMultiSelect ? internalValue ?? [] : internalValue ?? "") as any // cannot determine if multiselect or not on compile time
|
|
78
74
|
);
|
|
75
|
+
// onValueChange excluded to prevent running on every re-render when using an anoymous function, which is the common case
|
|
79
76
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
80
77
|
}, [internalValue]);
|
|
81
78
|
|
|
@@ -87,6 +84,7 @@ const DropDownPicker: React.FC<
|
|
|
87
84
|
|
|
88
85
|
return (
|
|
89
86
|
<PickerInputContainer
|
|
87
|
+
testID="dropdown-picker"
|
|
90
88
|
Icon={Icon}
|
|
91
89
|
placeholder={placeholder}
|
|
92
90
|
selectedValue={value}
|