@lynx-js/react 0.121.0 → 0.121.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +34 -0
- package/package.json +5 -5
- package/runtime/lazy/element-template-import.js +73 -0
- package/runtime/lazy/import.js +4 -0
- package/runtime/lazy/target.js +23 -0
- package/runtime/lib/core/commit-context.d.ts +8 -0
- package/runtime/lib/core/commit-context.js +18 -0
- package/runtime/lib/core/commit-context.js.map +1 -0
- package/runtime/lib/{snapshot/legacy-react-runtime/index.d.ts → core/compat/legacy-react-runtime.d.ts} +4 -4
- package/runtime/lib/{snapshot/legacy-react-runtime/index.js → core/compat/legacy-react-runtime.js} +6 -6
- package/runtime/lib/core/compat/legacy-react-runtime.js.map +1 -0
- package/runtime/lib/{snapshot → core}/compat/lynxComponent.d.ts +2 -1
- package/runtime/lib/{snapshot → core}/compat/lynxComponent.js +11 -5
- package/runtime/lib/core/compat/lynxComponent.js.map +1 -0
- package/runtime/lib/core/component.d.ts +2 -0
- package/runtime/lib/core/component.js +79 -0
- package/runtime/lib/core/component.js.map +1 -0
- package/runtime/lib/core/forceRootRender.d.ts +7 -0
- package/runtime/lib/core/forceRootRender.js +40 -0
- package/runtime/lib/core/forceRootRender.js.map +1 -0
- package/runtime/lib/core/globalProps.d.ts +31 -0
- package/runtime/lib/core/globalProps.js +55 -0
- package/runtime/lib/core/globalProps.js.map +1 -0
- package/runtime/lib/core/hooks/useLynxGlobalEventListener.js +1 -1
- package/runtime/lib/core/hooks/useLynxGlobalEventListener.js.map +1 -1
- package/runtime/lib/{snapshot/compat → core}/initData.d.ts +1 -1
- package/runtime/lib/{snapshot/compat → core}/initData.js +4 -5
- package/runtime/lib/core/initData.js.map +1 -0
- package/runtime/lib/{snapshot/lynx/dynamic-js.js → core/lynx/dynamic-import.js} +1 -1
- package/runtime/lib/core/lynx/dynamic-import.js.map +1 -0
- package/runtime/lib/core/lynx/lazy-bundle.js.map +1 -0
- package/runtime/lib/core/lynx/runtime-backend.d.ts +5 -0
- package/runtime/lib/core/lynx/runtime-backend.js +20 -0
- package/runtime/lib/core/lynx/runtime-backend.js.map +1 -0
- package/runtime/lib/core/lynx-data-processors.d.ts +2 -0
- package/runtime/lib/core/lynx-data-processors.js +53 -0
- package/runtime/lib/core/lynx-data-processors.js.map +1 -0
- package/runtime/lib/core/lynx-page-data.d.ts +1 -0
- package/runtime/lib/core/lynx-page-data.js +14 -0
- package/runtime/lib/core/lynx-page-data.js.map +1 -0
- package/runtime/lib/core/lynx-update-data.d.ts +11 -0
- package/runtime/lib/core/lynx-update-data.js +21 -0
- package/runtime/lib/core/lynx-update-data.js.map +1 -0
- package/runtime/lib/core/performance.d.ts +30 -0
- package/runtime/lib/core/performance.js +145 -0
- package/runtime/lib/core/performance.js.map +1 -0
- package/runtime/lib/core/ref.d.ts +37 -0
- package/runtime/lib/core/ref.js +108 -0
- package/runtime/lib/core/ref.js.map +1 -0
- package/runtime/lib/core/reload-version.d.ts +2 -0
- package/runtime/lib/{snapshot/lifecycle/pass.js → core/reload-version.js} +4 -5
- package/runtime/lib/core/reload-version.js.map +1 -0
- package/runtime/lib/element-template/background/attr-slots.d.ts +6 -1
- package/runtime/lib/element-template/background/attr-slots.js +35 -2
- package/runtime/lib/element-template/background/attr-slots.js.map +1 -1
- package/runtime/lib/element-template/background/commit-context.d.ts +3 -3
- package/runtime/lib/element-template/background/commit-context.js +15 -18
- package/runtime/lib/element-template/background/commit-context.js.map +1 -1
- package/runtime/lib/element-template/background/commit-hook.d.ts +1 -1
- package/runtime/lib/element-template/background/commit-hook.js +68 -43
- package/runtime/lib/element-template/background/commit-hook.js.map +1 -1
- package/runtime/lib/element-template/background/destroy.js +9 -6
- package/runtime/lib/element-template/background/destroy.js.map +1 -1
- package/runtime/lib/element-template/background/document.js +5 -5
- package/runtime/lib/element-template/background/document.js.map +1 -1
- package/runtime/lib/element-template/background/hydrate.d.ts +2 -3
- package/runtime/lib/element-template/background/hydrate.js +247 -74
- package/runtime/lib/element-template/background/hydrate.js.map +1 -1
- package/runtime/lib/element-template/background/hydration-listener.js +49 -22
- package/runtime/lib/element-template/background/hydration-listener.js.map +1 -1
- package/runtime/lib/element-template/background/instance.d.ts +38 -9
- package/runtime/lib/element-template/background/instance.js +292 -113
- package/runtime/lib/element-template/background/instance.js.map +1 -1
- package/runtime/lib/element-template/client/root.d.ts +7 -0
- package/runtime/lib/element-template/client/root.js +3 -6
- package/runtime/lib/element-template/client/root.js.map +1 -1
- package/runtime/lib/element-template/debug/alog.d.ts +21 -0
- package/runtime/lib/element-template/debug/alog.js +33 -0
- package/runtime/lib/element-template/debug/alog.js.map +1 -1
- package/runtime/lib/element-template/debug/elementPAPICall.js +5 -0
- package/runtime/lib/element-template/debug/elementPAPICall.js.map +1 -1
- package/runtime/lib/element-template/hydration-map.d.ts +5 -0
- package/runtime/lib/element-template/hydration-map.js +12 -0
- package/runtime/lib/element-template/hydration-map.js.map +1 -0
- package/runtime/lib/element-template/index.d.ts +25 -3
- package/runtime/lib/element-template/index.js +38 -9
- package/runtime/lib/element-template/index.js.map +1 -1
- package/runtime/lib/element-template/internal.d.ts +5 -1
- package/runtime/lib/element-template/internal.js +6 -7
- package/runtime/lib/element-template/internal.js.map +1 -1
- package/runtime/lib/element-template/lynx/env.js +5 -48
- package/runtime/lib/element-template/lynx/env.js.map +1 -1
- package/runtime/lib/element-template/lynx/performance.d.ts +0 -21
- package/runtime/lib/element-template/lynx/performance.js +4 -121
- package/runtime/lib/element-template/lynx/performance.js.map +1 -1
- package/runtime/lib/element-template/native/index.d.ts +1 -1
- package/runtime/lib/element-template/native/index.js +28 -2
- package/runtime/lib/element-template/native/index.js.map +1 -1
- package/runtime/lib/element-template/native/main-thread-api.js +27 -5
- package/runtime/lib/element-template/native/main-thread-api.js.map +1 -1
- package/runtime/lib/element-template/native/mts-destroy.js +2 -0
- package/runtime/lib/element-template/native/mts-destroy.js.map +1 -1
- package/runtime/lib/element-template/native/patch-listener.js +6 -2
- package/runtime/lib/element-template/native/patch-listener.js.map +1 -1
- package/runtime/lib/element-template/native/reload-background.d.ts +1 -0
- package/runtime/lib/element-template/native/reload-background.js +39 -0
- package/runtime/lib/element-template/native/reload-background.js.map +1 -0
- package/runtime/lib/element-template/native/reload-main-thread.d.ts +1 -0
- package/runtime/lib/element-template/native/reload-main-thread.js +35 -0
- package/runtime/lib/element-template/native/reload-main-thread.js.map +1 -0
- package/runtime/lib/element-template/prop-adapters/event.d.ts +1 -0
- package/runtime/lib/element-template/prop-adapters/event.js +4 -1
- package/runtime/lib/element-template/prop-adapters/event.js.map +1 -1
- package/runtime/lib/element-template/prop-adapters/ref.d.ts +26 -0
- package/runtime/lib/element-template/prop-adapters/ref.js +107 -0
- package/runtime/lib/element-template/prop-adapters/ref.js.map +1 -0
- package/runtime/lib/element-template/prop-adapters/spread.js +8 -1
- package/runtime/lib/element-template/prop-adapters/spread.js.map +1 -1
- package/runtime/lib/element-template/protocol/opcodes.d.ts +4 -0
- package/runtime/lib/element-template/protocol/opcodes.js +4 -0
- package/runtime/lib/element-template/protocol/opcodes.js.map +1 -1
- package/runtime/lib/element-template/protocol/template-type.d.ts +6 -0
- package/runtime/lib/element-template/protocol/template-type.js +20 -0
- package/runtime/lib/element-template/protocol/template-type.js.map +1 -0
- package/runtime/lib/element-template/protocol/types.d.ts +74 -6
- package/runtime/lib/element-template/runtime/list/list.d.ts +65 -0
- package/runtime/lib/element-template/runtime/list/list.js +587 -0
- package/runtime/lib/element-template/runtime/list/list.js.map +1 -0
- package/runtime/lib/element-template/runtime/page/page.d.ts +5 -2
- package/runtime/lib/element-template/runtime/page/page.js +12 -0
- package/runtime/lib/element-template/runtime/page/page.js.map +1 -1
- package/runtime/lib/element-template/runtime/patch.js +210 -38
- package/runtime/lib/element-template/runtime/patch.js.map +1 -1
- package/runtime/lib/element-template/runtime/render/render-main-thread.d.ts +3 -1
- package/runtime/lib/element-template/runtime/render/render-main-thread.js +38 -7
- package/runtime/lib/element-template/runtime/render/render-main-thread.js.map +1 -1
- package/runtime/lib/element-template/runtime/render/render-opcodes.js +80 -43
- package/runtime/lib/element-template/runtime/render/render-opcodes.js.map +1 -1
- package/runtime/lib/element-template/runtime/render/render-to-opcodes.js +41 -4
- package/runtime/lib/element-template/runtime/render/render-to-opcodes.js.map +1 -1
- package/runtime/lib/element-template/runtime/template/attr-slot-plan.d.ts +1 -0
- package/runtime/lib/element-template/runtime/template/attr-slot-plan.js +4 -0
- package/runtime/lib/element-template/runtime/template/attr-slot-plan.js.map +1 -1
- package/runtime/lib/element-template/runtime/template/handle.d.ts +3 -2
- package/runtime/lib/element-template/runtime/template/handle.js +5 -1
- package/runtime/lib/element-template/runtime/template/handle.js.map +1 -1
- package/runtime/lib/element-template/runtime/template/registry.d.ts +2 -0
- package/runtime/lib/element-template/runtime/template/registry.js +6 -1
- package/runtime/lib/element-template/runtime/template/registry.js.map +1 -1
- package/runtime/lib/element-template/runtime-backend-marker.js +6 -0
- package/runtime/lib/element-template/runtime-backend-marker.js.map +1 -0
- package/runtime/lib/index.d.ts +1 -1
- package/runtime/lib/index.js +3 -1
- package/runtime/lib/index.js.map +1 -1
- package/runtime/lib/internal.d.ts +5 -4
- package/runtime/lib/internal.js +6 -5
- package/runtime/lib/internal.js.map +1 -1
- package/runtime/lib/lynx-api.d.ts +3 -8
- package/runtime/lib/lynx-api.js +8 -45
- package/runtime/lib/lynx-api.js.map +1 -1
- package/runtime/lib/runtime-backend-marker.js +6 -0
- package/runtime/lib/runtime-backend-marker.js.map +1 -0
- package/runtime/lib/snapshot/debug/vnodeSource.js +1 -1
- package/runtime/lib/snapshot/debug/vnodeSource.js.map +1 -1
- package/runtime/lib/snapshot/lifecycle/patch/commit.d.ts +0 -1
- package/runtime/lib/snapshot/lifecycle/patch/commit.js +4 -9
- package/runtime/lib/snapshot/lifecycle/patch/commit.js.map +1 -1
- package/runtime/lib/snapshot/lifecycle/patch/updateMainThread.js +2 -2
- package/runtime/lib/snapshot/lifecycle/patch/updateMainThread.js.map +1 -1
- package/runtime/lib/snapshot/lifecycle/ref/delay.d.ts +6 -13
- package/runtime/lib/snapshot/lifecycle/ref/delay.js +9 -30
- package/runtime/lib/snapshot/lifecycle/ref/delay.js.map +1 -1
- package/runtime/lib/snapshot/lifecycle/reload.js +2 -2
- package/runtime/lib/snapshot/lifecycle/reload.js.map +1 -1
- package/runtime/lib/snapshot/list/list.js +1 -1
- package/runtime/lib/snapshot/list/list.js.map +1 -1
- package/runtime/lib/snapshot/list/listUpdateInfo.js +3 -2
- package/runtime/lib/snapshot/list/listUpdateInfo.js.map +1 -1
- package/runtime/lib/snapshot/lynx/calledByNative.js +3 -9
- package/runtime/lib/snapshot/lynx/calledByNative.js.map +1 -1
- package/runtime/lib/snapshot/lynx/env.js +5 -51
- package/runtime/lib/snapshot/lynx/env.js.map +1 -1
- package/runtime/lib/snapshot/lynx/performance.d.ts +0 -21
- package/runtime/lib/snapshot/lynx/performance.js +7 -121
- package/runtime/lib/snapshot/lynx/performance.js.map +1 -1
- package/runtime/lib/snapshot/lynx/runWithForce.js +9 -39
- package/runtime/lib/snapshot/lynx/runWithForce.js.map +1 -1
- package/runtime/lib/snapshot/lynx/tt.js +10 -30
- package/runtime/lib/snapshot/lynx/tt.js.map +1 -1
- package/runtime/lib/snapshot/snapshot/backgroundSnapshot.js +4 -4
- package/runtime/lib/snapshot/snapshot/backgroundSnapshot.js.map +1 -1
- package/runtime/lib/snapshot/snapshot/list.js +1 -1
- package/runtime/lib/snapshot/snapshot/list.js.map +1 -1
- package/runtime/lib/snapshot/snapshot/ref.d.ts +3 -5
- package/runtime/lib/snapshot/snapshot/ref.js +16 -59
- package/runtime/lib/snapshot/snapshot/ref.js.map +1 -1
- package/runtime/lib/snapshot/snapshot/snapshot.js +1 -1
- package/runtime/lib/snapshot/snapshot/snapshot.js.map +1 -1
- package/runtime/lib/snapshot/snapshot/snapshotInstanceHydrationMap.js +1 -1
- package/runtime/lib/snapshot/snapshot/snapshotInstanceHydrationMap.js.map +1 -1
- package/runtime/lib/tsconfig.tsbuildinfo +1 -1
- package/runtime/lib/worklet-runtime/workletRuntime.js +1 -1
- package/runtime/lib/worklet-runtime/workletRuntime.js.map +1 -1
- package/runtime/worklet-runtime/dev.js +2 -3
- package/runtime/worklet-runtime/main.js +1 -1
- package/testing-library/dist/{rslib-runtime.js → 0~rslib-runtime.js} +14 -13
- package/testing-library/dist/env/index.js +2 -8
- package/testing-library/dist/env/vitest.js +1 -1
- package/testing-library/dist/plugins/index.js +13 -2
- package/testing-library/dist/pure.js +18 -18
- package/testing-library/dist/rstest-config.js +2 -4
- package/testing-library/dist/setupFiles/common/bootstrap.js +1 -0
- package/testing-library/dist/setupFiles/common/runtime-setup.js +1 -1
- package/testing-library/dist/setupFiles/inner/rstest.js +2 -1
- package/testing-library/dist/setupFiles/inner/vitest.js +2 -1
- package/testing-library/dist/type-entry/index.js +1 -0
- package/transform/dist/wasm.cjs +113 -40
- package/runtime/lib/element-template/hooks/react.d.ts +0 -14
- package/runtime/lib/element-template/hooks/react.js +0 -24
- package/runtime/lib/element-template/hooks/react.js.map +0 -1
- package/runtime/lib/element-template/runtime/components/slot.js +0 -11
- package/runtime/lib/element-template/runtime/components/slot.js.map +0 -1
- package/runtime/lib/snapshot/compat/initData.js.map +0 -1
- package/runtime/lib/snapshot/compat/lynxComponent.js.map +0 -1
- package/runtime/lib/snapshot/legacy-react-runtime/index.js.map +0 -1
- package/runtime/lib/snapshot/lifecycle/pass.d.ts +0 -3
- package/runtime/lib/snapshot/lifecycle/pass.js.map +0 -1
- package/runtime/lib/snapshot/lynx/component.js +0 -73
- package/runtime/lib/snapshot/lynx/component.js.map +0 -1
- package/runtime/lib/snapshot/lynx/dynamic-js.js.map +0 -1
- package/runtime/lib/snapshot/lynx/lazy-bundle.js.map +0 -1
- package/testing-library/dist/881.js +0 -1
- /package/runtime/lib/{snapshot/lynx/dynamic-js.d.ts → core/lynx/dynamic-import.d.ts} +0 -0
- /package/runtime/lib/{snapshot → core}/lynx/lazy-bundle.d.ts +0 -0
- /package/runtime/lib/{snapshot → core}/lynx/lazy-bundle.js +0 -0
- /package/runtime/lib/element-template/{runtime/components/slot.d.ts → runtime-backend-marker.d.ts} +0 -0
- /package/runtime/lib/{snapshot/lynx/component.d.ts → runtime-backend-marker.d.ts} +0 -0
- /package/testing-library/dist/{0~123.js → 0~@rstest/adapter-rsbuild.js} +0 -0
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Copyright 2026 The Lynx Authors. All rights reserved.
|
|
2
2
|
// Licensed under the Apache License Version 2.0 that can be found in the
|
|
3
3
|
// LICENSE file in the root directory of this source tree.
|
|
4
|
+
import { composeElementTemplateListAttributes, createElementTemplateListStateFromItems, flushInitialElementTemplateListUpdates, flushPendingElementTemplateListUpdates, insertElementTemplateListItem, markElementTemplateListDestroyed, registerElementTemplateListState, removeElementTemplateListItem, updateElementTemplateListAttributes, updateElementTemplateListItem, } from './list/list.js';
|
|
4
5
|
import { elementTemplateRegistry } from './template/registry.js';
|
|
5
6
|
import { ElementTemplateUpdateOps } from '../protocol/opcodes.js';
|
|
6
7
|
export function applyElementTemplateUpdateCommands(stream) {
|
|
@@ -22,10 +23,10 @@ export function applyElementTemplateUpdateCommands(stream) {
|
|
|
22
23
|
}
|
|
23
24
|
}
|
|
24
25
|
const resolvedElementSlots = resolveElementSlots(elementSlots);
|
|
25
|
-
if (
|
|
26
|
+
if (resolvedElementSlots === undefined) {
|
|
26
27
|
continue;
|
|
27
28
|
}
|
|
28
|
-
const nativeRef = __CreateElementTemplate(templateKey, bundleUrl, normalizeAttributeSlots(attributeSlots), resolvedElementSlots
|
|
29
|
+
const nativeRef = __CreateElementTemplate(templateKey, bundleUrl, normalizeAttributeSlots(attributeSlots), resolvedElementSlots, handleId);
|
|
29
30
|
if (nativeRef) {
|
|
30
31
|
elementTemplateRegistry.set(handleId, nativeRef);
|
|
31
32
|
}
|
|
@@ -35,24 +36,119 @@ export function applyElementTemplateUpdateCommands(stream) {
|
|
|
35
36
|
const targetId = stream[i++];
|
|
36
37
|
const attrSlotIndex = stream[i++];
|
|
37
38
|
const value = stream[i++];
|
|
38
|
-
const nativeRef =
|
|
39
|
+
const nativeRef = resolveTargetHandle(targetId, 'target');
|
|
39
40
|
if (!nativeRef) {
|
|
40
41
|
continue;
|
|
41
42
|
}
|
|
43
|
+
if (attrSlotIndex === 0) {
|
|
44
|
+
const listAttributes = updateElementTemplateListAttributes(targetId, value);
|
|
45
|
+
if (listAttributes) {
|
|
46
|
+
__SetAttributeOfElementTemplate(nativeRef, attrSlotIndex, listAttributes, null);
|
|
47
|
+
break;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
42
50
|
__SetAttributeOfElementTemplate(nativeRef, attrSlotIndex, value, null);
|
|
43
51
|
break;
|
|
44
52
|
}
|
|
53
|
+
case ElementTemplateUpdateOps.createTypedElement: {
|
|
54
|
+
const handleId = stream[i++];
|
|
55
|
+
const type = stream[i++];
|
|
56
|
+
const attributes = stream[i++];
|
|
57
|
+
const elementSlots = stream[i++];
|
|
58
|
+
const options = stream[i++];
|
|
59
|
+
const isTypedList = type === 'list';
|
|
60
|
+
if (__DEV__) {
|
|
61
|
+
const createError = validateCreateHandleId(handleId);
|
|
62
|
+
if (createError) {
|
|
63
|
+
lynx.reportError(createError);
|
|
64
|
+
continue;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
if (__DEV__ && elementSlots != null && !Array.isArray(elementSlots)) {
|
|
68
|
+
lynx.reportError(new Error('ElementTemplate update create elementSlots must be an array, null, or undefined.'));
|
|
69
|
+
continue;
|
|
70
|
+
}
|
|
71
|
+
if (__DEV__
|
|
72
|
+
&& isTypedList
|
|
73
|
+
&& !isTypedListElementSlotsEmpty(elementSlots)) {
|
|
74
|
+
lynx.reportError(new Error('ElementTemplate typed list create must keep logical children in options.listChildren.'));
|
|
75
|
+
continue;
|
|
76
|
+
}
|
|
77
|
+
const resolvedElementSlots = isTypedList ? null : resolveElementSlots(elementSlots);
|
|
78
|
+
if (resolvedElementSlots === undefined) {
|
|
79
|
+
continue;
|
|
80
|
+
}
|
|
81
|
+
let resolvedListItems = null;
|
|
82
|
+
let nativeOptions;
|
|
83
|
+
if (isTypedList) {
|
|
84
|
+
const listChildren = getTypedListChildren(options);
|
|
85
|
+
if (__DEV__ && !Array.isArray(listChildren)) {
|
|
86
|
+
lynx.reportError(new Error('ElementTemplate typed list create must keep logical children in options.listChildren.'));
|
|
87
|
+
continue;
|
|
88
|
+
}
|
|
89
|
+
resolvedListItems = resolveTypedListItems(listChildren);
|
|
90
|
+
if (resolvedListItems === null) {
|
|
91
|
+
continue;
|
|
92
|
+
}
|
|
93
|
+
nativeOptions = resolveTypedListOptions(options, resolvedListItems);
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
nativeOptions = options;
|
|
97
|
+
}
|
|
98
|
+
const listState = resolvedListItems
|
|
99
|
+
? createElementTemplateListStateFromItems(resolvedListItems, attributes)
|
|
100
|
+
: null;
|
|
101
|
+
const typedAttributes = listState
|
|
102
|
+
? composeElementTemplateListAttributes(undefined, listState)
|
|
103
|
+
: attributes;
|
|
104
|
+
const nativeRef = __CreateTypedElementTemplate(type, typedAttributes, isTypedList ? null : resolvedElementSlots, handleId, nativeOptions);
|
|
105
|
+
if (nativeRef) {
|
|
106
|
+
elementTemplateRegistry.set(handleId, nativeRef);
|
|
107
|
+
if (listState) {
|
|
108
|
+
registerElementTemplateListState(handleId, listState, true, nativeRef);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
break;
|
|
112
|
+
}
|
|
113
|
+
case ElementTemplateUpdateOps.insertTypedListItem: {
|
|
114
|
+
const listId = stream[i++];
|
|
115
|
+
const item = stream[i++];
|
|
116
|
+
const beforeId = stream[i++];
|
|
117
|
+
const resolvedItem = resolveTypedListItem(item, 'typed list insert item');
|
|
118
|
+
if (resolvedItem === null) {
|
|
119
|
+
continue;
|
|
120
|
+
}
|
|
121
|
+
insertElementTemplateListItem(listId, resolvedItem, beforeId);
|
|
122
|
+
break;
|
|
123
|
+
}
|
|
124
|
+
case ElementTemplateUpdateOps.removeTypedListItem: {
|
|
125
|
+
const listId = stream[i++];
|
|
126
|
+
const itemId = stream[i++];
|
|
127
|
+
const removedSubtreeHandleIds = stream[i++];
|
|
128
|
+
removeElementTemplateListItem(listId, itemId, removedSubtreeHandleIds);
|
|
129
|
+
break;
|
|
130
|
+
}
|
|
131
|
+
case ElementTemplateUpdateOps.updateTypedListItem: {
|
|
132
|
+
const listId = stream[i++];
|
|
133
|
+
const item = stream[i++];
|
|
134
|
+
const resolvedItem = resolveTypedListItem(item, 'typed list update item');
|
|
135
|
+
if (resolvedItem === null) {
|
|
136
|
+
continue;
|
|
137
|
+
}
|
|
138
|
+
updateElementTemplateListItem(listId, resolvedItem);
|
|
139
|
+
break;
|
|
140
|
+
}
|
|
45
141
|
case ElementTemplateUpdateOps.insertNode: {
|
|
46
142
|
const targetId = stream[i++];
|
|
47
143
|
const elementSlotIndex = stream[i++];
|
|
48
144
|
const childId = stream[i++];
|
|
49
145
|
const referenceId = stream[i++];
|
|
50
|
-
const nativeRef =
|
|
51
|
-
const childRef =
|
|
146
|
+
const nativeRef = resolveTargetHandle(targetId, 'target');
|
|
147
|
+
const childRef = resolveTargetHandle(childId, 'child');
|
|
52
148
|
if (!nativeRef || !childRef) {
|
|
53
149
|
continue;
|
|
54
150
|
}
|
|
55
|
-
const referenceRef = referenceId === 0 ? null :
|
|
151
|
+
const referenceRef = referenceId === 0 ? null : resolveTargetHandle(referenceId, 'reference');
|
|
56
152
|
if (referenceId !== 0 && !referenceRef) {
|
|
57
153
|
continue;
|
|
58
154
|
}
|
|
@@ -64,54 +160,123 @@ export function applyElementTemplateUpdateCommands(stream) {
|
|
|
64
160
|
const elementSlotIndex = stream[i++];
|
|
65
161
|
const childId = stream[i++];
|
|
66
162
|
const removedSubtreeHandleIds = stream[i++];
|
|
67
|
-
const nativeRef =
|
|
68
|
-
const childRef =
|
|
163
|
+
const nativeRef = resolveTargetHandle(targetId, 'target');
|
|
164
|
+
const childRef = resolveTargetHandle(childId, 'child');
|
|
69
165
|
if (!nativeRef || !childRef) {
|
|
70
166
|
continue;
|
|
71
167
|
}
|
|
72
168
|
__RemoveNodeFromElementTemplate(nativeRef, elementSlotIndex, childRef);
|
|
73
|
-
|
|
74
|
-
// strong refs after a successful detach lets JS GC reclaim the subtree.
|
|
75
|
-
for (const handleId of removedSubtreeHandleIds) {
|
|
76
|
-
elementTemplateRegistry.delete(handleId);
|
|
77
|
-
}
|
|
169
|
+
releaseRemovedSubtreeHandles(removedSubtreeHandleIds);
|
|
78
170
|
break;
|
|
79
171
|
}
|
|
80
172
|
default: {
|
|
81
|
-
|
|
173
|
+
if (__DEV__) {
|
|
174
|
+
lynx.reportError(new Error(`ElementTemplate update opcode ${String(op)} is not supported.`));
|
|
175
|
+
}
|
|
82
176
|
}
|
|
83
177
|
}
|
|
84
178
|
}
|
|
179
|
+
flushPendingListUpdates();
|
|
180
|
+
}
|
|
181
|
+
function flushPendingListUpdates() {
|
|
182
|
+
applyListFlushResults(flushPendingElementTemplateListUpdates());
|
|
183
|
+
applyListFlushResults(flushInitialElementTemplateListUpdates());
|
|
184
|
+
}
|
|
185
|
+
function applyListFlushResults(results) {
|
|
186
|
+
for (let index = 0; index < results.length; index += 1) {
|
|
187
|
+
const result = results[index];
|
|
188
|
+
const listRef = resolveTargetHandle(result.uid, 'typed list');
|
|
189
|
+
if (!listRef) {
|
|
190
|
+
continue;
|
|
191
|
+
}
|
|
192
|
+
__SetAttributeOfElementTemplate(listRef, 0, result.attributes, null);
|
|
193
|
+
if (result.removedSubtreeHandleIds) {
|
|
194
|
+
releaseRemovedSubtreeHandles(result.removedSubtreeHandleIds);
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
function releaseRemovedSubtreeHandles(removedSubtreeHandleIds) {
|
|
199
|
+
for (const handleId of removedSubtreeHandleIds) {
|
|
200
|
+
const pendingRemovedSubtreeHandleIds = markElementTemplateListDestroyed(handleId);
|
|
201
|
+
elementTemplateRegistry.delete(handleId);
|
|
202
|
+
if (pendingRemovedSubtreeHandleIds) {
|
|
203
|
+
releaseRemovedSubtreeHandles(pendingRemovedSubtreeHandleIds);
|
|
204
|
+
}
|
|
205
|
+
}
|
|
85
206
|
}
|
|
86
207
|
function resolveElementSlots(elementSlots) {
|
|
87
|
-
if (
|
|
88
|
-
return
|
|
208
|
+
if (elementSlots == null) {
|
|
209
|
+
return null;
|
|
89
210
|
}
|
|
90
211
|
let hasError = false;
|
|
91
|
-
const value =
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
}
|
|
97
|
-
return [];
|
|
212
|
+
const value = [];
|
|
213
|
+
for (let slotIndex = 0; slotIndex < elementSlots.length; slotIndex += 1) {
|
|
214
|
+
const children = elementSlots[slotIndex];
|
|
215
|
+
if (children == null) {
|
|
216
|
+
continue;
|
|
98
217
|
}
|
|
99
|
-
|
|
100
|
-
.
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
218
|
+
if (__DEV__ && !Array.isArray(children)) {
|
|
219
|
+
lynx.reportError(new Error(`ElementTemplate create slot ${slotIndex} must be an array of child handles, null, or undefined.`));
|
|
220
|
+
hasError = true;
|
|
221
|
+
continue;
|
|
222
|
+
}
|
|
223
|
+
const resolvedChildren = [];
|
|
224
|
+
for (let childIndex = 0; childIndex < children.length; childIndex += 1) {
|
|
225
|
+
const childId = children[childIndex];
|
|
226
|
+
const childRef = resolveTargetHandle(childId, 'child');
|
|
227
|
+
if (childRef === null) {
|
|
105
228
|
hasError = true;
|
|
229
|
+
continue;
|
|
106
230
|
}
|
|
107
|
-
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
}
|
|
111
|
-
|
|
231
|
+
resolvedChildren.push(childRef);
|
|
232
|
+
}
|
|
233
|
+
value[slotIndex] = resolvedChildren;
|
|
234
|
+
}
|
|
235
|
+
if (hasError) {
|
|
236
|
+
return undefined;
|
|
237
|
+
}
|
|
238
|
+
return value;
|
|
239
|
+
}
|
|
240
|
+
function resolveTypedListOptions(options, items) {
|
|
241
|
+
return {
|
|
242
|
+
...options,
|
|
243
|
+
listChildren: items.map(item => item.ref),
|
|
244
|
+
};
|
|
245
|
+
}
|
|
246
|
+
function getTypedListChildren(options) {
|
|
247
|
+
return (__DEV__ ? options?.listChildren : options.listChildren);
|
|
248
|
+
}
|
|
249
|
+
function resolveTypedListItems(items) {
|
|
250
|
+
const resolvedItems = [];
|
|
251
|
+
for (let index = 0; index < items.length; index += 1) {
|
|
252
|
+
const resolvedItem = resolveTypedListItem(items[index], `typed list item ${index}`);
|
|
253
|
+
if (resolvedItem === null) {
|
|
254
|
+
return null;
|
|
255
|
+
}
|
|
256
|
+
resolvedItems.push(resolvedItem);
|
|
257
|
+
}
|
|
258
|
+
return resolvedItems;
|
|
259
|
+
}
|
|
260
|
+
function resolveTypedListItem(item, role) {
|
|
261
|
+
const ref = resolveTargetHandle(item.__etHandleRef, role);
|
|
262
|
+
if (ref === null) {
|
|
263
|
+
return null;
|
|
264
|
+
}
|
|
265
|
+
return {
|
|
266
|
+
uid: item.__etHandleRef,
|
|
267
|
+
ref,
|
|
268
|
+
templateKey: item.type,
|
|
269
|
+
platformInfo: item.platformInfo,
|
|
270
|
+
};
|
|
112
271
|
}
|
|
113
|
-
function
|
|
114
|
-
|
|
272
|
+
function isTypedListElementSlotsEmpty(elementSlots) {
|
|
273
|
+
if (!Array.isArray(elementSlots)) {
|
|
274
|
+
return true;
|
|
275
|
+
}
|
|
276
|
+
return elementSlots.every(slot => slot == null || (Array.isArray(slot) && slot.length === 0));
|
|
277
|
+
}
|
|
278
|
+
function resolveTargetHandle(id, role) {
|
|
279
|
+
const nativeRef = elementTemplateRegistry.getTarget(id);
|
|
115
280
|
if (!nativeRef) {
|
|
116
281
|
lynx.reportError(new Error(`ElementTemplate update ${role} handle ${id} not found.`));
|
|
117
282
|
return null;
|
|
@@ -121,13 +286,20 @@ function resolveHandle(id, role) {
|
|
|
121
286
|
function isValidHandleId(handleId) {
|
|
122
287
|
return Number.isInteger(handleId) && handleId !== 0;
|
|
123
288
|
}
|
|
124
|
-
function
|
|
289
|
+
function validateCreateHandleId(handleId) {
|
|
125
290
|
if (!isValidHandleId(handleId)) {
|
|
126
291
|
return new Error(`ElementTemplate update has invalid handleId ${String(handleId)}.`);
|
|
127
292
|
}
|
|
128
293
|
if (elementTemplateRegistry.get(handleId)) {
|
|
129
294
|
return new Error(`ElementTemplate update received duplicate handleId ${handleId}.`);
|
|
130
295
|
}
|
|
296
|
+
return null;
|
|
297
|
+
}
|
|
298
|
+
function validateCreateTemplatePayload(handleId, attributeSlots, elementSlots) {
|
|
299
|
+
const handleError = validateCreateHandleId(handleId);
|
|
300
|
+
if (handleError) {
|
|
301
|
+
return handleError;
|
|
302
|
+
}
|
|
131
303
|
if (attributeSlots != null && !Array.isArray(attributeSlots)) {
|
|
132
304
|
return new Error('ElementTemplate update create attributeSlots must be an array, null, or undefined.');
|
|
133
305
|
}
|
|
@@ -137,7 +309,7 @@ function validateCreateTemplatePayload(handleId, attributeSlots, elementSlots) {
|
|
|
137
309
|
return null;
|
|
138
310
|
}
|
|
139
311
|
function normalizeAttributeSlots(attributeSlots) {
|
|
140
|
-
if (
|
|
312
|
+
if (attributeSlots == null) {
|
|
141
313
|
return attributeSlots;
|
|
142
314
|
}
|
|
143
315
|
return attributeSlots.map((value) => (value === undefined ? null : value));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../../src/element-template/runtime/patch.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../../src/element-template/runtime/patch.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,13 +6,28 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { renderOpcodesIntoElementTemplate } from './render-opcodes.js';
|
|
8
8
|
import { render as renderToString } from './render-to-opcodes.js';
|
|
9
|
+
import { getReloadVersion } from '../../../core/reload-version.js';
|
|
9
10
|
import { profileEnd, profileStart } from '../../debug/profile.js';
|
|
10
11
|
import { ElementTemplateLifecycleConstant } from '../../protocol/lifecycle-constant.js';
|
|
11
|
-
import {
|
|
12
|
+
import { flushInitialElementTemplateListUpdates } from '../list/list.js';
|
|
13
|
+
import { insertRootIntoPage, removeRootFromPage } from '../page/page.js';
|
|
12
14
|
import { __root } from '../page/root-instance.js';
|
|
15
|
+
import { getElementTemplateNativeRef } from '../template/registry.js';
|
|
16
|
+
// ET reload reuses the native page, so the main-thread render path owns the
|
|
17
|
+
// root refs it appended and can remove only those roots before rebuilding.
|
|
18
|
+
let mainThreadRootRefs = [];
|
|
19
|
+
function resetMainThreadRootRefs() {
|
|
20
|
+
mainThreadRootRefs = [];
|
|
21
|
+
}
|
|
22
|
+
function removeMainThreadRootRefs() {
|
|
23
|
+
const rootRefs = mainThreadRootRefs;
|
|
24
|
+
mainThreadRootRefs = [];
|
|
25
|
+
for (const rootRef of rootRefs) {
|
|
26
|
+
removeRootFromPage(rootRef);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
13
29
|
function renderMainThread() {
|
|
14
30
|
let opcodes;
|
|
15
|
-
let rootRefs = [];
|
|
16
31
|
profileStart('ReactLynx::renderMainThread');
|
|
17
32
|
try {
|
|
18
33
|
opcodes = renderToString(__root.__jsx, undefined);
|
|
@@ -26,10 +41,12 @@ function renderMainThread() {
|
|
|
26
41
|
}
|
|
27
42
|
profileStart('ReactLynx::renderOpcodes');
|
|
28
43
|
try {
|
|
29
|
-
rootRefs = renderOpcodesIntoElementTemplate(opcodes)
|
|
44
|
+
const { rootRefs } = renderOpcodesIntoElementTemplate(opcodes);
|
|
30
45
|
for (const rootRef of rootRefs) {
|
|
31
|
-
|
|
46
|
+
insertRootIntoPage(rootRef);
|
|
32
47
|
}
|
|
48
|
+
flushInitialListUpdates();
|
|
49
|
+
mainThreadRootRefs = rootRefs;
|
|
33
50
|
}
|
|
34
51
|
finally {
|
|
35
52
|
profileEnd();
|
|
@@ -37,17 +54,31 @@ function renderMainThread() {
|
|
|
37
54
|
profileStart('ReactLynx::packSerializedETInstance');
|
|
38
55
|
try {
|
|
39
56
|
const instances = [];
|
|
40
|
-
for (const rootRef of
|
|
57
|
+
for (const rootRef of mainThreadRootRefs) {
|
|
41
58
|
instances.push(__SerializeElementTemplate(rootRef));
|
|
42
59
|
}
|
|
60
|
+
const payload = {
|
|
61
|
+
instances,
|
|
62
|
+
reloadVersion: getReloadVersion(),
|
|
63
|
+
};
|
|
43
64
|
lynx.getJSContext().dispatchEvent({
|
|
44
65
|
type: ElementTemplateLifecycleConstant.hydrate,
|
|
45
|
-
data:
|
|
66
|
+
data: payload,
|
|
46
67
|
});
|
|
47
68
|
}
|
|
48
69
|
finally {
|
|
49
70
|
profileEnd();
|
|
50
71
|
}
|
|
51
72
|
}
|
|
52
|
-
|
|
73
|
+
function flushInitialListUpdates() {
|
|
74
|
+
const results = flushInitialElementTemplateListUpdates();
|
|
75
|
+
for (let index = 0; index < results.length; index += 1) {
|
|
76
|
+
const result = results[index];
|
|
77
|
+
const listRef = getElementTemplateNativeRef(result.uid);
|
|
78
|
+
if (listRef) {
|
|
79
|
+
__SetAttributeOfElementTemplate(listRef, 0, result.attributes, null);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
export { removeMainThreadRootRefs, renderMainThread, resetMainThreadRootRefs };
|
|
53
84
|
//# sourceMappingURL=render-main-thread.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-main-thread.js","sourceRoot":"","sources":["../../../../src/element-template/runtime/render/render-main-thread.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,yEAAyE;AACzE,0DAA0D;AAE1D;;GAEG;AAEH,OAAO,EAAE,gCAAgC,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,MAAM,IAAI,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,gCAAgC,EAAE,MAAM,sCAAsC,CAAC;AAExF,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"render-main-thread.js","sourceRoot":"","sources":["../../../../src/element-template/runtime/render/render-main-thread.ts"],"names":[],"mappings":"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"}
|