Skip to content

fix(): to collect contracts before state define #2197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 7, 2022
Merged

fix(): to collect contracts before state define #2197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions packages/brick-kit/src/core/CustomTemplates/expandCustomTemplate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ export function expandCustomTemplate(
): RuntimeBrickConf {
const tplContext = new CustomTemplateContext(proxyBrick);
const template = customTemplateRegistry.get(brickConf.brick);
if (template.contracts) {
collectWidgetContract(template.contracts);
}
if (Array.isArray(template.state)) {
tplContext.state.syncDefine(template.state, context, proxyBrick);
}
Expand All @@ -69,6 +72,9 @@ export async function asyncExpandCustomTemplate(
): Promise<RuntimeBrickConf> {
const tplContext = new CustomTemplateContext(proxyBrick);
const template = customTemplateRegistry.get(brickConf.brick);
if (template.contracts) {
collectWidgetContract(template.contracts);
}
if (Array.isArray(template.state)) {
await tplContext.state.define(template.state, context, proxyBrick);
}
Expand All @@ -88,7 +94,7 @@ function lowLevelExpandCustomTemplate(
context: PluginRuntimeContext,
tplContext: CustomTemplateContext
): RuntimeBrickConf {
const { bricks, proxy, state, contracts } = template;
const { bricks, proxy, state } = template;
const {
properties: templateProperties,
slots: externalSlots,
Expand All @@ -104,9 +110,6 @@ function lowLevelExpandCustomTemplate(
proxyBrick.proxyRefs = new Map();
proxyBrick.stateNames = state?.map((item) => item.name);

if (contracts) {
collectWidgetContract(contracts);
}
const refToBrickConf = collectRefsInTemplate(template);

// Reversed proxies are used for expand storyboard before rendering page.
Expand Down