@unif/react-native-design 0.19.0 → 0.21.0

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

@@ -1,12 +1,16 @@
 "use strict";
 
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Text } from 'react-native';
-import { useThemedStyles } from "../../../theme/index.js";
+import { scaleFontMetric, useFontScale, useThemedStyles } from "../../../theme/index.js";
+import { createLogger } from "../../../utils/logger/index.js";
 import { Icon } from "../Icon/index.js";
+import { normalizeNonBlankText } from "../shared/accessibilityName.js";
 import { ButtonBase } from "./ButtonBase.js";
 import { makeStyles } from "./styles.js";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+const log = createLogger('Button');
+
 /**
  * 7 variant × 3 size 文本按钮。
  * 内部组合 ButtonBase + content(label + 可选 leftIcon / rightIcon),
@@ -26,41 +30,54 @@ export function Button({
   rightIcon,
   style,
   testID,
-  accessibilityHint
+  accessibilityHint,
+  accessibilityState
 }) {
   const styles = useThemedStyles(makeStyles);
+  const fontScale = useFontScale();
+  const accessibleName = normalizeNonBlankText(label);
+  const hasBlankLabel = accessibleName === undefined;
+  useEffect(() => {
+    if (hasBlankLabel) {
+      log.warn('Button label 不能为空白，当前 action 已禁用。');
+    }
+  }, [hasBlankLabel]);
   return /*#__PURE__*/_jsx(ButtonBase, {
     onPress: onPress,
     size: size,
     variant: variant,
     block: block,
-    disabled: disabled,
+    disabled: disabled === true || hasBlankLabel,
     loading: loading,
-    accessibilityLabel: label,
+    accessibilityLabel: accessibleName,
     accessibilityHint: accessibilityHint,
+    accessibilityState: accessibilityState,
     style: style,
     testID: testID,
     children: ({
       sizing,
       palette
-    }) => /*#__PURE__*/_jsxs(_Fragment, {
-      children: [leftIcon ? /*#__PURE__*/_jsx(Icon, {
-        name: leftIcon,
-        size: sizing.fs + 2,
-        color: palette.fg
-      }) : null, /*#__PURE__*/_jsx(Text, {
-        style: [styles.label, {
-          color: palette.fg,
-          fontSize: sizing.fs
-        }],
-        numberOfLines: 1,
-        children: label
-      }), rightIcon ? /*#__PURE__*/_jsx(Icon, {
-        name: rightIcon,
-        size: sizing.fs + 2,
-        color: palette.fg
-      }) : null]
-    })
+    }) => {
+      const textSize = scaleFontMetric(sizing.fs, fontScale);
+      return /*#__PURE__*/_jsxs(_Fragment, {
+        children: [leftIcon ? /*#__PURE__*/_jsx(Icon, {
+          name: leftIcon,
+          size: sizing.fs + 2,
+          color: palette.fg
+        }) : null, /*#__PURE__*/_jsx(Text, {
+          style: [styles.label, {
+            color: palette.fg,
+            fontSize: textSize
+          }],
+          numberOfLines: 1,
+          children: label
+        }), rightIcon ? /*#__PURE__*/_jsx(Icon, {
+          name: rightIcon,
+          size: sizing.fs + 2,
+          color: palette.fg
+        }) : null]
+      });
+    }
   });
 }
 //# sourceMappingURL=Button.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["React","Text","useThemedStyles","Icon","ButtonBase","makeStyles","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","Button","label","onPress","size","variant","block","disabled","loading","leftIcon","rightIcon","style","testID","accessibilityHint","styles","accessibilityLabel","children","sizing","palette","name","fs","color","fg","fontSize","numberOfLines"],"sourceRoot":"../../../../../src","sources":["components/ui/Button/Button.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,IAAI,QAAQ,cAAc;AACnC,SAASC,eAAe,QAAQ,yBAAgB;AAChD,SAASC,IAAI,QAAQ,kBAAS;AAC9B,SAASC,UAAU,QAAQ,iBAAc;AACzC,SAASC,UAAU,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA,EAAAC,IAAA,IAAAC,KAAA;AAGtC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,MAAMA,CAAC;EACrBC,KAAK;EACLC,OAAO;EACPC,IAAI;EACJC,OAAO;EACPC,KAAK;EACLC,QAAQ;EACRC,OAAO;EACPC,QAAQ;EACRC,SAAS;EACTC,KAAK;EACLC,MAAM;EACNC;AACW,CAAC,EAAqB;EACjC,MAAMC,MAAM,GAAGvB,eAAe,CAACG,UAAU,CAAC;EAC1C,oBACEE,IAAA,CAACH,UAAU;IACTU,OAAO,EAAEA,OAAQ;IACjBC,IAAI,EAAEA,IAAK;IACXC,OAAO,EAAEA,OAAQ;IACjBC,KAAK,EAAEA,KAAM;IACbC,QAAQ,EAAEA,QAAS;IACnBC,OAAO,EAAEA,OAAQ;IACjBO,kBAAkB,EAAEb,KAAM;IAC1BW,iBAAiB,EAAEA,iBAAkB;IACrCF,KAAK,EAAEA,KAAM;IACbC,MAAM,EAAEA,MAAO;IAAAI,QAAA,EAEdA,CAAC;MAAEC,MAAM;MAAEC;IAAQ,CAAC,kBACnBlB,KAAA,CAAAF,SAAA;MAAAkB,QAAA,GACGP,QAAQ,gBACPb,IAAA,CAACJ,IAAI;QAAC2B,IAAI,EAAEV,QAAS;QAACL,IAAI,EAAEa,MAAM,CAACG,EAAE,GAAG,CAAE;QAACC,KAAK,EAAEH,OAAO,CAACI;MAAG,CAAE,CAAC,GAC9D,IAAI,eACR1B,IAAA,CAACN,IAAI;QACHqB,KAAK,EAAE,CAACG,MAAM,CAACZ,KAAK,EAAE;UAAEmB,KAAK,EAAEH,OAAO,CAACI,EAAE;UAAEC,QAAQ,EAAEN,MAAM,CAACG;QAAG,CAAC,CAAE;QAClEI,aAAa,EAAE,CAAE;QAAAR,QAAA,EAEhBd;MAAK,CACF,CAAC,EACNQ,SAAS,gBACRd,IAAA,CAACJ,IAAI;QAAC2B,IAAI,EAAET,SAAU;QAACN,IAAI,EAAEa,MAAM,CAACG,EAAE,GAAG,CAAE;QAACC,KAAK,EAAEH,OAAO,CAACI;MAAG,CAAE,CAAC,GAC/D,IAAI;IAAA,CACR;EACH,CACS,CAAC;AAEjB","ignoreList":[]}
+{"version":3,"names":["React","useEffect","Text","scaleFontMetric","useFontScale","useThemedStyles","createLogger","Icon","normalizeNonBlankText","ButtonBase","makeStyles","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","log","Button","label","onPress","size","variant","block","disabled","loading","leftIcon","rightIcon","style","testID","accessibilityHint","accessibilityState","styles","fontScale","accessibleName","hasBlankLabel","undefined","warn","accessibilityLabel","children","sizing","palette","textSize","fs","name","color","fg","fontSize","numberOfLines"],"sourceRoot":"../../../../../src","sources":["components/ui/Button/Button.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,SAAS,QAAQ,OAAO;AACxC,SAASC,IAAI,QAAQ,cAAc;AACnC,SAASC,eAAe,EAAEC,YAAY,EAAEC,eAAe,QAAQ,yBAAgB;AAC/E,SAASC,YAAY,QAAQ,gCAAuB;AACpD,SAASC,IAAI,QAAQ,kBAAS;AAC9B,SAASC,qBAAqB,QAAQ,gCAA6B;AACnE,SAASC,UAAU,QAAQ,iBAAc;AACzC,SAASC,UAAU,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA,EAAAC,IAAA,IAAAC,KAAA;AAGtC,MAAMC,GAAG,GAAGX,YAAY,CAAC,QAAQ,CAAC;;AAElC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASY,MAAMA,CAAC;EACrBC,KAAK;EACLC,OAAO;EACPC,IAAI;EACJC,OAAO;EACPC,KAAK;EACLC,QAAQ;EACRC,OAAO;EACPC,QAAQ;EACRC,SAAS;EACTC,KAAK;EACLC,MAAM;EACNC,iBAAiB;EACjBC;AACW,CAAC,EAAqB;EACjC,MAAMC,MAAM,GAAG3B,eAAe,CAACK,UAAU,CAAC;EAC1C,MAAMuB,SAAS,GAAG7B,YAAY,CAAC,CAAC;EAChC,MAAM8B,cAAc,GAAG1B,qBAAqB,CAACW,KAAK,CAAC;EACnD,MAAMgB,aAAa,GAAGD,cAAc,KAAKE,SAAS;EAElDnC,SAAS,CAAC,MAAM;IACd,IAAIkC,aAAa,EAAE;MACjBlB,GAAG,CAACoB,IAAI,CAAC,mCAAmC,CAAC;IAC/C;EACF,CAAC,EAAE,CAACF,aAAa,CAAC,CAAC;EAEnB,oBACEvB,IAAA,CAACH,UAAU;IACTW,OAAO,EAAEA,OAAQ;IACjBC,IAAI,EAAEA,IAAK;IACXC,OAAO,EAAEA,OAAQ;IACjBC,KAAK,EAAEA,KAAM;IACbC,QAAQ,EAAEA,QAAQ,KAAK,IAAI,IAAIW,aAAc;IAC7CV,OAAO,EAAEA,OAAQ;IACjBa,kBAAkB,EAAEJ,cAAe;IACnCJ,iBAAiB,EAAEA,iBAAkB;IACrCC,kBAAkB,EAAEA,kBAAmB;IACvCH,KAAK,EAAEA,KAAM;IACbC,MAAM,EAAEA,MAAO;IAAAU,QAAA,EAEdA,CAAC;MAAEC,MAAM;MAAEC;IAAQ,CAAC,KAAK;MACxB,MAAMC,QAAQ,GAAGvC,eAAe,CAACqC,MAAM,CAACG,EAAE,EAAEV,SAAS,CAAC;MACtD,oBACEjB,KAAA,CAAAF,SAAA;QAAAyB,QAAA,GACGb,QAAQ,gBACPd,IAAA,CAACL,IAAI;UAACqC,IAAI,EAAElB,QAAS;UAACL,IAAI,EAAEmB,MAAM,CAACG,EAAE,GAAG,CAAE;UAACE,KAAK,EAAEJ,OAAO,CAACK;QAAG,CAAE,CAAC,GAC9D,IAAI,eACRlC,IAAA,CAACV,IAAI;UACH0B,KAAK,EAAE,CAACI,MAAM,CAACb,KAAK,EAAE;YAAE0B,KAAK,EAAEJ,OAAO,CAACK,EAAE;YAAEC,QAAQ,EAAEL;UAAS,CAAC,CAAE;UACjEM,aAAa,EAAE,CAAE;UAAAT,QAAA,EAEhBpB;QAAK,CACF,CAAC,EACNQ,SAAS,gBACRf,IAAA,CAACL,IAAI;UAACqC,IAAI,EAAEjB,SAAU;UAACN,IAAI,EAAEmB,MAAM,CAACG,EAAE,GAAG,CAAE;UAACE,KAAK,EAAEJ,OAAO,CAACK;QAAG,CAAE,CAAC,GAC/D,IAAI;MAAA,CACR,CAAC;IAEP;EAAC,CACS,CAAC;AAEjB","ignoreList":[]}

package/lib/module/components/ui/Button/ButtonBase.js

@@ -20,6 +20,7 @@ export function ButtonBase({
   accessibilityLabel,
   accessibilityRole = 'button',
   accessibilityHint,
+  accessibilityState,
   style,
   testID,
   children
@@ -29,7 +30,8 @@ export function ButtonBase({
   const sizing = useMemo(() => sizingFor(size), [size]);
   const palette = useMemo(() => paletteFor(variant, c), [variant, c]);
   const isText = variant === 'text';
-  const isInteractive = !disabled && !loading;
+  const unavailable = disabled === true || loading === true;
+  const hasAccessibleName = accessibilityLabel !== undefined;
 
   // [M-7] 触控目标补偿:hitSlop 向外扩展命中区域到 fixed.hitTarget(44pt)。
   // 公式:vertical slop = max(0, (hitTarget - h) / 2);square 时同补 horizontal。
@@ -64,14 +66,17 @@ export function ButtonBase({
     };
   }, [isText, sizing.h, square]);
   return /*#__PURE__*/_jsx(Pressable, {
-    accessibilityRole: accessibilityRole,
-    accessibilityState: {
-      disabled: !isInteractive
-    },
+    accessible: hasAccessibleName,
+    accessibilityRole: hasAccessibleName ? accessibilityRole : undefined,
+    accessibilityState: hasAccessibleName ? {
+      ...accessibilityState,
+      disabled: unavailable,
+      busy: loading === true
+    } : undefined,
     accessibilityLabel: accessibilityLabel,
     accessibilityHint: accessibilityHint,
-    disabled: !isInteractive,
-    onPress: onPress,
+    disabled: unavailable,
+    onPress: unavailable ? undefined : onPress,
     hitSlop: hitSlop,
     testID: testID,
     style: ({
@@ -86,13 +91,8 @@ export function ButtonBase({
       backgroundColor: palette.bg,
       borderColor: palette.border ?? 'transparent',
       borderWidth: palette.border ? 1 : 0,
-      opacity: disabled ? 0.5 : pressed ? pressedOpacity : 1,
+      opacity: unavailable ? 0.5 : pressed ? pressedOpacity : 1,
       alignSelf: block ? 'stretch' : 'flex-start',
-      // 非 block 用 undefined 而非硬编码 0:Yoga 的 resolveFlexGrow 里显式 flexGrow
-      // 优先级高于 flex 简写,写死 0 会让调用方 style={{ flex: 1 }} 失效(按钮撑不开 /
-      // 并排塌成 padding 宽裁掉 label)。undefined → 仍走 Yoga 默认 0(普通态零变化),
-      // 但把 flex / flexGrow 的控制权交还给末尾 merge 的 style。撑满优先仍推荐用 block。
-      flexGrow: block ? 1 : undefined,
       gap: sizing.gap
     }, style],
     children: loading ? /*#__PURE__*/_jsx(ActivityIndicator, {

package/lib/module/components/ui/Button/ButtonBase.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useMemo","ActivityIndicator","Pressable","fixed","pressedOpacity","useColors","useThemedStyles","makeStyles","paletteFor","sizingFor","jsx","_jsx","ButtonBase","onPress","size","variant","disabled","loading","block","square","accessibilityLabel","accessibilityRole","accessibilityHint","style","testID","children","c","styles","sizing","palette","isText","isInteractive","hitSlop","v","Math","round","hitTarget","top","bottom","left","right","max","h","accessibilityState","pressed","base","height","undefined","width","paddingHorizontal","px","borderRadius","br","backgroundColor","bg","borderColor","border","borderWidth","opacity","alignSelf","flexGrow","gap","color","fg"],"sourceRoot":"../../../../../src","sources":["components/ui/Button/ButtonBase.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useMemo","ActivityIndicator","Pressable","fixed","pressedOpacity","useColors","useThemedStyles","makeStyles","paletteFor","sizingFor","jsx","_jsx","ButtonBase","onPress","size","variant","disabled","loading","block","square","accessibilityLabel","accessibilityRole","accessibilityHint","accessibilityState","style","testID","children","c","styles","sizing","palette","isText","unavailable","hasAccessibleName","undefined","hitSlop","v","Math","round","hitTarget","top","bottom","left","right","max","h","accessible","busy","pressed","base","height","width","paddingHorizontal","px","borderRadius","br","backgroundColor","bg","borderColor","border","borderWidth","opacity","alignSelf","gap","color","fg"],"sourceRoot":"../../../../../src","sources":["components/ui/Button/ButtonBase.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -1,31 +1,33 @@
 "use strict";
 
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Pressable, useWindowDimensions, View } from 'react-native';
-import ReanimatedCarousel, { Pagination } from 'react-native-reanimated-carousel';
+import { Carousel as ReanimatedCarousel, Pagination } from 'react-native-reanimated-carousel';
 import { useSharedValue } from 'react-native-reanimated';
-import { space, useThemedStyles } from "../../../theme/index.js";
+import { space, usePrefersReducedMotion, useThemedStyles } from "../../../theme/index.js";
+import { createLogger } from "../../../utils/logger/index.js";
+import { A11Y_HIDDEN_PROPS } from "../shared/a11y.js";
+import { effectiveCarouselAutoplay, normalizeCarouselAction, resolveCarouselItemAccessibility, shouldRenderCarouselPagination } from "./behavior.js";
 import { makeCarouselStyles } from "./styles.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/** Carousel —— 包装 `react-native-reanimated-carousel@5.0.0-beta.5`。
- *
- *  dot indicator 走 `c.primary` token,使用库内置 `Pagination.Custom`
- *  (`useSharedValue` + `onProgressChange` 驱动,re-render 全在 worklet 里)。
+const log = createLogger('Carousel');
+
+/** Carousel —— 包装 `react-native-reanimated-carousel@5.0.0`。
  *
- *  用 Pagination.Custom 而非 Basic:Basic 的 activeDot 用 translateX 推进
- *  内层 fill,外壳宽度等于 dotStyle.width,activeDotStyle.width 只影响内层,
- *  做不出"active 4 → 12 长条"。Custom 自己 interpolate width/height/bg。
+ *  dot indicator 走 `c.primary` token,使用库内置 `Pagination`
+ *  (`useSharedValue` + `progress` 驱动,视觉插值留在 UI 线程)。
  *
- *  forwardRef 透传 ICarouselInstance —— 解锁 a11y 暂停(ref.current.scrollTo)
- *  以及宿主页面的命令式 scrollTo / prev / next。
+ *  forwardRef 透传 CarouselRef,供宿主命令式 scrollTo / prev / next
+ *  并读取最后一次完成落位的 index。
  */
-// T 约束 object —— `Pagination.Basic<T extends {}>` 需要 object
 function CarouselInner({
-  items,
+  data,
   renderItem,
+  keyExtractor,
   height,
-  itemWidth,
-  autoPlay,
+  itemSize,
+  autoplay,
+  autoplayInterval,
   loop = true,
   showIndicator = true,
   indicatorPosition = 'bottom',
@@ -37,16 +39,32 @@ function CarouselInner({
   const {
     width: screenWidth
   } = useWindowDimensions();
-  const width = itemWidth ?? screenWidth;
+  const width = itemSize ?? screenWidth;
   const styles = useThemedStyles(makeCarouselStyles);
-  // Carousel `onProgressChange` 把 absoluteProgress 写进 shared value,Pagination 自动跟。
+  const reducedMotion = usePrefersReducedMotion();
+  const effectiveAutoplay = effectiveCarouselAutoplay(autoplay, reducedMotion);
+  const shouldRenderPagination = shouldRenderCarouselPagination(showIndicator, data.length);
+  const action = normalizeCarouselAction(onPressItem, getAccessibilityLabel);
+  const itemAccessibility = action.kind === 'action' ? data.map((item, index) => resolveCarouselItemAccessibility(action.getAccessibilityLabel, item, index, data.length)) : [];
+  const actionDiagnosticKey = action.diagnostics.join(',');
+  const itemDiagnosticKey = itemAccessibility.map((result, index) => result.diagnostics.length > 0 ? `${index}:${result.diagnostics.join('+')}` : '').filter(Boolean).join(',');
+  useEffect(() => {
+    if (actionDiagnosticKey.length > 0) {
+      log.warn('Carousel action 必须同时提供 onPressItem 与 getAccessibilityLabel 函数，已按 display-only 渲染。');
+    }
+  }, [actionDiagnosticKey]);
+  useEffect(() => {
+    if (itemDiagnosticKey.length > 0) {
+      log.warn(`Carousel item 名称无效(${itemDiagnosticKey})，对应 slide 已按 display-only 渲染。`);
+    }
+  }, [itemDiagnosticKey]);
+  // Carousel 把逻辑页进度写进 shared value,Pagination 自动跟随。
   const progress = useSharedValue(0);
 
   // 'bottom' 模式给容器额外 +space[7] (=r(16)) 高度容纳独立行指示器;
   // 与 dotsWrapBottom 的 paddingTop=space[3]+dot height space[1] 一起跟 r() 同步缩放。
   // 'overlay-bottom-right' 不占额外高度。
-  const indicatorReservedHeight = showIndicator && indicatorPosition === 'bottom' ? space['7'] : 0;
-  const data = items;
+  const indicatorReservedHeight = shouldRenderPagination && indicatorPosition === 'bottom' ? space['7'] : 0;
   return /*#__PURE__*/_jsxs(View, {
     style: [{
       height: height + indicatorReservedHeight
@@ -59,58 +77,64 @@ function CarouselInner({
         width,
         height
       },
+      itemSize: width,
       data: data,
+      keyExtractor: keyExtractor,
       loop: loop,
-      autoPlay: !!autoPlay,
-      autoPlayInterval: autoPlay,
-      onProgressChange: progress,
+      autoplay: effectiveAutoplay,
+      autoplayInterval: autoplayInterval,
+      progress: progress,
       ref: ref,
       renderItem: ({
         item,
-        index
-      }) =>
-      /*#__PURE__*/
-      // RN Pressable 而非 RNGH Pressable:Carousel 的 GestureDetector 已挂在
-      // ReanimatedCarousel 内部,外层再套 RNGH Pressable 会产生手势冲突;
-      // 用 RN 原生 Pressable 让库自己的拖拽手势优先,tap 仍正常触发。
-      _jsx(Pressable, {
-        onPress: () => onPressItem?.(item, index),
-        style: {
-          width,
-          height
+        index,
+        relativeProgress
+      }) => {
+        const content = renderItem({
+          item,
+          index,
+          relativeProgress
+        });
+        const itemTestID = `${testID ?? 'carousel'}-item-${index}`;
+        const itemLabel = itemAccessibility[index]?.label;
+        if (action.kind === 'action' && itemLabel !== undefined) {
+          // RN Pressable 而非 RNGH Pressable:Carousel 的 GestureDetector 已挂在
+          // ReanimatedCarousel 内部,外层再套 RNGH Pressable 会产生手势冲突;
+          // 用 RN 原生 Pressable 让库自己的拖拽手势优先,tap 仍正常触发。
+          return /*#__PURE__*/_jsx(Pressable, {
+            onPress: () => action.onPressItem(item, index),
+            style: {
+              width,
+              height
+            },
+            testID: itemTestID,
+            accessibilityRole: "button",
+            accessibilityLabel: itemLabel,
+            children: content
+          });
         }
-        // [L-92] 恒产出兜底:testID 缺失时用 'carousel' 前缀而非 undefined。
-        // 与 childTestID「父缺失返 undefined」语义不同,不替换为 childTestID。
-        // 原因:renderItem 须向 ReanimatedCarousel 提供稳定可预期的子项 testID
-        // 用于 E2E 定位,哪怕调用方未传 testID 也能用 carousel-item-0 等定位;
-        // 副作用:同屏两个未传 testID 的 Carousel 会碰撞 carousel-item-N。
-        // 建议:多 Carousel 场景请务必传 testID 以避免碰撞。
-        ,
-        testID: `${testID ?? 'carousel'}-item-${index}`
-        // 只在真正可点时声明 button 语义,纯展示型不标 button 避免读屏器误导
-        ,
-        ...(onPressItem ? {
-          accessibilityRole: 'button',
-          accessibilityLabel: getAccessibilityLabel?.(item, index) ?? `第 ${index + 1} 项`
-        } : null),
-        children: renderItem(item, index)
-      })
-    }), showIndicator && items.length > 1 ?
+        return /*#__PURE__*/_jsx(View, {
+          style: {
+            width,
+            height
+          },
+          testID: itemTestID,
+          children: content
+        });
+      }
+    }), shouldRenderPagination ?
     /*#__PURE__*/
-    // importantForAccessibility="no" —— dots 仅视觉辅助,SR 不需要读出
-    // 每个 dot 的状态(已由 accessibilityRole=tab / accessibilityState.selected 表达
-    // 的场景另论,这里 Pagination.Custom 无内置 a11y 语义,对 SR 隐藏比误读更优)。
-    _jsx(Pagination.Custom, {
-      progress: progress,
-      data: data,
-      dotStyle: styles.dot,
-      activeDotStyle: styles.dotActive,
-      containerStyle: indicatorPosition === 'overlay-bottom-right' ? styles.dotsWrapOverlay : styles.dotsWrapBottom
-      // @ts-expect-error — importantForAccessibility 是 RN View prop,
-      // Pagination.Custom containerStyle 走 ViewStyle 但 TS 类型未收录该 prop
-      ,
-      importantForAccessibility: "no-hide-descendants",
-      accessibilityElementsHidden: true
+    // Pagination 是第三方组件，隐藏 props 必须落在本地 View，不能向其透传。
+    _jsx(View, {
+      ...A11Y_HIDDEN_PROPS,
+      style: indicatorPosition === 'overlay-bottom-right' ? styles.dotsWrapOverlay : styles.dotsWrapBottom,
+      children: /*#__PURE__*/_jsx(Pagination, {
+        progress: progress,
+        count: data.length,
+        dotStyle: styles.dot,
+        activeDotStyle: styles.dotActive,
+        containerStyle: styles.dots
+      })
     }) : null]
   });
 }

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

@@ -1 +1 @@
-{"version":3,"names":["React","Pressable","useWindowDimensions","View","ReanimatedCarousel","Pagination","useSharedValue","space","useThemedStyles","makeCarouselStyles","jsx","_jsx","jsxs","_jsxs","CarouselInner","items","renderItem","height","itemWidth","autoPlay","loop","showIndicator","indicatorPosition","onPressItem","getAccessibilityLabel","style","testID","ref","width","screenWidth","styles","progress","indicatorReservedHeight","data","children","autoPlayInterval","onProgressChange","item","index","onPress","accessibilityRole","accessibilityLabel","length","Custom","dotStyle","dot","activeDotStyle","dotActive","containerStyle","dotsWrapOverlay","dotsWrapBottom","importantForAccessibility","accessibilityElementsHidden","Carousel","forwardRef"],"sourceRoot":"../../../../../src","sources":["components/ui/Carousel/Carousel.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useEffect","Pressable","useWindowDimensions","View","Carousel","ReanimatedCarousel","Pagination","useSharedValue","space","usePrefersReducedMotion","useThemedStyles","createLogger","A11Y_HIDDEN_PROPS","effectiveCarouselAutoplay","normalizeCarouselAction","resolveCarouselItemAccessibility","shouldRenderCarouselPagination","makeCarouselStyles","jsx","_jsx","jsxs","_jsxs","log","CarouselInner","data","renderItem","keyExtractor","height","itemSize","autoplay","autoplayInterval","loop","showIndicator","indicatorPosition","onPressItem","getAccessibilityLabel","style","testID","ref","width","screenWidth","styles","reducedMotion","effectiveAutoplay","shouldRenderPagination","length","action","itemAccessibility","kind","map","item","index","actionDiagnosticKey","diagnostics","join","itemDiagnosticKey","result","filter","Boolean","warn","progress","indicatorReservedHeight","children","relativeProgress","content","itemTestID","itemLabel","label","undefined","onPress","accessibilityRole","accessibilityLabel","dotsWrapOverlay","dotsWrapBottom","count","dotStyle","dot","activeDotStyle","dotActive","containerStyle","dots","forwardRef"],"sourceRoot":"../../../../../src","sources":["components/ui/Carousel/Carousel.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,SAAS,QAAQ,OAAO;AACxC,SAASC,SAAS,EAAEC,mBAAmB,EAAEC,IAAI,QAAQ,cAAc;AACnE,SACEC,QAAQ,IAAIC,kBAAkB,EAC9BC,UAAU,QACL,kCAAkC;AACzC,SAASC,cAAc,QAAQ,yBAAyB;AACxD,SACEC,KAAK,EACLC,uBAAuB,EACvBC,eAAe,QACV,yBAAgB;AACvB,SAASC,YAAY,QAAQ,gCAAuB;AACpD,SAASC,iBAAiB,QAAQ,mBAAgB;AAClD,SACEC,yBAAyB,EACzBC,uBAAuB,EACvBC,gCAAgC,EAChCC,8BAA8B,QACzB,eAAY;AACnB,SAASC,kBAAkB,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAG9C,MAAMC,GAAG,GAAGX,YAAY,CAAC,UAAU,CAAC;;AAEpC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASY,aAAaA,CACpB;EACEC,IAAI;EACJC,UAAU;EACVC,YAAY;EACZC,MAAM;EACNC,QAAQ;EACRC,QAAQ;EACRC,gBAAgB;EAChBC,IAAI,GAAG,IAAI;EACXC,aAAa,GAAG,IAAI;EACpBC,iBAAiB,GAAG,QAAQ;EAC5BC,WAAW;EACXC,qBAAqB;EACrBC,KAAK;EACLC;AACgB,CAAC,EACnBC,GAA2B,EACR;EACnB,MAAM;IAAEC,KAAK,EAAEC;EAAY,CAAC,GAAGtC,mBAAmB,CAAC,CAAC;EACpD,MAAMqC,KAAK,GAAGX,QAAQ,IAAIY,WAAW;EACrC,MAAMC,MAAM,GAAG/B,eAAe,CAACO,kBAAkB,CAAC;EAClD,MAAMyB,aAAa,GAAGjC,uBAAuB,CAAC,CAAC;EAC/C,MAAMkC,iBAAiB,GAAG9B,yBAAyB,CAACgB,QAAQ,EAAEa,aAAa,CAAC;EAC5E,MAAME,sBAAsB,GAAG5B,8BAA8B,CAC3DgB,aAAa,EACbR,IAAI,CAACqB,MACP,CAAC;EACD,MAAMC,MAAM,GAAGhC,uBAAuB,CAAIoB,WAAW,EAAEC,qBAAqB,CAAC;EAC7E,MAAMY,iBAAiB,GACrBD,MAAM,CAACE,IAAI,KAAK,QAAQ,GACpBxB,IAAI,CAACyB,GAAG,CAAC,CAACC,IAAI,EAAEC,KAAK,KACnBpC,gCAAgC,CAC9B+B,MAAM,CAACX,qBAAqB,EAC5Be,IAAI,EACJC,KAAK,EACL3B,IAAI,CAACqB,MACP,CACF,CAAC,GACD,EAAE;EACR,MAAMO,mBAAmB,GAAGN,MAAM,CAACO,WAAW,CAACC,IAAI,CAAC,GAAG,CAAC;EACxD,MAAMC,iBAAiB,GAAGR,iBAAiB,CACxCE,GAAG,CAAC,CAACO,MAAM,EAAEL,KAAK,KACjBK,MAAM,CAACH,WAAW,CAACR,MAAM,GAAG,CAAC,GACzB,GAAGM,KAAK,IAAIK,MAAM,CAACH,WAAW,CAACC,IAAI,CAAC,GAAG,CAAC,EAAE,GAC1C,EACN,CAAC,CACAG,MAAM,CAACC,OAAO,CAAC,CACfJ,IAAI,CAAC,GAAG,CAAC;EAEZtD,SAAS,CAAC,MAAM;IACd,IAAIoD,mBAAmB,CAACP,MAAM,GAAG,CAAC,EAAE;MAClCvB,GAAG,CAACqC,IAAI,CACN,mFACF,CAAC;IACH;EACF,CAAC,EAAE,CAACP,mBAAmB,CAAC,CAAC;EACzBpD,SAAS,CAAC,MAAM;IACd,IAAIuD,iBAAiB,CAACV,MAAM,GAAG,CAAC,EAAE;MAChCvB,GAAG,CAACqC,IAAI,CACN,sBAAsBJ,iBAAiB,gCACzC,CAAC;IACH;EACF,CAAC,EAAE,CAACA,iBAAiB,CAAC,CAAC;EACvB;EACA,MAAMK,QAAQ,GAAGrD,cAAc,CAAS,CAAC,CAAC;;EAE1C;EACA;EACA;EACA,MAAMsD,uBAAuB,GAC3BjB,sBAAsB,IAAIX,iBAAiB,KAAK,QAAQ,GAAGzB,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC;EAE3E,oBACEa,KAAA,CAAClB,IAAI;IACHiC,KAAK,EAAE,CAAC;MAAET,MAAM,EAAEA,MAAM,GAAGkC;IAAwB,CAAC,EAAEzB,KAAK,CAAE;IAC7DC,MAAM,EAAEA,MAAO;IAAAyB,QAAA,gBAEf3C,IAAA,CAACd;IACC;IAAA;MACA+B,KAAK,EAAE;QAAEG,KAAK;QAAEZ;MAAO,CAAE;MACzBC,QAAQ,EAAEW,KAAM;MAChBf,IAAI,EAAEA,IAAK;MACXE,YAAY,EAAEA,YAAa;MAC3BK,IAAI,EAAEA,IAAK;MACXF,QAAQ,EAAEc,iBAAkB;MAC5Bb,gBAAgB,EAAEA,gBAAiB;MACnC8B,QAAQ,EAAEA,QAAS;MACnBtB,GAAG,EAAEA,GAAI;MACTb,UAAU,EAAEA,CAAC;QAAEyB,IAAI;QAAEC,KAAK;QAAEY;MAAiB,CAAC,KAAK;QACjD,MAAMC,OAAO,GAAGvC,UAAU,CAAC;UAAEyB,IAAI;UAAEC,KAAK;UAAEY;QAAiB,CAAC,CAAC;QAC7D,MAAME,UAAU,GAAG,GAAG5B,MAAM,IAAI,UAAU,SAASc,KAAK,EAAE;QAC1D,MAAMe,SAAS,GAAGnB,iBAAiB,CAACI,KAAK,CAAC,EAAEgB,KAAK;QAEjD,IAAIrB,MAAM,CAACE,IAAI,KAAK,QAAQ,IAAIkB,SAAS,KAAKE,SAAS,EAAE;UACvD;UACA;UACA;UACA,oBACEjD,IAAA,CAAClB,SAAS;YACRoE,OAAO,EAAEA,CAAA,KAAMvB,MAAM,CAACZ,WAAW,CAACgB,IAAI,EAAEC,KAAK,CAAE;YAC/Cf,KAAK,EAAE;cAAEG,KAAK;cAAEZ;YAAO,CAAE;YACzBU,MAAM,EAAE4B,UAAW;YACnBK,iBAAiB,EAAC,QAAQ;YAC1BC,kBAAkB,EAAEL,SAAU;YAAAJ,QAAA,EAE7BE;UAAO,CACC,CAAC;QAEhB;QAEA,oBACE7C,IAAA,CAAChB,IAAI;UAACiC,KAAK,EAAE;YAAEG,KAAK;YAAEZ;UAAO,CAAE;UAACU,MAAM,EAAE4B,UAAW;UAAAH,QAAA,EAChDE;QAAO,CACJ,CAAC;MAEX;IAAE,CACH,CAAC,EACDpB,sBAAsB;IAAA;IACrB;IACAzB,IAAA,CAAChB,IAAI;MAAA,GACCS,iBAAiB;MACrBwB,KAAK,EACHH,iBAAiB,KAAK,sBAAsB,GACxCQ,MAAM,CAAC+B,eAAe,GACtB/B,MAAM,CAACgC,cACZ;MAAAX,QAAA,eAED3C,IAAA,CAACb,UAAU;QACTsD,QAAQ,EAAEA,QAAS;QACnBc,KAAK,EAAElD,IAAI,CAACqB,MAAO;QACnB8B,QAAQ,EAAElC,MAAM,CAACmC,GAAI;QACrBC,cAAc,EAAEpC,MAAM,CAACqC,SAAU;QACjCC,cAAc,EAAEtC,MAAM,CAACuC;MAAK,CAC7B;IAAC,CACE,CAAC,GACL,IAAI;EAAA,CACJ,CAAC;AAEX;;AAEA;AACA,OAAO,MAAM5E,QAAQ,gBAAGL,KAAK,CAACkF,UAAU,CAAC1D,aAAa,CAEhC","ignoreList":[]}

package/lib/module/components/ui/Carousel/behavior.js

@@ -0,0 +1,60 @@
+"use strict";
+
+import { normalizeNonBlankText } from "../shared/accessibilityName.js";
+
+/** 系统请求减弱动效时，Carousel 不得启动计时 autoplay。 */
+export const effectiveCarouselAutoplay = (autoplay, reducedMotion) => autoplay === true && !reducedMotion;
+
+/** 单页不需要视觉页码，也不应为其保留布局高度。 */
+export const shouldRenderCarouselPagination = (showIndicator, itemCount) => showIndicator && itemCount > 1;
+/** 只有两个函数同时存在才形成 action；任何半配置/未类型化值都失败关闭为展示。 */
+export function normalizeCarouselAction(onPressItem, getAccessibilityLabel) {
+  if (onPressItem === undefined && getAccessibilityLabel === undefined) {
+    return {
+      kind: 'display',
+      diagnostics: []
+    };
+  }
+  if (typeof onPressItem !== 'function' || typeof getAccessibilityLabel !== 'function') {
+    return {
+      kind: 'display',
+      diagnostics: ['action']
+    };
+  }
+  return {
+    kind: 'action',
+    onPressItem: onPressItem,
+    getAccessibilityLabel: getAccessibilityLabel,
+    diagnostics: []
+  };
+}
+/** getter 的异常和非法返回值都只影响当前 item，不能让整个 Carousel render 崩溃。 */
+export function resolveCarouselItemAccessibility(getAccessibilityLabel, item, index, itemCount) {
+  let rawLabel;
+  try {
+    rawLabel = getAccessibilityLabel(item, index);
+  } catch {
+    return {
+      label: undefined,
+      diagnostics: ['threw']
+    };
+  }
+  if (typeof rawLabel !== 'string') {
+    return {
+      label: undefined,
+      diagnostics: ['invalid']
+    };
+  }
+  const label = normalizeNonBlankText(rawLabel);
+  if (label === undefined) {
+    return {
+      label: undefined,
+      diagnostics: ['blank']
+    };
+  }
+  return {
+    label: `${label}，第 ${index + 1} 项，共 ${itemCount} 项`,
+    diagnostics: []
+  };
+}
+//# sourceMappingURL=behavior.js.map

package/lib/module/components/ui/Carousel/behavior.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["normalizeNonBlankText","effectiveCarouselAutoplay","autoplay","reducedMotion","shouldRenderCarouselPagination","showIndicator","itemCount","normalizeCarouselAction","onPressItem","getAccessibilityLabel","undefined","kind","diagnostics","resolveCarouselItemAccessibility","item","index","rawLabel","label"],"sourceRoot":"../../../../../src","sources":["components/ui/Carousel/behavior.ts"],"mappings":";;AAAA,SAASA,qBAAqB,QAAQ,gCAA6B;;AAEnE;AACA,OAAO,MAAMC,yBAAyB,GAAGA,CACvCC,QAA6B,EAC7BC,aAAsB,KACVD,QAAQ,KAAK,IAAI,IAAI,CAACC,aAAa;;AAEjD;AACA,OAAO,MAAMC,8BAA8B,GAAGA,CAC5CC,aAAsB,EACtBC,SAAiB,KACLD,aAAa,IAAIC,SAAS,GAAG,CAAC;AAc5C;AACA,OAAO,SAASC,uBAAuBA,CACrCC,WAAoB,EACpBC,qBAA8B,EACD;EAC7B,IAAID,WAAW,KAAKE,SAAS,IAAID,qBAAqB,KAAKC,SAAS,EAAE;IACpE,OAAO;MAAEC,IAAI,EAAE,SAAS;MAAEC,WAAW,EAAE;IAAG,CAAC;EAC7C;EACA,IACE,OAAOJ,WAAW,KAAK,UAAU,IACjC,OAAOC,qBAAqB,KAAK,UAAU,EAC3C;IACA,OAAO;MAAEE,IAAI,EAAE,SAAS;MAAEC,WAAW,EAAE,CAAC,QAAQ;IAAE,CAAC;EACrD;EACA,OAAO;IACLD,IAAI,EAAE,QAAQ;IACdH,WAAW,EAAEA,WAAsC;IACnDC,qBAAqB,EAAEA,qBAA+C;IACtEG,WAAW,EAAE;EACf,CAAC;AACH;AAOA;AACA,OAAO,SAASC,gCAAgCA,CAC9CJ,qBAA6C,EAC7CK,IAAO,EACPC,KAAa,EACbT,SAAiB,EACU;EAC3B,IAAIU,QAAiB;EACrB,IAAI;IACFA,QAAQ,GAAGP,qBAAqB,CAACK,IAAI,EAAEC,KAAK,CAAC;EAC/C,CAAC,CAAC,MAAM;IACN,OAAO;MAAEE,KAAK,EAAEP,SAAS;MAAEE,WAAW,EAAE,CAAC,OAAO;IAAE,CAAC;EACrD;EACA,IAAI,OAAOI,QAAQ,KAAK,QAAQ,EAAE;IAChC,OAAO;MAAEC,KAAK,EAAEP,SAAS;MAAEE,WAAW,EAAE,CAAC,SAAS;IAAE,CAAC;EACvD;EACA,MAAMK,KAAK,GAAGjB,qBAAqB,CAACgB,QAAQ,CAAC;EAC7C,IAAIC,KAAK,KAAKP,SAAS,EAAE;IACvB,OAAO;MAAEO,KAAK,EAAEP,SAAS;MAAEE,WAAW,EAAE,CAAC,OAAO;IAAE,CAAC;EACrD;EACA,OAAO;IACLK,KAAK,EAAE,GAAGA,KAAK,MAAMF,KAAK,GAAG,CAAC,QAAQT,SAAS,IAAI;IACnDM,WAAW,EAAE;EACf,CAAC;AACH","ignoreList":[]}

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

@@ -3,25 +3,20 @@
 import { StyleSheet } from 'react-native';
 import { r, radius, space } from "../../../theme/index.js";
 export const makeCarouselStyles = c => StyleSheet.create({
-  /** 'bottom' 模式:独立行容器,覆盖 Pagination.Custom 默认的 `justifyContent: 'space-between'`
-   *  (否则 dot 横向撑开),让 dot 居中紧贴。 */
+  /** 'bottom' 模式:独立行容器,让 dot 居中紧贴。 */
   dotsWrapBottom: {
-    flexDirection: 'row',
-    justifyContent: 'center',
     alignItems: 'center',
-    // 3pt 横间距:dot 单元 4pt + space[1]=r(4) 偏大,保留 r(3) 作为局部 dot 间隙
-    gap: r(3),
     paddingTop: space['3']
   },
-  /** 'overlay-bottom-right' 模式:absolute 浮在 Carousel 右下角,
-   *  override `justifyContent` → 'flex-end' 让 dot 群靠右。 */
+  /** 'overlay-bottom-right' 模式：用 absolute bottom/right 固定在右下角。 */
   dotsWrapOverlay: {
     position: 'absolute',
     bottom: space['3'],
-    right: space['5'],
-    flexDirection: 'row',
-    justifyContent: 'flex-end',
-    alignItems: 'center',
+    right: space['5']
+  },
+  /** Pagination 本体保持第三方所需的横向 layout，只承载视觉 dot。 */
+  dots: {
+    // 正式版按 active 最大宽度为每个 dot 预留 12pt,额外保留 3pt 间距。
     gap: r(3)
   },
   dot: {
@@ -32,10 +27,10 @@ export const makeCarouselStyles = c => StyleSheet.create({
     backgroundColor: c.primary,
     opacity: 0.32
   },
-  /** activeDot —— 12×4 长条,Pagination.Custom 会把 dotStyle 的 height /
-   *  borderRadius 与 activeDotStyle 的 width 一起 interpolate,这里只 override 变化值。 */
+  /** activeDot —— 12×4 长条,正式版 Pagination 为每项预留 12pt 宽避免布局跳动。 */
   dotActive: {
     width: space['5'],
+    backgroundColor: c.primary,
     opacity: 1
   }
 });

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

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","r","radius","space","makeCarouselStyles","c","create","dotsWrapBottom","flexDirection","justifyContent","alignItems","gap","paddingTop","dotsWrapOverlay","position","bottom","right","dot","width","height","borderRadius","pill","backgroundColor","primary","opacity","dotActive"],"sourceRoot":"../../../../../src","sources":["components/ui/Carousel/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SAASC,CAAC,EAAEC,MAAM,EAAEC,KAAK,QAA0B,yBAAgB;AAEnE,OAAO,MAAMC,kBAAkB,GAAIC,CAAc,IAC/CL,UAAU,CAACM,MAAM,CAAC;EAChB;AACJ;EACIC,cAAc,EAAE;IACdC,aAAa,EAAE,KAAK;IACpBC,cAAc,EAAE,QAAQ;IACxBC,UAAU,EAAE,QAAQ;IACpB;IACAC,GAAG,EAAEV,CAAC,CAAC,CAAC,CAAC;IACTW,UAAU,EAAET,KAAK,CAAC,GAAG;EACvB,CAAC;EACD;AACJ;EACIU,eAAe,EAAE;IACfC,QAAQ,EAAE,UAAU;IACpBC,MAAM,EAAEZ,KAAK,CAAC,GAAG,CAAC;IAClBa,KAAK,EAAEb,KAAK,CAAC,GAAG,CAAC;IACjBK,aAAa,EAAE,KAAK;IACpBC,cAAc,EAAE,UAAU;IAC1BC,UAAU,EAAE,QAAQ;IACpBC,GAAG,EAAEV,CAAC,CAAC,CAAC;EACV,CAAC;EACDgB,GAAG,EAAE;IACHC,KAAK,EAAEf,KAAK,CAAC,GAAG,CAAC;IACjBgB,MAAM,EAAEhB,KAAK,CAAC,GAAG,CAAC;IAClB;IACAiB,YAAY,EAAElB,MAAM,CAACmB,IAAI;IACzBC,eAAe,EAAEjB,CAAC,CAACkB,OAAO;IAC1BC,OAAO,EAAE;EACX,CAAC;EACD;AACJ;EACIC,SAAS,EAAE;IACTP,KAAK,EAAEf,KAAK,CAAC,GAAG,CAAC;IACjBqB,OAAO,EAAE;EACX;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["StyleSheet","r","radius","space","makeCarouselStyles","c","create","dotsWrapBottom","alignItems","paddingTop","dotsWrapOverlay","position","bottom","right","dots","gap","dot","width","height","borderRadius","pill","backgroundColor","primary","opacity","dotActive"],"sourceRoot":"../../../../../src","sources":["components/ui/Carousel/styles.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SAASC,CAAC,EAAEC,MAAM,EAAEC,KAAK,QAA0B,yBAAgB;AAEnE,OAAO,MAAMC,kBAAkB,GAAIC,CAAc,IAC/CL,UAAU,CAACM,MAAM,CAAC;EAChB;EACAC,cAAc,EAAE;IACdC,UAAU,EAAE,QAAQ;IACpBC,UAAU,EAAEN,KAAK,CAAC,GAAG;EACvB,CAAC;EACD;EACAO,eAAe,EAAE;IACfC,QAAQ,EAAE,UAAU;IACpBC,MAAM,EAAET,KAAK,CAAC,GAAG,CAAC;IAClBU,KAAK,EAAEV,KAAK,CAAC,GAAG;EAClB,CAAC;EACD;EACAW,IAAI,EAAE;IACJ;IACAC,GAAG,EAAEd,CAAC,CAAC,CAAC;EACV,CAAC;EACDe,GAAG,EAAE;IACHC,KAAK,EAAEd,KAAK,CAAC,GAAG,CAAC;IACjBe,MAAM,EAAEf,KAAK,CAAC,GAAG,CAAC;IAClB;IACAgB,YAAY,EAAEjB,MAAM,CAACkB,IAAI;IACzBC,eAAe,EAAEhB,CAAC,CAACiB,OAAO;IAC1BC,OAAO,EAAE;EACX,CAAC;EACD;EACAC,SAAS,EAAE;IACTP,KAAK,EAAEd,KAAK,CAAC,GAAG,CAAC;IACjBkB,eAAe,EAAEhB,CAAC,CAACiB,OAAO;IAC1BC,OAAO,EAAE;EACX;AACF,CAAC,CAAC","ignoreList":[]}