@expo/ui 58.0.21 → 58.0.22

package/build/universal/ScrollView/index.ios.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Group, ScrollView as SwiftUIScrollView } from '@expo/ui/swift-ui';
+import { HStack, ScrollView as SwiftUIScrollView, VStack } from '@expo/ui/swift-ui';
 import { frame, padding } from '@expo/ui/swift-ui/modifiers';
 import { transformToModifiers } from '../transformStyle';
 export function ScrollView({ children, direction = 'vertical', showsIndicators = true, style, onPress, onAppear, onDisappear, disabled, hidden, testID, modifiers: extraModifiers }) {
-    // Extract padding from style — it goes on the inner Group so content is
+    // Extract padding from style — it goes on the inner stack so content is
     // inset after stretching to full width.
     const { padding: paddingAll, paddingHorizontal, paddingVertical, paddingTop, paddingBottom, paddingLeft, paddingRight, ...styleWithoutPadding } = style ?? {};
     const scrollModifiers = transformToModifiers(Object.keys(styleWithoutPadding).length > 0 ? styleWithoutPadding : undefined, {
@@ -34,15 +34,21 @@ export function ScrollView({ children, direction = 'vertical', showsIndicators =
             trailing: paddingRight
         }));
     }
+    const stack = direction === 'horizontal' ? /*#__PURE__*/ _jsx(HStack, {
+        alignment: "top",
+        modifiers: innerModifiers,
+        children: children
+    }) : /*#__PURE__*/ _jsx(VStack, {
+        alignment: "leading",
+        modifiers: innerModifiers,
+        children: children
+    });
     return /*#__PURE__*/ _jsx(SwiftUIScrollView, {
         axes: direction,
         showsIndicators: showsIndicators,
         modifiers: scrollModifiers,
         testID: testID,
-        children: /*#__PURE__*/ _jsx(Group, {
-            modifiers: innerModifiers,
-            children: children
-        })
+        children: stack
     });
 }
 export * from './types';

package/build/universal/ScrollView/index.ios.js.map

@@ -1 +1 @@
-{"version":3,"sources":["universal/ScrollView/index.ios.tsx"],"sourcesContent":[null],"names":["Group","ScrollView","SwiftUIScrollView","frame","padding","transformToModifiers","children","direction","showsIndicators","style","onPress","onAppear","onDisappear","disabled","hidden","testID","modifiers","extraModifiers","paddingAll","paddingHorizontal","paddingVertical","paddingTop","paddingBottom","paddingLeft","paddingRight","styleWithoutPadding","scrollModifiers","Object","keys","length","undefined","innerModifiers","maxWidth","Infinity","alignment","hasPadding","push","all","horizontal","vertical","top","bottom","leading","trailing","axes"],"mappings":";AAAA,SAASA,KAAK,EAAEC,cAAcC,iBAAiB,QAAQ,oBAAoB;AAC3E,SAASC,KAAK,EAAEC,OAAO,QAAQ,8BAA8B;AAG7D,SAASC,oBAAoB,QAAQ,oBAAoB;AAGzD,OAAO,SAASJ,WAAW,EACzBK,QAAQ,EACRC,YAAY,UAAU,EACtBC,kBAAkB,IAAI,EACtBC,KAAK,EACLC,OAAO,EACPC,QAAQ,EACRC,WAAW,EACXC,QAAQ,EACRC,MAAM,EACNC,MAAM,EACNC,WAAWC,cAAc,EACT;IAChB,wEAAwE;IACxE,wCAAwC;IACxC,MAAM,EACJb,SAASc,UAAU,EACnBC,iBAAiB,EACjBC,eAAe,EACfC,UAAU,EACVC,aAAa,EACbC,WAAW,EACXC,YAAY,EACZ,GAAGC,qBACJ,GAAGhB,SAAS,CAAC;IAEd,MAAMiB,kBAAkBrB,qBACtBsB,OAAOC,IAAI,CAACH,qBAAqBI,MAAM,GAAG,IAAKJ,sBAAuCK,WACtF;QAAEpB;QAASC;QAAUC;QAAaC;QAAUC;QAAQC;IAAO,GAC3DE;IAGF,yEAAyE;IACzE,iDAAiD;IACjD,MAAMc,iBAAmC;QAAC5B,MAAM;YAAE6B,UAAUC;YAAUC,WAAW;QAAa;KAAG;IAEjG,MAAMC,aACJjB,cAAc,QACdC,qBAAqB,QACrBC,mBAAmB,QACnBC,cAAc,QACdC,iBAAiB,QACjBC,eAAe,QACfC,gBAAgB;IAElB,IAAIW,YAAY;QACdJ,eAAeK,IAAI,CACjBhC,QAAQ;YACNiC,KAAKnB;YACLoB,YAAYnB;YACZoB,UAAUnB;YACVoB,KAAKnB;YACLoB,QAAQnB;YACRoB,SAASnB;YACToB,UAAUnB;QACZ;IAEJ;IAEA,qBACE,KAACtB;QACC0C,MAAMrC;QACNC,iBAAiBA;QACjBQ,WAAWU;QACXX,QAAQA;kBACR,cAAA,KAACf;YAAMgB,WAAWe;sBAAiBzB;;;AAGzC;AAEA,cAAc,UAAU"}
+{"version":3,"sources":["universal/ScrollView/index.ios.tsx"],"sourcesContent":[null],"names":["HStack","ScrollView","SwiftUIScrollView","VStack","frame","padding","transformToModifiers","children","direction","showsIndicators","style","onPress","onAppear","onDisappear","disabled","hidden","testID","modifiers","extraModifiers","paddingAll","paddingHorizontal","paddingVertical","paddingTop","paddingBottom","paddingLeft","paddingRight","styleWithoutPadding","scrollModifiers","Object","keys","length","undefined","innerModifiers","maxWidth","Infinity","alignment","hasPadding","push","all","horizontal","vertical","top","bottom","leading","trailing","stack","axes"],"mappings":";AAAA,SAASA,MAAM,EAAEC,cAAcC,iBAAiB,EAAEC,MAAM,QAAQ,oBAAoB;AACpF,SAASC,KAAK,EAAEC,OAAO,QAAQ,8BAA8B;AAG7D,SAASC,oBAAoB,QAAQ,oBAAoB;AAGzD,OAAO,SAASL,WAAW,EACzBM,QAAQ,EACRC,YAAY,UAAU,EACtBC,kBAAkB,IAAI,EACtBC,KAAK,EACLC,OAAO,EACPC,QAAQ,EACRC,WAAW,EACXC,QAAQ,EACRC,MAAM,EACNC,MAAM,EACNC,WAAWC,cAAc,EACT;IAChB,wEAAwE;IACxE,wCAAwC;IACxC,MAAM,EACJb,SAASc,UAAU,EACnBC,iBAAiB,EACjBC,eAAe,EACfC,UAAU,EACVC,aAAa,EACbC,WAAW,EACXC,YAAY,EACZ,GAAGC,qBACJ,GAAGhB,SAAS,CAAC;IAEd,MAAMiB,kBAAkBrB,qBACtBsB,OAAOC,IAAI,CAACH,qBAAqBI,MAAM,GAAG,IAAKJ,sBAAuCK,WACtF;QAAEpB;QAASC;QAAUC;QAAaC;QAAUC;QAAQC;IAAO,GAC3DE;IAGF,yEAAyE;IACzE,iDAAiD;IACjD,MAAMc,iBAAmC;QAAC5B,MAAM;YAAE6B,UAAUC;YAAUC,WAAW;QAAa;KAAG;IAEjG,MAAMC,aACJjB,cAAc,QACdC,qBAAqB,QACrBC,mBAAmB,QACnBC,cAAc,QACdC,iBAAiB,QACjBC,eAAe,QACfC,gBAAgB;IAElB,IAAIW,YAAY;QACdJ,eAAeK,IAAI,CACjBhC,QAAQ;YACNiC,KAAKnB;YACLoB,YAAYnB;YACZoB,UAAUnB;YACVoB,KAAKnB;YACLoB,QAAQnB;YACRoB,SAASnB;YACToB,UAAUnB;QACZ;IAEJ;IAEA,MAAMoB,QACJrC,cAAc,6BACZ,KAACR;QAAOmC,WAAU;QAAMlB,WAAWe;kBAChCzB;uBAGH,KAACJ;QAAOgC,WAAU;QAAUlB,WAAWe;kBACpCzB;;IAIP,qBACE,KAACL;QACC4C,MAAMtC;QACNC,iBAAiBA;QACjBQ,WAAWU;QACXX,QAAQA;kBACP6B;;AAGP;AAEA,cAAc,UAAU"}

package/build/universal/Switch/index.android.js

@@ -1,19 +1,28 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Row, Switch as ComposeSwitch, Text } from '@expo/ui/jetpack-compose';
-import { fillMaxWidth, IntrinsicSize, testID as testIDModifier, weight, width } from '@expo/ui/jetpack-compose/modifiers';
+import { defaultMinSize, fillMaxWidth, IntrinsicSize, testID as testIDModifier, toggleable, weight, width } from '@expo/ui/jetpack-compose/modifiers';
+// Material's minimum touch target.
+const MIN_INTERACTIVE_SIZE = 48;
 export function Switch({ value, onValueChange, label, disabled, testID, modifiers }) {
+    const isLabeled = label != null;
     const toggle = /*#__PURE__*/ _jsx(ComposeSwitch, {
         value: value,
-        onCheckedChange: disabled ? undefined : onValueChange,
+        onCheckedChange: isLabeled ? undefined : onValueChange,
         enabled: !disabled,
         modifiers: [
             ...modifiers ?? [],
+            ...isLabeled ? [
+                defaultMinSize({
+                    minWidth: MIN_INTERACTIVE_SIZE,
+                    minHeight: MIN_INTERACTIVE_SIZE
+                })
+            ] : [],
             ...testID ? [
                 testIDModifier(testID)
             ] : []
         ]
     });
-    if (label == null) return toggle;
+    if (!isLabeled) return toggle;
     return /*#__PURE__*/ _jsxs(Row, {
         verticalAlignment: "center",
         horizontalArrangement: {
@@ -21,7 +30,11 @@ export function Switch({ value, onValueChange, label, disabled, testID, modifier
         },
         modifiers: [
             fillMaxWidth(),
-            width(IntrinsicSize.Max)
+            width(IntrinsicSize.Max),
+            toggleable(value, ()=>!disabled && onValueChange(!value), {
+                role: 'switch',
+                enabled: !disabled
+            })
         ],
         children: [
             /*#__PURE__*/ _jsx(Text, {

package/build/universal/Switch/index.android.js.map

@@ -1 +1 @@
-{"version":3,"sources":["universal/Switch/index.android.tsx"],"sourcesContent":[null],"names":["Row","Switch","ComposeSwitch","Text","fillMaxWidth","IntrinsicSize","testID","testIDModifier","weight","width","value","onValueChange","label","disabled","modifiers","toggle","onCheckedChange","undefined","enabled","verticalAlignment","horizontalArrangement","spacedBy","Max"],"mappings":";AAAA,SAASA,GAAG,EAAEC,UAAUC,aAAa,EAAEC,IAAI,QAAQ,2BAA2B;AAC9E,SACEC,YAAY,EACZC,aAAa,EACbC,UAAUC,cAAc,EACxBC,MAAM,EACNC,KAAK,QACA,qCAAqC;AAI5C,OAAO,SAASR,OAAO,EAAES,KAAK,EAAEC,aAAa,EAAEC,KAAK,EAAEC,QAAQ,EAAEP,MAAM,EAAEQ,SAAS,EAAe;IAC9F,MAAMC,uBACJ,KAACb;QACCQ,OAAOA;QACPM,iBAAiBH,WAAWI,YAAYN;QACxCO,SAAS,CAACL;QACVC,WAAW;eAAKA,aAAa,EAAE;eAAOR,SAAS;gBAACC,eAAeD;aAAQ,GAAG,EAAE;SAAE;;IAIlF,IAAIM,SAAS,MAAM,OAAOG;IAE1B,qBACE,MAACf;QACCmB,mBAAkB;QAClBC,uBAAuB;YAAEC,UAAU;QAAE;QACrCP,WAAW;YAACV;YAAgBK,MAAMJ,cAAciB,GAAG;SAAE;;0BACrD,KAACnB;gBAAKW,WAAW;oBAACN,OAAO;iBAAG;0BAAGI;;YAC9BG;;;AAGP;AAEA,cAAc,UAAU"}
+{"version":3,"sources":["universal/Switch/index.android.tsx"],"sourcesContent":[null],"names":["Row","Switch","ComposeSwitch","Text","defaultMinSize","fillMaxWidth","IntrinsicSize","testID","testIDModifier","toggleable","weight","width","MIN_INTERACTIVE_SIZE","value","onValueChange","label","disabled","modifiers","isLabeled","toggle","onCheckedChange","undefined","enabled","minWidth","minHeight","verticalAlignment","horizontalArrangement","spacedBy","Max","role"],"mappings":";AAAA,SAASA,GAAG,EAAEC,UAAUC,aAAa,EAAEC,IAAI,QAAQ,2BAA2B;AAC9E,SACEC,cAAc,EACdC,YAAY,EACZC,aAAa,EACbC,UAAUC,cAAc,EACxBC,UAAU,EACVC,MAAM,EACNC,KAAK,QACA,qCAAqC;AAI5C,mCAAmC;AACnC,MAAMC,uBAAuB;AAE7B,OAAO,SAASX,OAAO,EAAEY,KAAK,EAAEC,aAAa,EAAEC,KAAK,EAAEC,QAAQ,EAAET,MAAM,EAAEU,SAAS,EAAe;IAC9F,MAAMC,YAAYH,SAAS;IAC3B,MAAMI,uBACJ,KAACjB;QACCW,OAAOA;QACPO,iBAAiBF,YAAYG,YAAYP;QACzCQ,SAAS,CAACN;QACVC,WAAW;eACLA,aAAa,EAAE;eACfC,YACA;gBAACd,eAAe;oBAAEmB,UAAUX;oBAAsBY,WAAWZ;gBAAqB;aAAG,GACrF,EAAE;eACFL,SAAS;gBAACC,eAAeD;aAAQ,GAAG,EAAE;SAC3C;;IAIL,IAAI,CAACW,WAAW,OAAOC;IAEvB,qBACE,MAACnB;QACCyB,mBAAkB;QAClBC,uBAAuB;YAAEC,UAAU;QAAE;QACrCV,WAAW;YACTZ;YACAM,MAAML,cAAcsB,GAAG;YACvBnB,WAAWI,OAAO,IAAM,CAACG,YAAYF,cAAc,CAACD,QAAQ;gBAC1DgB,MAAM;gBACNP,SAAS,CAACN;YACZ;SACD;;0BACD,KAACb;gBAAKc,WAAW;oBAACP,OAAO;iBAAG;0BAAGK;;YAC9BI;;;AAGP;AAEA,cAAc,UAAU"}

package/build/universal/Switch/index.js

@@ -25,6 +25,7 @@ const styles = StyleSheet.create({
     },
     text: {
         color: colors.foreground,
+        flexGrow: 1,
         userSelect: 'none'
     },
     track: {

package/build/universal/Switch/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["universal/Switch/index.tsx"],"sourcesContent":[null],"names":["View","Text","StyleSheet","useFocusVisible","colors","createWebComponent","durations","easings","shadows","Input","styles","create","view","alignItems","cursor","display","flexDirection","gap","viewDisabled","opacity","input","position","pointerEvents","margin","width","height","text","color","foreground","userSelect","track","backgroundColor","gray","borderRadius","transitionDuration","base","transitionProperty","transitionTimingFunction","standard","trackChecked","primary","focused","boxShadow","focus","thumb","top","left","thumbChecked","transform","Switch","value","onValueChange","label","disabled","testID","focusVisible","onFocus","onBlur","aria-disabled","role","style","type","checked","onChange","target"],"mappings":";AAAA,SAASA,IAAI,EAAEC,IAAI,EAAEC,UAAU,QAAQ,eAAe;AAEtD,SAASC,eAAe,QAAQ,WAAW;AAC3C,SAASC,MAAM,EAAEC,kBAAkB,EAAEC,SAAS,EAAEC,OAAO,EAAEC,OAAO,QAAQ,cAAc;AAGtF,MAAMC,QAAQJ,mBAAmB;AAEjC,MAAMK,SAASR,WAAWS,MAAM,CAAC;IAC/BC,MAAM;QACJC,YAAY;QACZC,QAAQ;QACRC,SAAS;QACTC,eAAe;QACfC,KAAK;IACP;IACAC,cAAc;QACZJ,QAAQ;QACRK,SAAS;IACX;IACAC,OAAO;QACLC,UAAU;QACVF,SAAS;QACTG,eAAe;QACfC,QAAQ;QACRC,OAAO;QACPC,QAAQ;IACV;IACAC,MAAM;QACJC,OAAOvB,OAAOwB,UAAU;QACxBC,YAAY;IACd;IACAC,OAAO;QACLC,iBAAiB3B,OAAO4B,IAAI,CAAC,IAAI;QACjCC,cAAc,KAAK;QACnBR,QAAQ;QACRJ,UAAU;QACVa,oBAAoB5B,UAAU6B,IAAI;QAClCC,oBAAoB;QACpBC,0BAA0B9B,QAAQ+B,QAAQ;QAC1Cd,OAAO;IACT;IACAe,cAAc;QACZR,iBAAiB3B,OAAOoC,OAAO,CAAC,IAAI;IACtC;IACAC,SAAS;QACPC,WAAWlC,QAAQmC,KAAK;IAC1B;IACAC,OAAO;QACLvB,UAAU;QACVwB,KAAK;QACLC,MAAM;QACNf,iBAAiB;QACjBE,cAAc,KAAK;QACnBS,WAAW;QACXjB,QAAQ;QACRD,OAAO;QACPU,oBAAoB5B,UAAU6B,IAAI;QAClCC,oBAAoB;QACpBC,0BAA0B9B,QAAQ+B,QAAQ;IAC5C;IACAS,cAAc;QACZC,WAAW;IACb;AACF;AAEA;;CAEC,GACD,OAAO,SAASC,OAAO,EAAEC,KAAK,EAAEC,aAAa,EAAEC,KAAK,EAAEC,WAAW,KAAK,EAAEC,MAAM,EAAe;IAC3F,MAAM,EAAEC,YAAY,EAAEC,OAAO,EAAEC,MAAM,EAAE,GAAGtD;IAE1C,qBACE,MAACH;QACC0D,iBAAeL;QACfM,MAAK;QACLC,OAAO;YAAClD,OAAOE,IAAI;YAAEyC,YAAY3C,OAAOQ,YAAY;SAAC;;0BACrD,KAACT;gBACCoD,MAAK;gBACLF,MAAK;gBACLH,SAASA;gBACTC,QAAQA;gBACRK,SAASZ;gBACTG,UAAUA;gBACVC,QAAQA;gBACRM,OAAOlD,OAAOU,KAAK;gBACnB2C,UAAU,CAAC,EAAEC,QAAQ,EAAEF,OAAO,EAAE,EAAE,GAAKX,cAAcW;;YAGtDV,SAAS,sBAAQ,KAACnD;gBAAK2D,OAAOlD,OAAOgB,IAAI;0BAAG0B;;0BAE7C,KAACpD;gBAAK4D,OAAO;oBAAClD,OAAOoB,KAAK;oBAAEoB,SAASxC,OAAO6B,YAAY;oBAAEgB,gBAAgB7C,OAAO+B,OAAO;iBAAC;0BACvF,cAAA,KAACzC;oBAAK4D,OAAO;wBAAClD,OAAOkC,KAAK;wBAAEM,SAASxC,OAAOqC,YAAY;qBAAC;;;;;AAIjE;AAEA,cAAc,UAAU"}
+{"version":3,"sources":["universal/Switch/index.tsx"],"sourcesContent":[null],"names":["View","Text","StyleSheet","useFocusVisible","colors","createWebComponent","durations","easings","shadows","Input","styles","create","view","alignItems","cursor","display","flexDirection","gap","viewDisabled","opacity","input","position","pointerEvents","margin","width","height","text","color","foreground","flexGrow","userSelect","track","backgroundColor","gray","borderRadius","transitionDuration","base","transitionProperty","transitionTimingFunction","standard","trackChecked","primary","focused","boxShadow","focus","thumb","top","left","thumbChecked","transform","Switch","value","onValueChange","label","disabled","testID","focusVisible","onFocus","onBlur","aria-disabled","role","style","type","checked","onChange","target"],"mappings":";AAAA,SAASA,IAAI,EAAEC,IAAI,EAAEC,UAAU,QAAQ,eAAe;AAEtD,SAASC,eAAe,QAAQ,WAAW;AAC3C,SAASC,MAAM,EAAEC,kBAAkB,EAAEC,SAAS,EAAEC,OAAO,EAAEC,OAAO,QAAQ,cAAc;AAGtF,MAAMC,QAAQJ,mBAAmB;AAEjC,MAAMK,SAASR,WAAWS,MAAM,CAAC;IAC/BC,MAAM;QACJC,YAAY;QACZC,QAAQ;QACRC,SAAS;QACTC,eAAe;QACfC,KAAK;IACP;IACAC,cAAc;QACZJ,QAAQ;QACRK,SAAS;IACX;IACAC,OAAO;QACLC,UAAU;QACVF,SAAS;QACTG,eAAe;QACfC,QAAQ;QACRC,OAAO;QACPC,QAAQ;IACV;IACAC,MAAM;QACJC,OAAOvB,OAAOwB,UAAU;QACxBC,UAAU;QACVC,YAAY;IACd;IACAC,OAAO;QACLC,iBAAiB5B,OAAO6B,IAAI,CAAC,IAAI;QACjCC,cAAc,KAAK;QACnBT,QAAQ;QACRJ,UAAU;QACVc,oBAAoB7B,UAAU8B,IAAI;QAClCC,oBAAoB;QACpBC,0BAA0B/B,QAAQgC,QAAQ;QAC1Cf,OAAO;IACT;IACAgB,cAAc;QACZR,iBAAiB5B,OAAOqC,OAAO,CAAC,IAAI;IACtC;IACAC,SAAS;QACPC,WAAWnC,QAAQoC,KAAK;IAC1B;IACAC,OAAO;QACLxB,UAAU;QACVyB,KAAK;QACLC,MAAM;QACNf,iBAAiB;QACjBE,cAAc,KAAK;QACnBS,WAAW;QACXlB,QAAQ;QACRD,OAAO;QACPW,oBAAoB7B,UAAU8B,IAAI;QAClCC,oBAAoB;QACpBC,0BAA0B/B,QAAQgC,QAAQ;IAC5C;IACAS,cAAc;QACZC,WAAW;IACb;AACF;AAEA;;CAEC,GACD,OAAO,SAASC,OAAO,EAAEC,KAAK,EAAEC,aAAa,EAAEC,KAAK,EAAEC,WAAW,KAAK,EAAEC,MAAM,EAAe;IAC3F,MAAM,EAAEC,YAAY,EAAEC,OAAO,EAAEC,MAAM,EAAE,GAAGvD;IAE1C,qBACE,MAACH;QACC2D,iBAAeL;QACfM,MAAK;QACLC,OAAO;YAACnD,OAAOE,IAAI;YAAE0C,YAAY5C,OAAOQ,YAAY;SAAC;;0BACrD,KAACT;gBACCqD,MAAK;gBACLF,MAAK;gBACLH,SAASA;gBACTC,QAAQA;gBACRK,SAASZ;gBACTG,UAAUA;gBACVC,QAAQA;gBACRM,OAAOnD,OAAOU,KAAK;gBACnB4C,UAAU,CAAC,EAAEC,QAAQ,EAAEF,OAAO,EAAE,EAAE,GAAKX,cAAcW;;YAGtDV,SAAS,sBAAQ,KAACpD;gBAAK4D,OAAOnD,OAAOgB,IAAI;0BAAG2B;;0BAE7C,KAACrD;gBAAK6D,OAAO;oBAACnD,OAAOqB,KAAK;oBAAEoB,SAASzC,OAAO8B,YAAY;oBAAEgB,gBAAgB9C,OAAOgC,OAAO;iBAAC;0BACvF,cAAA,KAAC1C;oBAAK6D,OAAO;wBAACnD,OAAOmC,KAAK;wBAAEM,SAASzC,OAAOsC,YAAY;qBAAC;;;;;AAIjE;AAEA,cAAc,UAAU"}

package/build/universal/Text/index.js

@@ -3,10 +3,10 @@ import { Text as RNText, StyleSheet, useColorScheme } from 'react-native';
 import { useUniversalLifecycle } from '../hooks';
 const styles = StyleSheet.create({
     light: {
-        color: '#000000'
+        color: 'var(--expo-ui-foreground, #000000)'
     },
     dark: {
-        color: '#FFFFFF'
+        color: 'var(--expo-ui-foreground, #FFFFFF)'
     },
     hidden: {
         display: 'none'

package/build/universal/Text/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["universal/Text/index.tsx"],"sourcesContent":[null],"names":["Text","RNText","StyleSheet","useColorScheme","useUniversalLifecycle","styles","create","light","color","dark","hidden","display","disabled","opacity","children","textStyle","numberOfLines","style","onPress","onAppear","onDisappear","testID","isDarkScheme"],"mappings":";AAAA,SAASA,QAAQC,MAAM,EAAEC,UAAU,EAAEC,cAAc,QAAQ,eAAe;AAE1E,SAASC,qBAAqB,QAAQ,WAAW;AAGjD,MAAMC,SAASH,WAAWI,MAAM,CAAC;IAC/BC,OAAO;QAAEC,OAAO;IAAU;IAC1BC,MAAM;QAAED,OAAO;IAAU;IACzBE,QAAQ;QAAEC,SAAS;IAAO;IAC1BC,UAAU;QAAEC,SAAS;IAAI;AAC3B;AAEA;;CAEC,GACD,OAAO,SAASb,KAAK,EACnBc,QAAQ,EACRC,SAAS,EACTC,aAAa,EACbC,KAAK,EACLC,OAAO,EACPC,QAAQ,EACRC,WAAW,EACXR,WAAW,KAAK,EAChBF,SAAS,KAAK,EACdW,MAAM,EACI;IACVjB,sBAAsBe,UAAUC;IAEhC,MAAME,eAAenB,qBAAqB;IAE1C,qBACE,KAACF;QACCe,eAAeA;QACfE,SAASA;QACTN,UAAUA;QACVS,QAAQA;QACRJ,OAAO;YACLK,eAAejB,OAAOI,IAAI,GAAGJ,OAAOE,KAAK;YACzCU;YACAF;YACAL,UAAUL,OAAOK,MAAM;YACvBE,YAAYP,OAAOO,QAAQ;SAC5B;kBACAE;;AAGP;AAEA,cAAc,UAAU"}
+{"version":3,"sources":["universal/Text/index.tsx"],"sourcesContent":[null],"names":["Text","RNText","StyleSheet","useColorScheme","useUniversalLifecycle","styles","create","light","color","dark","hidden","display","disabled","opacity","children","textStyle","numberOfLines","style","onPress","onAppear","onDisappear","testID","isDarkScheme"],"mappings":";AAAA,SAASA,QAAQC,MAAM,EAAEC,UAAU,EAAEC,cAAc,QAAQ,eAAe;AAE1E,SAASC,qBAAqB,QAAQ,WAAW;AAGjD,MAAMC,SAASH,WAAWI,MAAM,CAAC;IAC/BC,OAAO;QAAEC,OAAO;IAAqC;IACrDC,MAAM;QAAED,OAAO;IAAqC;IACpDE,QAAQ;QAAEC,SAAS;IAAO;IAC1BC,UAAU;QAAEC,SAAS;IAAI;AAC3B;AAEA;;CAEC,GACD,OAAO,SAASb,KAAK,EACnBc,QAAQ,EACRC,SAAS,EACTC,aAAa,EACbC,KAAK,EACLC,OAAO,EACPC,QAAQ,EACRC,WAAW,EACXR,WAAW,KAAK,EAChBF,SAAS,KAAK,EACdW,MAAM,EACI;IACVjB,sBAAsBe,UAAUC;IAEhC,MAAME,eAAenB,qBAAqB;IAE1C,qBACE,KAACF;QACCe,eAAeA;QACfE,SAASA;QACTN,UAAUA;QACVS,QAAQA;QACRJ,OAAO;YACLK,eAAejB,OAAOI,IAAI,GAAGJ,OAAOE,KAAK;YACzCU;YACAF;YACAL,UAAUL,OAAOK,MAAM;YACvBE,YAAYP,OAAOO,QAAQ;SAC5B;kBACAE;;AAGP;AAEA,cAAc,UAAU"}

package/build/universal/webUtils.js

@@ -91,6 +91,10 @@ export const globalCss = css`
     }
   }
 
+  [data-theme='light'] {
+    ${lightVariables}
+  }
+
   [data-theme='dark'] {
     ${darkVariables}
   }

package/build/universal/webUtils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["universal/webUtils.ts"],"sourcesContent":[null],"names":["processColor","unstable_createElement","createWebComponent","type","props","css","strings","values","reduce","acc","s","i","length","String","replace","trim","lightVariables","darkVariables","colors","background","foreground","red","primary","gray","durations","fast","base","slow","easings","standard","shadows","button","focus","input","globalCss","DEFAULT_PRIMARY_COLOR","srgbToLinear","c","Math","pow","linearToSrgb","hexToLch","hex","raw","body","Array","from","join","r","Number","parseInt","slice","g","b","l","cbrt","m","L","labA","labB","sqrt","atan2","lchToHex","chroma","hue","a","cos","sin","l_","m_","s_","bl","cl","max","min","round","map","x","toString","padStart","PRIMARY_STOPS","step","cMul","colorValueToHex","color","argb","generatePrimaryColorScale","C","H","scale","tgtL","newL","newC"],"mappings":"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"}
+{"version":3,"sources":["universal/webUtils.ts"],"sourcesContent":[null],"names":["processColor","unstable_createElement","createWebComponent","type","props","css","strings","values","reduce","acc","s","i","length","String","replace","trim","lightVariables","darkVariables","colors","background","foreground","red","primary","gray","durations","fast","base","slow","easings","standard","shadows","button","focus","input","globalCss","DEFAULT_PRIMARY_COLOR","srgbToLinear","c","Math","pow","linearToSrgb","hexToLch","hex","raw","body","Array","from","join","r","Number","parseInt","slice","g","b","l","cbrt","m","L","labA","labB","sqrt","atan2","lchToHex","chroma","hue","a","cos","sin","l_","m_","s_","bl","cl","max","min","round","map","x","toString","padStart","PRIMARY_STOPS","step","cMul","colorValueToHex","color","argb","generatePrimaryColorScale","C","H","scale","tgtL","newL","newC"],"mappings":"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"}

package/ios/BottomSheetView.swift

@@ -70,7 +70,7 @@ struct BottomSheetView: ExpoSwiftUI.View {
 
   @ViewBuilder
   private func contentChildren() -> some View {
-    ForEach(props.children?.withoutSlot("anchor") ?? [], id: \.id) { child in
+    ForEach(props.children?.withoutSlots() ?? [], id: \.id) { child in
       let view: any View = child.childView
       AnyView(view)
     }
@@ -93,6 +93,15 @@ struct BottomSheetView: ExpoSwiftUI.View {
     }
   }
 
+  @ViewBuilder
+  private var presentedContent: some View {
+    if let background = props.children?.slot("presentationBackground") {
+      sheetContent.presentationBackground { background }
+    } else {
+      sheetContent
+    }
+  }
+
   @ViewBuilder
   private var anchor: some View {
     if let anchorView = props.children?.slot("anchor") {
@@ -107,7 +116,7 @@ struct BottomSheetView: ExpoSwiftUI.View {
       .sheet(isPresented: $isPresented, onDismiss: {
         props.onDismiss()
       }) {
-        sheetContent
+        presentedContent
       }
       .onChange(of: isPresented, perform: { newIsPresented in
         if props.isPresented == newIsPresented {

package/ios/DatePickerView.swift

@@ -4,12 +4,7 @@ import SwiftUI
 internal struct DatePickerView: ExpoSwiftUI.View {
   @ObservedObject var props: DatePickerProps
   @State private var date = Date()
-  // `.graphical` has some AutoLayout bug (it uses UICalendarView under the hood)
-  // It shrinks height when user taps a date.
-  // https://github.com/expo/expo/issues/47062
-  // https://stackoverflow.com/a/74763440/7070640
-  // Current fix is to add a fixed min width of 320 when `.graphical` style is used.
-  // TODO: Remove if apple fixes the bug in newer versions
+
   private var isGraphicalStyle: Bool {
     props.modifiers?.contains {
       $0["$type"] as? String == "datePickerStyle" && $0["style"] as? String == "graphical"
@@ -20,8 +15,7 @@ internal struct DatePickerView: ExpoSwiftUI.View {
 #if os(tvOS)
     Text("DatePicker is not supported on tvOS")
 #else
-    createDatePicker()
-      .frame(minWidth: isGraphicalStyle ? 320 : nil)
+    datePicker
       .onChange(of: date) { newDate in
         if props.selection == newDate { return }
         props.onDateChange(["date": newDate.timeIntervalSince1970 * 1000])
@@ -32,10 +26,51 @@ internal struct DatePickerView: ExpoSwiftUI.View {
       .onAppear {
         date = props.selection ?? Date()
       }
-      .if(props.title == nil && !hasChildren) { $0.labelsHidden() }
 #endif
   }
 
+#if !os(tvOS)
+  @ViewBuilder
+  private var datePicker: some View {
+#if os(iOS)
+    if isGraphicalStyle {
+      graphicalDatePicker
+    } else {
+      swiftUIDatePicker
+    }
+#else
+    swiftUIDatePicker
+#endif
+  }
+
+  private var swiftUIDatePicker: some View {
+    createDatePicker()
+      // Graphical style on macOS: https://github.com/expo/expo/issues/47062
+      .frame(minWidth: isGraphicalStyle ? 320 : nil)
+      .if(props.title == nil && !hasChildren) { $0.labelsHidden() }
+  }
+
+#if os(iOS)
+  // SwiftUI's graphical `DatePicker` can keep a wrong height when it appears after launch.
+  // https://github.com/expo/expo/issues/47765
+  @ViewBuilder
+  private var graphicalDatePicker: some View {
+    let picker = InlineDatePicker(
+      date: $date,
+      range: props.range,
+      components: props.displayedComponents,
+      accessibilityLabel: props.title
+    )
+    // Like SwiftUI's graphical style, the label is not drawn and is only read by VoiceOver.
+    if hasChildren, #available(iOS 18.0, *) {
+      picker.accessibilityLabel { _ in Children() }
+    } else {
+      picker
+    }
+  }
+#endif
+#endif
+
   private var hasChildren: Bool {
     props.children?.isEmpty == false
   }
@@ -94,6 +129,96 @@ internal enum DatePickerComponent: String, Enumerable {
   case hourAndMinute
 }
 
+#if os(iOS)
+private struct InlineDatePicker: UIViewRepresentable {
+  @Binding var date: Date
+  let range: DateRange?
+  let components: [DatePickerComponent]
+  let accessibilityLabel: String?
+
+  func makeCoordinator() -> Coordinator {
+    Coordinator(date: $date)
+  }
+
+  func makeUIView(context: Context) -> UIDatePicker {
+    let picker = UIDatePicker()
+    picker.preferredDatePickerStyle = .inline
+    picker.addTarget(context.coordinator, action: #selector(Coordinator.valueChanged(_:)), for: .valueChanged)
+    return picker
+  }
+
+  func updateUIView(_ picker: UIDatePicker, context: Context) {
+    context.coordinator.date = $date
+    let environment = context.environment
+    let mode = components.toDatePickerMode()
+
+    // These change the picker's content, so SwiftUI has to measure it again.
+    var needsMeasure = false
+    if picker.datePickerMode != mode {
+      picker.datePickerMode = mode
+      needsMeasure = true
+    }
+    if picker.locale != environment.locale {
+      picker.locale = environment.locale
+      needsMeasure = true
+    }
+    if picker.calendar != environment.calendar {
+      picker.calendar = environment.calendar
+      needsMeasure = true
+    }
+    if picker.timeZone != environment.timeZone {
+      picker.timeZone = environment.timeZone
+    }
+    picker.minimumDate = range?.start
+    picker.maximumDate = range?.end
+    if picker.date != date {
+      picker.setDate(date, animated: false)
+    }
+    picker.isEnabled = environment.isEnabled
+    picker.accessibilityLabel = accessibilityLabel
+
+    if needsMeasure {
+      picker.invalidateIntrinsicContentSize()
+    }
+  }
+
+  func sizeThatFits(_ proposal: ProposedViewSize, uiView: UIDatePicker, context: Context) -> CGSize? {
+    let width = proposal.width.flatMap { $0.isFinite ? $0 : nil }
+    let size = uiView.systemLayoutSizeFitting(
+      CGSize(width: width ?? 0, height: UIView.layoutFittingCompressedSize.height),
+      withHorizontalFittingPriority: width == nil ? .fittingSizeLevel : .required,
+      verticalFittingPriority: .fittingSizeLevel
+    )
+    return CGSize(width: width ?? size.width, height: size.height)
+  }
+
+  final class Coordinator: NSObject {
+    var date: Binding<Date>
+
+    init(date: Binding<Date>) {
+      self.date = date
+    }
+
+    @objc func valueChanged(_ picker: UIDatePicker) {
+      date.wrappedValue = picker.date
+    }
+  }
+}
+
+private extension [DatePickerComponent] {
+  func toDatePickerMode() -> UIDatePicker.Mode {
+    switch (contains(.date), contains(.hourAndMinute)) {
+    case (true, true):
+      return .dateAndTime
+    case (false, true):
+      return .time
+    default:
+      return .date
+    }
+  }
+}
+#endif
+
 #if !os(tvOS)
 internal extension [DatePickerComponent] {
   func toSwiftUIComponents() -> DatePicker.Components {

package/ios/Modifiers/SelectedSegmentTintColorModifier.swift

@@ -0,0 +1,86 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+import SwiftUI
+
+// SwiftUI has no API for this, so set it on the `UISegmentedControl` behind the segmented `Picker`.
+internal struct SelectedSegmentTintColorModifier: ViewModifier, Record {
+  @Field var color: Color?
+
+  func body(content: Content) -> some View {
+#if os(iOS)
+    content.background(SegmentedControlTintSetter(color: color.map { UIColor($0) }))
+#else
+    content
+#endif
+  }
+}
+
+#if os(iOS)
+private struct SegmentedControlTintSetter: UIViewRepresentable {
+  let color: UIColor?
+
+  func makeUIView(context: Context) -> SegmentedControlTintSetterView {
+    return SegmentedControlTintSetterView()
+  }
+
+  func updateUIView(_ view: SegmentedControlTintSetterView, context: Context) {
+    view.color = color
+    view.applyColor()
+  }
+}
+
+private final class SegmentedControlTintSetterView: UIView {
+  var color: UIColor?
+
+  override init(frame: CGRect) {
+    super.init(frame: frame)
+    isUserInteractionEnabled = false
+    isAccessibilityElement = false
+  }
+
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+
+  override func didMoveToWindow() {
+    super.didMoveToWindow()
+    applyColor()
+  }
+
+  func applyColor() {
+    // The segmented control may not be in the hierarchy until the next layout pass.
+    DispatchQueue.main.async { [weak self] in
+      guard let self, let segmentedControl = self.findSegmentedControl() else {
+        return
+      }
+      if segmentedControl.selectedSegmentTintColor != self.color {
+        segmentedControl.selectedSegmentTintColor = self.color
+      }
+    }
+  }
+
+  private func findSegmentedControl() -> UISegmentedControl? {
+    var ancestor = superview
+    while let current = ancestor {
+      if let match = Self.firstSegmentedControl(in: current) {
+        return match
+      }
+      ancestor = current.superview
+    }
+    return nil
+  }
+
+  private static func firstSegmentedControl(in view: UIView) -> UISegmentedControl? {
+    if let segmentedControl = view as? UISegmentedControl {
+      return segmentedControl
+    }
+    for subview in view.subviews {
+      if let match = firstSegmentedControl(in: subview) {
+        return match
+      }
+    }
+    return nil
+  }
+}
+#endif

package/ios/Modifiers/ViewModifierRegistry.swift

@@ -1973,6 +1973,10 @@ extension ViewModifierRegistry {
       return try TintModifier(from: params, appContext: appContext)
     }
 
+    register("selectedSegmentTintColor") { params, appContext, _ in
+      return try SelectedSegmentTintColorModifier(from: params, appContext: appContext)
+    }
+
     register("hidden") { params, appContext, _ in
       return try HiddenModifier(from: params, appContext: appContext)
     }

package/ios/RNHostView.swift

@@ -47,6 +47,24 @@ struct RNHostView: ExpoSwiftUI.View {
           isEnabled: !props.layoutRoot
         )
       )
+      .onAppear {
+        updateTouchHandler()
+      }
+      .onChange(of: props.children?.first?.childIdentity) { _ in
+        updateTouchHandler()
+      }
+      .onDisappear {
+        touchHandler.detach()
+      }
+  }
+
+  // Follows the current child, which Fabric can replace or remount while this view stays.
+  private func updateTouchHandler() {
+    if props.layoutRoot, let view = firstChildUIView {
+      touchHandler.attach(to: view)
+    } else {
+      touchHandler.detach()
+    }
   }
 
   @ViewBuilder
@@ -60,14 +78,6 @@ struct RNHostView: ExpoSwiftUI.View {
       ) {
         Children()
       }
-      .onAppear {
-        if props.layoutRoot {
-          touchHandler.attach(to: childUIView)
-        }
-      }
-      .onDisappear {
-        touchHandler.detach()
-      }
     } else if matchesContents {
       // No hosted UIView (a pure SwiftUI child, e.g. Text/Image). Render it at its
       // natural size instead of falling into the fill branch below, which would
@@ -82,14 +92,6 @@ struct RNHostView: ExpoSwiftUI.View {
       Children()
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .modifier(ReportSizeToYogaNodeModifier(shadowNodeProxy: props.shadowNodeProxy))
-        .onAppear {
-          if props.layoutRoot, let view = firstChildUIView {
-            touchHandler.attach(to: view)
-          }
-        }
-        .onDisappear {
-          touchHandler.detach()
-        }
     }
   }
 
@@ -173,6 +175,7 @@ private final class RNHostTouchHandler: ObservableObject {
 // An axis that is not matched fills the parent and reports its size to the Yoga node instead
 private struct ApplySizeFromYogaNode<Content: SwiftUI.View>: SwiftUI.View {
   @StateObject private var observer: Observer
+  let childUIView: UIView
   let horizontal: Bool
   let vertical: Bool
   let shadowNodeProxy: ExpoSwiftUI.ShadowNodeProxy
@@ -186,6 +189,7 @@ private struct ApplySizeFromYogaNode<Content: SwiftUI.View>: SwiftUI.View {
     @ViewBuilder content: () -> Content
   ) {
     _observer = StateObject(wrappedValue: Observer(view: childUIView))
+    self.childUIView = childUIView
     self.horizontal = horizontal
     self.vertical = vertical
     self.shadowNodeProxy = shadowNodeProxy
@@ -193,6 +197,14 @@ private struct ApplySizeFromYogaNode<Content: SwiftUI.View>: SwiftUI.View {
   }
 
   var body: some SwiftUI.View {
+    sizedContent
+      .onChange(of: childUIView) { newView in
+        observer.observe(newView)
+      }
+  }
+
+  @ViewBuilder
+  private var sizedContent: some SwiftUI.View {
     if horizontal && vertical {
       content
         .frame(width: observer.size.width, height: observer.size.height)
@@ -223,6 +235,12 @@ private struct ApplySizeFromYogaNode<Content: SwiftUI.View>: SwiftUI.View {
 
     init(view: UIView) {
       self.size = view.bounds.size
+      observe(view)
+    }
+
+    func observe(_ view: UIView) {
+      kvoToken?.invalidate()
+      size = view.bounds.size
       kvoToken = view.observe(\.bounds) { [weak self] view, _ in
         MainActor.assumeIsolated {
           self?.size = view.bounds.size

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.22/expo.modules.ui-58.0.22-sources.jar.md5

@@ -0,0 +1 @@
+3367880bd9dfec581496b8b5087f9ae0

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.22/expo.modules.ui-58.0.22-sources.jar.sha1

@@ -0,0 +1 @@
+a1628408f238e018286c0c9887ebb3cf9912577d

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.22/expo.modules.ui-58.0.22-sources.jar.sha256

@@ -0,0 +1 @@
+2487d657c68bf866e677ef379bc97b7de37edb41eb173b6d8d938b81bfcb2293

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.22/expo.modules.ui-58.0.22-sources.jar.sha512

@@ -0,0 +1 @@
+6c228c1dcbe9ee23cca52ba20eb724d39d18533e6c31ad738ab5738e5dfc64432b7c79363f7ff772f019f8bda955d0d38ccb3f4331d3236e4beddd70e6e426f4

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.22/expo.modules.ui-58.0.22.aar.md5

@@ -0,0 +1 @@
+6b7272e2ff6f2f155c76a4e7a3341af6

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.22/expo.modules.ui-58.0.22.aar.sha1

@@ -0,0 +1 @@
+7acd625f3cd50ad228fac699424fcff3c77942bb

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.22/expo.modules.ui-58.0.22.aar.sha256

@@ -0,0 +1 @@
+59cc7013ee6674f030b4f81641fa80fb1829815d6ab5a7903f0e7479e6adb96e

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.22/expo.modules.ui-58.0.22.aar.sha512

@@ -0,0 +1 @@
+0a89be2233ee1dd16b1cb671e0694d6d9a428f7f199e3e3efcdd621090c541d435478b39402a6da271373a70cbed690f989e938ebcbbcd35b740e1bf240dfb64