chore: Ts strict remaining

packages/@react-aria/autocomplete/test/useSearchAutocomplete.test.js

@@ -11,7 +11,6 @@
  */
 
 import {Item} from '@react-stately/collections';
-import {ListLayout} from '@react-stately/layout';
 import React from 'react';
 import {renderHook} from '@react-spectrum/test-utils-internal';
 import {useComboBoxState} from '@react-stately/combobox';
@@ -30,11 +29,6 @@ describe('useSearchAutocomplete', function () {
   });
 
   let defaultProps = {items: [{id: 1, name: 'one'}], children: (props) => <Item>{props.name}</Item>};
-  let {result} = renderHook(() => useComboBoxState(defaultProps));
-  let mockLayout = new ListLayout({
-    rowHeight: 40
-  });
-  mockLayout.collection = result.current.collection;
 
   afterEach(() => {
     jest.clearAllMocks();
@@ -45,8 +39,7 @@ describe('useSearchAutocomplete', function () {
       label: 'test label',
       popoverRef: React.createRef(),
       inputRef: React.createRef(),
-      listBoxRef: React.createRef(),
-      layout: mockLayout
+      listBoxRef: React.createRef()
     };
 
     let {result} = renderHook(() => useSearchAutocomplete(props, useComboBoxState(defaultProps)));
@@ -73,8 +66,7 @@ describe('useSearchAutocomplete', function () {
       inputRef: {
         current: document.createElement('input')
       },
-      listBoxRef: React.createRef(),
-      layout: mockLayout
+      listBoxRef: React.createRef()
     };
 
     let {result: state} = renderHook((props) => useComboBoxState(props), {initialProps: props});

packages/@react-aria/combobox/src/useComboBox.ts

@@ -283,7 +283,7 @@ export function useComboBox<T>(props: AriaComboBoxOptions<T>, state: ComboBoxSta
   let lastSection = useRef(sectionKey);
   let lastItem = useRef(itemKey);
   useEffect(() => {
-    if (isAppleDevice() && focusedItem != null && itemKey !== lastItem.current) {
+    if (isAppleDevice() && focusedItem != null && itemKey != null && itemKey !== lastItem.current) {
       let isSelected = state.selectionManager.isSelected(itemKey);
       let section = sectionKey != null ? state.collection.getItem(sectionKey) : null;
       let sectionTitle = section?.['aria-label'] || (typeof section?.rendered === 'string' ? section.rendered : '') || '';

packages/@react-aria/combobox/test/useComboBox.test.js

@@ -12,7 +12,6 @@
 
 import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal';
 import {Item} from '@react-stately/collections';
-import {ListLayout} from '@react-stately/layout';
 import React from 'react';
 import {useComboBox} from '../';
 import {useComboBoxState} from '@react-stately/combobox';
@@ -32,11 +31,6 @@ describe('useComboBox', function () {
   });
 
   let defaultProps = {items: [{id: 1, name: 'one'}], children: (props) => <Item>{props.name}</Item>};
-  let {result} = renderHook(() => useComboBoxState(defaultProps));
-  let mockLayout = new ListLayout({
-    rowHeight: 40
-  });
-  mockLayout.collection = result.current.collection;
 
   let props = {
     label: 'test label',
@@ -51,8 +45,7 @@ describe('useComboBox', function () {
     },
     listBoxRef: {
       current: document.createElement('div')
-    },
-    layout: mockLayout
+    }
   };
 
   afterEach(() => {

packages/@react-aria/dnd/src/DragPreview.tsx

@@ -15,7 +15,7 @@ import {flushSync} from 'react-dom';
 import React, {ForwardedRef, JSX, useEffect, useImperativeHandle, useRef, useState} from 'react';
 
 export interface DragPreviewProps {
-  children: (items: DragItem[]) => JSX.Element
+  children: (items: DragItem[]) => JSX.Element | null
 }
 
 function DragPreview(props: DragPreviewProps, ref: ForwardedRef<DragPreviewRenderer | null>) {

packages/@react-aria/dnd/src/useDroppableCollection.ts

@@ -56,7 +56,7 @@ export interface DroppableCollectionResult {
 
 interface DroppingState {
   collection: Collection<Node<unknown>>,
-  focusedKey: Key,
+  focusedKey: Key | null,
   selectedKeys: Set<Key>,
   target: DropTarget,
   draggingKeys: Set<Key | null | undefined>,
@@ -273,6 +273,7 @@ export function useDroppableCollection(props: DroppableCollectionOptions, state:
           }
         }
       } else if (
+        prevFocusedKey != null &&
         state.selectionManager.focusedKey === prevFocusedKey &&
         isInternal &&
         target.type === 'item' &&
@@ -293,7 +294,7 @@ export function useDroppableCollection(props: DroppableCollectionOptions, state:
         // Also show the focus ring if the focused key is not selected, e.g. in case of a reorder.
         state.selectionManager.setFocusedKey(target.key);
         setInteractionModality('keyboard');
-      } else if (!state.selectionManager.isSelected(state.selectionManager.focusedKey)) {
+      } else if (state.selectionManager.focusedKey != null && !state.selectionManager.isSelected(state.selectionManager.focusedKey)) {
         setInteractionModality('keyboard');
       }
 
@@ -533,7 +534,7 @@ export function useDroppableCollection(props: DroppableCollectionOptions, state:
 
         // If the focused key is a cell, get the parent item instead.
         // For now, we assume that individual cells cannot be dropped on.
-        let item = localState.state.collection.getItem(key);
+        let item = key != null ? localState.state.collection.getItem(key) : null;
         if (item?.type === 'cell') {
           key = item.parentKey;
         }

packages/@react-aria/dnd/stories/DraggableCollection.tsx

@@ -61,7 +61,7 @@ export function DraggableCollectionExample(props) {
 
 function DraggableCollection(props) {
   let ref = React.useRef<HTMLDivElement>(null);
-  let state = useListState(props);
+  let state = useListState<ItemValue>(props);
   let gridState = useGridState({
     selectionMode: 'multiple',
     collection: React.useMemo(() => new GridCollection<ItemValue>({

packages/@react-aria/dnd/stories/dnd.stories.tsx

@@ -387,7 +387,7 @@ function DraggableCollectionExample(props) {
 function DraggableCollection(props) {
   let {isDisabled} = props;
   let ref = React.useRef<HTMLDivElement>(null);
-  let state = useListState(props);
+  let state = useListState<ItemValue>(props);
   let gridState = useGridState({
     ...props,
     selectionMode: 'multiple',