@unif/react-native-design 0.8.1 → 0.9.0

package/lib/module/components/ui/Tag/styles.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import { StyleSheet } from 'react-native';
-import { fw, radius } from "../../../theme/index.js";
+import { fw, r, radius, space, type as t } from "../../../theme/index.js";
 /** Tag 静态 base —— alignSelf 防 flex 父容器拉伸,radius 走 token。 */
 export const styles = StyleSheet.create({
   base: {
@@ -21,23 +21,30 @@ export function sizingFor(size) {
   switch (size) {
     case 'md':
       return {
-        h: 22,
-        px: 8,
-        fs: 12
+        h: r(22),
+        px: space['3'],
+        fs: t.xxs
       };
     case 'lg':
       return {
-        h: 26,
-        px: 10,
-        fs: 13
+        h: r(26),
+        px: space['4'],
+        fs: t.xs
       };
   }
 }
 
 /** Tag 颜色推导:variant → { bg, fg, border } 三色,全走 ColorTokens。
- *  签名 `(target, context)` 与 chat/Tool 的 tintFor / variantFor / labelFor 一致。 */
+ *  签名 `(variant, c)` 与 Button/Avatar 的 paletteFor 一致。
+ *  新增 variant 在 types.ts 加 union + 这里加 case。 */
 export function paletteFor(variant, c) {
   switch (variant) {
+    case 'neutral':
+      return {
+        bg: c.surfaceContainerHigh,
+        fg: c.foregroundMuted,
+        border: undefined
+      };
     case 'brand':
       return {
         bg: c.primaryContainer,
@@ -68,12 +75,6 @@ export function paletteFor(variant, c) {
         fg: c.foregroundMuted,
         border: c.outline
       };
-    default:
-      return {
-        bg: c.surfaceContainerHigh,
-        fg: c.foregroundMuted,
-        border: undefined
-      };
   }
 }
 //# sourceMappingURL=styles.js.map

package/lib/module/components/ui/Tag/styles.js.map

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","fw","radius","styles","create","base","alignSelf","flexDirection","alignItems","borderRadius","sm","text","fontWeight","medium","sizingFor","size","h","px","fs","paletteFor","variant","c","bg","primaryContainer","fg","primary","border","undefined","successContainer","success","errorContainer","error","infoContainer","info","foregroundMuted","outline","surfaceContainerHigh"],"sourceRoot":"../../../../../src","sources":["components/ui/Tag/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SAASC,EAAE,EAAEC,MAAM,QAA0B,yBAAgB;AAG7D;AACA,OAAO,MAAMC,MAAM,GAAGH,UAAU,CAACI,MAAM,CAAC;EACtCC,IAAI,EAAE;IACJC,SAAS,EAAE,YAAY;IACvBC,aAAa,EAAE,KAAK;IACpBC,UAAU,EAAE,QAAQ;IACpBC,YAAY,EAAEP,MAAM,CAACQ;EACvB,CAAC;EACDC,IAAI,EAAE;IACJC,UAAU,EAAEX,EAAE,CAACY;EACjB;AACF,CAAC,CAAC;;AAEF;AACA;AACA,OAAO,SAASC,SAASA,CAACC,IAAa,EAIrC;EACA,QAAQA,IAAI;IACV,KAAK,IAAI;MACP,OAAO;QAAEC,CAAC,EAAE,EAAE;QAAEC,EAAE,EAAE,CAAC;QAAEC,EAAE,EAAE;MAAG,CAAC;IACjC,KAAK,IAAI;MACP,OAAO;QAAEF,CAAC,EAAE,EAAE;QAAEC,EAAE,EAAE,EAAE;QAAEC,EAAE,EAAE;MAAG,CAAC;EACpC;AACF;;AAEA;AACA;AACA,OAAO,SAASC,UAAUA,CAACC,OAAmB,EAAEC,CAAc,EAAE;EAC9D,QAAQD,OAAO;IACb,KAAK,OAAO;MACV,OAAO;QAAEE,EAAE,EAAED,CAAC,CAACE,gBAAgB;QAAEC,EAAE,EAAEH,CAAC,CAACI,OAAO;QAAEC,MAAM,EAAEC;MAAU,CAAC;IACrE,KAAK,SAAS;MACZ,OAAO;QAAEL,EAAE,EAAED,CAAC,CAACO,gBAAgB;QAAEJ,EAAE,EAAEH,CAAC,CAACQ,OAAO;QAAEH,MAAM,EAAEC;MAAU,CAAC;IACrE,KAAK,OAAO;MACV,OAAO;QAAEL,EAAE,EAAED,CAAC,CAACS,cAAc;QAAEN,EAAE,EAAEH,CAAC,CAACU,KAAK;QAAEL,MAAM,EAAEC;MAAU,CAAC;IACjE,KAAK,MAAM;MACT,OAAO;QAAEL,EAAE,EAAED,CAAC,CAACW,aAAa;QAAER,EAAE,EAAEH,CAAC,CAACY,IAAI;QAAEP,MAAM,EAAEC;MAAU,CAAC;IAC/D,KAAK,SAAS;MACZ,OAAO;QACLL,EAAE,EAAE,aAAsB;QAC1BE,EAAE,EAAEH,CAAC,CAACa,eAAe;QACrBR,MAAM,EAAEL,CAAC,CAACc;MACZ,CAAC;IACH;MACE,OAAO;QACLb,EAAE,EAAED,CAAC,CAACe,oBAAoB;QAC1BZ,EAAE,EAAEH,CAAC,CAACa,eAAe;QACrBR,MAAM,EAAEC;MACV,CAAC;EACL;AACF","ignoreList":[]}
+{"version":3,"names":["StyleSheet","fw","r","radius","space","type","t","styles","create","base","alignSelf","flexDirection","alignItems","borderRadius","sm","text","fontWeight","medium","sizingFor","size","h","px","fs","xxs","xs","paletteFor","variant","c","bg","surfaceContainerHigh","fg","foregroundMuted","border","undefined","primaryContainer","primary","successContainer","success","errorContainer","error","infoContainer","info","outline"],"sourceRoot":"../../../../../src","sources":["components/ui/Tag/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SACEC,EAAE,EACFC,CAAC,EACDC,MAAM,EACNC,KAAK,EACLC,IAAI,IAAIC,CAAC,QAEJ,yBAAgB;AAGvB;AACA,OAAO,MAAMC,MAAM,GAAGP,UAAU,CAACQ,MAAM,CAAC;EACtCC,IAAI,EAAE;IACJC,SAAS,EAAE,YAAY;IACvBC,aAAa,EAAE,KAAK;IACpBC,UAAU,EAAE,QAAQ;IACpBC,YAAY,EAAEV,MAAM,CAACW;EACvB,CAAC;EACDC,IAAI,EAAE;IACJC,UAAU,EAAEf,EAAE,CAACgB;EACjB;AACF,CAAC,CAAC;;AAEF;AACA;AACA,OAAO,SAASC,SAASA,CAACC,IAAa,EAIrC;EACA,QAAQA,IAAI;IACV,KAAK,IAAI;MACP,OAAO;QAAEC,CAAC,EAAElB,CAAC,CAAC,EAAE,CAAC;QAAEmB,EAAE,EAAEjB,KAAK,CAAC,GAAG,CAAC;QAAEkB,EAAE,EAAEhB,CAAC,CAACiB;MAAI,CAAC;IAChD,KAAK,IAAI;MACP,OAAO;QAAEH,CAAC,EAAElB,CAAC,CAAC,EAAE,CAAC;QAAEmB,EAAE,EAAEjB,KAAK,CAAC,GAAG,CAAC;QAAEkB,EAAE,EAAEhB,CAAC,CAACkB;MAAG,CAAC;EACjD;AACF;;AAEA;AACA;AACA;AACA,OAAO,SAASC,UAAUA,CAACC,OAAmB,EAAEC,CAAc,EAAE;EAC9D,QAAQD,OAAO;IACb,KAAK,SAAS;MACZ,OAAO;QACLE,EAAE,EAAED,CAAC,CAACE,oBAAoB;QAC1BC,EAAE,EAAEH,CAAC,CAACI,eAAe;QACrBC,MAAM,EAAEC;MACV,CAAC;IACH,KAAK,OAAO;MACV,OAAO;QAAEL,EAAE,EAAED,CAAC,CAACO,gBAAgB;QAAEJ,EAAE,EAAEH,CAAC,CAACQ,OAAO;QAAEH,MAAM,EAAEC;MAAU,CAAC;IACrE,KAAK,SAAS;MACZ,OAAO;QAAEL,EAAE,EAAED,CAAC,CAACS,gBAAgB;QAAEN,EAAE,EAAEH,CAAC,CAACU,OAAO;QAAEL,MAAM,EAAEC;MAAU,CAAC;IACrE,KAAK,OAAO;MACV,OAAO;QAAEL,EAAE,EAAED,CAAC,CAACW,cAAc;QAAER,EAAE,EAAEH,CAAC,CAACY,KAAK;QAAEP,MAAM,EAAEC;MAAU,CAAC;IACjE,KAAK,MAAM;MACT,OAAO;QAAEL,EAAE,EAAED,CAAC,CAACa,aAAa;QAAEV,EAAE,EAAEH,CAAC,CAACc,IAAI;QAAET,MAAM,EAAEC;MAAU,CAAC;IAC/D,KAAK,SAAS;MACZ,OAAO;QACLL,EAAE,EAAE,aAAsB;QAC1BE,EAAE,EAAEH,CAAC,CAACI,eAAe;QACrBC,MAAM,EAAEL,CAAC,CAACe;MACZ,CAAC;EACL;AACF","ignoreList":[]}

package/lib/module/components/ui/TextField/TextFieldBase.js

@@ -2,7 +2,8 @@
 
 import React, { forwardRef, useState } from 'react';
 import { Text, TextInput, View } from 'react-native';
-import { control, space, useColors, useThemedStyles } from "../../../theme/index.js";
+import { control, r, space, useColors, useThemedStyles } from "../../../theme/index.js";
+import { childTestID } from "../../../utils/testID/index.js";
 import { makeStyles } from "./styles.js";
 
 /** `TextInput` 在 react-native-strict-api 下是组件类型(`TextInputType`),
@@ -24,7 +25,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export const TextFieldBase = /*#__PURE__*/forwardRef(function TextFieldBase({
   multiline = false,
   height = control.lg,
-  minHeight = 96,
+  // [L-81] multiline minHeight 裸 96 → r(96),随设备缩放
+  minHeight = r(96),
   maxHeight,
   leading,
   trailing,
@@ -35,14 +37,21 @@ export const TextFieldBase = /*#__PURE__*/forwardRef(function TextFieldBase({
   value,
   onFocus,
   onBlur,
+  onChangeText,
   testID,
   ...rest
 }, ref) {
   const c = useColors();
   const styles = useThemedStyles(makeStyles);
   const [focused, setFocused] = useState(false);
-  const filled = value != null && String(value).length > 0;
+  // [M-9] 内部镜像 state:非受控场景 value 不传,用 _mirror 做 hasValue 判断
+  const [_mirror, setMirror] = useState('');
+  // [M-9] filled 在受控 value 和内部镜像 state 之间取 hasValue,
+  // 保证非受控场景 filled 视觉态能正确响应用户输入,且受控用法行为不变
+  const filled = value != null ? String(value).length > 0 : _mirror.length > 0;
   const isEditable = disabled ? false : editable;
+  // [L-31] editable=false(非 disabled)时也应进入 disabled a11y state
+  const isDisabledA11y = disabled || editable === false;
 
   // 视觉态优先级:error > focused > filled > idle。
   // active 三态(focus/filled/error)共享 wrapActive 白底,各自只覆 borderColor 差量。
@@ -66,6 +75,11 @@ export const TextFieldBase = /*#__PURE__*/forwardRef(function TextFieldBase({
         ...rest,
         editable: isEditable,
         value: value,
+        onChangeText: text => {
+          // [M-9] 同步内部镜像,非受控场景 filled 视觉态依赖此 state
+          setMirror(text);
+          onChangeText?.(text);
+        },
         multiline: multiline,
         onFocus: e => {
           setFocused(true);
@@ -80,16 +94,20 @@ export const TextFieldBase = /*#__PURE__*/forwardRef(function TextFieldBase({
         multiline && {
           minHeight: Math.max(0, minHeight - space[4] * 2)
         }],
-        placeholderTextColor: c.foregroundSubtle,
-        accessibilityState: disabled ? {
+        placeholderTextColor: c.foregroundSubtle
+        // [L-31] editable=false 并入 disabled a11y state,SR 能正确播报不可编辑
+        ,
+        accessibilityState: isDisabledA11y ? {
           disabled: true
         } : undefined,
-        testID: testID ? `${testID}-input` : undefined
+        testID: childTestID(testID, 'input')
       }), trailing != null ? /*#__PURE__*/_jsx(View, {
         children: trailing
       }) : null]
     }), error ? /*#__PURE__*/_jsx(Text, {
       style: styles.errorMsg,
+      accessibilityLiveRegion: "polite",
+      testID: childTestID(testID, 'error'),
       children: error
     }) : null]
   });

package/lib/module/components/ui/TextField/TextFieldBase.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","forwardRef","useState","Text","TextInput","View","control","space","useColors","useThemedStyles","makeStyles","jsx","_jsx","jsxs","_jsxs","TextFieldBase","multiline","height","lg","minHeight","maxHeight","leading","trailing","error","disabled","editable","containerStyle","value","onFocus","onBlur","testID","rest","ref","c","styles","focused","setFocused","filled","String","length","isEditable","wrapStateStyles","wrapActive","wrapError","wrapFocus","wrapFilled","wrapIdle","style","containerDisabled","children","wrap","wrapMultiline","e","input","inputMultiline","Math","max","placeholderTextColor","foregroundSubtle","accessibilityState","undefined","errorMsg","displayName"],"sourceRoot":"../../../../../src","sources":["components/ui/TextField/TextFieldBase.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","forwardRef","useState","Text","TextInput","View","control","r","space","useColors","useThemedStyles","childTestID","makeStyles","jsx","_jsx","jsxs","_jsxs","TextFieldBase","multiline","height","lg","minHeight","maxHeight","leading","trailing","error","disabled","editable","containerStyle","value","onFocus","onBlur","onChangeText","testID","rest","ref","c","styles","focused","setFocused","_mirror","setMirror","filled","String","length","isEditable","isDisabledA11y","wrapStateStyles","wrapActive","wrapError","wrapFocus","wrapFilled","wrapIdle","style","containerDisabled","children","wrap","wrapMultiline","text","e","input","inputMultiline","Math","max","placeholderTextColor","foregroundSubtle","accessibilityState","undefined","errorMsg","accessibilityLiveRegion","displayName"],"sourceRoot":"../../../../../src","sources":["components/ui/TextField/TextFieldBase.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -3,8 +3,11 @@
 import React from 'react';
 import { Image, View } from 'react-native';
 import { useThemedStyles } from "../../../theme/index.js";
-import { makeStyles, sizingFor } from "./styles.js";
+import { createLogger } from "../../../utils/logger/index.js";
+import { makeStyles, RING_EXTRA_RADIUS, sizingFor } from "./styles.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+const log = createLogger('Thumbnail');
+
 /** 缩略图基础组件 —— 列表 / 卡片 / chat 行内通用 16:9.5 小图。
  *
  *  尺寸阶梯:sm / md(默认 113×67)/ lg,与 NewsList / NewsArea 历史一致。
@@ -27,7 +30,12 @@ export function Thumbnail({
   testID
 }) {
   const styles = useThemedStyles(makeStyles);
-  if (!uri && !source) return null;
+  if (!uri && !source) {
+    // [L-18] uri/source 均未传:一次性告警,返回 null 而非空白区域。
+    // types 注释已说明二选一语义;此 warn 用于开发期快速定位漏传。
+    log.warn('Thumbnail: uri 和 source 均未提供,组件将渲染为 null');
+    return null;
+  }
   const dim = sizingFor(size);
   const image = /*#__PURE__*/_jsx(Image, {
     source: uri ? {
@@ -43,7 +51,7 @@ export function Thumbnail({
   // ring 容器:borderRadius 比 image 大 (border + padding) 才能贴合包裹外圈
   return /*#__PURE__*/_jsx(View, {
     style: [styles.ring, {
-      borderRadius: dim.borderRadius + 3
+      borderRadius: dim.borderRadius + RING_EXTRA_RADIUS
     }],
     testID: testID,
     children: image

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

@@ -1 +1 @@
-{"version":3,"names":["React","Image","View","useThemedStyles","makeStyles","sizingFor","jsx","_jsx","Thumbnail","uri","source","size","selected","style","resizeMode","accessibilityLabel","testID","styles","dim","image","base","accessible","undefined","ring","borderRadius","children"],"sourceRoot":"../../../../../src","sources":["components/ui/Thumbnail/Thumbnail.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,KAAK,EAAEC,IAAI,QAAQ,cAAc;AAC1C,SAASC,eAAe,QAAQ,yBAAgB;AAChD,SAASC,UAAU,EAAEC,SAAS,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGjD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,SAASA,CAAC;EACxBC,GAAG;EACHC,MAAM;EACNC,IAAI,GAAG,IAAI;EACXC,QAAQ;EACRC,KAAK;EACLC,UAAU,GAAG,OAAO;EACpBC,kBAAkB;EAClBC;AACc,CAAC,EAA4B;EAC3C,MAAMC,MAAM,GAAGd,eAAe,CAACC,UAAU,CAAC;EAC1C,IAAI,CAACK,GAAG,IAAI,CAACC,MAAM,EAAE,OAAO,IAAI;EAChC,MAAMQ,GAAG,GAAGb,SAAS,CAACM,IAAI,CAAC;EAC3B,MAAMQ,KAAK,gBACTZ,IAAA,CAACN,KAAK;IACJS,MAAM,EAAED,GAAG,GAAG;MAAEA;IAAI,CAAC,GAAIC,MAAsC;IAC/DG,KAAK,EAAE,CAACI,MAAM,CAACG,IAAI,EAAEF,GAAG,EAAEL,KAAK,CAAE;IACjCC,UAAU,EAAEA,UAAW;IACvBC,kBAAkB,EAAEA,kBAAmB;IACvCM,UAAU,EAAE,CAAC,CAACN,kBAAmB;IACjCC,MAAM,EAAEJ,QAAQ,GAAGU,SAAS,GAAGN;EAAO,CACvC,CACF;EACD,IAAI,CAACJ,QAAQ,EAAE,OAAOO,KAAK;EAC3B;EACA,oBACEZ,IAAA,CAACL,IAAI;IACHW,KAAK,EAAE,CAACI,MAAM,CAACM,IAAI,EAAE;MAAEC,YAAY,EAAEN,GAAG,CAACM,YAAY,GAAG;IAAE,CAAC,CAAE;IAC7DR,MAAM,EAAEA,MAAO;IAAAS,QAAA,EAEdN;EAAK,CACF,CAAC;AAEX","ignoreList":[]}
+{"version":3,"names":["React","Image","View","useThemedStyles","createLogger","makeStyles","RING_EXTRA_RADIUS","sizingFor","jsx","_jsx","log","Thumbnail","uri","source","size","selected","style","resizeMode","accessibilityLabel","testID","styles","warn","dim","image","base","accessible","undefined","ring","borderRadius","children"],"sourceRoot":"../../../../../src","sources":["components/ui/Thumbnail/Thumbnail.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,KAAK,EAAEC,IAAI,QAAQ,cAAc;AAC1C,SAASC,eAAe,QAAQ,yBAAgB;AAChD,SAASC,YAAY,QAAQ,gCAAuB;AACpD,SAASC,UAAU,EAAEC,iBAAiB,EAAEC,SAAS,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGpE,MAAMC,GAAG,GAAGN,YAAY,CAAC,WAAW,CAAC;;AAErC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASO,SAASA,CAAC;EACxBC,GAAG;EACHC,MAAM;EACNC,IAAI,GAAG,IAAI;EACXC,QAAQ;EACRC,KAAK;EACLC,UAAU,GAAG,OAAO;EACpBC,kBAAkB;EAClBC;AACc,CAAC,EAA4B;EAC3C,MAAMC,MAAM,GAAGjB,eAAe,CAACE,UAAU,CAAC;EAC1C,IAAI,CAACO,GAAG,IAAI,CAACC,MAAM,EAAE;IACnB;IACA;IACAH,GAAG,CAACW,IAAI,CAAC,0CAA0C,CAAC;IACpD,OAAO,IAAI;EACb;EACA,MAAMC,GAAG,GAAGf,SAAS,CAACO,IAAI,CAAC;EAC3B,MAAMS,KAAK,gBACTd,IAAA,CAACR,KAAK;IACJY,MAAM,EAAED,GAAG,GAAG;MAAEA;IAAI,CAAC,GAAIC,MAAsC;IAC/DG,KAAK,EAAE,CAACI,MAAM,CAACI,IAAI,EAAEF,GAAG,EAAEN,KAAK,CAAE;IACjCC,UAAU,EAAEA,UAAW;IACvBC,kBAAkB,EAAEA,kBAAmB;IACvCO,UAAU,EAAE,CAAC,CAACP,kBAAmB;IACjCC,MAAM,EAAEJ,QAAQ,GAAGW,SAAS,GAAGP;EAAO,CACvC,CACF;EACD,IAAI,CAACJ,QAAQ,EAAE,OAAOQ,KAAK;EAC3B;EACA,oBACEd,IAAA,CAACP,IAAI;IACHc,KAAK,EAAE,CACLI,MAAM,CAACO,IAAI,EACX;MAAEC,YAAY,EAAEN,GAAG,CAACM,YAAY,GAAGtB;IAAkB,CAAC,CACtD;IACFa,MAAM,EAAEA,MAAO;IAAAU,QAAA,EAEdN;EAAK,CACF,CAAC;AAEX","ignoreList":[]}

package/lib/module/components/ui/Thumbnail/styles.js

@@ -2,6 +2,10 @@
 
 import { StyleSheet } from 'react-native';
 import { r } from "../../../theme/index.js";
+/** [L-94] ring 圆角外展量:border(2) + padding(1) = 3pt,让外圈圆角贴合内圆角。
+ *  Thumbnail.tsx 侧用此常量替代魔数 `+ 3`。 */
+export const RING_EXTRA_RADIUS = r(2) + r(1); // border + padding
+
 /** Thumbnail 静态样式 ——
  *  - `base`:Image 占位色,加载中 / 失败时不至于空白
  *  - `ring`:`selected` 态的外圈品牌色描边,padding 抵消 ring 与 image 之间留 1pt gap */
@@ -10,9 +14,9 @@ export const makeStyles = c => StyleSheet.create({
     backgroundColor: c.surfaceContainer
   },
   ring: {
-    borderWidth: 2,
+    borderWidth: r(2),
     borderColor: c.primary,
-    padding: 1
+    padding: r(1)
   }
 });
 

package/lib/module/components/ui/Thumbnail/styles.js.map

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","r","makeStyles","c","create","base","backgroundColor","surfaceContainer","ring","borderWidth","borderColor","primary","padding","sizingFor","size","width","height","borderRadius"],"sourceRoot":"../../../../../src","sources":["components/ui/Thumbnail/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SAASC,CAAC,QAA0B,yBAAgB;AAGpD;AACA;AACA;AACA,OAAO,MAAMC,UAAU,GAAIC,CAAc,IACvCH,UAAU,CAACI,MAAM,CAAC;EAChBC,IAAI,EAAE;IACJC,eAAe,EAAEH,CAAC,CAACI;EACrB,CAAC;EACDC,IAAI,EAAE;IACJC,WAAW,EAAE,CAAC;IACdC,WAAW,EAAEP,CAAC,CAACQ,OAAO;IACtBC,OAAO,EAAE;EACX;AACF,CAAC,CAAC;;AAEJ;AACA;AACA,OAAO,MAAMC,SAAS,GAAIC,IAAmB,IAAK;EAChD,QAAQA,IAAI;IACV,KAAK,IAAI;MACP,OAAO;QAAEC,KAAK,EAAEd,CAAC,CAAC,EAAE,CAAC;QAAEe,MAAM,EAAEf,CAAC,CAAC,EAAE,CAAC;QAAEgB,YAAY,EAAEhB,CAAC,CAAC,CAAC;MAAE,CAAC;IAC5D,KAAK,IAAI;MACP,OAAO;QAAEc,KAAK,EAAEd,CAAC,CAAC,GAAG,CAAC;QAAEe,MAAM,EAAEf,CAAC,CAAC,EAAE,CAAC;QAAEgB,YAAY,EAAEhB,CAAC,CAAC,EAAE;MAAE,CAAC;IAC9D,KAAK,IAAI;IACT;MACE;MACA,OAAO;QAAEc,KAAK,EAAEd,CAAC,CAAC,GAAG,CAAC;QAAEe,MAAM,EAAEf,CAAC,CAAC,EAAE,CAAC;QAAEgB,YAAY,EAAEhB,CAAC,CAAC,CAAC;MAAE,CAAC;EAC/D;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["StyleSheet","r","RING_EXTRA_RADIUS","makeStyles","c","create","base","backgroundColor","surfaceContainer","ring","borderWidth","borderColor","primary","padding","sizingFor","size","width","height","borderRadius"],"sourceRoot":"../../../../../src","sources":["components/ui/Thumbnail/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SAASC,CAAC,QAA0B,yBAAgB;AAGpD;AACA;AACA,OAAO,MAAMC,iBAAiB,GAAGD,CAAC,CAAC,CAAC,CAAC,GAAGA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;;AAE9C;AACA;AACA;AACA,OAAO,MAAME,UAAU,GAAIC,CAAc,IACvCJ,UAAU,CAACK,MAAM,CAAC;EAChBC,IAAI,EAAE;IACJC,eAAe,EAAEH,CAAC,CAACI;EACrB,CAAC;EACDC,IAAI,EAAE;IACJC,WAAW,EAAET,CAAC,CAAC,CAAC,CAAC;IACjBU,WAAW,EAAEP,CAAC,CAACQ,OAAO;IACtBC,OAAO,EAAEZ,CAAC,CAAC,CAAC;EACd;AACF,CAAC,CAAC;;AAEJ;AACA;AACA,OAAO,MAAMa,SAAS,GAAIC,IAAmB,IAAK;EAChD,QAAQA,IAAI;IACV,KAAK,IAAI;MACP,OAAO;QAAEC,KAAK,EAAEf,CAAC,CAAC,EAAE,CAAC;QAAEgB,MAAM,EAAEhB,CAAC,CAAC,EAAE,CAAC;QAAEiB,YAAY,EAAEjB,CAAC,CAAC,CAAC;MAAE,CAAC;IAC5D,KAAK,IAAI;MACP,OAAO;QAAEe,KAAK,EAAEf,CAAC,CAAC,GAAG,CAAC;QAAEgB,MAAM,EAAEhB,CAAC,CAAC,EAAE,CAAC;QAAEiB,YAAY,EAAEjB,CAAC,CAAC,EAAE;MAAE,CAAC;IAC9D,KAAK,IAAI;IACT;MACE;MACA,OAAO;QAAEe,KAAK,EAAEf,CAAC,CAAC,GAAG,CAAC;QAAEgB,MAAM,EAAEhB,CAAC,CAAC,EAAE,CAAC;QAAEiB,YAAY,EAAEjB,CAAC,CAAC,CAAC;MAAE,CAAC;EAC/D;AACF,CAAC","ignoreList":[]}

package/lib/module/components/ui/Toast/ToastHost.js

@@ -1,10 +1,11 @@
 "use strict";
 
-import React, { useEffect, useRef, useState } from 'react';
-import { Text, View } from 'react-native';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { AccessibilityInfo, Text, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import Animated, { cancelAnimation, runOnJS, useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated';
 import { useColors, useThemedStyles, motion, space } from "../../../theme/index.js";
+import { childTestID } from "../../../utils/testID/index.js";
 import { dotColorFor, makeStyles } from "./styles.js";
 import { _subs } from "./toast.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -35,8 +36,18 @@ export function ToastHost({
       _subs.delete(sub);
     };
   }, []);
+
+  // 退场完成只清「仍是自己」的 entry:withTiming 完成回调经 runOnJS 跨线程异步投递,
+  // 投递到执行之间若来了新 toast,无 id 守卫的 setEntry(null) 会把新 toast 瞬时清掉([M-14])。
+  const dismissIfCurrent = useCallback(id => {
+    setEntry(cur => cur?.id === id ? null : cur);
+  }, []);
   useEffect(() => {
     if (!entry) return;
+    // [M-15] toast 出现时主动播报 —— 容器 pointerEvents="none" + 3s 自动消失,
+    // SR 用户对一闪而过的反馈本无任何感知通道。
+    AccessibilityInfo.announceForAccessibility(entry.message);
+    const id = entry.id;
     // 进入方向:top 从上(-8)滑入,bottom / center 从下(8)滑入
     const from = entry.position === 'top' ? -8 : 8;
     cancelAnimation(op);
@@ -56,7 +67,7 @@ export function ToastHost({
       ty.value = withTiming(from, {
         duration: motion.base
       }, finished => {
-        if (finished) runOnJS(setEntry)(null);
+        if (finished) runOnJS(dismissIfCurrent)(id);
       });
     }, entry.duration);
     return () => {
@@ -64,7 +75,7 @@ export function ToastHost({
       cancelAnimation(op);
       cancelAnimation(ty);
     };
-  }, [entry, op, ty]);
+  }, [entry, op, ty, dismissIfCurrent]);
   const animatedStyle = useAnimatedStyle(() => ({
     opacity: op.value,
     transform: [{
@@ -96,7 +107,7 @@ export function ToastHost({
         }]
       }) : null, /*#__PURE__*/_jsx(Text, {
         style: styles.text,
-        testID: testID ? `${testID}-text` : undefined,
+        testID: childTestID(testID, 'text'),
         children: entry.message
       })]
     })

package/lib/module/components/ui/Toast/ToastHost.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useRef","useState","Text","View","useSafeAreaInsets","Animated","cancelAnimation","runOnJS","useAnimatedStyle","useSharedValue","withTiming","useColors","useThemedStyles","motion","space","dotColorFor","makeStyles","_subs","jsx","_jsx","jsxs","_jsxs","ToastHost","testID","c","styles","insets","entry","setEntry","op","ty","dismissTimer","sub","next","current","clearTimeout","add","delete","from","position","value","duration","base","setTimeout","finished","animatedStyle","opacity","transform","translateY","posStyle","top","bottom","justifyContent","dotColor","kind","style","host","pointerEvents","children","toast","dot","backgroundColor","text","undefined","message"],"sourceRoot":"../../../../../src","sources":["components/ui/Toast/ToastHost.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useCallback","useEffect","useRef","useState","AccessibilityInfo","Text","View","useSafeAreaInsets","Animated","cancelAnimation","runOnJS","useAnimatedStyle","useSharedValue","withTiming","useColors","useThemedStyles","motion","space","childTestID","dotColorFor","makeStyles","_subs","jsx","_jsx","jsxs","_jsxs","ToastHost","testID","c","styles","insets","entry","setEntry","op","ty","dismissTimer","sub","next","current","clearTimeout","add","delete","dismissIfCurrent","id","cur","announceForAccessibility","message","from","position","value","duration","base","setTimeout","finished","animatedStyle","opacity","transform","translateY","posStyle","top","bottom","justifyContent","dotColor","kind","style","host","pointerEvents","children","toast","dot","backgroundColor","text"],"sourceRoot":"../../../../../src","sources":["components/ui/Toast/ToastHost.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/ui/Toast/ToastHost.web.js

@@ -1,8 +1,9 @@
 "use strict";
 
 import React, { useEffect, useRef, useState } from 'react';
-import { Text, View } from 'react-native';
-import { useColors, useThemedStyles, motion } from "../../../theme/index.js";
+import { AccessibilityInfo, Text, View } from 'react-native';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import { motion, space, useColors, usePrefersReducedMotion, useThemedStyles } from "../../../theme/index.js";
 import { dotColorFor, makeStyles } from "./styles.js";
 import { _subs } from "./toast.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -21,6 +22,8 @@ export function ToastHost({
 } = {}) {
   const c = useColors();
   const styles = useThemedStyles(makeStyles);
+  const insets = useSafeAreaInsets();
+  const reduced = usePrefersReducedMotion();
   const [entry, setEntry] = useState(null);
   const [visible, setVisible] = useState(false);
   const dismissTimerRef = useRef(null);
@@ -38,6 +41,8 @@ export function ToastHost({
   useEffect(() => {
     // entry=null:上一轮 effect 的 cleanup 已清 timer/RAF,这里无需重复。
     if (!entry) return;
+    // [M-15] web 同样主动播报(RN-Web announceForAccessibility 注入 aria-live region)。
+    AccessibilityInfo.announceForAccessibility(entry.message);
 
     // cancelled 标志:entry 快速连续切换 / 组件卸载时,cleanup 置 true。RAF 与
     // timer 回调执行前都检查它 —— cancelAnimationFrame 在部分浏览器不保证取消
@@ -72,14 +77,26 @@ export function ToastHost({
     };
   }, [entry]);
   if (!entry) return null;
+
+  // 位置:top=顶部(safe-area + 间距)/ center=屏幕居中 / bottom=底部(默认),复刻 native 版。
+  // 此前 web 完全未注入定位,position 参数被静默忽略、垂直位置随挂载次序漂移([H-6])。
+  const posStyle = entry.position === 'top' ? {
+    top: insets.top + space[10]
+  } : entry.position === 'center' ? {
+    top: 0,
+    bottom: 0,
+    justifyContent: 'center'
+  } : {
+    bottom: insets.bottom + space[10]
+  };
   const dotColor = dotColorFor(entry.kind, c);
   const animatedWebStyle = {
     opacity: visible ? 1 : 0,
     transform: visible ? 'translateY(0px)' : 'translateY(8px)',
-    transition: `opacity ${motion.base}ms ease-out, transform ${motion.base}ms ease-out`
+    transition: reduced ? 'none' : `opacity ${motion.base}ms ease-out, transform ${motion.base}ms ease-out`
   };
   return /*#__PURE__*/_jsx(View, {
-    style: styles.host,
+    style: [styles.host, posStyle],
     pointerEvents: "none",
     testID: testID,
     children: /*#__PURE__*/_jsx("div", {

package/lib/module/components/ui/Toast/ToastHost.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useRef","useState","Text","View","useColors","useThemedStyles","motion","dotColorFor","makeStyles","_subs","jsx","_jsx","jsxs","_jsxs","ToastHost","testID","c","styles","entry","setEntry","visible","setVisible","dismissTimerRef","exitTimerRef","enterRafRef","sub","next","add","delete","cancelled","current","requestAnimationFrame","setTimeout","base","duration","clearTimeout","cancelAnimationFrame","dotColor","kind","animatedWebStyle","opacity","transform","transition","style","host","pointerEvents","children","toast","dot","backgroundColor","text","undefined","message"],"sourceRoot":"../../../../../src","sources":["components/ui/Toast/ToastHost.web.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useEffect","useRef","useState","AccessibilityInfo","Text","View","useSafeAreaInsets","motion","space","useColors","usePrefersReducedMotion","useThemedStyles","dotColorFor","makeStyles","_subs","jsx","_jsx","jsxs","_jsxs","ToastHost","testID","c","styles","insets","reduced","entry","setEntry","visible","setVisible","dismissTimerRef","exitTimerRef","enterRafRef","sub","next","add","delete","announceForAccessibility","message","cancelled","current","requestAnimationFrame","setTimeout","base","duration","clearTimeout","cancelAnimationFrame","posStyle","position","top","bottom","justifyContent","dotColor","kind","animatedWebStyle","opacity","transform","transition","style","host","pointerEvents","children","toast","dot","backgroundColor","text","undefined"],"sourceRoot":"../../../../../src","sources":["components/ui/Toast/ToastHost.web.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/ui/Toast/styles.js

@@ -12,6 +12,8 @@ export const makeStyles = c => StyleSheet.create({
     // zIndex: toast 浮层 —— 盖在 Screen 内容之上(navigator / overlay 之下)。
     // 同级兄弟节点无 z 顺序需求,但作为 absolute 浮岛对其他屏内 absolute 节点
     // 需要显式 200 抢占,保留并锁数值。
+    // 注意:confirm() 的原生 Modal 是 window 级,永远盖在 toast 之上 —— confirm
+    // 打开期间到达的 toast 不可见,勿把 toast 当作 confirm 显示期间的反馈通道。
     zIndex: 200
   },
   toast: {

package/lib/module/components/ui/Toast/styles.js.map

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","fw","r","radius","space","type","t","makeStyles","c","create","host","position","left","right","alignItems","zIndex","toast","flexDirection","gap","backgroundColor","inverseSurface","borderRadius","md","paddingHorizontal","paddingVertical","maxWidth","dot","width","height","text","color","inverseOnSurface","fontSize","sm","fontWeight","medium","flexShrink","dotColorFor","kind","success","error"],"sourceRoot":"../../../../../src","sources":["components/ui/Toast/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AAEzC,SAASC,EAAE,EAAEC,CAAC,EAAEC,MAAM,EAAEC,KAAK,EAAEC,IAAI,IAAIC,CAAC,QAAQ,yBAAgB;AAGhE,OAAO,MAAMC,UAAU,GAAIC,CAAc,IACvCR,UAAU,CAACS,MAAM,CAAC;EAChBC,IAAI,EAAE;IACJ;IACAC,QAAQ,EAAE,UAAU;IACpBC,IAAI,EAAE,CAAC;IACPC,KAAK,EAAE,CAAC;IACRC,UAAU,EAAE,QAAQ;IACpB;IACA;IACA;IACAC,MAAM,EAAE;EACV,CAAC;EACDC,KAAK,EAAE;IACLC,aAAa,EAAE,KAAK;IACpBH,UAAU,EAAE,QAAQ;IACpBI,GAAG,EAAEd,KAAK,CAAC,CAAC,CAAC;IACbe,eAAe,EAAEX,CAAC,CAACY,cAAc;IACjCC,YAAY,EAAElB,MAAM,CAACmB,EAAE;IACvBC,iBAAiB,EAAEnB,KAAK,CAAC,CAAC,CAAC;IAC3BoB,eAAe,EAAEpB,KAAK,CAAC,CAAC,CAAC;IACzBqB,QAAQ,EAAE;EACZ,CAAC;EACDC,GAAG,EAAE;IACH;IACAC,KAAK,EAAEzB,CAAC,CAAC,CAAC,CAAC;IACX0B,MAAM,EAAE1B,CAAC,CAAC,CAAC,CAAC;IACZmB,YAAY,EAAEnB,CAAC,CAAC,CAAC;EACnB,CAAC;EACD2B,IAAI,EAAE;IACJC,KAAK,EAAEtB,CAAC,CAACuB,gBAAgB;IACzBC,QAAQ,EAAE1B,CAAC,CAAC2B,EAAE;IACdC,UAAU,EAAEjC,EAAE,CAACkC,MAAM;IACrBC,UAAU,EAAE;EACd;AACF,CAAC,CAAC;;AAEJ;AACA;AACA,OAAO,SAASC,WAAWA,CAACC,IAAe,EAAE9B,CAAc,EAAiB;EAC1E,QAAQ8B,IAAI;IACV,KAAK,SAAS;MACZ,OAAO9B,CAAC,CAAC+B,OAAO;IAClB,KAAK,OAAO;MACV,OAAO/B,CAAC,CAACgC,KAAK;IAChB,KAAK,MAAM;MACT,OAAO,IAAI;EACf;AACF","ignoreList":[]}
+{"version":3,"names":["StyleSheet","fw","r","radius","space","type","t","makeStyles","c","create","host","position","left","right","alignItems","zIndex","toast","flexDirection","gap","backgroundColor","inverseSurface","borderRadius","md","paddingHorizontal","paddingVertical","maxWidth","dot","width","height","text","color","inverseOnSurface","fontSize","sm","fontWeight","medium","flexShrink","dotColorFor","kind","success","error"],"sourceRoot":"../../../../../src","sources":["components/ui/Toast/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AAEzC,SAASC,EAAE,EAAEC,CAAC,EAAEC,MAAM,EAAEC,KAAK,EAAEC,IAAI,IAAIC,CAAC,QAAQ,yBAAgB;AAGhE,OAAO,MAAMC,UAAU,GAAIC,CAAc,IACvCR,UAAU,CAACS,MAAM,CAAC;EAChBC,IAAI,EAAE;IACJ;IACAC,QAAQ,EAAE,UAAU;IACpBC,IAAI,EAAE,CAAC;IACPC,KAAK,EAAE,CAAC;IACRC,UAAU,EAAE,QAAQ;IACpB;IACA;IACA;IACA;IACA;IACAC,MAAM,EAAE;EACV,CAAC;EACDC,KAAK,EAAE;IACLC,aAAa,EAAE,KAAK;IACpBH,UAAU,EAAE,QAAQ;IACpBI,GAAG,EAAEd,KAAK,CAAC,CAAC,CAAC;IACbe,eAAe,EAAEX,CAAC,CAACY,cAAc;IACjCC,YAAY,EAAElB,MAAM,CAACmB,EAAE;IACvBC,iBAAiB,EAAEnB,KAAK,CAAC,CAAC,CAAC;IAC3BoB,eAAe,EAAEpB,KAAK,CAAC,CAAC,CAAC;IACzBqB,QAAQ,EAAE;EACZ,CAAC;EACDC,GAAG,EAAE;IACH;IACAC,KAAK,EAAEzB,CAAC,CAAC,CAAC,CAAC;IACX0B,MAAM,EAAE1B,CAAC,CAAC,CAAC,CAAC;IACZmB,YAAY,EAAEnB,CAAC,CAAC,CAAC;EACnB,CAAC;EACD2B,IAAI,EAAE;IACJC,KAAK,EAAEtB,CAAC,CAACuB,gBAAgB;IACzBC,QAAQ,EAAE1B,CAAC,CAAC2B,EAAE;IACdC,UAAU,EAAEjC,EAAE,CAACkC,MAAM;IACrBC,UAAU,EAAE;EACd;AACF,CAAC,CAAC;;AAEJ;AACA;AACA,OAAO,SAASC,WAAWA,CAACC,IAAe,EAAE9B,CAAc,EAAiB;EAC1E,QAAQ8B,IAAI;IACV,KAAK,SAAS;MACZ,OAAO9B,CAAC,CAAC+B,OAAO;IAClB,KAAK,OAAO;MACV,OAAO/B,CAAC,CAACgC,KAAK;IAChB,KAAK,MAAM;MACT,OAAO,IAAI;EACf;AACF","ignoreList":[]}

package/lib/module/components/ui/Toast/toast.js

@@ -5,23 +5,43 @@
  *
  * 文件名故意小写 `toast.ts`,host 组件叫 `ToastHost.tsx`,避免 APFS 大小写冲突。
  */
-
+import { createLogger } from "../../../utils/logger/index.js";
+const log = createLogger('toast');
 let _id = 0;
 export const _subs = new Set();
+const DEFAULT_DURATION = 3000;
+// [L-55] duration 合法域:[1, 2^31)。INT32_MAX = 2^31-1 = 2147483647,
+// setTimeout 内部用 int32 存储,超出会溢出变成 0 立即触发。
+const MAX_DURATION = 2147483647;
+
+/** [L-55] 钳制 duration 到 [1, 2^31),域外回落 DEFAULT_DURATION 并 dev warn。 */
+function clampDuration(raw) {
+  if (raw == null) return DEFAULT_DURATION;
+  if (!Number.isFinite(raw) || raw < 1 || raw >= MAX_DURATION) {
+    log.warn(`toast duration(${raw}) 超出合法域 [1, 2^31),已回落 ${DEFAULT_DURATION}ms。`);
+    return DEFAULT_DURATION;
+  }
+  return Math.trunc(raw);
+}
 function emit(input, kind = 'info') {
   const entry = typeof input === 'string' ? {
     id: ++_id,
     message: input,
     kind,
-    duration: 3000,
+    duration: DEFAULT_DURATION,
     position: 'bottom'
   } : {
     id: ++_id,
     message: input.message,
     kind: input.kind ?? kind,
-    duration: input.duration ?? 3000,
+    duration: clampDuration(input.duration),
     position: input.position ?? 'bottom'
   };
+  // 未挂 <ToastHost />:消息无人接收,告警提示集成漏挂(对照 confirm 重入告警的纪律)。
+  if (_subs.size === 0) {
+    log.warn('toast() 调用时未挂载 <ToastHost />,消息被丢弃。请在 app 根附近挂一次 <ToastHost />。');
+    return;
+  }
   _subs.forEach(s => s(entry));
 }
 

package/lib/module/components/ui/Toast/toast.js.map

@@ -1 +1 @@
-{"version":3,"names":["_id","_subs","Set","emit","input","kind","entry","id","message","duration","position","forEach","s","toast","Object","assign","info","success","error"],"sourceRoot":"../../../../../src","sources":["components/ui/Toast/toast.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;;AAGA,IAAIA,GAAG,GAAG,CAAC;AACX,OAAO,MAAMC,KAAK,GAAG,IAAIC,GAAG,CAAa,CAAC;AAE1C,SAASC,IAAIA,CAACC,KAAiB,EAAEC,IAAe,GAAG,MAAM,EAAE;EACzD,MAAMC,KAAiB,GACrB,OAAOF,KAAK,KAAK,QAAQ,GACrB;IAAEG,EAAE,EAAE,EAAEP,GAAG;IAAEQ,OAAO,EAAEJ,KAAK;IAAEC,IAAI;IAAEI,QAAQ,EAAE,IAAI;IAAEC,QAAQ,EAAE;EAAS,CAAC,GACvE;IACEH,EAAE,EAAE,EAAEP,GAAG;IACTQ,OAAO,EAAEJ,KAAK,CAACI,OAAO;IACtBH,IAAI,EAAED,KAAK,CAACC,IAAI,IAAIA,IAAI;IACxBI,QAAQ,EAAEL,KAAK,CAACK,QAAQ,IAAI,IAAI;IAChCC,QAAQ,EAAEN,KAAK,CAACM,QAAQ,IAAI;EAC9B,CAAC;EACPT,KAAK,CAACU,OAAO,CAAEC,CAAC,IAAKA,CAAC,CAACN,KAAK,CAAC,CAAC;AAChC;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMO,KAAK,GAAGC,MAAM,CAACC,MAAM,CAAEX,KAAiB,IAAKD,IAAI,CAACC,KAAK,EAAE,MAAM,CAAC,EAAE;EAC7EY,IAAI,EAAGZ,KAAiB,IAAKD,IAAI,CAACC,KAAK,EAAE,MAAM,CAAC;EAChDa,OAAO,EAAGb,KAAiB,IAAKD,IAAI,CAACC,KAAK,EAAE,SAAS,CAAC;EACtDc,KAAK,EAAGd,KAAiB,IAAKD,IAAI,CAACC,KAAK,EAAE,OAAO;AACnD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["createLogger","log","_id","_subs","Set","DEFAULT_DURATION","MAX_DURATION","clampDuration","raw","Number","isFinite","warn","Math","trunc","emit","input","kind","entry","id","message","duration","position","size","forEach","s","toast","Object","assign","info","success","error"],"sourceRoot":"../../../../../src","sources":["components/ui/Toast/toast.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA,SAASA,YAAY,QAAQ,gCAAuB;AAGpD,MAAMC,GAAG,GAAGD,YAAY,CAAC,OAAO,CAAC;AAEjC,IAAIE,GAAG,GAAG,CAAC;AACX,OAAO,MAAMC,KAAK,GAAG,IAAIC,GAAG,CAAa,CAAC;AAE1C,MAAMC,gBAAgB,GAAG,IAAI;AAC7B;AACA;AACA,MAAMC,YAAY,GAAG,UAAU;;AAE/B;AACA,SAASC,aAAaA,CAACC,GAAuB,EAAU;EACtD,IAAIA,GAAG,IAAI,IAAI,EAAE,OAAOH,gBAAgB;EACxC,IAAI,CAACI,MAAM,CAACC,QAAQ,CAACF,GAAG,CAAC,IAAIA,GAAG,GAAG,CAAC,IAAIA,GAAG,IAAIF,YAAY,EAAE;IAC3DL,GAAG,CAACU,IAAI,CACN,kBAAkBH,GAAG,yBAAyBH,gBAAgB,KAChE,CAAC;IACD,OAAOA,gBAAgB;EACzB;EACA,OAAOO,IAAI,CAACC,KAAK,CAACL,GAAG,CAAC;AACxB;AAEA,SAASM,IAAIA,CAACC,KAAiB,EAAEC,IAAe,GAAG,MAAM,EAAE;EACzD,MAAMC,KAAiB,GACrB,OAAOF,KAAK,KAAK,QAAQ,GACrB;IACEG,EAAE,EAAE,EAAEhB,GAAG;IACTiB,OAAO,EAAEJ,KAAK;IACdC,IAAI;IACJI,QAAQ,EAAEf,gBAAgB;IAC1BgB,QAAQ,EAAE;EACZ,CAAC,GACD;IACEH,EAAE,EAAE,EAAEhB,GAAG;IACTiB,OAAO,EAAEJ,KAAK,CAACI,OAAO;IACtBH,IAAI,EAAED,KAAK,CAACC,IAAI,IAAIA,IAAI;IACxBI,QAAQ,EAAEb,aAAa,CAACQ,KAAK,CAACK,QAAQ,CAAC;IACvCC,QAAQ,EAAEN,KAAK,CAACM,QAAQ,IAAI;EAC9B,CAAC;EACP;EACA,IAAIlB,KAAK,CAACmB,IAAI,KAAK,CAAC,EAAE;IACpBrB,GAAG,CAACU,IAAI,CACN,iEACF,CAAC;IACD;EACF;EACAR,KAAK,CAACoB,OAAO,CAAEC,CAAC,IAAKA,CAAC,CAACP,KAAK,CAAC,CAAC;AAChC;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMQ,KAAK,GAAGC,MAAM,CAACC,MAAM,CAAEZ,KAAiB,IAAKD,IAAI,CAACC,KAAK,EAAE,MAAM,CAAC,EAAE;EAC7Ea,IAAI,EAAGb,KAAiB,IAAKD,IAAI,CAACC,KAAK,EAAE,MAAM,CAAC;EAChDc,OAAO,EAAGd,KAAiB,IAAKD,IAAI,CAACC,KAAK,EAAE,SAAS,CAAC;EACtDe,KAAK,EAAGf,KAAiB,IAAKD,IAAI,CAACC,KAAK,EAAE,OAAO;AACnD,CAAC,CAAC","ignoreList":[]}

package/lib/module/components/ui/shared/badgeStyles.js

@@ -0,0 +1,31 @@
+"use strict";
+
+import { StyleSheet } from 'react-native';
+import { fw, r, radius, space, type as t } from "../../../theme/index.js";
+
+/**
+ * 角标样式工厂 —— Grid/TabBar 等组件图标右上角小红点共用。
+ * @param c   颜色 token
+ * @param top 角标纵向偏移(不同场景基点不同:Grid 图标 r(-6) / TabBar 图标 r(-3))
+ */
+export const badgeStyles = (c, top) => StyleSheet.create({
+  badge: {
+    position: 'absolute',
+    top,
+    right: r(-10),
+    minWidth: r(16),
+    height: r(16),
+    borderRadius: radius.md,
+    backgroundColor: c.error,
+    paddingHorizontal: space[1],
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  badgeText: {
+    color: c.onError,
+    fontSize: t.nano,
+    fontWeight: fw.bold,
+    lineHeight: 12
+  }
+});
+//# sourceMappingURL=badgeStyles.js.map

package/lib/module/components/ui/shared/badgeStyles.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["StyleSheet","fw","r","radius","space","type","t","badgeStyles","c","top","create","badge","position","right","minWidth","height","borderRadius","md","backgroundColor","error","paddingHorizontal","alignItems","justifyContent","badgeText","color","onError","fontSize","nano","fontWeight","bold","lineHeight"],"sourceRoot":"../../../../../src","sources":["components/ui/shared/badgeStyles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SACEC,EAAE,EACFC,CAAC,EACDC,MAAM,EACNC,KAAK,EACLC,IAAI,IAAIC,CAAC,QAEJ,yBAAgB;;AAEvB;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,WAAW,GAAGA,CAACC,CAAc,EAAEC,GAAW,KACrDT,UAAU,CAACU,MAAM,CAAC;EAChBC,KAAK,EAAE;IACLC,QAAQ,EAAE,UAAU;IACpBH,GAAG;IACHI,KAAK,EAAEX,CAAC,CAAC,CAAC,EAAE,CAAC;IACbY,QAAQ,EAAEZ,CAAC,CAAC,EAAE,CAAC;IACfa,MAAM,EAAEb,CAAC,CAAC,EAAE,CAAC;IACbc,YAAY,EAAEb,MAAM,CAACc,EAAE;IACvBC,eAAe,EAAEV,CAAC,CAACW,KAAK;IACxBC,iBAAiB,EAAEhB,KAAK,CAAC,CAAC,CAAC;IAC3BiB,UAAU,EAAE,QAAQ;IACpBC,cAAc,EAAE;EAClB,CAAC;EACDC,SAAS,EAAE;IACTC,KAAK,EAAEhB,CAAC,CAACiB,OAAO;IAChBC,QAAQ,EAAEpB,CAAC,CAACqB,IAAI;IAChBC,UAAU,EAAE3B,EAAE,CAAC4B,IAAI;IACnBC,UAAU,EAAE;EACd;AACF,CAAC,CAAC","ignoreList":[]}