@tarojs/taro-rn 3.8.0-canary.0 → 4.0.0-beta.0

package/dist/lib/getRecorderManager/index.js

@@ -127,7 +127,12 @@ class RecorderManager {
                     const uri = recordInstance.getURI() || '';
                     const info = yield FileSystem.getInfoAsync(uri);
                     // console.log(`FILE INFO: ${JSON.stringify(info)}`)
-                    const result = { tempFilePath: uri, duration: recordStatus.durationMillis, fileSize: info.size };
+                    const result = {
+                        tempFilePath: uri,
+                        duration: recordStatus.durationMillis,
+                        // @ts-ignore
+                        fileSize: info.size
+                    };
                     this.onStopCallback && this.onStopCallback(result);
                 }
             }

package/dist/lib/getRecorderManager/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/getRecorderManager/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/getRecorderManager/index.ts"],"names":[],"mappings":"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"}

package/dist/lib/getSystemInfoSync/index.js

@@ -1,4 +1,4 @@
-import { Platform, Dimensions, PixelRatio } from 'react-native';
+import { Platform, Dimensions, PixelRatio, StatusBar } from 'react-native';
 import { initialWindowMetrics } from 'react-native-safe-area-context';
 import DeviceInfo from 'react-native-device-info';
 export function getSystemInfoSync() {
@@ -17,7 +17,12 @@ export function getSystemInfoSync() {
     const deviceOrientation = screenHeight > screenWidth ? 'portrait' : 'landscape';
     // NOTE：在竖屏正方向下的安全区域
     let safeArea = {};
-    const { top = 0, bottom = 0 } = (initialWindowMetrics === null || initialWindowMetrics === void 0 ? void 0 : initialWindowMetrics.insets) || {};
+    let { top = 0, bottom = 0 } = (initialWindowMetrics === null || initialWindowMetrics === void 0 ? void 0 : initialWindowMetrics.insets) || {};
+    // NOTE：android 在沉浸式切换时，有几率top值为0。
+    // https://github.com/th3rdwave/react-native-safe-area-context/issues/364
+    if (Platform.OS === 'android') {
+        top = StatusBar.currentHeight || 0;
+    }
     try {
         const W = Math.min(screenWidth, screenHeight);
         const H = Math.max(screenWidth, screenHeight);

package/dist/lib/getSystemInfoSync/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/getSystemInfoSync/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/getSystemInfoSync/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-rn",
-  "version": "3.8.0-canary.0",
+  "version": "4.0.0-beta.0",
   "description": "Taro RN framework",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
@@ -23,77 +23,75 @@
   "dependencies": {
     "@bam.tech/react-native-image-resizer": "~3.0.4",
     "@react-native-async-storage/async-storage": "~1.17.7",
-    "@react-native-camera-roll/camera-roll": "~5.0.4",
+    "@react-native-camera-roll/camera-roll": "~5.2.3",
     "@react-native-clipboard/clipboard": "~1.11.1",
     "@react-native-community/geolocation": "~3.0.2",
     "@react-native-community/netinfo": "~9.3.0",
     "babel-preset-expo": "~9.2.1",
     "base64-js": "^1.3.0",
     "deprecated-react-native-prop-types": "^2.3.0",
-    "expo-av": "~13.0.0",
-    "expo-barcode-scanner": "~12.0.0",
-    "expo-brightness": "~11.0.0",
-    "expo-camera": "~13.0.0",
-    "expo-file-system": "~15.1.1",
-    "expo-image-picker": "~14.0.0",
-    "expo-keep-awake": "~11.0.1",
-    "expo-location": "~15.0.1",
-    "expo-sensors": "~12.0.1",
+    "expo-av": "~13.2.1",
+    "expo-barcode-scanner": "~12.3.1",
+    "expo-brightness": "~11.2.1",
+    "expo-camera": "~13.2.1",
+    "expo-file-system": "~15.2.2",
+    "expo-image-picker": "~14.1.1",
+    "expo-keep-awake": "~12.0.1",
+    "expo-location": "~15.1.1",
+    "expo-sensors": "~12.1.1",
     "nullthrows": "^1.1.1",
     "prop-types": "^15.8.1",
-    "react-native-device-info": "~10.3.0",
+    "react-native-device-info": "~10.4.0",
     "react-native-image-zoom-viewer": "^3.0.1",
     "react-native-root-siblings": "^4.1.1",
     "react-native-root-toast": "^3.0.1",
-    "react-native-safe-area-context": "~4.4.1",
+    "react-native-safe-area-context": "~4.5.0",
     "react-native-stylekit": "^1.0.0",
     "react-native-syan-image-picker": "0.5.3",
-    "@tarojs/runtime-rn": "3.8.0-canary.0"
+    "@tarojs/runtime-rn": "4.0.0-beta.0"
   },
   "devDependencies": {
     "@babel/core": "^7.14.5",
     "@babel/preset-env": "^7.14.5",
     "@jest/globals": "^26.6.2",
-    "@testing-library/jest-native": "^4.0.4",
-    "@testing-library/react-native": "^11.5.0",
+    "@testing-library/jest-native": "^5.4.2",
+    "@testing-library/react-native": "^12.0.1",
     "@types/jest": "^27.4.1",
-    "@types/react-native": "^0.69.8",
-    "expo": "~47.0.3",
-    "expo-modules-core": "~1.0.2",
+    "expo": "~48.0.0",
     "fbjs-scripts": "^3.0.1",
-    "jest": "^26.4.2",
-    "jest-cli": "^26.4.2",
-    "jest-environment-node": "^26.0.0",
-    "jest-expo": "^47.0.0",
-    "metro-react-native-babel-preset": "^0.72.1",
+    "jest": "^29.3.1",
+    "jest-cli": "^29.3.1",
+    "jest-environment-node": "^29.5.0",
+    "jest-expo": "^48.0.2",
+    "metro-react-native-babel-preset": "^0.73.7",
     "mock-socket": "^7.1.0",
-    "react": "18.1.0",
-    "react-native": "^0.70.5",
-    "react-test-renderer": "18.1.0"
+    "react": "18.2.0",
+    "react-native": "^0.71.3",
+    "react-test-renderer": "18.2.0"
   },
   "peerDependencies": {
     "@bam.tech/react-native-image-resizer": "~3.0.4",
     "@react-native-async-storage/async-storage": "~1.17.7",
-    "@react-native-camera-roll/camera-roll": "~5.0.4",
+    "@react-native-camera-roll/camera-roll": "~5.2.3",
     "@react-native-clipboard/clipboard": "~1.11.1",
     "@react-native-community/geolocation": "~3.0.2",
     "@react-native-community/netinfo": "~9.3.0",
-    "expo-av": "~13.0.0",
-    "expo-barcode-scanner": "~12.0.0",
-    "expo-brightness": "~11.0.0",
-    "expo-camera": "~13.0.0",
-    "expo-file-system": "~15.1.1",
-    "expo-image-picker": "~14.0.0",
-    "expo-keep-awake": "~11.0.1",
-    "expo-location": "~15.0.1",
-    "expo-sensors": "~12.0.1",
-    "react-native-device-info": "~10.3.0",
-    "react-native-safe-area-context": "~4.4.1",
+    "expo-av": "~13.2.1",
+    "expo-barcode-scanner": "~12.3.1",
+    "expo-brightness": "~11.2.1",
+    "expo-camera": "~13.2.1",
+    "expo-file-system": "~15.2.2",
+    "expo-image-picker": "~14.1.1",
+    "expo-keep-awake": "~12.0.1",
+    "expo-location": "~15.1.1",
+    "expo-sensors": "~12.1.1",
+    "react-native-device-info": "~10.4.0",
+    "react-native-safe-area-context": "~4.5.0",
     "react-native-syan-image-picker": "0.5.3"
   },
   "scripts": {
     "assets": "cpy 'src/**/*.png' '!src/__tests__/*' dist",
-    "build": "rimraf ./dist && tsc && pnpm run assets && pnpm run script",
+    "build": "rimraf --impl=move-remove ./dist && tsc && pnpm run assets && pnpm run script",
     "dev": "pnpm run assets && tsc --watch",
     "lint": "eslint .",
     "test": "jest --silent",

package/src/__tests__/__snapshots__/scanCode.test.tsx.snap

@@ -3,8 +3,8 @@
 exports[`scanCode should render scanCode success 1`] = `
 <View
   style={
-    Array [
-      Object {
+    [
+      {
         "alignItems": "center",
         "backgroundColor": "#FFF",
         "flex": 1,
@@ -22,13 +22,13 @@ exports[`scanCode should render scanCode success 1`] = `
     onMountError={[Function]}
     onPictureSaved={[Function]}
     proxiedProperties={
-      Object {
+      {
         "autoFocus": undefined,
         "barCodeScannerEnabled": true,
-        "barCodeScannerSettings": Object {
-          "barCodeTypes": Array [],
+        "barCodeScannerSettings": {
+          "barCodeTypes": [],
         },
-        "faceDetectorSettings": Object {},
+        "faceDetectorSettings": {},
         "flashMode": undefined,
         "focusDepth": 0,
         "type": undefined,
@@ -37,7 +37,7 @@ exports[`scanCode should render scanCode success 1`] = `
       }
     }
     style={
-      Object {
+      {
         "height": 1334,
         "width": 750,
       }
@@ -45,6 +45,23 @@ exports[`scanCode should render scanCode success 1`] = `
   />
   <View
     accessibilityLabel="Close"
+    accessibilityState={
+      {
+        "busy": undefined,
+        "checked": undefined,
+        "disabled": undefined,
+        "expanded": undefined,
+        "selected": undefined,
+      }
+    }
+    accessibilityValue={
+      {
+        "max": undefined,
+        "min": undefined,
+        "now": undefined,
+        "text": undefined,
+      }
+    }
     accessible={true}
     collapsable={false}
     focusable={true}
@@ -56,7 +73,7 @@ exports[`scanCode should render scanCode success 1`] = `
     onResponderTerminationRequest={[Function]}
     onStartShouldSetResponder={[Function]}
     style={
-      Object {
+      {
         "left": 20,
         "opacity": 1,
         "position": "absolute",
@@ -66,7 +83,7 @@ exports[`scanCode should render scanCode success 1`] = `
   >
     <View
       style={
-        Object {
+        {
           "paddingTop": 20,
         }
       }
@@ -74,7 +91,7 @@ exports[`scanCode should render scanCode success 1`] = `
       <Image
         source={1}
         style={
-          Object {
+          {
             "height": 25,
             "marginTop": null,
             "width": 25,
@@ -84,6 +101,23 @@ exports[`scanCode should render scanCode success 1`] = `
     </View>
   </View>
   <View
+    accessibilityState={
+      {
+        "busy": undefined,
+        "checked": undefined,
+        "disabled": undefined,
+        "expanded": undefined,
+        "selected": undefined,
+      }
+    }
+    accessibilityValue={
+      {
+        "max": undefined,
+        "min": undefined,
+        "now": undefined,
+        "text": undefined,
+      }
+    }
     accessible={true}
     collapsable={false}
     focusable={true}
@@ -95,7 +129,7 @@ exports[`scanCode should render scanCode success 1`] = `
     onResponderTerminationRequest={[Function]}
     onStartShouldSetResponder={[Function]}
     style={
-      Object {
+      {
         "bottom": 40,
         "opacity": 1,
         "position": "absolute",
@@ -105,7 +139,7 @@ exports[`scanCode should render scanCode success 1`] = `
   >
     <View
       style={
-        Object {
+        {
           "paddingTop": 20,
         }
       }
@@ -113,7 +147,7 @@ exports[`scanCode should render scanCode success 1`] = `
       <Image
         source={1}
         style={
-          Object {
+          {
             "height": 20,
             "width": 20,
           }

package/src/__tests__/websocket.test.ts

@@ -105,7 +105,7 @@ describe('websocket', () => {
     socketTaskThree.close({})
   })
   // @ts-ignore
-  test('should work basically', async (done) => {
+  test('should work basically', (done) => {
     const fakeURL = 'wss://localhost:8080'
     const mockServer = new Server(fakeURL)
     const connected = jest.fn()
@@ -123,47 +123,48 @@ describe('websocket', () => {
       mockServer.send(msg2)
     })
 
-    const socketTask = await Taro.connectSocket({
+    Taro.connectSocket({
       url: fakeURL,
       success,
       complete
-    })
-
-    const socketTaskSend = jest.spyOn(socketTask.ws, 'send')
-    const socketTaskClose = jest.spyOn(socketTask.ws, 'close')
-    const closeCode = 100
-    const closeReason = 'hey'
-
-    socketTask.onOpen(() => {
-      socketTask.send({
-        data: msg,
-        success: (res) => {
-          expect(socketTaskSend).toHaveBeenCalled()
-          expect(res.errMsg).toMatch('sendSocketMessage:ok')
-        },
+    }).then(socketTask => {
+
+      const socketTaskSend = jest.spyOn(socketTask.ws, 'send')
+      const socketTaskClose = jest.spyOn(socketTask.ws, 'close')
+      const closeCode = 100
+      const closeReason = 'hey'
+  
+      socketTask.onOpen(() => {
+        socketTask.send({
+          data: msg,
+          success: (res) => {
+            expect(socketTaskSend).toHaveBeenCalled()
+            expect(res.errMsg).toMatch('sendSocketMessage:ok')
+          },
+        })
       })
-    })
-
-    socketTask.onMessage(res => {
-      expect(res.data).toMatch(msg2)
-      socketTask.close({
-        code: closeCode,
-        reason: closeReason,
-        success: (res) => {
-          expect(socketTaskClose).toHaveBeenCalled()
-          expect(res.errMsg).toMatch('sendSocketMessage:ok')
-        },
+  
+      socketTask.onMessage(res => {
+        expect(res.data).toMatch(msg2)
+        socketTask.close({
+          code: closeCode,
+          reason: closeReason,
+          success: (res) => {
+            expect(socketTaskClose).toHaveBeenCalled()
+            expect(res.errMsg).toMatch('sendSocketMessage:ok')
+          },
+        })
+      })
+  
+      socketTask.onClose(({ code, reason }) => {
+        const expectMsg = 'connectSocket:ok'
+        expect(connected.mock.calls.length).toBe(1)
+        expect(success.mock.calls[0][0].errMsg).toMatch(expectMsg)
+        expect(complete.mock.calls[0][0].errMsg).toMatch(expectMsg)
+        expect(code).toBe(closeCode)
+        expect(reason).toBe(closeReason)
+        done()
       })
-    })
-
-    socketTask.onClose(({ code, reason }) => {
-      const expectMsg = 'connectSocket:ok'
-      expect(connected.mock.calls.length).toBe(1)
-      expect(success.mock.calls[0][0].errMsg).toMatch(expectMsg)
-      expect(complete.mock.calls[0][0].errMsg).toMatch(expectMsg)
-      expect(code).toBe(closeCode)
-      expect(reason).toBe(closeReason)
-      done()
     })
   })
 })

package/src/lib/getRecorderManager/index.ts

@@ -151,7 +151,12 @@ class RecorderManager {
         const info = await FileSystem.getInfoAsync(uri)
         // console.log(`FILE INFO: ${JSON.stringify(info)}`)
 
-        const result = { tempFilePath: uri, duration: recordStatus.durationMillis, fileSize: info.size }
+        const result = {
+          tempFilePath: uri,
+          duration: recordStatus.durationMillis,
+          // @ts-ignore
+          fileSize: info.size
+        }
         this.onStopCallback && this.onStopCallback(result)
       }
     } catch (error) {

package/src/lib/getSystemInfoSync/index.ts

@@ -1,7 +1,8 @@
 import {
   Platform,
   Dimensions,
-  PixelRatio
+  PixelRatio,
+  StatusBar
 } from 'react-native'
 import { initialWindowMetrics } from 'react-native-safe-area-context'
 import DeviceInfo from 'react-native-device-info'
@@ -24,7 +25,11 @@ export function getSystemInfoSync(): Taro.getSystemInfoSync.Result {
 
   // NOTE：在竖屏正方向下的安全区域
   let safeArea = {}
-  const { top = 0, bottom = 0 } = initialWindowMetrics?.insets || {}
+  let { top = 0, bottom = 0 } = initialWindowMetrics?.insets || {}
+  // NOTE：android 在沉浸式切换时，有几率top值为0。
+  // https://github.com/th3rdwave/react-native-safe-area-context/issues/364
+  if(Platform.OS === 'android') { top = StatusBar.currentHeight || 0; }
+
   try {
     const W = Math.min(screenWidth, screenHeight)
     const H = Math.max(screenWidth, screenHeight)

package/types/overlay.d.ts

@@ -1,9 +1,9 @@
 import Taro from '@tarojs/taro'
 
 declare module '@tarojs/taro' {
-  namespace vibrateShort {
-    interface Option {
-      type?: 'heavy' | 'medium' | 'light'
-    }
-  }
+  // namespace vibrateShort {
+  //   interface Option {
+  //     type?: 'heavy' | 'medium' | 'light'
+  //   }
+  // }
 }