Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Removed annotation caching [PT-185363141] #82

Merged
merged 1 commit into from
Jun 25, 2024
Merged

fix: Removed annotation caching [PT-185363141] #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 46 additions & 75 deletions app/scripts/fabric-extensions/annotations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,16 @@ function handleAnnotations(annotationTool) {
annotationId &&
e.target.type === fabric.AnnotationText.prototype.type
) {
var text = fabric.Annotations.get(
annotationId,
fabric.AnnotationText.prototype.type
);
var border = fabric.Annotations.get(
annotationId,
fabric.AnnotationBorder.prototype.type
);
var arrow = fabric.Annotations.get(
annotationId,
fabric.AnnotationArrow.prototype.type
);

// find the associated objects
const objects = {};
canvas.forEachObject((object) => {
if (object.annotationId === annotationId) {
objects[object.type.replace("annotation-", "")] = object;
}
});

const {text, border, arrow} = objects;
if (!text || !border || !arrow) {
return;
}
Expand All @@ -85,30 +83,11 @@ function handleAnnotations(annotationTool) {
annotationId &&
e.target.type !== fabric.AnnotationControlPoint.prototype.type
) {
var text = fabric.Annotations.get(
annotationId,
fabric.AnnotationText.prototype.type
);
var border = fabric.Annotations.get(
annotationId,
fabric.AnnotationBorder.prototype.type
);
var arrow = fabric.Annotations.get(
annotationId,
fabric.AnnotationArrow.prototype.type
);
var controlPoint = fabric.Annotations.get(
annotationId,
fabric.AnnotationControlPoint.prototype.type
);

if (text && e.target !== text) canvas.remove(text);
if (border && e.target !== border) canvas.remove(border);
if (arrow && e.target !== arrow) canvas.remove(arrow);
if (controlPoint && e.target !== controlPoint)
canvas.remove(controlPoint);

fabric.Annotations.remove(annotationId);
canvas.forEachObject((object) => {
if (object.annotationId === annotationId) {
canvas.remove(object);
}
});
}
});
}
Expand All @@ -129,44 +108,40 @@ module.exports = handleAnnotations;
fabric.Annotations = {
margin: 10,

annotations: {},

set: function (id, annotation) {
this.annotations[id] = this.annotations[id] || {};
this.annotations[id][annotation.type] = annotation;
},

get: function (id, type) {
return (this.annotations[id] && this.annotations[id][type]) || undefined;
getObject: function (canvas, id, type) {
return canvas.getObjects(type).find(object => object.annotationId === id);
},

remove: function (id, type) {
if (type) {
if (this.annotations[id]) {
delete this.annotations[id][type];
}
} else {
delete this.annotations[id];
}
getAllAnnotationIds: function (canvas) {
return canvas.getObjects(fabric.AnnotationText.prototype.type).reduce((acc, cur) => {
acc.push(cur.annotationId);
return acc;
}, []);
},

addControlPoint: function (annotationId, canvas) {
var controlPoint = fabric.Annotations.get(
var controlPoint = fabric.Annotations.getObject(
canvas,
annotationId,
fabric.AnnotationControlPoint.prototype.type
);
if (controlPoint) {
return;
}

var text = fabric.Annotations.get(
var text = fabric.Annotations.getObject(
canvas,
annotationId,
fabric.AnnotationText.prototype.type
);
var arrow = fabric.Annotations.get(
var arrow = fabric.Annotations.getObject(
canvas,
annotationId,
fabric.AnnotationArrow.prototype.type
);
if (!text || !arrow) {
return;
}

controlPoint = new fabric.AnnotationControlPoint({
annotationId,
Expand All @@ -182,7 +157,6 @@ module.exports = handleAnnotations;
originX: 'center',
originY: 'center'
});
fabric.Annotations.set(annotationId, controlPoint);

controlPoint.on('moving', () => {
var p = fabric.Annotations.calcArrowPoints(text, {
Expand All @@ -199,27 +173,27 @@ module.exports = handleAnnotations;
},

removeControlPoint: function (annotationId, canvas) {
var controlPoint = fabric.Annotations.get(
var controlPoint = fabric.Annotations.getObject(
canvas,
annotationId,
fabric.AnnotationControlPoint.prototype.type
);
if (controlPoint) {
controlPoint.off('moving');
this.remove(annotationId, fabric.AnnotationControlPoint.prototype.type);
if (canvas.contains(controlPoint)) {
canvas.remove(controlPoint);
}
}
},

addAllControlPoints: function (canvas) {
Object.keys(this.annotations).forEach((id) => {
fabric.Annotations.getAllAnnotationIds(canvas).forEach((id) => {
fabric.Annotations.addControlPoint(id, canvas);
});
},

removeAllControlPoints: function (canvas, exceptId) {
Object.keys(this.annotations).forEach((id) => {
fabric.Annotations.getAllAnnotationIds(canvas).forEach((id) => {
if (id !== exceptId) {
fabric.Annotations.removeControlPoint(id, canvas);
}
Expand Down Expand Up @@ -323,7 +297,6 @@ module.exports = handleAnnotations;
this.callSuper('initialize', text, options);
options = options || {};
this.set('annotationId', options.annotationId);
fabric.Annotations.set(options.annotationId, this);
},

containsPoint: function (point) {
Expand All @@ -335,32 +308,33 @@ module.exports = handleAnnotations;
_renderTextCommon: function (ctx, method) {
this.callSuper('_renderTextCommon', ctx, method);

var border = fabric.Annotations.get(
this.annotationId,
fabric.AnnotationBorder.prototype.type
);
const annotationId = this.annotationId;
let requestReRender = false;

const border = this.canvas.getObjects(fabric.AnnotationBorder.prototype.type).find(object => object.annotationId === annotationId);
if (border) {
var newRect = fabric.Annotations.calcBorderRect(this);
if (
border.width !== newRect.width ||
border.height !== newRect.height
) {
border.set(newRect);
this.canvas.requestRenderAll();
requestReRender = true;
}
}

var arrow = fabric.Annotations.get(
this.annotationId,
fabric.AnnotationArrow.prototype.type
);
const arrow = this.canvas.getObjects(fabric.AnnotationArrow.prototype.type).find(object => object.annotationId === annotationId);
if (arrow) {
var p = fabric.Annotations.calcArrowPoints(this, arrow);
if (arrow.x1 !== p[0] || arrow.y1 !== p[1]) {
arrow.set({ x1: p[0], y1: p[1] });
this.canvas.requestRenderAll();
requestReRender = true;
}
}

if (requestReRender) {
this.canvas.requestRenderAll();
}
},

/**
Expand Down Expand Up @@ -416,7 +390,6 @@ module.exports = handleAnnotations;
lockMovementY: true,
hoverCursor: 'default'
});
fabric.Annotations.set(options.annotationId, this);
},

/**
Expand Down Expand Up @@ -536,7 +509,6 @@ module.exports = handleAnnotations;
lockMovementY: true,
hoverCursor: 'default'
});
fabric.Annotations.set(options.annotationId, this);
},

/**
Expand Down Expand Up @@ -595,7 +567,6 @@ module.exports = handleAnnotations;
hasControls: false,
hasBorders: false
});
fabric.Annotations.set(options.annotationId, this);
},

/**
Expand Down
2 changes: 2 additions & 0 deletions app/scripts/tools/shape-tools/annotation-tool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ AnnotationTool.prototype.mouseDown = function (opt) {
this.canvas.add(text);
this.editText(text, opt.e);
opt.e.preventDefault();

this.master.pushToHistory();
};

AnnotationTool.prototype.activate = function () {
Expand Down
2 changes: 1 addition & 1 deletion dist/drawing-tool.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading