1616import { AnnotationEditorType , shadow } from "../../shared/util.js" ;
1717import { DrawingEditor , DrawingOptions } from "./draw.js" ;
1818import { AnnotationEditor } from "./editor.js" ;
19+ import { ContourDrawOutline } from "./drawers/contour.js" ;
20+ import { InkDrawingOptions } from "./ink.js" ;
1921import { SignatureExtractor } from "./drawers/signaturedraw.js" ;
20- import { SupportedImageMimeTypes } from "../display_utils.js" ;
2122
2223class SignatureOptions extends DrawingOptions {
23- #viewParameters;
24-
25- constructor ( viewerParameters ) {
24+ constructor ( ) {
2625 super ( ) ;
27- this . #viewParameters = viewerParameters ;
2826
2927 super . updateProperties ( {
3028 fill : "black" ,
@@ -33,7 +31,24 @@ class SignatureOptions extends DrawingOptions {
3331 }
3432
3533 clone ( ) {
36- const clone = new SignatureOptions ( this . #viewParameters) ;
34+ const clone = new SignatureOptions ( ) ;
35+ clone . updateAll ( this ) ;
36+ return clone ;
37+ }
38+ }
39+
40+ class DrawnSignatureOptions extends InkDrawingOptions {
41+ constructor ( viewerParameters ) {
42+ super ( viewerParameters ) ;
43+
44+ super . updateProperties ( {
45+ stroke : "black" ,
46+ "stroke-width" : 1 ,
47+ } ) ;
48+ }
49+
50+ clone ( ) {
51+ const clone = new DrawnSignatureOptions ( this . _viewParameters ) ;
3752 clone . updateAll ( this ) ;
3853 return clone ;
3954 }
@@ -44,6 +59,8 @@ class SignatureOptions extends DrawingOptions {
4459 * a signature drawing.
4560 */
4661class SignatureEditor extends DrawingEditor {
62+ #isExtracted = false ;
63+
4764 static _type = "signature" ;
4865
4966 static _editorType = AnnotationEditorType . SIGNATURE ;
@@ -52,13 +69,15 @@ class SignatureEditor extends DrawingEditor {
5269
5370 constructor ( params ) {
5471 super ( { ...params , mustBeCommitted : true , name : "signatureEditor" } ) ;
55- this . _willKeepAspectRatio = false ;
72+ this . _willKeepAspectRatio = true ;
5673 }
5774
5875 /** @inheritdoc */
5976 static initialize ( l10n , uiManager ) {
6077 AnnotationEditor . initialize ( l10n , uiManager ) ;
61- this . _defaultDrawingOptions = new SignatureOptions (
78+
79+ this . _defaultDrawingOptions = new SignatureOptions ( ) ;
80+ this . _defaultDrawnSignatureOptions = new DrawnSignatureOptions (
6281 uiManager . viewParameters
6382 ) ;
6483 }
@@ -88,6 +107,14 @@ class SignatureEditor extends DrawingEditor {
88107 return true ;
89108 }
90109
110+ /** @inheritdoc */
111+ onScaleChanging ( ) {
112+ if ( this . _drawId === null ) {
113+ return ;
114+ }
115+ super . onScaleChanging ( ) ;
116+ }
117+
91118 /** @inheritdoc */
92119 render ( ) {
93120 if ( this . div ) {
@@ -98,70 +125,91 @@ class SignatureEditor extends DrawingEditor {
98125 this . div . hidden = true ;
99126 this . div . setAttribute ( "role" , "figure" ) ;
100127
101- this . #extractSignature ( ) ;
128+ this . _uiManager . getSignature ( this ) ;
102129
103130 return this . div ;
104131 }
105132
106- async #extractSignature( ) {
107- const input = document . createElement ( "input" ) ;
108- input . type = "file" ;
109- input . accept = SupportedImageMimeTypes . join ( "," ) ;
110- const signal = this . _uiManager . _signal ;
111- const { promise, resolve } = Promise . withResolvers ( ) ;
112-
113- input . addEventListener (
114- "change" ,
115- async ( ) => {
116- if ( ! input . files || input . files . length === 0 ) {
117- resolve ( ) ;
118- } else {
119- this . _uiManager . enableWaiting ( true ) ;
120- const data = await this . _uiManager . imageManager . getFromFile (
121- input . files [ 0 ]
122- ) ;
123- this . _uiManager . enableWaiting ( false ) ;
124- resolve ( data ) ;
125- }
126- resolve ( ) ;
127- } ,
128- { signal }
129- ) ;
130- input . addEventListener ( "cancel" , resolve , { signal } ) ;
131- input . click ( ) ;
132-
133- const bitmap = await promise ;
134- const {
135- rawDims : { pageWidth, pageHeight } ,
136- rotation,
137- } = this . parent . viewport ;
138- let drawOutlines ;
139- if ( bitmap ?. bitmap ) {
140- drawOutlines = SignatureExtractor . process (
141- bitmap . bitmap ,
142- pageWidth ,
143- pageHeight ,
144- rotation ,
145- SignatureEditor . _INNER_MARGIN
146- ) ;
133+ addSignature ( outline , heightInPage ) {
134+ const { x : savedX , y : savedY } = this ;
135+ this . #isExtracted = outline instanceof ContourDrawOutline ;
136+ let drawingOptions ;
137+ if ( this . #isExtracted) {
138+ drawingOptions = SignatureEditor . getDefaultDrawingOptions ( ) ;
147139 } else {
148- drawOutlines = SignatureExtractor . extractContoursFromText (
149- "Hello PDF.js' World !!" ,
150- { fontStyle : "italic" , fontWeight : "400" , fontFamily : "cursive" } ,
151- pageWidth ,
152- pageHeight ,
153- rotation ,
154- SignatureEditor . _INNER_MARGIN
155- ) ;
140+ drawingOptions = SignatureEditor . _defaultDrawnSignatureOptions . clone ( ) ;
141+ drawingOptions . updateProperties ( { "stroke-width" : outline . thickness } ) ;
156142 }
157143 this . _addOutlines ( {
158- drawOutlines,
159- drawingOptions : SignatureEditor . getDefaultDrawingOptions ( ) ,
144+ drawOutlines : outline ,
145+ drawingOptions,
160146 } ) ;
147+ const [ parentWidth , parentHeight ] = this . parentDimensions ;
148+ const [ , pageHeight ] = this . pageDimensions ;
149+ let newHeight = heightInPage / pageHeight ;
150+ // Ensure the signature doesn't exceed the page height.
151+ // If the signature is too big, we scale it down to 50% of the page height.
152+ newHeight = newHeight >= 1 ? 0.5 : newHeight ;
153+
154+ this . width *= newHeight / this . height ;
155+ this . height = newHeight ;
156+ this . setDims ( parentWidth * this . width , parentHeight * this . height ) ;
157+ this . x = savedX ;
158+ this . y = savedY ;
159+ this . center ( ) ;
160+
161+ this . _onResized ( ) ;
161162 this . onScaleChanging ( ) ;
162163 this . rotate ( ) ;
164+ this . _uiManager . addToAnnotationStorage ( this ) ;
165+
163166 this . div . hidden = false ;
164167 }
168+
169+ getFromImage ( bitmap ) {
170+ const {
171+ rawDims : { pageWidth, pageHeight } ,
172+ rotation,
173+ } = this . parent . viewport ;
174+ return SignatureExtractor . process (
175+ bitmap ,
176+ pageWidth ,
177+ pageHeight ,
178+ rotation ,
179+ SignatureEditor . _INNER_MARGIN
180+ ) ;
181+ }
182+
183+ getFromText ( text , fontInfo ) {
184+ const {
185+ rawDims : { pageWidth, pageHeight } ,
186+ rotation,
187+ } = this . parent . viewport ;
188+ return SignatureExtractor . extractContoursFromText (
189+ text ,
190+ fontInfo ,
191+ pageWidth ,
192+ pageHeight ,
193+ rotation ,
194+ SignatureEditor . _INNER_MARGIN
195+ ) ;
196+ }
197+
198+ getDrawnSignature ( curves ) {
199+ const {
200+ rawDims : { pageWidth, pageHeight } ,
201+ rotation,
202+ } = this . parent . viewport ;
203+ return SignatureExtractor . processDrawnLines ( {
204+ lines : curves ,
205+ pageWidth,
206+ pageHeight,
207+ rotation,
208+ innerMargin : SignatureEditor . _INNER_MARGIN ,
209+ mustSmooth : false ,
210+ areContours : false ,
211+ } ) ;
212+ }
165213}
166214
167215export { SignatureEditor } ;
0 commit comments