@@ -219,8 +219,6 @@ class BaseViewer {
219219
220220 #annotationMode = AnnotationMode . ENABLE_FORMS ;
221221
222- #previousAnnotationMode = null ;
223-
224222 #enablePermissions = false ;
225223
226224 #previousContainerHeight = 0 ;
@@ -275,6 +273,9 @@ class BaseViewer {
275273 this . textLayerMode = options . textLayerMode ?? TextLayerMode . ENABLE ;
276274 this . #annotationMode =
277275 options . annotationMode ?? AnnotationMode . ENABLE_FORMS ;
276+ this . #annotationEditorMode = options . annotationEditorEnabled
277+ ? AnnotationEditorType . NONE
278+ : null ;
278279 this . imageResourcesPath = options . imageResourcesPath || "" ;
279280 this . enablePrintAutoRotate = options . enablePrintAutoRotate || false ;
280281 this . renderer = options . renderer || RendererType . CANVAS ;
@@ -284,10 +285,6 @@ class BaseViewer {
284285 this . #enablePermissions = options . enablePermissions || false ;
285286 this . pageColors = options . pageColors || null ;
286287
287- if ( options . annotationEditorEnabled === true ) {
288- this . #annotationEditorUIManager = new AnnotationEditorUIManager ( ) ;
289- }
290-
291288 if ( typeof PDFJSDev === "undefined" || ! PDFJSDev . test ( "MOZCENTRAL" ) ) {
292289 if (
293290 this . pageColors &&
@@ -354,13 +351,6 @@ class BaseViewer {
354351 return this . #annotationMode === AnnotationMode . ENABLE_FORMS ;
355352 }
356353
357- /**
358- * @type {boolean }
359- */
360- get enableAnnotationEditor ( ) {
361- return ! ! this . #annotationEditorUIManager;
362- }
363-
364354 /**
365355 * @type {boolean }
366356 */
@@ -553,25 +543,35 @@ class BaseViewer {
553543
554544 /**
555545 * Currently only *some* permissions are supported.
546+ * @returns {Object }
556547 */
557548 #initializePermissions( permissions ) {
549+ const params = {
550+ annotationEditorMode : this . #annotationEditorMode,
551+ annotationMode : this . #annotationMode,
552+ textLayerMode : this . textLayerMode ,
553+ } ;
558554 if ( ! permissions ) {
559- return ;
555+ return params ;
560556 }
561557
562558 if ( ! permissions . includes ( PermissionFlag . COPY ) ) {
563559 this . viewer . classList . add ( ENABLE_PERMISSIONS_CLASS ) ;
564560 }
565561
562+ if ( ! permissions . includes ( PermissionFlag . MODIFY_CONTENTS ) ) {
563+ params . annotationEditorMode = null ;
564+ }
565+
566566 if (
567567 ! permissions . includes ( PermissionFlag . MODIFY_ANNOTATIONS ) &&
568- ! permissions . includes ( PermissionFlag . FILL_INTERACTIVE_FORMS )
568+ ! permissions . includes ( PermissionFlag . FILL_INTERACTIVE_FORMS ) &&
569+ this . #annotationMode === AnnotationMode . ENABLE_FORMS
569570 ) {
570- if ( this . #annotationMode === AnnotationMode . ENABLE_FORMS ) {
571- this . #previousAnnotationMode = this . #annotationMode; // Allow resetting.
572- this . #annotationMode = AnnotationMode . ENABLE ;
573- }
571+ params . annotationMode = AnnotationMode . ENABLE ;
574572 }
573+
574+ return params ;
575575 }
576576
577577 #onePageRenderedOrForceFetch( ) {
@@ -706,7 +706,23 @@ class BaseViewer {
706706 }
707707 this . _firstPageCapability . resolve ( firstPdfPage ) ;
708708 this . _optionalContentConfigPromise = optionalContentConfigPromise ;
709- this . #initializePermissions( permissions ) ;
709+
710+ const { annotationEditorMode, annotationMode, textLayerMode } =
711+ this . #initializePermissions( permissions ) ;
712+
713+ if ( annotationEditorMode !== null ) {
714+ if ( isPureXfa ) {
715+ console . warn ( "Warning: XFA-editing is not implemented." ) ;
716+ } else {
717+ // Ensure that the Editor buttons, in the toolbar, are updated.
718+ this . eventBus . dispatch ( "annotationeditormodechanged" , {
719+ source : this ,
720+ mode : annotationEditorMode ,
721+ } ) ;
722+
723+ this . #annotationEditorUIManager = new AnnotationEditorUIManager ( ) ;
724+ }
725+ }
710726
711727 const viewerElement =
712728 this . _scrollMode === ScrollMode . PAGE ? null : this . viewer ;
@@ -715,14 +731,13 @@ class BaseViewer {
715731 scale : scale * PixelsPerInch . PDF_TO_CSS_UNITS ,
716732 } ) ;
717733 const textLayerFactory =
718- this . textLayerMode !== TextLayerMode . DISABLE && ! isPureXfa
719- ? this
720- : null ;
734+ textLayerMode !== TextLayerMode . DISABLE && ! isPureXfa ? this : null ;
721735 const annotationLayerFactory =
722- this . # annotationMode !== AnnotationMode . DISABLE ? this : null ;
736+ annotationMode !== AnnotationMode . DISABLE ? this : null ;
723737 const xfaLayerFactory = isPureXfa ? this : null ;
724- const annotationEditorLayerFactory =
725- this . #annotationEditorUIManager && ! isPureXfa ? this : null ;
738+ const annotationEditorLayerFactory = this . #annotationEditorUIManager
739+ ? this
740+ : null ;
726741
727742 for ( let pageNum = 1 ; pageNum <= pagesCount ; ++ pageNum ) {
728743 const pageView = new PDFPageView ( {
@@ -734,9 +749,9 @@ class BaseViewer {
734749 optionalContentConfigPromise,
735750 renderingQueue : this . renderingQueue ,
736751 textLayerFactory,
737- textLayerMode : this . textLayerMode ,
752+ textLayerMode,
738753 annotationLayerFactory,
739- annotationMode : this . #annotationMode ,
754+ annotationMode,
740755 xfaLayerFactory,
741756 annotationEditorLayerFactory,
742757 textHighlighterFactory : this ,
@@ -868,6 +883,10 @@ class BaseViewer {
868883 }
869884
870885 _resetView ( ) {
886+ if ( this . #annotationEditorMode !== null ) {
887+ this . #annotationEditorMode = AnnotationEditorType . NONE ;
888+ }
889+ this . #annotationEditorUIManager = null ;
871890 this . _pages = [ ] ;
872891 this . _currentPageNumber = 1 ;
873892 this . _currentScale = UNKNOWN_SCALE ;
@@ -913,11 +932,6 @@ class BaseViewer {
913932 this . viewer . removeAttribute ( "lang" ) ;
914933 // Reset all PDF document permissions.
915934 this . viewer . classList . remove ( ENABLE_PERMISSIONS_CLASS ) ;
916-
917- if ( this . #previousAnnotationMode !== null ) {
918- this . #annotationMode = this . #previousAnnotationMode;
919- this . #previousAnnotationMode = null ;
920- }
921935 }
922936
923937 #ensurePageViewVisible( ) {
@@ -2125,6 +2139,9 @@ class BaseViewer {
21252139 }
21262140 }
21272141
2142+ /**
2143+ * @type {number | null }
2144+ */
21282145 get annotationEditorMode ( ) {
21292146 return this . #annotationEditorMode;
21302147 }
@@ -2142,6 +2159,9 @@ class BaseViewer {
21422159 if ( ! isValidAnnotationEditorMode ( mode ) ) {
21432160 throw new Error ( `Invalid AnnotationEditor mode: ${ mode } ) ;
21442161 }
2162+ if ( ! this . pdfDocument ) {
2163+ return ;
2164+ }
21452165 this . #annotationEditorMode = mode ;
21462166 this . eventBus . dispatch ( "annotationeditormodechanged" , {
21472167 source : this ,
0 commit comments