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: non-nullable check for block variable and removed ! in layout_ #7522 #7537

Merged
merged 4 commits into from
Sep 24, 2023
Merged

fix: non-nullable check for block variable and removed ! in layout_ #7522 #7537

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7bccb2c
#7522 edits -- collaborated with Hinal Patel, Swedhaa Sri Elango, & Y…
priya-rjb Sep 22, 2023
c7d18a9
#7522 edits: collaborated with Hinal Patel, Swedhaa Sri Elango, & Yuc…
priya-rjb Sep 22, 2023
ce92e99
fix: non-nullable check for block variable and removed ! in layout_ #…
priya-rjb Sep 22, 2023
aa66f72
fix: non-nullable check for block variable and removed ! in layout_
priya-rjb Sep 24, 2023
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
20 changes: 13 additions & 7 deletions core/flyout_horizontal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,29 +267,35 @@ export class HorizontalFlyout extends Flyout {
for (let i = 0, item; (item = contents[i]); i++) {
if (item.type === 'block') {
const block = item.block;
const allBlocks = block!.getDescendants(false);
//CHANGE: Checked whether block is undefined:
if (typeof block === "undefined") {
johnnesky marked this conversation as resolved.
Show resolved Hide resolved
continue;
}
//CHANGE: Removed ! from after the remaining uses of block within the for loop.
const allBlocks = block.getDescendants(false);

for (let j = 0, child; (child = allBlocks[j]); j++) {
// Mark blocks as being inside a flyout. This is used to detect and
// prevent the closure of the flyout if the user right-clicks on such
// a block.
child.isInFlyout = true;
}
const root = block!.getSvgRoot();
const blockHW = block!.getHeightWidth();
const root = block.getSvgRoot();
const blockHW = block.getHeightWidth();
// Figure out where to place the block.
const tab = block!.outputConnection ? this.tabWidth_ : 0;
const tab = block.outputConnection ? this.tabWidth_ : 0;
let moveX;
if (this.RTL) {
moveX = cursorX + blockHW.width;
} else {
moveX = cursorX - tab;
}
block!.moveBy(moveX, cursorY);
block.moveBy(moveX, cursorY);

const rect = this.createRect_(block!, moveX, cursorY, blockHW, i);
const rect = this.createRect_(block, moveX, cursorY, blockHW, i);
cursorX += blockHW.width + gaps[i];

this.addBlockListeners_(root, block!, rect);
this.addBlockListeners_(root, block, rect);
} else if (item.type === 'button') {
const button = item.button as FlyoutButton;
this.initFlyoutButton_(button, cursorX, cursorY);
Expand Down