@hzblj/kara-components 0.16.0 → 0.18.0

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

@@ -3,19 +3,26 @@
 import { Slider as SwiftUISlider } from '@expo/ui/swift-ui';
 import { disabled as disabledModifier, tint } from '@expo/ui/swift-ui/modifiers';
 import { useAppTheme } from '@hzblj/kara-theme';
-import { useMemo } from 'react';
+import { useCallback, useMemo, useRef } from 'react';
 import { useHostGuard } from "../../host-context.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * SwiftUI's slider. `onValueChangeEnd` is its `onEditingChanged(false)`, with the last value the drag reported: the
+ * controlled `value` can still be a render behind when the finger lifts.
+ */
 export const Slider = ({
   disabled = false,
   max = 1,
   min = 0,
   onValueChange,
+  onValueChangeEnd,
   step,
+  testID,
   value
 }) => {
   useHostGuard('Slider');
   const theme = useAppTheme();
+  const dragged = useRef(undefined);
   const modifiers = useMemo(() => {
     const list = [tint(theme.color('fill.accent.primary'))];
     if (disabled) {
@@ -23,12 +30,25 @@ export const Slider = ({
     }
     return list;
   }, [disabled, theme]);
+  const onChange = useCallback(next => {
+    dragged.current = next;
+    onValueChange?.(next);
+  }, [onValueChange]);
+  const onEditingChanged = useCallback(editing => {
+    const final = dragged.current ?? value;
+    dragged.current = undefined;
+    if (!editing) {
+      onValueChangeEnd?.(final);
+    }
+  }, [onValueChangeEnd, value]);
   return /*#__PURE__*/_jsx(SwiftUISlider, {
     max: max,
     min: min,
     modifiers: modifiers,
-    onValueChange: onValueChange,
+    onEditingChanged: onValueChangeEnd ? onEditingChanged : undefined,
+    onValueChange: onChange,
     step: step,
+    testID: testID,
     value: value
   });
 };

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

@@ -1 +1 @@
-{"version":3,"names":["Slider","SwiftUISlider","disabled","disabledModifier","tint","useAppTheme","useMemo","useHostGuard","jsx","_jsx","max","min","onValueChange","step","value","theme","modifiers","list","color","push"],"sourceRoot":"../../../../src","sources":["atoms/slider/slider.ios.tsx"],"mappings":";;AAAA,SAAQA,MAAM,IAAIC,aAAa,QAAO,mBAAmB;AACzD,SAAQC,QAAQ,IAAIC,gBAAgB,EAAEC,IAAI,QAAO,6BAA6B;AAC9E,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,OAAO,QAAO,OAAO;AAE7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,OAAO,MAAMT,MAAuB,GAAGA,CAAC;EACtCE,QAAQ,GAAG,KAAK;EAChBQ,GAAG,GAAG,CAAC;EACPC,GAAG,GAAG,CAAC;EACPC,aAAa;EACbC,IAAI;EACJC;AACW,CAAC,KAAK;EACjBP,YAAY,CAAC,QAAQ,CAAC;EACtB,MAAMQ,KAAK,GAAGV,WAAW,CAAC,CAAC;EAE3B,MAAMW,SAAS,GAAGV,OAAO,CAAC,MAAM;IAC9B,MAAMW,IAAI,GAAG,CAACb,IAAI,CAACW,KAAK,CAACG,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAEvD,IAAIhB,QAAQ,EAAE;MACZe,IAAI,CAACE,IAAI,CAAChB,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACnC;IAEA,OAAOc,IAAI;EACb,CAAC,EAAE,CAACf,QAAQ,EAAEa,KAAK,CAAC,CAAC;EAErB,oBACEN,IAAA,CAACR,aAAa;IAACS,GAAG,EAAEA,GAAI;IAACC,GAAG,EAAEA,GAAI;IAACK,SAAS,EAAEA,SAAU;IAACJ,aAAa,EAAEA,aAAc;IAACC,IAAI,EAAEA,IAAK;IAACC,KAAK,EAAEA;EAAM,CAAE,CAAC;AAEvH,CAAC","ignoreList":[]}
+{"version":3,"names":["Slider","SwiftUISlider","disabled","disabledModifier","tint","useAppTheme","useCallback","useMemo","useRef","useHostGuard","jsx","_jsx","max","min","onValueChange","onValueChangeEnd","step","testID","value","theme","dragged","undefined","modifiers","list","color","push","onChange","next","current","onEditingChanged","editing","final"],"sourceRoot":"../../../../src","sources":["atoms/slider/slider.ios.tsx"],"mappings":";;AAAA,SAAQA,MAAM,IAAIC,aAAa,QAAO,mBAAmB;AACzD,SAAQC,QAAQ,IAAIC,gBAAgB,EAAEC,IAAI,QAAO,6BAA6B;AAC9E,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,WAAW,EAAEC,OAAO,EAAEC,MAAM,QAAO,OAAO;AAElD,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C;AACA;AACA;AACA;AACA,OAAO,MAAMX,MAAuB,GAAGA,CAAC;EACtCE,QAAQ,GAAG,KAAK;EAChBU,GAAG,GAAG,CAAC;EACPC,GAAG,GAAG,CAAC;EACPC,aAAa;EACbC,gBAAgB;EAChBC,IAAI;EACJC,MAAM;EACNC;AACW,CAAC,KAAK;EACjBT,YAAY,CAAC,QAAQ,CAAC;EACtB,MAAMU,KAAK,GAAGd,WAAW,CAAC,CAAC;EAC3B,MAAMe,OAAO,GAAGZ,MAAM,CAAqBa,SAAS,CAAC;EAErD,MAAMC,SAAS,GAAGf,OAAO,CAAC,MAAM;IAC9B,MAAMgB,IAAI,GAAG,CAACnB,IAAI,CAACe,KAAK,CAACK,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAEvD,IAAItB,QAAQ,EAAE;MACZqB,IAAI,CAACE,IAAI,CAACtB,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACnC;IAEA,OAAOoB,IAAI;EACb,CAAC,EAAE,CAACrB,QAAQ,EAAEiB,KAAK,CAAC,CAAC;EAErB,MAAMO,QAAQ,GAAGpB,WAAW,CACzBqB,IAAY,IAAK;IAChBP,OAAO,CAACQ,OAAO,GAAGD,IAAI;IACtBb,aAAa,GAAGa,IAAI,CAAC;EACvB,CAAC,EACD,CAACb,aAAa,CAChB,CAAC;EAED,MAAMe,gBAAgB,GAAGvB,WAAW,CACjCwB,OAAgB,IAAK;IACpB,MAAMC,KAAK,GAAGX,OAAO,CAACQ,OAAO,IAAIV,KAAK;IACtCE,OAAO,CAACQ,OAAO,GAAGP,SAAS;IAE3B,IAAI,CAACS,OAAO,EAAE;MACZf,gBAAgB,GAAGgB,KAAK,CAAC;IAC3B;EACF,CAAC,EACD,CAAChB,gBAAgB,EAAEG,KAAK,CAC1B,CAAC;EAED,oBACEP,IAAA,CAACV,aAAa;IACZW,GAAG,EAAEA,GAAI;IACTC,GAAG,EAAEA,GAAI;IACTS,SAAS,EAAEA,SAAU;IACrBO,gBAAgB,EAAEd,gBAAgB,GAAGc,gBAAgB,GAAGR,SAAU;IAClEP,aAAa,EAAEY,QAAS;IACxBV,IAAI,EAAEA,IAAK;IACXC,MAAM,EAAEA,MAAO;IACfC,KAAK,EAAEA;EAAM,CACd,CAAC;AAEN,CAAC","ignoreList":[]}

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

@@ -1,7 +1,7 @@
 "use strict";
 
 import { Switch as ComposeSwitch, Row, Text } from '@expo/ui/jetpack-compose';
-import { clickable, fillMaxWidth } from '@expo/ui/jetpack-compose/modifiers';
+import { clickable, fillMaxWidth, testID as testIdModifier } from '@expo/ui/jetpack-compose/modifiers';
 import { haptics } from '@hzblj/expo-rich-haptics';
 import { useAppTheme } from '@hzblj/kara-theme';
 import { useCallback, useMemo } from 'react';
@@ -20,6 +20,7 @@ export const Switch = ({
   disabled = false,
   label,
   onValueChange,
+  testID,
   value
 }) => {
   useHostGuard('Switch');
@@ -29,6 +30,8 @@ export const Switch = ({
     onValueChange?.(next);
   }, [onValueChange]);
   const rowModifiers = useMemo(() => disabled || !onValueChange ? [fillMaxWidth()] : [fillMaxWidth(), clickable(() => toggle(!value))], [disabled, onValueChange, toggle, value]);
+  // On the switch, not the row: the switch is its own toggleable node inside the row, and the one a test reads.
+  const controlModifiers = useMemo(() => testID ? [testIdModifier(testID)] : undefined, [testID]);
   const control = /*#__PURE__*/_jsx(ComposeSwitch, {
     colors: {
       checkedBorderColor: theme.color('fill.accent.primary'),
@@ -36,6 +39,7 @@ export const Switch = ({
       checkedTrackColor: theme.color('fill.accent.primary')
     },
     enabled: !disabled,
+    modifiers: controlModifiers,
     onCheckedChange: onValueChange ? toggle : NOOP,
     value: value
   });

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

@@ -1 +1 @@
-{"version":3,"names":["Switch","ComposeSwitch","Row","Text","clickable","fillMaxWidth","haptics","useAppTheme","useCallback","useMemo","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,OAAO,QAAO,0BAA0B;AAChD,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,WAAW,EAAEC,OAAO,QAAO,OAAO;AAE1C,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,GAAGd,WAAW,CAAC,CAAC;EAC3B,MAAMe,MAAM,GAAGd,WAAW,CACvBe,IAAa,IAAK;IACjBjB,OAAO,CAACkB,IAAI,CAACD,IAAI,GAAG,UAAU,GAAG,WAAW,CAAC;IAC7CJ,aAAa,GAAGI,IAAI,CAAC;EACvB,CAAC,EACD,CAACJ,aAAa,CAChB,CAAC;EACD,MAAMM,YAAY,GAAGhB,OAAO,CAC1B,MAAOQ,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":[]}
+{"version":3,"names":["Switch","ComposeSwitch","Row","Text","clickable","fillMaxWidth","testID","testIdModifier","haptics","useAppTheme","useCallback","useMemo","useHostGuard","jsx","_jsx","jsxs","_jsxs","NOOP","undefined","disabled","label","onValueChange","value","theme","toggle","next","play","rowModifiers","controlModifiers","control","colors","checkedBorderColor","color","checkedThumbColor","checkedTrackColor","enabled","modifiers","onCheckedChange","horizontalArrangement","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,EAAEC,MAAM,IAAIC,cAAc,QAAO,oCAAoC;AACpG,SAAQC,OAAO,QAAO,0BAA0B;AAChD,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,WAAW,EAAEC,OAAO,QAAO,OAAO;AAE1C,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,MAAMlB,MAAuB,GAAGA,CAAC;EAACmB,QAAQ,GAAG,KAAK;EAAEC,KAAK;EAAEC,aAAa;EAAEf,MAAM;EAAEgB;AAAkB,CAAC,KAAK;EAC/GV,YAAY,CAAC,QAAQ,CAAC;EACtB,MAAMW,KAAK,GAAGd,WAAW,CAAC,CAAC;EAC3B,MAAMe,MAAM,GAAGd,WAAW,CACvBe,IAAa,IAAK;IACjBjB,OAAO,CAACkB,IAAI,CAACD,IAAI,GAAG,UAAU,GAAG,WAAW,CAAC;IAC7CJ,aAAa,GAAGI,IAAI,CAAC;EACvB,CAAC,EACD,CAACJ,aAAa,CAChB,CAAC;EACD,MAAMM,YAAY,GAAGhB,OAAO,CAC1B,MAAOQ,QAAQ,IAAI,CAACE,aAAa,GAAG,CAAChB,YAAY,CAAC,CAAC,CAAC,GAAG,CAACA,YAAY,CAAC,CAAC,EAAED,SAAS,CAAC,MAAMoB,MAAM,CAAC,CAACF,KAAK,CAAC,CAAC,CAAE,EACzG,CAACH,QAAQ,EAAEE,aAAa,EAAEG,MAAM,EAAEF,KAAK,CACzC,CAAC;EACD;EACA,MAAMM,gBAAgB,GAAGjB,OAAO,CAAC,MAAOL,MAAM,GAAG,CAACC,cAAc,CAACD,MAAM,CAAC,CAAC,GAAGY,SAAU,EAAE,CAACZ,MAAM,CAAC,CAAC;EACjG,MAAMuB,OAAO,gBACXf,IAAA,CAACb,aAAa;IACZ6B,MAAM,EAAE;MACNC,kBAAkB,EAAER,KAAK,CAACS,KAAK,CAAC,qBAAqB,CAAC;MACtDC,iBAAiB,EAAEV,KAAK,CAACS,KAAK,CAAC,mBAAmB,CAAC;MACnDE,iBAAiB,EAAEX,KAAK,CAACS,KAAK,CAAC,qBAAqB;IACtD,CAAE;IACFG,OAAO,EAAE,CAAChB,QAAS;IACnBiB,SAAS,EAAER,gBAAiB;IAC5BS,eAAe,EAAEhB,aAAa,GAAGG,MAAM,GAAGP,IAAK;IAC/CK,KAAK,EAAEA;EAAM,CACd,CACF;EAED,IAAI,CAACF,KAAK,EAAE;IACV,OAAOS,OAAO;EAChB;EAEA,oBACEb,KAAA,CAACd,GAAG;IAACoC,qBAAqB,EAAC,cAAc;IAACF,SAAS,EAAET,YAAa;IAACY,iBAAiB,EAAC,QAAQ;IAAAC,QAAA,gBAC3F1B,IAAA,CAACX,IAAI;MAAC6B,KAAK,EAAET,KAAK,CAACkB,WAAW,CAACtB,QAAQ,GAAG,kBAAkB,GAAG,iBAAiB,CAAE;MAACuB,KAAK,EAAEnB,KAAK,CAACoB,UAAU,CAACC,IAAK;MAAAJ,QAAA,EAC7GpB;IAAK,CACF,CAAC,EACNS,OAAO;EAAA,CACL,CAAC;AAEV,CAAC","ignoreList":[]}

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

@@ -10,6 +10,7 @@ export const Switch = ({
   disabled = false,
   label,
   onValueChange,
+  testID,
   value
 }) => {
   useHostGuard('Switch');
@@ -25,7 +26,8 @@ export const Switch = ({
     isOn: value,
     label: label,
     modifiers: modifiers,
-    onIsOnChange: onValueChange
+    onIsOnChange: onValueChange,
+    testID: testID
   });
 };
 //# sourceMappingURL=switch.ios.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["Toggle","disabled","disabledModifier","tint","useAppTheme","useMemo","useHostGuard","jsx","_jsx","Switch","label","onValueChange","value","theme","modifiers","list","color","push","isOn","onIsOnChange"],"sourceRoot":"../../../../src","sources":["atoms/switch/switch.ios.tsx"],"mappings":";;AAAA,SAAQA,MAAM,QAAO,mBAAmB;AACxC,SAAQC,QAAQ,IAAIC,gBAAgB,EAAEC,IAAI,QAAO,6BAA6B;AAC9E,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,OAAO,QAAO,OAAO;AAE7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,OAAO,MAAMC,MAAuB,GAAGA,CAAC;EAACR,QAAQ,GAAG,KAAK;EAAES,KAAK;EAAEC,aAAa;EAAEC;AAAkB,CAAC,KAAK;EACvGN,YAAY,CAAC,QAAQ,CAAC;EACtB,MAAMO,KAAK,GAAGT,WAAW,CAAC,CAAC;EAE3B,MAAMU,SAAS,GAAGT,OAAO,CAAC,MAAM;IAC9B,MAAMU,IAAI,GAAG,CAACZ,IAAI,CAACU,KAAK,CAACG,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAEvD,IAAIf,QAAQ,EAAE;MACZc,IAAI,CAACE,IAAI,CAACf,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACnC;IAEA,OAAOa,IAAI;EACb,CAAC,EAAE,CAACd,QAAQ,EAAEY,KAAK,CAAC,CAAC;EAErB,oBAAOL,IAAA,CAACR,MAAM;IAACkB,IAAI,EAAEN,KAAM;IAACF,KAAK,EAAEA,KAAM;IAACI,SAAS,EAAEA,SAAU;IAACK,YAAY,EAAER;EAAc,CAAE,CAAC;AACjG,CAAC","ignoreList":[]}
+{"version":3,"names":["Toggle","disabled","disabledModifier","tint","useAppTheme","useMemo","useHostGuard","jsx","_jsx","Switch","label","onValueChange","testID","value","theme","modifiers","list","color","push","isOn","onIsOnChange"],"sourceRoot":"../../../../src","sources":["atoms/switch/switch.ios.tsx"],"mappings":";;AAAA,SAAQA,MAAM,QAAO,mBAAmB;AACxC,SAAQC,QAAQ,IAAIC,gBAAgB,EAAEC,IAAI,QAAO,6BAA6B;AAC9E,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,OAAO,QAAO,OAAO;AAE7B,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAG/C,OAAO,MAAMC,MAAuB,GAAGA,CAAC;EAACR,QAAQ,GAAG,KAAK;EAAES,KAAK;EAAEC,aAAa;EAAEC,MAAM;EAAEC;AAAkB,CAAC,KAAK;EAC/GP,YAAY,CAAC,QAAQ,CAAC;EACtB,MAAMQ,KAAK,GAAGV,WAAW,CAAC,CAAC;EAE3B,MAAMW,SAAS,GAAGV,OAAO,CAAC,MAAM;IAC9B,MAAMW,IAAI,GAAG,CAACb,IAAI,CAACW,KAAK,CAACG,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAEvD,IAAIhB,QAAQ,EAAE;MACZe,IAAI,CAACE,IAAI,CAAChB,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACnC;IAEA,OAAOc,IAAI;EACb,CAAC,EAAE,CAACf,QAAQ,EAAEa,KAAK,CAAC,CAAC;EAErB,oBAAON,IAAA,CAACR,MAAM;IAACmB,IAAI,EAAEN,KAAM;IAACH,KAAK,EAAEA,KAAM;IAACK,SAAS,EAAEA,SAAU;IAACK,YAAY,EAAET,aAAc;IAACC,MAAM,EAAEA;EAAO,CAAE,CAAC;AACjH,CAAC","ignoreList":[]}

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

@@ -4,7 +4,8 @@ import { Children, isValidElement } from 'react';
 
 /** A run of the text: a string child, or a nested `Text` with a colour of its own. */
 
-const textOf = children => Children.toArray(children).map(child => typeof child === 'string' || typeof child === 'number' ? String(child) : '').join('');
+/** The string and number children, joined: the text of a `Text` without spans, however JSX split it. */
+export const textOf = children => Children.toArray(children).map(child => typeof child === 'string' || typeof child === 'number' ? String(child) : '').join('');
 
 /**
  * The children as runs when any of them is a nested `Text` (`type`, the platform's own component), `null` when they

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

@@ -1 +1 @@
-{"version":3,"names":["Children","isValidElement","textOf","children","toArray","map","child","String","join","spansOf","type","items","some","flatMap","text","color","props","spansKey","spans","hash","value","span","character","charCodeAt","Math","imul"],"sourceRoot":"../../../../src","sources":["atoms/text/spans.ts"],"mappings":";;AACA,SAAQA,QAAQ,EAAEC,cAAc,QAAuB,OAAO;;AAE9D;;AAGA,MAAMC,MAAM,GAAIC,QAAmB,IACjCH,QAAQ,CAACI,OAAO,CAACD,QAAQ,CAAC,CACvBE,GAAG,CAACC,KAAK,IAAK,OAAOA,KAAK,KAAK,QAAQ,IAAI,OAAOA,KAAK,KAAK,QAAQ,GAAGC,MAAM,CAACD,KAAK,CAAC,GAAG,EAAG,CAAC,CAC3FE,IAAI,CAAC,EAAE,CAAC;;AAEb;AACA;AACA;AACA;AACA,OAAO,MAAMC,OAAO,GAAGA,CAACN,QAAmB,EAAEO,IAAa,KAAwB;EAChF,MAAMC,KAAK,GAAGX,QAAQ,CAACI,OAAO,CAACD,QAAQ,CAAC;EAExC,IAAI,CAACQ,KAAK,CAACC,IAAI,CAACN,KAAK,IAAI,aAAAL,cAAc,CAACK,KAAK,CAAC,IAAIA,KAAK,CAACI,IAAI,KAAKA,IAAI,CAAC,EAAE;IACtE,OAAO,IAAI;EACb;EAEA,OAAOC,KAAK,CAACE,OAAO,CAAWP,KAAK,IAAI;IACtC,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;MAC1D,OAAO,CAAC;QAACQ,IAAI,EAAEP,MAAM,CAACD,KAAK;MAAC,CAAC,CAAC;IAChC;IACA,IAAI,aAAAL,cAAc,CAA6CK,KAAK,CAAC,IAAIA,KAAK,CAACI,IAAI,KAAKA,IAAI,EAAE;MAC5F,OAAO,CAAC;QAACK,KAAK,EAAET,KAAK,CAACU,KAAK,CAACD,KAAK;QAAED,IAAI,EAAEZ,MAAM,CAACI,KAAK,CAACU,KAAK,CAACb,QAAQ;MAAC,CAAC,CAAC;IACzE;IACA,OAAO,EAAE;EACX,CAAC,CAAC;AACJ,CAAC;;AAED;AACA,OAAO,MAAMc,QAAQ,GAAGA,CAACF,KAAiB,EAAEG,KAAiC,EAAEJ,IAAY,KAAa;EACtG,IAAIK,IAAI,GAAG,UAAU;EACrB,MAAMC,KAAK,GAAGF,KAAK,GAAGA,KAAK,CAACb,GAAG,CAACgB,IAAI,IAAI,GAAGA,IAAI,CAACN,KAAK,IAAI,EAAE,IAAIM,IAAI,CAACP,IAAI,EAAE,CAAC,CAACN,IAAI,CAAC,GAAG,CAAC,GAAGM,IAAI;EAE5F,KAAK,MAAMQ,SAAS,IAAI,GAAGP,KAAK,IAAIK,KAAK,EAAE,EAAE;IAC3CD,IAAI,IAAIG,SAAS,CAACC,UAAU,CAAC,CAAC,CAAC;IAC/BJ,IAAI,GAAGK,IAAI,CAACC,IAAI,CAACN,IAAI,EAAE,UAAU,CAAC;EACpC;EAEA,OAAOA,IAAI,KAAK,CAAC;AACnB,CAAC","ignoreList":[]}
+{"version":3,"names":["Children","isValidElement","textOf","children","toArray","map","child","String","join","spansOf","type","items","some","flatMap","text","color","props","spansKey","spans","hash","value","span","character","charCodeAt","Math","imul"],"sourceRoot":"../../../../src","sources":["atoms/text/spans.ts"],"mappings":";;AACA,SAAQA,QAAQ,EAAEC,cAAc,QAAuB,OAAO;;AAE9D;;AAGA;AACA,OAAO,MAAMC,MAAM,GAAIC,QAAmB,IACxCH,QAAQ,CAACI,OAAO,CAACD,QAAQ,CAAC,CACvBE,GAAG,CAACC,KAAK,IAAK,OAAOA,KAAK,KAAK,QAAQ,IAAI,OAAOA,KAAK,KAAK,QAAQ,GAAGC,MAAM,CAACD,KAAK,CAAC,GAAG,EAAG,CAAC,CAC3FE,IAAI,CAAC,EAAE,CAAC;;AAEb;AACA;AACA;AACA;AACA,OAAO,MAAMC,OAAO,GAAGA,CAACN,QAAmB,EAAEO,IAAa,KAAwB;EAChF,MAAMC,KAAK,GAAGX,QAAQ,CAACI,OAAO,CAACD,QAAQ,CAAC;EAExC,IAAI,CAACQ,KAAK,CAACC,IAAI,CAACN,KAAK,IAAI,aAAAL,cAAc,CAACK,KAAK,CAAC,IAAIA,KAAK,CAACI,IAAI,KAAKA,IAAI,CAAC,EAAE;IACtE,OAAO,IAAI;EACb;EAEA,OAAOC,KAAK,CAACE,OAAO,CAAWP,KAAK,IAAI;IACtC,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;MAC1D,OAAO,CAAC;QAACQ,IAAI,EAAEP,MAAM,CAACD,KAAK;MAAC,CAAC,CAAC;IAChC;IACA,IAAI,aAAAL,cAAc,CAA6CK,KAAK,CAAC,IAAIA,KAAK,CAACI,IAAI,KAAKA,IAAI,EAAE;MAC5F,OAAO,CAAC;QAACK,KAAK,EAAET,KAAK,CAACU,KAAK,CAACD,KAAK;QAAED,IAAI,EAAEZ,MAAM,CAACI,KAAK,CAACU,KAAK,CAACb,QAAQ;MAAC,CAAC,CAAC;IACzE;IACA,OAAO,EAAE;EACX,CAAC,CAAC;AACJ,CAAC;;AAED;AACA,OAAO,MAAMc,QAAQ,GAAGA,CAACF,KAAiB,EAAEG,KAAiC,EAAEJ,IAAY,KAAa;EACtG,IAAIK,IAAI,GAAG,UAAU;EACrB,MAAMC,KAAK,GAAGF,KAAK,GAAGA,KAAK,CAACb,GAAG,CAACgB,IAAI,IAAI,GAAGA,IAAI,CAACN,KAAK,IAAI,EAAE,IAAIM,IAAI,CAACP,IAAI,EAAE,CAAC,CAACN,IAAI,CAAC,GAAG,CAAC,GAAGM,IAAI;EAE5F,KAAK,MAAMQ,SAAS,IAAI,GAAGP,KAAK,IAAIK,KAAK,EAAE,EAAE;IAC3CD,IAAI,IAAIG,SAAS,CAACC,UAAU,CAAC,CAAC,CAAC;IAC/BJ,IAAI,GAAGK,IAAI,CAACC,IAAI,CAACN,IAAI,EAAE,UAAU,CAAC;EACpC;EAEA,OAAOA,IAAI,KAAK,CAAC;AACnB,CAAC","ignoreList":[]}

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

@@ -7,13 +7,18 @@ import { animateConfig, splitAccessibility, useAccessibilityModifiers, useSxModi
 import { duration, easing, springPhysics, useAppTheme } from '@hzblj/kara-theme';
 import { useMemo } from 'react';
 import { useHostGuard } from "../../host-context.js";
-import { spansOf } from "./spans.js";
+import { spansOf, textOf } from "./spans.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const DECORATION = {
   none: 'none',
   strikethrough: 'lineThrough',
   underline: 'underline'
 };
+const OVERFLOW = {
+  head: 'startEllipsis',
+  middle: 'middleEllipsis',
+  tail: 'ellipsis'
+};
 const applyTransform = (children, transform) => {
   if (!transform || typeof children !== 'string') {
     return children;
@@ -66,6 +71,7 @@ export const Text = ({
   numberOfLines,
   testID,
   transform,
+  truncation = 'tail',
   variant = 'body',
   ...props
 }) => {
@@ -78,12 +84,16 @@ export const Text = ({
   const modifiers = useMemo(() => [...sxModifiers, ...(testID ? [testIdModifier(testID)] : []), ...accessibilityModifiers], [accessibilityModifiers, sxModifiers, testID]);
   const spans = useMemo(() => spansOf(children, Text), [children]);
   const animate = sx.animate === false ? undefined : sx.animate;
+  // Compose ellipsizes at the start or in the middle of a single line only, and clips a longer text: that ends at the
+  // tail instead.
+  const overflow = numberOfLines === 1 ? OVERFLOW[truncation] : 'ellipsis';
 
-  // `@expo/ui`'s text takes spans but animates none, and sets no font features: with `animate`, kara's own Compose text
-  // eases each span's colour, and with `monospacedDigit` asks the face for its tabular figures.
-  if (animate !== undefined || monospacedDigit) {
+  // `@expo/ui`'s text takes spans but animates none, sets no font features and ellipsizes only at the end: with
+  // `animate`, kara's own Compose text eases each span's colour, with `monospacedDigit` asks the face for its tabular
+  // figures, and puts the ellipsis at the start or in the middle of a line.
+  if (animate !== undefined || monospacedDigit || overflow !== 'ellipsis') {
     const runs = spans ?? [{
-      text: typeof children === 'string' || typeof children === 'number' ? String(children) : ''
+      text: textOf(children)
     }];
     return /*#__PURE__*/_jsx(AnimatedText, {
       animation: animate === undefined ? undefined : textAnimation(animateConfig(animate)),
@@ -100,13 +110,15 @@ export const Text = ({
       })),
       textAlign: align,
       textColor: theme.colorString(color),
-      textDecoration: decorationOf(decoration)
+      textDecoration: decorationOf(decoration),
+      textOverflow: overflow
     });
   }
   return /*#__PURE__*/_jsx(ComposeText, {
     color: theme.colorString(color),
     maxLines: numberOfLines,
     modifiers: modifiers,
+    overflow: "ellipsis",
     style: {
       fontFamily: style.fontFamily,
       fontSize: style.fontSize,

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

@@ -1 +1 @@
-{"version":3,"names":["Text","ComposeText","testID","testIdModifier","AnimatedText","animateConfig","splitAccessibility","useAccessibilityModifiers","useSxModifiers","duration","easing","springPhysics","useAppTheme","useMemo","useHostGuard","spansOf","jsx","_jsx","DECORATION","none","strikethrough","underline","applyTransform","children","transform","toUpperCase","toLowerCase","decorationOf","decoration","undefined","transformed","text","textAnimation","config","spring","dampingRatio","stiffness","type","milliseconds","curve","omega","Math","PI","delayMillis","delay","durationMillis","align","color","monospaced","monospacedDigit","numberOfLines","variant","props","theme","style","monoTypography","typography","accessibility","sx","sxModifiers","accessibilityModifiers","modifiers","spans","animate","runs","String","animation","fontFamily","fontFeatureSettings","fontSize","fontWeight","lineHeight","maxLines","map","span","colorString","textAlign","textColor","textDecoration","index"],"sourceRoot":"../../../../src","sources":["atoms/text/text.android.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Text","ComposeText","testID","testIdModifier","AnimatedText","animateConfig","splitAccessibility","useAccessibilityModifiers","useSxModifiers","duration","easing","springPhysics","useAppTheme","useMemo","useHostGuard","spansOf","textOf","jsx","_jsx","DECORATION","none","strikethrough","underline","OVERFLOW","head","middle","tail","applyTransform","children","transform","toUpperCase","toLowerCase","decorationOf","decoration","undefined","transformed","text","textAnimation","config","spring","dampingRatio","stiffness","type","milliseconds","curve","omega","Math","PI","delayMillis","delay","durationMillis","align","color","monospaced","monospacedDigit","numberOfLines","truncation","variant","props","theme","style","monoTypography","typography","accessibility","sx","sxModifiers","accessibilityModifiers","modifiers","spans","animate","overflow","runs","animation","fontFamily","fontFeatureSettings","fontSize","fontWeight","lineHeight","maxLines","map","span","colorString","textAlign","textColor","textDecoration","textOverflow","index"],"sourceRoot":"../../../../src","sources":["atoms/text/text.android.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -1,7 +1,7 @@
 "use strict";
 
 import { Text as SwiftUIText } from '@expo/ui/swift-ui';
-import { foregroundStyle, lineLimit, lineSpacing, monospacedDigit as monospacedDigitModifier, multilineTextAlignment, strikethrough, textCase, underline } from '@expo/ui/swift-ui/modifiers';
+import { foregroundStyle, lineLimit, lineSpacing, monospacedDigit as monospacedDigitModifier, multilineTextAlignment, strikethrough, textCase, truncationMode, underline } from '@expo/ui/swift-ui/modifiers';
 import { scaledFont } from '@hzblj/kara-native/swift-ui';
 import { splitAccessibility, textColorTransition, useAccessibilityModifiers, useSxModifiers } from '@hzblj/kara-sx';
 import { useAppTheme } from '@hzblj/kara-theme';
@@ -31,6 +31,7 @@ export const Text = ({
   numberOfLines,
   testID,
   transform,
+  truncation,
   variant = 'body',
   ...props
 }) => {
@@ -79,8 +80,11 @@ export const Text = ({
     if (numberOfLines !== undefined) {
       list.push(lineLimit(numberOfLines));
     }
+    if (truncation) {
+      list.push(truncationMode(truncation));
+    }
     return [...list, ...transition, ...sxModifiers, ...accessibilityModifiers];
-  }, [accessibilityModifiers, align, color, decoration, monospacedDigit, numberOfLines, style, sxModifiers, theme, transform, transition]);
+  }, [accessibilityModifiers, align, color, decoration, monospacedDigit, numberOfLines, style, sxModifiers, theme, transform, transition, truncation]);
   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","monospacedDigit","monospacedDigitModifier","multilineTextAlignment","strikethrough","textCase","underline","scaledFont","splitAccessibility","textColorTransition","useAccessibilityModifiers","useSxModifiers","useAppTheme","useMemo","useHostGuard","spansKey","spansOf","jsx","_jsx","ALIGNMENT","center","left","right","FRAME_ALIGNMENT","align","children","color","decoration","monospaced","numberOfLines","testID","transform","variant","props","theme","style","monoTypography","typography","accessibility","sx","sxModifiers","accessibilityModifiers","spans","animate","transition","modifiers","list","family","fontFamily","size","fontSize","textStyle","scalesWith","weight","Math","max","lineHeight","push","isActive","pattern","undefined","map","span","index","text"],"sourceRoot":"../../../../src","sources":["atoms/text/text.ios.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Text","SwiftUIText","foregroundStyle","lineLimit","lineSpacing","monospacedDigit","monospacedDigitModifier","multilineTextAlignment","strikethrough","textCase","truncationMode","underline","scaledFont","splitAccessibility","textColorTransition","useAccessibilityModifiers","useSxModifiers","useAppTheme","useMemo","useHostGuard","spansKey","spansOf","jsx","_jsx","ALIGNMENT","center","left","right","FRAME_ALIGNMENT","align","children","color","decoration","monospaced","numberOfLines","testID","transform","truncation","variant","props","theme","style","monoTypography","typography","accessibility","sx","sxModifiers","accessibilityModifiers","spans","animate","transition","modifiers","list","family","fontFamily","size","fontSize","textStyle","scalesWith","weight","Math","max","lineHeight","push","isActive","pattern","undefined","map","span","index","text"],"sourceRoot":"../../../../src","sources":["atoms/text/text.ios.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/atoms/text-field/text-field-input.js

@@ -0,0 +1,14 @@
+"use strict";
+
+/** Keyboards for an address, where a capital or a correction the user did not type would only break it. */
+const ADDRESS_KEYBOARDS = new Set(['email', 'url']);
+
+/** The capitalisation asked for, else `none` for an address; `undefined` leaves the platform's own. */
+export const capitalizationFor = (keyboard, autoCapitalize) => autoCapitalize ?? (ADDRESS_KEYBOARDS.has(keyboard) ? 'none' : undefined);
+
+/** Autocorrection as asked for, else on for everything but an address. */
+export const autoCorrectFor = (keyboard, autoCorrect) => autoCorrect ?? !ADDRESS_KEYBOARDS.has(keyboard);
+
+/** A no-op for a ref call that lands after the native view has gone. */
+export const ignoreDetachedView = () => undefined;
+//# sourceMappingURL=text-field-input.js.map

package/lib/module/atoms/text-field/text-field-input.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ADDRESS_KEYBOARDS","Set","capitalizationFor","keyboard","autoCapitalize","has","undefined","autoCorrectFor","autoCorrect","ignoreDetachedView"],"sourceRoot":"../../../../src","sources":["atoms/text-field/text-field-input.ts"],"mappings":";;AAEA;AACA,MAAMA,iBAAiD,GAAG,IAAIC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;;AAEnF;AACA,OAAO,MAAMC,iBAAiB,GAAGA,CAC/BC,QAA2B,EAC3BC,cAAmD,KACXA,cAAc,KAAKJ,iBAAiB,CAACK,GAAG,CAACF,QAAQ,CAAC,GAAG,MAAM,GAAGG,SAAS,CAAC;;AAElH;AACA,OAAO,MAAMC,cAAc,GAAGA,CAACJ,QAA2B,EAAEK,WAAgC,KAC1FA,WAAW,IAAI,CAACR,iBAAiB,CAACK,GAAG,CAACF,QAAQ,CAAC;;AAEjD;AACA,OAAO,MAAMM,kBAAkB,GAAGA,CAAA,KAAMH,SAAS","ignoreList":[]}

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

@@ -1,28 +1,122 @@
 "use strict";
 
 import { Column, Text as ComposeText, OutlinedTextField, useNativeState } from '@expo/ui/jetpack-compose';
+import { semantics, testID as testIdModifier } from '@expo/ui/jetpack-compose/modifiers';
 import { useSxModifiers } from '@hzblj/kara-sx';
 import { useAppTheme } from '@hzblj/kara-theme';
+import { useImperativeHandle, useMemo, useRef } from 'react';
 import { Glyph } from "../../glyph/index.js";
 import { useHostGuard } from "../../host-context.js";
+import { autoCorrectFor, capitalizationFor, ignoreDetachedView } from "./text-field-input.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const KEYBOARD = {
+  decimal: 'decimal',
+  default: 'text',
+  email: 'email',
+  number: 'number',
+  phone: 'phone',
+  url: 'uri'
+};
+
+/**
+ * A `secure` field asks for the password keyboards: they suggest nothing and learn nothing, and they are what Android's
+ * autofill takes for a password field.
+ */
+const SECURE_KEYBOARD = {
+  ...KEYBOARD,
+  default: 'password',
+  number: 'numberPassword'
+};
+
+/** Compose's autofill `ContentType`s, by the hint names `@expo/ui`'s `semantics` modifier maps to them. */
+const AUTOFILL_HINT = {
+  addressCity: 'postal-address-locality',
+  countryName: 'country',
+  creditCardNumber: 'cc-number',
+  emailAddress: 'email',
+  familyName: 'family-name',
+  fullStreetAddress: 'street-address',
+  givenName: 'given-name',
+  name: 'name',
+  newPassword: 'new-password',
+  oneTimeCode: 'one-time-code',
+  password: 'password',
+  postalCode: 'postal-code',
+  streetAddressLine1: 'address-line1',
+  streetAddressLine2: 'address-line2',
+  telephoneNumber: 'tel',
+  username: 'username'
+};
 export const TextField = ({
+  autoCapitalize,
+  autoCorrect,
+  autoFocus = false,
+  contentType,
   defaultValue = '',
   disabled = false,
   error = false,
+  keyboard = 'default',
   label,
+  maxLength,
   multiline = false,
   onChangeText,
-  secure = false
+  onFocusChange,
+  onSubmit,
+  placeholder,
+  ref,
+  secure = false,
+  submitLabel,
+  testID
 }) => {
   useHostGuard('TextField');
   const theme = useAppTheme();
   const value = useNativeState(defaultValue);
-  const modifiers = useSxModifiers({
+  const field = useRef(null);
+  const sxModifiers = useSxModifiers({
     wide: true
   });
   const invalid = Boolean(error);
   const message = typeof error === 'string' && error ? error : undefined;
+  const face = {
+    fontFamily: theme.typography.body.fontFamily,
+    fontWeight: theme.typography.body.fontWeight
+  };
+  const capitalization = capitalizationFor(keyboard, autoCapitalize) ?? 'none';
+  const corrects = !secure && autoCorrectFor(keyboard, autoCorrect);
+  const singleLine = !multiline;
+  const submits = singleLine && Boolean(onSubmit);
+  useImperativeHandle(ref, () => ({
+    blur: () => field.current?.blur().catch(ignoreDetachedView),
+    // The field reports no text set from code, so the change is reported here.
+    clear: () => {
+      field.current?.clear().catch(ignoreDetachedView);
+      onChangeText?.('');
+    },
+    focus: () => field.current?.focus().catch(ignoreDetachedView)
+  }), [onChangeText]);
+  const modifiers = useMemo(() => [...sxModifiers, ...(testID ? [testIdModifier(testID)] : []), ...(contentType ? [semantics({
+    contentType: AUTOFILL_HINT[contentType]
+  })] : [])], [contentType, sxModifiers, testID]);
+
+  /**
+   * A multiline field keeps the default action, a return key that starts a new line. A single-line one asked for
+   * `onSubmit` without a `submitLabel` gets `done`: Compose only runs the keyboard action it was given.
+   */
+  const keyboardOptions = useMemo(() => ({
+    autoCorrectEnabled: corrects,
+    capitalization,
+    imeAction: singleLine ? submitLabel ?? (submits ? 'done' : 'default') : 'default',
+    keyboardType: (secure ? SECURE_KEYBOARD : KEYBOARD)[keyboard]
+  }), [capitalization, corrects, keyboard, secure, singleLine, submitLabel, submits]);
+
+  // Only the action matching `imeAction` ever fires, so each one is the submit.
+  const keyboardActions = useMemo(() => submits && onSubmit ? {
+    onDone: onSubmit,
+    onGo: onSubmit,
+    onNext: onSubmit,
+    onSearch: onSubmit,
+    onSend: onSubmit
+  } : undefined, [onSubmit, submits]);
   return /*#__PURE__*/_jsxs(Column, {
     verticalArrangement: {
       spacedBy: 4
@@ -32,19 +126,32 @@ export const TextField = ({
       style: theme.typography.labelMedium,
       children: label
     }) : null, /*#__PURE__*/_jsxs(OutlinedTextField, {
+      autoFocus: autoFocus,
       enabled: !disabled,
       isError: invalid,
+      keyboardActions: keyboardActions,
+      keyboardOptions: keyboardOptions,
+      maxLength: maxLength,
       modifiers: modifiers,
+      onFocusChanged: onFocusChange,
       onValueChange: onChangeText,
-      singleLine: !multiline,
+      ref: field,
+      singleLine: singleLine,
       textStyle: {
         color: theme.colorString('content.primary'),
-        fontFamily: theme.typography.body.fontFamily,
-        fontWeight: theme.typography.body.fontWeight
+        ...face
       },
       value: value,
       visualTransformation: secure ? 'password' : 'none',
-      children: [invalid ? /*#__PURE__*/_jsx(OutlinedTextField.TrailingIcon, {
+      children: [placeholder ?
+      /*#__PURE__*/
+      // No colour of its own: Material's placeholder colour comes down to it, dimmed with the field.
+      _jsx(OutlinedTextField.Placeholder, {
+        children: /*#__PURE__*/_jsx(ComposeText, {
+          style: face,
+          children: placeholder
+        })
+      }) : null, invalid ? /*#__PURE__*/_jsx(OutlinedTextField.TrailingIcon, {
         children: /*#__PURE__*/_jsx(Glyph, {
           color: "content.destructive",
           name: "error"

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

@@ -1 +1 @@
-{"version":3,"names":["Column","Text","ComposeText","OutlinedTextField","useNativeState","useSxModifiers","useAppTheme","Glyph","useHostGuard","jsx","_jsx","jsxs","_jsxs","TextField","defaultValue","disabled","error","label","multiline","onChangeText","secure","theme","value","modifiers","wide","invalid","Boolean","message","undefined","verticalArrangement","spacedBy","children","color","colorString","style","typography","labelMedium","enabled","isError","onValueChange","singleLine","textStyle","fontFamily","body","fontWeight","visualTransformation","TrailingIcon","name","SupportingText","footnote"],"sourceRoot":"../../../../src","sources":["atoms/text-field/text-field.android.tsx"],"mappings":";;AAAA,SAAQA,MAAM,EAAEC,IAAI,IAAIC,WAAW,EAAEC,iBAAiB,EAAEC,cAAc,QAAO,0BAA0B;AACvG,SAAQC,cAAc,QAAO,gBAAgB;AAC7C,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,KAAK,QAAO,sBAAa;AACjC,SAAQC,YAAY,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAG/C,OAAO,MAAMC,SAA6B,GAAGA,CAAC;EAC5CC,YAAY,GAAG,EAAE;EACjBC,QAAQ,GAAG,KAAK;EAChBC,KAAK,GAAG,KAAK;EACbC,KAAK;EACLC,SAAS,GAAG,KAAK;EACjBC,YAAY;EACZC,MAAM,GAAG;AACK,CAAC,KAAK;EACpBZ,YAAY,CAAC,WAAW,CAAC;EACzB,MAAMa,KAAK,GAAGf,WAAW,CAAC,CAAC;EAC3B,MAAMgB,KAAK,GAAGlB,cAAc,CAACU,YAAY,CAAC;EAC1C,MAAMS,SAAS,GAAGlB,cAAc,CAAC;IAACmB,IAAI,EAAE;EAAI,CAAC,CAAC;EAC9C,MAAMC,OAAO,GAAGC,OAAO,CAACV,KAAK,CAAC;EAC9B,MAAMW,OAAO,GAAG,OAAOX,KAAK,KAAK,QAAQ,IAAIA,KAAK,GAAGA,KAAK,GAAGY,SAAS;EAEtE,oBACEhB,KAAA,CAACZ,MAAM;IAAC6B,mBAAmB,EAAE;MAACC,QAAQ,EAAE;IAAC,CAAE;IAAAC,QAAA,GACxCd,KAAK,gBACJP,IAAA,CAACR,WAAW;MACV8B,KAAK,EAAEX,KAAK,CAACY,WAAW,CAACR,OAAO,GAAG,qBAAqB,GAAG,mBAAmB,CAAE;MAChFS,KAAK,EAAEb,KAAK,CAACc,UAAU,CAACC,WAAY;MAAAL,QAAA,EAEnCd;IAAK,CACK,CAAC,GACZ,IAAI,eACRL,KAAA,CAACT,iBAAiB;MAChBkC,OAAO,EAAE,CAACtB,QAAS;MACnBuB,OAAO,EAAEb,OAAQ;MACjBF,SAAS,EAAEA,SAAU;MACrBgB,aAAa,EAAEpB,YAAa;MAC5BqB,UAAU,EAAE,CAACtB,SAAU;MACvBuB,SAAS,EAAE;QACTT,KAAK,EAAEX,KAAK,CAACY,WAAW,CAAC,iBAAiB,CAAC;QAC3CS,UAAU,EAAErB,KAAK,CAACc,UAAU,CAACQ,IAAI,CAACD,UAAU;QAC5CE,UAAU,EAAEvB,KAAK,CAACc,UAAU,CAACQ,IAAI,CAACC;MACpC,CAAE;MACFtB,KAAK,EAAEA,KAAM;MACbuB,oBAAoB,EAAEzB,MAAM,GAAG,UAAU,GAAG,MAAO;MAAAW,QAAA,GAElDN,OAAO,gBACNf,IAAA,CAACP,iBAAiB,CAAC2C,YAAY;QAAAf,QAAA,eAC7BrB,IAAA,CAACH,KAAK;UAACyB,KAAK,EAAC,qBAAqB;UAACe,IAAI,EAAC;QAAO,CAAE;MAAC,CACpB,CAAC,GAC/B,IAAI,EACPpB,OAAO,gBACNjB,IAAA,CAACP,iBAAiB,CAAC6C,cAAc;QAAAjB,QAAA,eAC/BrB,IAAA,CAACR,WAAW;UAAC8B,KAAK,EAAEX,KAAK,CAACY,WAAW,CAAC,qBAAqB,CAAE;UAACC,KAAK,EAAEb,KAAK,CAACc,UAAU,CAACc,QAAS;UAAAlB,QAAA,EAC5FJ;QAAO,CACG;MAAC,CACkB,CAAC,GACjC,IAAI;IAAA,CACS,CAAC;EAAA,CACd,CAAC;AAEb,CAAC","ignoreList":[]}
+{"version":3,"names":["Column","Text","ComposeText","OutlinedTextField","useNativeState","semantics","testID","testIdModifier","useSxModifiers","useAppTheme","useImperativeHandle","useMemo","useRef","Glyph","useHostGuard","autoCorrectFor","capitalizationFor","ignoreDetachedView","jsx","_jsx","jsxs","_jsxs","KEYBOARD","decimal","default","email","number","phone","url","SECURE_KEYBOARD","AUTOFILL_HINT","addressCity","countryName","creditCardNumber","emailAddress","familyName","fullStreetAddress","givenName","name","newPassword","oneTimeCode","password","postalCode","streetAddressLine1","streetAddressLine2","telephoneNumber","username","TextField","autoCapitalize","autoCorrect","autoFocus","contentType","defaultValue","disabled","error","keyboard","label","maxLength","multiline","onChangeText","onFocusChange","onSubmit","placeholder","ref","secure","submitLabel","theme","value","field","sxModifiers","wide","invalid","Boolean","message","undefined","face","fontFamily","typography","body","fontWeight","capitalization","corrects","singleLine","submits","blur","current","catch","clear","focus","modifiers","keyboardOptions","autoCorrectEnabled","imeAction","keyboardType","keyboardActions","onDone","onGo","onNext","onSearch","onSend","verticalArrangement","spacedBy","children","color","colorString","style","labelMedium","enabled","isError","onFocusChanged","onValueChange","textStyle","visualTransformation","Placeholder","TrailingIcon","SupportingText","footnote"],"sourceRoot":"../../../../src","sources":["atoms/text-field/text-field.android.tsx"],"mappings":";;AAAA,SACEA,MAAM,EACNC,IAAI,IAAIC,WAAW,EAEnBC,iBAAiB,EAIjBC,cAAc,QACT,0BAA0B;AACjC,SAAQC,SAAS,EAAEC,MAAM,IAAIC,cAAc,QAAO,oCAAoC;AACtF,SAAQC,cAAc,QAAO,gBAAgB;AAC7C,SAAQC,WAAW,QAAO,mBAAmB;AAC7C,SAAQC,mBAAmB,EAAEC,OAAO,EAAEC,MAAM,QAAO,OAAO;AAC1D,SAAQC,KAAK,QAAO,sBAAa;AACjC,SAAQC,YAAY,QAAO,uBAAoB;AAE/C,SAAQC,cAAc,EAAEC,iBAAiB,EAAEC,kBAAkB,QAAO,uBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAExF,MAAMC,QAAQ,GAAG;EACfC,OAAO,EAAE,SAAS;EAClBC,OAAO,EAAE,MAAM;EACfC,KAAK,EAAE,OAAO;EACdC,MAAM,EAAE,QAAQ;EAChBC,KAAK,EAAE,OAAO;EACdC,GAAG,EAAE;AACP,CAAqE;;AAErE;AACA;AACA;AACA;AACA,MAAMC,eAAe,GAAG;EACtB,GAAGP,QAAQ;EACXE,OAAO,EAAE,UAAU;EACnBE,MAAM,EAAE;AACV,CAAqE;;AAErE;AACA,MAAMI,aAAa,GAAG;EACpBC,WAAW,EAAE,yBAAyB;EACtCC,WAAW,EAAE,SAAS;EACtBC,gBAAgB,EAAE,WAAW;EAC7BC,YAAY,EAAE,OAAO;EACrBC,UAAU,EAAE,aAAa;EACzBC,iBAAiB,EAAE,gBAAgB;EACnCC,SAAS,EAAE,YAAY;EACvBC,IAAI,EAAE,MAAM;EACZC,WAAW,EAAE,cAAc;EAC3BC,WAAW,EAAE,eAAe;EAC5BC,QAAQ,EAAE,UAAU;EACpBC,UAAU,EAAE,aAAa;EACzBC,kBAAkB,EAAE,eAAe;EACnCC,kBAAkB,EAAE,eAAe;EACnCC,eAAe,EAAE,KAAK;EACtBC,QAAQ,EAAE;AACZ,CAAyD;AAEzD,OAAO,MAAMC,SAA6B,GAAGA,CAAC;EAC5CC,cAAc;EACdC,WAAW;EACXC,SAAS,GAAG,KAAK;EACjBC,WAAW;EACXC,YAAY,GAAG,EAAE;EACjBC,QAAQ,GAAG,KAAK;EAChBC,KAAK,GAAG,KAAK;EACbC,QAAQ,GAAG,SAAS;EACpBC,KAAK;EACLC,SAAS;EACTC,SAAS,GAAG,KAAK;EACjBC,YAAY;EACZC,aAAa;EACbC,QAAQ;EACRC,WAAW;EACXC,GAAG;EACHC,MAAM,GAAG,KAAK;EACdC,WAAW;EACX3D;AACc,CAAC,KAAK;EACpBQ,YAAY,CAAC,WAAW,CAAC;EACzB,MAAMoD,KAAK,GAAGzD,WAAW,CAAC,CAAC;EAC3B,MAAM0D,KAAK,GAAG/D,cAAc,CAACgD,YAAY,CAAC;EAC1C,MAAMgB,KAAK,GAAGxD,MAAM,CAAsB,IAAI,CAAC;EAC/C,MAAMyD,WAAW,GAAG7D,cAAc,CAAC;IAAC8D,IAAI,EAAE;EAAI,CAAC,CAAC;EAChD,MAAMC,OAAO,GAAGC,OAAO,CAAClB,KAAK,CAAC;EAC9B,MAAMmB,OAAO,GAAG,OAAOnB,KAAK,KAAK,QAAQ,IAAIA,KAAK,GAAGA,KAAK,GAAGoB,SAAS;EACtE,MAAMC,IAAI,GAAG;IAACC,UAAU,EAAEV,KAAK,CAACW,UAAU,CAACC,IAAI,CAACF,UAAU;IAAEG,UAAU,EAAEb,KAAK,CAACW,UAAU,CAACC,IAAI,CAACC;EAAU,CAAC;EACzG,MAAMC,cAAc,GAAGhE,iBAAiB,CAACuC,QAAQ,EAAEP,cAAc,CAAC,IAAI,MAAM;EAC5E,MAAMiC,QAAQ,GAAG,CAACjB,MAAM,IAAIjD,cAAc,CAACwC,QAAQ,EAAEN,WAAW,CAAC;EACjE,MAAMiC,UAAU,GAAG,CAACxB,SAAS;EAC7B,MAAMyB,OAAO,GAAGD,UAAU,IAAIV,OAAO,CAACX,QAAQ,CAAC;EAE/CnD,mBAAmB,CACjBqD,GAAG,EACH,OAAO;IACLqB,IAAI,EAAEA,CAAA,KAAMhB,KAAK,CAACiB,OAAO,EAAED,IAAI,CAAC,CAAC,CAACE,KAAK,CAACrE,kBAAkB,CAAC;IAC3D;IACAsE,KAAK,EAAEA,CAAA,KAAM;MACXnB,KAAK,CAACiB,OAAO,EAAEE,KAAK,CAAC,CAAC,CAACD,KAAK,CAACrE,kBAAkB,CAAC;MAChD0C,YAAY,GAAG,EAAE,CAAC;IACpB,CAAC;IACD6B,KAAK,EAAEA,CAAA,KAAMpB,KAAK,CAACiB,OAAO,EAAEG,KAAK,CAAC,CAAC,CAACF,KAAK,CAACrE,kBAAkB;EAC9D,CAAC,CAAC,EACF,CAAC0C,YAAY,CACf,CAAC;EAED,MAAM8B,SAAS,GAAG9E,OAAO,CACvB,MAAM,CACJ,GAAG0D,WAAW,EACd,IAAI/D,MAAM,GAAG,CAACC,cAAc,CAACD,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAC3C,IAAI6C,WAAW,GAAG,CAAC9C,SAAS,CAAC;IAAC8C,WAAW,EAAErB,aAAa,CAACqB,WAAW;EAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAC/E,EACD,CAACA,WAAW,EAAEkB,WAAW,EAAE/D,MAAM,CACnC,CAAC;;EAED;AACF;AACA;AACA;EACE,MAAMoF,eAAe,GAAG/E,OAAO,CAC7B,OAAO;IACLgF,kBAAkB,EAAEV,QAAQ;IAC5BD,cAAc;IACdY,SAAS,EAAEV,UAAU,GAAIjB,WAAW,KAAKkB,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC,GAAI,SAAS;IACnFU,YAAY,EAAE,CAAC7B,MAAM,GAAGnC,eAAe,GAAGP,QAAQ,EAAEiC,QAAQ;EAC9D,CAAC,CAAC,EACF,CAACyB,cAAc,EAAEC,QAAQ,EAAE1B,QAAQ,EAAES,MAAM,EAAEkB,UAAU,EAAEjB,WAAW,EAAEkB,OAAO,CAC/E,CAAC;;EAED;EACA,MAAMW,eAAe,GAAGnF,OAAO,CAC7B,MACEwE,OAAO,IAAItB,QAAQ,GACf;IAACkC,MAAM,EAAElC,QAAQ;IAAEmC,IAAI,EAAEnC,QAAQ;IAAEoC,MAAM,EAAEpC,QAAQ;IAAEqC,QAAQ,EAAErC,QAAQ;IAAEsC,MAAM,EAAEtC;EAAQ,CAAC,GAC1Fa,SAAS,EACf,CAACb,QAAQ,EAAEsB,OAAO,CACpB,CAAC;EAED,oBACE9D,KAAA,CAACrB,MAAM;IAACoG,mBAAmB,EAAE;MAACC,QAAQ,EAAE;IAAC,CAAE;IAAAC,QAAA,GACxC9C,KAAK,gBACJrC,IAAA,CAACjB,WAAW;MACVqG,KAAK,EAAErC,KAAK,CAACsC,WAAW,CAACjC,OAAO,GAAG,qBAAqB,GAAG,mBAAmB,CAAE;MAChFkC,KAAK,EAAEvC,KAAK,CAACW,UAAU,CAAC6B,WAAY;MAAAJ,QAAA,EAEnC9C;IAAK,CACK,CAAC,GACZ,IAAI,eACRnC,KAAA,CAAClB,iBAAiB;MAChB+C,SAAS,EAAEA,SAAU;MACrByD,OAAO,EAAE,CAACtD,QAAS;MACnBuD,OAAO,EAAErC,OAAQ;MACjBuB,eAAe,EAAEA,eAAgB;MACjCJ,eAAe,EAAEA,eAAgB;MACjCjC,SAAS,EAAEA,SAAU;MACrBgC,SAAS,EAAEA,SAAU;MACrBoB,cAAc,EAAEjD,aAAc;MAC9BkD,aAAa,EAAEnD,YAAa;MAC5BI,GAAG,EAAEK,KAAM;MACXc,UAAU,EAAEA,UAAW;MACvB6B,SAAS,EAAE;QAACR,KAAK,EAAErC,KAAK,CAACsC,WAAW,CAAC,iBAAiB,CAAC;QAAE,GAAG7B;MAAI,CAAE;MAClER,KAAK,EAAEA,KAAM;MACb6C,oBAAoB,EAAEhD,MAAM,GAAG,UAAU,GAAG,MAAO;MAAAsC,QAAA,GAElDxC,WAAW;MAAA;MACV;MACA3C,IAAA,CAAChB,iBAAiB,CAAC8G,WAAW;QAAAX,QAAA,eAC5BnF,IAAA,CAACjB,WAAW;UAACuG,KAAK,EAAE9B,IAAK;UAAA2B,QAAA,EAAExC;QAAW,CAAc;MAAC,CACxB,CAAC,GAC9B,IAAI,EACPS,OAAO,gBACNpD,IAAA,CAAChB,iBAAiB,CAAC+G,YAAY;QAAAZ,QAAA,eAC7BnF,IAAA,CAACN,KAAK;UAAC0F,KAAK,EAAC,qBAAqB;UAACjE,IAAI,EAAC;QAAO,CAAE;MAAC,CACpB,CAAC,GAC/B,IAAI,EACPmC,OAAO,gBACNtD,IAAA,CAAChB,iBAAiB,CAACgH,cAAc;QAAAb,QAAA,eAC/BnF,IAAA,CAACjB,WAAW;UAACqG,KAAK,EAAErC,KAAK,CAACsC,WAAW,CAAC,qBAAqB,CAAE;UAACC,KAAK,EAAEvC,KAAK,CAACW,UAAU,CAACuC,QAAS;UAAAd,QAAA,EAC5F7B;QAAO,CACG;MAAC,CACkB,CAAC,GACjC,IAAI;IAAA,CACS,CAAC;EAAA,CACd,CAAC;AAEb,CAAC","ignoreList":[]}