@unif/react-native-design 0.20.0 → 0.21.0

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

@@ -3,21 +3,33 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { View } from 'react-native';
 import { motion, usePrefersReducedMotion } from "../../../theme/index.js";
+import { createRevealWebAnimatedStyle, resolveRevealWebStyle, scheduleRevealAnimationFrames } from "./webTransition.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+const webRuntime = globalThis;
+function readAnimationFrameApi() {
+  try {
+    const request = webRuntime.requestAnimationFrame;
+    const cancel = webRuntime.cancelAnimationFrame;
+    if (typeof request !== 'function' || typeof cancel !== 'function') {
+      return undefined;
+    }
+    return {
+      requestAnimationFrame: callback => request.call(webRuntime, callback),
+      cancelAnimationFrame: id => cancel.call(webRuntime, id)
+    };
+  } catch {
+    return undefined;
+  }
+}
+
 /**
  * Web 端 Reveal —— RN-Web 上 reanimated 4 的 layout 动画（FadeIn/FadeOut）会在
  * _updatePropsJS 里 Object.keys 抛 TypeError（layoutReanimation/web，渲染即每帧崩）,
  * 改用 React state + CSS transition 复刻入场淡入。退场在 web 省略（消费者卸载即移除）;
  * native 走 Reveal.tsx 的 reanimated 实现。
  *
- * **结构分叉说明（三层容器）**：
- * - 外层 `<View style={style}>` —— 承接 RN StyleSheet 样式（flex/margin/padding 等），
- *   与 native Reveal 保持相同的容器语义；
- * - 中间 `<div style={animatedWebStyle}>` —— CSS opacity transition 动画层；
- *   必须是真正的 DOM 元素才能触发 CSS transition（react-native-web 的 <View> 会先
- *   inline 合并 style 再设 opacity，时序不稳定）；
- * - 因此这里刻意不用 animationKeyframes（需要 @keyframes 注入 document），
- *   而用 CSS transition + state 切换 opacity。
+ * caller layout 与动画 opacity 都落到同一个 RN View。双 RAF 建立 opacity:0 起点；
+ * reduced motion 或 RAF 不可用时首 render 就显示，且不输出 transition。
  */
 export function Reveal({
   children,
@@ -26,38 +38,49 @@ export function Reveal({
   testID
 }) {
   const reduced = usePrefersReducedMotion();
-  const [visible, setVisible] = useState(false);
-  const rafRef = useRef(null);
+  const frameApiRef = useRef(readAnimationFrameApi());
+  const frameApi = frameApiRef.current;
+  const canAnimate = !reduced && frameApi !== undefined;
+  const [visible, setVisible] = useState(() => !canAnimate);
+  const generationRef = useRef(0);
+  const previousCanAnimateRef = useRef(canAnimate);
+  const animationJustEnabled = canAnimate && previousCanAnimateRef.current === false;
   useEffect(() => {
-    // reduce-motion:跳过淡入,内容即时呈现(与 native FadeIn 在 ReduceMotion.System 下一致)。
-    if (reduced) {
+    const generation = generationRef.current + 1;
+    generationRef.current = generation;
+    previousCanAnimateRef.current = canAnimate;
+    if (!canAnimate) {
       setVisible(true);
-      return;
+      return () => {
+        if (generationRef.current === generation) {
+          generationRef.current += 1;
+        }
+      };
     }
-    let cancelled = false;
-    // 双 RAF 过一帧 commit/paint，确保 CSS transition 有 opacity:0 起点（仿 ToastHost.web）。
-    rafRef.current = requestAnimationFrame(() => {
-      if (cancelled) return;
-      rafRef.current = requestAnimationFrame(() => {
-        if (!cancelled) setVisible(true);
-      });
+    setVisible(false);
+    const cancelFrames = scheduleRevealAnimationFrames({
+      api: frameApi,
+      isCurrent: () => generationRef.current === generation,
+      onVisible: () => setVisible(true)
     });
     return () => {
-      cancelled = true;
-      if (rafRef.current != null) cancelAnimationFrame(rafRef.current);
+      if (generationRef.current === generation) {
+        generationRef.current += 1;
+      }
+      cancelFrames();
     };
-  }, [reduced]);
-  const animatedWebStyle = {
-    opacity: visible ? 1 : 0,
-    transition: reduced ? undefined : `opacity ${duration}ms ease-out`
-  };
+  }, [canAnimate, frameApi]);
+  const resolvedStyle = resolveRevealWebStyle(style);
+  const animatedWebStyle = createRevealWebAnimatedStyle({
+    targetOpacity: resolvedStyle.targetOpacity,
+    visible: canAnimate ? !animationJustEnabled && visible : true,
+    animate: canAnimate,
+    duration
+  });
   return /*#__PURE__*/_jsx(View, {
-    style: style,
+    style: [resolvedStyle.callerStyle, animatedWebStyle],
     testID: testID,
-    children: /*#__PURE__*/_jsx("div", {
-      style: animatedWebStyle,
-      children: children
-    })
+    children: children
   });
 }
 //# sourceMappingURL=Reveal.web.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useRef","useState","View","motion","usePrefersReducedMotion","jsx","_jsx","Reveal","children","style","duration","base","testID","reduced","visible","setVisible","rafRef","cancelled","current","requestAnimationFrame","cancelAnimationFrame","animatedWebStyle","opacity","transition","undefined"],"sourceRoot":"../../../../../src","sources":["components/ui/Reveal/Reveal.web.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,SAAS,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,OAAO;AAC1D,SAASC,IAAI,QAAQ,cAAc;AACnC,SAASC,MAAM,EAAEC,uBAAuB,QAAQ,yBAAgB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGjE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,MAAMA,CAAC;EACrBC,QAAQ;EACRC,KAAK;EACLC,QAAQ,GAAGP,MAAM,CAACQ,IAAI;EACtBC;AACW,CAAC,EAAqB;EACjC,MAAMC,OAAO,GAAGT,uBAAuB,CAAC,CAAC;EACzC,MAAM,CAACU,OAAO,EAAEC,UAAU,CAAC,GAAGd,QAAQ,CAAC,KAAK,CAAC;EAC7C,MAAMe,MAAM,GAAGhB,MAAM,CAAgB,IAAI,CAAC;EAE1CD,SAAS,CAAC,MAAM;IACd;IACA,IAAIc,OAAO,EAAE;MACXE,UAAU,CAAC,IAAI,CAAC;MAChB;IACF;IACA,IAAIE,SAAS,GAAG,KAAK;IACrB;IACAD,MAAM,CAACE,OAAO,GAAGC,qBAAqB,CAAC,MAAM;MAC3C,IAAIF,SAAS,EAAE;MACfD,MAAM,CAACE,OAAO,GAAGC,qBAAqB,CAAC,MAAM;QAC3C,IAAI,CAACF,SAAS,EAAEF,UAAU,CAAC,IAAI,CAAC;MAClC,CAAC,CAAC;IACJ,CAAC,CAAC;IACF,OAAO,MAAM;MACXE,SAAS,GAAG,IAAI;MAChB,IAAID,MAAM,CAACE,OAAO,IAAI,IAAI,EAAEE,oBAAoB,CAACJ,MAAM,CAACE,OAAO,CAAC;IAClE,CAAC;EACH,CAAC,EAAE,CAACL,OAAO,CAAC,CAAC;EAEb,MAAMQ,gBAAqC,GAAG;IAC5CC,OAAO,EAAER,OAAO,GAAG,CAAC,GAAG,CAAC;IACxBS,UAAU,EAAEV,OAAO,GAAGW,SAAS,GAAG,WAAWd,QAAQ;EACvD,CAAC;EAED,oBACEJ,IAAA,CAACJ,IAAI;IAACO,KAAK,EAAEA,KAAM;IAACG,MAAM,EAAEA,MAAO;IAAAJ,QAAA,eACjCF,IAAA;MAAKG,KAAK,EAAEY,gBAAiB;MAAAb,QAAA,EAAEA;IAAQ,CAAM;EAAC,CAC1C,CAAC;AAEX","ignoreList":[]}
+{"version":3,"names":["React","useEffect","useRef","useState","View","motion","usePrefersReducedMotion","createRevealWebAnimatedStyle","resolveRevealWebStyle","scheduleRevealAnimationFrames","jsx","_jsx","webRuntime","globalThis","readAnimationFrameApi","request","requestAnimationFrame","cancel","cancelAnimationFrame","undefined","callback","call","id","Reveal","children","style","duration","base","testID","reduced","frameApiRef","frameApi","current","canAnimate","visible","setVisible","generationRef","previousCanAnimateRef","animationJustEnabled","generation","cancelFrames","api","isCurrent","onVisible","resolvedStyle","animatedWebStyle","targetOpacity","animate","callerStyle"],"sourceRoot":"../../../../../src","sources":["components/ui/Reveal/Reveal.web.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/ui/Reveal/webTransition.js

@@ -0,0 +1,157 @@
+"use strict";
+
+import { StyleSheet } from 'react-native';
+function isEmptyStyleInput(value) {
+  if (value === undefined || value === null || value === false) return true;
+  if (!Array.isArray(value)) return false;
+  return value.every(isEmptyStyleInput);
+}
+function interpolateLikeReactNativeWeb(value) {
+  // String(Symbol()) 不抛错，但 RNW 的 `${value}` 会抛错，必须使用同一 coercion。
+  return `${value}`;
+}
+
+/**
+ * RNW 会对 transform array 做深层 Object.keys / join / string coercion；
+ * StyleSheet.flatten 只做浅合并，不能证明这条后续路径安全。
+ */
+function isSafeWebTransform(transform) {
+  if (transform === undefined || typeof transform === 'string') return true;
+  if (!Array.isArray(transform)) return false;
+  try {
+    return transform.every(operation => {
+      if (operation === null || typeof operation !== 'object' || Array.isArray(operation)) {
+        return false;
+      }
+      const keys = Object.keys(operation);
+      if (keys.length !== 1) return false;
+      const key = keys[0];
+      if (key === undefined) return false;
+      const value = operation[key];
+      if (key === 'matrix' || key === 'matrix3d') {
+        if (!Array.isArray(value)) return false;
+        interpolateLikeReactNativeWeb(value.join(','));
+      } else {
+        interpolateLikeReactNativeWeb(value);
+      }
+      return true;
+    });
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Web Reveal 只读取 caller 最终 opacity，不修改合法 caller style。
+ * flatten 或 RNW transform preprocessing 不安全时丢弃整份 hostile style。
+ */
+export function resolveRevealWebStyle(style) {
+  try {
+    if (isEmptyStyleInput(style)) {
+      return {
+        callerStyle: undefined,
+        targetOpacity: 1
+      };
+    }
+    const flattened = StyleSheet.flatten(style);
+    if (flattened === undefined || flattened === null || typeof flattened !== 'object' || Array.isArray(flattened)) {
+      return {
+        callerStyle: undefined,
+        targetOpacity: 1
+      };
+    }
+    const flattenedStyle = flattened;
+    if (!isSafeWebTransform(flattenedStyle.transform)) {
+      return {
+        callerStyle: undefined,
+        targetOpacity: 1
+      };
+    }
+    const opacity = flattenedStyle.opacity;
+    return {
+      callerStyle: style,
+      targetOpacity: typeof opacity === 'number' && Number.isFinite(opacity) && opacity >= 0 && opacity <= 1 ? opacity : 1
+    };
+  } catch {
+    return {
+      callerStyle: undefined,
+      targetOpacity: 1
+    };
+  }
+}
+export function createRevealWebAnimatedStyle({
+  targetOpacity,
+  visible,
+  animate,
+  duration
+}) {
+  return {
+    opacity: visible ? targetOpacity : 0,
+    ...(animate ? {
+      transitionProperty: 'opacity',
+      transitionDuration: `${duration}ms`,
+      transitionTimingFunction: 'ease-out'
+    } : {})
+  };
+}
+
+/**
+ * 两个 RAF id 独立保存；cleanup 即使发生在任意一帧之间，也会取消已知 id。
+ * cancelled + generation 双重保护保证旧回调不能写入新一轮 Reveal。
+ */
+export function scheduleRevealAnimationFrames({
+  api,
+  isCurrent,
+  onVisible
+}) {
+  let firstFrameId;
+  let secondFrameId;
+  let cancelled = false;
+  const isActive = () => {
+    if (cancelled) return false;
+    try {
+      return isCurrent();
+    } catch {
+      return false;
+    }
+  };
+  const show = () => {
+    if (isActive()) onVisible();
+  };
+  if (api === undefined) {
+    show();
+    return () => {
+      cancelled = true;
+    };
+  }
+  try {
+    firstFrameId = api.requestAnimationFrame(() => {
+      if (!isActive()) return;
+      try {
+        secondFrameId = api.requestAnimationFrame(show);
+      } catch {
+        show();
+      }
+    });
+  } catch {
+    show();
+  }
+  return () => {
+    cancelled = true;
+    if (firstFrameId !== undefined) {
+      try {
+        api.cancelAnimationFrame(firstFrameId);
+      } catch {
+        // cancel 失败时仍由 cancelled / generation guard 阻止旧回调写状态。
+      }
+    }
+    if (secondFrameId !== undefined) {
+      try {
+        api.cancelAnimationFrame(secondFrameId);
+      } catch {
+        // 同上。
+      }
+    }
+  };
+}
+//# sourceMappingURL=webTransition.js.map

package/lib/module/components/ui/Reveal/webTransition.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["StyleSheet","isEmptyStyleInput","value","undefined","Array","isArray","every","interpolateLikeReactNativeWeb","isSafeWebTransform","transform","operation","keys","Object","length","key","join","resolveRevealWebStyle","style","callerStyle","targetOpacity","flattened","flatten","flattenedStyle","opacity","Number","isFinite","createRevealWebAnimatedStyle","visible","animate","duration","transitionProperty","transitionDuration","transitionTimingFunction","scheduleRevealAnimationFrames","api","isCurrent","onVisible","firstFrameId","secondFrameId","cancelled","isActive","show","requestAnimationFrame","cancelAnimationFrame"],"sourceRoot":"../../../../../src","sources":["components/ui/Reveal/webTransition.ts"],"mappings":"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","ignoreList":[]}

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

@@ -1,70 +1,97 @@
 "use strict";
 
-import React, { forwardRef } from 'react';
-import { Pressable } from 'react-native-gesture-handler';
-import { control, fixed, r, useColors } from "../../../theme/index.js";
-import { childTestID } from "../../../utils/testID/index.js";
-import { Icon } from "../Icon/index.js";
-import { Input } from "../Input/index.js";
+import React, { forwardRef, useEffect } from 'react';
+import { fixed } from "../../../theme/index.js";
+import { createLogger } from "../../../utils/logger/index.js";
+import { TextFieldBase } from "../TextField/TextFieldBase.js";
+import { normalizeSearchLayout } from "../TextField/normalize.js";
+import { useTextFieldValue } from "../TextField/useTextFieldValue.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+const log = createLogger('Search');
+
 /**
- * 搜索输入框 —— `<Input>` 的预设：前置搜索图标、清除按钮、
- * 高 control.md、键盘 return 键为「搜索」。
- *
- * Ref 透传到 Input 内部 TextInput，业务可调 `searchRef.current?.focus()`。
+ * 搜索输入框:值状态只在本层 controller 持有一次,下层 base 始终以受控形状渲染。
  */
-export const Search = /*#__PURE__*/forwardRef(function Search({
-  onSubmit,
-  placeholder = '搜索…',
-  value,
-  onChangeText,
-  testID,
-  ...rest
-}, ref) {
-  const c = useColors();
-  const filled = typeof value === 'string' && value.length > 0;
-  return /*#__PURE__*/_jsx(Input, {
+export const Search = /*#__PURE__*/forwardRef(function Search(props, ref) {
+  const {
+    value: rawValue,
+    defaultValue: rawDefaultValue,
+    onChangeText: rawOnChangeText,
+    onSubmit: rawOnSubmit,
+    onSubmitEditing: rawOnSubmitEditing,
+    disabled: rawDisabled,
+    editable: rawEditable,
+    placeholder: rawPlaceholder,
+    leading: _leading,
+    trailing: _trailing,
+    height: _height,
+    returnKeyType: _returnKeyType,
+    accessibilityRole: _accessibilityRole,
+    role: _role,
+    clearButtonMode: _clearButtonMode,
+    enterKeyHint: _enterKeyHint,
+    ...rest
+  } = props;
+  const value = rawValue;
+  const defaultValue = rawDefaultValue;
+  const onChangeText = typeof rawOnChangeText === 'function' ? rawOnChangeText : undefined;
+  const onSubmit = typeof rawOnSubmit === 'function' ? rawOnSubmit : undefined;
+  const onSubmitEditing = typeof rawOnSubmitEditing === 'function' ? rawOnSubmitEditing : undefined;
+  const disabled = rawDisabled === true;
+  const editable = rawEditable === false ? false : undefined;
+  const placeholder = typeof rawPlaceholder === 'string' ? rawPlaceholder : '搜索…';
+  const allowedNativeProps = rest;
+  const removedNativeAliasKey = Object.entries({
+    leading: _leading,
+    trailing: _trailing,
+    height: _height,
+    returnKeyType: _returnKeyType,
+    accessibilityRole: _accessibilityRole,
+    role: _role,
+    clearButtonMode: _clearButtonMode,
+    enterKeyHint: _enterKeyHint
+  }).filter(([, entry]) => entry !== undefined).map(([name]) => name).join(',');
+  useEffect(() => {
+    if (removedNativeAliasKey.length > 0) {
+      log.warn(`已忽略 Search 自管 props(${removedNativeAliasKey})。`);
+    }
+  }, [removedNativeAliasKey]);
+  const controller = useTextFieldValue({
+    value,
+    defaultValue,
+    onChangeText
+  }, 'Search');
+  const searchLayout = normalizeSearchLayout(fixed.hitTarget, 36);
+  const effectiveEditable = disabled !== true && editable !== false;
+  const trailing = controller.value.length > 0 && effectiveEditable && controller.canUpdate ? {
+    kind: 'action',
+    icon: 'close',
+    onPress: () => controller.onChangeText(''),
+    accessibilityLabel: '清除搜索内容'
+  } : undefined;
+  return /*#__PURE__*/_jsx(TextFieldBase, {
     ref: ref,
-    ...rest,
-    value: value,
-    onChangeText: onChangeText,
-    placeholder: placeholder
-    // [L-81] 高度裸 36 → control.md(r(36),随设备缩放)
-    ,
-    height: control.md,
+    ...allowedNativeProps,
+    multiline: false,
+    value: controller.value,
+    onChangeText: controller.onChangeText,
+    disabled: disabled,
+    editable: editable,
+    placeholder: placeholder,
+    height: fixed.hitTarget,
+    searchLayout: searchLayout,
     returnKeyType: "search",
     accessibilityRole: "search",
-    testID: testID,
-    onSubmitEditing: e => {
-      // [M-9] 改读 e.nativeEvent.text —— 不再依赖受控 value,非受控场景也能触发
-      const text = e.nativeEvent.text;
-      onSubmit?.(text);
+    onSubmitEditing: event => {
+      onSubmitEditing?.(event);
+      onSubmit?.(controller.value);
+    },
+    leading: {
+      kind: 'icon',
+      icon: 'search',
+      size: 18
     },
-    leading: /*#__PURE__*/_jsx(Icon, {
-      name: "search",
-      size: r(18),
-      color: c.foregroundSubtle
-    }),
-    trailing: filled ? /*#__PURE__*/_jsx(Pressable, {
-      onPress: () => onChangeText?.('')
-      // [M-7] 清除按钮 icon r(14)≈14pt;Input 高 control.md≈36pt 限制垂直扩展
-      // horizontal 走 (44-14)/2=15;vertical 走 (44-control.md)/2≈4
-      ,
-      hitSlop: {
-        top: Math.round((fixed.hitTarget - control.md) / 2),
-        bottom: Math.round((fixed.hitTarget - control.md) / 2),
-        left: Math.round((fixed.hitTarget - r(14)) / 2),
-        right: Math.round((fixed.hitTarget - r(14)) / 2)
-      },
-      accessibilityRole: "button",
-      accessibilityLabel: "\u6E05\u9664",
-      testID: childTestID(testID, 'clear'),
-      children: /*#__PURE__*/_jsx(Icon, {
-        name: "close",
-        size: r(14),
-        color: c.foregroundSubtle
-      })
-    }) : null
+    trailing: trailing
   });
 });
 Search.displayName = 'Search';

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

@@ -1 +1 @@
-{"version":3,"names":["React","forwardRef","Pressable","control","fixed","r","useColors","childTestID","Icon","Input","jsx","_jsx","Search","onSubmit","placeholder","value","onChangeText","testID","rest","ref","c","filled","length","height","md","returnKeyType","accessibilityRole","onSubmitEditing","e","text","nativeEvent","leading","name","size","color","foregroundSubtle","trailing","onPress","hitSlop","top","Math","round","hitTarget","bottom","left","right","accessibilityLabel","children","displayName"],"sourceRoot":"../../../../../src","sources":["components/ui/Search/Search.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,UAAU,QAAQ,OAAO;AACzC,SAASC,SAAS,QAAQ,8BAA8B;AAExD,SAASC,OAAO,EAAEC,KAAK,EAAEC,CAAC,EAAEC,SAAS,QAAQ,yBAAgB;AAC7D,SAASC,WAAW,QAAQ,gCAAuB;AACnD,SAASC,IAAI,QAAQ,kBAAS;AAC9B,SAASC,KAAK,QAAQ,mBAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAIjC;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,MAAM,gBAAGX,UAAU,CAA4B,SAASW,MAAMA,CACzE;EAAEC,QAAQ;EAAEC,WAAW,GAAG,KAAK;EAAEC,KAAK;EAAEC,YAAY;EAAEC,MAAM;EAAE,GAAGC;AAAK,CAAC,EACvEC,GAAG,EACgB;EACnB,MAAMC,CAAC,GAAGd,SAAS,CAAC,CAAC;EACrB,MAAMe,MAAM,GAAG,OAAON,KAAK,KAAK,QAAQ,IAAIA,KAAK,CAACO,MAAM,GAAG,CAAC;EAC5D,oBACEX,IAAA,CAACF,KAAK;IACJU,GAAG,EAAEA,GAAI;IAAA,GACLD,IAAI;IACRH,KAAK,EAAEA,KAAM;IACbC,YAAY,EAAEA,YAAa;IAC3BF,WAAW,EAAEA;IACb;IAAA;IACAS,MAAM,EAAEpB,OAAO,CAACqB,EAAG;IACnBC,aAAa,EAAC,QAAQ;IACtBC,iBAAiB,EAAC,QAAQ;IAC1BT,MAAM,EAAEA,MAAO;IACfU,eAAe,EAAGC,CAAC,IAAK;MACtB;MACA,MAAMC,IAAI,GAAGD,CAAC,CAACE,WAAW,CAACD,IAAI;MAC/BhB,QAAQ,GAAGgB,IAAI,CAAC;IAClB,CAAE;IACFE,OAAO,eAAEpB,IAAA,CAACH,IAAI;MAACwB,IAAI,EAAC,QAAQ;MAACC,IAAI,EAAE5B,CAAC,CAAC,EAAE,CAAE;MAAC6B,KAAK,EAAEd,CAAC,CAACe;IAAiB,CAAE,CAAE;IACxEC,QAAQ,EACNf,MAAM,gBACJV,IAAA,CAACT,SAAS;MACRmC,OAAO,EAAEA,CAAA,KAAMrB,YAAY,GAAG,EAAE;MAChC;MACA;MAAA;MACAsB,OAAO,EAAE;QACPC,GAAG,EAAEC,IAAI,CAACC,KAAK,CAAC,CAACrC,KAAK,CAACsC,SAAS,GAAGvC,OAAO,CAACqB,EAAE,IAAI,CAAC,CAAC;QACnDmB,MAAM,EAAEH,IAAI,CAACC,KAAK,CAAC,CAACrC,KAAK,CAACsC,SAAS,GAAGvC,OAAO,CAACqB,EAAE,IAAI,CAAC,CAAC;QACtDoB,IAAI,EAAEJ,IAAI,CAACC,KAAK,CAAC,CAACrC,KAAK,CAACsC,SAAS,GAAGrC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAC/CwC,KAAK,EAAEL,IAAI,CAACC,KAAK,CAAC,CAACrC,KAAK,CAACsC,SAAS,GAAGrC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;MACjD,CAAE;MACFqB,iBAAiB,EAAC,QAAQ;MAC1BoB,kBAAkB,EAAC,cAAI;MACvB7B,MAAM,EAAEV,WAAW,CAACU,MAAM,EAAE,OAAO,CAAE;MAAA8B,QAAA,eAErCpC,IAAA,CAACH,IAAI;QAACwB,IAAI,EAAC,OAAO;QAACC,IAAI,EAAE5B,CAAC,CAAC,EAAE,CAAE;QAAC6B,KAAK,EAAEd,CAAC,CAACe;MAAiB,CAAE;IAAC,CACpD,CAAC,GACV;EACL,CACF,CAAC;AAEN,CAAC,CAAC;AAEFvB,MAAM,CAACoC,WAAW,GAAG,QAAQ","ignoreList":[]}
+{"version":3,"names":["React","forwardRef","useEffect","fixed","createLogger","TextFieldBase","normalizeSearchLayout","useTextFieldValue","jsx","_jsx","log","Search","props","ref","value","rawValue","defaultValue","rawDefaultValue","onChangeText","rawOnChangeText","onSubmit","rawOnSubmit","onSubmitEditing","rawOnSubmitEditing","disabled","rawDisabled","editable","rawEditable","placeholder","rawPlaceholder","leading","_leading","trailing","_trailing","height","_height","returnKeyType","_returnKeyType","accessibilityRole","_accessibilityRole","role","_role","clearButtonMode","_clearButtonMode","enterKeyHint","_enterKeyHint","rest","undefined","allowedNativeProps","removedNativeAliasKey","Object","entries","filter","entry","map","name","join","length","warn","controller","searchLayout","hitTarget","effectiveEditable","canUpdate","kind","icon","onPress","accessibilityLabel","multiline","event","size","displayName"],"sourceRoot":"../../../../../src","sources":["components/ui/Search/Search.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,SAAS,QAAQ,OAAO;AACpD,SAASC,KAAK,QAAQ,yBAAgB;AACtC,SAASC,YAAY,QAAQ,gCAAuB;AACpD,SAASC,aAAa,QAAQ,+BAA4B;AAC1D,SAASC,qBAAqB,QAAQ,2BAAwB;AAM9D,SAASC,iBAAiB,QAAQ,mCAAgC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGnE,MAAMC,GAAG,GAAGN,YAAY,CAAC,QAAQ,CAAC;;AAElC;AACA;AACA;AACA,OAAO,MAAMO,MAAM,gBAAGV,UAAU,CAC9B,SAASU,MAAMA,CAACC,KAAK,EAAEC,GAAG,EAAqB;EAC7C,MAAM;IACJC,KAAK,EAAEC,QAAQ;IACfC,YAAY,EAAEC,eAAe;IAC7BC,YAAY,EAAEC,eAAe;IAC7BC,QAAQ,EAAEC,WAAW;IACrBC,eAAe,EAAEC,kBAAkB;IACnCC,QAAQ,EAAEC,WAAW;IACrBC,QAAQ,EAAEC,WAAW;IACrBC,WAAW,EAAEC,cAAc;IAC3BC,OAAO,EAAEC,QAAQ;IACjBC,QAAQ,EAAEC,SAAS;IACnBC,MAAM,EAAEC,OAAO;IACfC,aAAa,EAAEC,cAAc;IAC7BC,iBAAiB,EAAEC,kBAAkB;IACrCC,IAAI,EAAEC,KAAK;IACXC,eAAe,EAAEC,gBAAgB;IACjCC,YAAY,EAAEC,aAAa;IAC3B,GAAGC;EACL,CAAC,GAAGlC,KAA8C;EAClD,MAAME,KAAK,GAAGC,QAAQ;EACtB,MAAMC,YAAY,GAAGC,eAAe;EACpC,MAAMC,YAAY,GAChB,OAAOC,eAAe,KAAK,UAAU,GAChCA,eAAe,GAChB4B,SAAS;EACf,MAAM3B,QAAQ,GACZ,OAAOC,WAAW,KAAK,UAAU,GAC5BA,WAAW,GACZ0B,SAAS;EACf,MAAMzB,eAAe,GACnB,OAAOC,kBAAkB,KAAK,UAAU,GACnCA,kBAAkB,GACnBwB,SAAS;EACf,MAAMvB,QAAQ,GAAGC,WAAW,KAAK,IAAI;EACrC,MAAMC,QAAQ,GAAGC,WAAW,KAAK,KAAK,GAAG,KAAK,GAAGoB,SAAS;EAC1D,MAAMnB,WAAW,GACf,OAAOC,cAAc,KAAK,QAAQ,GAAGA,cAAc,GAAG,KAAK;EAC7D,MAAMmB,kBAAkB,GAAGF,IAgB1B;EACD,MAAMG,qBAAqB,GAAGC,MAAM,CAACC,OAAO,CAAC;IAC3CrB,OAAO,EAAEC,QAAQ;IACjBC,QAAQ,EAAEC,SAAS;IACnBC,MAAM,EAAEC,OAAO;IACfC,aAAa,EAAEC,cAAc;IAC7BC,iBAAiB,EAAEC,kBAAkB;IACrCC,IAAI,EAAEC,KAAK;IACXC,eAAe,EAAEC,gBAAgB;IACjCC,YAAY,EAAEC;EAChB,CAAC,CAAC,CACCO,MAAM,CAAC,CAAC,GAAGC,KAAK,CAAC,KAAKA,KAAK,KAAKN,SAAS,CAAC,CAC1CO,GAAG,CAAC,CAAC,CAACC,IAAI,CAAC,KAAKA,IAAI,CAAC,CACrBC,IAAI,CAAC,GAAG,CAAC;EACZtD,SAAS,CAAC,MAAM;IACd,IAAI+C,qBAAqB,CAACQ,MAAM,GAAG,CAAC,EAAE;MACpC/C,GAAG,CAACgD,IAAI,CAAC,uBAAuBT,qBAAqB,IAAI,CAAC;IAC5D;EACF,CAAC,EAAE,CAACA,qBAAqB,CAAC,CAAC;EAC3B,MAAMU,UAAU,GAAGpD,iBAAiB,CAClC;IAAEO,KAAK;IAAEE,YAAY;IAAEE;EAAa,CAAC,EACrC,QACF,CAAC;EACD,MAAM0C,YAAY,GAAGtD,qBAAqB,CAACH,KAAK,CAAC0D,SAAS,EAAE,EAAE,CAAC;EAC/D,MAAMC,iBAAiB,GAAGtC,QAAQ,KAAK,IAAI,IAAIE,QAAQ,KAAK,KAAK;EACjE,MAAMM,QAAmC,GACvC2B,UAAU,CAAC7C,KAAK,CAAC2C,MAAM,GAAG,CAAC,IAAIK,iBAAiB,IAAIH,UAAU,CAACI,SAAS,GACpE;IACEC,IAAI,EAAE,QAAQ;IACdC,IAAI,EAAE,OAAO;IACbC,OAAO,EAAEA,CAAA,KAAMP,UAAU,CAACzC,YAAY,CAAC,EAAE,CAAC;IAC1CiD,kBAAkB,EAAE;EACtB,CAAC,GACDpB,SAAS;EAEf,oBACEtC,IAAA,CAACJ,aAAa;IACZQ,GAAG,EAAEA,GAAI;IAAA,GACLmC,kBAAkB;IACtBoB,SAAS,EAAE,KAAM;IACjBtD,KAAK,EAAE6C,UAAU,CAAC7C,KAAM;IACxBI,YAAY,EAAEyC,UAAU,CAACzC,YAAa;IACtCM,QAAQ,EAAEA,QAAS;IACnBE,QAAQ,EAAEA,QAAS;IACnBE,WAAW,EAAEA,WAAY;IACzBM,MAAM,EAAE/B,KAAK,CAAC0D,SAAU;IACxBD,YAAY,EAAEA,YAAa;IAC3BxB,aAAa,EAAC,QAAQ;IACtBE,iBAAiB,EAAC,QAAQ;IAC1BhB,eAAe,EAAG+C,KAAK,IAAK;MAC1B/C,eAAe,GAAG+C,KAAK,CAAC;MACxBjD,QAAQ,GAAGuC,UAAU,CAAC7C,KAAK,CAAC;IAC9B,CAAE;IACFgB,OAAO,EAAE;MAAEkC,IAAI,EAAE,MAAM;MAAEC,IAAI,EAAE,QAAQ;MAAEK,IAAI,EAAE;IAAG,CAAE;IACpDtC,QAAQ,EAAEA;EAAS,CACpB,CAAC;AAEN,CACF,CAAC;AAEDrB,MAAM,CAAC4D,WAAW,GAAG,QAAQ","ignoreList":[]}

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

@@ -3,7 +3,7 @@
 import React, { useMemo } from 'react';
 import { Text, View } from 'react-native';
 import { Pressable } from 'react-native-gesture-handler';
-import { fw, useTheme, useThemedStyles } from "../../../theme/index.js";
+import { fw, scaleFontMetric, useFontScale, useTheme, useThemedStyles } from "../../../theme/index.js";
 import { childTestID } from "../../../utils/testID/index.js";
 import { makeStyles, sizingFor } from "./styles.js";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -29,7 +29,9 @@ export function Segmented({
     shadow
   } = useTheme();
   const styles = useThemedStyles(makeStyles);
+  const fontScale = useFontScale();
   const sizing = useMemo(() => sizingFor(size), [size]);
+  const textSize = scaleFontMetric(sizing.fs, fontScale);
   const activeBg = scheme === 'dark' ? c.surfaceContainerHighest : c.surface;
   const activeShadow = scheme === 'dark' ? null : shadow.subtle;
   return (
@@ -66,7 +68,7 @@ export function Segmented({
           }],
           children: /*#__PURE__*/_jsx(Text, {
             style: {
-              fontSize: sizing.fs,
+              fontSize: textSize,
               color: on ? c.foreground : c.foregroundSubtle,
               fontWeight: on ? fw.semi : fw.medium
             },

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

@@ -1 +1 @@
-{"version":3,"names":["React","useMemo","Text","View","Pressable","fw","useTheme","useThemedStyles","childTestID","makeStyles","sizingFor","jsx","_jsx","Segmented","value","onChange","items","size","disabled","testID","colors","c","scheme","shadow","styles","sizing","activeBg","surfaceContainerHighest","surface","activeShadow","subtle","style","seg","accessibilityRole","children","map","it","on","id","itemTestID","itemDisabled","onPress","accessibilityState","selected","accessibilityLabel","label","pressed","segItem","minHeight","paddingHorizontal","px","backgroundColor","opacity","fontSize","fs","color","foreground","foregroundSubtle","fontWeight","semi","medium","numberOfLines"],"sourceRoot":"../../../../../src","sources":["components/ui/Segmented/Segmented.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useMemo","Text","View","Pressable","fw","scaleFontMetric","useFontScale","useTheme","useThemedStyles","childTestID","makeStyles","sizingFor","jsx","_jsx","Segmented","value","onChange","items","size","disabled","testID","colors","c","scheme","shadow","styles","fontScale","sizing","textSize","fs","activeBg","surfaceContainerHighest","surface","activeShadow","subtle","style","seg","accessibilityRole","children","map","it","on","id","itemTestID","itemDisabled","onPress","accessibilityState","selected","accessibilityLabel","label","pressed","segItem","minHeight","paddingHorizontal","px","backgroundColor","opacity","fontSize","color","foreground","foregroundSubtle","fontWeight","semi","medium","numberOfLines"],"sourceRoot":"../../../../../src","sources":["components/ui/Segmented/Segmented.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -2,7 +2,7 @@
 
 import React from 'react';
 import Animated from 'react-native-reanimated';
-import { usePulse } from "../Pulse/index.js";
+import { DOT_DEFAULTS, usePulseWithDefaults } from "../Pulse/usePulse.js";
 import { r, useColors } from "../../../theme/index.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
@@ -14,9 +14,9 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * <Skeleton shape="circle" size={40} />        // 头像占位
  * ```
  *
- * `usePulse({ from: 0.5 })` 每实例独立脉冲 —— native 端走 Reanimated 4 worklet,
- * web 端走 CSS transition + setInterval(零 rAF JS 帧),opacity 在 0.5~1 循环。
- * 区别于沿 X 横扫高光的流式 shimmer。 */
+ * 每实例独立脉冲(默认 `from: 0.5`)—— native 端走 Reanimated 4 worklet,web 端走
+ * CSS transition + setInterval(零 rAF JS 帧),opacity 在 0.5~1 循环。系统开启
+ * 减弱动效时静止在 `to`(完全显示)。区别于沿 X 横扫高光的流式 shimmer。 */
 export function Skeleton({
   shape = 'rect',
   width,
@@ -27,9 +27,7 @@ export function Skeleton({
   testID
 }) {
   const c = useColors();
-  const animatedStyle = usePulse({
-    from: 0.5
-  });
+  const animatedStyle = usePulseWithDefaults(undefined, DOT_DEFAULTS, 'Skeleton');
 
   // 按形状推默认尺寸 + 圆角;caller 显式传 width / height / radius 时 override
   const dim = (() => {

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

@@ -1 +1 @@
-{"version":3,"names":["React","Animated","usePulse","r","useColors","jsx","_jsx","Skeleton","shape","width","height","size","radius","style","testID","c","animatedStyle","from","dim","borderRadius","View","backgroundColor","surfaceContainerHigh","accessibilityElementsHidden","importantForAccessibility"],"sourceRoot":"../../../../../src","sources":["components/ui/Skeleton/Skeleton.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,OAAOC,QAAQ,MAAM,yBAAyB;AAC9C,SAASC,QAAQ,QAAQ,mBAAU;AACnC,SAASC,CAAC,EAAEC,SAAS,QAAQ,yBAAgB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAG9C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,QAAQA,CAAC;EACvBC,KAAK,GAAG,MAAM;EACdC,KAAK;EACLC,MAAM;EACNC,IAAI,GAAGR,CAAC,CAAC,EAAE,CAAC;EACZS,MAAM;EACNC,KAAK;EACLC;AACa,CAAC,EAAqB;EACnC,MAAMC,CAAC,GAAGX,SAAS,CAAC,CAAC;EACrB,MAAMY,aAAa,GAAGd,QAAQ,CAAC;IAAEe,IAAI,EAAE;EAAI,CAAC,CAAC;;EAE7C;EACA,MAAMC,GAAG,GAAG,CAAC,MAAM;IACjB,IAAIV,KAAK,KAAK,QAAQ,EAAE;MACtB,OAAO;QAAEC,KAAK,EAAEE,IAAI;QAAED,MAAM,EAAEC,IAAI;QAAEQ,YAAY,EAAEP,MAAM,IAAID,IAAI,GAAG;MAAE,CAAC;IACxE;IACA,IAAIH,KAAK,KAAK,MAAM,EAAE;MACpB,OAAO;QACLC,KAAK,EAAEA,KAAK,IAAI,MAAM;QACtBC,MAAM,EAAEA,MAAM,IAAIP,CAAC,CAAC,EAAE,CAAC;QACvBgB,YAAY,EAAEP,MAAM,IAAIT,CAAC,CAAC,CAAC;MAC7B,CAAC;IACH;IACA,OAAO;MACLM,KAAK,EAAEA,KAAK,IAAI,MAAM;MACtBC,MAAM,EAAEA,MAAM,IAAIP,CAAC,CAAC,EAAE,CAAC;MACvBgB,YAAY,EAAEP,MAAM,IAAIT,CAAC,CAAC,CAAC;IAC7B,CAAC;EACH,CAAC,EAAE,CAAC;EAEJ,oBACEG,IAAA,CAACL,QAAQ,CAACmB,IAAI;IACZP,KAAK,EAAE,CACL;MAAE,GAAGK,GAAG;MAAEG,eAAe,EAAEN,CAAC,CAACO;IAAqB,CAAC,EACnDN,aAAa,EACbH,KAAK,CACL;IACFC,MAAM,EAAEA,MAAO;IACfS,2BAA2B;IAC3BC,yBAAyB,EAAC;EAAqB,CAChD,CAAC;AAEN","ignoreList":[]}
+{"version":3,"names":["React","Animated","DOT_DEFAULTS","usePulseWithDefaults","r","useColors","jsx","_jsx","Skeleton","shape","width","height","size","radius","style","testID","c","animatedStyle","undefined","dim","borderRadius","View","backgroundColor","surfaceContainerHigh","accessibilityElementsHidden","importantForAccessibility"],"sourceRoot":"../../../../../src","sources":["components/ui/Skeleton/Skeleton.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,OAAOC,QAAQ,MAAM,yBAAyB;AAC9C,SAASC,YAAY,EAAEC,oBAAoB,QAAQ,sBAAmB;AACtE,SAASC,CAAC,EAAEC,SAAS,QAAQ,yBAAgB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAG9C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,QAAQA,CAAC;EACvBC,KAAK,GAAG,MAAM;EACdC,KAAK;EACLC,MAAM;EACNC,IAAI,GAAGR,CAAC,CAAC,EAAE,CAAC;EACZS,MAAM;EACNC,KAAK;EACLC;AACa,CAAC,EAAqB;EACnC,MAAMC,CAAC,GAAGX,SAAS,CAAC,CAAC;EACrB,MAAMY,aAAa,GAAGd,oBAAoB,CACxCe,SAAS,EACThB,YAAY,EACZ,UACF,CAAC;;EAED;EACA,MAAMiB,GAAG,GAAG,CAAC,MAAM;IACjB,IAAIV,KAAK,KAAK,QAAQ,EAAE;MACtB,OAAO;QAAEC,KAAK,EAAEE,IAAI;QAAED,MAAM,EAAEC,IAAI;QAAEQ,YAAY,EAAEP,MAAM,IAAID,IAAI,GAAG;MAAE,CAAC;IACxE;IACA,IAAIH,KAAK,KAAK,MAAM,EAAE;MACpB,OAAO;QACLC,KAAK,EAAEA,KAAK,IAAI,MAAM;QACtBC,MAAM,EAAEA,MAAM,IAAIP,CAAC,CAAC,EAAE,CAAC;QACvBgB,YAAY,EAAEP,MAAM,IAAIT,CAAC,CAAC,CAAC;MAC7B,CAAC;IACH;IACA,OAAO;MACLM,KAAK,EAAEA,KAAK,IAAI,MAAM;MACtBC,MAAM,EAAEA,MAAM,IAAIP,CAAC,CAAC,EAAE,CAAC;MACvBgB,YAAY,EAAEP,MAAM,IAAIT,CAAC,CAAC,CAAC;IAC7B,CAAC;EACH,CAAC,EAAE,CAAC;EAEJ,oBACEG,IAAA,CAACN,QAAQ,CAACoB,IAAI;IACZP,KAAK,EAAE,CACL;MAAE,GAAGK,GAAG;MAAEG,eAAe,EAAEN,CAAC,CAACO;IAAqB,CAAC,EACnDN,aAAa,EACbH,KAAK,CACL;IACFC,MAAM,EAAEA,MAAO;IACfS,2BAA2B;IAC3BC,yBAAyB,EAAC;EAAqB,CAChD,CAAC;AAEN","ignoreList":[]}

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

@@ -1,15 +1,17 @@
 "use strict";
 
 import { useEffect } from 'react';
+import { View } from 'react-native';
 import Animated, { cancelAnimation, Easing, ReduceMotion, useAnimatedStyle, useSharedValue, withRepeat, withTiming } from 'react-native-reanimated';
 import { r, useColors } from "../../../theme/index.js";
-import { sanitizeSpinnerProps } from "./shared.js";
+import { A11Y_HIDDEN_PROPS } from "../shared/a11y.js";
+import { sanitizeSpinnerProps, SPINNER_CENTER_STYLE } from "./shared.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 export function Spinner({
   size = r(18),
   color,
   thickness = r(2),
-  style,
+  style: outerStyle,
   testID
 }) {
   const c = useColors();
@@ -35,18 +37,23 @@ export function Spinner({
       rotate: `${angle.value}deg`
     }]
   }));
-  return /*#__PURE__*/_jsx(Animated.View, {
+  return /*#__PURE__*/_jsx(View, {
     style: [{
       width: safeSize,
-      height: safeSize,
-      borderRadius: safeSize / 2,
-      borderWidth: safeThickness,
-      borderColor: c.outline,
-      borderTopColor: stroke
-    }, animatedStyle, style],
+      height: safeSize
+    }, outerStyle, SPINNER_CENTER_STYLE],
     testID: testID,
-    accessibilityElementsHidden: true,
-    importantForAccessibility: "no-hide-descendants"
+    ...A11Y_HIDDEN_PROPS,
+    children: /*#__PURE__*/_jsx(Animated.View, {
+      style: [{
+        width: safeSize,
+        height: safeSize,
+        borderRadius: safeSize / 2,
+        borderWidth: safeThickness,
+        borderColor: c.outline,
+        borderTopColor: stroke
+      }, animatedStyle]
+    })
   });
 }
 //# sourceMappingURL=Spinner.js.map