Merge branch 'dev' of https://github.com/uiwjs/react-native-uiw into dev

Author: ChenlingasMx

example/examples/ios/Podfile.lock

@@ -367,8 +367,8 @@ PODS:
   - RNScreens (3.15.0):
     - React-Core
     - React-RCTImage
-  - RNSVG (12.1.1):
-    - React
+  - RNSVG (13.0.0):
+    - React-Core
   - SocketRocket (0.6.0)
   - Yoga (1.14.0)
   - YogaKit (1.18.1):
@@ -587,7 +587,7 @@ SPEC CHECKSUMS:
   RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
   RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50
   RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7
-  RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f
+  RNSVG: 42a0c731b11179ebbd27a3eeeafa7201ebb476ff
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   Yoga: 0b84a956f7393ef1f37f3bb213c516184e4a689d
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

packages/core/src/DatePicker/README.md

@@ -6,10 +6,11 @@ DatePicker
 
 ### 基础示例
 
-```jsx
-import { useState } from 'react'
+```jsx mdx:preview&background=#bebebe29
+import { Button } from '@uiw/react-native';
+import React,{ useState } from 'react';
 import { View,Text } from 'react-native';
-import { DatePicker } from '@uiw/react-native';
+import  DatePicker  from '@uiw/react-native/lib/DatePicker/date-picker';
 function Demo() {
   const [visible,setVisible] = useState(false)
   const [formatDate,setFormatDate] = useState('')
@@ -62,10 +63,10 @@ DatePeriodInput
 
 ### 基础示例
 
-```jsx
-import { useState } from 'react'
-import { View,Text } from 'react-native';
-import { DatePeriodInput } from '@uiw/react-native';
+```jsx mdx:preview&background=#bebebe29
+import React,{ useState }  from 'react';
+import { View} from 'react-native';
+import  DatePeriodInput  from '@uiw/react-native/lib/DatePicker/date-period-input';
 function Demo() {
   const [value,setValue] = useState(undefined)
   return (

packages/core/src/DatePicker/date-period-input/index.tsx

@@ -88,7 +88,7 @@ const DatePeriodInput: FC<DatePeriodInputProps> = ({
             <Icon name="date" size={16} color={theme.colors.primary_text || '#ccc'} />
             <Text
               color={disabled ? 'disabled' : 'text'}
-              style={{ ...theme.textVariants.p1, marginLeft: theme.spacing.x2 || 8 }}
+              style={[p1, { marginLeft: 8 }]} //...theme.textVariants.p1
             >
               {dates[0] ? dayjs(dates[0]).format(format) : placeholder[0]}
             </Text>
@@ -103,8 +103,8 @@ const DatePeriodInput: FC<DatePeriodInputProps> = ({
             </AnimatedTouchableIcon>
           )}
         </TouchableOpacity>
-        <View style={{ marginHorizontal: theme.spacing.x2 || 8 }}>
-          <Text color="text" style={{ ...(theme.textVariants.p1 || p1) }}>
+        <View style={{ marginHorizontal: 8 }}>
+          <Text color="text" style={p1}>
             ~
           </Text>
         </View>
@@ -126,10 +126,7 @@ const DatePeriodInput: FC<DatePeriodInputProps> = ({
         >
           <Flex style={{ alignItems: 'center' }}>
             <Icon size={16} name="date" color={theme.colors.primary_text || '#ccc'} />
-            <Text
-              color={disabled ? 'disabled' : 'text'}
-              style={{ ...(theme.textVariants.p1 || p1), marginLeft: theme.spacing.x2 || 8 }}
-            >
+            <Text color={disabled ? 'disabled' : 'text'} style={[p1, { marginLeft: 8 }]}>
               {dates[1] ? dayjs(dates[1]).format(format) : placeholder[1]}
             </Text>
           </Flex>

packages/core/src/DatePicker/date-picker/index.tsx

@@ -67,7 +67,7 @@ const DatePicker = forwardRef<DatePickerRef, DatePickerProps>((props, ref) => {
     return (
       <Modal visible={visible} onClosed={handleClose}>
         <SafeAreaView>
-          <View style={{ padding: theme.spacing.x2 }}>
+          <View style={{ padding: 8 }}>
             <Flex justify="between">
               <Flex.Item>
                 <TouchableOpacity activeOpacity={0.5} onPress={handleClose}>

packages/core/src/Form/README.md

@@ -326,7 +326,7 @@ export default FormDemo
 | 参数 | 说明 | 类型 | 默认值 |
 |------|------|-----|------|
 | `field` | 字段名 | string | - |
-| `type` | 字段类型(`input` \| `textArea`  \| `slider` \| `rate` \| `radio` \| `search`\| `switch`\| `checkBox`\| `stepper`\| `picker`\| `treeSelect`\ | `datePicker`\ | `cardList`) | string | - |
+| `type` | 字段类型(`input` \| `textArea`  \| `slider` \| `rate` \| `radio` \| `search`\| `switch`\| `checkBox`\| `stepper`\| `picker`\| `treeSelect`\| `datePicker`\| `cardList`) | string | - |
 | `name` | 标签名 | string | - |
 | `validate` | 验证规则 | RulesOption['validate'] | - |
 | `options` | 集合 | Array<{ label: string; value: KeyType }> | - |

packages/core/src/Picker/components/WheelPicker/index.tsx

@@ -78,7 +78,7 @@ export default function WheelPicker({
             transform: [{ translateY: -itemHeight / 2 }],
             height: itemHeight,
             backgroundColor: indicatorBackgroundColor ?? theme.colors.gray100,
-            borderRadius: theme.borderRadii.x2 || 2,
+            borderRadius: 2,
           },
         ]}
       />

packages/core/src/Picker/index.tsx

@@ -141,7 +141,7 @@ function Picker(props: ComPickerProps) {
     return (
       <Modal visible={visible} onClosed={handleClose}>
         <SafeAreaView>
-          <View style={{ padding: theme.spacing.x2 }}>
+          <View style={{ padding: 8 }}>
             <Flex justify="between">
               <Flex.Item>
                 <TouchableOpacity activeOpacity={0.5} onPress={handleClose}>