customized-fabric 1.8.9 → 1.9.1
Sign up to get free protection for your applications and to get access to all the features.
@@ -245,8 +245,9 @@ const ImagePlaceholderClass = fabric_1.fabric.util.createClass(fabric_1.fabric.G
|
|
245
245
|
loadCustomizedImage: async function (image) {
|
246
246
|
if (image) {
|
247
247
|
const { url, filteredUrl, data, clipPath } = image;
|
248
|
-
|
249
|
-
|
248
|
+
const imageUrl = filteredUrl ?? url;
|
249
|
+
if (imageUrl && data && clipPath) {
|
250
|
+
const loadedImage = await (0, utils_1.loadImageFromUrl)(imageUrl);
|
250
251
|
if (loadedImage) {
|
251
252
|
const mask = await this.getMask();
|
252
253
|
const { top, left, scaleX, width, angle, flipX, flipY, settings = {}, } = data;
|
package/lib/utils/index.d.ts
CHANGED
@@ -14,8 +14,8 @@ export declare const loadImage: (imageInput: File | string) => Promise<fabric.Im
|
|
14
14
|
export declare const getImageFilters: (type: ImageFilterType, options?: {
|
15
15
|
color?: string;
|
16
16
|
}) => fabric.IGrayscaleFilter[];
|
17
|
-
export declare const lockObject: (object: fabric.Object | any, locked: boolean, selectable?: boolean) => void;
|
18
|
-
export declare const lockAllObjects: (canvas: fabric.Canvas, locked: boolean, selectable?: boolean) => void;
|
17
|
+
export declare const lockObject: (object: fabric.Object | any, locked: boolean, selectable?: boolean, evented?: boolean) => void;
|
18
|
+
export declare const lockAllObjects: (canvas: fabric.Canvas, locked: boolean, selectable?: boolean, evented?: boolean) => void;
|
19
19
|
export declare const getObject: (object: any, options?: {
|
20
20
|
isOriginal?: boolean;
|
21
21
|
hideStroke?: boolean;
|
package/lib/utils/index.js
CHANGED
@@ -105,7 +105,7 @@ const getImageFilters = (type, options = {}) => {
|
|
105
105
|
}
|
106
106
|
};
|
107
107
|
exports.getImageFilters = getImageFilters;
|
108
|
-
const lockObject = (object, locked, selectable) => {
|
108
|
+
const lockObject = (object, locked, selectable, evented) => {
|
109
109
|
object.set({
|
110
110
|
hasControls: !locked,
|
111
111
|
lockMovementX: locked,
|
@@ -119,12 +119,13 @@ const lockObject = (object, locked, selectable) => {
|
|
119
119
|
lockScalingFlip: locked,
|
120
120
|
locked: locked,
|
121
121
|
selectable: selectable ?? !locked,
|
122
|
+
evented: evented ?? !locked,
|
122
123
|
});
|
123
124
|
};
|
124
125
|
exports.lockObject = lockObject;
|
125
|
-
const lockAllObjects = (canvas, locked, selectable) => {
|
126
|
+
const lockAllObjects = (canvas, locked, selectable, evented) => {
|
126
127
|
canvas._objects.map((object) => {
|
127
|
-
(0, exports.lockObject)(object, locked, selectable);
|
128
|
+
(0, exports.lockObject)(object, locked, selectable, evented);
|
128
129
|
});
|
129
130
|
};
|
130
131
|
exports.lockAllObjects = lockAllObjects;
|