Merge pull request #20104 from calixteman/fix_newpopup

timvandermeij · web-flow · commit e4585c245214 · 2025-07-18T19:34:03.000+02:00
[Editor] Only add a popup to an existing annotation if it exits
diff --git a/src/display/annotation_layer.js b/src/display/annotation_layer.js
@@ -215,15 +215,15 @@ class AnnotationElement {
     }
 
     let popup = this.#popupElement?.popup || this.popup;
-    if (!popup && newPopup.text) {
+    if (!popup && newPopup?.text) {
       this._createPopup(newPopup);
       popup = this.#popupElement.popup;
     }
     if (!popup) {
       return;
     }
     popup.updateEdited(params);
-    if (newPopup.deleted) {
+    if (newPopup?.deleted) {
       popup.remove();
       this.#popupElement = null;
       this.popup = null;

Original file line number	Diff line number	Diff line change
`@@ -215,15 +215,15 @@ class AnnotationElement {`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`let popup = this.#popupElement?.popup \|\| this.popup;`
`218`		`- if (!popup && newPopup.text) {`
	`218`	`+ if (!popup && newPopup?.text) {`
`219`	`219`	`this._createPopup(newPopup);`
`220`	`220`	`popup = this.#popupElement.popup;`
`221`	`221`	`}`
`222`	`222`	`if (!popup) {`
`223`	`223`	`return;`
`224`	`224`	`}`
`225`	`225`	`popup.updateEdited(params);`
`226`		`- if (newPopup.deleted) {`
	`226`	`+ if (newPopup?.deleted) {`
`227`	`227`	`popup.remove();`
`228`	`228`	`this.#popupElement = null;`
`229`	`229`	`this.popup = null;`