@hzblj/kara-components 0.10.0 → 0.12.0

package/lib/module/atoms/skeleton/skeleton.js

@@ -1,26 +1,40 @@
 "use strict";
 
-import { duration, opacity } from '@hzblj/kara-theme';
+import { timing } from '@hzblj/kara-sx';
+import { duration, opacity, useReducedMotion } from '@hzblj/kara-theme';
 import { useEffect } from 'react';
-import { useAnimatedStyle, useSharedValue, withRepeat, withTiming } from 'react-native-reanimated';
-import { ABox } from "../box/index.js";
+import { cancelAnimation, useAnimatedStyle, useSharedValue, withRepeat, withTiming } from 'react-native-reanimated';
+import { Box } from "../box/index.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+/** A breath, not a transition, so it sits off the scale: `slow` twice each way, at constant speed. */
+const PULSE = {
+  ...timing('slow', 'linear'),
+  duration: duration.slow * 2
+};
 export const Skeleton = ({
   borderRadius = 'small',
   h,
   testID,
   w
 }) => {
+  const reduced = useReducedMotion();
   const pulse = useSharedValue(opacity.o40);
+
+  // With motion reduced it holds still, halfway between the two ends of the pulse.
   useEffect(() => {
-    pulse.value = withRepeat(withTiming(opacity.o100, {
-      duration: duration.d800
-    }), -1, true);
-  }, [pulse]);
+    if (reduced) {
+      cancelAnimation(pulse);
+      pulse.value = opacity.o70;
+      return;
+    }
+    pulse.value = opacity.o40;
+    pulse.value = withRepeat(withTiming(opacity.o100, PULSE), -1, true);
+  }, [pulse, reduced]);
   const rStyle = useAnimatedStyle(() => ({
     opacity: pulse.value
   }), []);
-  return /*#__PURE__*/_jsx(ABox, {
+  return /*#__PURE__*/_jsx(Box, {
+    "aria-hidden": true,
     bg: "fill.quaternary",
     borderRadius: borderRadius,
     h: h,

package/lib/module/atoms/skeleton/skeleton.js.map

@@ -1 +1 @@
-{"version":3,"names":["duration","opacity","useEffect","useAnimatedStyle","useSharedValue","withRepeat","withTiming","ABox","jsx","_jsx","Skeleton","borderRadius","h","testID","w","pulse","o40","value","o100","d800","rStyle","bg","style","wide","undefined"],"sourceRoot":"../../../../src","sources":["atoms/skeleton/skeleton.tsx"],"mappings":";;AAAA,SAAQA,QAAQ,EAAEC,OAAO,QAAO,mBAAmB;AACnD,SAAQC,SAAS,QAAO,OAAO;AAC/B,SAAQC,gBAAgB,EAAEC,cAAc,EAAEC,UAAU,EAAEC,UAAU,QAAO,yBAAyB;AAEhG,SAAQC,IAAI,QAAO,iBAAQ;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG3B,OAAO,MAAMC,QAA2B,GAAGA,CAAC;EAACC,YAAY,GAAG,OAAO;EAAEC,CAAC;EAAEC,MAAM;EAAEC;AAAgB,CAAC,KAAK;EACpG,MAAMC,KAAK,GAAGX,cAAc,CAASH,OAAO,CAACe,GAAG,CAAC;EAEjDd,SAAS,CAAC,MAAM;IACda,KAAK,CAACE,KAAK,GAAGZ,UAAU,CAACC,UAAU,CAACL,OAAO,CAACiB,IAAI,EAAE;MAAClB,QAAQ,EAAEA,QAAQ,CAACmB;IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC;EACzF,CAAC,EAAE,CAACJ,KAAK,CAAC,CAAC;EAEX,MAAMK,MAAM,GAAGjB,gBAAgB,CAAC,OAAO;IAACF,OAAO,EAAEc,KAAK,CAACE;EAAK,CAAC,CAAC,EAAE,EAAE,CAAC;EAEnE,oBACER,IAAA,CAACF,IAAI;IACHc,EAAE,EAAC,iBAAiB;IACpBV,YAAY,EAAEA,YAAa;IAC3BC,CAAC,EAAEA,CAAE;IACLU,KAAK,EAAEF,MAAO;IACdP,MAAM,EAAEA,MAAO;IACfC,CAAC,EAAEA,CAAE;IACLS,IAAI,EAAET,CAAC,KAAKU;EAAU,CACvB,CAAC;AAEN,CAAC","ignoreList":[]}
+{"version":3,"names":["timing","duration","opacity","useReducedMotion","useEffect","cancelAnimation","useAnimatedStyle","useSharedValue","withRepeat","withTiming","Box","jsx","_jsx","PULSE","slow","Skeleton","borderRadius","h","testID","w","reduced","pulse","o40","value","o70","o100","rStyle","bg","style","wide","undefined"],"sourceRoot":"../../../../src","sources":["atoms/skeleton/skeleton.tsx"],"mappings":";;AAAA,SAAQA,MAAM,QAAO,gBAAgB;AACrC,SAAQC,QAAQ,EAAEC,OAAO,EAAEC,gBAAgB,QAAO,mBAAmB;AACrE,SAAQC,SAAS,QAAO,OAAO;AAC/B,SAAQC,eAAe,EAAEC,gBAAgB,EAAEC,cAAc,EAAEC,UAAU,EAAEC,UAAU,QAAO,yBAAyB;AAEjH,SAAQC,GAAG,QAAO,iBAAQ;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG1B;AACA,MAAMC,KAAK,GAAG;EAAC,GAAGb,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC;EAAEC,QAAQ,EAAEA,QAAQ,CAACa,IAAI,GAAG;AAAC,CAAC;AAExE,OAAO,MAAMC,QAA2B,GAAGA,CAAC;EAACC,YAAY,GAAG,OAAO;EAAEC,CAAC;EAAEC,MAAM;EAAEC;AAAgB,CAAC,KAAK;EACpG,MAAMC,OAAO,GAAGjB,gBAAgB,CAAC,CAAC;EAClC,MAAMkB,KAAK,GAAGd,cAAc,CAASL,OAAO,CAACoB,GAAG,CAAC;;EAEjD;EACAlB,SAAS,CAAC,MAAM;IACd,IAAIgB,OAAO,EAAE;MACXf,eAAe,CAACgB,KAAK,CAAC;MACtBA,KAAK,CAACE,KAAK,GAAGrB,OAAO,CAACsB,GAAG;MACzB;IACF;IAEAH,KAAK,CAACE,KAAK,GAAGrB,OAAO,CAACoB,GAAG;IACzBD,KAAK,CAACE,KAAK,GAAGf,UAAU,CAACC,UAAU,CAACP,OAAO,CAACuB,IAAI,EAAEZ,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC;EACrE,CAAC,EAAE,CAACQ,KAAK,EAAED,OAAO,CAAC,CAAC;EAEpB,MAAMM,MAAM,GAAGpB,gBAAgB,CAAC,OAAO;IAACJ,OAAO,EAAEmB,KAAK,CAACE;EAAK,CAAC,CAAC,EAAE,EAAE,CAAC;EAEnE,oBACEX,IAAA,CAACF,GAAG;IACF,mBAAW;IACXiB,EAAE,EAAC,iBAAiB;IACpBX,YAAY,EAAEA,YAAa;IAC3BC,CAAC,EAAEA,CAAE;IACLW,KAAK,EAAEF,MAAO;IACdR,MAAM,EAAEA,MAAO;IACfC,CAAC,EAAEA,CAAE;IACLU,IAAI,EAAEV,CAAC,KAAKW;EAAU,CACvB,CAAC;AAEN,CAAC","ignoreList":[]}

package/lib/module/atoms/stagger/index.js

@@ -0,0 +1,5 @@
+"use strict";
+
+export * from "./stagger.js";
+export * from "./stagger.types.js";
+//# sourceMappingURL=index.js.map

package/lib/module/atoms/stagger/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../../../src","sources":["atoms/stagger/index.ts"],"mappings":";;AAAA,cAAc,cAAW;AACzB,cAAc,oBAAiB","ignoreList":[]}

package/lib/module/atoms/stagger/stagger.js

@@ -0,0 +1,102 @@
+"use strict";
+
+import { isMotionComponent } from '@hzblj/kara-sx';
+import { duration } from '@hzblj/kara-theme';
+import { Children, cloneElement, isValidElement, useLayoutEffect, useRef } from 'react';
+import { Box } from "../box/index.js";
+import { jsx as _jsx } from "react/jsx-runtime";
+const asConfig = motion => typeof motion === 'string' ? {
+  preset: motion
+} : motion;
+
+/**
+ * The stagger's preset, or the child's own with the delay added: a child that names its look keeps it and only takes
+ * its turn. Reanimated's own builder is the child's, untouched, since adding a delay to one mutates it.
+ */
+const withDelay = (own, fallback, delay) => {
+  if (own === undefined) {
+    return {
+      ...fallback,
+      delay: (fallback.delay ?? 0) + delay
+    };
+  }
+  if (typeof own === 'string') {
+    return {
+      delay,
+      preset: own
+    };
+  }
+  return typeof own === 'object' && own !== null && 'preset' in own ? {
+    ...own,
+    delay: (own.delay ?? 0) + delay
+  } : own;
+};
+export const Stagger = ({
+  children,
+  entering = 'fadeUp',
+  exiting,
+  from = 'start',
+  interval = 'stagger',
+  layout,
+  testID,
+  ...sx
+}) => {
+  // The children that have arrived already. Only the ones new in this render take turns, so a list that grows by a
+  // page staggers the page, and an item added on its own arrives at once instead of after everything above it.
+  const arrived = useRef(new Set());
+  const items = Children.toArray(children);
+  const turns = new Map();
+  for (const item of items) {
+    if (/*#__PURE__*/isValidElement(item) && item.key !== null && !arrived.current.has(item.key)) {
+      turns.set(item.key, turns.size);
+    }
+  }
+
+  // Marked once committed: a render React throws away must not use up a child's turn.
+  useLayoutEffect(() => {
+    for (const key of turns.keys()) {
+      arrived.current.add(key);
+    }
+  });
+  const step = duration[interval];
+  const enter = asConfig(entering);
+  const leave = exiting === undefined ? undefined : asConfig(exiting);
+  const delayOf = key => {
+    const turn = key === null ? undefined : turns.get(key);
+    if (turn === undefined) {
+      return 0;
+    }
+    return (from === 'start' ? turn : turns.size - 1 - turn) * step;
+  };
+  return (
+    /*#__PURE__*/
+    // With `layout` the container moves and resizes with its children, so what holds it can follow.
+    _jsx(Box, {
+      layout: layout,
+      testID: testID,
+      ...sx,
+      children: items.map(item => {
+        if (! /*#__PURE__*/isValidElement(item)) {
+          return item;
+        }
+        const delay = delayOf(item.key);
+
+        // A component that takes the motion props gets them directly, with no view added around it.
+        if (isMotionComponent(item.type)) {
+          return /*#__PURE__*/cloneElement(item, {
+            entering: withDelay(item.props.entering, enter, delay),
+            exiting: item.props.exiting ?? leave,
+            layout: item.props.layout ?? layout
+          });
+        }
+        return /*#__PURE__*/_jsx(Box, {
+          entering: withDelay(undefined, enter, delay),
+          exiting: leave,
+          layout: layout,
+          children: item
+        }, item.key);
+      })
+    })
+  );
+};
+//# sourceMappingURL=stagger.js.map

package/lib/module/atoms/stagger/stagger.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["isMotionComponent","duration","Children","cloneElement","isValidElement","useLayoutEffect","useRef","Box","jsx","_jsx","asConfig","motion","preset","withDelay","own","fallback","delay","undefined","Stagger","children","entering","exiting","from","interval","layout","testID","sx","arrived","Set","items","toArray","turns","Map","item","key","current","has","set","size","keys","add","step","enter","leave","delayOf","turn","get","map","type","props"],"sourceRoot":"../../../../src","sources":["atoms/stagger/stagger.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/atoms/stagger/stagger.types.js

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

package/lib/module/atoms/stagger/stagger.types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../../../src","sources":["atoms/stagger/stagger.types.ts"],"mappings":"","ignoreList":[]}

package/lib/module/atoms/surface/surface.android.js

@@ -2,7 +2,7 @@
 
 import { Column, Surface as ComposeSurface, Shape } from '@expo/ui/jetpack-compose';
 import { testID as testIdModifier } from '@expo/ui/jetpack-compose/modifiers';
-import { useSxModifiers } from '@hzblj/kara-sx';
+import { splitAccessibility, useAccessibilityModifiers, useSxModifiers } from '@hzblj/kara-sx';
 import { radii, useAppTheme } from '@hzblj/kara-theme';
 import { useMemo } from 'react';
 import { useHostGuard } from "../../host-context.js";
@@ -30,15 +30,17 @@ export const Surface = ({
   px,
   py,
   testID,
-  ...sx
+  ...props
 }) => {
   useHostGuard('Surface');
+  const [accessibility, sx] = splitAccessibility(props);
   const theme = useAppTheme();
   const sxModifiers = useSxModifiers({
     ...sx,
     bg: undefined
   });
-  const modifiers = useMemo(() => testID ? [...sxModifiers, testIdModifier(testID)] : sxModifiers, [sxModifiers, testID]);
+  const accessibilityModifiers = useAccessibilityModifiers(accessibility);
+  const modifiers = useMemo(() => [...sxModifiers, ...(testID ? [testIdModifier(testID)] : []), ...accessibilityModifiers], [accessibilityModifiers, sxModifiers, testID]);
   const contentModifiers = useSxModifiers({
     p,
     pb,

package/lib/module/atoms/surface/surface.android.js.map

@@ -1 +1 @@
-{"version":3,"names":["Column","Surface","ComposeSurface","Shape","testID","testIdModifier","useSxModifiers","radii","useAppTheme","useMemo","useHostGuard","jsx","_jsx","cornerRadii","radius","bottomEnd","bottomStart","topEnd","topStart","children","glass","p","pb","pl","pr","pt","px","py","sx","theme","sxModifiers","bg","undefined","modifiers","contentModifiers","wide","color","contentColor","shape","RoundedCorner","borderRadius","tonalElevation"],"sourceRoot":"../../../../src","sources":["atoms/surface/surface.android.tsx"],"mappings":";;AAAA,SAAQA,MAAM,EAAEC,OAAO,IAAIC,cAAc,EAAEC,KAAK,QAAO,0BAA0B;AACjF,SAAQC,MAAM,IAAIC,cAAc,QAAO,oCAAoC;AAC3E,SAAQC,cAAc,QAAO,gBAAgB;AAC7C,SAAQC,KAAK,EAAEC,WAAW,QAAO,mBAAmB;AACpD,SAAQC,OAAO,QAAO,OAAO;AAC7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,MAAMC,WAAW,GAAIC,MAAc,KAAM;EAACC,SAAS,EAAED,MAAM;EAAEE,WAAW,EAAEF,MAAM;EAAEG,MAAM,EAAEH,MAAM;EAAEI,QAAQ,EAAEJ;AAAM,CAAC,CAAC;;AAEpH;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMb,OAAyB,GAAGA,CAAC;EACxCkB,QAAQ;EACRC,KAAK,GAAG,KAAK;EACbC,CAAC,GAAG,KAAK;EACTC,EAAE;EACFC,EAAE;EACFC,EAAE;EACFC,EAAE;EACFC,EAAE;EACFC,EAAE;EACFvB,MAAM;EACN,GAAGwB;AACS,CAAC,KAAK;EAClBlB,YAAY,CAAC,SAAS,CAAC;EAEvB,MAAMmB,KAAK,GAAGrB,WAAW,CAAC,CAAC;EAC3B,MAAMsB,WAAW,GAAGxB,cAAc,CAAC;IAAC,GAAGsB,EAAE;IAAEG,EAAE,EAAEC;EAAS,CAAC,CAAC;EAC1D,MAAMC,SAAS,GAAGxB,OAAO,CACvB,MAAOL,MAAM,GAAG,CAAC,GAAG0B,WAAW,EAAEzB,cAAc,CAACD,MAAM,CAAC,CAAC,GAAG0B,WAAY,EACvE,CAACA,WAAW,EAAE1B,MAAM,CACtB,CAAC;EACD,MAAM8B,gBAAgB,GAAG5B,cAAc,CAAC;IAACe,CAAC;IAAEC,EAAE;IAAEC,EAAE;IAAEC,EAAE;IAAEC,EAAE;IAAEC,EAAE;IAAEC,EAAE;IAAEQ,IAAI,EAAEP,EAAE,CAACO;EAAI,CAAC,CAAC;EAEnF,oBACEvB,IAAA,CAACV,cAAc;IACbkC,KAAK,EAAEP,KAAK,CAACO,KAAK,CAACR,EAAE,CAACG,EAAE,IAAI,iBAAiB,CAAE;IAC/CM,YAAY,EAAER,KAAK,CAACO,KAAK,CAAC,iBAAiB,CAAE;IAC7CH,SAAS,EAAEA,SAAU;IACrBK,KAAK,EAAEnC,KAAK,CAACoC,aAAa,CAAC;MAAC1B,WAAW,EAAEA,WAAW,CAACN,KAAK,CAACqB,EAAE,CAACY,YAAY,IAAI,OAAO,CAAC;IAAC,CAAC,CAAE;IAC1FC,cAAc,EAAErB,KAAK,GAAG,CAAC,GAAG,CAAE;IAAAD,QAAA,eAE9BP,IAAA,CAACZ,MAAM;MAACiC,SAAS,EAAEC,gBAAiB;MAAAf,QAAA,EAAEA;IAAQ,CAAS;EAAC,CAC1C,CAAC;AAErB,CAAC","ignoreList":[]}
+{"version":3,"names":["Column","Surface","ComposeSurface","Shape","testID","testIdModifier","splitAccessibility","useAccessibilityModifiers","useSxModifiers","radii","useAppTheme","useMemo","useHostGuard","jsx","_jsx","cornerRadii","radius","bottomEnd","bottomStart","topEnd","topStart","children","glass","p","pb","pl","pr","pt","px","py","props","accessibility","sx","theme","sxModifiers","bg","undefined","accessibilityModifiers","modifiers","contentModifiers","wide","color","contentColor","shape","RoundedCorner","borderRadius","tonalElevation"],"sourceRoot":"../../../../src","sources":["atoms/surface/surface.android.tsx"],"mappings":";;AAAA,SAAQA,MAAM,EAAEC,OAAO,IAAIC,cAAc,EAAEC,KAAK,QAAO,0BAA0B;AACjF,SAAQC,MAAM,IAAIC,cAAc,QAAO,oCAAoC;AAC3E,SAAQC,kBAAkB,EAAEC,yBAAyB,EAAEC,cAAc,QAAO,gBAAgB;AAC5F,SAAQC,KAAK,EAAEC,WAAW,QAAO,mBAAmB;AACpD,SAAQC,OAAO,QAAO,OAAO;AAC7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,MAAMC,WAAW,GAAIC,MAAc,KAAM;EAACC,SAAS,EAAED,MAAM;EAAEE,WAAW,EAAEF,MAAM;EAAEG,MAAM,EAAEH,MAAM;EAAEI,QAAQ,EAAEJ;AAAM,CAAC,CAAC;;AAEpH;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMf,OAAyB,GAAGA,CAAC;EACxCoB,QAAQ;EACRC,KAAK,GAAG,KAAK;EACbC,CAAC,GAAG,KAAK;EACTC,EAAE;EACFC,EAAE;EACFC,EAAE;EACFC,EAAE;EACFC,EAAE;EACFC,EAAE;EACFzB,MAAM;EACN,GAAG0B;AACS,CAAC,KAAK;EAClBlB,YAAY,CAAC,SAAS,CAAC;EACvB,MAAM,CAACmB,aAAa,EAAEC,EAAE,CAAC,GAAG1B,kBAAkB,CAACwB,KAAK,CAAC;EAErD,MAAMG,KAAK,GAAGvB,WAAW,CAAC,CAAC;EAC3B,MAAMwB,WAAW,GAAG1B,cAAc,CAAC;IAAC,GAAGwB,EAAE;IAAEG,EAAE,EAAEC;EAAS,CAAC,CAAC;EAC1D,MAAMC,sBAAsB,GAAG9B,yBAAyB,CAACwB,aAAa,CAAC;EACvE,MAAMO,SAAS,GAAG3B,OAAO,CACvB,MAAM,CAAC,GAAGuB,WAAW,EAAE,IAAI9B,MAAM,GAAG,CAACC,cAAc,CAACD,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,GAAGiC,sBAAsB,CAAC,EAC9F,CAACA,sBAAsB,EAAEH,WAAW,EAAE9B,MAAM,CAC9C,CAAC;EACD,MAAMmC,gBAAgB,GAAG/B,cAAc,CAAC;IAACe,CAAC;IAAEC,EAAE;IAAEC,EAAE;IAAEC,EAAE;IAAEC,EAAE;IAAEC,EAAE;IAAEC,EAAE;IAAEW,IAAI,EAAER,EAAE,CAACQ;EAAI,CAAC,CAAC;EAEnF,oBACE1B,IAAA,CAACZ,cAAc;IACbuC,KAAK,EAAER,KAAK,CAACQ,KAAK,CAACT,EAAE,CAACG,EAAE,IAAI,iBAAiB,CAAE;IAC/CO,YAAY,EAAET,KAAK,CAACQ,KAAK,CAAC,iBAAiB,CAAE;IAC7CH,SAAS,EAAEA,SAAU;IACrBK,KAAK,EAAExC,KAAK,CAACyC,aAAa,CAAC;MAAC7B,WAAW,EAAEA,WAAW,CAACN,KAAK,CAACuB,EAAE,CAACa,YAAY,IAAI,OAAO,CAAC;IAAC,CAAC,CAAE;IAC1FC,cAAc,EAAExB,KAAK,GAAG,CAAC,GAAG,CAAE;IAAAD,QAAA,eAE9BP,IAAA,CAACd,MAAM;MAACsC,SAAS,EAAEC,gBAAiB;MAAAlB,QAAA,EAAEA;IAAQ,CAAS;EAAC,CAC1C,CAAC;AAErB,CAAC","ignoreList":[]}

package/lib/module/atoms/surface/surface.ios.js

@@ -1,24 +1,28 @@
 "use strict";
 
 import { GlassEffectContainer, VStack } from '@expo/ui/swift-ui';
-import { useSxModifiers } from '@hzblj/kara-sx';
+import { splitAccessibility, useAccessibilityModifiers, useSxModifiers } from '@hzblj/kara-sx';
+import { useMemo } from 'react';
 import { useHostGuard } from "../../host-context.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 export const Surface = ({
   children,
   glass = false,
   testID,
-  ...sx
+  ...props
 }) => {
   useHostGuard('Surface');
+  const [accessibility, sx] = splitAccessibility(props);
 
   // `surface.primary` unless told otherwise, as Material's `Surface` is on Android — without it a plain one drew nothing.
-  const modifiers = useSxModifiers({
+  const sxModifiers = useSxModifiers({
     bg: 'surface.primary',
     borderRadius: 'large',
     p: 's16',
     ...sx
   });
+  const accessibilityModifiers = useAccessibilityModifiers(accessibility);
+  const modifiers = useMemo(() => [...sxModifiers, ...accessibilityModifiers], [accessibilityModifiers, sxModifiers]);
   const content = /*#__PURE__*/_jsx(VStack, {
     alignment: "leading",
     modifiers: modifiers,

package/lib/module/atoms/surface/surface.ios.js.map

@@ -1 +1 @@
-{"version":3,"names":["GlassEffectContainer","VStack","useSxModifiers","useHostGuard","jsx","_jsx","Surface","children","glass","testID","sx","modifiers","bg","borderRadius","p","content","alignment"],"sourceRoot":"../../../../src","sources":["atoms/surface/surface.ios.tsx"],"mappings":";;AAAA,SAAQA,oBAAoB,EAAEC,MAAM,QAAO,mBAAmB;AAC9D,SAAQC,cAAc,QAAO,gBAAgB;AAC7C,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,OAAO,MAAMC,OAAyB,GAAGA,CAAC;EAACC,QAAQ;EAAEC,KAAK,GAAG,KAAK;EAAEC,MAAM;EAAE,GAAGC;AAAgB,CAAC,KAAK;EACnGP,YAAY,CAAC,SAAS,CAAC;;EAEvB;EACA,MAAMQ,SAAS,GAAGT,cAAc,CAAC;IAACU,EAAE,EAAE,iBAAiB;IAAEC,YAAY,EAAE,OAAO;IAAEC,CAAC,EAAE,KAAK;IAAE,GAAGJ;EAAE,CAAC,CAAC;EACjG,MAAMK,OAAO,gBACXV,IAAA,CAACJ,MAAM;IAACe,SAAS,EAAC,SAAS;IAACL,SAAS,EAAEA,SAAU;IAACF,MAAM,EAAEA,MAAO;IAAAF,QAAA,EAC9DA;EAAQ,CACH,CACT;EAED,IAAI,CAACC,KAAK,EAAE;IACV,OAAOO,OAAO;EAChB;EAEA,oBAAOV,IAAA,CAACL,oBAAoB;IAAAO,QAAA,EAAEQ;EAAO,CAAuB,CAAC;AAC/D,CAAC","ignoreList":[]}
+{"version":3,"names":["GlassEffectContainer","VStack","splitAccessibility","useAccessibilityModifiers","useSxModifiers","useMemo","useHostGuard","jsx","_jsx","Surface","children","glass","testID","props","accessibility","sx","sxModifiers","bg","borderRadius","p","accessibilityModifiers","modifiers","content","alignment"],"sourceRoot":"../../../../src","sources":["atoms/surface/surface.ios.tsx"],"mappings":";;AAAA,SAAQA,oBAAoB,EAAEC,MAAM,QAAO,mBAAmB;AAC9D,SAAQC,kBAAkB,EAAEC,yBAAyB,EAAEC,cAAc,QAAO,gBAAgB;AAC5F,SAAQC,OAAO,QAAO,OAAO;AAC7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,OAAO,MAAMC,OAAyB,GAAGA,CAAC;EAACC,QAAQ;EAAEC,KAAK,GAAG,KAAK;EAAEC,MAAM;EAAE,GAAGC;AAAmB,CAAC,KAAK;EACtGP,YAAY,CAAC,SAAS,CAAC;EACvB,MAAM,CAACQ,aAAa,EAAEC,EAAE,CAAC,GAAGb,kBAAkB,CAACW,KAAK,CAAC;;EAErD;EACA,MAAMG,WAAW,GAAGZ,cAAc,CAAC;IAACa,EAAE,EAAE,iBAAiB;IAAEC,YAAY,EAAE,OAAO;IAAEC,CAAC,EAAE,KAAK;IAAE,GAAGJ;EAAE,CAAC,CAAC;EACnG,MAAMK,sBAAsB,GAAGjB,yBAAyB,CAACW,aAAa,CAAC;EACvE,MAAMO,SAAS,GAAGhB,OAAO,CAAC,MAAM,CAAC,GAAGW,WAAW,EAAE,GAAGI,sBAAsB,CAAC,EAAE,CAACA,sBAAsB,EAAEJ,WAAW,CAAC,CAAC;EACnH,MAAMM,OAAO,gBACXd,IAAA,CAACP,MAAM;IAACsB,SAAS,EAAC,SAAS;IAACF,SAAS,EAAEA,SAAU;IAACT,MAAM,EAAEA,MAAO;IAAAF,QAAA,EAC9DA;EAAQ,CACH,CACT;EAED,IAAI,CAACC,KAAK,EAAE;IACV,OAAOW,OAAO;EAChB;EAEA,oBAAOd,IAAA,CAACR,oBAAoB;IAAAU,QAAA,EAAEY;EAAO,CAAuB,CAAC;AAC/D,CAAC","ignoreList":[]}

package/lib/module/atoms/switch/switch.android.js

@@ -32,7 +32,7 @@ export const Switch = ({
   const control = /*#__PURE__*/_jsx(ComposeSwitch, {
     colors: {
       checkedBorderColor: theme.color('fill.accent.primary'),
-      checkedThumbColor: theme.color('content.on.bg'),
+      checkedThumbColor: theme.color('content.on.accent'),
       checkedTrackColor: theme.color('fill.accent.primary')
     },
     enabled: !disabled,

package/lib/module/atoms/switch/switch.android.js.map

@@ -1 +1 @@
-{"version":3,"names":["Switch","ComposeSwitch","Row","Text","clickable","fillMaxWidth","useAppTheme","useCallback","useMemo","haptics","useHostGuard","jsx","_jsx","jsxs","_jsxs","NOOP","undefined","disabled","label","onValueChange","value","theme","toggle","next","play","rowModifiers","control","colors","checkedBorderColor","color","checkedThumbColor","checkedTrackColor","enabled","onCheckedChange","horizontalArrangement","modifiers","verticalAlignment","children","colorString","style","typography","body"],"sourceRoot":"../../../../src","sources":["atoms/switch/switch.android.tsx"],"mappings":";;AAAA,SAAQA,MAAM,IAAIC,aAAa,EAAEC,GAAG,EAAEC,IAAI,QAAO,0BAA0B;AAC3E,SAAQC,SAAS,EAAEC,YAAY,QAAO,oCAAoC;AAC1E,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,WAAW,EAAEC,OAAO,QAAO,OAAO;AAE1C,SAAQC,OAAO,QAAO,wBAAe;AACrC,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAG/C;AACA,MAAMC,IAAI,GAAGA,CAAA,KAAMC,SAAS;;AAE5B;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMhB,MAAuB,GAAGA,CAAC;EAACiB,QAAQ,GAAG,KAAK;EAAEC,KAAK;EAAEC,aAAa;EAAEC;AAAkB,CAAC,KAAK;EACvGV,YAAY,CAAC,QAAQ,CAAC;EACtB,MAAMW,KAAK,GAAGf,WAAW,CAAC,CAAC;EAC3B,MAAMgB,MAAM,GAAGf,WAAW,CACvBgB,IAAa,IAAK;IACjBd,OAAO,CAACe,IAAI,CAACD,IAAI,GAAG,UAAU,GAAG,WAAW,CAAC;IAC7CJ,aAAa,GAAGI,IAAI,CAAC;EACvB,CAAC,EACD,CAACJ,aAAa,CAChB,CAAC;EACD,MAAMM,YAAY,GAAGjB,OAAO,CAC1B,MAAOS,QAAQ,IAAI,CAACE,aAAa,GAAG,CAACd,YAAY,CAAC,CAAC,CAAC,GAAG,CAACA,YAAY,CAAC,CAAC,EAAED,SAAS,CAAC,MAAMkB,MAAM,CAAC,CAACF,KAAK,CAAC,CAAC,CAAE,EACzG,CAACH,QAAQ,EAAEE,aAAa,EAAEG,MAAM,EAAEF,KAAK,CACzC,CAAC;EACD,MAAMM,OAAO,gBACXd,IAAA,CAACX,aAAa;IACZ0B,MAAM,EAAE;MACNC,kBAAkB,EAAEP,KAAK,CAACQ,KAAK,CAAC,qBAAqB,CAAC;MACtDC,iBAAiB,EAAET,KAAK,CAACQ,KAAK,CAAC,eAAe,CAAC;MAC/CE,iBAAiB,EAAEV,KAAK,CAACQ,KAAK,CAAC,qBAAqB;IACtD,CAAE;IACFG,OAAO,EAAE,CAACf,QAAS;IACnBgB,eAAe,EAAEd,aAAa,GAAGG,MAAM,GAAGP,IAAK;IAC/CK,KAAK,EAAEA;EAAM,CACd,CACF;EAED,IAAI,CAACF,KAAK,EAAE;IACV,OAAOQ,OAAO;EAChB;EAEA,oBACEZ,KAAA,CAACZ,GAAG;IAACgC,qBAAqB,EAAC,cAAc;IAACC,SAAS,EAAEV,YAAa;IAACW,iBAAiB,EAAC,QAAQ;IAAAC,QAAA,gBAC3FzB,IAAA,CAACT,IAAI;MAAC0B,KAAK,EAAER,KAAK,CAACiB,WAAW,CAACrB,QAAQ,GAAG,kBAAkB,GAAG,iBAAiB,CAAE;MAACsB,KAAK,EAAElB,KAAK,CAACmB,UAAU,CAACC,IAAK;MAAAJ,QAAA,EAC7GnB;IAAK,CACF,CAAC,EACNQ,OAAO;EAAA,CACL,CAAC;AAEV,CAAC","ignoreList":[]}
+{"version":3,"names":["Switch","ComposeSwitch","Row","Text","clickable","fillMaxWidth","useAppTheme","useCallback","useMemo","haptics","useHostGuard","jsx","_jsx","jsxs","_jsxs","NOOP","undefined","disabled","label","onValueChange","value","theme","toggle","next","play","rowModifiers","control","colors","checkedBorderColor","color","checkedThumbColor","checkedTrackColor","enabled","onCheckedChange","horizontalArrangement","modifiers","verticalAlignment","children","colorString","style","typography","body"],"sourceRoot":"../../../../src","sources":["atoms/switch/switch.android.tsx"],"mappings":";;AAAA,SAAQA,MAAM,IAAIC,aAAa,EAAEC,GAAG,EAAEC,IAAI,QAAO,0BAA0B;AAC3E,SAAQC,SAAS,EAAEC,YAAY,QAAO,oCAAoC;AAC1E,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,WAAW,EAAEC,OAAO,QAAO,OAAO;AAE1C,SAAQC,OAAO,QAAO,wBAAe;AACrC,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAG/C;AACA,MAAMC,IAAI,GAAGA,CAAA,KAAMC,SAAS;;AAE5B;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMhB,MAAuB,GAAGA,CAAC;EAACiB,QAAQ,GAAG,KAAK;EAAEC,KAAK;EAAEC,aAAa;EAAEC;AAAkB,CAAC,KAAK;EACvGV,YAAY,CAAC,QAAQ,CAAC;EACtB,MAAMW,KAAK,GAAGf,WAAW,CAAC,CAAC;EAC3B,MAAMgB,MAAM,GAAGf,WAAW,CACvBgB,IAAa,IAAK;IACjBd,OAAO,CAACe,IAAI,CAACD,IAAI,GAAG,UAAU,GAAG,WAAW,CAAC;IAC7CJ,aAAa,GAAGI,IAAI,CAAC;EACvB,CAAC,EACD,CAACJ,aAAa,CAChB,CAAC;EACD,MAAMM,YAAY,GAAGjB,OAAO,CAC1B,MAAOS,QAAQ,IAAI,CAACE,aAAa,GAAG,CAACd,YAAY,CAAC,CAAC,CAAC,GAAG,CAACA,YAAY,CAAC,CAAC,EAAED,SAAS,CAAC,MAAMkB,MAAM,CAAC,CAACF,KAAK,CAAC,CAAC,CAAE,EACzG,CAACH,QAAQ,EAAEE,aAAa,EAAEG,MAAM,EAAEF,KAAK,CACzC,CAAC;EACD,MAAMM,OAAO,gBACXd,IAAA,CAACX,aAAa;IACZ0B,MAAM,EAAE;MACNC,kBAAkB,EAAEP,KAAK,CAACQ,KAAK,CAAC,qBAAqB,CAAC;MACtDC,iBAAiB,EAAET,KAAK,CAACQ,KAAK,CAAC,mBAAmB,CAAC;MACnDE,iBAAiB,EAAEV,KAAK,CAACQ,KAAK,CAAC,qBAAqB;IACtD,CAAE;IACFG,OAAO,EAAE,CAACf,QAAS;IACnBgB,eAAe,EAAEd,aAAa,GAAGG,MAAM,GAAGP,IAAK;IAC/CK,KAAK,EAAEA;EAAM,CACd,CACF;EAED,IAAI,CAACF,KAAK,EAAE;IACV,OAAOQ,OAAO;EAChB;EAEA,oBACEZ,KAAA,CAACZ,GAAG;IAACgC,qBAAqB,EAAC,cAAc;IAACC,SAAS,EAAEV,YAAa;IAACW,iBAAiB,EAAC,QAAQ;IAAAC,QAAA,gBAC3FzB,IAAA,CAACT,IAAI;MAAC0B,KAAK,EAAER,KAAK,CAACiB,WAAW,CAACrB,QAAQ,GAAG,kBAAkB,GAAG,iBAAiB,CAAE;MAACsB,KAAK,EAAElB,KAAK,CAACmB,UAAU,CAACC,IAAK;MAAAJ,QAAA,EAC7GnB;IAAK,CACF,CAAC,EACNQ,OAAO;EAAA,CACL,CAAC;AAEV,CAAC","ignoreList":[]}

package/lib/module/atoms/text/text.android.js

@@ -2,7 +2,7 @@
 
 import { Text as ComposeText } from '@expo/ui/jetpack-compose';
 import { testID as testIdModifier } from '@expo/ui/jetpack-compose/modifiers';
-import { useSxModifiers } from '@hzblj/kara-sx';
+import { splitAccessibility, useAccessibilityModifiers, useSxModifiers } from '@hzblj/kara-sx';
 import { useAppTheme } from '@hzblj/kara-theme';
 import { useMemo } from 'react';
 import { useHostGuard } from "../../host-context.js";
@@ -28,13 +28,15 @@ export const Text = ({
   testID,
   transform,
   variant = 'body',
-  ...sx
+  ...props
 }) => {
   useHostGuard('Text');
   const theme = useAppTheme();
   const style = theme.typography[variant];
+  const [accessibility, sx] = splitAccessibility(props);
   const sxModifiers = useSxModifiers(sx);
-  const modifiers = useMemo(() => testID ? [...sxModifiers, testIdModifier(testID)] : sxModifiers, [sxModifiers, testID]);
+  const accessibilityModifiers = useAccessibilityModifiers(accessibility);
+  const modifiers = useMemo(() => [...sxModifiers, ...(testID ? [testIdModifier(testID)] : []), ...accessibilityModifiers], [accessibilityModifiers, sxModifiers, testID]);
   return /*#__PURE__*/_jsx(ComposeText, {
     color: theme.colorString(color),
     maxLines: numberOfLines,

package/lib/module/atoms/text/text.android.js.map

@@ -1 +1 @@
-{"version":3,"names":["Text","ComposeText","testID","testIdModifier","useSxModifiers","useAppTheme","useMemo","useHostGuard","jsx","_jsx","DECORATION","none","strikethrough","underline","applyTransform","children","transform","toUpperCase","toLowerCase","decorationOf","decoration","undefined","align","color","numberOfLines","variant","sx","theme","style","typography","sxModifiers","modifiers","colorString","maxLines","fontFamily","fontSize","fontWeight","lineHeight","textAlign","textDecoration"],"sourceRoot":"../../../../src","sources":["atoms/text/text.android.tsx"],"mappings":";;AAAA,SAAQA,IAAI,IAAIC,WAAW,QAAO,0BAA0B;AAC5D,SAAQC,MAAM,IAAIC,cAAc,QAAO,oCAAoC;AAC3E,SAAQC,cAAc,QAAO,gBAAgB;AAC7C,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,OAAO,QAAO,OAAO;AAE7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,MAAMC,UAAU,GAAG;EACjBC,IAAI,EAAE,MAAM;EACZC,aAAa,EAAE,aAAa;EAC5BC,SAAS,EAAE;AACb,CAAU;AAEV,MAAMC,cAAc,GAAGA,CAACC,QAA+B,EAAEC,SAAoC,KAAK;EAChG,IAAI,CAACA,SAAS,IAAI,OAAOD,QAAQ,KAAK,QAAQ,EAAE;IAC9C,OAAOA,QAAQ;EACjB;EAEA,OAAOC,SAAS,KAAK,WAAW,GAAGD,QAAQ,CAACE,WAAW,CAAC,CAAC,GAAGF,QAAQ,CAACG,WAAW,CAAC,CAAC;AACpF,CAAC;AAED,MAAMC,YAAY,GAAIC,UAAsC,IAC1DA,UAAU,KAAKC,SAAS,GAAGA,SAAS,GAAGX,UAAU,CAACU,UAAU,CAAC;AAE/D,OAAO,MAAMpB,IAAmB,GAAGA,CAAC;EAClCsB,KAAK;EACLP,QAAQ;EACRQ,KAAK,GAAG,iBAAiB;EACzBH,UAAU;EACVI,aAAa;EACbtB,MAAM;EACNc,SAAS;EACTS,OAAO,GAAG,MAAM;EAChB,GAAGC;AACM,CAAC,KAAK;EACfnB,YAAY,CAAC,MAAM,CAAC;EACpB,MAAMoB,KAAK,GAAGtB,WAAW,CAAC,CAAC;EAC3B,MAAMuB,KAAK,GAAGD,KAAK,CAACE,UAAU,CAACJ,OAAO,CAAC;EACvC,MAAMK,WAAW,GAAG1B,cAAc,CAACsB,EAAE,CAAC;EACtC,MAAMK,SAAS,GAAGzB,OAAO,CACvB,MAAOJ,MAAM,GAAG,CAAC,GAAG4B,WAAW,EAAE3B,cAAc,CAACD,MAAM,CAAC,CAAC,GAAG4B,WAAY,EACvE,CAACA,WAAW,EAAE5B,MAAM,CACtB,CAAC;EAED,oBACEO,IAAA,CAACR,WAAW;IACVsB,KAAK,EAAEI,KAAK,CAACK,WAAW,CAACT,KAAK,CAAE;IAChCU,QAAQ,EAAET,aAAc;IACxBO,SAAS,EAAEA,SAAU;IACrBH,KAAK,EAAE;MACLM,UAAU,EAAEN,KAAK,CAACM,UAAU;MAC5BC,QAAQ,EAAEP,KAAK,CAACO,QAAQ;MACxBC,UAAU,EAAER,KAAK,CAACQ,UAAU;MAC5BC,UAAU,EAAET,KAAK,CAACS,UAAU;MAC5BC,SAAS,EAAEhB,KAAK;MAChBiB,cAAc,EAAEpB,YAAY,CAACC,UAAU;IACzC,CAAE;IAAAL,QAAA,EAEDD,cAAc,CAACC,QAAQ,EAAEC,SAAS;EAAC,CACzB,CAAC;AAElB,CAAC","ignoreList":[]}
+{"version":3,"names":["Text","ComposeText","testID","testIdModifier","splitAccessibility","useAccessibilityModifiers","useSxModifiers","useAppTheme","useMemo","useHostGuard","jsx","_jsx","DECORATION","none","strikethrough","underline","applyTransform","children","transform","toUpperCase","toLowerCase","decorationOf","decoration","undefined","align","color","numberOfLines","variant","props","theme","style","typography","accessibility","sx","sxModifiers","accessibilityModifiers","modifiers","colorString","maxLines","fontFamily","fontSize","fontWeight","lineHeight","textAlign","textDecoration"],"sourceRoot":"../../../../src","sources":["atoms/text/text.android.tsx"],"mappings":";;AAAA,SAAQA,IAAI,IAAIC,WAAW,QAAO,0BAA0B;AAC5D,SAAQC,MAAM,IAAIC,cAAc,QAAO,oCAAoC;AAC3E,SAAQC,kBAAkB,EAAEC,yBAAyB,EAAEC,cAAc,QAAO,gBAAgB;AAC5F,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,OAAO,QAAO,OAAO;AAE7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,MAAMC,UAAU,GAAG;EACjBC,IAAI,EAAE,MAAM;EACZC,aAAa,EAAE,aAAa;EAC5BC,SAAS,EAAE;AACb,CAAU;AAEV,MAAMC,cAAc,GAAGA,CAACC,QAA+B,EAAEC,SAAoC,KAAK;EAChG,IAAI,CAACA,SAAS,IAAI,OAAOD,QAAQ,KAAK,QAAQ,EAAE;IAC9C,OAAOA,QAAQ;EACjB;EAEA,OAAOC,SAAS,KAAK,WAAW,GAAGD,QAAQ,CAACE,WAAW,CAAC,CAAC,GAAGF,QAAQ,CAACG,WAAW,CAAC,CAAC;AACpF,CAAC;AAED,MAAMC,YAAY,GAAIC,UAAsC,IAC1DA,UAAU,KAAKC,SAAS,GAAGA,SAAS,GAAGX,UAAU,CAACU,UAAU,CAAC;AAE/D,OAAO,MAAMtB,IAAmB,GAAGA,CAAC;EAClCwB,KAAK;EACLP,QAAQ;EACRQ,KAAK,GAAG,iBAAiB;EACzBH,UAAU;EACVI,aAAa;EACbxB,MAAM;EACNgB,SAAS;EACTS,OAAO,GAAG,MAAM;EAChB,GAAGC;AACM,CAAC,KAAK;EACfnB,YAAY,CAAC,MAAM,CAAC;EACpB,MAAMoB,KAAK,GAAGtB,WAAW,CAAC,CAAC;EAC3B,MAAMuB,KAAK,GAAGD,KAAK,CAACE,UAAU,CAACJ,OAAO,CAAC;EACvC,MAAM,CAACK,aAAa,EAAEC,EAAE,CAAC,GAAG7B,kBAAkB,CAACwB,KAAK,CAAC;EACrD,MAAMM,WAAW,GAAG5B,cAAc,CAAC2B,EAAE,CAAC;EACtC,MAAME,sBAAsB,GAAG9B,yBAAyB,CAAC2B,aAAa,CAAC;EACvE,MAAMI,SAAS,GAAG5B,OAAO,CACvB,MAAM,CAAC,GAAG0B,WAAW,EAAE,IAAIhC,MAAM,GAAG,CAACC,cAAc,CAACD,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,GAAGiC,sBAAsB,CAAC,EAC9F,CAACA,sBAAsB,EAAED,WAAW,EAAEhC,MAAM,CAC9C,CAAC;EAED,oBACES,IAAA,CAACV,WAAW;IACVwB,KAAK,EAAEI,KAAK,CAACQ,WAAW,CAACZ,KAAK,CAAE;IAChCa,QAAQ,EAAEZ,aAAc;IACxBU,SAAS,EAAEA,SAAU;IACrBN,KAAK,EAAE;MACLS,UAAU,EAAET,KAAK,CAACS,UAAU;MAC5BC,QAAQ,EAAEV,KAAK,CAACU,QAAQ;MACxBC,UAAU,EAAEX,KAAK,CAACW,UAAU;MAC5BC,UAAU,EAAEZ,KAAK,CAACY,UAAU;MAC5BC,SAAS,EAAEnB,KAAK;MAChBoB,cAAc,EAAEvB,YAAY,CAACC,UAAU;IACzC,CAAE;IAAAL,QAAA,EAEDD,cAAc,CAACC,QAAQ,EAAEC,SAAS;EAAC,CACzB,CAAC;AAElB,CAAC","ignoreList":[]}

package/lib/module/atoms/text/text.ios.js

@@ -3,7 +3,7 @@
 import { Text as SwiftUIText } from '@expo/ui/swift-ui';
 import { foregroundStyle, lineLimit, lineSpacing, multilineTextAlignment, strikethrough, textCase, underline } from '@expo/ui/swift-ui/modifiers';
 import { scaledFont } from '@hzblj/kara-native/swift-ui';
-import { useSxModifiers } from '@hzblj/kara-sx';
+import { splitAccessibility, useAccessibilityModifiers, useSxModifiers } from '@hzblj/kara-sx';
 import { useAppTheme } from '@hzblj/kara-theme';
 import { useMemo } from 'react';
 import { useHostGuard } from "../../host-context.js";
@@ -29,13 +29,15 @@ export const Text = ({
   testID,
   transform,
   variant = 'body',
-  ...sx
+  ...props
 }) => {
   useHostGuard('Text');
   const theme = useAppTheme();
   const style = theme.typography[variant];
   // After the text's own modifiers: the font and colour belong to the glyphs, the padding and frame to the box around.
+  const [accessibility, sx] = splitAccessibility(props);
   const sxModifiers = useSxModifiers(sx, FRAME_ALIGNMENT[align ?? 'left']);
+  const accessibilityModifiers = useAccessibilityModifiers(accessibility);
   const modifiers = useMemo(() => {
     const list = [
     // Not `@expo/ui`'s `font()`: for the platform's face it gives either Apple's size or a size that ignores Dynamic
@@ -67,8 +69,8 @@ export const Text = ({
     if (numberOfLines !== undefined) {
       list.push(lineLimit(numberOfLines));
     }
-    return [...list, ...sxModifiers];
-  }, [align, color, decoration, numberOfLines, style, sxModifiers, theme, transform]);
+    return [...list, ...sxModifiers, ...accessibilityModifiers];
+  }, [accessibilityModifiers, align, color, decoration, numberOfLines, style, sxModifiers, theme, transform]);
   return /*#__PURE__*/_jsx(SwiftUIText, {
     modifiers: modifiers,
     testID: testID,

package/lib/module/atoms/text/text.ios.js.map

@@ -1 +1 @@
-{"version":3,"names":["Text","SwiftUIText","foregroundStyle","lineLimit","lineSpacing","multilineTextAlignment","strikethrough","textCase","underline","scaledFont","useSxModifiers","useAppTheme","useMemo","useHostGuard","jsx","_jsx","ALIGNMENT","center","left","right","FRAME_ALIGNMENT","align","children","color","decoration","numberOfLines","testID","transform","variant","sx","theme","style","typography","sxModifiers","modifiers","list","family","fontFamily","size","fontSize","textStyle","scalesWith","weight","Math","max","lineHeight","push","isActive","pattern","undefined"],"sourceRoot":"../../../../src","sources":["atoms/text/text.ios.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Text","SwiftUIText","foregroundStyle","lineLimit","lineSpacing","multilineTextAlignment","strikethrough","textCase","underline","scaledFont","splitAccessibility","useAccessibilityModifiers","useSxModifiers","useAppTheme","useMemo","useHostGuard","jsx","_jsx","ALIGNMENT","center","left","right","FRAME_ALIGNMENT","align","children","color","decoration","numberOfLines","testID","transform","variant","props","theme","style","typography","accessibility","sx","sxModifiers","accessibilityModifiers","modifiers","list","family","fontFamily","size","fontSize","textStyle","scalesWith","weight","Math","max","lineHeight","push","isActive","pattern","undefined"],"sourceRoot":"../../../../src","sources":["atoms/text/text.ios.tsx"],"mappings":";;AAAA,SAAQA,IAAI,IAAIC,WAAW,QAAO,mBAAmB;AACrD,SACEC,eAAe,EACfC,SAAS,EACTC,WAAW,EAEXC,sBAAsB,EACtBC,aAAa,EACbC,QAAQ,EACRC,SAAS,QACJ,6BAA6B;AACpC,SAAQC,UAAU,QAAO,6BAA6B;AACtD,SAA6BC,kBAAkB,EAAEC,yBAAyB,EAAEC,cAAc,QAAO,gBAAgB;AACjH,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,OAAO,QAAO,OAAO;AAE7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,MAAMC,SAAS,GAAG;EAChBC,MAAM,EAAE,QAAQ;EAChBC,IAAI,EAAE,SAAS;EACfC,KAAK,EAAE;AACT,CAAU;;AAEV;AACA,MAAMC,eAAe,GAAG;EACtBH,MAAM,EAAE,QAAQ;EAChBC,IAAI,EAAE,SAAS;EACfC,KAAK,EAAE;AACT,CAAsD;AAEtD,OAAO,MAAMrB,IAAmB,GAAGA,CAAC;EAClCuB,KAAK;EACLC,QAAQ;EACRC,KAAK,GAAG,iBAAiB;EACzBC,UAAU;EACVC,aAAa;EACbC,MAAM;EACNC,SAAS;EACTC,OAAO,GAAG,MAAM;EAChB,GAAGC;AACM,CAAC,KAAK;EACfhB,YAAY,CAAC,MAAM,CAAC;EACpB,MAAMiB,KAAK,GAAGnB,WAAW,CAAC,CAAC;EAC3B,MAAMoB,KAAK,GAAGD,KAAK,CAACE,UAAU,CAACJ,OAAO,CAAC;EACvC;EACA,MAAM,CAACK,aAAa,EAAEC,EAAE,CAAC,GAAG1B,kBAAkB,CAACqB,KAAK,CAAC;EACrD,MAAMM,WAAW,GAAGzB,cAAc,CAACwB,EAAE,EAAEd,eAAe,CAACC,KAAK,IAAI,MAAM,CAAC,CAAC;EACxE,MAAMe,sBAAsB,GAAG3B,yBAAyB,CAACwB,aAAa,CAAC;EAEvE,MAAMI,SAAS,GAAGzB,OAAO,CAAC,MAAM;IAC9B,MAAM0B,IAAsB,GAAG;IAC7B;IACA;IACA/B,UAAU,CAAC;MAACgC,MAAM,EAAER,KAAK,CAACS,UAAU;MAAEC,IAAI,EAAEV,KAAK,CAACW,QAAQ;MAAEC,SAAS,EAAEZ,KAAK,CAACa,UAAU;MAAEC,MAAM,EAAEd,KAAK,CAACc;IAAM,CAAC,CAAC,EAC/G3C,WAAW,CAAC4C,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEhB,KAAK,CAACiB,UAAU,GAAGjB,KAAK,CAACW,QAAQ,CAAC,CAAC,EAC3D1C,eAAe,CAAC8B,KAAK,CAACP,KAAK,CAACA,KAAK,CAAC,CAAC,CACpC;IAED,IAAIF,KAAK,EAAE;MACTiB,IAAI,CAACW,IAAI,CAAC9C,sBAAsB,CAACa,SAAS,CAACK,KAAK,CAAC,CAAC,CAAC;IACrD;IAEA,IAAIM,SAAS,EAAE;MACbW,IAAI,CAACW,IAAI,CAAC5C,QAAQ,CAACsB,SAAS,CAAC,CAAC;IAChC;IAEA,IAAIH,UAAU,KAAK,WAAW,EAAE;MAC9Bc,IAAI,CAACW,IAAI,CAAC3C,SAAS,CAAC;QAAC4C,QAAQ,EAAE,IAAI;QAAEC,OAAO,EAAE;MAAO,CAAC,CAAC,CAAC;IAC1D;IAEA,IAAI3B,UAAU,KAAK,eAAe,EAAE;MAClCc,IAAI,CAACW,IAAI,CAAC7C,aAAa,CAAC;QAAC8C,QAAQ,EAAE,IAAI;QAAEC,OAAO,EAAE;MAAO,CAAC,CAAC,CAAC;IAC9D;IAEA,IAAI1B,aAAa,KAAK2B,SAAS,EAAE;MAC/Bd,IAAI,CAACW,IAAI,CAAChD,SAAS,CAACwB,aAAa,CAAC,CAAC;IACrC;IAEA,OAAO,CAAC,GAAGa,IAAI,EAAE,GAAGH,WAAW,EAAE,GAAGC,sBAAsB,CAAC;EAC7D,CAAC,EAAE,CAACA,sBAAsB,EAAEf,KAAK,EAAEE,KAAK,EAAEC,UAAU,EAAEC,aAAa,EAAEM,KAAK,EAAEI,WAAW,EAAEL,KAAK,EAAEH,SAAS,CAAC,CAAC;EAE3G,oBACEZ,IAAA,CAAChB,WAAW;IAACsC,SAAS,EAAEA,SAAU;IAACX,MAAM,EAAEA,MAAO;IAAAJ,QAAA,EAC/CA;EAAQ,CACE,CAAC;AAElB,CAAC","ignoreList":[]}

package/lib/module/atoms/v-stack/v-stack.ios.js

@@ -2,7 +2,7 @@
 
 import { VStack as SwiftUIVStack } from '@expo/ui/swift-ui';
 import { onTapGesture } from '@expo/ui/swift-ui/modifiers';
-import { useSxModifiers } from '@hzblj/kara-sx';
+import { splitAccessibility, useAccessibilityModifiers, useSxModifiers } from '@hzblj/kara-sx';
 import { spacing } from '@hzblj/kara-theme';
 import { useMemo } from 'react';
 import { useHostGuard } from "../../host-context.js";
@@ -18,11 +18,13 @@ export const VStack = ({
   onPress,
   spacing: gap,
   testID,
-  ...sx
+  ...props
 }) => {
   useHostGuard('VStack');
+  const [accessibility, sx] = splitAccessibility(props);
   const sxModifiers = useSxModifiers(sx, ALIGNMENT[align]);
-  const modifiers = useMemo(() => onPress ? [...sxModifiers, onTapGesture(onPress)] : sxModifiers, [onPress, sxModifiers]);
+  const accessibilityModifiers = useAccessibilityModifiers(accessibility, onPress !== undefined);
+  const modifiers = useMemo(() => [...sxModifiers, ...(onPress ? [onTapGesture(onPress)] : []), ...accessibilityModifiers], [accessibilityModifiers, onPress, sxModifiers]);
   return /*#__PURE__*/_jsx(SwiftUIVStack, {
     alignment: ALIGNMENT[align],
     modifiers: modifiers,

package/lib/module/atoms/v-stack/v-stack.ios.js.map

@@ -1 +1 @@
-{"version":3,"names":["VStack","SwiftUIVStack","onTapGesture","useSxModifiers","spacing","useMemo","useHostGuard","jsx","_jsx","ALIGNMENT","center","end","start","align","children","onPress","gap","testID","sx","sxModifiers","modifiers","alignment","undefined"],"sourceRoot":"../../../../src","sources":["atoms/v-stack/v-stack.ios.tsx"],"mappings":";;AAAA,SAAQA,MAAM,IAAIC,aAAa,QAAO,mBAAmB;AACzD,SAAQC,YAAY,QAAO,6BAA6B;AACxD,SAA6BC,cAAc,QAAO,gBAAgB;AAClE,SAAQC,OAAO,QAAO,mBAAmB;AACzC,SAAQC,OAAO,QAAO,OAAO;AAC7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,MAAMC,SAAS,GAAG;EAChBC,MAAM,EAAE,QAAQ;EAChBC,GAAG,EAAE,UAAU;EACfC,KAAK,EAAE;AACT,CAAwD;AAExD,OAAO,MAAMZ,MAAuB,GAAGA,CAAC;EACtCa,KAAK,GAAG,OAAO;EACfC,QAAQ;EACRC,OAAO;EACPX,OAAO,EAAEY,GAAG;EACZC,MAAM;EACN,GAAGC;AACQ,CAAC,KAAK;EACjBZ,YAAY,CAAC,QAAQ,CAAC;EACtB,MAAMa,WAAW,GAAGhB,cAAc,CAACe,EAAE,EAAET,SAAS,CAACI,KAAK,CAAC,CAAC;EACxD,MAAMO,SAAS,GAAGf,OAAO,CACvB,MAAOU,OAAO,GAAG,CAAC,GAAGI,WAAW,EAAEjB,YAAY,CAACa,OAAO,CAAC,CAAC,GAAGI,WAAY,EACvE,CAACJ,OAAO,EAAEI,WAAW,CACvB,CAAC;EAED,oBACEX,IAAA,CAACP,aAAa;IACZoB,SAAS,EAAEZ,SAAS,CAACI,KAAK,CAAE;IAC5BO,SAAS,EAAEA,SAAU;IACrBhB,OAAO,EAAEY,GAAG,KAAKM,SAAS,GAAGA,SAAS,GAAGlB,OAAO,CAACY,GAAG,CAAE;IACtDC,MAAM,EAAEA,MAAO;IAAAH,QAAA,EAEdA;EAAQ,CACI,CAAC;AAEpB,CAAC","ignoreList":[]}
+{"version":3,"names":["VStack","SwiftUIVStack","onTapGesture","splitAccessibility","useAccessibilityModifiers","useSxModifiers","spacing","useMemo","useHostGuard","jsx","_jsx","ALIGNMENT","center","end","start","align","children","onPress","gap","testID","props","accessibility","sx","sxModifiers","accessibilityModifiers","undefined","modifiers","alignment"],"sourceRoot":"../../../../src","sources":["atoms/v-stack/v-stack.ios.tsx"],"mappings":";;AAAA,SAAQA,MAAM,IAAIC,aAAa,QAAO,mBAAmB;AACzD,SAAQC,YAAY,QAAO,6BAA6B;AACxD,SAA6BC,kBAAkB,EAAEC,yBAAyB,EAAEC,cAAc,QAAO,gBAAgB;AACjH,SAAQC,OAAO,QAAO,mBAAmB;AACzC,SAAQC,OAAO,QAAO,OAAO;AAC7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,MAAMC,SAAS,GAAG;EAChBC,MAAM,EAAE,QAAQ;EAChBC,GAAG,EAAE,UAAU;EACfC,KAAK,EAAE;AACT,CAAwD;AAExD,OAAO,MAAMd,MAAuB,GAAGA,CAAC;EACtCe,KAAK,GAAG,OAAO;EACfC,QAAQ;EACRC,OAAO;EACPX,OAAO,EAAEY,GAAG;EACZC,MAAM;EACN,GAAGC;AACQ,CAAC,KAAK;EACjBZ,YAAY,CAAC,QAAQ,CAAC;EACtB,MAAM,CAACa,aAAa,EAAEC,EAAE,CAAC,GAAGnB,kBAAkB,CAACiB,KAAK,CAAC;EACrD,MAAMG,WAAW,GAAGlB,cAAc,CAACiB,EAAE,EAAEX,SAAS,CAACI,KAAK,CAAC,CAAC;EACxD,MAAMS,sBAAsB,GAAGpB,yBAAyB,CAACiB,aAAa,EAAEJ,OAAO,KAAKQ,SAAS,CAAC;EAC9F,MAAMC,SAAS,GAAGnB,OAAO,CACvB,MAAM,CAAC,GAAGgB,WAAW,EAAE,IAAIN,OAAO,GAAG,CAACf,YAAY,CAACe,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,GAAGO,sBAAsB,CAAC,EAC9F,CAACA,sBAAsB,EAAEP,OAAO,EAAEM,WAAW,CAC/C,CAAC;EAED,oBACEb,IAAA,CAACT,aAAa;IACZ0B,SAAS,EAAEhB,SAAS,CAACI,KAAK,CAAE;IAC5BW,SAAS,EAAEA,SAAU;IACrBpB,OAAO,EAAEY,GAAG,KAAKO,SAAS,GAAGA,SAAS,GAAGnB,OAAO,CAACY,GAAG,CAAE;IACtDC,MAAM,EAAEA,MAAO;IAAAH,QAAA,EAEdA;EAAQ,CACI,CAAC;AAEpB,CAAC","ignoreList":[]}

package/lib/module/atoms/z-stack/z-stack.ios.js

@@ -2,7 +2,7 @@
 
 import { ZStack as SwiftUIZStack } from '@expo/ui/swift-ui';
 import { onTapGesture } from '@expo/ui/swift-ui/modifiers';
-import { useSxModifiers } from '@hzblj/kara-sx';
+import { splitAccessibility, useAccessibilityModifiers, useSxModifiers } from '@hzblj/kara-sx';
 import { useMemo } from 'react';
 import { useHostGuard } from "../../host-context.js";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -16,11 +16,13 @@ export const ZStack = ({
   children,
   onPress,
   testID,
-  ...sx
+  ...props
 }) => {
   useHostGuard('ZStack');
+  const [accessibility, sx] = splitAccessibility(props);
   const sxModifiers = useSxModifiers(sx, ALIGNMENT[align]);
-  const modifiers = useMemo(() => onPress ? [...sxModifiers, onTapGesture(onPress)] : sxModifiers, [onPress, sxModifiers]);
+  const accessibilityModifiers = useAccessibilityModifiers(accessibility, onPress !== undefined);
+  const modifiers = useMemo(() => [...sxModifiers, ...(onPress ? [onTapGesture(onPress)] : []), ...accessibilityModifiers], [accessibilityModifiers, onPress, sxModifiers]);
   return /*#__PURE__*/_jsx(SwiftUIZStack, {
     alignment: ALIGNMENT[align],
     modifiers: modifiers,

package/lib/module/atoms/z-stack/z-stack.ios.js.map

@@ -1 +1 @@
-{"version":3,"names":["ZStack","SwiftUIZStack","onTapGesture","useSxModifiers","useMemo","useHostGuard","jsx","_jsx","ALIGNMENT","bottom","center","top","align","children","onPress","testID","sx","sxModifiers","modifiers","alignment"],"sourceRoot":"../../../../src","sources":["atoms/z-stack/z-stack.ios.tsx"],"mappings":";;AAAA,SAAQA,MAAM,IAAIC,aAAa,QAAO,mBAAmB;AACzD,SAAQC,YAAY,QAAO,6BAA6B;AACxD,SAA6BC,cAAc,QAAO,gBAAgB;AAClE,SAAQC,OAAO,QAAO,OAAO;AAC7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,MAAMC,SAAS,GAAG;EAChBC,MAAM,EAAE,QAAQ;EAChBC,MAAM,EAAE,QAAQ;EAChBC,GAAG,EAAE;AACP,CAAwD;AAExD,OAAO,MAAMX,MAAuB,GAAGA,CAAC;EAACY,KAAK,GAAG,QAAQ;EAAEC,QAAQ;EAAEC,OAAO;EAAEC,MAAM;EAAE,GAAGC;AAAe,CAAC,KAAK;EAC5GX,YAAY,CAAC,QAAQ,CAAC;EACtB,MAAMY,WAAW,GAAGd,cAAc,CAACa,EAAE,EAAER,SAAS,CAACI,KAAK,CAAC,CAAC;EACxD,MAAMM,SAAS,GAAGd,OAAO,CACvB,MAAOU,OAAO,GAAG,CAAC,GAAGG,WAAW,EAAEf,YAAY,CAACY,OAAO,CAAC,CAAC,GAAGG,WAAY,EACvE,CAACH,OAAO,EAAEG,WAAW,CACvB,CAAC;EAED,oBACEV,IAAA,CAACN,aAAa;IAACkB,SAAS,EAAEX,SAAS,CAACI,KAAK,CAAE;IAACM,SAAS,EAAEA,SAAU;IAACH,MAAM,EAAEA,MAAO;IAAAF,QAAA,EAC9EA;EAAQ,CACI,CAAC;AAEpB,CAAC","ignoreList":[]}
+{"version":3,"names":["ZStack","SwiftUIZStack","onTapGesture","splitAccessibility","useAccessibilityModifiers","useSxModifiers","useMemo","useHostGuard","jsx","_jsx","ALIGNMENT","bottom","center","top","align","children","onPress","testID","props","accessibility","sx","sxModifiers","accessibilityModifiers","undefined","modifiers","alignment"],"sourceRoot":"../../../../src","sources":["atoms/z-stack/z-stack.ios.tsx"],"mappings":";;AAAA,SAAQA,MAAM,IAAIC,aAAa,QAAO,mBAAmB;AACzD,SAAQC,YAAY,QAAO,6BAA6B;AACxD,SAA6BC,kBAAkB,EAAEC,yBAAyB,EAAEC,cAAc,QAAO,gBAAgB;AACjH,SAAQC,OAAO,QAAO,OAAO;AAC7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,MAAMC,SAAS,GAAG;EAChBC,MAAM,EAAE,QAAQ;EAChBC,MAAM,EAAE,QAAQ;EAChBC,GAAG,EAAE;AACP,CAAwD;AAExD,OAAO,MAAMb,MAAuB,GAAGA,CAAC;EAACc,KAAK,GAAG,QAAQ;EAAEC,QAAQ;EAAEC,OAAO;EAAEC,MAAM;EAAE,GAAGC;AAAkB,CAAC,KAAK;EAC/GX,YAAY,CAAC,QAAQ,CAAC;EACtB,MAAM,CAACY,aAAa,EAAEC,EAAE,CAAC,GAAGjB,kBAAkB,CAACe,KAAK,CAAC;EACrD,MAAMG,WAAW,GAAGhB,cAAc,CAACe,EAAE,EAAEV,SAAS,CAACI,KAAK,CAAC,CAAC;EACxD,MAAMQ,sBAAsB,GAAGlB,yBAAyB,CAACe,aAAa,EAAEH,OAAO,KAAKO,SAAS,CAAC;EAC9F,MAAMC,SAAS,GAAGlB,OAAO,CACvB,MAAM,CAAC,GAAGe,WAAW,EAAE,IAAIL,OAAO,GAAG,CAACd,YAAY,CAACc,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,GAAGM,sBAAsB,CAAC,EAC9F,CAACA,sBAAsB,EAAEN,OAAO,EAAEK,WAAW,CAC/C,CAAC;EAED,oBACEZ,IAAA,CAACR,aAAa;IAACwB,SAAS,EAAEf,SAAS,CAACI,KAAK,CAAE;IAACU,SAAS,EAAEA,SAAU;IAACP,MAAM,EAAEA,MAAO;IAAAF,QAAA,EAC9EA;EAAQ,CACI,CAAC;AAEpB,CAAC","ignoreList":[]}

package/lib/module/glyph/glyph.android.js

@@ -6,12 +6,14 @@ import { spacing, useAppTheme } from '@hzblj/kara-theme';
 import { jsx as _jsx } from "react/jsx-runtime";
 /** The Material Symbol `@hzblj/kara-native` ships as a drawable — inside a Compose host. */
 export const Glyph = ({
+  accessibilityLabel,
   color = 'content.primary',
   name,
   size = 's24'
 }) => {
   const theme = useAppTheme();
   return /*#__PURE__*/_jsx(DrawableIcon, {
+    accessibilityLabel: accessibilityLabel,
     iconColor: theme.color(color),
     iconSize: spacing[size],
     resourceName: GLYPHS[name].android

package/lib/module/glyph/glyph.android.js.map

@@ -1 +1 @@
-{"version":3,"names":["GLYPHS","DrawableIcon","spacing","useAppTheme","jsx","_jsx","Glyph","color","name","size","theme","iconColor","iconSize","resourceName","android"],"sourceRoot":"../../../src","sources":["glyph/glyph.android.tsx"],"mappings":";;AAAA,SAAQA,MAAM,QAAO,oBAAoB;AACzC,SAAQC,YAAY,QAAO,oCAAoC;AAC/D,SAAQC,OAAO,EAAEC,WAAW,QAAO,mBAAmB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAItD;AACA,OAAO,MAAMC,KAAqB,GAAGA,CAAC;EAACC,KAAK,GAAG,iBAAiB;EAAEC,IAAI;EAAEC,IAAI,GAAG;AAAiB,CAAC,KAAK;EACpG,MAAMC,KAAK,GAAGP,WAAW,CAAC,CAAC;EAE3B,oBAAOE,IAAA,CAACJ,YAAY;IAACU,SAAS,EAAED,KAAK,CAACH,KAAK,CAACA,KAAK,CAAE;IAACK,QAAQ,EAAEV,OAAO,CAACO,IAAI,CAAE;IAACI,YAAY,EAAEb,MAAM,CAACQ,IAAI,CAAC,CAACM;EAAQ,CAAE,CAAC;AACrH,CAAC","ignoreList":[]}
+{"version":3,"names":["GLYPHS","DrawableIcon","spacing","useAppTheme","jsx","_jsx","Glyph","accessibilityLabel","color","name","size","theme","iconColor","iconSize","resourceName","android"],"sourceRoot":"../../../src","sources":["glyph/glyph.android.tsx"],"mappings":";;AAAA,SAAQA,MAAM,QAAO,oBAAoB;AACzC,SAAQC,YAAY,QAAO,oCAAoC;AAC/D,SAAQC,OAAO,EAAEC,WAAW,QAAO,mBAAmB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAItD;AACA,OAAO,MAAMC,KAAqB,GAAGA,CAAC;EACpCC,kBAAkB;EAClBC,KAAK,GAAG,iBAAiB;EACzBC,IAAI;EACJC,IAAI,GAAG;AACG,CAAC,KAAK;EAChB,MAAMC,KAAK,GAAGR,WAAW,CAAC,CAAC;EAE3B,oBACEE,IAAA,CAACJ,YAAY;IACXM,kBAAkB,EAAEA,kBAAmB;IACvCK,SAAS,EAAED,KAAK,CAACH,KAAK,CAACA,KAAK,CAAE;IAC9BK,QAAQ,EAAEX,OAAO,CAACQ,IAAI,CAAE;IACxBI,YAAY,EAAEd,MAAM,CAACS,IAAI,CAAC,CAACM;EAAQ,CACpC,CAAC;AAEN,CAAC","ignoreList":[]}

package/lib/module/glyph/glyph.ios.js

@@ -1,22 +1,25 @@
 "use strict";
 
 import { Image } from '@expo/ui/swift-ui';
-import { accessibilityHidden } from '@expo/ui/swift-ui/modifiers';
+import { accessibilityHidden, accessibilityLabel as labelModifier } from '@expo/ui/swift-ui/modifiers';
 import { GLYPHS } from '@hzblj/kara-native';
 import { spacing, useAppTheme } from '@hzblj/kara-theme';
+import { useMemo } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 const DECORATIVE = [accessibilityHidden(true)];
 
 /** The SF Symbol the system already has — inside a SwiftUI host. */
 export const Glyph = ({
+  accessibilityLabel,
   color = 'content.primary',
   name,
   size = 's24'
 }) => {
   const theme = useAppTheme();
+  const modifiers = useMemo(() => accessibilityLabel ? [labelModifier(accessibilityLabel)] : DECORATIVE, [accessibilityLabel]);
   return /*#__PURE__*/_jsx(Image, {
     color: theme.color(color),
-    modifiers: DECORATIVE,
+    modifiers: modifiers,
     size: spacing[size],
     systemName: GLYPHS[name].ios
   });

package/lib/module/glyph/glyph.ios.js.map

@@ -1 +1 @@
-{"version":3,"names":["Image","accessibilityHidden","GLYPHS","spacing","useAppTheme","jsx","_jsx","DECORATIVE","Glyph","color","name","size","theme","modifiers","systemName","ios"],"sourceRoot":"../../../src","sources":["glyph/glyph.ios.tsx"],"mappings":";;AAAA,SAAQA,KAAK,QAAO,mBAAmB;AACvC,SAAQC,mBAAmB,QAAO,6BAA6B;AAC/D,SAAQC,MAAM,QAAO,oBAAoB;AACzC,SAAQC,OAAO,EAAEC,WAAW,QAAO,mBAAmB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAItD,MAAMC,UAAU,GAAG,CAACN,mBAAmB,CAAC,IAAI,CAAC,CAAC;;AAE9C;AACA,OAAO,MAAMO,KAAqB,GAAGA,CAAC;EAACC,KAAK,GAAG,iBAAiB;EAAEC,IAAI;EAAEC,IAAI,GAAG;AAAiB,CAAC,KAAK;EACpG,MAAMC,KAAK,GAAGR,WAAW,CAAC,CAAC;EAE3B,oBAAOE,IAAA,CAACN,KAAK;IAACS,KAAK,EAAEG,KAAK,CAACH,KAAK,CAACA,KAAK,CAAE;IAACI,SAAS,EAAEN,UAAW;IAACI,IAAI,EAAER,OAAO,CAACQ,IAAI,CAAE;IAACG,UAAU,EAAEZ,MAAM,CAACQ,IAAI,CAAC,CAACK;EAAI,CAAE,CAAC;AACvH,CAAC","ignoreList":[]}
+{"version":3,"names":["Image","accessibilityHidden","accessibilityLabel","labelModifier","GLYPHS","spacing","useAppTheme","useMemo","jsx","_jsx","DECORATIVE","Glyph","color","name","size","theme","modifiers","systemName","ios"],"sourceRoot":"../../../src","sources":["glyph/glyph.ios.tsx"],"mappings":";;AAAA,SAAQA,KAAK,QAAO,mBAAmB;AACvC,SAAQC,mBAAmB,EAAEC,kBAAkB,IAAIC,aAAa,QAAO,6BAA6B;AACpG,SAAQC,MAAM,QAAO,oBAAoB;AACzC,SAAQC,OAAO,EAAEC,WAAW,QAAO,mBAAmB;AACtD,SAAQC,OAAO,QAAO,OAAO;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAI7B,MAAMC,UAAU,GAAG,CAACT,mBAAmB,CAAC,IAAI,CAAC,CAAC;;AAE9C;AACA,OAAO,MAAMU,KAAqB,GAAGA,CAAC;EACpCT,kBAAkB;EAClBU,KAAK,GAAG,iBAAiB;EACzBC,IAAI;EACJC,IAAI,GAAG;AACG,CAAC,KAAK;EAChB,MAAMC,KAAK,GAAGT,WAAW,CAAC,CAAC;EAC3B,MAAMU,SAAS,GAAGT,OAAO,CACvB,MAAOL,kBAAkB,GAAG,CAACC,aAAa,CAACD,kBAAkB,CAAC,CAAC,GAAGQ,UAAW,EAC7E,CAACR,kBAAkB,CACrB,CAAC;EAED,oBAAOO,IAAA,CAACT,KAAK;IAACY,KAAK,EAAEG,KAAK,CAACH,KAAK,CAACA,KAAK,CAAE;IAACI,SAAS,EAAEA,SAAU;IAACF,IAAI,EAAET,OAAO,CAACS,IAAI,CAAE;IAACG,UAAU,EAAEb,MAAM,CAACS,IAAI,CAAC,CAACK;EAAI,CAAE,CAAC;AACtH,CAAC","ignoreList":[]}

package/lib/module/molecules/collapsible/collapsible.android.js

@@ -2,20 +2,28 @@
 
 import { AnimatedVisibility, Box, Column, Text as ComposeText, EnterTransition, ExitTransition, Row } from '@expo/ui/jetpack-compose';
 import { animated, clickable, defaultMinSize, fillMaxWidth, graphicsLayer, tween } from '@expo/ui/jetpack-compose/modifiers';
-import { duration, useAppTheme } from '@hzblj/kara-theme';
+import { useAccessibilityModifiers } from '@hzblj/kara-sx';
+import { duration, useAppTheme, useReducedMotion } from '@hzblj/kara-theme';
 import { useMemo } from 'react';
 import { Glyph } from "../../glyph/index.js";
 import { useHostGuard } from "../../host-context.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/** Material's standard easing, at the length a disclosure takes. */
+/** Material's standard easing, at the length a chevron turning takes. */
 const TURN = tween({
-  durationMillis: duration.d200,
+  durationMillis: duration.fast,
   easing: 'fastOutSlowIn'
 });
+const SNAP = tween({
+  durationMillis: duration.none
+});
 
 /** Down from the row, fading in — Compose's default grows from a corner, sideways as well as down. */
 const ENTER = EnterTransition.expandVertically().plus(EnterTransition.fadeIn());
 const EXIT = ExitTransition.shrinkVertically().plus(ExitTransition.fadeOut());
+
+/** With motion reduced (Compose follows the device's own setting, this `KaraProvider reduceMotion`): no growing. */
+const FADE_IN = EnterTransition.fadeIn();
+const FADE_OUT = ExitTransition.fadeOut();
 const WIDE = [fillMaxWidth()];
 
 /** Material's least touch target. */
@@ -34,12 +42,14 @@ export const Collapsible = ({
 }) => {
   useHostGuard('Collapsible');
   const theme = useAppTheme();
+  const reduced = useReducedMotion();
+  const accessibilityModifiers = useAccessibilityModifiers({}, true);
   const modifiers = useMemo(() => [fillMaxWidth(), defaultMinSize({
     minHeight: ROW_HEIGHT
-  }), clickable(() => onExpandedChange(!expanded))], [expanded, onExpandedChange]);
+  }), clickable(() => onExpandedChange(!expanded)), ...accessibilityModifiers], [accessibilityModifiers, expanded, onExpandedChange]);
   const turn = useMemo(() => [graphicsLayer({
-    rotationZ: animated(expanded ? 90 : 0, TURN)
-  })], [expanded]);
+    rotationZ: animated(expanded ? 90 : 0, reduced ? SNAP : TURN)
+  })], [expanded, reduced]);
   return /*#__PURE__*/_jsxs(Column, {
     modifiers: WIDE,
     children: [/*#__PURE__*/_jsxs(Row, {
@@ -58,8 +68,8 @@ export const Collapsible = ({
         })
       })]
     }), /*#__PURE__*/_jsx(AnimatedVisibility, {
-      enterTransition: ENTER,
-      exitTransition: EXIT,
+      enterTransition: reduced ? FADE_IN : ENTER,
+      exitTransition: reduced ? FADE_OUT : EXIT,
       visible: expanded,
       children: children
     })]