Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,6 @@
"RPID",
"RRGGBB",
"rstrip",
"recyclerview",
"RTER",
"s3uqn2oe4m85tufi6mqflbfbuajrm2i3",
"SAASPASS",
Expand Down
2 changes: 1 addition & 1 deletion jest/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ jest.mock('../src/components/Icon/IllustrationLoader.ts', () => ({
}));

jest.mock(
'@components/FlatList/RenderTaskQueue',
'@components/FlatList/InvertedFlatList/RenderTaskQueue',
() =>
class SyncRenderTaskQueue {
private handler: (info: unknown) => void = () => {};
Expand Down
29 changes: 0 additions & 29 deletions jest/setupAfterEnv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,6 @@ import ONYXKEYS from '@src/ONYXKEYS';

jest.useRealTimers();

// This mock must live in setupAfterEnv (not setupFiles) because @shopify/flash-list/jestSetup,
// imported in setup.ts, registers its own measureLayout mock. Placing ours here ensures it
// runs after FlashList's setup and takes precedence.
jest.mock(
'@shopify/flash-list/dist/recyclerview/utils/measureLayout',
() =>
({
...jest.requireActual('@shopify/flash-list/dist/recyclerview/utils/measureLayout'),
measureParentSize: jest.fn().mockImplementation(() => ({
x: 0,
y: 0,
width: 300,
height: 400,
})),
measureFirstChildLayout: jest.fn().mockImplementation(() => ({
x: 0,
y: 0,
width: 300,
height: 400,
})),
measureItemLayout: jest.fn().mockImplementation(() => ({
x: 0,
y: 0,
width: 300,
height: 75,
})),
}) as Record<string, unknown>,
);

// Auto-initialize Onyx for tests.
// Tests that already call Onyx.init() in their own beforeAll will safely re-configure Onyx —
// the second init() just re-runs initStoreValues and re-resolves the already-resolved deferred task.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/node_modules/@shopify/flash-list/dist/recyclerview/layout-managers/LinearLayoutManager.js b/node_modules/@shopify/flash-list/dist/recyclerview/layout-managers/LinearLayoutManager.js
index fb40ded..12375d9 100644
index fb40ded..ea4eba2 100644
--- a/node_modules/@shopify/flash-list/dist/recyclerview/layout-managers/LinearLayoutManager.js
+++ b/node_modules/@shopify/flash-list/dist/recyclerview/layout-managers/LinearLayoutManager.js
@@ -92,6 +92,17 @@ export class RVLinearLayoutManagerImpl extends RVLayoutManager {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading