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

feat(fabric.Layer): Group Rewrite Proposal #7316

Closed
wants to merge 22 commits into from
Closed

feat(fabric.Layer): Group Rewrite Proposal #7316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d30cf9e
Create layer.class.js
ShaMan123 Aug 20, 2021
cd8ae57
Update build.js
ShaMan123 Aug 20, 2021
dc9ffcd
fix positioning
ShaMan123 Aug 20, 2021
3a89567
Update layer.class.js
ShaMan123 Aug 20, 2021
cfdc581
no layoutStrategy stable
ShaMan123 Aug 20, 2021
a93088f
fix(): svg export
ShaMan123 Aug 20, 2021
59943a3
from svg
ShaMan123 Aug 20, 2021
f78783d
organize
ShaMan123 Aug 20, 2021
4f9faae
remove `toActiveSelection`
ShaMan123 Aug 20, 2021
e9618c2
lint
ShaMan123 Aug 20, 2021
ce32e1a
initial `_objects`
ShaMan123 Aug 20, 2021
d8c1fdb
fix(parser): default fill/stroke value should be null
ShaMan123 Aug 20, 2021
faf7c7c
Update object_stacking.mixin.js
ShaMan123 Aug 20, 2021
cfaf3ae
fixes to pass tests
ShaMan123 Aug 20, 2021
e408635
Create layer.js
ShaMan123 Aug 20, 2021
4503032
Update layer.js
ShaMan123 Aug 20, 2021
78d00f2
better initialization
ShaMan123 Aug 20, 2021
a7f3515
fix(`_applyBoundingRect`): account for scale
ShaMan123 Aug 20, 2021
ba940fb
Update layer.class.js
ShaMan123 Aug 20, 2021
a2d7185
lint
ShaMan123 Aug 20, 2021
c3871cc
Update layer.class.js
ShaMan123 Aug 21, 2021
af3d461
Update object.class.js
ShaMan123 Aug 21, 2021
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
1 change: 1 addition & 0 deletions build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ var filesToInclude = [
'src/shapes/polygon.class.js',
'src/shapes/path.class.js',
'src/shapes/group.class.js',
'src/shapes/layer.class.js',
ifSpecifiedInclude('interaction', 'src/shapes/active_selection.class.js'),
'src/shapes/image.class.js',

Expand Down
19 changes: 11 additions & 8 deletions src/mixins/object_stacking.mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
* @chainable
*/
sendToBack: function() {
if (this.group) {
fabric.StaticCanvas.prototype.sendToBack.call(this.group, this);
if (this.group || this.layer) {
fabric.StaticCanvas.prototype.sendToBack.call(this.group || this.layer, this);
}
else if (this.canvas) {
this.canvas.sendToBack(this);
Expand All @@ -21,8 +21,8 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
* @chainable
*/
bringToFront: function() {
if (this.group) {
fabric.StaticCanvas.prototype.bringToFront.call(this.group, this);
if (this.group || this.layer) {
fabric.StaticCanvas.prototype.bringToFront.call(this.group || this.layer, this);
}
else if (this.canvas) {
this.canvas.bringToFront(this);
Expand All @@ -37,8 +37,8 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
* @chainable
*/
sendBackwards: function(intersecting) {
if (this.group) {
fabric.StaticCanvas.prototype.sendBackwards.call(this.group, this, intersecting);
if (this.group || this.layer) {
fabric.StaticCanvas.prototype.sendBackwards.call(this.group || this.layer, this, intersecting);
}
else if (this.canvas) {
this.canvas.sendBackwards(this, intersecting);
Expand All @@ -53,8 +53,8 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
* @chainable
*/
bringForward: function(intersecting) {
if (this.group) {
fabric.StaticCanvas.prototype.bringForward.call(this.group, this, intersecting);
if (this.group || this.layer) {
fabric.StaticCanvas.prototype.bringForward.call(this.group || this.layer, this, intersecting);
}
else if (this.canvas) {
this.canvas.bringForward(this, intersecting);
Expand All @@ -72,6 +72,9 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
if (this.group && this.group.type !== 'activeSelection') {
fabric.StaticCanvas.prototype.moveTo.call(this.group, this, index);
}
else if (this.layer) {
fabric.StaticCanvas.prototype.moveTo.call(this.layer, this, index);
}
else if (this.canvas) {
this.canvas.moveTo(this, index);
}
Expand Down
2 changes: 1 addition & 1 deletion src/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
parsed;

if ((attr === 'fill' || attr === 'stroke') && value === 'none') {
value = '';
value = null;
}
else if (attr === 'strokeUniform') {
return (value === 'non-scaling-stroke');
Expand Down
Loading