Merge branch 'ng-legacy'

* ng-legacy: Add method for requesting full drawing history # Conflicts: # dist/canvas-whiteboard.component.js # dist/canvas-whiteboard.component.metadata.json # package-lock.json # package.json # src/canvas-whiteboard.component.ts
webfactorymk · Sep 23, 2018 · d0527e9 · d0527e9
2 parents 484fa9f + 84c26c9
commit d0527e9
Show file tree

Hide file tree

Showing 16 changed files with 91 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -370,6 +370,8 @@ export class AppComponent {
   }
 }   
 ```
+### Requesting the full update history so far
+Can be called via the method  `getDrawingHistory(): CanvasWhiteboardUpdate[]`. The items will be deep cloned for consistency using lodash.
 
 ## Saving drawn canvas as an image
 In order to save drawn images you can either click the Save button in the canvas, 

diff --git a/dist/README.md b/dist/README.md
@@ -370,6 +370,8 @@ export class AppComponent {
   }
 }   
 ```
+### Requesting the full update history so far
+Can be called via the method  `getDrawingHistory(): CanvasWhiteboardUpdate[]`. The items will be deep cloned for consistency using lodash.
 
 ## Saving drawn canvas as an image
 In order to save drawn images you can either click the Save button in the canvas, 

diff --git a/dist/bundles/ng2-canvas-whiteboard.umd.js b/dist/bundles/ng2-canvas-whiteboard.umd.js
diff --git a/dist/bundles/ng2-canvas-whiteboard.umd.min.js b/dist/bundles/ng2-canvas-whiteboard.umd.min.js
diff --git a/dist/modules/ng2-canvas-whiteboard.es5.js b/dist/modules/ng2-canvas-whiteboard.es5.js
diff --git a/dist/modules/ng2-canvas-whiteboard.js b/dist/modules/ng2-canvas-whiteboard.js
diff --git a/dist/ng2-canvas-whiteboard.metadata.json b/dist/ng2-canvas-whiteboard.metadata.json
diff --git a/dist/package.json b/dist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng2-canvas-whiteboard",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "A Canvas component for Angular which supports free drawing.",
   "main": "./bundles/ng2-canvas-whiteboard.umd.js",
   "module": "./modules/ng2-canvas-whiteboard.es5.js",
@@ -40,7 +40,9 @@
   "peerDependencies": {
     "rxjs": "^6.0.0"
   },
-  "dependencies": {},
+  "dependencies": {
+    "lodash": "4.17.11"
+  },
   "devDependencies": {
     "@angular/animations": "^6.0.0",
     "@angular/common": "^6.0.0",
@@ -50,6 +52,7 @@
     "@angular/platform-browser": "^6.0.0",
     "@angular/platform-browser-dynamic": "^6.0.0",
     "@angular/platform-server": "^6.0.0",
+    "@types/lodash": "4.14.116",
     "@types/node": "7.0.10",
     "chalk": "1.1.3",
     "core-js": "2.4.1",

diff --git a/dist/src/canvas-whiteboard.component.d.ts b/dist/src/canvas-whiteboard.component.d.ts
@@ -391,6 +391,11 @@ export declare class CanvasWhiteboardComponent implements OnInit, AfterViewInit,
      */
     toggleShapeSelector(value: boolean): void;
     selectShape(newShapeBlueprint: INewCanvasWhiteboardShape<CanvasWhiteboardShape>): void;
+    /**
+     * Returns a deep copy of the current drawing history for the canvas.
+     * The deep copy is returned because we don't want anyone to mutate the current history
+     */
+    getDrawingHistory(): CanvasWhiteboardUpdate[];
     /**
      * Unsubscribe from a given subscription if it is active
      * @param subscription

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng2-canvas-whiteboard",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "A Canvas component for Angular which supports free drawing.",
   "main": "./bundles/ng2-canvas-whiteboard.umd.js",
   "module": "./modules/ng2-canvas-whiteboard.es5.js",
@@ -40,7 +40,9 @@
   "peerDependencies": {
     "rxjs": "^6.0.0"
   },
-  "dependencies": {},
+  "dependencies": {
+    "lodash": "4.17.11"
+  },
   "devDependencies": {
     "@angular/animations": "^6.0.0",
     "@angular/common": "^6.0.0",
@@ -50,6 +52,7 @@
     "@angular/platform-browser": "^6.0.0",
     "@angular/platform-browser-dynamic": "^6.0.0",
     "@angular/platform-server": "^6.0.0",
+    "@types/lodash": "4.14.116",
     "@types/node": "7.0.10",
     "chalk": "1.1.3",
     "core-js": "2.4.1",

diff --git a/public_api.js b/public_api.js
diff --git a/src/canvas-whiteboard.component.js b/src/canvas-whiteboard.component.js
diff --git a/src/canvas-whiteboard.component.ts b/src/canvas-whiteboard.component.ts
@@ -18,6 +18,7 @@ import {CanvasWhiteboardShapeService, INewCanvasWhiteboardShape} from "./shapes/
 import {CanvasWhiteboardShapeOptions} from "./shapes/canvas-whiteboard-shape-options";
 import {fromEvent, Subscription} from "rxjs/index";
 import {debounceTime, distinctUntilChanged} from "rxjs/operators";
+import {cloneDeep} from "lodash";
 
 @Component({
     selector: 'canvas-whiteboard',
@@ -820,7 +821,7 @@ export class CanvasWhiteboardComponent implements OnInit, AfterViewInit, OnChang
      * @return Emits an Array of Updates when the batch.
      */
     private _prepareUpdateForBatchDispatch(update: CanvasWhiteboardUpdate): void {
-        this._batchUpdates.push(update);
+        this._batchUpdates.push(cloneDeep(update));
         if (!this._updateTimeout) {
             this._updateTimeout = setTimeout(() => {
                 this.onBatchUpdate.emit(this._batchUpdates);
@@ -1074,6 +1075,14 @@ export class CanvasWhiteboardComponent implements OnInit, AfterViewInit, OnChang
         this.selectedShapeConstructor = newShapeBlueprint;
     }
 
+    /**
+     * Returns a deep copy of the current drawing history for the canvas.
+     * The deep copy is returned because we don't want anyone to mutate the current history
+     */
+    getDrawingHistory(): CanvasWhiteboardUpdate[] {
+        return cloneDeep(this._updateHistory);
+    }
+
     /**
      * Unsubscribe from a given subscription if it is active
      * @param subscription

diff --git a/src/ng2-canvas-whiteboard.js b/src/ng2-canvas-whiteboard.js
diff --git a/tsconfig.json b/tsconfig.json
@@ -17,7 +17,8 @@
     "target": "es5",
     "skipLibCheck": true,
     "types": [
-      "node"
+      "node",
+      "lodash"
     ]
   },
   "exclude": [