@unif/react-native-design 0.8.2 → 0.10.0

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

@@ -3,12 +3,16 @@
 import React from 'react';
 import { Text, View } from 'react-native';
 import { Pressable } from 'react-native-gesture-handler';
-import { useThemedStyles } from "../../../theme/index.js";
+import { fixed, pressedOpacity, useThemedStyles } from "../../../theme/index.js";
 import { createLogger } from "../../../utils/logger/index.js";
+import { childTestID } from "../../../utils/testID/index.js";
 import { makeStyles, sizingFor } from "./styles.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const log = createLogger('Stepper');
 
+// [L-30] 模块级 Set 去重 —— step/min/max 告警只打一次,避免渲染阶段刷屏
+const _warned = new Set();
+
 /**
  * 数字步进器 [−][ N ][+]。
  * 按钮自动夹到 min/max；越界的按钮透明度变 0.4。
@@ -28,11 +32,22 @@ export function Stepper({
 }) {
   const styles = useThemedStyles(makeStyles);
   const dims = sizingFor(size);
-  if (Number.isFinite(step) && step <= 0) {
-    log.warn(`step 必须是正数，传入 ${step}，已 fallback 为 1`);
+
+  // [L-30] step 口径对齐:非有限数(NaN/Infinity)也告警,与 min>max 告警保持一致
+  // 模块级 Set 去重:每个异常组合只打一次告警,避免渲染阶段重复刷屏
+  if (!Number.isFinite(step) || step <= 0) {
+    const k = `step:${step}`;
+    if (!_warned.has(k)) {
+      _warned.add(k);
+      log.warn(`step 必须是有限正数，传入 ${step}，已 fallback 为 1`);
+    }
   }
   if (Number.isFinite(min) && Number.isFinite(max) && min > max) {
-    log.warn(`min(${min}) 不能大于 max(${max})，已按 min 渲染`);
+    const k = `minmax:${min}:${max}`;
+    if (!_warned.has(k)) {
+      _warned.add(k);
+      log.warn(`min(${min}) 不能大于 max(${max})，已按 min 渲染`);
+    }
   }
   const safeStep = Number.isFinite(step) && step > 0 ? step : 1;
   const safeMin = Number.isFinite(min) ? min : 0;
@@ -41,8 +56,14 @@ export function Stepper({
   const safeValue = Number.isNaN(value) ? safeMin : Math.min(safeMax, Math.max(safeMin, value));
   const decDisabled = disabled || safeValue <= safeMin;
   const incDisabled = disabled || safeValue >= safeMax;
+
+  // [M-7] 按钮高 sm=28 / md=32 均低于 fixed.hitTarget=44;hitSlop 不越父边界,
+  // 须让容器一并扩展:wrap 加垂直 padding 把命中区撑到 44pt。
+  const wrapPaddingV = Math.max(0, Math.round((fixed.hitTarget - dims.h) / 2));
   return /*#__PURE__*/_jsxs(View, {
-    style: styles.wrap,
+    style: [styles.wrap, {
+      paddingVertical: wrapPaddingV
+    }],
     testID: testID,
     children: [/*#__PURE__*/_jsx(Pressable, {
       onPress: () => onChange(Math.max(safeMin, safeValue - safeStep)),
@@ -53,31 +74,46 @@ export function Stepper({
         disabled: decDisabled
       },
       accessibilityHint: `当前值 ${safeValue}，减 ${safeStep}`,
-      testID: testID ? `${testID}-decrement` : undefined,
+      testID: childTestID(testID, 'decrement'),
       style: ({
         pressed
       }) => [styles.cell, styles.btnLeft, {
         width: dims.btn,
         height: dims.h
       }, {
-        opacity: decDisabled ? 0.4 : pressed ? 0.7 : 1
+        opacity: decDisabled ? 0.4 : pressed ? pressedOpacity : 1
       }],
       children: /*#__PURE__*/_jsx(Text, {
         style: styles.btnText,
         children: "\u2212"
       })
     }), /*#__PURE__*/_jsx(View, {
+      accessible: true,
       accessibilityRole: "adjustable",
       accessibilityValue: {
         min: safeMin,
         max: safeMax,
         now: safeValue
       },
+      accessibilityActions: [{
+        name: 'increment',
+        label: '增加'
+      }, {
+        name: 'decrement',
+        label: '减少'
+      }],
+      onAccessibilityAction: e => {
+        if (e.nativeEvent.actionName === 'increment' && !incDisabled) {
+          onChange(Math.min(safeMax, safeValue + safeStep));
+        } else if (e.nativeEvent.actionName === 'decrement' && !decDisabled) {
+          onChange(Math.max(safeMin, safeValue - safeStep));
+        }
+      },
       style: [styles.cell, {
         minWidth: dims.w,
         height: dims.h
       }],
-      testID: testID ? `${testID}-value` : undefined,
+      testID: childTestID(testID, 'value'),
       children: /*#__PURE__*/_jsx(Text, {
         style: [styles.valueText, {
           fontSize: dims.fs
@@ -93,14 +129,14 @@ export function Stepper({
         disabled: incDisabled
       },
       accessibilityHint: `当前值 ${safeValue}，加 ${safeStep}`,
-      testID: testID ? `${testID}-increment` : undefined,
+      testID: childTestID(testID, 'increment'),
       style: ({
         pressed
       }) => [styles.cell, styles.btnRight, {
         width: dims.btn,
         height: dims.h
       }, {
-        opacity: incDisabled ? 0.4 : pressed ? 0.7 : 1
+        opacity: incDisabled ? 0.4 : pressed ? pressedOpacity : 1
       }],
       children: /*#__PURE__*/_jsx(Text, {
         style: styles.btnText,

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

@@ -1 +1 @@
-{"version":3,"names":["React","Text","View","Pressable","useThemedStyles","createLogger","makeStyles","sizingFor","jsx","_jsx","jsxs","_jsxs","log","Stepper","value","onChange","min","max","step","size","disabled","testID","styles","dims","Number","isFinite","warn","safeStep","safeMin","safeMax","safeValue","isNaN","Math","decDisabled","incDisabled","style","wrap","children","onPress","accessibilityRole","accessibilityLabel","accessibilityState","accessibilityHint","undefined","pressed","cell","btnLeft","width","btn","height","h","opacity","btnText","accessibilityValue","now","minWidth","w","valueText","fontSize","fs","btnRight"],"sourceRoot":"../../../../../src","sources":["components/ui/Stepper/Stepper.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","Text","View","Pressable","fixed","pressedOpacity","useThemedStyles","createLogger","childTestID","makeStyles","sizingFor","jsx","_jsx","jsxs","_jsxs","log","_warned","Set","Stepper","value","onChange","min","max","step","size","disabled","testID","styles","dims","Number","isFinite","k","has","add","warn","safeStep","safeMin","safeMax","safeValue","isNaN","Math","decDisabled","incDisabled","wrapPaddingV","round","hitTarget","h","style","wrap","paddingVertical","children","onPress","accessibilityRole","accessibilityLabel","accessibilityState","accessibilityHint","pressed","cell","btnLeft","width","btn","height","opacity","btnText","accessible","accessibilityValue","now","accessibilityActions","name","label","onAccessibilityAction","e","nativeEvent","actionName","minWidth","w","valueText","fontSize","fs","btnRight"],"sourceRoot":"../../../../../src","sources":["components/ui/Stepper/Stepper.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -3,16 +3,9 @@
 import React, { useEffect } from 'react';
 import { Pressable } from 'react-native-gesture-handler';
 import Animated, { cancelAnimation, interpolate, interpolateColor, useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated';
-import { motion, r, useColors, useThemedStyles } from "../../../theme/index.js";
-import { INSET, makeStyles, THUMB, TRACK_W } from "./styles.js";
+import { fixed, motion, r, useColors, useThemedStyles } from "../../../theme/index.js";
+import { makeStyles, THUMB_OFF_X, THUMB_ON_X, TRACK_H } from "./styles.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-// ─── 动画派生常量(组件私有,非 style)─────────────────────────────────────
-// 把手 translateX 的 off / on 端点:左右各留 INSET 间距,
-// off = INSET(2),on = trackW - INSET - thumbW(32-2-16=14)。
-// 走 r() 保证多设备缩放跟 track / thumb 物理尺寸一致(否则非设计基准设备会错位)。
-const THUMB_OFF_X = r(INSET);
-const THUMB_ON_X = r(TRACK_W - INSET - THUMB);
-
 /**
  * 布尔切换。32×20 轨道 + 16×16 白色把手,200ms 缓动。
  *
@@ -45,8 +38,10 @@ export function Switch({
   }));
   return /*#__PURE__*/_jsx(Pressable, {
     onPress: () => !disabled && onChange(!value),
-    disabled: disabled,
-    hitSlop: 6,
+    disabled: disabled
+    // [M-7] 轨道高 r(20)≈20pt;补 (44-20)/2=12 到 fixed.hitTarget
+    ,
+    hitSlop: Math.round((fixed.hitTarget - r(TRACK_H)) / 2),
     style: disabled ? styles.pressableDisabled : styles.pressableEnabled,
     accessibilityRole: "switch",
     accessibilityState: {

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

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","Pressable","Animated","cancelAnimation","interpolate","interpolateColor","useAnimatedStyle","useSharedValue","withTiming","motion","r","useColors","useThemedStyles","INSET","makeStyles","THUMB","TRACK_W","jsx","_jsx","THUMB_OFF_X","THUMB_ON_X","Switch","value","onChange","disabled","accessibilityLabel","testID","c","styles","progress","duration","base","trackStyle","backgroundColor","surfaceContainerHighest","primary","thumbStyle","transform","translateX","onPress","hitSlop","style","pressableDisabled","pressableEnabled","accessibilityRole","accessibilityState","checked","children","View","track","thumb"],"sourceRoot":"../../../../../src","sources":["components/ui/Switch/Switch.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,SAAS,QAAQ,OAAO;AACxC,SAASC,SAAS,QAAQ,8BAA8B;AAExD,OAAOC,QAAQ,IACbC,eAAe,EACfC,WAAW,EACXC,gBAAgB,EAChBC,gBAAgB,EAChBC,cAAc,EACdC,UAAU,QACL,yBAAyB;AAChC,SAASC,MAAM,EAAEC,CAAC,EAAEC,SAAS,EAAEC,eAAe,QAAQ,yBAAgB;AACtE,SAASC,KAAK,EAAEC,UAAU,EAAEC,KAAK,EAAEC,OAAO,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAG7D;AACA;AACA;AACA;AACA,MAAMC,WAAW,GAAGT,CAAC,CAACG,KAAK,CAAC;AAC5B,MAAMO,UAAU,GAAGV,CAAC,CAACM,OAAO,GAAGH,KAAK,GAAGE,KAAK,CAAC;;AAE7C;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASM,MAAMA,CAAC;EACrBC,KAAK;EACLC,QAAQ;EACRC,QAAQ;EACRC,kBAAkB;EAClBC;AACW,CAAC,EAAqB;EACjC,MAAMC,CAAC,GAAGhB,SAAS,CAAC,CAAC;EACrB,MAAMiB,MAAM,GAAGhB,eAAe,CAACE,UAAU,CAAC;EAC1C,MAAMe,QAAQ,GAAGtB,cAAc,CAACe,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC;EAE9CtB,SAAS,CAAC,MAAM;IACd6B,QAAQ,CAACP,KAAK,GAAGd,UAAU,CAACc,KAAK,GAAG,CAAC,GAAG,CAAC,EAAE;MAAEQ,QAAQ,EAAErB,MAAM,CAACsB;IAAK,CAAC,CAAC;IACrE,OAAO,MAAM5B,eAAe,CAAC0B,QAAQ,CAAC;EACxC,CAAC,EAAE,CAACP,KAAK,EAAEO,QAAQ,CAAC,CAAC;EAErB,MAAMG,UAAU,GAAG1B,gBAAgB,CAAC,OAAO;IACzC2B,eAAe,EAAE5B,gBAAgB,CAC/BwB,QAAQ,CAACP,KAAK,EACd,CAAC,CAAC,EAAE,CAAC,CAAC,EACN,CAACK,CAAC,CAACO,uBAAuB,EAAEP,CAAC,CAACQ,OAAO,CACvC;EACF,CAAC,CAAC,CAAC;EAEH,MAAMC,UAAU,GAAG9B,gBAAgB,CAAC,OAAO;IACzC+B,SAAS,EAAE,CACT;MACEC,UAAU,EAAElC,WAAW,CACrByB,QAAQ,CAACP,KAAK,EACd,CAAC,CAAC,EAAE,CAAC,CAAC,EACN,CAACH,WAAW,EAAEC,UAAU,CAC1B;IACF,CAAC;EAEL,CAAC,CAAC,CAAC;EAEH,oBACEF,IAAA,CAACjB,SAAS;IACRsC,OAAO,EAAEA,CAAA,KAAM,CAACf,QAAQ,IAAID,QAAQ,CAAC,CAACD,KAAK,CAAE;IAC7CE,QAAQ,EAAEA,QAAS;IACnBgB,OAAO,EAAE,CAAE;IACXC,KAAK,EAAEjB,QAAQ,GAAGI,MAAM,CAACc,iBAAiB,GAAGd,MAAM,CAACe,gBAAiB;IACrEC,iBAAiB,EAAC,QAAQ;IAC1BC,kBAAkB,EAAE;MAAEC,OAAO,EAAExB,KAAK;MAAEE,QAAQ,EAAE,CAAC,CAACA;IAAS,CAAE;IAC7DC,kBAAkB,EAAEA,kBAAmB;IACvCC,MAAM,EAAEA,MAAO;IAAAqB,QAAA,eAEf7B,IAAA,CAAChB,QAAQ,CAAC8C,IAAI;MAACP,KAAK,EAAE,CAACb,MAAM,CAACqB,KAAK,EAAEjB,UAAU,CAAE;MAAAe,QAAA,eAC/C7B,IAAA,CAAChB,QAAQ,CAAC8C,IAAI;QAACP,KAAK,EAAE,CAACb,MAAM,CAACsB,KAAK,EAAEd,UAAU;MAAE,CAAE;IAAC,CACvC;EAAC,CACP,CAAC;AAEhB","ignoreList":[]}
+{"version":3,"names":["React","useEffect","Pressable","Animated","cancelAnimation","interpolate","interpolateColor","useAnimatedStyle","useSharedValue","withTiming","fixed","motion","r","useColors","useThemedStyles","makeStyles","THUMB_OFF_X","THUMB_ON_X","TRACK_H","jsx","_jsx","Switch","value","onChange","disabled","accessibilityLabel","testID","c","styles","progress","duration","base","trackStyle","backgroundColor","surfaceContainerHighest","primary","thumbStyle","transform","translateX","onPress","hitSlop","Math","round","hitTarget","style","pressableDisabled","pressableEnabled","accessibilityRole","accessibilityState","checked","children","View","track","thumb"],"sourceRoot":"../../../../../src","sources":["components/ui/Switch/Switch.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,SAAS,QAAQ,OAAO;AACxC,SAASC,SAAS,QAAQ,8BAA8B;AAExD,OAAOC,QAAQ,IACbC,eAAe,EACfC,WAAW,EACXC,gBAAgB,EAChBC,gBAAgB,EAChBC,cAAc,EACdC,UAAU,QACL,yBAAyB;AAChC,SAASC,KAAK,EAAEC,MAAM,EAAEC,CAAC,EAAEC,SAAS,EAAEC,eAAe,QAAQ,yBAAgB;AAC7E,SAASC,UAAU,EAAEC,WAAW,EAAEC,UAAU,EAAEC,OAAO,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGxE;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,MAAMA,CAAC;EACrBC,KAAK;EACLC,QAAQ;EACRC,QAAQ;EACRC,kBAAkB;EAClBC;AACW,CAAC,EAAqB;EACjC,MAAMC,CAAC,GAAGd,SAAS,CAAC,CAAC;EACrB,MAAMe,MAAM,GAAGd,eAAe,CAACC,UAAU,CAAC;EAC1C,MAAMc,QAAQ,GAAGrB,cAAc,CAACc,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC;EAE9CrB,SAAS,CAAC,MAAM;IACd4B,QAAQ,CAACP,KAAK,GAAGb,UAAU,CAACa,KAAK,GAAG,CAAC,GAAG,CAAC,EAAE;MAAEQ,QAAQ,EAAEnB,MAAM,CAACoB;IAAK,CAAC,CAAC;IACrE,OAAO,MAAM3B,eAAe,CAACyB,QAAQ,CAAC;EACxC,CAAC,EAAE,CAACP,KAAK,EAAEO,QAAQ,CAAC,CAAC;EAErB,MAAMG,UAAU,GAAGzB,gBAAgB,CAAC,OAAO;IACzC0B,eAAe,EAAE3B,gBAAgB,CAC/BuB,QAAQ,CAACP,KAAK,EACd,CAAC,CAAC,EAAE,CAAC,CAAC,EACN,CAACK,CAAC,CAACO,uBAAuB,EAAEP,CAAC,CAACQ,OAAO,CACvC;EACF,CAAC,CAAC,CAAC;EAEH,MAAMC,UAAU,GAAG7B,gBAAgB,CAAC,OAAO;IACzC8B,SAAS,EAAE,CACT;MACEC,UAAU,EAAEjC,WAAW,CACrBwB,QAAQ,CAACP,KAAK,EACd,CAAC,CAAC,EAAE,CAAC,CAAC,EACN,CAACN,WAAW,EAAEC,UAAU,CAC1B;IACF,CAAC;EAEL,CAAC,CAAC,CAAC;EAEH,oBACEG,IAAA,CAAClB,SAAS;IACRqC,OAAO,EAAEA,CAAA,KAAM,CAACf,QAAQ,IAAID,QAAQ,CAAC,CAACD,KAAK,CAAE;IAC7CE,QAAQ,EAAEA;IACV;IAAA;IACAgB,OAAO,EAAEC,IAAI,CAACC,KAAK,CAAC,CAAChC,KAAK,CAACiC,SAAS,GAAG/B,CAAC,CAACM,OAAO,CAAC,IAAI,CAAC,CAAE;IACxD0B,KAAK,EAAEpB,QAAQ,GAAGI,MAAM,CAACiB,iBAAiB,GAAGjB,MAAM,CAACkB,gBAAiB;IACrEC,iBAAiB,EAAC,QAAQ;IAC1BC,kBAAkB,EAAE;MAAEC,OAAO,EAAE3B,KAAK;MAAEE,QAAQ,EAAE,CAAC,CAACA;IAAS,CAAE;IAC7DC,kBAAkB,EAAEA,kBAAmB;IACvCC,MAAM,EAAEA,MAAO;IAAAwB,QAAA,eAEf9B,IAAA,CAACjB,QAAQ,CAACgD,IAAI;MAACP,KAAK,EAAE,CAAChB,MAAM,CAACwB,KAAK,EAAEpB,UAAU,CAAE;MAAAkB,QAAA,eAC/C9B,IAAA,CAACjB,QAAQ,CAACgD,IAAI;QAACP,KAAK,EAAE,CAAChB,MAAM,CAACyB,KAAK,EAAEjB,UAAU;MAAE,CAAE;IAAC,CACvC;EAAC,CACP,CAAC;AAEhB","ignoreList":[]}

package/lib/module/components/ui/Switch/Switch.web.js

@@ -3,15 +3,9 @@
 import React from 'react';
 import { Pressable } from 'react-native-gesture-handler';
 import { View } from 'react-native';
-import { motion, r, useColors, useThemedStyles } from "../../../theme/index.js";
-import { INSET, makeStyles, THUMB, TRACK_W } from "./styles.js";
+import { motion, useColors, useThemedStyles } from "../../../theme/index.js";
+import { makeStyles, THUMB_OFF_X, THUMB_ON_X } from "./styles.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-// ─── 动画派生常量(组件私有,非 style)─────────────────────────────────────
-// 把手 translateX 的 off / on 端点:左右各留 INSET 间距,
-// off = INSET(2),on = trackW - INSET - thumbW(32-2-16=14)。
-const THUMB_OFF_X = r(INSET);
-const THUMB_ON_X = r(TRACK_W - INSET - THUMB);
-
 /**
  * Web 端 Switch —— RN-Web 上 reanimated 4 + worklets 0.9.x 的 useAnimatedStyle
  * 链路会抛 `Object.keys(undefined)` TypeError(切换时打印,thumb 卡住),走 CSS

package/lib/module/components/ui/Switch/Switch.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Pressable","View","motion","r","useColors","useThemedStyles","INSET","makeStyles","THUMB","TRACK_W","jsx","_jsx","THUMB_OFF_X","THUMB_ON_X","Switch","value","onChange","disabled","accessibilityLabel","testID","c","styles","trackWebStyle","track","backgroundColor","primary","surfaceContainerHighest","transitionProperty","transitionDuration","base","transitionTimingFunction","thumbWebStyle","thumb","transform","translateX","onPress","hitSlop","style","pressableDisabled","pressableEnabled","accessibilityRole","accessibilityState","checked","children"],"sourceRoot":"../../../../../src","sources":["components/ui/Switch/Switch.web.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,SAAS,QAAQ,8BAA8B;AACxD,SAASC,IAAI,QAAQ,cAAc;AACnC,SAASC,MAAM,EAAEC,CAAC,EAAEC,SAAS,EAAEC,eAAe,QAAQ,yBAAgB;AACtE,SAASC,KAAK,EAAEC,UAAU,EAAEC,KAAK,EAAEC,OAAO,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAG7D;AACA;AACA;AACA,MAAMC,WAAW,GAAGT,CAAC,CAACG,KAAK,CAAC;AAC5B,MAAMO,UAAU,GAAGV,CAAC,CAACM,OAAO,GAAGH,KAAK,GAAGE,KAAK,CAAC;;AAE7C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASM,MAAMA,CAAC;EACrBC,KAAK;EACLC,QAAQ;EACRC,QAAQ;EACRC,kBAAkB;EAClBC;AACW,CAAC,EAAqB;EACjC,MAAMC,CAAC,GAAGhB,SAAS,CAAC,CAAC;EACrB,MAAMiB,MAAM,GAAGhB,eAAe,CAACE,UAAU,CAAC;;EAE1C;EACA,MAAMe,aAAa,GAAG;IACpB,GAAGD,MAAM,CAACE,KAAK;IACfC,eAAe,EAAET,KAAK,GAAGK,CAAC,CAACK,OAAO,GAAGL,CAAC,CAACM,uBAAuB;IAC9D;IACAC,kBAAkB,EAAE,kBAAkB;IACtCC,kBAAkB,EAAE,GAAG1B,MAAM,CAAC2B,IAAI,IAAI;IACtCC,wBAAwB,EAAE;EAC5B,CAAsB;EACtB,MAAMC,aAAa,GAAG;IACpB,GAAGV,MAAM,CAACW,KAAK;IACfC,SAAS,EAAE,CAAC;MAAEC,UAAU,EAAEnB,KAAK,GAAGF,UAAU,GAAGD;IAAY,CAAC,CAAC;IAC7De,kBAAkB,EAAE,WAAW;IAC/BC,kBAAkB,EAAE,GAAG1B,MAAM,CAAC2B,IAAI,IAAI;IACtCC,wBAAwB,EAAE;EAC5B,CAAsB;EAEtB,oBACEnB,IAAA,CAACX,SAAS;IACRmC,OAAO,EAAEA,CAAA,KAAM,CAAClB,QAAQ,IAAID,QAAQ,CAAC,CAACD,KAAK,CAAE;IAC7CE,QAAQ,EAAEA,QAAS;IACnBmB,OAAO,EAAE,CAAE;IACXC,KAAK,EAAEpB,QAAQ,GAAGI,MAAM,CAACiB,iBAAiB,GAAGjB,MAAM,CAACkB,gBAAiB;IACrEC,iBAAiB,EAAC,QAAQ;IAC1BC,kBAAkB,EAAE;MAAEC,OAAO,EAAE3B,KAAK;MAAEE,QAAQ,EAAE,CAAC,CAACA;IAAS,CAAE;IAC7DC,kBAAkB,EAAEA,kBAAmB;IACvCC,MAAM,EAAEA,MAAO;IAAAwB,QAAA,eAEfhC,IAAA,CAACV,IAAI;MAACoC,KAAK,EAAEf,aAAc;MAAAqB,QAAA,eACzBhC,IAAA,CAACV,IAAI;QAACoC,KAAK,EAAEN;MAAc,CAAE;IAAC,CAC1B;EAAC,CACE,CAAC;AAEhB","ignoreList":[]}
+{"version":3,"names":["React","Pressable","View","motion","useColors","useThemedStyles","makeStyles","THUMB_OFF_X","THUMB_ON_X","jsx","_jsx","Switch","value","onChange","disabled","accessibilityLabel","testID","c","styles","trackWebStyle","track","backgroundColor","primary","surfaceContainerHighest","transitionProperty","transitionDuration","base","transitionTimingFunction","thumbWebStyle","thumb","transform","translateX","onPress","hitSlop","style","pressableDisabled","pressableEnabled","accessibilityRole","accessibilityState","checked","children"],"sourceRoot":"../../../../../src","sources":["components/ui/Switch/Switch.web.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,SAAS,QAAQ,8BAA8B;AACxD,SAASC,IAAI,QAAQ,cAAc;AACnC,SAASC,MAAM,EAAEC,SAAS,EAAEC,eAAe,QAAQ,yBAAgB;AACnE,SAASC,UAAU,EAAEC,WAAW,EAAEC,UAAU,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAG/D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,MAAMA,CAAC;EACrBC,KAAK;EACLC,QAAQ;EACRC,QAAQ;EACRC,kBAAkB;EAClBC;AACW,CAAC,EAAqB;EACjC,MAAMC,CAAC,GAAGb,SAAS,CAAC,CAAC;EACrB,MAAMc,MAAM,GAAGb,eAAe,CAACC,UAAU,CAAC;;EAE1C;EACA,MAAMa,aAAa,GAAG;IACpB,GAAGD,MAAM,CAACE,KAAK;IACfC,eAAe,EAAET,KAAK,GAAGK,CAAC,CAACK,OAAO,GAAGL,CAAC,CAACM,uBAAuB;IAC9D;IACAC,kBAAkB,EAAE,kBAAkB;IACtCC,kBAAkB,EAAE,GAAGtB,MAAM,CAACuB,IAAI,IAAI;IACtCC,wBAAwB,EAAE;EAC5B,CAAsB;EACtB,MAAMC,aAAa,GAAG;IACpB,GAAGV,MAAM,CAACW,KAAK;IACfC,SAAS,EAAE,CAAC;MAAEC,UAAU,EAAEnB,KAAK,GAAGJ,UAAU,GAAGD;IAAY,CAAC,CAAC;IAC7DiB,kBAAkB,EAAE,WAAW;IAC/BC,kBAAkB,EAAE,GAAGtB,MAAM,CAACuB,IAAI,IAAI;IACtCC,wBAAwB,EAAE;EAC5B,CAAsB;EAEtB,oBACEjB,IAAA,CAACT,SAAS;IACR+B,OAAO,EAAEA,CAAA,KAAM,CAAClB,QAAQ,IAAID,QAAQ,CAAC,CAACD,KAAK,CAAE;IAC7CE,QAAQ,EAAEA,QAAS;IACnBmB,OAAO,EAAE,CAAE;IACXC,KAAK,EAAEpB,QAAQ,GAAGI,MAAM,CAACiB,iBAAiB,GAAGjB,MAAM,CAACkB,gBAAiB;IACrEC,iBAAiB,EAAC,QAAQ;IAC1BC,kBAAkB,EAAE;MAAEC,OAAO,EAAE3B,KAAK;MAAEE,QAAQ,EAAE,CAAC,CAACA;IAAS,CAAE;IAC7DC,kBAAkB,EAAEA,kBAAmB;IACvCC,MAAM,EAAEA,MAAO;IAAAwB,QAAA,eAEf9B,IAAA,CAACR,IAAI;MAACgC,KAAK,EAAEf,aAAc;MAAAqB,QAAA,eACzB9B,IAAA,CAACR,IAAI;QAACgC,KAAK,EAAEN;MAAc,CAAE;IAAC,CAC1B;EAAC,CACE,CAAC;AAEhB","ignoreList":[]}

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

@@ -8,12 +8,20 @@ export const TRACK_W = 32;
 export const TRACK_H = 20;
 export const THUMB = 16;
 export const INSET = 2;
+
+/** [M-25] 把手 translateX 端点 —— 与 styles 同源导出,Switch.tsx / Switch.web.tsx 两端 import。
+ *  off = INSET(2),on = TRACK_W - INSET - THUMB(32-2-16=14)。走 r() 保证多设备缩放一致。 */
+export const THUMB_OFF_X = r(INSET);
+export const THUMB_ON_X = r(TRACK_W - INSET - THUMB);
 export const makeStyles = c => StyleSheet.create({
   pressableEnabled: {
-    opacity: 1
+    opacity: 1,
+    // [L-37] alignSelf:'flex-start' 防止父容器拉伸把手区域(与 Chip [M-8] 同口径)
+    alignSelf: 'flex-start'
   },
   pressableDisabled: {
-    opacity: 0.5
+    opacity: 0.5,
+    alignSelf: 'flex-start'
   },
   track: {
     width: r(TRACK_W),
@@ -24,7 +32,8 @@ export const makeStyles = c => StyleSheet.create({
   thumb: {
     width: r(THUMB),
     height: r(THUMB),
-    borderRadius: radius.md,
+    // [L-79] radius.pill —— sentinel 999 确保把手始终是真圆
+    borderRadius: radius.pill,
     backgroundColor: c.onPrimary
   }
 });

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

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","r","radius","TRACK_W","TRACK_H","THUMB","INSET","makeStyles","c","create","pressableEnabled","opacity","pressableDisabled","track","width","height","borderRadius","lg","justifyContent","thumb","md","backgroundColor","onPrimary"],"sourceRoot":"../../../../../src","sources":["components/ui/Switch/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SAASC,CAAC,EAAEC,MAAM,QAAQ,yBAAgB;AAG1C;AACA;AACA,OAAO,MAAMC,OAAO,GAAG,EAAE;AACzB,OAAO,MAAMC,OAAO,GAAG,EAAE;AACzB,OAAO,MAAMC,KAAK,GAAG,EAAE;AACvB,OAAO,MAAMC,KAAK,GAAG,CAAC;AAEtB,OAAO,MAAMC,UAAU,GAAIC,CAAc,IACvCR,UAAU,CAACS,MAAM,CAAC;EAChBC,gBAAgB,EAAE;IAChBC,OAAO,EAAE;EACX,CAAC;EACDC,iBAAiB,EAAE;IACjBD,OAAO,EAAE;EACX,CAAC;EACDE,KAAK,EAAE;IACLC,KAAK,EAAEb,CAAC,CAACE,OAAO,CAAC;IACjBY,MAAM,EAAEd,CAAC,CAACG,OAAO,CAAC;IAClBY,YAAY,EAAEd,MAAM,CAACe,EAAE;IACvBC,cAAc,EAAE;EAClB,CAAC;EACDC,KAAK,EAAE;IACLL,KAAK,EAAEb,CAAC,CAACI,KAAK,CAAC;IACfU,MAAM,EAAEd,CAAC,CAACI,KAAK,CAAC;IAChBW,YAAY,EAAEd,MAAM,CAACkB,EAAE;IACvBC,eAAe,EAAEb,CAAC,CAACc;EACrB;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["StyleSheet","r","radius","TRACK_W","TRACK_H","THUMB","INSET","THUMB_OFF_X","THUMB_ON_X","makeStyles","c","create","pressableEnabled","opacity","alignSelf","pressableDisabled","track","width","height","borderRadius","lg","justifyContent","thumb","pill","backgroundColor","onPrimary"],"sourceRoot":"../../../../../src","sources":["components/ui/Switch/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SAASC,CAAC,EAAEC,MAAM,QAAQ,yBAAgB;AAG1C;AACA;AACA,OAAO,MAAMC,OAAO,GAAG,EAAE;AACzB,OAAO,MAAMC,OAAO,GAAG,EAAE;AACzB,OAAO,MAAMC,KAAK,GAAG,EAAE;AACvB,OAAO,MAAMC,KAAK,GAAG,CAAC;;AAEtB;AACA;AACA,OAAO,MAAMC,WAAW,GAAGN,CAAC,CAACK,KAAK,CAAC;AACnC,OAAO,MAAME,UAAU,GAAGP,CAAC,CAACE,OAAO,GAAGG,KAAK,GAAGD,KAAK,CAAC;AAEpD,OAAO,MAAMI,UAAU,GAAIC,CAAc,IACvCV,UAAU,CAACW,MAAM,CAAC;EAChBC,gBAAgB,EAAE;IAChBC,OAAO,EAAE,CAAC;IACV;IACAC,SAAS,EAAE;EACb,CAAC;EACDC,iBAAiB,EAAE;IACjBF,OAAO,EAAE,GAAG;IACZC,SAAS,EAAE;EACb,CAAC;EACDE,KAAK,EAAE;IACLC,KAAK,EAAEhB,CAAC,CAACE,OAAO,CAAC;IACjBe,MAAM,EAAEjB,CAAC,CAACG,OAAO,CAAC;IAClBe,YAAY,EAAEjB,MAAM,CAACkB,EAAE;IACvBC,cAAc,EAAE;EAClB,CAAC;EACDC,KAAK,EAAE;IACLL,KAAK,EAAEhB,CAAC,CAACI,KAAK,CAAC;IACfa,MAAM,EAAEjB,CAAC,CAACI,KAAK,CAAC;IAChB;IACAc,YAAY,EAAEjB,MAAM,CAACqB,IAAI;IACzBC,eAAe,EAAEd,CAAC,CAACe;EACrB;AACF,CAAC,CAAC","ignoreList":[]}

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

@@ -3,48 +3,52 @@
 import React from 'react';
 import { Text, View } from 'react-native';
 import { Pressable } from 'react-native-gesture-handler';
-import { icon, useColors, useThemedStyles } from "../../../theme/index.js";
+import { pressedOpacity, r, useColors, useThemedStyles } from "../../../theme/index.js";
 import { childTestID } from "../../../utils/testID/index.js";
 import { Icon } from "../Icon/index.js";
 import { makeStyles } from "./styles.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * 固定底部 tab bar —— App 主导航。
- * 高 50px，顶部一条细线边框。激活色：primary-300。
+ * 高 50px，顶部一条细线边框。激活色：primary。
  * 想留 home indicator 的安全区，请外面包一层 `<SafeAreaView edges={['bottom']}>`。
  */
 export function TabBar({
   active,
   onChange,
   items,
+  style,
   testID
 }) {
   const c = useColors();
   const styles = useThemedStyles(makeStyles);
   return /*#__PURE__*/_jsx(View, {
-    style: styles.bar,
+    style: [styles.bar, style],
     testID: testID,
+    accessibilityRole: "tablist",
     children: items.map(item => {
       const on = item.id === active;
       const tint = on ? c.primary : c.foregroundSubtle;
       const itemTestID = childTestID(testID, item.id, item.testID);
+      // a11y label 包含角标数量,SR 用户知晓待处理条目数(如"消息,3条未读")
+      const a11yLabel = item.badge != null ? `${item.label},${item.badge}条未读` : item.label;
       return /*#__PURE__*/_jsxs(Pressable, {
         onPress: () => onChange(item.id),
         accessibilityRole: "tab",
         accessibilityState: {
           selected: on
         },
-        accessibilityLabel: item.label,
+        accessibilityLabel: a11yLabel,
         testID: itemTestID,
         style: ({
           pressed
         }) => [styles.tab, {
-          opacity: pressed ? 0.7 : 1
+          opacity: pressed ? pressedOpacity : 1
         }],
         children: [/*#__PURE__*/_jsxs(View, {
           children: [/*#__PURE__*/_jsx(Icon, {
             name: item.icon,
-            size: icon.sm,
+            size: r(22),
             color: tint
           }), item.badge != null ? /*#__PURE__*/_jsx(View, {
             style: styles.badge,

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

@@ -1 +1 @@
-{"version":3,"names":["React","Text","View","Pressable","icon","useColors","useThemedStyles","childTestID","Icon","makeStyles","jsx","_jsx","jsxs","_jsxs","TabBar","active","onChange","items","testID","c","styles","style","bar","children","map","item","on","id","tint","primary","foregroundSubtle","itemTestID","onPress","accessibilityRole","accessibilityState","selected","accessibilityLabel","label","pressed","tab","opacity","name","size","sm","color","badge","badgeText","numberOfLines"],"sourceRoot":"../../../../../src","sources":["components/ui/TabBar/TabBar.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,IAAI,EAAEC,IAAI,QAAQ,cAAc;AACzC,SAASC,SAAS,QAAQ,8BAA8B;AACxD,SAASC,IAAI,EAAEC,SAAS,EAAEC,eAAe,QAAQ,yBAAgB;AACjE,SAASC,WAAW,QAAQ,gCAAuB;AACnD,SAASC,IAAI,QAAQ,kBAAS;AAC9B,SAASC,UAAU,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAGtC;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,MAAMA,CAAC;EACrBC,MAAM;EACNC,QAAQ;EACRC,KAAK;EACLC;AACW,CAAC,EAAqB;EACjC,MAAMC,CAAC,GAAGd,SAAS,CAAC,CAAC;EACrB,MAAMe,MAAM,GAAGd,eAAe,CAACG,UAAU,CAAC;EAC1C,oBACEE,IAAA,CAACT,IAAI;IAACmB,KAAK,EAAED,MAAM,CAACE,GAAI;IAACJ,MAAM,EAAEA,MAAO;IAAAK,QAAA,EACrCN,KAAK,CAACO,GAAG,CAAEC,IAAI,IAAK;MACnB,MAAMC,EAAE,GAAGD,IAAI,CAACE,EAAE,KAAKZ,MAAM;MAC7B,MAAMa,IAAI,GAAGF,EAAE,GAAGP,CAAC,CAACU,OAAO,GAAGV,CAAC,CAACW,gBAAgB;MAChD,MAAMC,UAAU,GAAGxB,WAAW,CAACW,MAAM,EAAEO,IAAI,CAACE,EAAE,EAAEF,IAAI,CAACP,MAAM,CAAC;MAC5D,oBACEL,KAAA,CAACV,SAAS;QAER6B,OAAO,EAAEA,CAAA,KAAMhB,QAAQ,CAACS,IAAI,CAACE,EAAE,CAAE;QACjCM,iBAAiB,EAAC,KAAK;QACvBC,kBAAkB,EAAE;UAAEC,QAAQ,EAAET;QAAG,CAAE;QACrCU,kBAAkB,EAAEX,IAAI,CAACY,KAAM;QAC/BnB,MAAM,EAAEa,UAAW;QACnBV,KAAK,EAAEA,CAAC;UAAEiB;QAAQ,CAAC,KAAK,CACtBlB,MAAM,CAACmB,GAAG,EACV;UAAEC,OAAO,EAAEF,OAAO,GAAG,GAAG,GAAG;QAAE,CAAC,CAC9B;QAAAf,QAAA,gBAEFV,KAAA,CAACX,IAAI;UAAAqB,QAAA,gBACHZ,IAAA,CAACH,IAAI;YAACiC,IAAI,EAAEhB,IAAI,CAACrB,IAAK;YAACsC,IAAI,EAAEtC,IAAI,CAACuC,EAAG;YAACC,KAAK,EAAEhB;UAAK,CAAE,CAAC,EACpDH,IAAI,CAACoB,KAAK,IAAI,IAAI,gBACjBlC,IAAA,CAACT,IAAI;YAACmB,KAAK,EAAED,MAAM,CAACyB,KAAM;YAAAtB,QAAA,eACxBZ,IAAA,CAACV,IAAI;cAACoB,KAAK,EAAED,MAAM,CAAC0B,SAAU;cAAAvB,QAAA,EAAEE,IAAI,CAACoB;YAAK,CAAO;UAAC,CAC9C,CAAC,GACL,IAAI;QAAA,CACJ,CAAC,eACPlC,IAAA,CAACV,IAAI;UAACoB,KAAK,EAAE,CAACD,MAAM,CAACiB,KAAK,EAAE;YAAEO,KAAK,EAAEhB;UAAK,CAAC,CAAE;UAACmB,aAAa,EAAE,CAAE;UAAAxB,QAAA,EAC5DE,IAAI,CAACY;QAAK,CACP,CAAC;MAAA,GArBFZ,IAAI,CAACE,EAsBD,CAAC;IAEhB,CAAC;EAAC,CACE,CAAC;AAEX","ignoreList":[]}
+{"version":3,"names":["React","Text","View","Pressable","pressedOpacity","r","useColors","useThemedStyles","childTestID","Icon","makeStyles","jsx","_jsx","jsxs","_jsxs","TabBar","active","onChange","items","style","testID","c","styles","bar","accessibilityRole","children","map","item","on","id","tint","primary","foregroundSubtle","itemTestID","a11yLabel","badge","label","onPress","accessibilityState","selected","accessibilityLabel","pressed","tab","opacity","name","icon","size","color","badgeText","numberOfLines"],"sourceRoot":"../../../../../src","sources":["components/ui/TabBar/TabBar.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -1,43 +1,32 @@
 "use strict";
 
 import { StyleSheet } from 'react-native';
-import { fixed, fw, r, radius, space, type as t } from "../../../theme/index.js";
-export const makeStyles = c => StyleSheet.create({
-  bar: {
-    height: fixed.tabbarH,
-    flexDirection: 'row',
-    backgroundColor: c.surface,
-    borderTopWidth: StyleSheet.hairlineWidth,
-    borderTopColor: c.outline
-  },
-  tab: {
-    flex: 1,
-    alignItems: 'center',
-    justifyContent: 'center',
-    gap: r(2)
-  },
-  label: {
-    fontSize: t.nano,
-    fontWeight: fw.medium,
-    lineHeight: 12
-  },
-  badge: {
-    position: 'absolute',
-    top: r(-3),
-    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
-  }
-});
+import { fixed, fw, r, type as t } from "../../../theme/index.js";
+import { badgeStyles } from "../shared/badgeStyles.js";
+export const makeStyles = c => {
+  // TabBar 图标 22pt,角标上边缘偏移 r(-3):使圆心落在图标右上角
+  const badge = badgeStyles(c, r(-3));
+  return StyleSheet.create({
+    bar: {
+      height: fixed.tabbarH,
+      flexDirection: 'row',
+      backgroundColor: c.surface,
+      borderTopWidth: StyleSheet.hairlineWidth,
+      borderTopColor: c.outline
+    },
+    tab: {
+      flex: 1,
+      alignItems: 'center',
+      justifyContent: 'center',
+      gap: r(2)
+    },
+    label: {
+      fontSize: t.nano,
+      fontWeight: fw.medium,
+      lineHeight: 12
+    },
+    badge: badge.badge,
+    badgeText: badge.badgeText
+  });
+};
 //# sourceMappingURL=styles.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","fixed","fw","r","radius","space","type","t","makeStyles","c","create","bar","height","tabbarH","flexDirection","backgroundColor","surface","borderTopWidth","hairlineWidth","borderTopColor","outline","tab","flex","alignItems","justifyContent","gap","label","fontSize","nano","fontWeight","medium","lineHeight","badge","position","top","right","minWidth","borderRadius","md","error","paddingHorizontal","badgeText","color","onError","bold"],"sourceRoot":"../../../../../src","sources":["components/ui/TabBar/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AAEzC,SAASC,KAAK,EAAEC,EAAE,EAAEC,CAAC,EAAEC,MAAM,EAAEC,KAAK,EAAEC,IAAI,IAAIC,CAAC,QAAQ,yBAAgB;AAEvE,OAAO,MAAMC,UAAU,GAAIC,CAAc,IACvCT,UAAU,CAACU,MAAM,CAAC;EAChBC,GAAG,EAAE;IACHC,MAAM,EAAEX,KAAK,CAACY,OAAO;IACrBC,aAAa,EAAE,KAAK;IACpBC,eAAe,EAAEN,CAAC,CAACO,OAAO;IAC1BC,cAAc,EAAEjB,UAAU,CAACkB,aAAa;IACxCC,cAAc,EAAEV,CAAC,CAACW;EACpB,CAAC;EACDC,GAAG,EAAE;IACHC,IAAI,EAAE,CAAC;IACPC,UAAU,EAAE,QAAQ;IACpBC,cAAc,EAAE,QAAQ;IACxBC,GAAG,EAAEtB,CAAC,CAAC,CAAC;EACV,CAAC;EACDuB,KAAK,EAAE;IACLC,QAAQ,EAAEpB,CAAC,CAACqB,IAAI;IAChBC,UAAU,EAAE3B,EAAE,CAAC4B,MAAM;IACrBC,UAAU,EAAE;EACd,CAAC;EACDC,KAAK,EAAE;IACLC,QAAQ,EAAE,UAAU;IACpBC,GAAG,EAAE/B,CAAC,CAAC,CAAC,CAAC,CAAC;IACVgC,KAAK,EAAEhC,CAAC,CAAC,CAAC,EAAE,CAAC;IACbiC,QAAQ,EAAEjC,CAAC,CAAC,EAAE,CAAC;IACfS,MAAM,EAAET,CAAC,CAAC,EAAE,CAAC;IACbkC,YAAY,EAAEjC,MAAM,CAACkC,EAAE;IACvBvB,eAAe,EAAEN,CAAC,CAAC8B,KAAK;IACxBC,iBAAiB,EAAEnC,KAAK,CAAC,CAAC,CAAC;IAC3BkB,UAAU,EAAE,QAAQ;IACpBC,cAAc,EAAE;EAClB,CAAC;EACDiB,SAAS,EAAE;IACTC,KAAK,EAAEjC,CAAC,CAACkC,OAAO;IAChBhB,QAAQ,EAAEpB,CAAC,CAACqB,IAAI;IAChBC,UAAU,EAAE3B,EAAE,CAAC0C,IAAI;IACnBb,UAAU,EAAE;EACd;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["StyleSheet","fixed","fw","r","type","t","badgeStyles","makeStyles","c","badge","create","bar","height","tabbarH","flexDirection","backgroundColor","surface","borderTopWidth","hairlineWidth","borderTopColor","outline","tab","flex","alignItems","justifyContent","gap","label","fontSize","nano","fontWeight","medium","lineHeight","badgeText"],"sourceRoot":"../../../../../src","sources":["components/ui/TabBar/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AAEzC,SAASC,KAAK,EAAEC,EAAE,EAAEC,CAAC,EAAEC,IAAI,IAAIC,CAAC,QAAQ,yBAAgB;AACxD,SAASC,WAAW,QAAQ,0BAAuB;AAEnD,OAAO,MAAMC,UAAU,GAAIC,CAAc,IAAK;EAC5C;EACA,MAAMC,KAAK,GAAGH,WAAW,CAACE,CAAC,EAAEL,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;EACnC,OAAOH,UAAU,CAACU,MAAM,CAAC;IACvBC,GAAG,EAAE;MACHC,MAAM,EAAEX,KAAK,CAACY,OAAO;MACrBC,aAAa,EAAE,KAAK;MACpBC,eAAe,EAAEP,CAAC,CAACQ,OAAO;MAC1BC,cAAc,EAAEjB,UAAU,CAACkB,aAAa;MACxCC,cAAc,EAAEX,CAAC,CAACY;IACpB,CAAC;IACDC,GAAG,EAAE;MACHC,IAAI,EAAE,CAAC;MACPC,UAAU,EAAE,QAAQ;MACpBC,cAAc,EAAE,QAAQ;MACxBC,GAAG,EAAEtB,CAAC,CAAC,CAAC;IACV,CAAC;IACDuB,KAAK,EAAE;MACLC,QAAQ,EAAEtB,CAAC,CAACuB,IAAI;MAChBC,UAAU,EAAE3B,EAAE,CAAC4B,MAAM;MACrBC,UAAU,EAAE;IACd,CAAC;IACDtB,KAAK,EAAEA,KAAK,CAACA,KAAK;IAClBuB,SAAS,EAAEvB,KAAK,CAACuB;EACnB,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}

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

@@ -3,10 +3,13 @@
 import React from 'react';
 import { Text, View } from 'react-native';
 import { Pressable } from 'react-native-gesture-handler';
-import { useColors, useThemedStyles, fw } from "../../../theme/index.js";
+import { fw, pressedOpacity, useColors, useThemedStyles } from "../../../theme/index.js";
+import { createLogger } from "../../../utils/logger/index.js";
 import { childTestID } from "../../../utils/testID/index.js";
 import { makeStyles } from "./styles.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const log = createLogger('Tabs');
+
 /**
  * 页面级下划线 tabs。
  * 占满宽度，高 44px，激活项下方有 2px 主色下划线。
@@ -15,28 +18,39 @@ export function Tabs({
   value,
   onChange,
   items,
+  disabled: allDisabled = false,
+  style,
   testID
 }) {
   const c = useColors();
   const styles = useThemedStyles(makeStyles);
+  // items 长度守卫 —— types 注释承诺「≥2 项才有意义」,此处对违规使用方 dev warn。
+  // 不 return null:渲染空 tablist 比渲染单 tab 更符合 a11y 预期,且不破坏 hook 调用顺序。
+  if (items.length < 2) {
+    log.warn(`Tabs 至少需要 2 项，当前传入 ${items.length} 项`);
+  }
   return /*#__PURE__*/_jsx(View, {
-    style: styles.under,
+    style: [styles.under, style],
     testID: testID,
+    accessibilityRole: "tablist",
     children: items.map(it => {
       const on = it.id === value;
+      const itemDisabled = allDisabled || (it.disabled ?? false);
       const itemTestID = childTestID(testID, it.id, it.testID);
       return /*#__PURE__*/_jsxs(Pressable, {
-        onPress: () => onChange(it.id),
+        onPress: () => !itemDisabled && onChange(it.id),
+        disabled: itemDisabled,
         accessibilityRole: "tab",
         accessibilityState: {
-          selected: on
+          selected: on,
+          disabled: itemDisabled || undefined
         },
         accessibilityLabel: it.label,
         testID: itemTestID,
         style: ({
           pressed
         }) => [styles.underTab, {
-          opacity: pressed ? 0.7 : 1
+          opacity: itemDisabled ? 0.4 : pressed ? pressedOpacity : 1
         }],
         children: [/*#__PURE__*/_jsx(Text, {
           style: [styles.underLabel, {

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

@@ -1 +1 @@
-{"version":3,"names":["React","Text","View","Pressable","useColors","useThemedStyles","fw","childTestID","makeStyles","jsx","_jsx","jsxs","_jsxs","Tabs","value","onChange","items","testID","c","styles","style","under","children","map","it","on","id","itemTestID","onPress","accessibilityRole","accessibilityState","selected","accessibilityLabel","label","pressed","underTab","opacity","underLabel","color","primary","foregroundMuted","fontWeight","semi","medium","numberOfLines","underBar"],"sourceRoot":"../../../../../src","sources":["components/ui/Tabs/Tabs.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,IAAI,EAAEC,IAAI,QAAQ,cAAc;AACzC,SAASC,SAAS,QAAQ,8BAA8B;AACxD,SAASC,SAAS,EAAEC,eAAe,EAAEC,EAAE,QAAQ,yBAAgB;AAC/D,SAASC,WAAW,QAAQ,gCAAuB;AACnD,SAASC,UAAU,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAGtC;AACA;AACA;AACA;AACA,OAAO,SAASC,IAAIA,CAAC;EACnBC,KAAK;EACLC,QAAQ;EACRC,KAAK;EACLC;AACS,CAAC,EAAqB;EAC/B,MAAMC,CAAC,GAAGd,SAAS,CAAC,CAAC;EACrB,MAAMe,MAAM,GAAGd,eAAe,CAACG,UAAU,CAAC;EAC1C,oBACEE,IAAA,CAACR,IAAI;IAACkB,KAAK,EAAED,MAAM,CAACE,KAAM;IAACJ,MAAM,EAAEA,MAAO;IAAAK,QAAA,EACvCN,KAAK,CAACO,GAAG,CAAEC,EAAE,IAAK;MACjB,MAAMC,EAAE,GAAGD,EAAE,CAACE,EAAE,KAAKZ,KAAK;MAC1B,MAAMa,UAAU,GAAGpB,WAAW,CAACU,MAAM,EAAEO,EAAE,CAACE,EAAE,EAAEF,EAAE,CAACP,MAAM,CAAC;MACxD,oBACEL,KAAA,CAACT,SAAS;QAERyB,OAAO,EAAEA,CAAA,KAAMb,QAAQ,CAACS,EAAE,CAACE,EAAE,CAAE;QAC/BG,iBAAiB,EAAC,KAAK;QACvBC,kBAAkB,EAAE;UAAEC,QAAQ,EAAEN;QAAG,CAAE;QACrCO,kBAAkB,EAAER,EAAE,CAACS,KAAM;QAC7BhB,MAAM,EAAEU,UAAW;QACnBP,KAAK,EAAEA,CAAC;UAAEc;QAAQ,CAAC,KAAK,CACtBf,MAAM,CAACgB,QAAQ,EACf;UAAEC,OAAO,EAAEF,OAAO,GAAG,GAAG,GAAG;QAAE,CAAC,CAC9B;QAAAZ,QAAA,gBAEFZ,IAAA,CAACT,IAAI;UACHmB,KAAK,EAAE,CACLD,MAAM,CAACkB,UAAU,EACjB;YACEC,KAAK,EAAEb,EAAE,GAAGP,CAAC,CAACqB,OAAO,GAAGrB,CAAC,CAACsB,eAAe;YACzCC,UAAU,EAAEhB,EAAE,GAAGnB,EAAE,CAACoC,IAAI,GAAGpC,EAAE,CAACqC;UAChC,CAAC,CACD;UACFC,aAAa,EAAE,CAAE;UAAAtB,QAAA,EAEhBE,EAAE,CAACS;QAAK,CACL,CAAC,EACNR,EAAE,gBAAGf,IAAA,CAACR,IAAI;UAACkB,KAAK,EAAED,MAAM,CAAC0B;QAAS,CAAE,CAAC,GAAG,IAAI;MAAA,GAvBxCrB,EAAE,CAACE,EAwBC,CAAC;IAEhB,CAAC;EAAC,CACE,CAAC;AAEX","ignoreList":[]}
+{"version":3,"names":["React","Text","View","Pressable","fw","pressedOpacity","useColors","useThemedStyles","createLogger","childTestID","makeStyles","jsx","_jsx","jsxs","_jsxs","log","Tabs","value","onChange","items","disabled","allDisabled","style","testID","c","styles","length","warn","under","accessibilityRole","children","map","it","on","id","itemDisabled","itemTestID","onPress","accessibilityState","selected","undefined","accessibilityLabel","label","pressed","underTab","opacity","underLabel","color","primary","foregroundMuted","fontWeight","semi","medium","numberOfLines","underBar"],"sourceRoot":"../../../../../src","sources":["components/ui/Tabs/Tabs.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,IAAI,EAAEC,IAAI,QAAQ,cAAc;AACzC,SAASC,SAAS,QAAQ,8BAA8B;AACxD,SAASC,EAAE,EAAEC,cAAc,EAAEC,SAAS,EAAEC,eAAe,QAAQ,yBAAgB;AAC/E,SAASC,YAAY,QAAQ,gCAAuB;AACpD,SAASC,WAAW,QAAQ,gCAAuB;AACnD,SAASC,UAAU,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAGtC,MAAMC,GAAG,GAAGP,YAAY,CAAC,MAAM,CAAC;;AAEhC;AACA;AACA;AACA;AACA,OAAO,SAASQ,IAAIA,CAAC;EACnBC,KAAK;EACLC,QAAQ;EACRC,KAAK;EACLC,QAAQ,EAAEC,WAAW,GAAG,KAAK;EAC7BC,KAAK;EACLC;AACS,CAAC,EAAqB;EAC/B,MAAMC,CAAC,GAAGlB,SAAS,CAAC,CAAC;EACrB,MAAMmB,MAAM,GAAGlB,eAAe,CAACG,UAAU,CAAC;EAC1C;EACA;EACA,IAAIS,KAAK,CAACO,MAAM,GAAG,CAAC,EAAE;IACpBX,GAAG,CAACY,IAAI,CAAC,sBAAsBR,KAAK,CAACO,MAAM,IAAI,CAAC;EAClD;EACA,oBACEd,IAAA,CAACV,IAAI;IACHoB,KAAK,EAAE,CAACG,MAAM,CAACG,KAAK,EAAEN,KAAK,CAAE;IAC7BC,MAAM,EAAEA,MAAO;IACfM,iBAAiB,EAAC,SAAS;IAAAC,QAAA,EAE1BX,KAAK,CAACY,GAAG,CAAEC,EAAE,IAAK;MACjB,MAAMC,EAAE,GAAGD,EAAE,CAACE,EAAE,KAAKjB,KAAK;MAC1B,MAAMkB,YAAY,GAAGd,WAAW,KAAKW,EAAE,CAACZ,QAAQ,IAAI,KAAK,CAAC;MAC1D,MAAMgB,UAAU,GAAG3B,WAAW,CAACc,MAAM,EAAES,EAAE,CAACE,EAAE,EAAEF,EAAE,CAACT,MAAM,CAAC;MACxD,oBACET,KAAA,CAACX,SAAS;QAERkC,OAAO,EAAEA,CAAA,KAAM,CAACF,YAAY,IAAIjB,QAAQ,CAACc,EAAE,CAACE,EAAE,CAAE;QAChDd,QAAQ,EAAEe,YAAa;QACvBN,iBAAiB,EAAC,KAAK;QACvBS,kBAAkB,EAAE;UAClBC,QAAQ,EAAEN,EAAE;UACZb,QAAQ,EAAEe,YAAY,IAAIK;QAC5B,CAAE;QACFC,kBAAkB,EAAET,EAAE,CAACU,KAAM;QAC7BnB,MAAM,EAAEa,UAAW;QACnBd,KAAK,EAAEA,CAAC;UAAEqB;QAAQ,CAAC,KAAK,CACtBlB,MAAM,CAACmB,QAAQ,EACf;UAAEC,OAAO,EAAEV,YAAY,GAAG,GAAG,GAAGQ,OAAO,GAAGtC,cAAc,GAAG;QAAE,CAAC,CAC9D;QAAAyB,QAAA,gBAEFlB,IAAA,CAACX,IAAI;UACHqB,KAAK,EAAE,CACLG,MAAM,CAACqB,UAAU,EACjB;YACEC,KAAK,EAAEd,EAAE,GAAGT,CAAC,CAACwB,OAAO,GAAGxB,CAAC,CAACyB,eAAe;YACzCC,UAAU,EAAEjB,EAAE,GAAG7B,EAAE,CAAC+C,IAAI,GAAG/C,EAAE,CAACgD;UAChC,CAAC,CACD;UACFC,aAAa,EAAE,CAAE;UAAAvB,QAAA,EAEhBE,EAAE,CAACU;QAAK,CACL,CAAC,EACNT,EAAE,gBAAGrB,IAAA,CAACV,IAAI;UAACoB,KAAK,EAAEG,MAAM,CAAC6B;QAAS,CAAE,CAAC,GAAG,IAAI;MAAA,GA3BxCtB,EAAE,CAACE,EA4BC,CAAC;IAEhB,CAAC;EAAC,CACE,CAAC;AAEX","ignoreList":[]}

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

@@ -1,7 +1,11 @@
 "use strict";
 
 import { StyleSheet } from 'react-native';
-import { fixed, icon, r, type as t } from "../../../theme/index.js";
+import { fixed, r, type as t } from "../../../theme/index.js";
+
+// 下划线宽度固定 36pt —— 视觉上比 tab 文字稍宽、比整个 tab 格窄,
+// 刻意不用 icon.xl(语义是图标盒),此处是装饰性下划线,用具名常量自文档化。
+const UNDER_BAR_WIDTH = r(36);
 export const makeStyles = c => StyleSheet.create({
   under: {
     flexDirection: 'row',
@@ -22,7 +26,7 @@ export const makeStyles = c => StyleSheet.create({
     position: 'absolute',
     bottom: 0,
     height: r(2),
-    width: icon.xl,
+    width: UNDER_BAR_WIDTH,
     backgroundColor: c.primary,
     borderRadius: r(1)
   }

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

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","fixed","icon","r","type","t","makeStyles","c","create","under","flexDirection","backgroundColor","surface","borderBottomWidth","hairlineWidth","borderBottomColor","outline","underTab","flex","height","hitTarget","alignItems","justifyContent","underLabel","fontSize","sm","underBar","position","bottom","width","xl","primary","borderRadius"],"sourceRoot":"../../../../../src","sources":["components/ui/Tabs/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AAEzC,SAASC,KAAK,EAAEC,IAAI,EAAEC,CAAC,EAAEC,IAAI,IAAIC,CAAC,QAAQ,yBAAgB;AAE1D,OAAO,MAAMC,UAAU,GAAIC,CAAc,IACvCP,UAAU,CAACQ,MAAM,CAAC;EAChBC,KAAK,EAAE;IACLC,aAAa,EAAE,KAAK;IACpBC,eAAe,EAAEJ,CAAC,CAACK,OAAO;IAC1BC,iBAAiB,EAAEb,UAAU,CAACc,aAAa;IAC3CC,iBAAiB,EAAER,CAAC,CAACS;EACvB,CAAC;EACDC,QAAQ,EAAE;IACRC,IAAI,EAAE,CAAC;IACPC,MAAM,EAAElB,KAAK,CAACmB,SAAS;IACvBC,UAAU,EAAE,QAAQ;IACpBC,cAAc,EAAE;EAClB,CAAC;EACDC,UAAU,EAAE;IACVC,QAAQ,EAAEnB,CAAC,CAACoB;EACd,CAAC;EACDC,QAAQ,EAAE;IACRC,QAAQ,EAAE,UAAU;IACpBC,MAAM,EAAE,CAAC;IACTT,MAAM,EAAEhB,CAAC,CAAC,CAAC,CAAC;IACZ0B,KAAK,EAAE3B,IAAI,CAAC4B,EAAE;IACdnB,eAAe,EAAEJ,CAAC,CAACwB,OAAO;IAC1BC,YAAY,EAAE7B,CAAC,CAAC,CAAC;EACnB;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["StyleSheet","fixed","r","type","t","UNDER_BAR_WIDTH","makeStyles","c","create","under","flexDirection","backgroundColor","surface","borderBottomWidth","hairlineWidth","borderBottomColor","outline","underTab","flex","height","hitTarget","alignItems","justifyContent","underLabel","fontSize","sm","underBar","position","bottom","width","primary","borderRadius"],"sourceRoot":"../../../../../src","sources":["components/ui/Tabs/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AAEzC,SAASC,KAAK,EAAEC,CAAC,EAAEC,IAAI,IAAIC,CAAC,QAAQ,yBAAgB;;AAEpD;AACA;AACA,MAAMC,eAAe,GAAGH,CAAC,CAAC,EAAE,CAAC;AAE7B,OAAO,MAAMI,UAAU,GAAIC,CAAc,IACvCP,UAAU,CAACQ,MAAM,CAAC;EAChBC,KAAK,EAAE;IACLC,aAAa,EAAE,KAAK;IACpBC,eAAe,EAAEJ,CAAC,CAACK,OAAO;IAC1BC,iBAAiB,EAAEb,UAAU,CAACc,aAAa;IAC3CC,iBAAiB,EAAER,CAAC,CAACS;EACvB,CAAC;EACDC,QAAQ,EAAE;IACRC,IAAI,EAAE,CAAC;IACPC,MAAM,EAAElB,KAAK,CAACmB,SAAS;IACvBC,UAAU,EAAE,QAAQ;IACpBC,cAAc,EAAE;EAClB,CAAC;EACDC,UAAU,EAAE;IACVC,QAAQ,EAAEpB,CAAC,CAACqB;EACd,CAAC;EACDC,QAAQ,EAAE;IACRC,QAAQ,EAAE,UAAU;IACpBC,MAAM,EAAE,CAAC;IACTT,MAAM,EAAEjB,CAAC,CAAC,CAAC,CAAC;IACZ2B,KAAK,EAAExB,eAAe;IACtBM,eAAe,EAAEJ,CAAC,CAACuB,OAAO;IAC1BC,YAAY,EAAE7B,CAAC,CAAC,CAAC;EACnB;AACF,CAAC,CAAC","ignoreList":[]}

package/lib/module/components/ui/Tabs/types.js

@@ -1,2 +1,4 @@
 "use strict";
+
+export {};
 //# sourceMappingURL=types.js.map