Skip to content
Merged
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
5 changes: 5 additions & 0 deletions .changeset/metal-kids-arrive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@lynx-js/react": patch
---

Modified the format of data sent from background threads to the main thread.
24 changes: 9 additions & 15 deletions packages/react/runtime/__test__/lifecycle.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,8 @@ describe('useEffect', () => {
expect(mtCallback[0]).toEqual(LifecycleConstant.patchUpdate);
expect(mtCallback[1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_2",2,0,null,3,3,3,0,1,1,2,3,null,1,1,2,null]}",
"data": "{"patchList":[{"id":3,"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_2",2,0,null,3,3,3,0,1,1,2,3,null,1,1,2,null]}]}",
"patchOptions": {
"commitTaskId": 3,
"reloadVersion": 0,
},
}
Expand All @@ -117,9 +116,8 @@ describe('useEffect', () => {
expect(mtCallback[0]).toEqual(LifecycleConstant.patchUpdate);
expect(mtCallback[1]).toMatchInlineSnapshot(`
{
"data": "{}",
"data": "{"patchList":[{"id":4}]}",
"patchOptions": {
"commitTaskId": 4,
"reloadVersion": 0,
},
}
Expand All @@ -134,9 +132,8 @@ describe('useEffect', () => {
expect(mtCallback[0]).toEqual(LifecycleConstant.patchUpdate);
expect(mtCallback[1]).toMatchInlineSnapshot(`
{
"data": "{}",
"data": "{"patchList":[{"id":5}]}",
"patchOptions": {
"commitTaskId": 5,
"reloadVersion": 0,
},
}
Expand Down Expand Up @@ -194,7 +191,7 @@ describe('useEffect', () => {
lynxCoreInject.tt.OnLifecycleEvent(...globalThis.__OnLifecycleEvent.mock.calls[0]);
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1].data).toMatchInlineSnapshot(
`"{"snapshotPatch":[3,-3,0,400]}"`,
`"{"patchList":[{"snapshotPatch":[3,-3,0,400],"id":9}]}"`,
);
globalThis.__OnLifecycleEvent.mockClear();

Expand Down Expand Up @@ -313,9 +310,8 @@ describe('useEffect', () => {
expect(mtCallback[0]).toEqual(LifecycleConstant.patchUpdate);
expect(mtCallback[1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_4",2,0,null,3,3,3,0,1,1,2,3,null,1,1,2,null]}",
"data": "{"patchList":[{"id":14,"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_4",2,0,null,3,3,3,0,1,1,2,3,null,1,1,2,null]}]}",
"patchOptions": {
"commitTaskId": 14,
"reloadVersion": 0,
},
}
Expand Down Expand Up @@ -362,9 +358,8 @@ describe('componentDidMount', () => {
expect(mtCallback[0]).toEqual(LifecycleConstant.patchUpdate);
expect(mtCallback[1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_5",2,0,null,3,3,3,0,1,1,2,3,null,1,1,2,null]}",
"data": "{"patchList":[{"id":17,"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_5",2,0,null,3,3,3,0,1,1,2,3,null,1,1,2,null]}]}",
"patchOptions": {
"commitTaskId": 17,
"reloadVersion": 0,
},
}
Expand Down Expand Up @@ -410,9 +405,8 @@ describe('componentDidMount', () => {
expect(mtCallback[0]).toEqual(LifecycleConstant.patchUpdate);
expect(mtCallback[1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_6",2,0,null,3,3,3,0,1,1,2,3,null,1,1,2,null]}",
"data": "{"patchList":[{"id":20,"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_6",2,0,null,3,3,3,0,1,1,2,3,null,1,1,2,null]}]}",
"patchOptions": {
"commitTaskId": 20,
"reloadVersion": 0,
},
}
Expand Down Expand Up @@ -744,7 +738,7 @@ describe('useState', () => {
await waitSchedule();
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1].data).toMatchInlineSnapshot(
`"{"snapshotPatch":[3,-2,1,"abcd",3,-2,2,{"str":"efgh"}]}"`,
`"{"patchList":[{"id":36,"snapshotPatch":[3,-2,1,"abcd",3,-2,2,{"str":"efgh"}]}]}"`,
);
}
});
Expand Down Expand Up @@ -802,7 +796,7 @@ describe('useState', () => {
await waitSchedule();
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1].data).toMatchInlineSnapshot(
`"{"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_17",2,4,2,[false,{"str":"str"}],1,-1,2,null]}"`,
`"{"patchList":[{"id":39,"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_17",2,4,2,[false,{"str":"str"}],1,-1,2,null]}]}"`,
);
}
});
Expand Down
42 changes: 14 additions & 28 deletions packages/react/runtime/__test__/lifecycle/reload.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,8 @@ describe('reload', () => {
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[]}",
"data": "{"patchList":[{"snapshotPatch":[],"id":2}]}",
"patchOptions": {
"commitTaskId": 2,
"isHydration": true,
"pipelineOptions": {
"needTimestamps": true,
Expand All @@ -121,9 +120,8 @@ describe('reload', () => {
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[3,-5,0,{"dataX2":"WorldX2"},3,-8,0,"update",3,-6,0,{"attr":{"dataX2":"WorldX2"}}]}",
"data": "{"patchList":[{"id":3,"snapshotPatch":[3,-5,0,{"dataX2":"WorldX2"},3,-8,0,"update",3,-6,0,{"attr":{"dataX2":"WorldX2"}}]}]}",
"patchOptions": {
"commitTaskId": 3,
"reloadVersion": 0,
},
}
Expand Down Expand Up @@ -230,9 +228,8 @@ describe('reload', () => {
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[3,-8,0,"???"]}",
"data": "{"patchList":[{"id":4,"snapshotPatch":[3,-8,0,"???"]}]}",
"patchOptions": {
"commitTaskId": 4,
"reloadVersion": 0,
},
}
Expand Down Expand Up @@ -311,9 +308,8 @@ describe('reload', () => {
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[]}",
"data": "{"patchList":[{"snapshotPatch":[],"id":7}]}",
"patchOptions": {
"commitTaskId": 7,
"isHydration": true,
"pipelineOptions": {
"needTimestamps": true,
Expand Down Expand Up @@ -379,9 +375,8 @@ describe('reload', () => {
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[3,-16,0,"update"]}",
"data": "{"patchList":[{"id":8,"snapshotPatch":[3,-16,0,"update"]}]}",
"patchOptions": {
"commitTaskId": 8,
"reloadVersion": 2,
},
}
Expand Down Expand Up @@ -495,9 +490,8 @@ describe('reload', () => {
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[]}",
"data": "{"patchList":[{"snapshotPatch":[],"id":10}]}",
"patchOptions": {
"commitTaskId": 10,
"isHydration": true,
"pipelineOptions": {
"needTimestamps": true,
Expand All @@ -524,9 +518,8 @@ describe('reload', () => {
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[3,-5,0,{"dataX2":"WorldX2"},3,-8,0,"update",3,-6,0,{"attr":{"dataX2":"WorldX2"}}]}",
"data": "{"patchList":[{"id":11,"snapshotPatch":[3,-5,0,{"dataX2":"WorldX2"},3,-8,0,"update",3,-6,0,{"attr":{"dataX2":"WorldX2"}}]}]}",
"patchOptions": {
"commitTaskId": 11,
"reloadVersion": 2,
},
}
Expand Down Expand Up @@ -637,9 +630,8 @@ describe('reload', () => {
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[3,-8,0,"???"]}",
"data": "{"patchList":[{"id":12,"snapshotPatch":[3,-8,0,"???"]}]}",
"patchOptions": {
"commitTaskId": 12,
"reloadVersion": 2,
},
}
Expand Down Expand Up @@ -720,9 +712,8 @@ describe('reload', () => {
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[]}",
"data": "{"patchList":[{"snapshotPatch":[],"id":15}]}",
"patchOptions": {
"commitTaskId": 15,
"isHydration": true,
"pipelineOptions": {
"needTimestamps": true,
Expand Down Expand Up @@ -790,9 +781,8 @@ describe('reload', () => {
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[3,-17,0,"update"]}",
"data": "{"patchList":[{"id":16,"snapshotPatch":[3,-17,0,"update"]}]}",
"patchOptions": {
"commitTaskId": 16,
"reloadVersion": 4,
},
}
Expand Down Expand Up @@ -976,9 +966,8 @@ describe('reload', () => {
[
"rLynxChange",
{
"data": "{"snapshotPatch":[3,-6,0,"d",3,-7,0,"e",3,-8,0,"f"]}",
"data": "{"patchList":[{"id":19,"snapshotPatch":[3,-6,0,"d",3,-7,0,"e",3,-8,0,"f"]}]}",
"patchOptions": {
"commitTaskId": 19,
"reloadVersion": 4,
},
},
Expand Down Expand Up @@ -1319,9 +1308,8 @@ describe('firstScreenSyncTiming - jsReady', () => {
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[2,-17,-21,0,"__Card__:__snapshot_a94a8_test_5",2,0,"__Card__:__snapshot_a94a8_test_2",3,4,3,[{"dataX":"WorldX"}],0,"__Card__:__snapshot_a94a8_test_3",4,0,null,5,4,5,["Hello 2"],1,4,5,null,1,3,4,null,0,"__Card__:__snapshot_a94a8_test_4",6,0,null,7,4,7,["World"],1,6,7,null,1,3,6,null,0,"wrapper",8,0,"__Card__:__snapshot_a94a8_test_1",9,4,9,[{"attr":{"dataX":"WorldX"}}],1,8,9,null,1,3,8,null,1,2,3,null,1,-17,2,null]}",
"data": "{"patchList":[{"snapshotPatch":[2,-17,-21,0,"__Card__:__snapshot_a94a8_test_5",2,0,"__Card__:__snapshot_a94a8_test_2",3,4,3,[{"dataX":"WorldX"}],0,"__Card__:__snapshot_a94a8_test_3",4,0,null,5,4,5,["Hello 2"],1,4,5,null,1,3,4,null,0,"__Card__:__snapshot_a94a8_test_4",6,0,null,7,4,7,["World"],1,6,7,null,1,3,6,null,0,"wrapper",8,0,"__Card__:__snapshot_a94a8_test_1",9,4,9,[{"attr":{"dataX":"WorldX"}}],1,8,9,null,1,3,8,null,1,2,3,null,1,-17,2,null],"id":21}]}",
"patchOptions": {
"commitTaskId": 21,
"isHydration": true,
"pipelineOptions": {
"needTimestamps": true,
Expand Down Expand Up @@ -1521,9 +1509,8 @@ describe('firstScreenSyncTiming - jsReady', () => {
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[]}",
"data": "{"patchList":[{"snapshotPatch":[],"id":23}]}",
"patchOptions": {
"commitTaskId": 23,
"isHydration": true,
"pipelineOptions": {
"needTimestamps": true,
Expand Down Expand Up @@ -1684,9 +1671,8 @@ describe('firstScreenSyncTiming - jsReady', () => {
expect(lynx.getNativeApp().callLepusMethod).toHaveBeenCalledTimes(1);
expect(lynx.getNativeApp().callLepusMethod.mock.calls[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[]}",
"data": "{"patchList":[{"snapshotPatch":[],"id":25}]}",
"patchOptions": {
"commitTaskId": 25,
"isHydration": true,
"pipelineOptions": {
"needTimestamps": true,
Expand Down
21 changes: 7 additions & 14 deletions packages/react/runtime/__test__/lynx/timing.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,8 @@ describe('setState timing api', () => {

expect(mtCallbacks[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_2",3,0,null,4,3,4,0,1,1,3,4,null,1,-2,3,null],"flushOptions":{"__lynx_timing_flag":"__lynx_timing_actual_fmp"}}",
"data": "{"patchList":[{"id":3,"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_2",3,0,null,4,3,4,0,1,1,3,4,null,1,-2,3,null]}],"flushOptions":{"__lynx_timing_flag":"__lynx_timing_actual_fmp"}}",
"patchOptions": {
"commitTaskId": 3,
"pipelineOptions": {
"needTimestamps": false,
"pipelineID": "pipelineID",
Expand Down Expand Up @@ -174,9 +173,8 @@ describe('attribute timing api', () => {
await waitSchedule();
expect(mtCallbacks[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_4",3,4,3,[{"__ltf":"__lynx_timing_actual_fmp"}],0,null,4,3,4,0,1,1,3,4,null,1,-2,3,null]}",
"data": "{"patchList":[{"id":6,"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_4",3,4,3,[{"__ltf":"__lynx_timing_actual_fmp"}],0,null,4,3,4,0,1,1,3,4,null,1,-2,3,null]}]}",
"patchOptions": {
"commitTaskId": 6,
"pipelineOptions": {
"needTimestamps": true,
"pipelineID": "pipelineID",
Expand Down Expand Up @@ -337,9 +335,8 @@ describe('attribute timing api', () => {
`);
expect(mtCallbacks[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_6",3,4,3,[{"__ltf":"__lynx_timing_actual_fmp"}],0,null,4,3,4,0,1,1,3,4,null,1,-2,3,null]}",
"data": "{"patchList":[{"id":9,"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_6",3,4,3,[{"__ltf":"__lynx_timing_actual_fmp"}],0,null,4,3,4,0,1,1,3,4,null,1,-2,3,null]}]}",
"patchOptions": {
"commitTaskId": 9,
"pipelineOptions": {
"needTimestamps": true,
"pipelineID": "pipelineID",
Expand Down Expand Up @@ -440,9 +437,8 @@ describe('attribute timing api', () => {
`);
expect(mtCallbacks[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[]}",
"data": "{"patchList":[{"snapshotPatch":[],"id":11}]}",
"patchOptions": {
"commitTaskId": 11,
"isHydration": true,
"pipelineOptions": {
"needTimestamps": true,
Expand Down Expand Up @@ -498,9 +494,8 @@ describe('attribute timing api', () => {

expect(mtCallbacks[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[3,-2,1,444]}",
"data": "{"patchList":[{"id":14,"snapshotPatch":[3,-2,1,444]}]}",
"patchOptions": {
"commitTaskId": 14,
"pipelineOptions": {
"needTimestamps": false,
"pipelineID": "pipelineID",
Expand Down Expand Up @@ -655,9 +650,8 @@ describe('attribute timing api', () => {
await waitSchedule();
expect(mtCallbacks[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_15",3,4,3,[{"xxx":333,"__lynx_timing_flag":"__lynx_timing_actual_fmp"}],0,null,4,3,4,0,1,1,3,4,null,1,-2,3,null]}",
"data": "{"patchList":[{"id":17,"snapshotPatch":[0,"__Card__:__snapshot_a94a8_test_15",3,4,3,[{"xxx":333,"__lynx_timing_flag":"__lynx_timing_actual_fmp"}],0,null,4,3,4,0,1,1,3,4,null,1,-2,3,null]}]}",
"patchOptions": {
"commitTaskId": 17,
"pipelineOptions": {
"needTimestamps": true,
"pipelineID": "pipelineID",
Expand Down Expand Up @@ -749,9 +743,8 @@ describe('attribute timing api', () => {
await waitSchedule();
expect(mtCallbacks[0][1]).toMatchInlineSnapshot(`
{
"data": "{"snapshotPatch":[3,3,0,{"xxx":666,"__lynx_timing_flag":"__lynx_timing_actual_fmp"}]}",
"data": "{"patchList":[{"id":18,"snapshotPatch":[3,3,0,{"xxx":666,"__lynx_timing_flag":"__lynx_timing_actual_fmp"}]}]}",
"patchOptions": {
"commitTaskId": 18,
"pipelineOptions": {
"needTimestamps": false,
"pipelineID": "pipelineID",
Expand Down
64 changes: 0 additions & 64 deletions packages/react/runtime/__test__/patchUpdate.test.jsx

This file was deleted.

Loading