@leapfrog/interactive-canvas 2.0.25-beta-3 → 2.0.25-beta-4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _, { round, each, values, reduce, clone, max, isEqual } from 'lodash';
|
|
2
2
|
import { BehaviorSubject, Subject } from 'rxjs';
|
|
3
|
-
import * as fabric from 'fabric';
|
|
4
3
|
import { loadImage } from 'canvas';
|
|
4
|
+
import * as fabric from 'fabric';
|
|
5
5
|
|
|
6
6
|
const PIXELS_PER_MM$2 = 3.937;
|
|
7
7
|
class MillimeterDimensions {
|
|
@@ -3066,19 +3066,25 @@ class AbstractInteractiveCanvas {
|
|
|
3066
3066
|
originY: "top",
|
|
3067
3067
|
src: imageUrl,
|
|
3068
3068
|
crossOrigin: "anonymous",
|
|
3069
|
-
toObject: function () {
|
|
3070
|
-
return
|
|
3071
|
-
|
|
3069
|
+
/*toObject: function () {
|
|
3070
|
+
return {
|
|
3071
|
+
...fabric.Object.prototype.toObject.call(this),
|
|
3072
|
+
crossOrigin: this.crossOrigin,
|
|
3073
|
+
src: this.src,
|
|
3074
|
+
id: id
|
|
3075
|
+
};
|
|
3076
|
+
},*/
|
|
3072
3077
|
});
|
|
3073
|
-
fabricImage.toDataURL({ format: 'png' });
|
|
3078
|
+
// fabricImage.toDataURL({ format: 'png' });
|
|
3079
|
+
yield fabricImage.setSrc(imageUrl, options);
|
|
3074
3080
|
this.fabricCanvas.add(fabricImage);
|
|
3075
3081
|
const canvasObjectData = new CanvasObjectData(ObjectType.IMAGE, id);
|
|
3076
3082
|
canvasObjectData.imagePath = imageUrl;
|
|
3077
3083
|
console.log("Assigned imagePath:", canvasObjectData.imagePath);
|
|
3078
3084
|
const object = new Image(this, fabricImage, canvasObjectData);
|
|
3079
3085
|
console.log("Created Image object with imagePath:", object);
|
|
3080
|
-
|
|
3081
|
-
|
|
3086
|
+
object.data.imagePath = imageUrl;
|
|
3087
|
+
object.imageUrl$.next(imageUrl);
|
|
3082
3088
|
this.trackNewObject(object);
|
|
3083
3089
|
this.syncObjectList();
|
|
3084
3090
|
return object;
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
var _ = require('lodash');
|
|
4
4
|
var rxjs = require('rxjs');
|
|
5
|
-
var fabric = require('fabric');
|
|
6
5
|
var canvas = require('canvas');
|
|
6
|
+
var fabric = require('fabric');
|
|
7
7
|
|
|
8
8
|
function _interopNamespaceDefault(e) {
|
|
9
9
|
var n = Object.create(null);
|
|
@@ -3087,19 +3087,25 @@ class AbstractInteractiveCanvas {
|
|
|
3087
3087
|
originY: "top",
|
|
3088
3088
|
src: imageUrl,
|
|
3089
3089
|
crossOrigin: "anonymous",
|
|
3090
|
-
toObject: function () {
|
|
3091
|
-
return
|
|
3092
|
-
|
|
3090
|
+
/*toObject: function () {
|
|
3091
|
+
return {
|
|
3092
|
+
...fabric.Object.prototype.toObject.call(this),
|
|
3093
|
+
crossOrigin: this.crossOrigin,
|
|
3094
|
+
src: this.src,
|
|
3095
|
+
id: id
|
|
3096
|
+
};
|
|
3097
|
+
},*/
|
|
3093
3098
|
});
|
|
3094
|
-
fabricImage.toDataURL({ format: 'png' });
|
|
3099
|
+
// fabricImage.toDataURL({ format: 'png' });
|
|
3100
|
+
yield fabricImage.setSrc(imageUrl, options);
|
|
3095
3101
|
this.fabricCanvas.add(fabricImage);
|
|
3096
3102
|
const canvasObjectData = new CanvasObjectData(exports.ObjectType.IMAGE, id);
|
|
3097
3103
|
canvasObjectData.imagePath = imageUrl;
|
|
3098
3104
|
console.log("Assigned imagePath:", canvasObjectData.imagePath);
|
|
3099
3105
|
const object = new Image(this, fabricImage, canvasObjectData);
|
|
3100
3106
|
console.log("Created Image object with imagePath:", object);
|
|
3101
|
-
|
|
3102
|
-
|
|
3107
|
+
object.data.imagePath = imageUrl;
|
|
3108
|
+
object.imageUrl$.next(imageUrl);
|
|
3103
3109
|
this.trackNewObject(object);
|
|
3104
3110
|
this.syncObjectList();
|
|
3105
3111
|
return object;
|