[HOLD] Search: Use live onyx data if available

src/hooks/useOnyx.ts

@@ -1,3 +1,5 @@
+import isEmpty from 'lodash/isEmpty';
+import isPlainObject from 'lodash/isPlainObject';
 import {use, useMemo} from 'react';
 import type {DependencyList} from 'react';
 // eslint-disable-next-line no-restricted-imports
@@ -58,35 +60,42 @@
     }
 
     const useOnyxOptions = options as UseOnyxOptions<OnyxKey, OnyxValue<OnyxKey>> | undefined;
-    const {selector: selectorProp, ...optionsWithoutSelector} = useOnyxOptions ?? {};
+    const {selector, ...optionsWithoutSelector} = useOnyxOptions ?? {};
 
-    // Determine if we should use snapshot data based on search state and key
-    const shouldUseSnapshot = isOnSearch && !!currentSearchHash && isSnapshotCompatibleKey;
+    // Original Onyx
+    const originalOnyxOptions: UseOnyxOptions<OnyxKey, OnyxValue<OnyxKey>> = {...optionsWithoutSelector, selector, allowDynamicKey: true};
+    const originalResult = originalUseOnyx(key, originalOnyxOptions, dependencies);
 
-    // Create selector function that handles both regular and snapshot data
-    const selector = useMemo(() => {
-        if (!selectorProp || !shouldUseSnapshot) {
-            return selectorProp;
+    // Snapshot Onyx
+    const shouldUseSnapshot = isOnSearch && !!currentSearchHash && isSnapshotCompatibleKey;
+    const snapshotSelector = useMemo(() => {
+        if (!selector) {
+            return (data: OnyxValue<OnyxKey> | undefined) => getKeyData(data as SearchResults, key) as OnyxValue<OnyxKey>;
         }
 
-        return (data: OnyxValue<OnyxKey> | undefined) => selectorProp(getKeyData(data as SearchResults, key));
-    }, [selectorProp, shouldUseSnapshot, key]);
+        return (data: OnyxValue<OnyxKey> | undefined) => selector(getKeyData(data as SearchResults, key));
+    }, [selector, key]);
+    const snapshotOnyxOptions: UseOnyxOptions<OnyxKey, OnyxValue<OnyxKey>> = {...optionsWithoutSelector, selector: snapshotSelector, allowDynamicKey: true};
+    const snapshotKey = `${ONYXKEYS.COLLECTION.SNAPSHOT}${currentSearchHash}` as OnyxKey;
+    const snapshotResult = shouldUseSnapshot ? originalUseOnyx(snapshotKey, snapshotOnyxOptions, dependencies) : [undefined, {status: 'loaded'}];
 
-    const onyxOptions: UseOnyxOptions<OnyxKey, OnyxValue<OnyxKey>> = {...optionsWithoutSelector, selector, allowDynamicKey: true};
-    const snapshotKey = shouldUseSnapshot ? (`${ONYXKEYS.COLLECTION.SNAPSHOT}${currentSearchHash}` as OnyxKey) : key;
+    const result = useMemo((): UseOnyxResult<TReturnValue> => {
+        // Merge snapshot data with live data if possible
+        if (shouldUseSnapshot) {
+            if (isPlainObject(originalResult[0]) && isPlainObject(snapshotResult[0])) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                return [{...(snapshotResult[0] as Record<string, any>), ...(originalResult[0] as Record<string, any>)}, originalResult[1]] as UseOnyxResult<TReturnValue>;
+            }
 
-    const originalResult = originalUseOnyx(snapshotKey, onyxOptions, dependencies);
+            if (isEmpty(snapshotResult[0])) {
+                return originalResult as UseOnyxResult<TReturnValue>;
+            }
 
-    // Extract and memoize the specific key data from snapshot if in search mode
-    const result = useMemo((): UseOnyxResult<TReturnValue> => {
-        // if it has selector, we don't need to use snapshot here
-        if (!shouldUseSnapshot || selector) {
-            return originalResult as UseOnyxResult<TReturnValue>;
+            return snapshotResult as UseOnyxResult<TReturnValue>;
         }
 
-        const keyData = getKeyData(originalResult[0] as SearchResults, key);
-        return [keyData, originalResult[1]] as UseOnyxResult<TReturnValue>;
-    }, [shouldUseSnapshot, originalResult, key, selector]);
+        return originalResult as UseOnyxResult<TReturnValue>;
+    }, [shouldUseSnapshot, originalResult, snapshotResult]);
 
     return result;
 };

tests/perf-test/ModifiedExpenseMessage.perf-test.ts

@@ -14,7 +14,13 @@ import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 beforeAll(() =>
     Onyx.init({
         keys: ONYXKEYS,
-        evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+        evictableKeys: [
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+            ONYXKEYS.COLLECTION.SNAPSHOT,
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+        ],
     }),
 );
 

tests/perf-test/ReportActionCompose.perf-test.tsx

@@ -69,7 +69,13 @@ jest.mock('@src/libs/actions/EmojiPickerAction', () => {
 beforeAll(() =>
     Onyx.init({
         keys: ONYXKEYS,
-        evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+        evictableKeys: [
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+            ONYXKEYS.COLLECTION.SNAPSHOT,
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+        ],
     }),
 );
 

tests/perf-test/ReportActionsList.perf-test.tsx

@@ -63,7 +63,13 @@ jest.mock('@src/components/ConfirmedRoute.tsx');
 beforeAll(() =>
     Onyx.init({
         keys: ONYXKEYS,
-        evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+        evictableKeys: [
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+            ONYXKEYS.COLLECTION.SNAPSHOT,
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+        ],
     }),
 );
 

tests/perf-test/ReportActionsUtils.perf-test.ts

@@ -40,7 +40,13 @@ describe('ReportActionsUtils', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         });
 
         Onyx.multiSet({

tests/perf-test/ReportUtils.perf-test.ts

@@ -66,7 +66,13 @@ describe('ReportUtils', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         });
     });
 

tests/perf-test/SidebarLinks.perf-test.tsx

@@ -54,7 +54,13 @@ describe('SidebarLinks', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         });
     });
 

tests/perf-test/SidebarUtils.perf-test.ts

@@ -54,7 +54,13 @@ describe('SidebarUtils', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         });
 
         Onyx.multiSet({

tests/ui/ComposerTest.tsx

@@ -15,7 +15,13 @@ describe('Composer', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         });
     });
 

tests/ui/DebugReportActionsTest.tsx

@@ -29,7 +29,13 @@ describe('DebugReportActions', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         });
         act(() => {
             Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, CONST.LOCALES.EN);

tests/ui/LHNItemsPresence.tsx

@@ -127,7 +127,13 @@ describe('SidebarLinksData', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         });
         initOnyxDerivedValues();
     });

tests/ui/PureReportActionItemTest.tsx

@@ -49,7 +49,13 @@ describe('PureReportActionItem', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         });
         jest.spyOn(NativeNavigation, 'useRoute').mockReturnValue({key: '', name: ''});
         jest.spyOn(ReportActionUtils, 'getIOUActionForReportID').mockImplementation(getIOUActionForReportID);

tests/ui/ReportActionComposeTest.tsx

@@ -73,7 +73,13 @@ describe('ReportActionCompose Integration Tests', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         });
     });
 

tests/ui/ReportActionItemMessageEditTest.tsx

@@ -73,7 +73,13 @@ describe('ReportActionCompose Integration Tests', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         });
     });
 

tests/ui/ReportAttachments.tsx

@@ -142,7 +142,13 @@ describe('ReportAttachments', () => {
                 [ONYXKEYS.SESSION]: {accountID: TEST_USER_ACCOUNT_ID, email: TEST_USER_LOGIN},
                 [ONYXKEYS.PERSONAL_DETAILS_LIST]: {[TEST_USER_ACCOUNT_ID]: {accountID: TEST_USER_ACCOUNT_ID, login: TEST_USER_LOGIN}},
             },
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         });
     });
     beforeEach(async () => {

tests/ui/ReportDetailsPageTest.tsx

@@ -33,7 +33,13 @@ describe('ReportDetailsPage', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         });
     });
 

tests/ui/ReportListItemHeaderTest.tsx

@@ -113,7 +113,13 @@ describe('ReportListItemHeader', () => {
     beforeAll(() =>
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         }),
     );
 

tests/ui/TransactionItemRowRBRTest.tsx

@@ -95,7 +95,13 @@ describe('TransactionItemRowRBR', () => {
     beforeAll(async () => {
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         });
         await Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, CONST.LOCALES.DEFAULT);
     });

tests/ui/WorkspaceCategoriesTest.tsx

@@ -53,7 +53,13 @@ describe('WorkspaceCategories', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         });
     });
 

tests/ui/components/IOURequestStepConfirmationPageTest.tsx

@@ -200,7 +200,13 @@ describe('IOURequestStepConfirmationPageTest', () => {
         jest.clearAllMocks();
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         });
     });
 

tests/unit/PersistedRequests.ts

@@ -15,7 +15,13 @@ const request: Request = {
 beforeAll(() =>
     Onyx.init({
         keys: ONYXKEYS,
-        evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+        evictableKeys: [
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+            ONYXKEYS.COLLECTION.SNAPSHOT,
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+        ],
     }),
 );
 

tests/unit/ReportActionItemSingleTest.ts

@@ -12,7 +12,13 @@ describe('ReportActionItemSingle', () => {
     beforeAll(() =>
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         }),
     );
 

tests/unit/ReportActionsUtilsTest.ts

@@ -33,7 +33,13 @@ describe('ReportActionsUtils', () => {
     beforeAll(() =>
         Onyx.init({
             keys: ONYXKEYS,
-            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                ONYXKEYS.COLLECTION.SNAPSHOT,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+            ],
         }),
     );