@react-aria/utils 3.25.2 → 3.26.0

package/src/openLink.tsx

@@ -148,8 +148,9 @@ function openSyntheticLink(target: Element, modifiers: Modifiers) {
 
 export function useSyntheticLinkProps(props: LinkDOMProps) {
   let router = useRouter();
+  const href = router.useHref(props.href ?? '');
   return {
-    'data-href': props.href ? router.useHref(props.href) : undefined,
+    'data-href': props.href ? href : undefined,
     'data-target': props.target,
     'data-rel': props.rel,
     'data-download': props.download,
@@ -170,10 +171,11 @@ export function getSyntheticLinkProps(props: LinkDOMProps) {
   };
 }
 
-export function useLinkProps(props: LinkDOMProps) {
+export function useLinkProps(props?: LinkDOMProps) {
   let router = useRouter();
+  const href = router.useHref(props?.href ?? '');
   return {
-    href: props?.href ? router.useHref(props?.href) : undefined,
+    href: props?.href ? href : undefined,
     target: props?.target,
     rel: props?.rel,
     download: props?.download,

package/src/scrollIntoView.ts

@@ -14,7 +14,7 @@ import {getScrollParents} from './getScrollParents';
 
 interface ScrollIntoViewportOpts {
   /** The optional containing element of the target to be centered in the viewport. */
-  containingElement?: Element
+  containingElement?: Element | null
 }
 
 /**
@@ -81,8 +81,8 @@ function relativeOffset(ancestor: HTMLElement, child: HTMLElement, axis: 'left'|
  * that will be centered in the viewport prior to scrolling the targetElement into view. If scrolling is prevented on
  * the body (e.g. targetElement is in a popover), this will only scroll the scroll parents of the targetElement up to but not including the body itself.
  */
-export function scrollIntoViewport(targetElement: Element, opts?: ScrollIntoViewportOpts) {
-  if (document.contains(targetElement)) {
+export function scrollIntoViewport(targetElement: Element | null, opts?: ScrollIntoViewportOpts) {
+  if (targetElement && document.contains(targetElement)) {
     let root = document.scrollingElement || document.documentElement;
     let isScrollPrevented = window.getComputedStyle(root).overflow === 'hidden';
     // If scrolling is not currently prevented then we aren’t in a overlay nor is a overlay open, just use element.scrollIntoView to bring the element into view

package/src/useFormReset.ts

@@ -15,7 +15,7 @@ import {useEffect, useRef} from 'react';
 import {useEffectEvent} from './useEffectEvent';
 
 export function useFormReset<T>(
-  ref: RefObject<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement | null>,
+  ref: RefObject<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement | null> | undefined,
   initialValue: T,
   onReset: (value: T) => void
 ) {

package/src/useGlobalListeners.ts

@@ -42,7 +42,7 @@ export function useGlobalListeners(): GlobalListeners {
     });
   }, [removeGlobalListener]);
 
-  // eslint-disable-next-line arrow-body-style
+   
   useEffect(() => {
     return removeAllGlobalListeners;
   }, [removeAllGlobalListeners]);

package/src/useId.ts

@@ -22,7 +22,7 @@ let canUseDOM = Boolean(
   window.document.createElement
 );
 
-let idsUpdaterMap: Map<string, (v: string) => void> = new Map();
+let idsUpdaterMap: Map<string, Array<(v: string) => void>> = new Map();
 
 /**
  * If a default is not provided, generate an id.
@@ -39,7 +39,12 @@ export function useId(defaultId?: string): string {
   }, []);
 
   if (canUseDOM) {
-    idsUpdaterMap.set(res, updateValue);
+    // TS not smart enough to know that `has` means the value exists
+    if (idsUpdaterMap.has(res) && !idsUpdaterMap.get(res)!.includes(updateValue)) {
+      idsUpdaterMap.set(res, [...idsUpdaterMap.get(res)!, updateValue]);
+    } else {
+      idsUpdaterMap.set(res, [updateValue]);
+    }
   }
 
   useLayoutEffect(() => {
@@ -71,15 +76,15 @@ export function mergeIds(idA: string, idB: string): string {
     return idA;
   }
 
-  let setIdA = idsUpdaterMap.get(idA);
-  if (setIdA) {
-    setIdA(idB);
+  let setIdsA = idsUpdaterMap.get(idA);
+  if (setIdsA) {
+    setIdsA.forEach(fn => fn(idB));
     return idB;
   }
 
-  let setIdB = idsUpdaterMap.get(idB);
-  if (setIdB) {
-    setIdB(idA);
+  let setIdsB = idsUpdaterMap.get(idB);
+  if (setIdsB) {
+    setIdsB.forEach(fn => fn(idA));
     return idA;
   }
 

package/src/useLoadMore.ts

@@ -12,7 +12,7 @@
 
 import {RefObject, useCallback, useRef} from 'react';
 import {useEvent} from './useEvent';
-// eslint-disable-next-line rulesdir/useLayoutEffectRule
+ 
 import {useLayoutEffect} from './useLayoutEffect';
 
 export interface LoadMoreProps {
@@ -29,7 +29,7 @@ export interface LoadMoreProps {
    */
   scrollOffset?: number,
   /** The data currently loaded. */
-  items?: any[]
+  items?: any
 }
 
 export function useLoadMore(props: LoadMoreProps, ref: RefObject<HTMLElement | null>) {
@@ -73,7 +73,7 @@ export function useLoadMore(props: LoadMoreProps, ref: RefObject<HTMLElement | n
     }
 
     lastItems.current = items;
-  }, [isLoading, onLoadMore, props, ref]);
+  }, [isLoading, onLoadMore, props, ref, items]);
 
   // TODO: maybe this should still just return scroll props?
   // Test against case where the ref isn't defined when this is called

package/src/useViewportSize.ts

@@ -18,7 +18,6 @@ interface ViewportSize {
   height: number
 }
 
-// @ts-ignore
 let visualViewport = typeof document !== 'undefined' && window.visualViewport;
 
 export function useViewportSize(): ViewportSize {