Merge pull request mozilla#18393 from Snuffleupagus/mustBeViewedWhenE…

…diting-params Check the relevant parameters inside of the `mustBeViewedWhenEditing` method
timvandermeij · Jul 5, 2024 · ccb141e · ccb141e
2 parents cf9dfbc + 5f74490
commit ccb141e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/core/annotation.js b/src/core/annotation.js
@@ -777,8 +777,8 @@ class Annotation {
     return this.printable;
   }
 
-  mustBeViewedWhenEditing() {
-    return !this.data.isEditable;
+  mustBeViewedWhenEditing(isEditing, modifiedIds = null) {
+    return isEditing ? !this.data.isEditable : !modifiedIds?.has(this.data.id);
   }
 
   /**

diff --git a/src/core/document.js b/src/core/document.js
@@ -582,8 +582,7 @@ class Page {
           intentAny ||
           (intentDisplay &&
             annotation.mustBeViewed(annotationStorage, renderForms) &&
-            ((isEditing && annotation.mustBeViewedWhenEditing()) ||
-              (!isEditing && !modifiedIds?.has(annotation.data.id)))) ||
+            annotation.mustBeViewedWhenEditing(isEditing, modifiedIds)) ||
           (intentPrint && annotation.mustBePrinted(annotationStorage))
         ) {
           opListPromises.push(