Skip to content

Commit

Permalink
fix: non-nullable check for block variable and removed ! in layout_ #…
Browse files Browse the repository at this point in the history
…7522 (#7537)

* #7522 edits -- collaborated with Hinal Patel, Swedhaa Sri Elango, & Yuchi Hsieh

* #7522 edits: collaborated with Hinal Patel, Swedhaa Sri Elango, & Yuchi Hsieh

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

* fix: non-nullable check for block variable and removed ! in layout_
  • Loading branch information
priya-rjb authored Sep 24, 2023
1 parent 31a323a commit c762d42
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions core/flyout_horizontal.ts
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);

if (block === undefined || block === null) {
continue;
}

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

0 comments on commit c762d42

Please sign in to comment.