@unif/react-native-design 0.20.0 → 0.21.0

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

@@ -1,32 +1,38 @@
 "use strict";
 
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Text, View } from 'react-native';
 import { Pressable } from 'react-native-gesture-handler';
 import { pressedOpacity, r, useColors, useThemedStyles } from "../../../theme/index.js";
+import { createLogger } from "../../../utils/logger/index.js";
 import { Icon } from "../Icon/index.js";
+import { A11Y_HIDDEN_PROPS } from "../shared/a11y.js";
+import { resolveCellActionAccessibilityLabel, stringifyCellText } from "./content.js";
 import { useListVariant } from "./context.js";
 import { Leading } from "./Leading.js";
 import { makeStyles } from "./styles.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/** extra 是否包含可交互控件(Switch/Stepper/Checkbox 等 ReactNode)。
- *  用于决定 Pressable 外壳是否关闭 accessible —— 若外壳 accessible=true 且 extra 也是
- *  独立 accessible 控件,SR 会产生「双播报 + 控件被遮挡无法直接激活」的体验缺陷。
- *  规则:extra 是 ReactNode(非 string / null / undefined)时判定为「可能含控件」。
- *  使用方若明确 extra 是纯展示 ReactNode,可通过 accessibilityHint='none' 绕过(暂不加 prop)。*/
-function extraHasInteractiveNode(extra) {
-  return extra != null && typeof extra !== 'string';
-}
-function renderSlot(value, textStyle, numberOfLines) {
-  if (value == null) return null;
-  if (typeof value === 'string') {
-    return /*#__PURE__*/_jsx(Text, {
-      style: textStyle,
-      numberOfLines: numberOfLines,
-      children: value
-    });
+const log = createLogger('Cell');
+function CellExtraContent({
+  extra,
+  textStyle
+}) {
+  if (!extra) return null;
+  switch (extra.kind) {
+    case 'text':
+      return /*#__PURE__*/_jsx(Text, {
+        style: textStyle,
+        numberOfLines: 1,
+        children: stringifyCellText(extra.value)
+      });
+    case 'display':
+      return /*#__PURE__*/_jsx(View, {
+        ...A11Y_HIDDEN_PROPS,
+        children: extra.node
+      });
+    case 'control':
+      return extra.node;
   }
-  return value;
 }
 
 /**
@@ -36,27 +42,27 @@ function renderSlot(value, textStyle, numberOfLines) {
  * - `grouped`(默认):独立白卡片 + 8px 间距
  * - `flush`(嵌在 Card 内):紧凑列表,28×28 橙色 icon 盒子,行间 inset hairline 分隔
  */
-export function Cell({
-  title,
-  titleLines,
-  desc,
-  extra,
-  arrow,
-  leading,
-  onPress,
-  disabled,
-  danger,
-  style,
-  testID,
-  accessibilityLabel,
-  accessibilityHint
-}) {
+export function Cell(props) {
   const c = useColors();
   const styles = useThemedStyles(makeStyles);
   const variant = useListVariant();
   const flush = variant === 'flush';
-  const cellStyle = [styles.cell, flush && styles.cellFlush, flush && desc != null && styles.cellFlushWithDesc, style];
-  const titleColor = danger ? c.error : undefined;
+  const requestedAction = typeof props.onPress === 'function';
+  const accessibilityLabel = requestedAction ? resolveCellActionAccessibilityLabel({
+    accessibilityLabel: props.accessibilityLabel,
+    title: props.title,
+    desc: props.desc,
+    extra: props.extra
+  }) : undefined;
+  const hasEffectiveAction = requestedAction && accessibilityLabel !== undefined;
+  const hasMissingActionName = requestedAction && !hasEffectiveAction;
+  useEffect(() => {
+    if (hasMissingActionName) {
+      log.warn('Cell action 缺少非空业务名称，已按 display-only 渲染。');
+    }
+  }, [hasMissingActionName]);
+  const cellStyle = [styles.cell, flush && styles.cellFlush, flush && props.desc !== undefined && styles.cellFlushWithDesc, props.style];
+  const titleColor = props.danger ? c.error : undefined;
   const titleStyle = [flush ? styles.titleFlush : styles.title, titleColor && {
     color: titleColor
   }];
@@ -64,45 +70,50 @@ export function Cell({
   const extraStyle = flush ? styles.extraFlush : styles.extra;
   const inner = /*#__PURE__*/_jsxs(View, {
     style: cellStyle,
-    testID: onPress ? undefined : testID,
-    children: [leading != null ? /*#__PURE__*/_jsx(Leading, {
-      slot: leading,
-      danger: danger
+    testID: hasEffectiveAction ? undefined : props.testID,
+    children: [props.leading !== undefined ? /*#__PURE__*/_jsx(Leading, {
+      slot: props.leading,
+      danger: props.danger
     }) : null, /*#__PURE__*/_jsxs(View, {
       style: styles.body,
-      children: [renderSlot(title, titleStyle, titleLines ?? 1), renderSlot(desc, descStyle, 2)]
-    }), renderSlot(extra, extraStyle, 1), arrow && !danger ? /*#__PURE__*/_jsx(Icon, {
-      name: "chevron-right",
-      size: r(flush ? 18 : 20),
-      color: c.foregroundSubtle,
-      style: flush ? styles.chevronFlush : undefined
+      children: [/*#__PURE__*/_jsx(Text, {
+        style: titleStyle,
+        numberOfLines: props.titleLines ?? 1,
+        children: stringifyCellText(props.title)
+      }), props.desc !== undefined ? /*#__PURE__*/_jsx(Text, {
+        style: descStyle,
+        numberOfLines: 2,
+        children: stringifyCellText(props.desc)
+      }) : null]
+    }), /*#__PURE__*/_jsx(CellExtraContent, {
+      extra: props.extra,
+      textStyle: extraStyle
+    }), hasEffectiveAction && props.arrow && !props.danger ? /*#__PURE__*/_jsx(View, {
+      ...A11Y_HIDDEN_PROPS,
+      style: flush ? styles.chevronFlush : undefined,
+      children: /*#__PURE__*/_jsx(Icon, {
+        name: "chevron-right",
+        size: r(flush ? 18 : 20),
+        color: c.foregroundSubtle
+      })
     }) : null]
   });
-  if (onPress) {
-    // 若 extra 含交互控件(Switch/Stepper 等),外壳 Pressable 关闭 accessible,
-    // 让 SR 直接穿透读取控件本身,避免双播报和控件被遮挡无法激活的体验缺陷。
-    const hasInteractiveExtra = extraHasInteractiveNode(extra);
-
-    // 默认 a11y label:title + desc 拼接,给 SR 用户同时听到主副信息。
-    // 有 accessibilityLabel 显式覆盖时走 prop,否则组合 title+desc。
-    const defaultLabel = typeof title === 'string' ? typeof desc === 'string' && desc ? `${title},${desc}` : title : undefined;
+  if (hasEffectiveAction) {
+    const isDisabled = props.disabled === true;
     return /*#__PURE__*/_jsx(Pressable, {
-      onPress: onPress,
-      disabled: disabled,
+      onPress: isDisabled ? undefined : props.onPress,
+      disabled: isDisabled,
       accessibilityRole: "button",
-      accessibilityLabel: accessibilityLabel ?? defaultLabel,
-      accessibilityHint: accessibilityHint,
-      accessibilityState: disabled ? {
-        disabled: true
-      } : undefined
-      // extra 含控件时外壳不作为独立 a11y 元素,让 SR 穿透到 extra 控件
-      ,
-      accessible: hasInteractiveExtra ? false : undefined,
-      testID: testID,
+      accessibilityLabel: accessibilityLabel,
+      accessibilityHint: props.accessibilityHint,
+      accessibilityState: {
+        disabled: isDisabled
+      },
+      testID: props.testID,
       style: ({
         pressed
       }) => [{
-        opacity: disabled ? 0.5 : pressed ? pressedOpacity : 1
+        opacity: isDisabled ? 0.5 : pressed ? pressedOpacity : 1
       }],
       children: inner
     });

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

@@ -1 +1 @@
-{"version":3,"names":["React","Text","View","Pressable","pressedOpacity","r","useColors","useThemedStyles","Icon","useListVariant","Leading","makeStyles","jsx","_jsx","jsxs","_jsxs","extraHasInteractiveNode","extra","renderSlot","value","textStyle","numberOfLines","style","children","Cell","title","titleLines","desc","arrow","leading","onPress","disabled","danger","testID","accessibilityLabel","accessibilityHint","c","styles","variant","flush","cellStyle","cell","cellFlush","cellFlushWithDesc","titleColor","error","undefined","titleStyle","titleFlush","color","descStyle","descFlush","extraStyle","extraFlush","inner","slot","body","name","size","foregroundSubtle","chevronFlush","hasInteractiveExtra","defaultLabel","accessibilityRole","accessibilityState","accessible","pressed","opacity"],"sourceRoot":"../../../../../src","sources":["components/ui/Cell/Cell.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useEffect","Text","View","Pressable","pressedOpacity","r","useColors","useThemedStyles","createLogger","Icon","A11Y_HIDDEN_PROPS","resolveCellActionAccessibilityLabel","stringifyCellText","useListVariant","Leading","makeStyles","jsx","_jsx","jsxs","_jsxs","log","CellExtraContent","extra","textStyle","kind","style","numberOfLines","children","value","node","Cell","props","c","styles","variant","flush","requestedAction","onPress","accessibilityLabel","title","desc","undefined","hasEffectiveAction","hasMissingActionName","warn","cellStyle","cell","cellFlush","cellFlushWithDesc","titleColor","danger","error","titleStyle","titleFlush","color","descStyle","descFlush","extraStyle","extraFlush","inner","testID","leading","slot","body","titleLines","arrow","chevronFlush","name","size","foregroundSubtle","isDisabled","disabled","accessibilityRole","accessibilityHint","accessibilityState","pressed","opacity"],"sourceRoot":"../../../../../src","sources":["components/ui/Cell/Cell.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/ui/Cell/Leading.js

@@ -3,6 +3,7 @@
 import { StyleSheet, View } from 'react-native';
 import { r, useColors } from "../../../theme/index.js";
 import { Icon } from "../Icon/index.js";
+import { A11Y_HIDDEN_PROPS } from "../shared/a11y.js";
 import { useListVariant } from "./context.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const FLUSH_BOX_SIZE = r(28);
@@ -26,6 +27,7 @@ export function Leading({
     // grouped 模式:裸 icon 22px;flush 模式:28×28 圆角盒子,danger 时切 error-container
     if (variant === 'flush') {
       return /*#__PURE__*/_jsx(View, {
+        ...A11Y_HIDDEN_PROPS,
         style: [sharedStyles.flushBox, {
           backgroundColor: danger ? c.errorContainer : c.primaryContainer
         }],
@@ -36,14 +38,18 @@ export function Leading({
         })
       });
     }
-    return /*#__PURE__*/_jsx(Icon, {
-      name: slot,
-      size: r(22),
-      color: danger ? c.error : c.foregroundMuted
+    return /*#__PURE__*/_jsx(View, {
+      ...A11Y_HIDDEN_PROPS,
+      children: /*#__PURE__*/_jsx(Icon, {
+        name: slot,
+        size: r(22),
+        color: danger ? c.error : c.foregroundMuted
+      })
     });
   }
   return /*#__PURE__*/_jsx(View, {
-    children: slot
+    ...A11Y_HIDDEN_PROPS,
+    children: slot.node
   });
 }
 //# sourceMappingURL=Leading.js.map

package/lib/module/components/ui/Cell/Leading.js.map

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","View","r","useColors","Icon","useListVariant","jsx","_jsx","FLUSH_BOX_SIZE","FLUSH_BOX_RADIUS","sharedStyles","create","flushBox","width","height","borderRadius","alignItems","justifyContent","Leading","slot","danger","c","variant","style","backgroundColor","errorContainer","primaryContainer","children","name","size","color","error","primary","foregroundMuted"],"sourceRoot":"../../../../../src","sources":["components/ui/Cell/Leading.tsx"],"mappings":";;AACA,SAASA,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,CAAC,EAAEC,SAAS,QAAQ,yBAAgB;AAC7C,SAASC,IAAI,QAAuB,kBAAS;AAC7C,SAASC,cAAc,QAAQ,cAAW;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAE3C,MAAMC,cAAc,GAAGN,CAAC,CAAC,EAAE,CAAC;AAC5B,MAAMO,gBAAgB,GAAGP,CAAC,CAAC,CAAC,CAAC;AAE7B,MAAMQ,YAAY,GAAGV,UAAU,CAACW,MAAM,CAAC;EACrCC,QAAQ,EAAE;IACRC,KAAK,EAAEL,cAAc;IACrBM,MAAM,EAAEN,cAAc;IACtBO,YAAY,EAAEN,gBAAgB;IAC9BO,UAAU,EAAE,QAAQ;IACpBC,cAAc,EAAE;EAClB;AACF,CAAC,CAAC;AAEF,OAAO,SAASC,OAAOA,CAAC;EACtBC,IAAI;EACJC;AAIF,CAAC,EAAE;EACD,MAAMC,CAAC,GAAGlB,SAAS,CAAC,CAAC;EACrB,MAAMmB,OAAO,GAAGjB,cAAc,CAAC,CAAC;EAEhC,IAAI,OAAOc,IAAI,KAAK,QAAQ,EAAE;IAC5B;IACA,IAAIG,OAAO,KAAK,OAAO,EAAE;MACvB,oBACEf,IAAA,CAACN,IAAI;QACHsB,KAAK,EAAE,CACLb,YAAY,CAACE,QAAQ,EACrB;UACEY,eAAe,EAAEJ,MAAM,GAAGC,CAAC,CAACI,cAAc,GAAGJ,CAAC,CAACK;QACjD,CAAC,CACD;QAAAC,QAAA,eAEFpB,IAAA,CAACH,IAAI;UACHwB,IAAI,EAAET,IAAiB;UACvBU,IAAI,EAAE3B,CAAC,CAAC,EAAE,CAAE;UACZ4B,KAAK,EAAEV,MAAM,GAAGC,CAAC,CAACU,KAAK,GAAGV,CAAC,CAACW;QAAQ,CACrC;MAAC,CACE,CAAC;IAEX;IACA,oBACEzB,IAAA,CAACH,IAAI;MACHwB,IAAI,EAAET,IAAiB;MACvBU,IAAI,EAAE3B,CAAC,CAAC,EAAE,CAAE;MACZ4B,KAAK,EAAEV,MAAM,GAAGC,CAAC,CAACU,KAAK,GAAGV,CAAC,CAACY;IAAgB,CAC7C,CAAC;EAEN;EACA,oBAAO1B,IAAA,CAACN,IAAI;IAAA0B,QAAA,EAAER;EAAI,CAAO,CAAC;AAC5B","ignoreList":[]}
+{"version":3,"names":["StyleSheet","View","r","useColors","Icon","A11Y_HIDDEN_PROPS","useListVariant","jsx","_jsx","FLUSH_BOX_SIZE","FLUSH_BOX_RADIUS","sharedStyles","create","flushBox","width","height","borderRadius","alignItems","justifyContent","Leading","slot","danger","c","variant","style","backgroundColor","errorContainer","primaryContainer","children","name","size","color","error","primary","foregroundMuted","node"],"sourceRoot":"../../../../../src","sources":["components/ui/Cell/Leading.tsx"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,CAAC,EAAEC,SAAS,QAAQ,yBAAgB;AAC7C,SAASC,IAAI,QAAQ,kBAAS;AAC9B,SAASC,iBAAiB,QAAQ,mBAAgB;AAClD,SAASC,cAAc,QAAQ,cAAW;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAG3C,MAAMC,cAAc,GAAGP,CAAC,CAAC,EAAE,CAAC;AAC5B,MAAMQ,gBAAgB,GAAGR,CAAC,CAAC,CAAC,CAAC;AAE7B,MAAMS,YAAY,GAAGX,UAAU,CAACY,MAAM,CAAC;EACrCC,QAAQ,EAAE;IACRC,KAAK,EAAEL,cAAc;IACrBM,MAAM,EAAEN,cAAc;IACtBO,YAAY,EAAEN,gBAAgB;IAC9BO,UAAU,EAAE,QAAQ;IACpBC,cAAc,EAAE;EAClB;AACF,CAAC,CAAC;AAEF,OAAO,SAASC,OAAOA,CAAC;EACtBC,IAAI;EACJC;AAIF,CAAC,EAAE;EACD,MAAMC,CAAC,GAAGnB,SAAS,CAAC,CAAC;EACrB,MAAMoB,OAAO,GAAGjB,cAAc,CAAC,CAAC;EAEhC,IAAI,OAAOc,IAAI,KAAK,QAAQ,EAAE;IAC5B;IACA,IAAIG,OAAO,KAAK,OAAO,EAAE;MACvB,oBACEf,IAAA,CAACP,IAAI;QAAA,GACCI,iBAAiB;QACrBmB,KAAK,EAAE,CACLb,YAAY,CAACE,QAAQ,EACrB;UACEY,eAAe,EAAEJ,MAAM,GAAGC,CAAC,CAACI,cAAc,GAAGJ,CAAC,CAACK;QACjD,CAAC,CACD;QAAAC,QAAA,eAEFpB,IAAA,CAACJ,IAAI;UAACyB,IAAI,EAAET,IAAK;UAACU,IAAI,EAAE5B,CAAC,CAAC,EAAE,CAAE;UAAC6B,KAAK,EAAEV,MAAM,GAAGC,CAAC,CAACU,KAAK,GAAGV,CAAC,CAACW;QAAQ,CAAE;MAAC,CAClE,CAAC;IAEX;IACA,oBACEzB,IAAA,CAACP,IAAI;MAAA,GAAKI,iBAAiB;MAAAuB,QAAA,eACzBpB,IAAA,CAACJ,IAAI;QACHyB,IAAI,EAAET,IAAK;QACXU,IAAI,EAAE5B,CAAC,CAAC,EAAE,CAAE;QACZ6B,KAAK,EAAEV,MAAM,GAAGC,CAAC,CAACU,KAAK,GAAGV,CAAC,CAACY;MAAgB,CAC7C;IAAC,CACE,CAAC;EAEX;EACA,oBAAO1B,IAAA,CAACP,IAAI;IAAA,GAAKI,iBAAiB;IAAAuB,QAAA,EAAGR,IAAI,CAACe;EAAI,CAAO,CAAC;AACxD","ignoreList":[]}

package/lib/module/components/ui/Cell/content.js

@@ -0,0 +1,34 @@
+"use strict";
+
+import { normalizeNonBlankText } from "../shared/accessibilityName.js";
+export function stringifyCellText(value) {
+  return String(value);
+}
+function appendNonBlank(parts, value) {
+  const normalized = normalizeNonBlankText(value);
+  if (normalized !== undefined) parts.push(normalized);
+}
+export function buildCellAccessibilityLabel({
+  title,
+  desc,
+  extra
+}) {
+  const parts = [];
+  appendNonBlank(parts, stringifyCellText(title));
+  if (desc !== undefined) {
+    appendNonBlank(parts, stringifyCellText(desc));
+  }
+  if (extra?.kind === 'text') {
+    appendNonBlank(parts, stringifyCellText(extra.value));
+  } else if (extra?.kind === 'display') {
+    appendNonBlank(parts, extra.accessibilityText ?? '');
+  }
+  return parts.join('，');
+}
+export function resolveCellActionAccessibilityLabel({
+  accessibilityLabel,
+  ...content
+}) {
+  return normalizeNonBlankText(accessibilityLabel) ?? normalizeNonBlankText(buildCellAccessibilityLabel(content));
+}
+//# sourceMappingURL=content.js.map

package/lib/module/components/ui/Cell/content.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["normalizeNonBlankText","stringifyCellText","value","String","appendNonBlank","parts","normalized","undefined","push","buildCellAccessibilityLabel","title","desc","extra","kind","accessibilityText","join","resolveCellActionAccessibilityLabel","accessibilityLabel","content"],"sourceRoot":"../../../../../src","sources":["components/ui/Cell/content.ts"],"mappings":";;AACA,SAASA,qBAAqB,QAAQ,gCAA6B;AAInE,OAAO,SAASC,iBAAiBA,CAACC,KAAoB,EAAU;EAC9D,OAAOC,MAAM,CAACD,KAAK,CAAC;AACtB;AAEA,SAASE,cAAcA,CAACC,KAAe,EAAEH,KAAa,EAAQ;EAC5D,MAAMI,UAAU,GAAGN,qBAAqB,CAACE,KAAK,CAAC;EAC/C,IAAII,UAAU,KAAKC,SAAS,EAAEF,KAAK,CAACG,IAAI,CAACF,UAAU,CAAC;AACtD;AAEA,OAAO,SAASG,2BAA2BA,CAAC;EAC1CC,KAAK;EACLC,IAAI;EACJC;AAKF,CAAC,EAAU;EACT,MAAMP,KAAe,GAAG,EAAE;EAC1BD,cAAc,CAACC,KAAK,EAAEJ,iBAAiB,CAACS,KAAK,CAAC,CAAC;EAE/C,IAAIC,IAAI,KAAKJ,SAAS,EAAE;IACtBH,cAAc,CAACC,KAAK,EAAEJ,iBAAiB,CAACU,IAAI,CAAC,CAAC;EAChD;EAEA,IAAIC,KAAK,EAAEC,IAAI,KAAK,MAAM,EAAE;IAC1BT,cAAc,CAACC,KAAK,EAAEJ,iBAAiB,CAACW,KAAK,CAACV,KAAK,CAAC,CAAC;EACvD,CAAC,MAAM,IAAIU,KAAK,EAAEC,IAAI,KAAK,SAAS,EAAE;IACpCT,cAAc,CAACC,KAAK,EAAEO,KAAK,CAACE,iBAAiB,IAAI,EAAE,CAAC;EACtD;EAEA,OAAOT,KAAK,CAACU,IAAI,CAAC,GAAG,CAAC;AACxB;AAEA,OAAO,SAASC,mCAAmCA,CAAC;EAClDC,kBAAkB;EAClB,GAAGC;AAML,CAAC,EAAsB;EACrB,OACElB,qBAAqB,CAACiB,kBAAkB,CAAC,IACzCjB,qBAAqB,CAACS,2BAA2B,CAACS,OAAO,CAAC,CAAC;AAE/D","ignoreList":[]}

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

@@ -1,12 +1,17 @@
 "use strict";
 
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Text, View } from 'react-native';
 import { Pressable } from 'react-native-gesture-handler';
 import { fixed, pressedOpacity, r, useColors, useThemedStyles } from "../../../theme/index.js";
+import { createLogger } from "../../../utils/logger/index.js";
+import { A11Y_HIDDEN_PROPS } from "../shared/a11y.js";
+import { normalizeNonBlankText } from "../shared/accessibilityName.js";
 import { Icon } from "../Icon/index.js";
 import { makeStyles } from "./styles.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const log = createLogger('Checkbox');
+
 /**
  * 多选复选框。20×20 盒子。
  * 关：透明背景 + 细线边框。
@@ -18,31 +23,42 @@ export function Checkbox({
   checked,
   onChange,
   label,
+  accessibilityLabel,
   shape = 'square',
   disabled,
   testID
 }) {
   const c = useColors();
   const styles = useThemedStyles(makeStyles);
+  const accessibleName = normalizeNonBlankText(accessibilityLabel) ?? normalizeNonBlankText(label);
+  const hasMissingName = accessibleName === undefined;
+  const isDisabled = disabled === true || hasMissingName;
+  useEffect(() => {
+    if (hasMissingName) {
+      log.warn('Checkbox 需要非空的 accessibilityLabel 或可见 label，当前 action 已禁用。');
+    }
+  }, [hasMissingName]);
   return /*#__PURE__*/_jsxs(Pressable, {
-    onPress: () => !disabled && onChange(!checked),
-    disabled: disabled
+    accessible: !hasMissingName,
+    onPress: isDisabled ? undefined : () => onChange(!checked),
+    disabled: isDisabled
     // [M-7] box 20pt → 垂直补 (44-20)/2=12 到 fixed.hitTarget
     ,
     hitSlop: Math.round((fixed.hitTarget - r(20)) / 2),
-    accessibilityRole: "checkbox",
-    accessibilityState: {
+    accessibilityRole: hasMissingName ? undefined : 'checkbox',
+    accessibilityState: hasMissingName ? undefined : {
       checked,
-      disabled: !!disabled
+      disabled: isDisabled
     },
-    accessibilityLabel: label,
+    accessibilityLabel: accessibleName,
     testID: testID,
     style: ({
       pressed
     }) => [styles.row, {
-      opacity: disabled ? 0.5 : pressed ? pressedOpacity : 1
+      opacity: isDisabled ? 0.5 : pressed ? pressedOpacity : 1
     }],
     children: [/*#__PURE__*/_jsx(View, {
+      ...A11Y_HIDDEN_PROPS,
       style: [styles.box,
       // [L-79] circle 形态改用 radius.pill —— sentinel 999 确保任何尺寸下都是真圆
       shape === 'circle' && styles.boxCircle, checked && {
@@ -57,6 +73,7 @@ export function Checkbox({
         style: checked ? undefined : styles.tickHidden
       })
     }), label ? /*#__PURE__*/_jsx(Text, {
+      ...A11Y_HIDDEN_PROPS,
       style: styles.label,
       children: label
     }) : null]

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

@@ -1 +1 @@
-{"version":3,"names":["React","Text","View","Pressable","fixed","pressedOpacity","r","useColors","useThemedStyles","Icon","makeStyles","jsx","_jsx","jsxs","_jsxs","Checkbox","checked","onChange","label","shape","disabled","testID","c","styles","onPress","hitSlop","Math","round","hitTarget","accessibilityRole","accessibilityState","accessibilityLabel","style","pressed","row","opacity","children","box","boxCircle","backgroundColor","primary","borderColor","name","size","color","onPrimary","strokeWidth","undefined","tickHidden"],"sourceRoot":"../../../../../src","sources":["components/ui/Checkbox/Checkbox.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,IAAI,EAAEC,IAAI,QAAQ,cAAc;AACzC,SAASC,SAAS,QAAQ,8BAA8B;AACxD,SACEC,KAAK,EACLC,cAAc,EACdC,CAAC,EACDC,SAAS,EACTC,eAAe,QACV,yBAAgB;AACvB,SAASC,IAAI,QAAQ,kBAAS;AAC9B,SAASC,UAAU,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAGtC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,QAAQA,CAAC;EACvBC,OAAO;EACPC,QAAQ;EACRC,KAAK;EACLC,KAAK,GAAG,QAAQ;EAChBC,QAAQ;EACRC;AACa,CAAC,EAAqB;EACnC,MAAMC,CAAC,GAAGf,SAAS,CAAC,CAAC;EACrB,MAAMgB,MAAM,GAAGf,eAAe,CAACE,UAAU,CAAC;EAC1C,oBACEI,KAAA,CAACX,SAAS;IACRqB,OAAO,EAAEA,CAAA,KAAM,CAACJ,QAAQ,IAAIH,QAAQ,CAAC,CAACD,OAAO,CAAE;IAC/CI,QAAQ,EAAEA;IACV;IAAA;IACAK,OAAO,EAAEC,IAAI,CAACC,KAAK,CAAC,CAACvB,KAAK,CAACwB,SAAS,GAAGtB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAE;IACnDuB,iBAAiB,EAAC,UAAU;IAC5BC,kBAAkB,EAAE;MAAEd,OAAO;MAAEI,QAAQ,EAAE,CAAC,CAACA;IAAS,CAAE;IACtDW,kBAAkB,EAAEb,KAAM;IAC1BG,MAAM,EAAEA,MAAO;IACfW,KAAK,EAAEA,CAAC;MAAEC;IAAQ,CAAC,KAAK,CACtBV,MAAM,CAACW,GAAG,EACV;MAAEC,OAAO,EAAEf,QAAQ,GAAG,GAAG,GAAGa,OAAO,GAAG5B,cAAc,GAAG;IAAE,CAAC,CAC1D;IAAA+B,QAAA,gBAEFxB,IAAA,CAACV,IAAI;MACH8B,KAAK,EAAE,CACLT,MAAM,CAACc,GAAG;MACV;MACAlB,KAAK,KAAK,QAAQ,IAAII,MAAM,CAACe,SAAS,EACtCtB,OAAO,IAAI;QACTuB,eAAe,EAAEjB,CAAC,CAACkB,OAAO;QAC1BC,WAAW,EAAEnB,CAAC,CAACkB;MACjB,CAAC,CACD;MAAAJ,QAAA,eAGFxB,IAAA,CAACH,IAAI;QACHiC,IAAI,EAAC,OAAO;QACZC,IAAI,EAAErC,CAAC,CAAC,EAAE,CAAE;QACZsC,KAAK,EAAEtB,CAAC,CAACuB,SAAU;QACnBC,WAAW,EAAE,GAAI;QACjBd,KAAK,EAAEhB,OAAO,GAAG+B,SAAS,GAAGxB,MAAM,CAACyB;MAAW,CAChD;IAAC,CACE,CAAC,EACN9B,KAAK,gBAAGN,IAAA,CAACX,IAAI;MAAC+B,KAAK,EAAET,MAAM,CAACL,KAAM;MAAAkB,QAAA,EAAElB;IAAK,CAAO,CAAC,GAAG,IAAI;EAAA,CAChD,CAAC;AAEhB","ignoreList":[]}
+{"version":3,"names":["React","useEffect","Text","View","Pressable","fixed","pressedOpacity","r","useColors","useThemedStyles","createLogger","A11Y_HIDDEN_PROPS","normalizeNonBlankText","Icon","makeStyles","jsx","_jsx","jsxs","_jsxs","log","Checkbox","checked","onChange","label","accessibilityLabel","shape","disabled","testID","c","styles","accessibleName","hasMissingName","undefined","isDisabled","warn","accessible","onPress","hitSlop","Math","round","hitTarget","accessibilityRole","accessibilityState","style","pressed","row","opacity","children","box","boxCircle","backgroundColor","primary","borderColor","name","size","color","onPrimary","strokeWidth","tickHidden"],"sourceRoot":"../../../../../src","sources":["components/ui/Checkbox/Checkbox.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/ui/Confirm/ConfirmHost.js

@@ -5,7 +5,8 @@ import { Animated, Easing, Modal, Pressable, Text, View, useWindowDimensions } f
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { space, useThemedStyles } from "../../../theme/index.js";
 import { Button } from "../Button/index.js";
-import { _subs } from "./confirm.js";
+import { registerConfirmHost, settleConfirm } from "./confirm.js";
+import { resolveConfirmLabels } from "./labels.js";
 import { makeStyles } from "./styles.js";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /** 遮罩淡入 / 淡出时长(ms)—— 出场略长于入场,与 Modal slide 退场(~300ms)大致同步收完。 */
@@ -13,11 +14,14 @@ const SCRIM_IN_MS = 220;
 const SCRIM_OUT_MS = 260;
 
 /**
- * Confirm 对话框宿主 —— App 根挂一次,监听 `confirm()` 调用并渲染。
+ * Confirm 对话框宿主 —— App 根挂**一次**,监听 `confirm()` 调用并渲染。
  *
  * 原生 RN `Modal`(transparent + animationType slide)从底部滑入,backdrop 点击
- * 取消、内层 sheet 拦截点击不冒泡。**不依赖 @gorhom**(0.6.0 去 @gorhom 后改为
- * 纯 RN Modal + pub/sub 实现)。
+ * 取消、内层 sheet 拦截点击不冒泡。**不依赖 @gorhom**。
+ *
+ * 唯一 owner:重复挂载的实例拿到 `null` lease,永久惰性、不渲染 —— 不会出现两个
+ * Host 争抢同一个对话框。所有关闭路径统一走 `settleConfirm(entry, result)`,
+ * 组件内不直接调用 entry 的 resolver。
  */
 export function ConfirmHost() {
   const styles = useThemedStyles(makeStyles);
@@ -27,33 +31,52 @@ export function ConfirmHost() {
   } = useWindowDimensions();
   const [entry, setEntry] = useState(null);
 
-  // 跟踪当前未决 entry,供 unmount cleanup resolve(false)。
+  // 同步权威副本:effect cleanup 与迟到回调都读它,不受 React state 批处理延迟影响。
   const pendingRef = useRef(null);
-  pendingRef.current = entry;
+
+  // 注册失败(已有 owner)时保持惰性:不订阅、不渲染。
+  const [inert, setInert] = useState(false);
 
   // 保留最后一次显示的 entry:关闭时 entry 立即置 null,但 slide 退场动画期 Modal 仍可见,
   // 渲染 lastEntry 才不会滑出一个只剩 padding 的空 sheet([M-17])。
   const lastEntryRef = useRef(null);
   if (entry) lastEntryRef.current = entry;
   const display = entry ?? lastEntryRef.current;
+  const labels = resolveConfirmLabels({
+    confirmLabel: display?.options.confirmLabel,
+    cancelLabel: display?.options.cancelLabel
+  });
   useEffect(() => {
-    // [L-101] Subscriber 不再接收 null —— 收到新 entry 即显示;关闭路径由 resolve() 驱动
-    const sub = next => setEntry(next);
-    _subs.add(sub);
+    const subscriber = event => {
+      // 先写同步 ref 再置 React state —— cleanup 与迟到回调依赖 ref 的即时正确性。
+      if (event.type === 'show') {
+        pendingRef.current = event.entry;
+        setEntry(event.entry);
+        return;
+      }
+      if (pendingRef.current?.id === event.id) {
+        pendingRef.current = null;
+        setEntry(current => current?.id === event.id ? null : current);
+      }
+    };
+    const lease = registerConfirmHost(subscriber);
+    if (!lease) {
+      setInert(true);
+      return;
+    }
     return () => {
-      _subs.delete(sub);
-      // Host 卸载时若对话框仍未决(error boundary 重置 / 根 re-key 切语言主题等),
-      // resolve(false) —— 否则 confirm() 的 Promise 永久悬挂、_activeEntry 锁死([H-5])。
-      pendingRef.current?.resolve(false);
+      // 卸载时若对话框仍未决(error boundary 重置 / 根 re-key 切语言主题等),
+      // Store 把它 settle(false) —— 否则 confirm() 的 Promise 永久悬挂并锁死单例([H-5])。
+      const held = pendingRef.current;
+      pendingRef.current = null;
+      lease.release(held);
     };
   }, []);
   const handleConfirm = useCallback(() => {
-    entry?.resolve(true);
-    setEntry(null);
+    if (entry) settleConfirm(entry, true);
   }, [entry]);
   const handleCancel = useCallback(() => {
-    entry?.resolve(false);
-    setEntry(null);
+    if (entry) settleConfirm(entry, false);
   }, [entry]);
 
   // 遮罩自持淡入 / 淡出(不蹭 Modal 的位移动画,理由见下方 scrim 注释)。退场也要淡:
@@ -67,6 +90,7 @@ export function ConfirmHost() {
       useNativeDriver: true
     }).start();
   }, [entry, scrimOpacity]);
+  if (inert) return null;
   return /*#__PURE__*/_jsx(Modal, {
     visible: !!entry,
     transparent: true,
@@ -99,24 +123,24 @@ export function ConfirmHost() {
             children: [/*#__PURE__*/_jsx(Text, {
               style: styles.title,
               accessibilityRole: "header",
-              children: display.title
-            }), display.message ? /*#__PURE__*/_jsx(Text, {
+              children: display.options.title
+            }), display.options.message ? /*#__PURE__*/_jsx(Text, {
               style: styles.message,
-              children: display.message
+              children: display.options.message
             }) : null]
           }), /*#__PURE__*/_jsxs(View, {
             style: styles.actions,
             children: [/*#__PURE__*/_jsx(Button, {
               testID: "confirm-cancel",
-              label: display.cancelLabel ?? '取消',
+              label: labels.cancelLabel,
               variant: "secondary",
-              block: true,
+              style: styles.action,
               onPress: handleCancel
             }), /*#__PURE__*/_jsx(Button, {
               testID: "confirm-ok",
-              label: display.confirmLabel ?? '确认',
-              variant: display.destructive ? 'danger' : 'primary',
-              block: true,
+              label: labels.confirmLabel,
+              variant: display.options.destructive ? 'danger' : 'primary',
+              style: styles.action,
               onPress: handleConfirm
             })]
           })]

package/lib/module/components/ui/Confirm/ConfirmHost.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useCallback","useEffect","useRef","useState","Animated","Easing","Modal","Pressable","Text","View","useWindowDimensions","useSafeAreaInsets","space","useThemedStyles","Button","_subs","makeStyles","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","SCRIM_IN_MS","SCRIM_OUT_MS","ConfirmHost","styles","insets","height","screenH","entry","setEntry","pendingRef","current","lastEntryRef","display","sub","next","add","delete","resolve","handleConfirm","handleCancel","scrimOpacity","Value","timing","toValue","duration","easing","out","quad","useNativeDriver","start","visible","transparent","animationType","statusBarTranslucent","onRequestClose","children","style","backdrop","onPress","accessible","pointerEvents","scrim","top","opacity","testID","sheet","paddingBottom","bottom","body","title","accessibilityRole","message","actions","label","cancelLabel","variant","block","confirmLabel","destructive"],"sourceRoot":"../../../../../src","sources":["components/ui/Confirm/ConfirmHost.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useCallback","useEffect","useRef","useState","Animated","Easing","Modal","Pressable","Text","View","useWindowDimensions","useSafeAreaInsets","space","useThemedStyles","Button","registerConfirmHost","settleConfirm","resolveConfirmLabels","makeStyles","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","SCRIM_IN_MS","SCRIM_OUT_MS","ConfirmHost","styles","insets","height","screenH","entry","setEntry","pendingRef","inert","setInert","lastEntryRef","current","display","labels","confirmLabel","options","cancelLabel","subscriber","event","type","id","lease","held","release","handleConfirm","handleCancel","scrimOpacity","Value","timing","toValue","duration","easing","out","quad","useNativeDriver","start","visible","transparent","animationType","statusBarTranslucent","onRequestClose","children","style","backdrop","onPress","accessible","pointerEvents","scrim","top","opacity","testID","sheet","paddingBottom","bottom","body","title","accessibilityRole","message","actions","label","variant","action","destructive"],"sourceRoot":"../../../../../src","sources":["components/ui/Confirm/ConfirmHost.tsx"],"mappings":"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","ignoreList":[]}