CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-07 00:50:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove AnyDuringMigration from the comment icon (#6308)

Browse Source 
* fix: checking for null model text

* fix: use correct event type

* chore:format

* chore: use nullish coalescing
This commit is contained in:
Beka Westberg
2022-08-04 20:54:24 +00:00
committed by GitHub
parent dc44c66057
commit 48bdb07f33
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/comment.ts
View File

@@ -87,7 +87,7 @@ export class Comment extends Icon {
this.model_ = block.commentModel;
// If someone creates the comment directly instead of calling
// block.setCommentText we want to make sure the text is non-null;
this.model_.text = this.model_.text || '';
this.model_.text = this.model_.text ?? '';
this.createIcon();
}
@@ -153,9 +153,7 @@ export class Comment extends Icon {
const textarea = this.textarea_;
textarea.className = 'blocklyCommentTextarea';
textarea.setAttribute('dir', this.block_.RTL ? 'RTL' : 'LTR');
// AnyDuringMigration because: Type 'string | null' is not assignable to
// type 'string'.
textarea.value = this.model_.text as AnyDuringMigration;
textarea.value = this.model_.text ?? '';
this.resizeTextarea_();
body.appendChild(textarea);
@@ -168,7 +166,7 @@ export class Comment extends Icon {
textarea, 'mouseup', this, this.startEdit_, true, true);
// Don't zoom with mousewheel.
this.onWheelWrapper_ = browserEvents.conditionalBind(
textarea, 'wheel', this, function(e: AnyDuringMigration) {
textarea, 'wheel', this, function(e: Event) {
e.stopPropagation();
});
this.onChangeWrapper_ = browserEvents.conditionalBind(
@@ -286,10 +284,7 @@ export class Comment extends Icon {
*/
private createNonEditableBubble_() {
// TODO (#2917): It would be great if the comment could support line breaks.
// AnyDuringMigration because: Argument of type 'string | null' is not
// assignable to parameter of type 'string'.
this.paragraphElement_ =
Bubble.textToDom(this.block_.getCommentText() as AnyDuringMigration);
this.paragraphElement_ = Bubble.textToDom(this.model_.text ?? '');
this.bubble_ = Bubble.createNonEditableBubble(
this.paragraphElement_, (this.block_), this.iconXY_ as Coordinate);
this.applyColour();
@@ -368,9 +363,7 @@ export class Comment extends Icon {
*/
updateText() {
if (this.textarea_) {
// AnyDuringMigration because: Type 'string | null' is not assignable to
// type 'string'.
this.textarea_.value = this.model_.text as AnyDuringMigration;
this.textarea_.value = this.model_.text ?? '';
} else if (this.paragraphElement_) {
// Non-Editable mode.
// TODO (#2917): If 2917 gets added this will probably need to be updated.