@expo/ui 58.0.6 → 58.0.7

package/src/swift-ui/List/DataListForEach.tsx

@@ -1,10 +1,14 @@
 import { requireNativeView } from 'expo';
-import { memo, useLayoutEffect, useMemo, useRef, useState, type ReactElement } from 'react';
+import { type ReactElement } from 'react';
 
+import {
+  useRecycledRows,
+  type RecycledSlotProps,
+  type WindowChangeEvent,
+} from '../../recycling/useRecycledRows';
 import { type ViewEvent } from '../../types';
 import { createViewModifierEventListener } from '../modifiers/utils';
 import { type CommonViewModifierProps } from '../types';
-import { getSlotIndices, getWindow } from './window';
 
 export interface ListForEachProps<ItemT> extends CommonViewModifierProps {
   /** Called with deleted indices from this group's `data` array. */
@@ -46,9 +50,8 @@ export interface ListForEachProps<ItemT> extends CommonViewModifierProps {
   estimatedItemSize?: number;
 }
 
-type WindowEvent = { first: number; last: number; revision: number };
 type NativeProps = CommonViewModifierProps &
-  ViewEvent<'onWindowChange', WindowEvent> &
+  ViewEvent<'onWindowChange', WindowChangeEvent> &
   ViewEvent<'onDelete', { indices: number[]; revision: number }> &
   ViewEvent<'onMove', { sourceIndices: number[]; destination: number; revision: number }> & {
     deleteEnabled: boolean;
@@ -58,59 +61,14 @@ type NativeProps = CommonViewModifierProps &
     estimatedItemSize: number;
     children: ReactElement;
   };
-type SlotProps = {
-  itemKey: string;
-  index: number;
-  revision: number;
-  children: ReactElement;
-};
 
 const NativeList = requireNativeView<NativeProps>('ExpoUI', 'DataListForEachView');
-export const NativeSlot = requireNativeView<SlotProps>('ExpoUI', 'DataListForEachItemView');
+export const NativeSlot = requireNativeView<RecycledSlotProps>('ExpoUI', 'DataListForEachItemView');
 const NativePool = requireNativeView<{ children: ReactElement[] }>(
   'ExpoUI',
   'DataListForEachPoolView'
 );
 
-// Skip unchanged rows when the window moves.
-const RecycledRow = memo(function RecycledRow<ItemT>({
-  item,
-  index,
-  itemKey,
-  revision,
-  renderItem,
-}: SlotPropsWithoutChildren & {
-  item: ItemT;
-  renderItem: ListForEachProps<ItemT>['children'];
-}) {
-  return (
-    <NativeSlot itemKey={itemKey} index={index} revision={revision}>
-      {renderItem({ item, index })}
-    </NativeSlot>
-  );
-}) as <ItemT>(
-  props: SlotPropsWithoutChildren & {
-    item: ItemT;
-    renderItem: ListForEachProps<ItemT>['children'];
-  }
-) => ReactElement;
-type SlotPropsWithoutChildren = Omit<SlotProps, 'children'>;
-
-export function useItemKeys<ItemT>(
-  data: readonly ItemT[],
-  keyExtractor: ListForEachProps<ItemT>['keyExtractor']
-): string[] {
-  const keyExtractorRef = useRef(keyExtractor);
-  keyExtractorRef.current = keyExtractor;
-  return useMemo(() => {
-    const keys = data.map((item, index) => keyExtractorRef.current(item, index));
-    if (keys.some((key) => typeof key !== 'string') || new Set(keys).size !== keys.length) {
-      throw new Error('List.ForEach keyExtractor must return a unique string for every item.');
-    }
-    return keys;
-  }, [data]);
-}
-
 /**
  * Renders a window of recycled rows inside List or Section.
  * Rows show placeholders while JS prepares content. Native keys still cover the full data set.
@@ -120,56 +78,22 @@ export function DataListForEach<ItemT>({
   data,
   keyExtractor,
   children: renderItem,
-  overscanCount = 10,
+  overscanCount,
   estimatedItemSize = 64,
   modifiers,
   onDelete,
   onMove,
   ...props
 }: ListForEachProps<ItemT>) {
-  if (!Number.isSafeInteger(overscanCount) || overscanCount < 0) {
-    throw new Error('List.ForEach overscanCount must be a non-negative integer.');
-  }
-  if (!Number.isFinite(estimatedItemSize) || estimatedItemSize <= 0) {
-    throw new Error('List.ForEach estimatedItemSize must be a positive finite number.');
-  }
-  const itemKeys = useItemKeys(data, keyExtractor);
-  const [state, setState] = useState({
-    keys: itemKeys,
-    first: 0,
-    last: 0,
-    revision: 0,
-    capacity: 0,
+  const { itemKeys, revision, rows, onWindowChange, isCurrentRevision } = useRecycledRows({
+    componentName: 'List.ForEach',
+    Slot: NativeSlot,
+    data,
+    keyExtractor,
+    renderItem,
     overscanCount,
+    estimatedItemSize,
   });
-  let current = state;
-  if (state.keys !== itemKeys) {
-    const previousKey = state.keys[state.first];
-    const anchor = previousKey === undefined ? 0 : Math.max(0, itemKeys.indexOf(previousKey));
-    current = {
-      ...state,
-      keys: itemKeys,
-      first: Math.min(anchor, Math.max(0, data.length - 1)),
-      last: Math.min(anchor + state.last - state.first, Math.max(0, data.length - 1)),
-      revision: state.revision + 1,
-    };
-  }
-  if (current.overscanCount !== overscanCount) {
-    current = { ...current, overscanCount, capacity: 0 };
-  }
-  if (current !== state) setState(current);
-  const { start, capacity } = getWindow(
-    data.length,
-    current.first,
-    current.last,
-    overscanCount,
-    current.capacity
-  );
-  const committedRevision = useRef(current.revision);
-  useLayoutEffect(() => {
-    committedRevision.current = current.revision;
-  }, [current.revision]);
-  const indices = getSlotIndices(start, capacity);
 
   return (
     <NativeList
@@ -181,69 +105,24 @@ export function DataListForEach<ItemT>({
       onDelete={
         onDelete
           ? ({ nativeEvent }) => {
-              if (nativeEvent.revision === committedRevision.current) onDelete(nativeEvent.indices);
+              if (isCurrentRevision(nativeEvent.revision)) onDelete(nativeEvent.indices);
             }
           : undefined
       }
       onMove={
         onMove
           ? ({ nativeEvent }) => {
-              if (nativeEvent.revision === committedRevision.current) {
+              if (isCurrentRevision(nativeEvent.revision)) {
                 onMove(nativeEvent.sourceIndices, nativeEvent.destination);
               }
             }
           : undefined
       }
       itemKeys={itemKeys}
-      revision={current.revision}
+      revision={revision}
       estimatedItemSize={estimatedItemSize}
-      onWindowChange={({ nativeEvent: event }) => {
-        if (
-          !Number.isSafeInteger(event.first) ||
-          !Number.isSafeInteger(event.last) ||
-          event.last < event.first
-        ) {
-          return;
-        }
-        setState((previous) => {
-          // Ignore requests from before a data change.
-          if (event.revision !== previous.revision) return previous;
-          const maximum = Math.max(0, previous.keys.length - 1);
-          const first = Math.max(0, Math.min(event.first, maximum));
-          const last = Math.max(first, Math.min(event.last, maximum));
-          const { capacity } = getWindow(
-            previous.keys.length,
-            first,
-            last,
-            previous.overscanCount,
-            previous.capacity
-          );
-          return first === previous.first &&
-            last === previous.last &&
-            capacity === previous.capacity
-            ? previous
-            : { ...previous, first, last, capacity };
-        });
-      }}>
-      <NativePool>
-        {indices.map((index, slot) => {
-          const item = data[index];
-          const itemKey = itemKeys[index];
-          if (item === undefined || itemKey === undefined) {
-            throw new Error(`List.ForEach could not resolve the item at index ${index}.`);
-          }
-          return (
-            <RecycledRow
-              key={slot}
-              item={item}
-              index={index}
-              itemKey={itemKey}
-              revision={current.revision}
-              renderItem={renderItem}
-            />
-          );
-        })}
-      </NativePool>
+      onWindowChange={({ nativeEvent }) => onWindowChange(nativeEvent)}>
+      <NativePool>{rows}</NativePool>
     </NativeList>
   );
 }

package/src/swift-ui/List/ListForEach.tsx

@@ -1,8 +1,9 @@
 import { requireNativeView } from 'expo';
 
+import { useItemKeys } from '../../recycling/useRecycledRows';
 import { type ViewEvent } from '../../types';
 import { type CommonViewModifierProps } from '../types';
-import { DataListForEach, NativeSlot, useItemKeys, type ListForEachProps } from './DataListForEach';
+import { DataListForEach, NativeSlot, type ListForEachProps } from './DataListForEach';
 
 export { type ListForEachProps };
 
@@ -94,7 +95,7 @@ function StaticListForEach<ItemT>({
   estimatedItemSize: _estimatedItemSize,
   ...props
 }: Omit<ListForEachProps<ItemT>, 'recycling'>) {
-  const itemKeys = useItemKeys(data, keyExtractor);
+  const itemKeys = useItemKeys('List.ForEach', data, keyExtractor);
   return (
     <ChildrenListForEach {...props}>
       {data.map((item, index) => (

package/src/swift-ui/modifiers/presentationModifiers.ts

@@ -57,6 +57,16 @@ export const presentationDetents = (
 export const presentationDragIndicator = (visibility: 'automatic' | 'visible' | 'hidden') =>
   createModifier('presentationDragIndicator', { visibility });
 
+/**
+ * Sets the corner radius of a sheet presentation.
+ * @param cornerRadius - The corner radius in points, or `null` to use the system default.
+ * @platform ios 16.4+
+ * @platform tvos 16.4+
+ * @see Official [SwiftUI documentation](https://developer.apple.com/documentation/swiftui/view/presentationcornerradius(_:)).
+ */
+export const presentationCornerRadius = (cornerRadius: number | null) =>
+  createModifier('presentationCornerRadius', { cornerRadius });
+
 /**
  * Presentation background interaction type.
  */

package/src/universal/transformStyle.ios.ts

@@ -2,6 +2,7 @@ import {
   background,
   border,
   clipShape,
+  contentShape,
   disabled as disabledMod,
   font,
   foregroundStyle,
@@ -15,6 +16,7 @@ import {
   onTapGesture,
   opacity,
   padding,
+  shapes,
   type ModifierConfig,
 } from '@expo/ui/swift-ui/modifiers';
 
@@ -154,8 +156,9 @@ export function transformToModifiers(
   // type. The event, lifecycle, and behavior modifiers below are never dropped.
   mods = omitUserOverridden(mods, extraModifiers);
 
-  // Events
-  if (props.onPress) mods.push(onTapGesture(props.onPress));
+  // Events. SwiftUI only hit-tests drawn content, so the `contentShape` lets
+  // taps on empty space (for example a `Spacer` in a `Row`) reach `onPress`.
+  if (props.onPress) mods.push(contentShape(shapes.rectangle()), onTapGesture(props.onPress));
 
   // Lifecycle
   if (props.onAppear) mods.push(onAppear(props.onAppear));

package/build/swift-ui/List/window.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["swift-ui/List/window.ts"],"sourcesContent":[null],"names":["getWindow","count","first","last","overscanCount","minCapacity","start","capacity","Math","max","min","end","needed","getSlotIndices","Array","from","length","_","slot"],"mappings":"AAAA,OAAO,SAASA,UACdC,KAAa,EACbC,KAAa,EACbC,IAAY,EACZC,aAAqB,EACrBC,cAAc,CAAC;IAEf,IAAIJ,UAAU,GAAG,OAAO;QAAEK,OAAO;QAAGC,UAAU;IAAE;IAChDL,QAAQM,KAAKC,GAAG,CAAC,GAAGD,KAAKE,GAAG,CAACR,OAAOD,QAAQ;IAC5CE,OAAOK,KAAKC,GAAG,CAACP,OAAOM,KAAKE,GAAG,CAACP,MAAMF,QAAQ;IAC9C,MAAMK,QAAQE,KAAKC,GAAG,CAAC,GAAGP,QAAQE;IAClC,MAAMO,MAAMH,KAAKE,GAAG,CAACT,OAAOE,OAAO,IAAIC;IACvC,6FAA6F;IAC7F,yEAAyE;IACzE,MAAMQ,SAASD,MAAML;IACrB,IAAIC,WAAWF;IACf,IAAIO,SAASL,UAAUA,WAAWA,aAAa,IAAIK,SAASA,SAASR;IACrEG,WAAWC,KAAKE,GAAG,CAACT,OAAOM;IAC3B,OAAO;QAAED,OAAOE,KAAKE,GAAG,CAACJ,OAAOL,QAAQM;QAAWA;IAAS;AAC9D;AAEA,OAAO,SAASM,eAAeP,KAAa,EAAEC,QAAgB;IAC5D,IAAIA,aAAa,GAAG,OAAO,EAAE;IAC7B,OAAOO,MAAMC,IAAI,CACf;QAAEC,QAAQT;IAAS,GACnB,CAACU,GAAGC,OAASZ,QAAS,AAACY,CAAAA,OAAQZ,QAAQC,WAAYA,QAAO,IAAKA;AAEnE"}

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

@@ -1 +0,0 @@
-a2c50d54e658f6c03ab37ce21bc712ed

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

@@ -1 +0,0 @@
-ccc4bc2b5f6f1713a4f7c85ae9be4a6247690fc5

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

@@ -1 +0,0 @@
-d4e08c526d892c05d1ab6e42bd451df874e4da5cc58c18080ad730fc0ae59dfa

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

@@ -1 +0,0 @@
-5a6dc466f00aa1d74a9e1df2c4a06f3bf9c00b9eebe03e54e1ae68db446806f3f47f98e4a1d04bd90db6683459dd11785d22499d9cef48dd979293f8a88104d3

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

@@ -1 +0,0 @@
-61e999a9915231a3196a7fc2864c479e

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

@@ -1 +0,0 @@
-643965a7c8a6f46ba589dcd348cbf5e112834194

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

@@ -1 +0,0 @@
-9b228fbd60d559e9dfebe894e1846a8c7ce3c72e5c91936b4382c97295e9b072

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

@@ -1 +0,0 @@
-ddcedbdcc0e95db83f0657a68090572e6d7c7fb9233e796ea875d86e9782c619560ef0e98316cdf6642abbed4b42eb43b5e8264be55130f47e473adbc0f77c11

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.6/expo.modules.ui-58.0.6.module.md5

@@ -1 +0,0 @@
-7e592a224a0fc4b1d3190d5e0453dca4

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.6/expo.modules.ui-58.0.6.module.sha1

@@ -1 +0,0 @@
-351d8fdc59045d3033183991bc4a41010bbdf928

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.6/expo.modules.ui-58.0.6.module.sha256

@@ -1 +0,0 @@
-67875636aba690f3ed01c1885a8f5dd5c72824b9028ed012d77016a5c5bfef85

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.6/expo.modules.ui-58.0.6.module.sha512

@@ -1 +0,0 @@
-b7469559d94d21ec59ac3c32700d5c1651d2384574457e83c5f11eea0d6e947dd0ae5b68209f09056c30a0493e561c3a1dd74ea51cd3ec0435e8887603646187

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.6/expo.modules.ui-58.0.6.pom.md5

@@ -1 +0,0 @@
-5c827bb51c32599862e86feff95a8e6d

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.6/expo.modules.ui-58.0.6.pom.sha1

@@ -1 +0,0 @@
-df98a93ccb93778ea5f6d701bf92e3caf1565000

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.6/expo.modules.ui-58.0.6.pom.sha256

@@ -1 +0,0 @@
-3b1a0a5386bc7a66e1e3097896cf2e63f8faccfa982ad72fc4d9f81dd6d7b9b7

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.6/expo.modules.ui-58.0.6.pom.sha512

@@ -1 +0,0 @@
-d66ff20ada5d5bcd01c7ca0506db62ecc07e8eae9113f3e174b776efa9588663ef4bb7ea2761fba9c7ae518b3732c4185a7aee70d4a64e6fb0fcd579abdb5d94