Skip to content
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

fix: Multiline field not correctly size in parent block when copy/paste or load. #6429

Closed
wants to merge 1 commit into from
Closed

fix: Multiline field not correctly size in parent block when copy/paste or load. #6429

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
42 changes: 28 additions & 14 deletions core/serialization/blocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,13 +390,17 @@ export function appendInternal(
* @param param1 parentConnection: If provided, the system will attempt to
* connect the block to this connection after it is created. Undefined by
* default. isShadow: The block will be set to a shadow block after it is
* created. False by default.
* created. False by default. loadedBlocks: An array to store the loaded
* blocks. Empty by default.
* @returns The block that was just appended.
*/
function appendPrivate(
state: State, workspace: Workspace,
{parentConnection = undefined, isShadow = false}:
{parentConnection?: Connection, isShadow?: boolean} = {}): Block {
{parentConnection = undefined, isShadow = false, loadedBlocks = []}: {
parentConnection?: Connection,
isShadow?: boolean,
loadedBlocks?: BlockSvg[],
} = {}): Block {
if (!state['type']) {
throw new MissingBlockType(state);
}
Expand All @@ -409,9 +413,14 @@ function appendPrivate(
tryToConnectParent(parentConnection, block, state);
loadIcons(block, state);
loadFields(block, state);
loadInputBlocks(block, state);
loadNextBlocks(block, state);
initBlock(block, workspace.rendered);
loadInputBlocks(block, state, loadedBlocks);
loadNextBlocks(block, state, loadedBlocks);
initBlock(block, workspace.rendered, loadedBlocks);

if (!parentConnection) {
// Render the loaded blocks.
loadedBlocks.forEach((block: BlockSvg) => block.render(false));
}

return block;
}
Expand Down Expand Up @@ -578,8 +587,9 @@ function loadFields(block: Block, state: State) {
*
* @param block The block to attach input blocks to.
* @param state The state object to reference.
* @param loadedBlocks An array to store the loaded blocks.
*/
function loadInputBlocks(block: Block, state: State) {
function loadInputBlocks(block: Block, state: State, loadedBlocks: BlockSvg[]) {
if (!state['inputs']) {
return;
}
Expand All @@ -590,7 +600,7 @@ function loadInputBlocks(block: Block, state: State) {
if (!input || !input.connection) {
throw new MissingConnection(inputName, block, state);
}
loadConnection(input.connection, state['inputs'][inputName]);
loadConnection(input.connection, state['inputs'][inputName], loadedBlocks);
}
}

Expand All @@ -600,15 +610,16 @@ function loadInputBlocks(block: Block, state: State) {
*
* @param block The block to attach next blocks to.
* @param state The state object to reference.
* @param loadedBlocks An array to store the loaded blocks.
*/
function loadNextBlocks(block: Block, state: State) {
function loadNextBlocks(block: Block, state: State, loadedBlocks: BlockSvg[]) {
if (!state['next']) {
return;
}
if (!block.nextConnection) {
throw new MissingConnection('next', block, state);
}
loadConnection(block.nextConnection, state['next']);
loadConnection(block.nextConnection, state['next'], loadedBlocks);
}
/**
* Applies the state defined by connectionState to the given connection, ie
Expand All @@ -619,14 +630,15 @@ function loadNextBlocks(block: Block, state: State) {
* shadow block, or any connected real block.
*/
function loadConnection(
connection: Connection, connectionState: ConnectionState) {
connection: Connection, connectionState: ConnectionState,
loadedBlocks: BlockSvg[]) {
if (connectionState['shadow']) {
connection.setShadowState(connectionState['shadow']);
}
if (connectionState['block']) {
appendPrivate(
connectionState['block'], connection.getSourceBlock().workspace,
{parentConnection: connection});
{parentConnection: connection, loadedBlocks});
}
}

Expand All @@ -636,16 +648,18 @@ function loadConnection(
*
* @param block The block to initialize.
* @param rendered Whether the block is a rendered or headless block.
* @param loadedBlocks An array to store the loaded blocks.
*/
function initBlock(block: Block, rendered: boolean) {
function initBlock(block: Block, rendered: boolean, loadedBlocks: BlockSvg[]) {
if (rendered) {
const blockSvg = block as BlockSvg;
// Adding connections to the connection db is expensive. This defers that
// operation to decrease load time.
blockSvg.setConnectionTracking(false);

blockSvg.initSvg();
blockSvg.render(false);
// Render the block later.
loadedBlocks.push(blockSvg);
// fixes #6076 JSO deserialization doesn't
// set .iconXY_ property so here it will be set
const icons = blockSvg.getIcons();
Expand Down