@hzblj/kara-components 0.17.0 → 0.19.0

package/lib/module/atoms/icon-button/icon-button.android.js

@@ -1,29 +1,72 @@
 "use strict";
 
-import { IconButton as ComposeIconButton } from '@expo/ui/jetpack-compose';
+import { IconButton as ComposeIconButton, FilledIconButton, FilledTonalIconButton, OutlinedIconButton } from '@expo/ui/jetpack-compose';
+import { testID as testIdModifier } from '@expo/ui/jetpack-compose/modifiers';
 import { useAccessibilityModifiers } from '@hzblj/kara-sx';
+import { useAppTheme } from '@hzblj/kara-theme';
+import { useMemo } from 'react';
 import { useHostGuard } from "../../host-context.js";
+import { buttonTokens, contentOnTint } from "../button/button-tokens.js";
 import { Icon } from "../icon/index.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+/** Material has no glass: `glass` is the tonal button, a contained one that still reads over a photo or a map. */
+const MATERIAL_BY_VARIANT = {
+  filled: FilledIconButton,
+  glass: FilledTonalIconButton,
+  outlined: OutlinedIconButton,
+  plain: ComposeIconButton,
+  tonal: FilledTonalIconButton
+};
+
+/** Which `Button` variant's tokens fill the container: the same accent and secondary fills a `Button` draws. */
+const FILL_BY_VARIANT = {
+  filled: 'accent',
+  glass: 'secondary',
+  outlined: undefined,
+  plain: undefined,
+  tonal: 'secondary'
+};
 export const IconButton = ({
   accessibilityHint,
   accessibilityLabel,
+  color,
   disabled = false,
   name,
-  onPress
+  onPress,
+  testID,
+  variant = 'plain'
 }) => {
   useHostGuard('IconButton');
+  const theme = useAppTheme();
   // The label rides on the icon, as Material's own icon buttons carry it; the hint labels the click.
-  const modifiers = useAccessibilityModifiers({
+  const accessibilityModifiers = useAccessibilityModifiers({
     accessibilityHint
   }, accessibilityHint !== undefined);
-  return /*#__PURE__*/_jsx(ComposeIconButton, {
+  const modifiers = useMemo(() => testID ? [testIdModifier(testID), ...accessibilityModifiers] : accessibilityModifiers, [accessibilityModifiers, testID]);
+  const MaterialIconButton = MATERIAL_BY_VARIANT[variant];
+  const fillVariant = FILL_BY_VARIANT[variant];
+  const tokens = fillVariant ? buttonTokens(fillVariant, disabled, theme) : undefined;
+
+  // `filled` takes the colour as its fill and picks the icon's on it, as a tinted `Button` does; the rest colour the icon.
+  const filled = variant === 'filled';
+  const fill = filled && color && !disabled ? color : tokens?.fill;
+  let iconColor = color ?? 'content.primary';
+  if (disabled) {
+    iconColor = 'btn.content.disabled';
+  } else if (filled) {
+    iconColor = color ? contentOnTint(color, theme) : 'content.on.accent';
+  }
+  return /*#__PURE__*/_jsx(MaterialIconButton, {
+    colors: fill ? {
+      containerColor: theme.color(fill),
+      disabledContainerColor: theme.color(fill)
+    } : undefined,
     enabled: !disabled,
     modifiers: modifiers,
     onClick: onPress,
     children: /*#__PURE__*/_jsx(Icon, {
       accessibilityLabel: accessibilityLabel,
-      color: disabled ? 'btn.content.disabled' : 'content.primary',
+      color: iconColor,
       name: name
     })
   });

package/lib/module/atoms/icon-button/icon-button.android.js.map

@@ -1 +1 @@
-{"version":3,"names":["IconButton","ComposeIconButton","useAccessibilityModifiers","useHostGuard","Icon","jsx","_jsx","accessibilityHint","accessibilityLabel","disabled","name","onPress","modifiers","undefined","enabled","onClick","children","color"],"sourceRoot":"../../../../src","sources":["atoms/icon-button/icon-button.android.tsx"],"mappings":";;AAAA,SAAQA,UAAU,IAAIC,iBAAiB,QAAO,0BAA0B;AACxE,SAAQC,yBAAyB,QAAO,gBAAgB;AAExD,SAAQC,YAAY,QAAO,uBAAoB;AAC/C,SAAQC,IAAI,QAAO,kBAAS;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG5B,OAAO,MAAMN,UAA+B,GAAGA,CAAC;EAC9CO,iBAAiB;EACjBC,kBAAkB;EAClBC,QAAQ,GAAG,KAAK;EAChBC,IAAI;EACJC;AACe,CAAC,KAAK;EACrBR,YAAY,CAAC,YAAY,CAAC;EAC1B;EACA,MAAMS,SAAS,GAAGV,yBAAyB,CAAC;IAACK;EAAiB,CAAC,EAAEA,iBAAiB,KAAKM,SAAS,CAAC;EAEjG,oBACEP,IAAA,CAACL,iBAAiB;IAACa,OAAO,EAAE,CAACL,QAAS;IAACG,SAAS,EAAEA,SAAU;IAACG,OAAO,EAAEJ,OAAQ;IAAAK,QAAA,eAC5EV,IAAA,CAACF,IAAI;MACHI,kBAAkB,EAAEA,kBAAmB;MACvCS,KAAK,EAAER,QAAQ,GAAG,sBAAsB,GAAG,iBAAkB;MAC7DC,IAAI,EAAEA;IAAK,CACZ;EAAC,CACe,CAAC;AAExB,CAAC","ignoreList":[]}
+{"version":3,"names":["IconButton","ComposeIconButton","FilledIconButton","FilledTonalIconButton","OutlinedIconButton","testID","testIdModifier","useAccessibilityModifiers","useAppTheme","useMemo","useHostGuard","buttonTokens","contentOnTint","Icon","jsx","_jsx","MATERIAL_BY_VARIANT","filled","glass","outlined","plain","tonal","FILL_BY_VARIANT","undefined","accessibilityHint","accessibilityLabel","color","disabled","name","onPress","variant","theme","accessibilityModifiers","modifiers","MaterialIconButton","fillVariant","tokens","fill","iconColor","colors","containerColor","disabledContainerColor","enabled","onClick","children"],"sourceRoot":"../../../../src","sources":["atoms/icon-button/icon-button.android.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/atoms/icon-button/icon-button.ios.js

@@ -1,52 +1,102 @@
 "use strict";
 
 import { Button } from '@expo/ui/swift-ui';
-import { buttonStyle, contentShape, disabled as disabledModifier, shapes } from '@expo/ui/swift-ui/modifiers';
+import { buttonBorderShape, buttonStyle, contentShape, disabled as disabledModifier, shapes, tint as tintModifier } from '@expo/ui/swift-ui/modifiers';
+import { isLiquidGlassAvailable } from '@hzblj/kara-native';
 import { useAccessibilityModifiers } from '@hzblj/kara-sx';
+import { useAppTheme } from '@hzblj/kara-theme';
 import { useMemo } from 'react';
 import { useHostGuard } from "../../host-context.js";
+import { contentOnTint } from "../button/button-tokens.js";
 import { Icon } from "../icon/index.js";
 import { ZStack } from "../z-stack/index.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 /** Apple's least tap target. Android's `IconButton` is Material's 48dp; this is the same idea in points. */
 const TARGET = 44;
 
+/** Material's 40dp container, the ring an `outlined` button draws inside its tap target. */
+const RING = 40;
+
 /** The whole square takes the tap, not only the glyph's own pixels. */
 const WHOLE_TARGET = {
   modifiers: [contentShape(shapes.circle())]
 };
+
+/**
+ * The SwiftUI style behind each variant. `outlined` has none (SwiftUI draws no ring around a button), so it is a plain
+ * button whose label draws the ring.
+ */
+const STYLE_BY_VARIANT = {
+  filled: 'borderedProminent',
+  glass: 'glass',
+  outlined: 'plain',
+  plain: 'plain',
+  tonal: 'bordered'
+};
 export const IconButton = ({
   accessibilityHint,
   accessibilityLabel,
+  color,
   disabled = false,
   name,
   onPress,
-  testID
+  testID,
+  variant = 'plain'
 }) => {
   useHostGuard('IconButton');
+  const theme = useAppTheme();
   const accessibilityModifiers = useAccessibilityModifiers({
     accessibilityHint
   });
+  // Below iOS 26 `@expo/ui` turns `.glass` into `.automatic`, a bare icon; the tonal circle is what Android draws too.
+  const style = variant === 'glass' && !isLiquidGlassAvailable() ? 'bordered' : STYLE_BY_VARIANT[variant];
+  const bezel = style !== 'plain';
+
+  /**
+   * `filled` takes the colour as its fill, and the icon a colour that reads on it. `tonal` passes it as the tint too,
+   * which SwiftUI's bordered style draws its pale circle in. SwiftUI dims a disabled button's label itself, and greys a
+   * prominent one's fill, so a disabled filled icon goes back to the primary content colour rather than white on grey.
+   */
+  const fill = variant === 'filled' ? color ?? 'fill.accent.primary' : undefined;
+  const tint = fill ?? (variant === 'tonal' ? color : undefined);
+  const iconColor = fill ? disabled ? 'content.primary' : color ? contentOnTint(color, theme) : 'content.on.accent' : color ?? 'content.primary';
   const modifiers = useMemo(() => {
-    const list = [buttonStyle('plain'), ...accessibilityModifiers];
+    const list = [buttonStyle(style)];
+    if (bezel) {
+      list.push(buttonBorderShape('circle'));
+    }
+    if (tint) {
+      list.push(tintModifier(theme.color(tint)));
+    }
+    list.push(...accessibilityModifiers);
     if (disabled) {
       list.push(disabledModifier(true));
     }
     return list;
-  }, [accessibilityModifiers, disabled]);
+  }, [accessibilityModifiers, bezel, disabled, style, theme, tint]);
+
+  // A bezel style sizes its circle around the icon itself; a plain button's label is the whole target.
+  const icon = /*#__PURE__*/_jsx(Icon, {
+    accessibilityLabel: accessibilityLabel,
+    color: iconColor,
+    name: name
+  });
   return /*#__PURE__*/_jsx(Button, {
     modifiers: modifiers,
     onPress: onPress,
     testID: testID,
-    children: /*#__PURE__*/_jsx(ZStack, {
+    children: bezel ? icon : /*#__PURE__*/_jsx(ZStack, {
       h: TARGET,
       ios: WHOLE_TARGET,
       w: TARGET,
-      children: /*#__PURE__*/_jsx(Icon, {
-        accessibilityLabel: accessibilityLabel,
-        color: "content.primary",
-        name: name
-      })
+      children: variant === 'outlined' ? /*#__PURE__*/_jsx(ZStack, {
+        borderColor: "border.secondary.base",
+        borderRadius: "full",
+        borderWidth: 1,
+        h: RING,
+        w: RING,
+        children: icon
+      }) : icon
     })
   });
 };

package/lib/module/atoms/icon-button/icon-button.ios.js.map

@@ -1 +1 @@
-{"version":3,"names":["Button","buttonStyle","contentShape","disabled","disabledModifier","shapes","useAccessibilityModifiers","useMemo","useHostGuard","Icon","ZStack","jsx","_jsx","TARGET","WHOLE_TARGET","modifiers","circle","IconButton","accessibilityHint","accessibilityLabel","name","onPress","testID","accessibilityModifiers","list","push","children","h","ios","w","color"],"sourceRoot":"../../../../src","sources":["atoms/icon-button/icon-button.ios.tsx"],"mappings":";;AAAA,SAAQA,MAAM,QAAO,mBAAmB;AACxC,SAAQC,WAAW,EAAEC,YAAY,EAAEC,QAAQ,IAAIC,gBAAgB,EAAEC,MAAM,QAAO,6BAA6B;AAC3G,SAAQC,yBAAyB,QAAO,gBAAgB;AACxD,SAAQC,OAAO,QAAO,OAAO;AAE7B,SAAQC,YAAY,QAAO,uBAAoB;AAC/C,SAAQC,IAAI,QAAO,kBAAS;AAC5B,SAAQC,MAAM,QAAO,qBAAY;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAGjC;AACA,MAAMC,MAAM,GAAG,EAAE;;AAEjB;AACA,MAAMC,YAAY,GAAG;EAACC,SAAS,EAAE,CAACb,YAAY,CAACG,MAAM,CAACW,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC;AAEjE,OAAO,MAAMC,UAA+B,GAAGA,CAAC;EAC9CC,iBAAiB;EACjBC,kBAAkB;EAClBhB,QAAQ,GAAG,KAAK;EAChBiB,IAAI;EACJC,OAAO;EACPC;AACe,CAAC,KAAK;EACrBd,YAAY,CAAC,YAAY,CAAC;EAC1B,MAAMe,sBAAsB,GAAGjB,yBAAyB,CAAC;IAACY;EAAiB,CAAC,CAAC;EAE7E,MAAMH,SAAS,GAAGR,OAAO,CAAC,MAAM;IAC9B,MAAMiB,IAAI,GAAG,CAACvB,WAAW,CAAC,OAAO,CAAC,EAAE,GAAGsB,sBAAsB,CAAC;IAE9D,IAAIpB,QAAQ,EAAE;MACZqB,IAAI,CAACC,IAAI,CAACrB,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACnC;IAEA,OAAOoB,IAAI;EACb,CAAC,EAAE,CAACD,sBAAsB,EAAEpB,QAAQ,CAAC,CAAC;EAEtC,oBACES,IAAA,CAACZ,MAAM;IAACe,SAAS,EAAEA,SAAU;IAACM,OAAO,EAAEA,OAAQ;IAACC,MAAM,EAAEA,MAAO;IAAAI,QAAA,eAC7Dd,IAAA,CAACF,MAAM;MAACiB,CAAC,EAAEd,MAAO;MAACe,GAAG,EAAEd,YAAa;MAACe,CAAC,EAAEhB,MAAO;MAAAa,QAAA,eAE9Cd,IAAA,CAACH,IAAI;QAACU,kBAAkB,EAAEA,kBAAmB;QAACW,KAAK,EAAC,iBAAiB;QAACV,IAAI,EAAEA;MAAK,CAAE;IAAC,CAC9E;EAAC,CACH,CAAC;AAEb,CAAC","ignoreList":[]}
+{"version":3,"names":["Button","buttonBorderShape","buttonStyle","contentShape","disabled","disabledModifier","shapes","tint","tintModifier","isLiquidGlassAvailable","useAccessibilityModifiers","useAppTheme","useMemo","useHostGuard","contentOnTint","Icon","ZStack","jsx","_jsx","TARGET","RING","WHOLE_TARGET","modifiers","circle","STYLE_BY_VARIANT","filled","glass","outlined","plain","tonal","IconButton","accessibilityHint","accessibilityLabel","color","name","onPress","testID","variant","theme","accessibilityModifiers","style","bezel","fill","undefined","iconColor","list","push","icon","children","h","ios","w","borderColor","borderRadius","borderWidth"],"sourceRoot":"../../../../src","sources":["atoms/icon-button/icon-button.ios.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -1,31 +1,59 @@
 "use strict";
 
 import { LazyColumn, PullToRefreshBox } from '@expo/ui/jetpack-compose';
+import { testID as testIdModifier } from '@expo/ui/jetpack-compose/modifiers';
 import { useSxModifiers } from '@hzblj/kara-sx';
-import { Children, Fragment, isValidElement } from 'react';
+import { spacing } from '@hzblj/kara-theme';
+import { Children, Fragment, isValidElement, useMemo } from 'react';
 import { useHostGuard } from "../../host-context.js";
 import { useRefreshState } from "../../use-refresh-state.js";
+import { Card } from "../card/index.js";
 import { Divider } from "../divider/index.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /** A divider between rows, the separator SwiftUI's `List` draws on its own — so rows are written the same for both. */
 const withSeparators = children => Children.toArray(children).map((child, index) => /*#__PURE__*/_jsxs(Fragment, {
   children: [index > 0 ? /*#__PURE__*/_jsx(Divider, {}) : null, child]
 }, /*#__PURE__*/isValidElement(child) && child.key !== null ? child.key : index));
+
+/** The card's inset from the column's edges, as `Form` keeps its cards off the screen's. */
+const INSET = {
+  bottom: spacing.s16,
+  end: spacing.s16,
+  start: spacing.s16,
+  top: spacing.s16
+};
+
+/**
+ * `plain` is the column as it always was. `insetGrouped` sets the rows in one `Card`, the way `Form` draws a section,
+ * inset by the column's content padding: the card is a single item of the column, so its rows are composed together
+ * rather than as they scroll in. A long list that wants laziness stays `plain`.
+ */
 export const List = ({
   children,
-  onRefresh
+  onRefresh,
+  separators = true,
+  testID,
+  variant = 'plain'
 }) => {
   useHostGuard('List');
-  const modifiers = useSxModifiers({
+  const sxModifiers = useSxModifiers({
     wide: true
   });
+  // On the column, not the refresh box around it: the column is what scrolls.
+  const modifiers = useMemo(() => testID ? [...sxModifiers, testIdModifier(testID)] : sxModifiers, [sxModifiers, testID]);
   const {
     isRefreshing,
     refresh
   } = useRefreshState(onRefresh);
+  const rows = separators ? withSeparators(children) : children;
+  const grouped = variant === 'insetGrouped';
   const column = /*#__PURE__*/_jsx(LazyColumn, {
+    contentPadding: grouped ? INSET : undefined,
     modifiers: modifiers,
-    children: withSeparators(children)
+    children: grouped && Children.toArray(children).length > 0 ? /*#__PURE__*/_jsx(Card, {
+      wide: true,
+      children: rows
+    }) : rows
   });
   if (!onRefresh) {
     return column;

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

@@ -1 +1 @@
-{"version":3,"names":["LazyColumn","PullToRefreshBox","useSxModifiers","Children","Fragment","isValidElement","useHostGuard","useRefreshState","Divider","jsx","_jsx","jsxs","_jsxs","withSeparators","children","toArray","map","child","index","key","List","onRefresh","modifiers","wide","isRefreshing","refresh","column"],"sourceRoot":"../../../../src","sources":["atoms/list/list.android.tsx"],"mappings":";;AAAA,SAAQA,UAAU,EAAEC,gBAAgB,QAAO,0BAA0B;AACrE,SAAQC,cAAc,QAAO,gBAAgB;AAC7C,SAAQC,QAAQ,EAAEC,QAAQ,EAAEC,cAAc,QAAO,OAAO;AACxD,SAAQC,YAAY,QAAO,uBAAoB;AAC/C,SAAQC,eAAe,QAAO,4BAAyB;AACvD,SAAQC,OAAO,QAAO,qBAAY;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAGlC;AACA,MAAMC,cAAc,GAAIC,QAA+B,IACrDX,QAAQ,CAACY,OAAO,CAACD,QAAQ,CAAC,CAACE,GAAG,CAAC,CAACC,KAAK,EAAEC,KAAK,kBAC1CN,KAAA,CAACR,QAAQ;EAAAU,QAAA,GACNI,KAAK,GAAG,CAAC,gBAAGR,IAAA,CAACF,OAAO,IAAE,CAAC,GAAG,IAAI,EAC9BS,KAAK;AAAA,GAFO,aAAAZ,cAAc,CAACY,KAAK,CAAC,IAAIA,KAAK,CAACE,GAAG,KAAK,IAAI,GAAGF,KAAK,CAACE,GAAG,GAAGD,KAG/D,CACX,CAAC;AAEJ,OAAO,MAAME,IAAmB,GAAGA,CAAC;EAACN,QAAQ;EAAEO;AAAoB,CAAC,KAAK;EACvEf,YAAY,CAAC,MAAM,CAAC;EACpB,MAAMgB,SAAS,GAAGpB,cAAc,CAAC;IAACqB,IAAI,EAAE;EAAI,CAAC,CAAC;EAC9C,MAAM;IAACC,YAAY;IAAEC;EAAO,CAAC,GAAGlB,eAAe,CAACc,SAAS,CAAC;EAE1D,MAAMK,MAAM,gBAAGhB,IAAA,CAACV,UAAU;IAACsB,SAAS,EAAEA,SAAU;IAAAR,QAAA,EAAED,cAAc,CAACC,QAAQ;EAAC,CAAa,CAAC;EAExF,IAAI,CAACO,SAAS,EAAE;IACd,OAAOK,MAAM;EACf;EAEA,oBACEhB,IAAA,CAACT,gBAAgB;IAACuB,YAAY,EAAEA,YAAa;IAACH,SAAS,EAAEI,OAAQ;IAAAX,QAAA,EAC9DY;EAAM,CACS,CAAC;AAEvB,CAAC","ignoreList":[]}
+{"version":3,"names":["LazyColumn","PullToRefreshBox","testID","testIdModifier","useSxModifiers","spacing","Children","Fragment","isValidElement","useMemo","useHostGuard","useRefreshState","Card","Divider","jsx","_jsx","jsxs","_jsxs","withSeparators","children","toArray","map","child","index","key","INSET","bottom","s16","end","start","top","List","onRefresh","separators","variant","sxModifiers","wide","modifiers","isRefreshing","refresh","rows","grouped","column","contentPadding","undefined","length"],"sourceRoot":"../../../../src","sources":["atoms/list/list.android.tsx"],"mappings":";;AAAA,SAAQA,UAAU,EAAEC,gBAAgB,QAAO,0BAA0B;AACrE,SAAQC,MAAM,IAAIC,cAAc,QAAO,oCAAoC;AAC3E,SAAQC,cAAc,QAAO,gBAAgB;AAC7C,SAAQC,OAAO,QAAO,mBAAmB;AACzC,SAAQC,QAAQ,EAAEC,QAAQ,EAAEC,cAAc,EAAEC,OAAO,QAAO,OAAO;AACjE,SAAQC,YAAY,QAAO,uBAAoB;AAC/C,SAAQC,eAAe,QAAO,4BAAyB;AACvD,SAAQC,IAAI,QAAO,kBAAS;AAC5B,SAAQC,OAAO,QAAO,qBAAY;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAGlC;AACA,MAAMC,cAAc,GAAIC,QAA+B,IACrDb,QAAQ,CAACc,OAAO,CAACD,QAAQ,CAAC,CAACE,GAAG,CAAC,CAACC,KAAK,EAAEC,KAAK,kBAC1CN,KAAA,CAACV,QAAQ;EAAAY,QAAA,GACNI,KAAK,GAAG,CAAC,gBAAGR,IAAA,CAACF,OAAO,IAAE,CAAC,GAAG,IAAI,EAC9BS,KAAK;AAAA,GAFO,aAAAd,cAAc,CAACc,KAAK,CAAC,IAAIA,KAAK,CAACE,GAAG,KAAK,IAAI,GAAGF,KAAK,CAACE,GAAG,GAAGD,KAG/D,CACX,CAAC;;AAEJ;AACA,MAAME,KAAK,GAAG;EAACC,MAAM,EAAErB,OAAO,CAACsB,GAAG;EAAEC,GAAG,EAAEvB,OAAO,CAACsB,GAAG;EAAEE,KAAK,EAAExB,OAAO,CAACsB,GAAG;EAAEG,GAAG,EAAEzB,OAAO,CAACsB;AAAG,CAAC;;AAE3F;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMI,IAAmB,GAAGA,CAAC;EAACZ,QAAQ;EAAEa,SAAS;EAAEC,UAAU,GAAG,IAAI;EAAE/B,MAAM;EAAEgC,OAAO,GAAG;AAAkB,CAAC,KAAK;EACrHxB,YAAY,CAAC,MAAM,CAAC;EACpB,MAAMyB,WAAW,GAAG/B,cAAc,CAAC;IAACgC,IAAI,EAAE;EAAI,CAAC,CAAC;EAChD;EACA,MAAMC,SAAS,GAAG5B,OAAO,CACvB,MAAOP,MAAM,GAAG,CAAC,GAAGiC,WAAW,EAAEhC,cAAc,CAACD,MAAM,CAAC,CAAC,GAAGiC,WAAY,EACvE,CAACA,WAAW,EAAEjC,MAAM,CACtB,CAAC;EACD,MAAM;IAACoC,YAAY;IAAEC;EAAO,CAAC,GAAG5B,eAAe,CAACqB,SAAS,CAAC;EAC1D,MAAMQ,IAAI,GAAGP,UAAU,GAAGf,cAAc,CAACC,QAAQ,CAAC,GAAGA,QAAQ;EAC7D,MAAMsB,OAAO,GAAGP,OAAO,KAAK,cAAc;EAE1C,MAAMQ,MAAM,gBACV3B,IAAA,CAACf,UAAU;IAAC2C,cAAc,EAAEF,OAAO,GAAGhB,KAAK,GAAGmB,SAAU;IAACP,SAAS,EAAEA,SAAU;IAAAlB,QAAA,EAC3EsB,OAAO,IAAInC,QAAQ,CAACc,OAAO,CAACD,QAAQ,CAAC,CAAC0B,MAAM,GAAG,CAAC,gBAAG9B,IAAA,CAACH,IAAI;MAACwB,IAAI;MAAAjB,QAAA,EAAEqB;IAAI,CAAO,CAAC,GAAGA;EAAI,CACzE,CACb;EAED,IAAI,CAACR,SAAS,EAAE;IACd,OAAOU,MAAM;EACf;EAEA,oBACE3B,IAAA,CAACd,gBAAgB;IAACqC,YAAY,EAAEA,YAAa;IAACN,SAAS,EAAEO,OAAQ;IAAApB,QAAA,EAC9DuB;EAAM,CACS,CAAC;AAEvB,CAAC","ignoreList":[]}

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

@@ -1,21 +1,31 @@
 "use strict";
 
-import { List as SwiftUIList } from '@expo/ui/swift-ui';
-import { refreshable } from '@expo/ui/swift-ui/modifiers';
+import { Group, List as SwiftUIList } from '@expo/ui/swift-ui';
+import { listRowSeparator, listStyle, refreshable } from '@expo/ui/swift-ui/modifiers';
 import { useMemo } from 'react';
 import { useHostGuard } from "../../host-context.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * `listRowSeparator` is a row's preference, not the list's: set on the `List` it reaches no row. A `Group` hands a
+ * modifier to each of its children, so the rows go in one, and each of them hides its own separator.
+ */
+const NO_SEPARATORS = [listRowSeparator('hidden')];
 export const List = ({
   children,
   onRefresh,
-  testID
+  separators = true,
+  testID,
+  variant = 'insetGrouped'
 }) => {
   useHostGuard('List');
-  const modifiers = useMemo(() => onRefresh ? [refreshable(onRefresh)] : [], [onRefresh]);
+  const modifiers = useMemo(() => [listStyle(variant), ...(onRefresh ? [refreshable(onRefresh)] : [])], [onRefresh, variant]);
   return /*#__PURE__*/_jsx(SwiftUIList, {
     modifiers: modifiers,
     testID: testID,
-    children: children
+    children: separators ? children : /*#__PURE__*/_jsx(Group, {
+      modifiers: NO_SEPARATORS,
+      children: children
+    })
   });
 };
 //# sourceMappingURL=list.ios.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["List","SwiftUIList","refreshable","useMemo","useHostGuard","jsx","_jsx","children","onRefresh","testID","modifiers"],"sourceRoot":"../../../../src","sources":["atoms/list/list.ios.tsx"],"mappings":";;AAAA,SAAQA,IAAI,IAAIC,WAAW,QAAO,mBAAmB;AACrD,SAA6BC,WAAW,QAAO,6BAA6B;AAC5E,SAAQC,OAAO,QAAO,OAAO;AAE7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,OAAO,MAAMN,IAAmB,GAAGA,CAAC;EAACO,QAAQ;EAAEC,SAAS;EAAEC;AAAiB,CAAC,KAAK;EAC/EL,YAAY,CAAC,MAAM,CAAC;EAEpB,MAAMM,SAAS,GAAGP,OAAO,CAAmB,MAAOK,SAAS,GAAG,CAACN,WAAW,CAACM,SAAS,CAAC,CAAC,GAAG,EAAG,EAAE,CAACA,SAAS,CAAC,CAAC;EAE3G,oBACEF,IAAA,CAACL,WAAW;IAACS,SAAS,EAAEA,SAAU;IAACD,MAAM,EAAEA,MAAO;IAAAF,QAAA,EAC/CA;EAAQ,CACE,CAAC;AAElB,CAAC","ignoreList":[]}
+{"version":3,"names":["Group","List","SwiftUIList","listRowSeparator","listStyle","refreshable","useMemo","useHostGuard","jsx","_jsx","NO_SEPARATORS","children","onRefresh","separators","testID","variant","modifiers"],"sourceRoot":"../../../../src","sources":["atoms/list/list.ios.tsx"],"mappings":";;AAAA,SAAQA,KAAK,EAAEC,IAAI,IAAIC,WAAW,QAAO,mBAAmB;AAC5D,SAAQC,gBAAgB,EAAEC,SAAS,EAAuBC,WAAW,QAAO,6BAA6B;AACzG,SAAQC,OAAO,QAAO,OAAO;AAE7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C;AACA;AACA;AACA;AACA,MAAMC,aAAa,GAAG,CAACP,gBAAgB,CAAC,QAAQ,CAAC,CAAC;AAElD,OAAO,MAAMF,IAAmB,GAAGA,CAAC;EAClCU,QAAQ;EACRC,SAAS;EACTC,UAAU,GAAG,IAAI;EACjBC,MAAM;EACNC,OAAO,GAAG;AACD,CAAC,KAAK;EACfR,YAAY,CAAC,MAAM,CAAC;EAEpB,MAAMS,SAAS,GAAGV,OAAO,CACvB,MAAM,CAACF,SAAS,CAACW,OAAO,CAAC,EAAE,IAAIH,SAAS,GAAG,CAACP,WAAW,CAACO,SAAS,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAC1E,CAACA,SAAS,EAAEG,OAAO,CACrB,CAAC;EAED,oBACEN,IAAA,CAACP,WAAW;IAACc,SAAS,EAAEA,SAAU;IAACF,MAAM,EAAEA,MAAO;IAAAH,QAAA,EAC/CE,UAAU,GAAGF,QAAQ,gBAAGF,IAAA,CAACT,KAAK;MAACgB,SAAS,EAAEN,aAAc;MAAAC,QAAA,EAAEA;IAAQ,CAAQ;EAAC,CACjE,CAAC;AAElB,CAAC","ignoreList":[]}

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

@@ -1,32 +1,46 @@
 "use strict";
 
 import { CircularProgressIndicator, LinearProgressIndicator } from '@expo/ui/jetpack-compose';
+import { testID as testIdModifier } from '@expo/ui/jetpack-compose/modifiers';
 import { useAccessibilityModifiers } from '@hzblj/kara-sx';
-import { useAppTheme } from '@hzblj/kara-theme';
+import { useAppTheme, withOpacity } from '@hzblj/kara-theme';
+import { useMemo } from 'react';
 import { useHostGuard } from "../../host-context.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * Material draws the track in the seeded scheme's `secondaryContainer`, a pale accent: under a red or a green bar it
+ * would read as a second colour. Any other colour gets its own faded track instead, the way the accent's is pale; the
+ * accent keeps Material's. An indeterminate ring has no track in Material, so it is left without one.
+ */
 export const Progress = ({
   accessibilityLabel,
   circular = false,
+  color = 'fill.accent.primary',
+  testID,
   value
 }) => {
   useHostGuard('Progress');
   const theme = useAppTheme();
-  const color = theme.color('fill.accent.primary');
-  const modifiers = useAccessibilityModifiers({
+  const indicator = theme.color(color);
+  // The website reads the default above from the source, so it stays a literal rather than a shared constant.
+  const track = color === 'fill.accent.primary' ? undefined : withOpacity(String(indicator), 'o20');
+  const accessibilityModifiers = useAccessibilityModifiers({
     accessibilityLabel
   });
+  const modifiers = useMemo(() => testID ? [testIdModifier(testID), ...accessibilityModifiers] : accessibilityModifiers, [accessibilityModifiers, testID]);
   if (circular) {
     return /*#__PURE__*/_jsx(CircularProgressIndicator, {
-      color: color,
+      color: indicator,
       modifiers: modifiers,
-      progress: value
+      progress: value,
+      trackColor: value === undefined ? undefined : track
     });
   }
   return /*#__PURE__*/_jsx(LinearProgressIndicator, {
-    color: color,
+    color: indicator,
     modifiers: modifiers,
-    progress: value
+    progress: value,
+    trackColor: track
   });
 };
 //# sourceMappingURL=progress.android.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["CircularProgressIndicator","LinearProgressIndicator","useAccessibilityModifiers","useAppTheme","useHostGuard","jsx","_jsx","Progress","accessibilityLabel","circular","value","theme","color","modifiers","progress"],"sourceRoot":"../../../../src","sources":["atoms/progress/progress.android.tsx"],"mappings":";;AAAA,SAAQA,yBAAyB,EAAEC,uBAAuB,QAAO,0BAA0B;AAC3F,SAAQC,yBAAyB,QAAO,gBAAgB;AACxD,SAAQC,WAAW,QAAO,mBAAmB;AAE7C,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,OAAO,MAAMC,QAA2B,GAAGA,CAAC;EAACC,kBAAkB;EAAEC,QAAQ,GAAG,KAAK;EAAEC;AAAoB,CAAC,KAAK;EAC3GN,YAAY,CAAC,UAAU,CAAC;EACxB,MAAMO,KAAK,GAAGR,WAAW,CAAC,CAAC;EAC3B,MAAMS,KAAK,GAAGD,KAAK,CAACC,KAAK,CAAC,qBAAqB,CAAC;EAChD,MAAMC,SAAS,GAAGX,yBAAyB,CAAC;IAACM;EAAkB,CAAC,CAAC;EAEjE,IAAIC,QAAQ,EAAE;IACZ,oBAAOH,IAAA,CAACN,yBAAyB;MAACY,KAAK,EAAEA,KAAM;MAACC,SAAS,EAAEA,SAAU;MAACC,QAAQ,EAAEJ;IAAM,CAAE,CAAC;EAC3F;EAEA,oBAAOJ,IAAA,CAACL,uBAAuB;IAACW,KAAK,EAAEA,KAAM;IAACC,SAAS,EAAEA,SAAU;IAACC,QAAQ,EAAEJ;EAAM,CAAE,CAAC;AACzF,CAAC","ignoreList":[]}
+{"version":3,"names":["CircularProgressIndicator","LinearProgressIndicator","testID","testIdModifier","useAccessibilityModifiers","useAppTheme","withOpacity","useMemo","useHostGuard","jsx","_jsx","Progress","accessibilityLabel","circular","color","value","theme","indicator","track","undefined","String","accessibilityModifiers","modifiers","progress","trackColor"],"sourceRoot":"../../../../src","sources":["atoms/progress/progress.android.tsx"],"mappings":";;AAAA,SAAQA,yBAAyB,EAAEC,uBAAuB,QAAO,0BAA0B;AAC3F,SAAQC,MAAM,IAAIC,cAAc,QAAO,oCAAoC;AAC3E,SAAQC,yBAAyB,QAAO,gBAAgB;AACxD,SAAQC,WAAW,EAAEC,WAAW,QAAO,mBAAmB;AAC1D,SAAQC,OAAO,QAAO,OAAO;AAE7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,QAA2B,GAAGA,CAAC;EAC1CC,kBAAkB;EAClBC,QAAQ,GAAG,KAAK;EAChBC,KAAK,GAAG,qBAAqB;EAC7BZ,MAAM;EACNa;AACa,CAAC,KAAK;EACnBP,YAAY,CAAC,UAAU,CAAC;EACxB,MAAMQ,KAAK,GAAGX,WAAW,CAAC,CAAC;EAC3B,MAAMY,SAAS,GAAGD,KAAK,CAACF,KAAK,CAACA,KAAK,CAAC;EACpC;EACA,MAAMI,KAAK,GAAGJ,KAAK,KAAK,qBAAqB,GAAGK,SAAS,GAAGb,WAAW,CAACc,MAAM,CAACH,SAAS,CAAC,EAAE,KAAK,CAAC;EACjG,MAAMI,sBAAsB,GAAGjB,yBAAyB,CAAC;IAACQ;EAAkB,CAAC,CAAC;EAC9E,MAAMU,SAAS,GAAGf,OAAO,CACvB,MAAOL,MAAM,GAAG,CAACC,cAAc,CAACD,MAAM,CAAC,EAAE,GAAGmB,sBAAsB,CAAC,GAAGA,sBAAuB,EAC7F,CAACA,sBAAsB,EAAEnB,MAAM,CACjC,CAAC;EAED,IAAIW,QAAQ,EAAE;IACZ,oBACEH,IAAA,CAACV,yBAAyB;MACxBc,KAAK,EAAEG,SAAU;MACjBK,SAAS,EAAEA,SAAU;MACrBC,QAAQ,EAAER,KAAM;MAChBS,UAAU,EAAET,KAAK,KAAKI,SAAS,GAAGA,SAAS,GAAGD;IAAM,CACrD,CAAC;EAEN;EAEA,oBAAOR,IAAA,CAACT,uBAAuB;IAACa,KAAK,EAAEG,SAAU;IAACK,SAAS,EAAEA,SAAU;IAACC,QAAQ,EAAER,KAAM;IAACS,UAAU,EAAEN;EAAM,CAAE,CAAC;AAChH,CAAC","ignoreList":[]}

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

@@ -10,6 +10,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
 export const Progress = ({
   accessibilityLabel,
   circular = false,
+  color = 'fill.accent.primary',
+  testID,
   value
 }) => {
   useHostGuard('Progress');
@@ -18,14 +20,16 @@ export const Progress = ({
     accessibilityLabel
   });
   const ring = circular && value !== undefined;
-  const modifiers = useMemo(() => [ring ? gaugeStyle('circularCapacity') : progressViewStyle(circular ? 'circular' : 'linear'), tint(theme.color('fill.accent.primary')), ...accessibilityModifiers], [accessibilityModifiers, circular, ring, theme]);
+  const modifiers = useMemo(() => [ring ? gaugeStyle('circularCapacity') : progressViewStyle(circular ? 'circular' : 'linear'), tint(theme.color(color)), ...accessibilityModifiers], [accessibilityModifiers, circular, color, ring, theme]);
 
   // SwiftUI's circular `ProgressView` ignores its value on iOS and spins; a ring that fills is a capacity `Gauge`.
   return ring ? /*#__PURE__*/_jsx(Gauge, {
     modifiers: modifiers,
+    testID: testID,
     value: value
   }) : /*#__PURE__*/_jsx(ProgressView, {
     modifiers: modifiers,
+    testID: testID,
     value: value ?? null
   });
 };

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

@@ -1 +1 @@
-{"version":3,"names":["Gauge","ProgressView","gaugeStyle","progressViewStyle","tint","useAccessibilityModifiers","useAppTheme","useMemo","useHostGuard","jsx","_jsx","Progress","accessibilityLabel","circular","value","theme","accessibilityModifiers","ring","undefined","modifiers","color"],"sourceRoot":"../../../../src","sources":["atoms/progress/progress.ios.tsx"],"mappings":";;AAAA,SAAQA,KAAK,EAAEC,YAAY,QAAO,mBAAmB;AACrD,SAAQC,UAAU,EAAEC,iBAAiB,EAAEC,IAAI,QAAO,6BAA6B;AAC/E,SAAQC,yBAAyB,QAAO,gBAAgB;AACxD,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,OAAO,QAAO,OAAO;AAE7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,OAAO,MAAMC,QAA2B,GAAGA,CAAC;EAACC,kBAAkB;EAAEC,QAAQ,GAAG,KAAK;EAAEC;AAAoB,CAAC,KAAK;EAC3GN,YAAY,CAAC,UAAU,CAAC;EACxB,MAAMO,KAAK,GAAGT,WAAW,CAAC,CAAC;EAC3B,MAAMU,sBAAsB,GAAGX,yBAAyB,CAAC;IAACO;EAAkB,CAAC,CAAC;EAE9E,MAAMK,IAAI,GAAGJ,QAAQ,IAAIC,KAAK,KAAKI,SAAS;EAC5C,MAAMC,SAAS,GAAGZ,OAAO,CACvB,MAAM,CACJU,IAAI,GAAGf,UAAU,CAAC,kBAAkB,CAAC,GAAGC,iBAAiB,CAACU,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC,EAC3FT,IAAI,CAACW,KAAK,CAACK,KAAK,CAAC,qBAAqB,CAAC,CAAC,EACxC,GAAGJ,sBAAsB,CAC1B,EACD,CAACA,sBAAsB,EAAEH,QAAQ,EAAEI,IAAI,EAAEF,KAAK,CAChD,CAAC;;EAED;EACA,OAAOE,IAAI,gBACTP,IAAA,CAACV,KAAK;IAACmB,SAAS,EAAEA,SAAU;IAACL,KAAK,EAAEA;EAAM,CAAE,CAAC,gBAE7CJ,IAAA,CAACT,YAAY;IAACkB,SAAS,EAAEA,SAAU;IAACL,KAAK,EAAEA,KAAK,IAAI;EAAK,CAAE,CAC5D;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["Gauge","ProgressView","gaugeStyle","progressViewStyle","tint","useAccessibilityModifiers","useAppTheme","useMemo","useHostGuard","jsx","_jsx","Progress","accessibilityLabel","circular","color","testID","value","theme","accessibilityModifiers","ring","undefined","modifiers"],"sourceRoot":"../../../../src","sources":["atoms/progress/progress.ios.tsx"],"mappings":";;AAAA,SAAQA,KAAK,EAAEC,YAAY,QAAO,mBAAmB;AACrD,SAAQC,UAAU,EAAEC,iBAAiB,EAAEC,IAAI,QAAO,6BAA6B;AAC/E,SAAQC,yBAAyB,QAAO,gBAAgB;AACxD,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,OAAO,QAAO,OAAO;AAE7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,OAAO,MAAMC,QAA2B,GAAGA,CAAC;EAC1CC,kBAAkB;EAClBC,QAAQ,GAAG,KAAK;EAChBC,KAAK,GAAG,qBAAqB;EAC7BC,MAAM;EACNC;AACa,CAAC,KAAK;EACnBR,YAAY,CAAC,UAAU,CAAC;EACxB,MAAMS,KAAK,GAAGX,WAAW,CAAC,CAAC;EAC3B,MAAMY,sBAAsB,GAAGb,yBAAyB,CAAC;IAACO;EAAkB,CAAC,CAAC;EAE9E,MAAMO,IAAI,GAAGN,QAAQ,IAAIG,KAAK,KAAKI,SAAS;EAC5C,MAAMC,SAAS,GAAGd,OAAO,CACvB,MAAM,CACJY,IAAI,GAAGjB,UAAU,CAAC,kBAAkB,CAAC,GAAGC,iBAAiB,CAACU,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC,EAC3FT,IAAI,CAACa,KAAK,CAACH,KAAK,CAACA,KAAK,CAAC,CAAC,EACxB,GAAGI,sBAAsB,CAC1B,EACD,CAACA,sBAAsB,EAAEL,QAAQ,EAAEC,KAAK,EAAEK,IAAI,EAAEF,KAAK,CACvD,CAAC;;EAED;EACA,OAAOE,IAAI,gBACTT,IAAA,CAACV,KAAK;IAACqB,SAAS,EAAEA,SAAU;IAACN,MAAM,EAAEA,MAAO;IAACC,KAAK,EAAEA;EAAM,CAAE,CAAC,gBAE7DN,IAAA,CAACT,YAAY;IAACoB,SAAS,EAAEA,SAAU;IAACN,MAAM,EAAEA,MAAO;IAACC,KAAK,EAAEA,KAAK,IAAI;EAAK,CAAE,CAC5E;AACH,CAAC","ignoreList":[]}

package/lib/module/atoms/segmented-control/segmented-control.android.js

@@ -1,19 +1,59 @@
 "use strict";
 
 import { Host, SegmentedButton, SingleChoiceSegmentedButtonRow, Text } from '@expo/ui/jetpack-compose';
-import { fillMaxWidth, testID as testIdModifier, weight } from '@expo/ui/jetpack-compose/modifiers';
+import { fillMaxWidth, height, testID as testIdModifier, weight } from '@expo/ui/jetpack-compose/modifiers';
+import { iconResourceName } from '@hzblj/expo-native-icons';
 import { haptics } from '@hzblj/expo-rich-haptics';
-import { useAppTheme } from '@hzblj/kara-theme';
+import { DrawableIcon, NativeImage } from '@hzblj/kara-native/jetpack-compose';
+import { spacing as spacingTokens, useAppTheme } from '@hzblj/kara-theme';
 import { useCallback, useMemo } from 'react';
 import { useInsideHost } from "../../host-context.js";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { HStack } from "../h-stack/index.js";
+import { imageUri, segmentOf } from "./segments.js";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const MATCH_HEIGHT_ONLY = {
   horizontal: false,
   vertical: true
 };
 
-/** Every segment the same width, like UIKit's: Material's would size each to its label. */
-const SEGMENT = [weight(1)];
+/** Material's own segment height, which `spacing` only ever adds to. */
+const MATERIAL_HEIGHT = 40;
+/**
+ * What a segment shows: its label, one of the app's icons before it, or an image loaded by kara-native. The icon and a
+ * label the image falls back to take the segment's content colour, so they follow the selection and `disabled`.
+ */
+const SegmentLabel = ({
+  iconSize,
+  segment
+}) => {
+  const theme = useAppTheme();
+  const face = theme.typography.subheadlineMedium;
+  if (segment.image !== undefined) {
+    return /*#__PURE__*/_jsx(NativeImage, {
+      fontFamily: face.fontFamily,
+      fontSize: face.fontSize,
+      fontWeight: String(face.fontWeight),
+      imageHeight: iconSize,
+      label: segment.label,
+      source: imageUri(segment.image)
+    });
+  }
+  const label = /*#__PURE__*/_jsx(Text, {
+    style: face,
+    children: segment.label
+  });
+  if (segment.icon === undefined) {
+    return label;
+  }
+  return /*#__PURE__*/_jsxs(HStack, {
+    align: "center",
+    spacing: "s6",
+    children: [/*#__PURE__*/_jsx(DrawableIcon, {
+      iconSize: iconSize,
+      resourceName: iconResourceName(segment.icon)
+    }), label]
+  });
+};
 
 /**
  * Material's single-choice segmented buttons, the selected one filled with the accent like a checked `Switch`. Its own
@@ -23,13 +63,27 @@ const SEGMENT = [weight(1)];
  */
 export const SegmentedControl = ({
   disabled = false,
+  iconSize = 's20',
   onChange,
   selectedIndex,
+  spacing,
   testID,
   values
 }) => {
   const theme = useAppTheme();
   const insideHost = useInsideHost();
+  const segments = useMemo(() => values.map(segmentOf), [values]);
+  const iconPoints = spacingTokens[iconSize];
+
+  // Every segment the same width, like UIKit's: Material's would size each to its label. With `spacing`, as tall as
+  // the content and that space, and never shorter than Material's own segment.
+  const segmentModifiers = useMemo(() => {
+    if (spacing === undefined) {
+      return [weight(1)];
+    }
+    const content = Math.max(theme.typography.subheadlineMedium.lineHeight, iconPoints);
+    return [weight(1), height(Math.max(MATERIAL_HEIGHT, content + 2 * spacingTokens[spacing]))];
+  }, [iconPoints, spacing, theme]);
 
   // Every segment keeps the same outline, the selected one too: an accent border would run its fill out over the line
   // the others draw inside, and make it look taller than its neighbours.
@@ -53,20 +107,20 @@ export const SegmentedControl = ({
       return;
     }
     haptics.selection();
-    onChange?.(index, values[index] ?? '');
-  }, [onChange, selectedIndex, values]);
+    onChange?.(index, segments[index]?.label ?? '');
+  }, [onChange, segments, selectedIndex]);
   const row = /*#__PURE__*/_jsx(SingleChoiceSegmentedButtonRow, {
     modifiers: rowModifiers,
-    children: values.map((label, index) => /*#__PURE__*/_jsx(SegmentedButton, {
+    children: segments.map((segment, index) => /*#__PURE__*/_jsx(SegmentedButton, {
       colors: colors,
       enabled: !disabled,
-      modifiers: SEGMENT,
+      modifiers: segmentModifiers,
       onClick: () => select(index),
       selected: index === selectedIndex,
       children: /*#__PURE__*/_jsx(SegmentedButton.Label, {
-        children: /*#__PURE__*/_jsx(Text, {
-          style: theme.typography.subheadlineMedium,
-          children: label
+        children: /*#__PURE__*/_jsx(SegmentLabel, {
+          iconSize: iconPoints,
+          segment: segment
         })
       })
     }, index))

package/lib/module/atoms/segmented-control/segmented-control.android.js.map

@@ -1 +1 @@
-{"version":3,"names":["Host","SegmentedButton","SingleChoiceSegmentedButtonRow","Text","fillMaxWidth","testID","testIdModifier","weight","haptics","useAppTheme","useCallback","useMemo","useInsideHost","jsx","_jsx","MATCH_HEIGHT_ONLY","horizontal","vertical","SEGMENT","SegmentedControl","disabled","onChange","selectedIndex","values","theme","insideHost","colors","activeBorderColor","color","activeContainerColor","activeContentColor","disabledActiveBorderColor","disabledActiveContainerColor","disabledActiveContentColor","disabledInactiveBorderColor","disabledInactiveContentColor","inactiveBorderColor","inactiveContentColor","rowModifiers","select","index","selection","row","modifiers","children","map","label","enabled","onClick","selected","Label","style","typography","subheadlineMedium","colorScheme","dark","matchContents","seedColor","materialSeed"],"sourceRoot":"../../../../src","sources":["atoms/segmented-control/segmented-control.android.tsx"],"mappings":";;AAAA,SAAQA,IAAI,EAAEC,eAAe,EAAEC,8BAA8B,EAAEC,IAAI,QAAO,0BAA0B;AACpG,SAAQC,YAAY,EAAEC,MAAM,IAAIC,cAAc,EAAEC,MAAM,QAAO,oCAAoC;AACjG,SAAQC,OAAO,QAAO,0BAA0B;AAChD,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,WAAW,EAAEC,OAAO,QAAO,OAAO;AAE1C,SAAQC,aAAa,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAGhD,MAAMC,iBAAiB,GAAG;EAACC,UAAU,EAAE,KAAK;EAAEC,QAAQ,EAAE;AAAI,CAAC;;AAE7D;AACA,MAAMC,OAAO,GAAG,CAACX,MAAM,CAAC,CAAC,CAAC,CAAC;;AAE3B;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMY,gBAA2C,GAAGA,CAAC;EAC1DC,QAAQ,GAAG,KAAK;EAChBC,QAAQ;EACRC,aAAa;EACbjB,MAAM;EACNkB;AACqB,CAAC,KAAK;EAC3B,MAAMC,KAAK,GAAGf,WAAW,CAAC,CAAC;EAC3B,MAAMgB,UAAU,GAAGb,aAAa,CAAC,CAAC;;EAElC;EACA;EACA,MAAMc,MAAM,GAAGf,OAAO,CACpB,OAAO;IACLgB,iBAAiB,EAAEH,KAAK,CAACI,KAAK,CAAC,uBAAuB,CAAC;IACvDC,oBAAoB,EAAEL,KAAK,CAACI,KAAK,CAAC,qBAAqB,CAAC;IACxDE,kBAAkB,EAAEN,KAAK,CAACI,KAAK,CAAC,mBAAmB,CAAC;IACpDG,yBAAyB,EAAEP,KAAK,CAACI,KAAK,CAAC,iBAAiB,CAAC;IACzDI,4BAA4B,EAAER,KAAK,CAACI,KAAK,CAAC,sBAAsB,CAAC;IACjEK,0BAA0B,EAAET,KAAK,CAACI,KAAK,CAAC,sBAAsB,CAAC;IAC/DM,2BAA2B,EAAEV,KAAK,CAACI,KAAK,CAAC,iBAAiB,CAAC;IAC3DO,4BAA4B,EAAEX,KAAK,CAACI,KAAK,CAAC,sBAAsB,CAAC;IACjEQ,mBAAmB,EAAEZ,KAAK,CAACI,KAAK,CAAC,uBAAuB,CAAC;IACzDS,oBAAoB,EAAEb,KAAK,CAACI,KAAK,CAAC,iBAAiB;EACrD,CAAC,CAAC,EACF,CAACJ,KAAK,CACR,CAAC;EAED,MAAMc,YAAY,GAAG3B,OAAO,CAAC,MAAON,MAAM,GAAG,CAACD,YAAY,CAAC,CAAC,EAAEE,cAAc,CAACD,MAAM,CAAC,CAAC,GAAG,CAACD,YAAY,CAAC,CAAC,CAAE,EAAE,CAACC,MAAM,CAAC,CAAC;;EAEpH;EACA,MAAMkC,MAAM,GAAG7B,WAAW,CACvB8B,KAAa,IAAK;IACjB,IAAIA,KAAK,KAAKlB,aAAa,EAAE;MAC3B;IACF;IAEAd,OAAO,CAACiC,SAAS,CAAC,CAAC;IACnBpB,QAAQ,GAAGmB,KAAK,EAAEjB,MAAM,CAACiB,KAAK,CAAC,IAAI,EAAE,CAAC;EACxC,CAAC,EACD,CAACnB,QAAQ,EAAEC,aAAa,EAAEC,MAAM,CAClC,CAAC;EAED,MAAMmB,GAAG,gBACP5B,IAAA,CAACZ,8BAA8B;IAACyC,SAAS,EAAEL,YAAa;IAAAM,QAAA,EACrDrB,MAAM,CAACsB,GAAG,CAAC,CAACC,KAAK,EAAEN,KAAK,kBACvB1B,IAAA,CAACb,eAAe;MACdyB,MAAM,EAAEA,MAAO;MACfqB,OAAO,EAAE,CAAC3B,QAAS;MAEnBuB,SAAS,EAAEzB,OAAQ;MACnB8B,OAAO,EAAEA,CAAA,KAAMT,MAAM,CAACC,KAAK,CAAE;MAC7BS,QAAQ,EAAET,KAAK,KAAKlB,aAAc;MAAAsB,QAAA,eAElC9B,IAAA,CAACb,eAAe,CAACiD,KAAK;QAAAN,QAAA,eACpB9B,IAAA,CAACX,IAAI;UAACgD,KAAK,EAAE3B,KAAK,CAAC4B,UAAU,CAACC,iBAAkB;UAAAT,QAAA,EAAEE;QAAK,CAAO;MAAC,CAC1C;IAAC,GAPnBN,KAQU,CAClB;EAAC,CAC4B,CACjC;EAED,IAAIf,UAAU,EAAE;IACd,OAAOiB,GAAG;EACZ;EAEA,oBACE5B,IAAA,CAACd,IAAI;IAACsD,WAAW,EAAE9B,KAAK,CAAC+B,IAAI,GAAG,MAAM,GAAG,OAAQ;IAACC,aAAa,EAAEzC,iBAAkB;IAAC0C,SAAS,EAAEjC,KAAK,CAACkC,YAAa;IAAAd,QAAA,EAC/GF;EAAG,CACA,CAAC;AAEX,CAAC","ignoreList":[]}
+{"version":3,"names":["Host","SegmentedButton","SingleChoiceSegmentedButtonRow","Text","fillMaxWidth","height","testID","testIdModifier","weight","iconResourceName","haptics","DrawableIcon","NativeImage","spacing","spacingTokens","useAppTheme","useCallback","useMemo","useInsideHost","HStack","imageUri","segmentOf","jsx","_jsx","jsxs","_jsxs","MATCH_HEIGHT_ONLY","horizontal","vertical","MATERIAL_HEIGHT","SegmentLabel","iconSize","segment","theme","face","typography","subheadlineMedium","image","undefined","fontFamily","fontSize","fontWeight","String","imageHeight","label","source","style","children","icon","align","resourceName","SegmentedControl","disabled","onChange","selectedIndex","values","insideHost","segments","map","iconPoints","segmentModifiers","content","Math","max","lineHeight","colors","activeBorderColor","color","activeContainerColor","activeContentColor","disabledActiveBorderColor","disabledActiveContainerColor","disabledActiveContentColor","disabledInactiveBorderColor","disabledInactiveContentColor","inactiveBorderColor","inactiveContentColor","rowModifiers","select","index","selection","row","modifiers","enabled","onClick","selected","Label","colorScheme","dark","matchContents","seedColor","materialSeed"],"sourceRoot":"../../../../src","sources":["atoms/segmented-control/segmented-control.android.tsx"],"mappings":"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","ignoreList":[]}