fix:合并

Author: panbibi

.github/workflows/build_ios_app.yml

@@ -9,8 +9,8 @@ jobs:
   build:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
 

.github/workflows/ci.yml

@@ -12,11 +12,10 @@ jobs:
   build-deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
-          registry-url: 'https://registry.npmjs.org'
 
       - run: yarn install
       - run: npm run build

.github/workflows/pull_request.yml

@@ -8,10 +8,10 @@ env:
 
 jobs:
   build-deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
 

example/base/package.json

@@ -10,7 +10,7 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "react": "18.2.0",
+    "react": "18.0.0",
     "react-native": "0.69.7",
     "@uiw/react-native": "3.2.3",
     "@uiw/react-native-image-picker": "3.2.3",

example/examples/ios/Podfile.lock

@@ -284,6 +284,10 @@ PODS:
   - React-jsinspector (0.69.7)
   - React-logger (0.69.7):
     - glog
+  - react-native-cameraroll (5.3.1):
+    - React-Core
+  - react-native-image-picker (5.3.1):
+    - React-Core
   - react-native-safe-area-context (4.3.4):
     - RCT-Folly
     - RCTRequired
@@ -413,6 +417,8 @@ DEPENDENCIES:
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
   - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
+  - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
+  - react-native-image-picker (from `../node_modules/react-native-image-picker`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
@@ -489,6 +495,10 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
   React-logger:
     :path: "../node_modules/react-native/ReactCommon/logger"
+  react-native-cameraroll:
+    :path: "../node_modules/@react-native-camera-roll/camera-roll"
+  react-native-image-picker:
+    :path: "../node_modules/react-native-image-picker"
   react-native-safe-area-context:
     :path: "../node_modules/react-native-safe-area-context"
   React-perflogger:
@@ -559,6 +569,8 @@ SPEC CHECKSUMS:
   React-jsiexecutor: a73bec0218ba959fc92f811b581ad6c2270c6b6f
   React-jsinspector: 8134ee22182b8dd98dc0973db6266c398103ce6c
   React-logger: 1e7ac909607ee65fd5c4d8bea8c6e644f66b8843
+  react-native-cameraroll: f3050460fe1708378698c16686bfaa5f34099be2
+  react-native-image-picker: ec9b713e248760bfa0f879f0715391de4651a7cb
   react-native-safe-area-context: dfe5aa13bee37a0c7e8059d14f72ffc076d120e9
   React-perflogger: 8e832d4e21fdfa613033c76d58d7e617341e804b
   React-RCTActionSheet: 9ca778182a9523991bff6381045885b6e808bb73
@@ -580,6 +592,6 @@ SPEC CHECKSUMS:
   Yoga: 0b84a956f7393ef1f37f3bb213c516184e4a689d
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 36745b97236db17730b2d687b78fe071003a4a52
+PODFILE CHECKSUM: d4d2826c3f25f928be9b489778a443d49118b6c5
 
 COCOAPODS: 1.11.3

example/examples/package.json

@@ -14,7 +14,7 @@
     "@react-navigation/native": "~6.0.11",
     "@react-navigation/stack": "~6.2.2",
     "@uiw/react-native": "3.2.3",
-    "react": "18.2.0",
+    "react": "18.0.0",
     "react-native": "0.69.7",
     "react-native-gesture-handler": "~2.5.0",
     "react-native-safe-area-context": "~4.3.1",

example/examples/src/routes.tsx

@@ -362,14 +362,6 @@ export const stackPageData: Routes[] = [
       description: 'TransitionImage 图片过渡',
     },
   },
-  // {
-  //   name: 'Card',
-  //   component: require('./routes/Card').default,
-  //   params: {
-  //     title: 'Card 卡片',
-  //     description: 'QuickList 最基础的卡片容器，可承载文字、列表、图片、段落。',
-  //   },
-  // },
   {
     name: 'Progress',
     component: require('./routes/Progress').default,

package.json

@@ -53,7 +53,7 @@
     "babel-preset-react-native": "4.0.1",
     "fs-extra": "~10.1.0",
     "metro-react-native-babel-preset": "0.73.6",
-    "react": "18.2.0",
+    "react": "18.0.0",
     "react-native": "0.69.7"
   },
   "dependencies": {
@@ -65,8 +65,8 @@
     "typescript": "^4.7.4"
   },
   "resolutions": {
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0"
+    "react": "18.0.0",
+    "react-dom": "18.0.0"
   },
   "workspaces": {
     "packages": [

packages/core/package.json

@@ -57,7 +57,7 @@
     "@types/react-native": "0.69.1",
     "@uiw/icons": "2.5.3",
     "@validator.tool/hook": "2.2.4",
-    "ahooks": "2.10.14",
+    "ahooks": "3.7.6",
     "dayjs":"~1.11.7",
     "color": "4.2.3",
     "lodash": "4.17.21",

packages/core/src/DatePicker/components/basic-date-picker/useDatePicker.ts

@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { usePersistFn } from 'ahooks';
+import { useMemoizedFn } from 'ahooks';
 import dayjs, { Dayjs } from 'dayjs';
 import { ItemValue } from '../../../Picker/components/WheelPicker/type';
 import { CascadePickerItemProps, DatePickerPropsBase } from './type';
@@ -320,8 +320,8 @@ export default function useDatePicker({
   };
 
   return {
-    getValueCols: usePersistFn(getValueCols),
-    onValueChange: usePersistFn(onValueChange),
+    getValueCols: useMemoizedFn(getValueCols),
+    onValueChange: useMemoizedFn(onValueChange),
   };
 }