Fix some ts-ignores

Author: devongovett

packages/@react-spectrum/menu/src/ContextualHelpTrigger.tsx

@@ -11,10 +11,10 @@
  */
 
 import {classNames, SlotProvider, unwrapDOMRef, useIsMobileDevice} from '@react-spectrum/utils';
+import {DOMRefValue, ItemProps, Key} from '@react-types/shared';
 import {FocusScope} from '@react-aria/focus';
 import {getInteractionModality} from '@react-aria/interactions';
 import helpStyles from '@adobe/spectrum-css-temp/components/contextualhelp/vars.css';
-import {ItemProps, Key} from '@react-types/shared';
 import {Popover} from '@react-spectrum/overlays';
 import React, {JSX, ReactElement, useEffect, useRef, useState} from 'react';
 import ReactDOM from 'react-dom';
@@ -41,7 +41,7 @@ function ContextualHelpTrigger(props: InternalMenuDialogTriggerProps): ReactElem
   let {isUnavailable = false, targetKey} = props;
 
   let triggerRef = useRef<HTMLLIElement>(null);
-  let popoverRef = useRef(null);
+  let popoverRef = useRef<DOMRefValue<HTMLDivElement> | null>(null);
   let {popoverContainer, trayContainerRef, rootMenuTriggerState, menu: parentMenuRef, state} = useMenuStateContext()!;
   let submenuTriggerState = useSubmenuTriggerState({triggerKey: targetKey}, {...rootMenuTriggerState!, ...state});
   let submenuRef = unwrapDOMRef(popoverRef);
@@ -85,8 +85,7 @@ function ContextualHelpTrigger(props: InternalMenuDialogTriggerProps): ReactElem
   let [, content] = props.children as [ReactElement, ReactElement];
 
   let onBlurWithin = (e) => {
-    // @ts-ignore - TODO refs strike again
-    if (e.relatedTarget && popoverRef.current && (!popoverRef.current.UNSAFE_getDOMNode().contains(e.relatedTarget) && !(e.relatedTarget === triggerRef.current && getInteractionModality() === 'pointer'))) {
+    if (e.relatedTarget && popoverRef.current && (!popoverRef.current.UNSAFE_getDOMNode()?.contains(e.relatedTarget) && !(e.relatedTarget === triggerRef.current && getInteractionModality() === 'pointer'))) {
       if (submenuTriggerState.isOpen) {
         submenuTriggerState.close();
       }

packages/@react-spectrum/tree/src/TreeView.tsx

@@ -332,8 +332,7 @@ const expandButton = style<ExpandableRowChevronProps>({
 });
 
 function ExpandableRowChevron(props: ExpandableRowChevronProps) {
-  let expandButtonRef = useRef<HTMLSpanElement>(null);
-  // @ts-ignore - not sure how to type this or convert to a button (it fails a test if i convert)
+  let expandButtonRef = useRef(null);
   let [fullProps, ref] = useContextProps({...props, slot: 'chevron'}, expandButtonRef, ButtonContext);
   let {isExpanded, isDisabled} = fullProps;
   let {direction} = useLocale();

packages/@react-stately/data/src/useTreeData.ts

@@ -184,14 +184,14 @@ export function useTreeData<T extends object>(options: TreeOptions<T>): TreeData
         children = children.filter(c => c !== node);
       }
 
-      // @ts-ignore what is happening here, why can newNode be null and why do we allow it?
-      copy.children = children.map(child => {
+      copy.children = children?.map(child => {
         if (child === node) {
-          return newNode;
+          // newNode cannot be null here due to the above filter.
+          return newNode!;
         }
 
         return child;
-      });
+      }) ?? null;
 
       map.set(copy.key, copy);
 
@@ -206,6 +206,7 @@ export function useTreeData<T extends object>(options: TreeOptions<T>): TreeData
     return {
       items: items.map(item => {
         if (item === node) {
+          // newNode cannot be null here due to the above filter.
           return newNode!;
         }