zkit-ui 2.0.1 → 2.0.3

package/dist/ui/Text/index.d.ts

@@ -14,7 +14,7 @@ export interface TextProps extends NativeTextProps {
      */
     variant?: TextVariant;
     /**
-     * Named type scale token, or an unscaled design pixel size that will be resolved through wp(...).
+     * Named type scale token, or a numeric native font size.
      */
     size?: TextSizeValue;
     /**

package/dist/ui/Text/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui/Text/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAGL,IAAI,IAAI,MAAM,EAEd,KAAK,SAAS,EACd,KAAK,SAAS,IAAI,WAAW,EAC7B,KAAK,SAAS,EAGf,MAAM,cAAc,CAAC;AAKtB,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC;AAClG,MAAM,MAAM,QAAQ,GAAG,KAAK,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;AACxF,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,MAAM,CAAC;AAC9C,MAAM,MAAM,QAAQ,GAChB,SAAS,GACT,SAAS,GACT,OAAO,GACP,QAAQ,GACR,SAAS,GACT,SAAS,GACT,SAAS,GACT,QAAQ,GACR,MAAM,GACN,UAAU,GACV,SAAS,GACT,WAAW,GACX,aAAa,GACb,SAAS,CAAC;AACd,MAAM,MAAM,UAAU,GAClB,SAAS,GACT,QAAQ,GACR,UAAU,GACV,MAAM,GACN,OAAO,GACP,OAAO,GACP,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;AACzC,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,MAAM,CAAC;AAE5C,KAAK,eAAe,GAAG,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,UAAU,GAAG,eAAe,GAAG,eAAe,CAAC,CAAC;AAEnG,MAAM,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,MAAM,CAAC,CAAC;AAExD,MAAM,WAAW,SAAU,SAAQ,eAAe;IAChD;;OAEG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB;;OAEG;IACH,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;IAC/B,SAAS,CAAC,EAAE,SAAS,CAAC,eAAe,CAAC,CAAC;IACvC,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;IAC7C,aAAa,CAAC,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;IAC7C,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B;AAgcD,eAAO,MAAM,IAAI,qEAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui/Text/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAGL,IAAI,IAAI,MAAM,EAEd,KAAK,SAAS,EACd,KAAK,SAAS,IAAI,WAAW,EAC7B,KAAK,SAAS,EAGf,MAAM,cAAc,CAAC;AAKtB,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC;AAClG,MAAM,MAAM,QAAQ,GAAG,KAAK,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;AACxF,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,MAAM,CAAC;AAC9C,MAAM,MAAM,QAAQ,GAChB,SAAS,GACT,SAAS,GACT,OAAO,GACP,QAAQ,GACR,SAAS,GACT,SAAS,GACT,SAAS,GACT,QAAQ,GACR,MAAM,GACN,UAAU,GACV,SAAS,GACT,WAAW,GACX,aAAa,GACb,SAAS,CAAC;AACd,MAAM,MAAM,UAAU,GAClB,SAAS,GACT,QAAQ,GACR,UAAU,GACV,MAAM,GACN,OAAO,GACP,OAAO,GACP,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;AACzC,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,MAAM,CAAC;AAE5C,KAAK,eAAe,GAAG,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,UAAU,GAAG,eAAe,GAAG,eAAe,CAAC,CAAC;AAEnG,MAAM,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,MAAM,CAAC,CAAC;AAExD,MAAM,WAAW,SAAU,SAAQ,eAAe;IAChD;;OAEG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB;;OAEG;IACH,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;IAC/B,SAAS,CAAC,EAAE,SAAS,CAAC,eAAe,CAAC,CAAC;IACvC,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;IAC7C,aAAa,CAAC,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;IAC7C,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B;AAqcD,eAAO,MAAM,IAAI,qEAAuB,CAAC"}

package/dist/ui/Text/index.js

@@ -248,6 +248,9 @@ function resolveTypographyToken(size) {
         lineHeight: Math.ceil(fontSize * DEFAULT_LINE_HEIGHT_RATIO),
     };
 }
+function shouldScaleTypographyToken(size) {
+    return typeof size === 'string' || !isFiniteNumber(size);
+}
 function readStyleNumber(style, key) {
     const value = style === null || style === void 0 ? void 0 : style[key];
     return isFiniteNumber(value) ? Math.max(0, value) : undefined;
@@ -255,21 +258,22 @@ function readStyleNumber(style, key) {
 function resolveTypographyStyle({ explicitLineHeight, hasExplicitSize, shouldUseVariantDefaults, size, styleFontSize, styleLineHeight, }) {
     const shouldResolveSize = hasExplicitSize || shouldUseVariantDefaults;
     const token = shouldResolveSize ? resolveTypographyToken(size) : undefined;
+    const shouldScaleToken = shouldResolveSize ? shouldScaleTypographyToken(size) : false;
     const nextStyle = {};
     let hasStyle = false;
     if (token) {
-        nextStyle.fontSize = (0, zkit_tools_1.wp)(token.fontSize);
+        nextStyle.fontSize = shouldScaleToken ? (0, zkit_tools_1.wp)(token.fontSize) : token.fontSize;
         hasStyle = true;
     }
     if (styleLineHeight != null) {
         return hasStyle ? nextStyle : undefined;
     }
     if (isFiniteNumber(explicitLineHeight)) {
-        nextStyle.lineHeight = (0, zkit_tools_1.wp)(Math.max(0, explicitLineHeight));
+        nextStyle.lineHeight = Math.max(0, explicitLineHeight);
         hasStyle = true;
     }
     else if (token && styleFontSize == null) {
-        nextStyle.lineHeight = (0, zkit_tools_1.wp)(token.lineHeight);
+        nextStyle.lineHeight = shouldScaleToken ? (0, zkit_tools_1.wp)(token.lineHeight) : token.lineHeight;
         hasStyle = true;
     }
     return hasStyle ? nextStyle : undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zkit-ui",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "private": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -186,11 +186,19 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
+  "scripts": {
+    "build": "node scripts/build.cjs",
+    "verify:entrypoints": "node scripts/verify-entrypoints.cjs",
+    "verify": "pnpm run build && pnpm run verify:entrypoints",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "prepack": "pnpm run build",
+    "prepublishOnly": "pnpm run build"
+  },
   "dependencies": {
     "@vant/area-data": "^2.1.0",
     "dayjs": "^1.11.13",
     "react-native-toast-message": "^2.3.3",
-    "zkit-tools": "1.0.1"
+    "zkit-tools": "workspace:*"
   },
   "peerDependencies": {
     "@expo/vector-icons": "*",
@@ -210,6 +218,7 @@
   },
   "devDependencies": {
     "@expo/vector-icons": "^15.1.1",
+    "@lodev09/react-native-true-sheet": "workspace:*",
     "@shopify/flash-list": "^2.3.1",
     "@types/react": "~19.1.17",
     "dayjs": "^1.11.13",
@@ -225,13 +234,6 @@
     "react-native-svg": "^15.12.1",
     "react-native-worklets": "0.5.1",
     "sonner-native": "^0.22.2",
-    "typescript": "~5.9.3",
-    "@lodev09/react-native-true-sheet": "3.10.0"
-  },
-  "scripts": {
-    "build": "node scripts/build.cjs",
-    "verify:entrypoints": "node scripts/verify-entrypoints.cjs",
-    "verify": "pnpm run build && pnpm run verify:entrypoints",
-    "typecheck": "tsc -p tsconfig.json --noEmit"
+    "typescript": "~5.9.3"
   }
-}
+}

package/src/ui/Text/README.md

@@ -69,8 +69,8 @@ export function Demo() {
   <Text size="2xl">2xl</Text>
   <Text size="3xl">3xl</Text>
   <Text size="4xl">4xl</Text>
-  <Text size={18} lineHeight={26}>
-    自定义设计尺寸
+  <Text size={wp(18)} lineHeight={wp(26)}>
+    自定义原生尺寸
   </Text>
 </>
 ```
@@ -89,7 +89,7 @@ export function Demo() {
 | `3xl` | `wp(30)` | `wp(38)` |
 | `4xl` | `wp(36)` | `wp(44)` |
 
-传入数字 `size` 或 `lineHeight` 时，数字代表未缩放的设计像素，组件内部会统一转换。
+传入数字 `size` 或 `lineHeight` 时，数字代表调用侧已经计算好的原生尺寸，组件内部不会再次 `wp(...)`。
 通过 `style.fontSize` 直接覆盖字号时，调用侧应传入已经计算好的原生字号；如果没有同时传入 `lineHeight` 或 `style.lineHeight`，组件会移除内置 token 行高，避免字号和行高不匹配。
 
 ## 颜色

package/src/ui/Text/index.tsx

@@ -52,7 +52,7 @@ export interface TextProps extends NativeTextProps {
    */
   variant?: TextVariant;
   /**
-   * Named type scale token, or an unscaled design pixel size that will be resolved through wp(...).
+   * Named type scale token, or a numeric native font size.
    */
   size?: TextSizeValue;
   /**
@@ -313,6 +313,10 @@ function resolveTypographyToken(size: TextSizeValue): TypographyToken {
   };
 }
 
+function shouldScaleTypographyToken(size: TextSizeValue) {
+  return typeof size === 'string' || !isFiniteNumber(size);
+}
+
 function readStyleNumber(style: TextStyle | undefined, key: 'fontSize' | 'lineHeight') {
   const value = style?.[key];
   return isFiniteNumber(value) ? Math.max(0, value) : undefined;
@@ -335,11 +339,12 @@ function resolveTypographyStyle({
 }): TextStyle | undefined {
   const shouldResolveSize = hasExplicitSize || shouldUseVariantDefaults;
   const token = shouldResolveSize ? resolveTypographyToken(size) : undefined;
+  const shouldScaleToken = shouldResolveSize ? shouldScaleTypographyToken(size) : false;
   const nextStyle: TextStyle = {};
   let hasStyle = false;
 
   if (token) {
-    nextStyle.fontSize = wp(token.fontSize);
+    nextStyle.fontSize = shouldScaleToken ? wp(token.fontSize) : token.fontSize;
     hasStyle = true;
   }
 
@@ -348,10 +353,10 @@ function resolveTypographyStyle({
   }
 
   if (isFiniteNumber(explicitLineHeight)) {
-    nextStyle.lineHeight = wp(Math.max(0, explicitLineHeight));
+    nextStyle.lineHeight = Math.max(0, explicitLineHeight);
     hasStyle = true;
   } else if (token && styleFontSize == null) {
-    nextStyle.lineHeight = wp(token.lineHeight);
+    nextStyle.lineHeight = shouldScaleToken ? wp(token.lineHeight) : token.lineHeight;
     hasStyle = true;
   }