Merge branch 'dev-5.x' into feature/clear-text-on-select-item

Author: hossein-zare

index.d.ts

@@ -125,7 +125,7 @@ declare module 'react-native-dropdown-picker' {
     listItemLabelStyle: StyleProp<TextStyle>;
     listParentContainerStyle: StyleProp<ViewStyle>;
     listParentLabelStyle: StyleProp<TextStyle>;
-    onPress: (value: T) => void;
+    onPress: (item: ItemType<T>, custom?: boolean) => void;
     parent: T;
     props: ViewProps;
     rtl: boolean;
@@ -171,7 +171,7 @@ declare module 'react-native-dropdown-picker' {
       style: StyleProp<ViewStyle>;
     }) => JSX.Element;
     arrowIconContainerStyle?: StyleProp<ViewStyle>;
-    arrowIconStyle?: StyleProp<ViewStyle>;
+    arrowIconStyle?: StyleProp<ViewStyle | ImageStyle>;
     ArrowUpIconComponent?: (props: {
       style: StyleProp<ViewStyle>;
     }) => JSX.Element;
@@ -197,6 +197,7 @@ declare module 'react-native-dropdown-picker' {
     customItemContainerStyle?: StyleProp<ViewStyle>;
     customItemLabelStyle?: StyleProp<TextStyle>;
     clearSearchFieldOnSelect?: boolean;
+    customItemValueDelimiter?: string;
     disableBorderRadius?: boolean;
     disabledItemContainerStyle?: StyleProp<ViewStyle>;
     disabledItemLabelStyle?: StyleProp<TextStyle>;
@@ -272,7 +273,7 @@ declare module 'react-native-dropdown-picker' {
     theme?: ThemeNameType;
     TickIconComponent?: (props: { style: StyleProp<ViewStyle> }) => JSX.Element;
     tickIconContainerStyle?: StyleProp<ViewStyle>;
-    tickIconStyle?: StyleProp<ViewStyle>;
+    tickIconStyle?: StyleProp<ViewStyle | ImageStyle>;
     translation?: Partial<TranslationInterface>;
     zIndexInverse?: number;
     zIndex?: number;

package-lock.json

@@ -44,7 +44,8 @@
   "main": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "react-native-gesture-handler": "~2.13.1"
+    "react-native-gesture-handler": "~2.13.1",
+    "react-native-safe-area-context": "^5.6.1"
   },
   "devDependencies": {
     "@types/react": "^18.2.25",

package.json

@@ -16,14 +16,15 @@ import {
   Image,
   Modal,
   Platform,
-  SafeAreaView,
   StyleSheet,
   Text,
   TextInput,
   TouchableOpacity,
   View,
 } from 'react-native';
 
+import { SafeAreaView } from 'react-native-safe-area-context';
+
 import { FlatList, ScrollView } from 'react-native-gesture-handler';
 import {
   ASCII_CODE,
@@ -84,6 +85,7 @@ function Picker({
   customItemContainerStyle = {},
   customItemLabelStyle = {},
   clearSearchFieldOnSelect = false,
+  customItemValueDelimiter = '-',
   disableBorderRadius = true,
   disabled = false,
   disabledItemContainerStyle = {},
@@ -555,7 +557,7 @@ function Picker({
     ) {
       results.push({
         [ITEM_SCHEMA.label]: searchText,
-        [ITEM_SCHEMA.value]: searchText.replace(' ', '-'),
+        [ITEM_SCHEMA.value]: customItemValueDelimiter ? searchText.replaceAll(' ', customItemValueDelimiter) : searchText,
         custom: true,
       });
     }
@@ -1751,8 +1753,8 @@ function Picker({
   const _modalTitleStyle = useMemo(
     () => [
       THEME.modalTitle,
+       ...[textStyle].flat(),
       ...[modalTitleStyle].flat(),
-      ...[textStyle].flat(),
     ],
     [textStyle, modalTitleStyle, THEME],
   );

src/components/Picker.js

@@ -86,4 +86,13 @@ export default {
     },
     NOTHING_TO_SHOW: '검색된 사항이 존재하지 않습니다.',
   },
+  CN: {
+    PLACEHOLDER: '选择其中一项',
+    SEARCH_PLACEHOLDER: '输入内容...',
+    SELECTED_ITEMS_COUNT_TEXT: {
+      1: '已选择一项',
+      n: '已选择 {count} 项',
+    },
+    NOTHING_TO_SHOW: '没有内容可显示!',
+  },
 };