Merge remote-tracking branch 'origin/main' into feature/skippable-collection-member-ids

Author: fabioh8010

lib/metrics.ts

@@ -1,7 +1,5 @@
 import PerformanceProxy from './dependencies/PerformanceProxy';
 
-const decoratedAliases = new Set();
-
 /**
  * Capture a measurement between the start mark and now
  */
@@ -21,11 +19,6 @@ function isPromiseLike(value: unknown): value is Promise<unknown> {
  * Wraps a function with metrics capturing logic
  */
 function decorateWithMetrics<Args extends unknown[], ReturnType>(func: (...args: Args) => ReturnType, alias = func.name) {
-    if (decoratedAliases.has(alias)) {
-        throw new Error(`"${alias}" is already decorated`);
-    }
-
-    decoratedAliases.add(alias);
     function decorated(...args: Args) {
         const mark = PerformanceProxy.mark(alias, {detail: {args, alias}});
 

lib/useOnyx.ts

@@ -1,13 +1,15 @@
 import {deepEqual, shallowEqual} from 'fast-equals';
-import {useCallback, useEffect, useRef, useSyncExternalStore} from 'react';
+import {useCallback, useEffect, useMemo, useRef, useSyncExternalStore} from 'react';
 import type {DependencyList} from 'react';
 import OnyxCache, {TASK} from './OnyxCache';
 import type {Connection} from './OnyxConnectionManager';
 import connectionManager from './OnyxConnectionManager';
 import OnyxUtils from './OnyxUtils';
+import * as GlobalSettings from './GlobalSettings';
 import type {CollectionKeyBase, KeyValueMapping, OnyxCollection, OnyxKey, OnyxValue} from './types';
 import useLiveRef from './useLiveRef';
 import usePrevious from './usePrevious';
+import decorateWithMetrics from './metrics';
 
 type BaseUseOnyxOptions = {
     /**
@@ -144,7 +146,7 @@ function useOnyx<TKey extends OnyxKey, TReturnValue = OnyxValue<TKey>>(
     // in `getSnapshot()` to be satisfied several times.
     const isFirstConnectionRef = useRef(true);
 
-    // Indicates if the hook is connecting to a Onyx key.
+    // Indicates if the hook is connecting to an Onyx key.
     const isConnectingRef = useRef(false);
 
     // Stores the `onStoreChange()` function, which can be used to trigger a `getSnapshot()` update when desired.
@@ -321,11 +323,19 @@ function useOnyx<TKey extends OnyxKey, TReturnValue = OnyxValue<TKey>>(
         [key, options?.initWithStoredValues, options?.reuseConnection, checkEvictableKey],
     );
 
+    const getSnapshotDecorated = useMemo(() => {
+        if (!GlobalSettings.isPerformanceMetricsEnabled()) {
+            return getSnapshot;
+        }
+
+        return decorateWithMetrics(getSnapshot, 'useOnyx.getSnapshot');
+    }, [getSnapshot]);
+
     useEffect(() => {
         checkEvictableKey();
     }, [checkEvictableKey]);
 
-    const result = useSyncExternalStore<UseOnyxResult<TReturnValue>>(subscribe, getSnapshot);
+    const result = useSyncExternalStore<UseOnyxResult<TReturnValue>>(subscribe, getSnapshotDecorated);
 
     return result;
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-onyx",
-  "version": "2.0.84",
+  "version": "2.0.86",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.com",
   "description": "State management for React Native",
@@ -25,7 +25,8 @@
     "README.md",
     "LICENSE.md"
   ],
-  "main": "lib/index.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
     "lint": "eslint .",
     "typecheck": "tsc --noEmit",