Skip to content

fix: Remove unsafe non-null assertions #9598

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

Open
gonfunko wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Remove unsafe non-null assertions #9598

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
35 changes: 16 additions & 19 deletions packages/blockly/core/toolbox/toolbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
*/
// Former goog.module ID: Blockly.Toolbox

// Unused import preserved for side-effects. Remove if unneeded.
import {BlockSvg} from '../block_svg.js';
import * as browserEvents from '../browser_events.js';
import * as common from '../common.js';
Expand Down Expand Up @@ -192,7 +191,7 @@ export class Toolbox
aria.setRole(this.contentsDiv_, aria.Role.TREE);
container.appendChild(this.contentsDiv_);

svg.parentNode!.insertBefore(container, svg);
svg.parentNode?.insertBefore(container, svg);

this.attachEvents_(container, this.contentsDiv_);
return container;
Expand Down Expand Up @@ -281,7 +280,7 @@ export class Toolbox
const itemId = (targetElement as Element).getAttribute('id');
if (itemId) {
const item = this.getToolboxItemById(itemId);
if (item!.isSelectable()) {
if (item?.isSelectable()) {
this.setSelectedItem(item);
(item as ISelectableToolboxItem).onClick(e);
}
Expand Down Expand Up @@ -396,7 +395,7 @@ export class Toolbox
const toolboxItemDef = toolboxDef[i];
this.createToolboxItem(toolboxItemDef, fragment);
}
this.contentsDiv_!.appendChild(fragment);
this.contentsDiv_?.appendChild(fragment);
}

/**
Expand Down Expand Up @@ -435,9 +434,7 @@ export class Toolbox
}
// Adds the ID to the HTML element that can receive a click.
// This is used in onClick_ to find the toolboxItem that was clicked.
if (toolboxItem.getClickTarget()) {
toolboxItem.getClickTarget()!.setAttribute('id', toolboxItem.getId());
}
toolboxItem.getClickTarget()?.setAttribute('id', toolboxItem.getId());
}
}

Expand Down Expand Up @@ -722,7 +719,7 @@ export class Toolbox
this.width_ = toolboxDiv.offsetWidth;
this.height_ = workspaceMetrics.viewHeight;
}
this.flyout!.position();
this.flyout?.position();
}

/**
Expand All @@ -731,10 +728,11 @@ export class Toolbox
* @internal
*/
handleToolboxItemResize() {
if (!this.HtmlDiv) return;
// Reposition the workspace so that (0,0) is in the correct position
// relative to the new absolute edge (ie toolbox edge).
const workspace = this.workspace_;
const rect = this.HtmlDiv!.getBoundingClientRect();
const rect = this.HtmlDiv.getBoundingClientRect();
const flyout = this.getFlyout();
const newX =
this.toolboxPosition === toolbox.Position.LEFT
Expand Down Expand Up @@ -786,7 +784,7 @@ export class Toolbox
this.selectedItem_.isSelectable() &&
this.selectedItem_.getContents().length
) {
this.flyout!.show(this.selectedItem_.getContents());
this.flyout?.show(this.selectedItem_.getContents());
}
}

Expand All @@ -800,7 +798,9 @@ export class Toolbox
return;
}

this.HtmlDiv!.style.display = isVisible ? 'block' : 'none';
if (this.HtmlDiv) {
this.HtmlDiv.style.display = isVisible ? 'block' : 'none';
}
this.isVisible_ = isVisible;
// Invisible toolbox is ignored as drag targets and must have the drag
// target updated.
Expand Down Expand Up @@ -944,10 +944,10 @@ export class Toolbox
(oldItem === newItem && !newItem.isCollapsible()) ||
!newItem.getContents().length
) {
this.flyout!.hide();
this.flyout?.hide();
} else {
this.flyout!.show(newItem.getContents());
this.flyout!.scrollToStart();
this.flyout?.show(newItem.getContents());
this.flyout?.scrollToStart();
}
}

Expand Down Expand Up @@ -992,10 +992,7 @@ export class Toolbox
const collapsibleItem = this.selectedItem_ as ICollapsibleToolboxItem;
collapsibleItem.toggleExpanded();
return true;
} else if (
this.selectedItem_.getParent() &&
this.selectedItem_.getParent()!.isSelectable()
) {
} else if (this.selectedItem_.getParent()?.isSelectable()) {
this.setSelectedItem(this.selectedItem_.getParent());
return true;
}
Expand Down Expand Up @@ -1075,7 +1072,7 @@ export class Toolbox
/** Disposes of this toolbox. */
dispose() {
this.workspace_.getComponentManager().removeComponent('toolbox');
this.flyout!.dispose();
this.flyout?.dispose();
this.contents.forEach((item) => item.dispose());

for (let j = 0; j < this.boundEvents_.length; j++) {
Expand Down