Merge branch 'dev-harmony' into dev-harmony-optimize-rn

jdf2e · Jul 22, 2024 · c12046e · c12046e
2 parents e853f33 + eb2d633
commit c12046e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dongdesign/components",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.1",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/es/packages/nutui.react.build.js",

diff --git a/packages/nutui-taro-demo-rn/package.json b/packages/nutui-taro-demo-rn/package.json
@@ -112,4 +112,4 @@
   "resolutions": {
     "react-native-webview": "13.6.3"
   }
-}
+}
diff --git a/src/utils/px-transform.ts b/src/utils/px-transform.ts
@@ -1,7 +1,9 @@
 import { pxTransform as transform } from '@tarojs/taro'
 import { harmony, rn } from './platform-taro'
 
-export default function pxTransform(value: number) {
-  if (harmony() || rn()) return transform(value)
+export default function pxTransform(value: number, radix?: number): any {
+  // @ts-ignore
+  if (harmony()) return transform(value, radix || 375)
+  if (rn()) return value
   return `${value}px`
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,4 +112,4 @@ @@
       "resolutions": {
         "react-native-webview": "13.6.3"
       }
-    }
+    }