@expo/ui 58.0.5 → 58.0.6

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

@@ -2,6 +2,9 @@ import { requireNativeView } from 'expo';
 
 import { type ViewEvent } from '../../types';
 import { type CommonViewModifierProps } from '../types';
+import { DataListForEach, NativeSlot, useItemKeys, type ListForEachProps } from './DataListForEach';
+
+export { type ListForEachProps };
 
 const ListForEachNativeView: React.ComponentType<NativeListForEachProps> =
   requireNativeView<NativeListForEachProps>('ExpoUI', 'ListForEachView');
@@ -14,21 +17,29 @@ type NativeListForEachProps = CommonViewModifierProps &
   DeleteEvent &
   MoveEvent & {
     children: React.ReactNode;
+    deleteEnabled: boolean;
+    moveEnabled: boolean;
   };
 
-export interface ListForEachProps extends CommonViewModifierProps {
+/**
+ * @deprecated Pass `data` and `keyExtractor`, and render each row from a `children` function.
+ */
+export interface ListForEachElementsProps extends CommonViewModifierProps {
+  data?: never;
+  keyExtractor?: never;
+  recycling?: never;
+  overscanCount?: never;
+  estimatedItemSize?: never;
   /**
    * The children elements to be rendered inside the `List.ForEach`.
    */
   children: React.ReactNode;
-
   /**
    * Callback triggered when items are deleted.
    * Receives an array of indices that were deleted.
    * @see Official [SwiftUI documentation](https://developer.apple.com/documentation/swiftui/dynamicviewcontent/ondelete(perform:)).
    */
   onDelete?: (indices: number[]) => void;
-
   /**
    * Callback triggered when items are moved.
    * Receives the source indices and destination index.
@@ -37,14 +48,33 @@ export interface ListForEachProps extends CommonViewModifierProps {
   onMove?: (sourceIndices: number[], destination: number) => void;
 }
 
+let warnedElements = false;
+
 /**
- * A compound component of `List` that enables item deletion and reordering.
- * This component must be used as a child of `List` (as `List.ForEach`).
+ * A group of rows inside `List`, with optional deletion and reordering.
+ * Pass `data` with `keyExtractor`, and render each row from a `children` function.
+ * Recycles rows unless `recycling` is `false`.
  */
-export function ListForEach({ children, onDelete, onMove, ...props }: ListForEachProps) {
+export function ListForEach<ItemT>(props: ListForEachProps<ItemT> | ListForEachElementsProps) {
+  if (props.data === undefined) {
+    if (__DEV__ && !warnedElements) {
+      warnedElements = true;
+      console.warn(
+        '[@expo/ui] Passing elements as List.ForEach children is deprecated. Pass `data` and `keyExtractor`, and render each row from a `children` function: `{({ item }) => <Row item={item} />}`.'
+      );
+    }
+    return <ChildrenListForEach {...props} />;
+  }
+  const { recycling = true, ...rest } = props;
+  return recycling ? <DataListForEach {...rest} /> : <StaticListForEach {...rest} />;
+}
+
+function ChildrenListForEach({ children, onDelete, onMove, ...props }: ListForEachElementsProps) {
   return (
     <ListForEachNativeView
       {...props}
+      deleteEnabled={!!onDelete}
+      moveEnabled={!!onMove}
       onDelete={onDelete ? ({ nativeEvent }) => onDelete(nativeEvent.indices) : undefined}
       onMove={
         onMove
@@ -55,3 +85,23 @@ export function ListForEach({ children, onDelete, onMove, ...props }: ListForEac
     </ListForEachNativeView>
   );
 }
+
+function StaticListForEach<ItemT>({
+  data,
+  keyExtractor,
+  children: renderItem,
+  overscanCount: _overscanCount,
+  estimatedItemSize: _estimatedItemSize,
+  ...props
+}: Omit<ListForEachProps<ItemT>, 'recycling'>) {
+  const itemKeys = useItemKeys(data, keyExtractor);
+  return (
+    <ChildrenListForEach {...props}>
+      {data.map((item, index) => (
+        <NativeSlot key={itemKeys[index]} itemKey={itemKeys[index]!} index={index} revision={0}>
+          {renderItem({ item, index })}
+        </NativeSlot>
+      ))}
+    </ChildrenListForEach>
+  );
+}

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

@@ -5,7 +5,7 @@ import { createViewModifierEventListener } from '../modifiers/utils';
 import { type CommonViewModifierProps } from '../types';
 import { ListForEach } from './ListForEach';
 
-export { ListForEach, type ListForEachProps } from './ListForEach';
+export { ListForEach, type ListForEachProps, type ListForEachElementsProps } from './ListForEach';
 
 const ListNativeView: React.ComponentType<NativeListProps> = requireNativeView<NativeListProps>(
   'ExpoUI',

package/src/swift-ui/List/window.ts

@@ -0,0 +1,28 @@
+export function getWindow(
+  count: number,
+  first: number,
+  last: number,
+  overscanCount: number,
+  minCapacity = 0
+) {
+  if (count === 0) return { start: 0, capacity: 0 };
+  first = Math.max(0, Math.min(first, count - 1));
+  last = Math.max(first, Math.min(last, count - 1));
+  const start = Math.max(0, first - overscanCount);
+  const end = Math.min(count, last + 1 + overscanCount);
+  // Never shrink the pool: a stable capacity keeps `index % capacity` slot assignments stable.
+  // Grow it with headroom, because every growth re-renders the whole pool.
+  const needed = end - start;
+  let capacity = minCapacity;
+  if (needed > capacity) capacity = capacity === 0 ? needed : needed + overscanCount;
+  capacity = Math.min(count, capacity);
+  return { start: Math.min(start, count - capacity), capacity };
+}
+
+export function getSlotIndices(start: number, capacity: number): number[] {
+  if (capacity === 0) return [];
+  return Array.from(
+    { length: capacity },
+    (_, slot) => start + ((slot - (start % capacity) + capacity) % capacity)
+  );
+}

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

@@ -106,31 +106,67 @@ export const matchedGeometryEffect = (
  */
 export const geometryGroup = () => createModifier('geometryGroup', {});
 
+type FrameAlignment =
+  | 'center'
+  | 'leading'
+  | 'trailing'
+  | 'top'
+  | 'bottom'
+  | 'topLeading'
+  | 'topTrailing'
+  | 'bottomLeading'
+  | 'bottomTrailing';
+
 /**
- * Sets the frame properties of a view.
- * @param params - The frame parameters. Width, height, minWidth, maxWidth, minHeight, maxHeight, idealWidth, idealHeight and alignment.
+ * Positions this view within an invisible frame with the specified size.
+ * @param params - The fixed frame parameters: `width`, `height` and `alignment`.
  * @see Official [SwiftUI documentation](https://developer.apple.com/documentation/SwiftUI/View/frame(width:height:alignment:)).
  */
-export const frame = (params: {
+export function frame(params: {
   width?: number;
   height?: number;
+  alignment?: FrameAlignment;
+}): ModifierConfig;
+/**
+ * Positions this view within an invisible frame having the specified size constraints.
+ * @param params - The flexible frame parameters: `minWidth`, `idealWidth`, `maxWidth`, `minHeight`, `idealHeight`, `maxHeight` and `alignment`.
+ * @see Official [SwiftUI documentation](https://developer.apple.com/documentation/swiftui/view/frame(minwidth:idealwidth:maxwidth:minheight:idealheight:maxheight:alignment:)).
+ */
+export function frame(params: {
   minWidth?: number;
+  idealWidth?: number;
   maxWidth?: number;
   minHeight?: number;
+  idealHeight?: number;
   maxHeight?: number;
+  alignment?: FrameAlignment;
+}): ModifierConfig;
+export function frame(params: {
+  width?: number;
+  height?: number;
+  minWidth?: number;
   idealWidth?: number;
+  maxWidth?: number;
+  minHeight?: number;
   idealHeight?: number;
-  alignment?:
-    | 'center'
-    | 'leading'
-    | 'trailing'
-    | 'top'
-    | 'bottom'
-    | 'topLeading'
-    | 'topTrailing'
-    | 'bottomLeading'
-    | 'bottomTrailing';
-}) => createModifier('frame', params);
+  maxHeight?: number;
+  alignment?: FrameAlignment;
+}): ModifierConfig {
+  if (__DEV__) {
+    const { width, height, alignment: _alignment, ...flexible } = params;
+    const ignored = Object.keys(flexible).filter(
+      (key) => flexible[key as keyof typeof flexible] !== undefined
+    );
+    if ((width !== undefined || height !== undefined) && ignored.length > 0) {
+      console.warn(
+        `frame() ignores ${ignored.join(', ')} because width or height is also set. ` +
+          'SwiftUI applies fixed and flexible frames as separate modifiers. ' +
+          'Split the values into two calls, for example [frame({ height: 50 }), frame({ maxWidth: Infinity })].'
+      );
+    }
+  }
+  return createModifier('frame', params);
+}
 
 /**
  * Positions this view within an invisible frame with a size relative to the nearest container.

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

@@ -1 +0,0 @@
-8824700262a9ab7d8f339532d030c14d

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

@@ -1 +0,0 @@
-842b6342d3ac040ed8069f06731423ce098d4c06

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

@@ -1 +0,0 @@
-713717be0ec2dabfe766d7916d5c69df3434313c9cff38b1067c9efa8c46f9ab

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

@@ -1 +0,0 @@
-a0cbbe1a7eae1d80cd5d3284ab5fe64f36e357ed1b94685f469f7d71f7794e787fa6919d0d15df9eee791fe7142554344c0424ac4c9eb205dd2ce86b706b756e

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

@@ -1 +0,0 @@
-990bdee8071627b4b6943b40dc1aec45

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

@@ -1 +0,0 @@
-be3b0d33e5b9fb949a42f962c343e0119fdaedc0

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

@@ -1 +0,0 @@
-b3ded768986b2232ffeff134fec3af26cf68977a970bd9db2c5f6f7994d99391

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

@@ -1 +0,0 @@
-fd0be2177afd1ca4fb68653adcd767e5f25e5c7fa99d787b79a7b63fc5ec234381d9374fb7c5233cc0fcc3bffce07bd9abbf30b43da1bc63777e3ea3f7b4c644