@unif/react-native-design 0.19.0 → 0.21.0

package/README.md

@@ -5,7 +5,7 @@
 [![License](https://img.shields.io/npm/l/@unif/react-native-design.svg?color=blue)](LICENSE)
 [![Docs](https://img.shields.io/badge/docs-unif--design.github.io-orange.svg)](https://unif-design.github.io/react-native-design/)
 
-Unif 设计系统 —— theme(设计令牌)+ 组件 + 图标 + utils,面向 React Native 0.85 新架构(Fabric + TurboModule)。所有 Unif 应用与端能力包的 UI 基座。
+Unif 设计系统 —— theme(设计令牌)+ 组件 + 图标 + utils,面向 React Native 0.86 新架构(Fabric + TurboModule)。所有 Unif 应用与端能力包的 UI 基座。
 
 ## 特性
 
@@ -34,15 +34,21 @@ yarn add react-native-svg \
 
 iOS 另需在 `ios/` 执行 `bundle exec pod install`。完整步骤见[文档站 · 快速开始](https://unif-design.github.io/react-native-design/docs/getting-started)。
 
+`react-native-worklets` 的 Babel 插件与 Metro transformer 由宿主工程提供,不随本库分发 —— 宿主需自备与 RN `0.86.2` 匹配的 `@babel/core`、`@react-native/babel-preset@0.86.x`、`@react-native/metro-config@0.86.x`。
+
+`react-native-reanimated-carousel@5.0.0` 发布的 RNGH peer 是 `>=2.9.0 <3.0.0`,与本包要求的 `>=3.0.0 <4.0.0` 无交集;该组合已实测适配。消费端只能**接受这条警告**或加**只作用于 Carousel 的窄 override**(npm `overrides`、pnpm `peerDependencyRules.allowedVersions`、Yarn scoped `logFilters`),不要用全局 peer 忽略、`--force` 或 `--legacy-peer-deps`。本仓 `.yarnrc.yml` 里的 `logFilters` 不随 npm 包分发。
+
 ## 快速开始
 
-在 App 根挂一次 `ThemeProvider`,命令式 host(`ToastHost` / `ConfirmHost`)按需添加;`makeStyles` 必须写在模块顶层:
+App 根必须按 `GestureHandlerRootView → SafeAreaProvider → ThemeProvider → App 内容 + Hosts` 装配；`SafeAreaProvider` 从其 peer 包导入，设计系统 API 继续只从包根导入。`makeStyles` 必须写在模块顶层:
 
 ```tsx
 import {
-  ThemeProvider, ToastHost, Button, useThemedStyles, type ColorTokens,
+  ThemeProvider, ToastHost, ConfirmHost, Button, useThemedStyles, type ColorTokens,
 } from '@unif/react-native-design';
 import { View } from 'react-native';
+import { GestureHandlerRootView } from 'react-native-gesture-handler';
+import { SafeAreaProvider } from 'react-native-safe-area-context';
 
 // inline 会破坏 useThemedStyles 的样式缓存
 const makeStyles = (c: ColorTokens) => ({
@@ -59,10 +65,15 @@ function Demo() {
 }
 
 export const App = () => (
-  <ThemeProvider>
-    <Demo />
-    <ToastHost />
-  </ThemeProvider>
+  <GestureHandlerRootView style={{ flex: 1 }}>
+    <SafeAreaProvider>
+      <ThemeProvider>
+        <Demo />
+        <ToastHost />
+        <ConfirmHost />
+      </ThemeProvider>
+    </SafeAreaProvider>
+  </GestureHandlerRootView>
 );
 ```
 
@@ -71,14 +82,59 @@ export const App = () => (
 - **文档站**(快速开始 · 组件 API · 设计令牌 · 设计原则):https://unif-design.github.io/react-native-design/
 - **AI / LLM**(纯 Markdown,按需 fetch,别凭记忆猜 API):
   [llms.txt 索引](https://unif-design.github.io/react-native-design/llms.txt) · [llms-full.txt 全文](https://unif-design.github.io/react-native-design/llms-full.txt)
-- **Agent Skill** `unif-design`(覆盖组件 API、token 规则、与原生 RN 的关键差异):
-  `/plugin marketplace add unif-design/skills` → `/plugin install unif@unif-skills`
+- **Agent Skill** `design`(`unif` plugin,覆盖组件 API、token 规则、与原生 RN 的关键差异):
+  `/plugin marketplace add unif-design/skills` → `/plugin install unif@skills`
+
+## 原生验证宿主(runtime harness)
+
+```sh
+yarn create:runtime-harness
+```
+
+该命令**现场生成**一个一次性的 RN `0.86.2` app,用于人工验证 Jest 覆盖不到的部分:真实 native / Web 结构、44pt 命中框、a11y tree、reduced motion 与命令式 API 的竞态。
+
+它做的事:
+
+1. `yarn prepare` + `yarn pack` 打包**当前源码**,harness 装的是 `file:` tarball,不是 registry 上的版本;
+2. 用 `yarn.lock` 里钉死的官方 `@react-native-community/cli@20.1.0` + `@react-native-community/template@0.86.2` 生成脚手架 —— 两者的版本、template 自带的 React / RN / CLI 版本、以及锁文件里的 `checksum` 都会先校验,任一不符立即失败;
+3. 枚举根 `peerDependencies` 的**每一个**非 optional 项,从根 direct range 精确匹配 `yarn.lock` locator,并交叉验证 installed version 与 peer range;`@babel/core` / `@react-native/metro-config` 也走同一链路,在首次安装前写成精确版本;
+4. 配好 Babel(`react-native-worklets/plugin` 排最后)、Metro、RNGH root import,拷入 `manual-tests/runtime-api/RuntimeApiScreen.tsx`,并逐文件核对生成的 Podfile / Android Gradle 文件与 installed template 捕获的摘要;
+5. 首次 `yarn install` 只在脚本自持的临时 app 内生成 `yarn.lock`,随后立即以同一 manifest / lock 执行 `yarn install --immutable` 最终复验,再执行 `bundle install` + `bundle exec pod install`;完整流程成功后才保留并打印绝对路径与全部 provider 版本。
+
+边界:
+
+- app 只建在**脚本自持的系统临时目录**里(`fs.mkdtempSync`),**不接受调用方传目录**;脚手架之后的任一步失败也会递归删除自己那一个临时路径,只有完整成功才保留。
+- **完全不读、不写、不复制 `example/`** —— 那是启用新架构的 RN `0.85.3` 现有版本 shell,不能作为 RN `0.86.x` 的支持证据。
+- 生成物不入库。
+
+随后在**打印出来的那个目录**里执行(不是在本仓):
+
+```sh
+yarn android
+yarn ios
+```
+
+harness 不携带本仓的 `.yarnrc.yml` `logFilters`,所以安装时会看到那条已知的 RNRC / RNGH peer 警告 —— 这正是消费端会看到的真实情况。
 
 ## 兼容性
 
-- React Native **0.85+**(新架构 Fabric + TurboModule;随 RN 0.85 对应 concurrent React)
-- React 19、TypeScript 6
-- Node.js ≥ 24.13(见 `.nvmrc`)
+支持范围严格来自 `package.json#peerDependencies`;本仓直接验证的版本是 RN `0.86.2` + React `19.2.3`。
+
+| 依赖 | 支持范围 | 本仓验证版本 |
+| --- | --- | --- |
+| `react-native` | `>=0.86.0 <0.87.0` | `0.86.2` |
+| `react` | `>=19.2.3 <20.0.0` | `19.2.3` |
+| `react-native-gesture-handler` | `>=3.0.0 <4.0.0` | `3.1.0` |
+| `react-native-reanimated` | `>=4.5.2 <4.6.0` | `4.5.3` |
+| `react-native-worklets` | `>=0.11.0 <0.12.0` | `0.11.3` |
+| `react-native-reanimated-carousel` | `>=5.0.0 <6.0.0` | `5.0.0` |
+| `react-native-safe-area-context` | `>=5` | `5.7.x` |
+| `react-native-svg` | `>=15` | `15.15.x` |
+| `@sbaiahmed1/react-native-blur` | `>=4` | `4.6.x` |
+
+- 新架构(Fabric + TurboModule)必须开启;旧架构 Bridge、RN `0.85` 及更低版本、RN `0.87+` 都不在支持范围。
+- Node.js `^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0`(`package.json#engines`;本仓 `.nvmrc` 固定 `v24.13.0`)
+- TypeScript 6、Yarn 4
 
 ## 许可
 

package/lib/module/components/business/AvatarWithRing/AvatarWithRing.js

@@ -3,7 +3,7 @@
 import React, { useMemo } from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 import Svg, { Defs, LinearGradient as SvgLinearGradient, Rect, Stop } from 'react-native-svg';
-import { avatarGradient, useTheme } from "../../../theme/index.js";
+import { avatarGradient, useFontScale, useTheme } from "../../../theme/index.js";
 import { useSvgId } from "../useSvgId.js";
 import { makeAvatarStyles } from "./styles.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -25,11 +25,12 @@ export function AvatarWithRing({
     colors: c,
     shadow
   } = useTheme();
+  const fontScale = useFontScale();
   const id = useSvgId('av');
   const {
     inner,
     styles
-  } = useMemo(() => makeAvatarStyles(size, ringColor ?? c.avatarRing, shadow.brandAvatar, c), [size, ringColor, c, shadow.brandAvatar]);
+  } = useMemo(() => makeAvatarStyles(size, ringColor ?? c.avatarRing, shadow.brandAvatar, c, fontScale), [size, ringColor, c, shadow.brandAvatar, fontScale]);
   return /*#__PURE__*/_jsx(View, {
     style: [styles.shell, style],
     testID: testID,
@@ -62,9 +63,7 @@ export function AvatarWithRing({
           fill: `url(#${id})`
         })]
       }), /*#__PURE__*/_jsx(Text, {
-        style: [styles.label, {
-          lineHeight: inner
-        }],
+        style: styles.label,
         children: label
       })]
     })

package/lib/module/components/business/AvatarWithRing/AvatarWithRing.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useMemo","StyleSheet","Text","View","Svg","Defs","LinearGradient","SvgLinearGradient","Rect","Stop","avatarGradient","useTheme","useSvgId","makeAvatarStyles","jsx","_jsx","jsxs","_jsxs","AvatarWithRing","label","size","ringColor","style","testID","colors","c","shadow","id","inner","styles","avatarRing","brandAvatar","shell","children","avatarCore","width","height","absoluteFill","x1","y1","x2","y2","gradientUnits","offset","stopColor","rx","fill","lineHeight"],"sourceRoot":"../../../../../src","sources":["components/business/AvatarWithRing/AvatarWithRing.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,OAAO,QAAQ,OAAO;AACtC,SAASC,UAAU,EAAEC,IAAI,EAAEC,IAAI,QAAQ,cAAc;AACrD,OAAOC,GAAG,IACRC,IAAI,EACJC,cAAc,IAAIC,iBAAiB,EACnCC,IAAI,EACJC,IAAI,QACC,kBAAkB;AACzB,SAASC,cAAc,EAAEC,QAAQ,QAAQ,yBAAgB;AACzD,SAASC,QAAQ,QAAQ,gBAAa;AACtC,SAASC,gBAAgB,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAG5C;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAAC;EAC7BC,KAAK;EACLC,IAAI,GAAG,EAAE;EACTC,SAAS;EACTC,KAAK;EACLC;AACmB,CAAC,EAAqB;EACzC,MAAM;IAAEC,MAAM,EAAEC,CAAC;IAAEC;EAAO,CAAC,GAAGf,QAAQ,CAAC,CAAC;EACxC,MAAMgB,EAAE,GAAGf,QAAQ,CAAC,IAAI,CAAC;EACzB,MAAM;IAAEgB,KAAK;IAAEC;EAAO,CAAC,GAAG7B,OAAO,CAC/B,MACEa,gBAAgB,CAACO,IAAI,EAAEC,SAAS,IAAII,CAAC,CAACK,UAAU,EAAEJ,MAAM,CAACK,WAAW,EAAEN,CAAC,CAAC,EAC1E,CAACL,IAAI,EAAEC,SAAS,EAAEI,CAAC,EAAEC,MAAM,CAACK,WAAW,CACzC,CAAC;EACD,oBACEhB,IAAA,CAACZ,IAAI;IAACmB,KAAK,EAAE,CAACO,MAAM,CAACG,KAAK,EAAEV,KAAK,CAAE;IAACC,MAAM,EAAEA,MAAO;IAAAU,QAAA,eACjDhB,KAAA,CAACd,IAAI;MAACmB,KAAK,EAAEO,MAAM,CAACK,UAAW;MAAAD,QAAA,gBAC7BhB,KAAA,CAACb,GAAG;QAAC+B,KAAK,EAAEP,KAAM;QAACQ,MAAM,EAAER,KAAM;QAACN,KAAK,EAAErB,UAAU,CAACoC,YAAa;QAAAJ,QAAA,gBAC/DlB,IAAA,CAACV,IAAI;UAAA4B,QAAA,eAGHhB,KAAA,CAACV,iBAAiB;YAChBoB,EAAE,EAAEA,EAAG;YACPW,EAAE,EAAE,CAAE;YACNC,EAAE,EAAE,CAAE;YACNC,EAAE,EAAEZ,KAAM;YACVa,EAAE,EAAEb,KAAM;YACVc,aAAa,EAAC,gBAAgB;YAAAT,QAAA,gBAE9BlB,IAAA,CAACN,IAAI;cAACkC,MAAM,EAAE,CAAE;cAACC,SAAS,EAAElC,cAAc,CAAC,CAAC;YAAE,CAAE,CAAC,eACjDK,IAAA,CAACN,IAAI;cAACkC,MAAM,EAAE,CAAE;cAACC,SAAS,EAAElC,cAAc,CAAC,CAAC;YAAE,CAAE,CAAC;UAAA,CAChC;QAAC,CAChB,CAAC,eAGPK,IAAA,CAACP,IAAI;UACH2B,KAAK,EAAEP,KAAM;UACbQ,MAAM,EAAER,KAAM;UACdiB,EAAE,EAAEjB,KAAK,GAAG,CAAE;UACdkB,IAAI,EAAE,QAAQnB,EAAE;QAAI,CACrB,CAAC;MAAA,CACC,CAAC,eACNZ,IAAA,CAACb,IAAI;QAACoB,KAAK,EAAE,CAACO,MAAM,CAACV,KAAK,EAAE;UAAE4B,UAAU,EAAEnB;QAAM,CAAC,CAAE;QAAAK,QAAA,EAAEd;MAAK,CAAO,CAAC;IAAA,CAC9D;EAAC,CACH,CAAC;AAEX","ignoreList":[]}
+{"version":3,"names":["React","useMemo","StyleSheet","Text","View","Svg","Defs","LinearGradient","SvgLinearGradient","Rect","Stop","avatarGradient","useFontScale","useTheme","useSvgId","makeAvatarStyles","jsx","_jsx","jsxs","_jsxs","AvatarWithRing","label","size","ringColor","style","testID","colors","c","shadow","fontScale","id","inner","styles","avatarRing","brandAvatar","shell","children","avatarCore","width","height","absoluteFill","x1","y1","x2","y2","gradientUnits","offset","stopColor","rx","fill"],"sourceRoot":"../../../../../src","sources":["components/business/AvatarWithRing/AvatarWithRing.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,OAAO,QAAQ,OAAO;AACtC,SAASC,UAAU,EAAEC,IAAI,EAAEC,IAAI,QAAQ,cAAc;AACrD,OAAOC,GAAG,IACRC,IAAI,EACJC,cAAc,IAAIC,iBAAiB,EACnCC,IAAI,EACJC,IAAI,QACC,kBAAkB;AACzB,SAASC,cAAc,EAAEC,YAAY,EAAEC,QAAQ,QAAQ,yBAAgB;AACvE,SAASC,QAAQ,QAAQ,gBAAa;AACtC,SAASC,gBAAgB,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAG5C;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAAC;EAC7BC,KAAK;EACLC,IAAI,GAAG,EAAE;EACTC,SAAS;EACTC,KAAK;EACLC;AACmB,CAAC,EAAqB;EACzC,MAAM;IAAEC,MAAM,EAAEC,CAAC;IAAEC;EAAO,CAAC,GAAGf,QAAQ,CAAC,CAAC;EACxC,MAAMgB,SAAS,GAAGjB,YAAY,CAAC,CAAC;EAChC,MAAMkB,EAAE,GAAGhB,QAAQ,CAAC,IAAI,CAAC;EACzB,MAAM;IAAEiB,KAAK;IAAEC;EAAO,CAAC,GAAG/B,OAAO,CAC/B,MACEc,gBAAgB,CACdO,IAAI,EACJC,SAAS,IAAII,CAAC,CAACM,UAAU,EACzBL,MAAM,CAACM,WAAW,EAClBP,CAAC,EACDE,SACF,CAAC,EACH,CAACP,IAAI,EAAEC,SAAS,EAAEI,CAAC,EAAEC,MAAM,CAACM,WAAW,EAAEL,SAAS,CACpD,CAAC;EACD,oBACEZ,IAAA,CAACb,IAAI;IAACoB,KAAK,EAAE,CAACQ,MAAM,CAACG,KAAK,EAAEX,KAAK,CAAE;IAACC,MAAM,EAAEA,MAAO;IAAAW,QAAA,eACjDjB,KAAA,CAACf,IAAI;MAACoB,KAAK,EAAEQ,MAAM,CAACK,UAAW;MAAAD,QAAA,gBAC7BjB,KAAA,CAACd,GAAG;QAACiC,KAAK,EAAEP,KAAM;QAACQ,MAAM,EAAER,KAAM;QAACP,KAAK,EAAEtB,UAAU,CAACsC,YAAa;QAAAJ,QAAA,gBAC/DnB,IAAA,CAACX,IAAI;UAAA8B,QAAA,eAGHjB,KAAA,CAACX,iBAAiB;YAChBsB,EAAE,EAAEA,EAAG;YACPW,EAAE,EAAE,CAAE;YACNC,EAAE,EAAE,CAAE;YACNC,EAAE,EAAEZ,KAAM;YACVa,EAAE,EAAEb,KAAM;YACVc,aAAa,EAAC,gBAAgB;YAAAT,QAAA,gBAE9BnB,IAAA,CAACP,IAAI;cAACoC,MAAM,EAAE,CAAE;cAACC,SAAS,EAAEpC,cAAc,CAAC,CAAC;YAAE,CAAE,CAAC,eACjDM,IAAA,CAACP,IAAI;cAACoC,MAAM,EAAE,CAAE;cAACC,SAAS,EAAEpC,cAAc,CAAC,CAAC;YAAE,CAAE,CAAC;UAAA,CAChC;QAAC,CAChB,CAAC,eAGPM,IAAA,CAACR,IAAI;UACH6B,KAAK,EAAEP,KAAM;UACbQ,MAAM,EAAER,KAAM;UACdiB,EAAE,EAAEjB,KAAK,GAAG,CAAE;UACdkB,IAAI,EAAE,QAAQnB,EAAE;QAAI,CACrB,CAAC;MAAA,CACC,CAAC,eACNb,IAAA,CAACd,IAAI;QAACqB,KAAK,EAAEQ,MAAM,CAACX,KAAM;QAAAe,QAAA,EAAEf;MAAK,CAAO,CAAC;IAAA,CACrC;EAAC,CACH,CAAC;AAEX","ignoreList":[]}

package/lib/module/components/business/AvatarWithRing/styles.js

@@ -1,20 +1,21 @@
 "use strict";
 
 import { StyleSheet } from 'react-native';
-import { fw, r } from "../../../theme/index.js";
+import { fw, r, scaleFontMetric } from "../../../theme/index.js";
 import { createLogger } from "../../../utils/logger/index.js";
 const log = createLogger('AvatarWithRing');
 
 /**
- * 头像样式工厂 —— **非标 maker 签名**:`(size, ringColor, shadowStyle, c)` 4 参,
+ * 头像样式工厂 —— **非标 maker 签名**:`(size, ringColor, shadowStyle, c,
+ * fontScale)` 5 参,
  * 而非项目通用 `(c: ColorTokens, s: ShadowTokens) => StyleSheet` 2 参。
  *
  * **为何破例**:`size` / `ringColor` 是 **props 派生**(每次调用值不同,如 ring 宽度
  * = `size * 0.0625`、label 字号 = `size * 0.40`、inner 直径 = `size - ringWidth*2`),
- * 标准 `useThemedStyles(maker)` 按 `[colors, shadow]` memo 假设 maker 是模块顶层
- * 常量,无法承接 props 变化。改走调用点自带 `useMemo([size, ringColor, c,
- * shadow.brandAvatar])` 精确缓存,signature 因此带上 size/ringColor/shadow 三个
- * 运行期入参,c 仍传入用于 label 文字色。
+ * 标准 `useThemedStyles(maker)` 按 `[colors, shadow, fontScale, maker]` memo,且假设 maker
+ * 是模块顶层常量,无法承接 props 变化。改走调用点自带 `useMemo([size, ringColor, c,
+ * shadow.brandAvatar, fontScale])` 精确缓存,signature 因此带上
+ * size/ringColor/shadow/fontScale 四个运行期入参,c 仍传入用于 label 文字色。
  *
  * **不用 borderWidth + borderColor 实现 ring**:RN new arch (Fabric) 在
  * iOS 上对 `borderColor: rgba alpha + borderRadius: width/2`(完全圆)的组合
@@ -24,7 +25,7 @@ const log = createLogger('AvatarWithRing');
  * - shell:size×size 圆,backgroundColor = ringColor(承担 ring 视觉)+ shadow
  * - avatarCore:inner×inner 圆,在 shell 内 flex center,内部放 SVG 渐变 + label
  */
-export const makeAvatarStyles = (size, ringColor, shadowStyle, c) => {
+export const makeAvatarStyles = (size, ringColor, shadowStyle, c, fontScale) => {
   // 防御非法 size:NaN / 负数 / 0 会导致 inner 为负传入 SVG。
   // 最小合理值 = ringWidth*2 + 1(至少 1pt 圆心可见)。
   // ringWidth 下限为 2(见下方 Math.max),所以 size 至少要大于 4pt。
@@ -59,10 +60,10 @@ export const makeAvatarStyles = (size, ringColor, shadowStyle, c) => {
       justifyContent: 'center'
     },
     label: {
-      fontSize: r(Math.round(safeSize * 0.4)),
+      fontSize: scaleFontMetric(r(Math.round(safeSize * 0.4)), fontScale),
       fontWeight: fw.bold,
       color: c.onPrimary,
-      letterSpacing: -0.5,
+      letterSpacing: scaleFontMetric(-0.5, fontScale),
       textAlign: 'center'
     }
   });

package/lib/module/components/business/AvatarWithRing/styles.js.map

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","fw","r","createLogger","log","makeAvatarStyles","size","ringColor","shadowStyle","c","MIN_SIZE","safeSize","Number","isFinite","__DEV__","warn","dim","half","ringWidth","Math","max","round","inner","innerHalf","styles","create","shell","width","height","borderRadius","backgroundColor","alignItems","justifyContent","avatarCore","overflow","label","fontSize","fontWeight","bold","color","onPrimary","letterSpacing","textAlign"],"sourceRoot":"../../../../../src","sources":["components/business/AvatarWithRing/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAwB,cAAc;AACzD,SAASC,EAAE,EAAEC,CAAC,QAA0B,yBAAgB;AACxD,SAASC,YAAY,QAAQ,gCAAuB;AAEpD,MAAMC,GAAG,GAAGD,YAAY,CAAC,gBAAgB,CAAC;;AAE1C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAME,gBAAgB,GAAGA,CAC9BC,IAAY,EACZC,SAAiB,EACjBC,WAAsB,EACtBC,CAAc,KACX;EACH;EACA;EACA;EACA,MAAMC,QAAQ,GAAG,CAAC;EAClB,MAAMC,QAAQ,GACZC,MAAM,CAACC,QAAQ,CAACP,IAAI,CAAC,IAAIA,IAAI,IAAII,QAAQ,GACrCJ,IAAI,GACJ,CAAC,MAAM;IACL,IAAIQ,OAAO,EAAE;MACXV,GAAG,CAACW,IAAI,CACN,wBAAwBT,IAAI,WAAWI,QAAQ,UAAUA,QAAQ,GACnE,CAAC;IACH;IACA,OAAOA,QAAQ;EACjB,CAAC,EAAE,CAAC;EACV,MAAMM,GAAG,GAAGd,CAAC,CAACS,QAAQ,CAAC;EACvB,MAAMM,IAAI,GAAGD,GAAG,GAAG,CAAC;EACpB,MAAME,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC,EAAElB,CAAC,CAACiB,IAAI,CAACE,KAAK,CAACV,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC;EAC/D,MAAMW,KAAK,GAAGN,GAAG,GAAGE,SAAS,GAAG,CAAC;EACjC,MAAMK,SAAS,GAAGD,KAAK,GAAG,CAAC;EAC3B,MAAME,MAAM,GAAGxB,UAAU,CAACyB,MAAM,CAAC;IAC/BC,KAAK,EAAE;MACLC,KAAK,EAAEX,GAAG;MACVY,MAAM,EAAEZ,GAAG;MACXa,YAAY,EAAEZ,IAAI;MAClBa,eAAe,EAAEvB,SAAS;MAC1B,GAAGC,WAAW;MACduB,UAAU,EAAE,QAAQ;MACpBC,cAAc,EAAE;IAClB,CAAC;IACDC,UAAU,EAAE;MACVN,KAAK,EAAEL,KAAK;MACZM,MAAM,EAAEN,KAAK;MACbO,YAAY,EAAEN,SAAS;MACvBW,QAAQ,EAAE,QAAQ;MAClBH,UAAU,EAAE,QAAQ;MACpBC,cAAc,EAAE;IAClB,CAAC;IACDG,KAAK,EAAE;MACLC,QAAQ,EAAElC,CAAC,CAACiB,IAAI,CAACE,KAAK,CAACV,QAAQ,GAAG,GAAG,CAAC,CAAC;MACvC0B,UAAU,EAAEpC,EAAE,CAACqC,IAAI;MACnBC,KAAK,EAAE9B,CAAC,CAAC+B,SAAS;MAClBC,aAAa,EAAE,CAAC,GAAG;MACnBC,SAAS,EAAE;IACb;EACF,CAAC,CAAC;EACF,OAAO;IAAExB,SAAS;IAAEF,GAAG;IAAEM,KAAK;IAAEE;EAAO,CAAC;AAC1C,CAAC","ignoreList":[]}
+{"version":3,"names":["StyleSheet","fw","r","scaleFontMetric","createLogger","log","makeAvatarStyles","size","ringColor","shadowStyle","c","fontScale","MIN_SIZE","safeSize","Number","isFinite","__DEV__","warn","dim","half","ringWidth","Math","max","round","inner","innerHalf","styles","create","shell","width","height","borderRadius","backgroundColor","alignItems","justifyContent","avatarCore","overflow","label","fontSize","fontWeight","bold","color","onPrimary","letterSpacing","textAlign"],"sourceRoot":"../../../../../src","sources":["components/business/AvatarWithRing/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAwB,cAAc;AACzD,SAASC,EAAE,EAAEC,CAAC,EAAEC,eAAe,QAA0B,yBAAgB;AACzE,SAASC,YAAY,QAAQ,gCAAuB;AAEpD,MAAMC,GAAG,GAAGD,YAAY,CAAC,gBAAgB,CAAC;;AAE1C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAME,gBAAgB,GAAGA,CAC9BC,IAAY,EACZC,SAAiB,EACjBC,WAAsB,EACtBC,CAAc,EACdC,SAAiB,KACd;EACH;EACA;EACA;EACA,MAAMC,QAAQ,GAAG,CAAC;EAClB,MAAMC,QAAQ,GACZC,MAAM,CAACC,QAAQ,CAACR,IAAI,CAAC,IAAIA,IAAI,IAAIK,QAAQ,GACrCL,IAAI,GACJ,CAAC,MAAM;IACL,IAAIS,OAAO,EAAE;MACXX,GAAG,CAACY,IAAI,CACN,wBAAwBV,IAAI,WAAWK,QAAQ,UAAUA,QAAQ,GACnE,CAAC;IACH;IACA,OAAOA,QAAQ;EACjB,CAAC,EAAE,CAAC;EACV,MAAMM,GAAG,GAAGhB,CAAC,CAACW,QAAQ,CAAC;EACvB,MAAMM,IAAI,GAAGD,GAAG,GAAG,CAAC;EACpB,MAAME,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEpB,CAAC,CAACmB,IAAI,CAACE,KAAK,CAACV,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC;EAC/D,MAAMW,KAAK,GAAGN,GAAG,GAAGE,SAAS,GAAG,CAAC;EACjC,MAAMK,SAAS,GAAGD,KAAK,GAAG,CAAC;EAC3B,MAAME,MAAM,GAAG1B,UAAU,CAAC2B,MAAM,CAAC;IAC/BC,KAAK,EAAE;MACLC,KAAK,EAAEX,GAAG;MACVY,MAAM,EAAEZ,GAAG;MACXa,YAAY,EAAEZ,IAAI;MAClBa,eAAe,EAAExB,SAAS;MAC1B,GAAGC,WAAW;MACdwB,UAAU,EAAE,QAAQ;MACpBC,cAAc,EAAE;IAClB,CAAC;IACDC,UAAU,EAAE;MACVN,KAAK,EAAEL,KAAK;MACZM,MAAM,EAAEN,KAAK;MACbO,YAAY,EAAEN,SAAS;MACvBW,QAAQ,EAAE,QAAQ;MAClBH,UAAU,EAAE,QAAQ;MACpBC,cAAc,EAAE;IAClB,CAAC;IACDG,KAAK,EAAE;MACLC,QAAQ,EAAEnC,eAAe,CAACD,CAAC,CAACmB,IAAI,CAACE,KAAK,CAACV,QAAQ,GAAG,GAAG,CAAC,CAAC,EAAEF,SAAS,CAAC;MACnE4B,UAAU,EAAEtC,EAAE,CAACuC,IAAI;MACnBC,KAAK,EAAE/B,CAAC,CAACgC,SAAS;MAClBC,aAAa,EAAExC,eAAe,CAAC,CAAC,GAAG,EAAEQ,SAAS,CAAC;MAC/CiC,SAAS,EAAE;IACb;EACF,CAAC,CAAC;EACF,OAAO;IAAExB,SAAS;IAAEF,GAAG;IAAEM,KAAK;IAAEE;EAAO,CAAC;AAC1C,CAAC","ignoreList":[]}

package/lib/module/components/business/VersionPill/VersionPill.js

@@ -1,15 +1,20 @@
 "use strict";
 
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Text, View } from 'react-native';
 import { useColors, useThemedStyles } from "../../../theme/index.js";
+import { createLogger } from "../../../utils/logger/index.js";
+import { A11Y_HIDDEN_PROPS } from "../../ui/shared/a11y.js";
+import { buildVersionPillLabel, resolveVersionStatus } from "./content.js";
 import { makeVersionPillStyles } from "./styles.js";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+const log = createLogger('VersionPill');
+
 /** 版本徽章胶囊 —— success dot + 版本 + 分点 + build mono。 */
 export function VersionPill({
   version,
   build,
-  statusColor,
+  status,
   versionPrefix = '版本 ',
   buildPrefix = 'build ',
   style,
@@ -17,37 +22,49 @@ export function VersionPill({
 }) {
   const c = useColors();
   const styles = useThemedStyles(makeVersionPillStyles);
-  const dotColor = statusColor ?? c.success;
+  const resolvedStatus = resolveVersionStatus(status, c);
+  const statusDiagnosticKey = resolvedStatus.diagnostics.join(',');
+  useEffect(() => {
+    if (statusDiagnosticKey.length > 0) {
+      log.warn('VersionPill status.label 不能为空白，已回退为“状态未知”。');
+    }
+  }, [statusDiagnosticKey]);
   // build 的「省略」契约:undefined / null / "" 均视为空;字符串 "0" 不省略。
   const hasBuild = build != null && build !== '';
-  // 状态点用颜色传达语义,SR 无法感知;整个 pill 作为分组提供无障碍合并读出。
-  const a11yLabel = hasBuild ? `${versionPrefix}${version},${buildPrefix}${build}` : `${versionPrefix}${version}`;
+  // 可见状态补齐颜色之外的语义；外层仍负责把全部片段合并成单一读屏名称。
+  const a11yLabel = buildVersionPillLabel({
+    version,
+    build,
+    statusLabel: resolvedStatus.label,
+    versionPrefix,
+    buildPrefix
+  });
   return /*#__PURE__*/_jsxs(View, {
     accessible: true,
     accessibilityLabel: a11yLabel,
     style: [styles.pill, style],
     testID: testID,
     children: [/*#__PURE__*/_jsx(View, {
+      ...A11Y_HIDDEN_PROPS,
       style: [styles.dot, {
-        backgroundColor: dotColor
-      }],
-      accessibilityElementsHidden: true,
-      importantForAccessibility: "no"
+        backgroundColor: resolvedStatus.color
+      }]
+    }), /*#__PURE__*/_jsx(Text, {
+      ...A11Y_HIDDEN_PROPS,
+      style: styles.status,
+      children: resolvedStatus.label
     }), /*#__PURE__*/_jsxs(Text, {
+      ...A11Y_HIDDEN_PROPS,
       style: styles.version,
-      accessibilityElementsHidden: true,
-      importantForAccessibility: "no",
       children: [versionPrefix, version]
     }), hasBuild ? /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsx(Text, {
+        ...A11Y_HIDDEN_PROPS,
         style: styles.sep,
-        accessibilityElementsHidden: true,
-        importantForAccessibility: "no",
         children: "\xB7"
       }), /*#__PURE__*/_jsxs(Text, {
+        ...A11Y_HIDDEN_PROPS,
         style: styles.build,
-        accessibilityElementsHidden: true,
-        importantForAccessibility: "no",
         children: [buildPrefix, build]
       })]
     }) : null]

package/lib/module/components/business/VersionPill/VersionPill.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Text","View","useColors","useThemedStyles","makeVersionPillStyles","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","VersionPill","version","build","statusColor","versionPrefix","buildPrefix","style","testID","c","styles","dotColor","success","hasBuild","a11yLabel","accessible","accessibilityLabel","pill","children","dot","backgroundColor","accessibilityElementsHidden","importantForAccessibility","sep"],"sourceRoot":"../../../../../src","sources":["components/business/VersionPill/VersionPill.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,IAAI,EAAEC,IAAI,QAAQ,cAAc;AACzC,SAASC,SAAS,EAAEC,eAAe,QAAQ,yBAAgB;AAC3D,SAASC,qBAAqB,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA,EAAAC,QAAA,IAAAC,SAAA;AAGjD;AACA,OAAO,SAASC,WAAWA,CAAC;EAC1BC,OAAO;EACPC,KAAK;EACLC,WAAW;EACXC,aAAa,GAAG,KAAK;EACrBC,WAAW,GAAG,QAAQ;EACtBC,KAAK;EACLC;AACgB,CAAC,EAAqB;EACtC,MAAMC,CAAC,GAAGjB,SAAS,CAAC,CAAC;EACrB,MAAMkB,MAAM,GAAGjB,eAAe,CAACC,qBAAqB,CAAC;EACrD,MAAMiB,QAAQ,GAAGP,WAAW,IAAIK,CAAC,CAACG,OAAO;EACzC;EACA,MAAMC,QAAQ,GAAGV,KAAK,IAAI,IAAI,IAAIA,KAAK,KAAK,EAAE;EAC9C;EACA,MAAMW,SAAS,GAAGD,QAAQ,GACtB,GAAGR,aAAa,GAAGH,OAAO,IAAII,WAAW,GAAGH,KAAK,EAAE,GACnD,GAAGE,aAAa,GAAGH,OAAO,EAAE;EAChC,oBACEJ,KAAA,CAACP,IAAI;IACHwB,UAAU;IACVC,kBAAkB,EAAEF,SAAU;IAC9BP,KAAK,EAAE,CAACG,MAAM,CAACO,IAAI,EAAEV,KAAK,CAAE;IAC5BC,MAAM,EAAEA,MAAO;IAAAU,QAAA,gBAGftB,IAAA,CAACL,IAAI;MACHgB,KAAK,EAAE,CAACG,MAAM,CAACS,GAAG,EAAE;QAAEC,eAAe,EAAET;MAAS,CAAC,CAAE;MACnDU,2BAA2B;MAC3BC,yBAAyB,EAAC;IAAI,CAC/B,CAAC,eACFxB,KAAA,CAACR,IAAI;MACHiB,KAAK,EAAEG,MAAM,CAACR,OAAQ;MACtBmB,2BAA2B;MAC3BC,yBAAyB,EAAC,IAAI;MAAAJ,QAAA,GAE7Bb,aAAa,EACbH,OAAO;IAAA,CACJ,CAAC,EACNW,QAAQ,gBACPf,KAAA,CAAAE,SAAA;MAAAkB,QAAA,gBAEEtB,IAAA,CAACN,IAAI;QACHiB,KAAK,EAAEG,MAAM,CAACa,GAAI;QAClBF,2BAA2B;QAC3BC,yBAAyB,EAAC,IAAI;QAAAJ,QAAA,EAC/B;MAED,CAAM,CAAC,eACPpB,KAAA,CAACR,IAAI;QACHiB,KAAK,EAAEG,MAAM,CAACP,KAAM;QACpBkB,2BAA2B;QAC3BC,yBAAyB,EAAC,IAAI;QAAAJ,QAAA,GAE7BZ,WAAW,EACXH,KAAK;MAAA,CACF,CAAC;IAAA,CACP,CAAC,GACD,IAAI;EAAA,CACJ,CAAC;AAEX","ignoreList":[]}
+{"version":3,"names":["React","useEffect","Text","View","useColors","useThemedStyles","createLogger","A11Y_HIDDEN_PROPS","buildVersionPillLabel","resolveVersionStatus","makeVersionPillStyles","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","log","VersionPill","version","build","status","versionPrefix","buildPrefix","style","testID","c","styles","resolvedStatus","statusDiagnosticKey","diagnostics","join","length","warn","hasBuild","a11yLabel","statusLabel","label","accessible","accessibilityLabel","pill","children","dot","backgroundColor","color","sep"],"sourceRoot":"../../../../../src","sources":["components/business/VersionPill/VersionPill.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,SAAS,QAAQ,OAAO;AACxC,SAASC,IAAI,EAAEC,IAAI,QAAQ,cAAc;AACzC,SAASC,SAAS,EAAEC,eAAe,QAAQ,yBAAgB;AAC3D,SAASC,YAAY,QAAQ,gCAAuB;AACpD,SAASC,iBAAiB,QAAQ,yBAAsB;AACxD,SAASC,qBAAqB,EAAEC,oBAAoB,QAAQ,cAAW;AACvE,SAASC,qBAAqB,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA,EAAAC,QAAA,IAAAC,SAAA;AAGjD,MAAMC,GAAG,GAAGX,YAAY,CAAC,aAAa,CAAC;;AAEvC;AACA,OAAO,SAASY,WAAWA,CAAC;EAC1BC,OAAO;EACPC,KAAK;EACLC,MAAM;EACNC,aAAa,GAAG,KAAK;EACrBC,WAAW,GAAG,QAAQ;EACtBC,KAAK;EACLC;AACgB,CAAC,EAAqB;EACtC,MAAMC,CAAC,GAAGtB,SAAS,CAAC,CAAC;EACrB,MAAMuB,MAAM,GAAGtB,eAAe,CAACK,qBAAqB,CAAC;EACrD,MAAMkB,cAAc,GAAGnB,oBAAoB,CAACY,MAAM,EAAEK,CAAC,CAAC;EACtD,MAAMG,mBAAmB,GAAGD,cAAc,CAACE,WAAW,CAACC,IAAI,CAAC,GAAG,CAAC;EAEhE9B,SAAS,CAAC,MAAM;IACd,IAAI4B,mBAAmB,CAACG,MAAM,GAAG,CAAC,EAAE;MAClCf,GAAG,CAACgB,IAAI,CAAC,4CAA4C,CAAC;IACxD;EACF,CAAC,EAAE,CAACJ,mBAAmB,CAAC,CAAC;EACzB;EACA,MAAMK,QAAQ,GAAGd,KAAK,IAAI,IAAI,IAAIA,KAAK,KAAK,EAAE;EAC9C;EACA,MAAMe,SAAS,GAAG3B,qBAAqB,CAAC;IACtCW,OAAO;IACPC,KAAK;IACLgB,WAAW,EAAER,cAAc,CAACS,KAAK;IACjCf,aAAa;IACbC;EACF,CAAC,CAAC;EACF,oBACET,KAAA,CAACX,IAAI;IACHmC,UAAU;IACVC,kBAAkB,EAAEJ,SAAU;IAC9BX,KAAK,EAAE,CAACG,MAAM,CAACa,IAAI,EAAEhB,KAAK,CAAE;IAC5BC,MAAM,EAAEA,MAAO;IAAAgB,QAAA,gBAGf7B,IAAA,CAACT,IAAI;MAAA,GACCI,iBAAiB;MACrBiB,KAAK,EAAE,CAACG,MAAM,CAACe,GAAG,EAAE;QAAEC,eAAe,EAAEf,cAAc,CAACgB;MAAM,CAAC;IAAE,CAChE,CAAC,eACFhC,IAAA,CAACV,IAAI;MAAA,GAAKK,iBAAiB;MAAEiB,KAAK,EAAEG,MAAM,CAACN,MAAO;MAAAoB,QAAA,EAC/Cb,cAAc,CAACS;IAAK,CACjB,CAAC,eACPvB,KAAA,CAACZ,IAAI;MAAA,GAAKK,iBAAiB;MAAEiB,KAAK,EAAEG,MAAM,CAACR,OAAQ;MAAAsB,QAAA,GAChDnB,aAAa,EACbH,OAAO;IAAA,CACJ,CAAC,EACNe,QAAQ,gBACPpB,KAAA,CAAAE,SAAA;MAAAyB,QAAA,gBAEE7B,IAAA,CAACV,IAAI;QAAA,GAAKK,iBAAiB;QAAEiB,KAAK,EAAEG,MAAM,CAACkB,GAAI;QAAAJ,QAAA,EAAC;MAEhD,CAAM,CAAC,eACP3B,KAAA,CAACZ,IAAI;QAAA,GAAKK,iBAAiB;QAAEiB,KAAK,EAAEG,MAAM,CAACP,KAAM;QAAAqB,QAAA,GAC9ClB,WAAW,EACXH,KAAK;MAAA,CACF,CAAC;IAAA,CACP,CAAC,GACD,IAAI;EAAA,CACJ,CAAC;AAEX","ignoreList":[]}

package/lib/module/components/business/VersionPill/content.js

@@ -0,0 +1,30 @@
+"use strict";
+
+import { normalizeNonBlankText } from "../../ui/shared/accessibilityName.js";
+export function resolveVersionStatus(status, colors) {
+  if (status == null) {
+    return {
+      label: '正常',
+      color: colors.success,
+      diagnostics: []
+    };
+  }
+  const label = normalizeNonBlankText(status.label);
+  return {
+    label: label ?? '状态未知',
+    color: status.color ?? colors.foregroundMuted,
+    diagnostics: label === undefined ? ['status.label'] : []
+  };
+}
+export function buildVersionPillLabel({
+  version,
+  build,
+  statusLabel,
+  versionPrefix,
+  buildPrefix
+}) {
+  const versionLabel = `${versionPrefix}${version}`;
+  const buildLabel = build != null && build !== '' ? `，${buildPrefix}${build}` : '';
+  return `${versionLabel}${buildLabel}，${statusLabel}`;
+}
+//# sourceMappingURL=content.js.map

package/lib/module/components/business/VersionPill/content.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["normalizeNonBlankText","resolveVersionStatus","status","colors","label","color","success","diagnostics","foregroundMuted","undefined","buildVersionPillLabel","version","build","statusLabel","versionPrefix","buildPrefix","versionLabel","buildLabel"],"sourceRoot":"../../../../../src","sources":["components/business/VersionPill/content.ts"],"mappings":";;AACA,SAASA,qBAAqB,QAAQ,sCAAmC;AAWzE,OAAO,SAASC,oBAAoBA,CAClCC,MAAiC,EACjCC,MAA2B,EACJ;EACvB,IAAID,MAAM,IAAI,IAAI,EAAE;IAClB,OAAO;MAAEE,KAAK,EAAE,IAAI;MAAEC,KAAK,EAAEF,MAAM,CAACG,OAAO;MAAEC,WAAW,EAAE;IAAG,CAAC;EAChE;EACA,MAAMH,KAAK,GAAGJ,qBAAqB,CAACE,MAAM,CAACE,KAAK,CAAC;EACjD,OAAO;IACLA,KAAK,EAAEA,KAAK,IAAI,MAAM;IACtBC,KAAK,EAAEH,MAAM,CAACG,KAAK,IAAIF,MAAM,CAACK,eAAe;IAC7CD,WAAW,EAAEH,KAAK,KAAKK,SAAS,GAAG,CAAC,cAAc,CAAC,GAAG;EACxD,CAAC;AACH;AAUA,OAAO,SAASC,qBAAqBA,CAAC;EACpCC,OAAO;EACPC,KAAK;EACLC,WAAW;EACXC,aAAa;EACbC;AACuB,CAAC,EAAU;EAClC,MAAMC,YAAY,GAAG,GAAGF,aAAa,GAAGH,OAAO,EAAE;EACjD,MAAMM,UAAU,GACdL,KAAK,IAAI,IAAI,IAAIA,KAAK,KAAK,EAAE,GAAG,IAAIG,WAAW,GAAGH,KAAK,EAAE,GAAG,EAAE;EAChE,OAAO,GAAGI,YAAY,GAAGC,UAAU,IAAIJ,WAAW,EAAE;AACtD","ignoreList":[]}

package/lib/module/components/business/VersionPill/styles.js

@@ -22,6 +22,10 @@ export const makeVersionPillStyles = c => StyleSheet.create({
     height: r(5),
     borderRadius: radius.pill
   },
+  status: {
+    fontSize: type.microPlus,
+    color: c.foregroundMuted
+  },
   version: {
     fontSize: type.microPlus,
     color: c.foregroundMuted,

package/lib/module/components/business/VersionPill/styles.js.map

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","fontMono","r","radius","space","type","makeVersionPillStyles","c","create","pill","flexDirection","alignItems","gap","paddingHorizontal","paddingVertical","borderRadius","backgroundColor","surface","borderWidth","hairlineWidth","borderColor","outline","dot","width","height","version","fontSize","microPlus","color","foregroundMuted","fontVariant","sep","opacity","build","micro","fontFamily"],"sourceRoot":"../../../../../src","sources":["components/business/VersionPill/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SACEC,QAAQ,EACRC,CAAC,EACDC,MAAM,EACNC,KAAK,EACLC,IAAI,QAEC,yBAAgB;;AAEvB;AACA;AACA,OAAO,MAAMC,qBAAqB,GAAIC,CAAc,IAClDP,UAAU,CAACQ,MAAM,CAAC;EAChBC,IAAI,EAAE;IACJC,aAAa,EAAE,KAAK;IACpBC,UAAU,EAAE,QAAQ;IACpBC,GAAG,EAAER,KAAK,CAAC,CAAC,CAAC;IACbS,iBAAiB,EAAEX,CAAC,CAAC,EAAE,CAAC;IACxBY,eAAe,EAAEZ,CAAC,CAAC,CAAC,CAAC;IACrBa,YAAY,EAAEZ,MAAM,CAACM,IAAI;IACzBO,eAAe,EAAET,CAAC,CAACU,OAAO;IAC1BC,WAAW,EAAElB,UAAU,CAACmB,aAAa;IACrCC,WAAW,EAAEb,CAAC,CAACc;EACjB,CAAC;EACDC,GAAG,EAAE;IACHC,KAAK,EAAErB,CAAC,CAAC,CAAC,CAAC;IACXsB,MAAM,EAAEtB,CAAC,CAAC,CAAC,CAAC;IACZa,YAAY,EAAEZ,MAAM,CAACM;EACvB,CAAC;EACDgB,OAAO,EAAE;IACPC,QAAQ,EAAErB,IAAI,CAACsB,SAAS;IACxBC,KAAK,EAAErB,CAAC,CAACsB,eAAe;IACxBC,WAAW,EAAE,CAAC,cAAc;EAC9B,CAAC;EACDC,GAAG,EAAE;IACHC,OAAO,EAAE,GAAG;IACZJ,KAAK,EAAErB,CAAC,CAACsB,eAAe;IACxBH,QAAQ,EAAErB,IAAI,CAACsB;EACjB,CAAC;EACDM,KAAK,EAAE;IACLP,QAAQ,EAAErB,IAAI,CAAC6B,KAAK;IACpBN,KAAK,EAAErB,CAAC,CAACsB,eAAe;IACxBM,UAAU,EAAElC;EACd;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["StyleSheet","fontMono","r","radius","space","type","makeVersionPillStyles","c","create","pill","flexDirection","alignItems","gap","paddingHorizontal","paddingVertical","borderRadius","backgroundColor","surface","borderWidth","hairlineWidth","borderColor","outline","dot","width","height","status","fontSize","microPlus","color","foregroundMuted","version","fontVariant","sep","opacity","build","micro","fontFamily"],"sourceRoot":"../../../../../src","sources":["components/business/VersionPill/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SACEC,QAAQ,EACRC,CAAC,EACDC,MAAM,EACNC,KAAK,EACLC,IAAI,QAEC,yBAAgB;;AAEvB;AACA;AACA,OAAO,MAAMC,qBAAqB,GAAIC,CAAc,IAClDP,UAAU,CAACQ,MAAM,CAAC;EAChBC,IAAI,EAAE;IACJC,aAAa,EAAE,KAAK;IACpBC,UAAU,EAAE,QAAQ;IACpBC,GAAG,EAAER,KAAK,CAAC,CAAC,CAAC;IACbS,iBAAiB,EAAEX,CAAC,CAAC,EAAE,CAAC;IACxBY,eAAe,EAAEZ,CAAC,CAAC,CAAC,CAAC;IACrBa,YAAY,EAAEZ,MAAM,CAACM,IAAI;IACzBO,eAAe,EAAET,CAAC,CAACU,OAAO;IAC1BC,WAAW,EAAElB,UAAU,CAACmB,aAAa;IACrCC,WAAW,EAAEb,CAAC,CAACc;EACjB,CAAC;EACDC,GAAG,EAAE;IACHC,KAAK,EAAErB,CAAC,CAAC,CAAC,CAAC;IACXsB,MAAM,EAAEtB,CAAC,CAAC,CAAC,CAAC;IACZa,YAAY,EAAEZ,MAAM,CAACM;EACvB,CAAC;EACDgB,MAAM,EAAE;IACNC,QAAQ,EAAErB,IAAI,CAACsB,SAAS;IACxBC,KAAK,EAAErB,CAAC,CAACsB;EACX,CAAC;EACDC,OAAO,EAAE;IACPJ,QAAQ,EAAErB,IAAI,CAACsB,SAAS;IACxBC,KAAK,EAAErB,CAAC,CAACsB,eAAe;IACxBE,WAAW,EAAE,CAAC,cAAc;EAC9B,CAAC;EACDC,GAAG,EAAE;IACHC,OAAO,EAAE,GAAG;IACZL,KAAK,EAAErB,CAAC,CAACsB,eAAe;IACxBH,QAAQ,EAAErB,IAAI,CAACsB;EACjB,CAAC;EACDO,KAAK,EAAE;IACLR,QAAQ,EAAErB,IAAI,CAAC8B,KAAK;IACpBP,KAAK,EAAErB,CAAC,CAACsB,eAAe;IACxBO,UAAU,EAAEnC;EACd;AACF,CAAC,CAAC","ignoreList":[]}

package/lib/module/components/business/useSvgId.js

@@ -1,20 +1,29 @@
 "use strict";
 
 import { useId } from 'react';
+export function sanitizeSvgIdPart(value) {
+  return value.replace(/[^A-Za-z0-9_.-]+/gu, '-').replace(/^[.-]+|[.-]+$/gu, '');
+}
+export function buildSvgId(prefix, override, reactId) {
+  const cleanOverride = override === undefined ? '' : sanitizeSvgIdPart(override);
+  const cleanPrefix = sanitizeSvgIdPart(prefix);
+  const cleanReactId = sanitizeSvgIdPart(reactId);
+  const automatic = [cleanPrefix, cleanReactId].filter(Boolean).join('-') || ['svg-id', cleanReactId].filter(Boolean).join('-') || 'svg-id';
+  const candidate = cleanOverride || automatic;
+  return /^[A-Za-z_]/u.test(candidate) ? candidate : `svg-id-${candidate}`;
+}
 
 /**
- * SVG 渐变 id 生成 hook —— 消毒 React 19 useId 中的冒号字符。
+ * SVG 渐变 id 生成 hook —— 消毒 prefix、override 与 React useId。
  *
- * Why:React 19 的 useId() 返回含冒号(`:r0:`)的字符串,不是合法的 SVG id 字符
- * (XML NCName 规则),直接用在 `<LinearGradient id>` / `<RadialGradient id>`
- * 会导致 SVG 引用失败。sanitize 后拼上 prefix 保证唯一且合法。
+ * Why:useId() 的字符串格式由 renderer 决定，caller 传入的 prefix 与 override
+ * 也可能包含空白或标点；统一消毒并保证合法首字符后，SVG 引用才能跨平台稳定。
  *
  * @param prefix  短前缀,区分同屏多 gradient(如 "gw" / "rh" / "av")。
- * @param override 可选:外部传入的 gradientId;有值时直接返回,跳过 useId 分配。
+ * @param override 可选:外部传入的 gradientId;消毒后非空时优先使用。
  */
 export function useSvgId(prefix, override) {
-  const autoId = useId();
-  if (override !== undefined) return override;
-  return `${prefix}-${autoId.replace(/[^a-zA-Z0-9_-]/g, '')}`;
+  const reactId = useId();
+  return buildSvgId(prefix, override, reactId);
 }
 //# sourceMappingURL=useSvgId.js.map

package/lib/module/components/business/useSvgId.js.map

@@ -1 +1 @@
-{"version":3,"names":["useId","useSvgId","prefix","override","autoId","undefined","replace"],"sourceRoot":"../../../../src","sources":["components/business/useSvgId.ts"],"mappings":";;AAAA,SAASA,KAAK,QAAQ,OAAO;;AAE7B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,QAAQA,CAACC,MAAc,EAAEC,QAAiB,EAAU;EAClE,MAAMC,MAAM,GAAGJ,KAAK,CAAC,CAAC;EACtB,IAAIG,QAAQ,KAAKE,SAAS,EAAE,OAAOF,QAAQ;EAC3C,OAAO,GAAGD,MAAM,IAAIE,MAAM,CAACE,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,EAAE;AAC7D","ignoreList":[]}
+{"version":3,"names":["useId","sanitizeSvgIdPart","value","replace","buildSvgId","prefix","override","reactId","cleanOverride","undefined","cleanPrefix","cleanReactId","automatic","filter","Boolean","join","candidate","test","useSvgId"],"sourceRoot":"../../../../src","sources":["components/business/useSvgId.ts"],"mappings":";;AAAA,SAASA,KAAK,QAAQ,OAAO;AAE7B,OAAO,SAASC,iBAAiBA,CAACC,KAAa,EAAU;EACvD,OAAOA,KAAK,CACTC,OAAO,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAClCA,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC;AACnC;AAEA,OAAO,SAASC,UAAUA,CACxBC,MAAc,EACdC,QAA4B,EAC5BC,OAAe,EACP;EACR,MAAMC,aAAa,GACjBF,QAAQ,KAAKG,SAAS,GAAG,EAAE,GAAGR,iBAAiB,CAACK,QAAQ,CAAC;EAC3D,MAAMI,WAAW,GAAGT,iBAAiB,CAACI,MAAM,CAAC;EAC7C,MAAMM,YAAY,GAAGV,iBAAiB,CAACM,OAAO,CAAC;EAC/C,MAAMK,SAAS,GACb,CAACF,WAAW,EAAEC,YAAY,CAAC,CAACE,MAAM,CAACC,OAAO,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC,IACrD,CAAC,QAAQ,EAAEJ,YAAY,CAAC,CAACE,MAAM,CAACC,OAAO,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC,IAClD,QAAQ;EACV,MAAMC,SAAS,GAAGR,aAAa,IAAII,SAAS;EAC5C,OAAO,aAAa,CAACK,IAAI,CAACD,SAAS,CAAC,GAAGA,SAAS,GAAG,UAAUA,SAAS,EAAE;AAC1E;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,QAAQA,CAACb,MAAc,EAAEC,QAAiB,EAAU;EAClE,MAAMC,OAAO,GAAGP,KAAK,CAAC,CAAC;EACvB,OAAOI,UAAU,CAACC,MAAM,EAAEC,QAAQ,EAAEC,OAAO,CAAC;AAC9C","ignoreList":[]}

package/lib/module/components/ui/Avatar/Avatar.js

@@ -1,15 +1,17 @@
 "use strict";
 
-import React, { useEffect, useState } from 'react';
-import { Image, Text, View } from 'react-native';
-import { useColors } from "../../../theme/index.js";
+import React from 'react';
+import { Text, View } from 'react-native';
+import { scaleFontMetric, useColors, useFontScale } from "../../../theme/index.js";
+import { resolveImageSource } from "../../../utils/imageSource.js";
+import { ImageAttempt } from "../shared/ImageAttempt.js";
 import { paletteFor, sizingFor, styles } from "./styles.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * 圆形头像 —— 5 档尺寸 × 4 种配色 × 可选图片 source。
  *
- * 传 source 且未失败时渲染 Image(onError 后自动 fallback 到 label 文字),
- * 否则渲染 label + variant 背景色。
+ * 合法 source 由 keyed ImageAttempt 独立持有失败状态；非法 source 或加载失败
+ * 时渲染 label + variant 背景色。
  */
 export function Avatar({
   label,
@@ -20,21 +22,19 @@ export function Avatar({
   testID
 }) {
   const c = useColors();
-  const [imageFailed, setImageFailed] = useState(false);
-
-  // [M-20] React 18+ 已移除 unmount 后 setState 的 warning,mountedRef 守卫为死码,删除。
-  // [L-44] source 变化时重置 imageFailed,否则换图 URL 后仍展示 fallback 文字。
-  // source 可能是对象形态({ uri }),按 uri 字段做细粒度比较。
-  const uri = source != null && typeof source === 'object' && 'uri' in source ? source.uri : null;
-  useEffect(() => {
-    setImageFailed(false);
-  }, [uri, source]);
-  const handleImageError = () => {
-    setImageFailed(true);
-  };
+  const fontScale = useFontScale();
   const dims = sizingFor(size);
   const palette = paletteFor(variant, c);
-  const showImage = source != null && !imageFailed;
+  const labelFontSize = scaleFontMetric(dims.fs, fontScale);
+  const resolvedSource = resolveImageSource(source);
+  const fallback = /*#__PURE__*/_jsx(Text, {
+    style: [styles.label, {
+      fontSize: labelFontSize,
+      color: palette.fg
+    }],
+    numberOfLines: 1,
+    children: label
+  });
   return /*#__PURE__*/_jsx(View, {
     style: [styles.base, {
       width: dims.box,
@@ -45,19 +45,12 @@ export function Avatar({
     accessible: !!label,
     accessibilityLabel: label,
     testID: testID,
-    children: showImage ? /*#__PURE__*/_jsx(Image, {
-      source: source,
-      onError: handleImageError,
+    children: resolvedSource === undefined ? fallback : /*#__PURE__*/_jsx(ImageAttempt, {
+      source: resolvedSource.source,
+      fallback: fallback,
       style: styles.image,
       resizeMode: "cover"
-    }) : /*#__PURE__*/_jsx(Text, {
-      style: [styles.label, {
-        fontSize: dims.fs,
-        color: palette.fg
-      }],
-      numberOfLines: 1,
-      children: label
-    })
+    }, resolvedSource.key)
   });
 }
 //# sourceMappingURL=Avatar.js.map

package/lib/module/components/ui/Avatar/Avatar.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useState","Image","Text","View","useColors","paletteFor","sizingFor","styles","jsx","_jsx","Avatar","label","size","variant","source","style","testID","c","imageFailed","setImageFailed","uri","handleImageError","dims","palette","showImage","base","width","box","height","borderRadius","backgroundColor","bg","accessible","accessibilityLabel","children","onError","image","resizeMode","fontSize","fs","color","fg","numberOfLines"],"sourceRoot":"../../../../../src","sources":["components/ui/Avatar/Avatar.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAClD,SAASC,KAAK,EAAEC,IAAI,EAAEC,IAAI,QAAQ,cAAc;AAChD,SAASC,SAAS,QAAQ,yBAAgB;AAC1C,SAASC,UAAU,EAAEC,SAAS,EAAEC,MAAM,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGzD;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,MAAMA,CAAC;EACrBC,KAAK;EACLC,IAAI,GAAG,IAAI;EACXC,OAAO,GAAG,SAAS;EACnBC,MAAM;EACNC,KAAK;EACLC;AACW,CAAC,EAAqB;EACjC,MAAMC,CAAC,GAAGb,SAAS,CAAC,CAAC;EACrB,MAAM,CAACc,WAAW,EAAEC,cAAc,CAAC,GAAGnB,QAAQ,CAAC,KAAK,CAAC;;EAErD;EACA;EACA;EACA,MAAMoB,GAAG,GACPN,MAAM,IAAI,IAAI,IAAI,OAAOA,MAAM,KAAK,QAAQ,IAAI,KAAK,IAAIA,MAAM,GAC1DA,MAAM,CAAsBM,GAAG,GAChC,IAAI;EACVrB,SAAS,CAAC,MAAM;IACdoB,cAAc,CAAC,KAAK,CAAC;EACvB,CAAC,EAAE,CAACC,GAAG,EAAEN,MAAM,CAAC,CAAC;EAEjB,MAAMO,gBAAgB,GAAGA,CAAA,KAAM;IAC7BF,cAAc,CAAC,IAAI,CAAC;EACtB,CAAC;EACD,MAAMG,IAAI,GAAGhB,SAAS,CAACM,IAAI,CAAC;EAC5B,MAAMW,OAAO,GAAGlB,UAAU,CAACQ,OAAO,EAAEI,CAAC,CAAC;EAEtC,MAAMO,SAAS,GAAGV,MAAM,IAAI,IAAI,IAAI,CAACI,WAAW;EAEhD,oBACET,IAAA,CAACN,IAAI;IACHY,KAAK,EAAE,CACLR,MAAM,CAACkB,IAAI,EACX;MACEC,KAAK,EAAEJ,IAAI,CAACK,GAAG;MACfC,MAAM,EAAEN,IAAI,CAACK,GAAG;MAChBE,YAAY,EAAEP,IAAI,CAACK,GAAG,GAAG,CAAC;MAC1BG,eAAe,EAAEP,OAAO,CAACQ;IAC3B,CAAC,EACDhB,KAAK,CACL;IACFiB,UAAU,EAAE,CAAC,CAACrB,KAAM;IACpBsB,kBAAkB,EAAEtB,KAAM;IAC1BK,MAAM,EAAEA,MAAO;IAAAkB,QAAA,EAEdV,SAAS,gBACRf,IAAA,CAACR,KAAK;MACJa,MAAM,EAAEA,MAAO;MACfqB,OAAO,EAAEd,gBAAiB;MAC1BN,KAAK,EAAER,MAAM,CAAC6B,KAAM;MACpBC,UAAU,EAAC;IAAO,CACnB,CAAC,gBAEF5B,IAAA,CAACP,IAAI;MACHa,KAAK,EAAE,CAACR,MAAM,CAACI,KAAK,EAAE;QAAE2B,QAAQ,EAAEhB,IAAI,CAACiB,EAAE;QAAEC,KAAK,EAAEjB,OAAO,CAACkB;MAAG,CAAC,CAAE;MAChEC,aAAa,EAAE,CAAE;MAAAR,QAAA,EAEhBvB;IAAK,CACF;EACP,CACG,CAAC;AAEX","ignoreList":[]}
+{"version":3,"names":["React","Text","View","scaleFontMetric","useColors","useFontScale","resolveImageSource","ImageAttempt","paletteFor","sizingFor","styles","jsx","_jsx","Avatar","label","size","variant","source","style","testID","c","fontScale","dims","palette","labelFontSize","fs","resolvedSource","fallback","fontSize","color","fg","numberOfLines","children","base","width","box","height","borderRadius","backgroundColor","bg","accessible","accessibilityLabel","undefined","image","resizeMode","key"],"sourceRoot":"../../../../../src","sources":["components/ui/Avatar/Avatar.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,IAAI,EAAEC,IAAI,QAAQ,cAAc;AACzC,SAASC,eAAe,EAAEC,SAAS,EAAEC,YAAY,QAAQ,yBAAgB;AACzE,SAASC,kBAAkB,QAAQ,+BAA4B;AAC/D,SAASC,YAAY,QAAQ,2BAAwB;AACrD,SAASC,UAAU,EAAEC,SAAS,EAAEC,MAAM,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGzD;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,MAAMA,CAAC;EACrBC,KAAK;EACLC,IAAI,GAAG,IAAI;EACXC,OAAO,GAAG,SAAS;EACnBC,MAAM;EACNC,KAAK;EACLC;AACW,CAAC,EAAqB;EACjC,MAAMC,CAAC,GAAGhB,SAAS,CAAC,CAAC;EACrB,MAAMiB,SAAS,GAAGhB,YAAY,CAAC,CAAC;EAChC,MAAMiB,IAAI,GAAGb,SAAS,CAACM,IAAI,CAAC;EAC5B,MAAMQ,OAAO,GAAGf,UAAU,CAACQ,OAAO,EAAEI,CAAC,CAAC;EACtC,MAAMI,aAAa,GAAGrB,eAAe,CAACmB,IAAI,CAACG,EAAE,EAAEJ,SAAS,CAAC;EACzD,MAAMK,cAAc,GAAGpB,kBAAkB,CAACW,MAAM,CAAC;EACjD,MAAMU,QAAQ,gBACZf,IAAA,CAACX,IAAI;IACHiB,KAAK,EAAE,CAACR,MAAM,CAACI,KAAK,EAAE;MAAEc,QAAQ,EAAEJ,aAAa;MAAEK,KAAK,EAAEN,OAAO,CAACO;IAAG,CAAC,CAAE;IACtEC,aAAa,EAAE,CAAE;IAAAC,QAAA,EAEhBlB;EAAK,CACF,CACP;EAED,oBACEF,IAAA,CAACV,IAAI;IACHgB,KAAK,EAAE,CACLR,MAAM,CAACuB,IAAI,EACX;MACEC,KAAK,EAAEZ,IAAI,CAACa,GAAG;MACfC,MAAM,EAAEd,IAAI,CAACa,GAAG;MAChBE,YAAY,EAAEf,IAAI,CAACa,GAAG,GAAG,CAAC;MAC1BG,eAAe,EAAEf,OAAO,CAACgB;IAC3B,CAAC,EACDrB,KAAK,CACL;IACFsB,UAAU,EAAE,CAAC,CAAC1B,KAAM;IACpB2B,kBAAkB,EAAE3B,KAAM;IAC1BK,MAAM,EAAEA,MAAO;IAAAa,QAAA,EAEdN,cAAc,KAAKgB,SAAS,GAC3Bf,QAAQ,gBAERf,IAAA,CAACL,YAAY;MAEXU,MAAM,EAAES,cAAc,CAACT,MAAO;MAC9BU,QAAQ,EAAEA,QAAS;MACnBT,KAAK,EAAER,MAAM,CAACiC,KAAM;MACpBC,UAAU,EAAC;IAAO,GAJblB,cAAc,CAACmB,GAKrB;EACF,CACG,CAAC;AAEX","ignoreList":[]}