Merge branch 'release/0.3.4' into 'master'

Release/0.3.4

See merge request Apps/bin-eLehrmittel/pdf-wrap!12

Author: Nicolas Schäfli

CHANGELOG.md

@@ -4,7 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 0.3.2 - 2019-06-12
+## 0.3.4 - 2019-07-12
+### Fixed
+* Form rotation is now properly supported.
+* Add missing tslib dependency.
+
+### Changed
+* Update pdfjs-dist to version 2.1.266.
+* Update typescript to version 3.5.
+
+## 0.3.3 - 2019-06-12
 ### Fixed
 * Fix form resize bug introduced in 0.3.2.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@srag/pdf-wrap",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "A high level PDF abstraction library with a rich set of additional features like full text document search. Its primary goal is to provide a simple api to create your own PDF viewer. Tasty! Isn't it?",
   "repository": "https://github.com/studer-raimann/pdf-wrap",
   "homepage": "https://studer-raimann.github.io/pdf-wrap/",
@@ -44,16 +44,17 @@
     "tslint": "^5.16.0",
     "tslint-eslint-rules": "^5.3.1",
     "typedoc": "^0.14.2",
-    "typescript": "^3.4.5"
+    "typescript": "^3.5.3"
   },
   "dependencies": {
     "intersection-observer": "^0.7.0",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "2.1.266",
     "requestidlecallback-polyfill": "^1.0.2",
     "svg.draggable.js": "2.2.2",
     "svg.js": "^2.7.1",
     "svg.resize.js": "^1.4.3",
     "svg.select.js": "^3.0.1",
+    "tslib": "^1.10.0",
     "typescript-logging": "^0.6.2",
     "uuid-js": "^0.7.5"
   },

src/api/draw/element.builders.ts

@@ -39,6 +39,7 @@ export interface BorderElementBuilder<T, R> {
     id(value: string): T;
     borderColor(value: Color): T;
     borderWidth(px: number): T;
+    rotation(value: number): T;
     build(): R;
 }
 

src/api/draw/elements.ts

@@ -20,6 +20,11 @@ export interface DrawElement {
 export interface BorderElement extends DrawElement {
     readonly borderColor: Color;
     readonly borderWidth: number;
+    /**
+     * Describes to rotation of the element.
+     * @since 0.3.4
+     */
+    readonly rotation: number;
 }
 
 /**

src/paint/canvas.elements.ts

@@ -141,6 +141,7 @@ export interface CanvasElement<T extends DrawElement> extends Transformable <T>,
 export interface CanvasBorderElement<T extends DrawElement> extends CanvasElement<T> {
     borderWidth: number;
     borderColor: Color;
+    rotation: number;
 }
 
 /**
@@ -226,6 +227,11 @@ abstract class AbstractCanvasBorderElement<T extends DrawElement> implements Can
         this.borderElement.attr("stroke-width", value);
     }
 
+    get rotation(): number {
+        const rotation: number | undefined = this.borderElement.transform().rotation;
+        return rotation !== undefined ? rotation : 0;
+    }
+
     backwards(): void {
         this.borderElement.backward();
     }
@@ -329,6 +335,7 @@ export class CanvasPolyLine extends AbstractCanvasBorderElement<PolyLine> {
             .borderColor(this.borderColor)
             .borderWidth(this.borderWidth)
             .coordinates(this.coordinates)
+            .rotation(this.rotation)
             .build();
     }
 }
@@ -371,6 +378,7 @@ export class CanvasRectangle extends AbstractCanvasFormElement<Rectangle> {
             .fillColor(this.fillColor)
             .position(this.position)
             .dimension(this.dimension)
+            .rotation(this.rotation)
             .build();
     }
 }
@@ -405,6 +413,7 @@ export class CanvasCircle extends AbstractCanvasFormElement<Circle> {
             .fillColor(this.fillColor)
             .position(this.position)
             .diameter(this.diameter)
+            .rotation(this.rotation)
             .build();
     }
 }
@@ -443,6 +452,7 @@ export class CanvasEllipse extends AbstractCanvasFormElement<Ellipse> {
             .fillColor(this.fillColor)
             .position(this.position)
             .dimension(this.dimension)
+            .rotation(this.rotation)
             .build();
     }
 }
@@ -483,6 +493,7 @@ export class CanvasLine extends AbstractCanvasBorderElement<Line> {
             .borderWidth(this.borderWidth)
             .start(this.start)
             .end(this.end)
+            .rotation(this.rotation)
             .build();
     }
 }

src/paint/element.builders.impl.ts

@@ -52,6 +52,7 @@ abstract class AbstractBorderElementBuilder<T, R> implements BorderElementBuilde
     protected _id: string = `$svg${uuid.create(4).toString()}`;
     protected _borderColor: Color = colorFrom(Colors.BLACK);
     protected _borderWidth: number = 1;
+    protected _rotation: number = 0;
 
     id(value: string): T {
         this._id = value;
@@ -68,6 +69,13 @@ abstract class AbstractBorderElementBuilder<T, R> implements BorderElementBuilde
         return (this as unknown) as T;
     }
 
+
+    rotation(value: number): T {
+        this._rotation = value;
+        return (this as unknown) as T;
+    }
+
+
     abstract build(): R;
 }
 
@@ -118,7 +126,8 @@ export class PolyLineBuilderImpl extends AbstractBorderElementBuilder<PolyLineBu
             this._borderColor,
             this._borderWidth,
             this._coordinates,
-            this._id
+            this._id,
+            this._rotation
         );
     }
 }
@@ -150,7 +159,8 @@ export class RectangleBuilderImpl extends AbstractFormBuilder<RectangleBuilder,
             this._dimension,
             this._fillColor,
             this._id,
-            this._position
+            this._position,
+            this._rotation
         );
     }
 }
@@ -185,7 +195,8 @@ export class LineBuilderImpl extends AbstractBorderElementBuilder<LineBuilder, L
            this._borderWidth,
            this._id,
            this._start,
-           this._end
+           this._end,
+           this._rotation
         );
     }
 }
@@ -212,7 +223,8 @@ export class CircleBuilderImpl extends AbstractFormBuilder<CircleBuilder, Circle
             this._diameter,
             this._fillColor,
             this._id,
-            this._position
+            this._position,
+            this._rotation
         );
     }
 
@@ -244,7 +256,8 @@ export class EllipseBuilderImpl extends AbstractFormBuilder<EllipseBuilder, Elli
             this._dimension,
             this._fillColor,
             this._id,
-            this._position
+            this._position,
+            this._rotation
         );
     }
 

src/paint/elements.impl.ts

@@ -31,7 +31,8 @@ export class DrawablePolyLine implements PolyLine, DrawableElement {
         readonly borderColor: Color,
         readonly borderWidth: number,
         readonly coordinates: Array<Point>,
-        readonly id: string
+        readonly id: string,
+        readonly rotation: number
     ) {}
 
     draw(canvas: Canvas): void {
@@ -41,6 +42,7 @@ export class DrawablePolyLine implements PolyLine, DrawableElement {
             .borderColor(this.borderColor)
             .borderWidth(this.borderWidth)
             .coordinates(this.coordinates)
+            .rotation(this.rotation)
             .paint();
     }
 }
@@ -59,7 +61,8 @@ export class DrawableRectangle implements Rectangle, DrawableElement {
         readonly dimension: Dimension,
         readonly fillColor: Color,
         readonly id: string,
-        readonly position: Point
+        readonly position: Point,
+        readonly rotation: number
     ) {}
 
     draw(canvas: Canvas): void {
@@ -71,6 +74,7 @@ export class DrawableRectangle implements Rectangle, DrawableElement {
             .fillColor(this.fillColor)
             .position(this.position)
             .dimension(this.dimension)
+            .rotation(this.rotation)
             .paint();
     }
 }
@@ -82,6 +86,7 @@ export class DrawableLine implements Line, DrawableElement {
         readonly id: string,
         readonly start: Point,
         readonly end: Point,
+        readonly rotation: number
     ) {}
 
     draw(canvas: Canvas): void {
@@ -91,6 +96,7 @@ export class DrawableLine implements Line, DrawableElement {
             .borderWidth(this.borderWidth)
             .start(this.start)
             .end(this.end)
+            .rotation(this.rotation)
             .paint();
     }
 }
@@ -102,7 +108,8 @@ export class DrawableCircle implements Circle, DrawableElement {
         readonly diameter: number,
         readonly fillColor: Color,
         readonly id: string,
-        readonly position: Point
+        readonly position: Point,
+        readonly rotation: number
     ) {}
 
     draw(canvas: Canvas): void {
@@ -113,6 +120,7 @@ export class DrawableCircle implements Circle, DrawableElement {
             .fillColor(this.fillColor)
             .position(this.position)
             .diameter(this.diameter)
+            .rotation(this.rotation)
             .paint();
     }
 }
@@ -124,7 +132,8 @@ export class DrawableEllipse implements Ellipse, DrawableElement {
         readonly dimension: Dimension,
         readonly fillColor: Color,
         readonly id: string,
-        readonly position: Point
+        readonly position: Point,
+        readonly rotation: number
     ) {}
 
     draw(canvas: Canvas): void {
@@ -135,6 +144,7 @@ export class DrawableEllipse implements Ellipse, DrawableElement {
             .fillColor(this.fillColor)
             .position(this.position)
             .dimension(this.dimension)
+            .rotation(this.rotation)
             .paint();
     }
 }