@react-aria/utils 3.12.0 → 3.13.2

package/src/useId.ts

@@ -22,28 +22,17 @@ let idsUpdaterMap: Map<string, (v: string) => void> = new Map();
  * @param defaultId - Default component id.
  */
 export function useId(defaultId?: string): string {
-  let isRendering = useRef(true);
-  isRendering.current = true;
   let [value, setValue] = useState(defaultId);
   let nextId = useRef(null);
 
   let res = useSSRSafeId(value);
 
-  // don't memo this, we want it new each render so that the Effects always run
-  let updateValue = (val) => {
-    if (!isRendering.current) {
-      setValue(val);
-    } else {
-      nextId.current = val;
-    }
-  };
+  let updateValue = useCallback((val) => {
+    nextId.current = val;
+  }, []);
 
   idsUpdaterMap.set(res, updateValue);
 
-  useLayoutEffect(() => {
-    isRendering.current = false;
-  }, [updateValue]);
-
   useLayoutEffect(() => {
     let r = res;
     return () => {
@@ -51,13 +40,16 @@ export function useId(defaultId?: string): string {
     };
   }, [res]);
 
+  // This cannot cause an infinite loop because the ref is updated first.
+  // eslint-disable-next-line
   useEffect(() => {
     let newId = nextId.current;
     if (newId) {
-      setValue(newId);
       nextId.current = null;
+      setValue(newId);
     }
-  }, [setValue, updateValue]);
+  });
+
   return res;
 }
 

package/src/useResizeObserver.ts

@@ -5,11 +5,11 @@ function hasResizeObserver() {
 }
 
 type useResizeObserverOptionsType<T> = {
-  ref: RefObject<T>,
+  ref: RefObject<T | undefined>,
   onResize: () => void
 }
 
-export function useResizeObserver<T extends HTMLElement>(options: useResizeObserverOptionsType<T>) {
+export function useResizeObserver<T extends Element>(options: useResizeObserverOptionsType<T>) {
   const {ref, onResize} = options;
 
   useEffect(() => {

package/src/number.ts

@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export {clamp, snapValueToStep} from '@react-stately/utils';