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

Jump to bottom

fix(v6!): nested controls #7758

Merged
merged 15 commits into from
Apr 4, 2022
Merged

fix(v6!): nested controls #7758

merged 15 commits into from
Apr 4, 2022

Conversation

ShaMan123
Copy link
Contributor

@ShaMan123 ShaMan123 commented Mar 6, 2022 •
edited
Loading

Fixed nested controls.
Take a look at the goldens

I think we need to take a closer look at aCoords now after oCoords seems fixed

@ShaMan123 ShaMan123 requested a review from asturur March 6, 2022 11:08
@ShaMan123
Copy link
Contributor Author

I want to merge into v6!

@ShaMan123
Copy link
Contributor Author

ready

@ShaMan123
Copy link
Contributor Author

ShaMan123 commented Mar 6, 2022 •
edited
Loading

Now it is obvious there's a bug in the transform event data or something.

  1. skew a group
  2. skew a nested object
  3. rotate group
  4. skew object

skewing object will make it jump to skew 0 or something like that

@ShaMan123 ShaMan123 mentioned this pull request Mar 6, 2022
Closed
21 tasks
@ShaMan123
Copy link
Contributor Author

ShaMan123 commented Mar 6, 2022 •
edited
Loading

BTW I have a successful POC of rendering controls without oCoords, as part of the drawBorders function.
But I guess it won't suffice because we need oCoords for mouse hit testing

@ShaMan123
Copy link
Contributor Author

Another thought.
I can make this mergeable into master if you prefer

@ShaMan123
Copy link
Contributor Author

And I think, with this PR, that oCoords can become the only set of coords if we add corner values to them.

@ShaMan123 ShaMan123 changed the title fix(): nested controls fix(v6!): nested controls Mar 6, 2022
@ShaMan123
Copy link
Contributor Author

ShaMan123 commented Mar 6, 2022 •
edited
Loading

Regarding flipX and rotation

I followed existing logic and the visuals test but I am no longer sure flipX/Y are configured correctly when rendering controls.

Take a look at 5e129d1 and 58e2cd5
These commits seem to be wrong...

Please explain this commit d277016 and verify goldens

Why is this applied only to group elements?

fabric.js/src/shapes/object.class.js

Line 1403 in 109efe5

options.angle -= 180;

And what about flipY?

@ShaMan123
Revert "tests(): flipX"
e4e2f7b 
This reverts commit 58e2cd5.
@ShaMan123
Revert "flipX"
5fa46f2 
This reverts commit 5e129d1.
@stale
Copy link

stale bot commented Mar 22, 2022

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the stale Issue marked as stale by the stale bot label Mar 22, 2022
@ShaMan123 ShaMan123 added fix-next and removed stale Issue marked as stale by the stale bot labels Mar 22, 2022
@ShaMan123
Copy link
Contributor Author

@asturur I can rebase this PR to master. It's a prerequisite.

ShaMan123 added a commit that referenced this pull request Apr 4, 2022
@ShaMan123
port changes from fix-nested-controls
3632fd0 
closes #7758
@ShaMan123 ShaMan123 added stale Issue marked as stale by the stale bot and removed fix-next labels Apr 4, 2022
@stale stale bot removed the stale Issue marked as stale by the stale bot label Apr 4, 2022
@ShaMan123 ShaMan123 merged commit bf603cb into v6! Apr 4, 2022
This was referenced Apr 4, 2022
Merged
Closed
@ShaMan123 ShaMan123 deleted the fix-nested-controls branch April 4, 2022 20:20
ShaMan123 added a commit that referenced this pull request Apr 8, 2022
@ShaMan123
Squashed commit of the following:
9ed348f 
commit 5e286aa
Merge: 905b2de d53d6b6
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 23:05:56 2022 +0300

    Merge branch 'v6-group-patch2' into v6-fix-nested-controls

commit d53d6b6
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 23:02:42 2022 +0300

    lint

commit 5e3aaf5
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 22:59:27 2022 +0300

    Update group.class.js

commit 5c56124
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 22:58:58 2022 +0300

    backport collection fix to test

commit a5575bd
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 22:46:10 2022 +0300

    Update group.js

commit 905b2de
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 21:46:46 2022 +0300

    goldens

commit 3632fd0
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 21:36:16 2022 +0300

    port changes from `fix-nested-controls`

    closes #7758

commit 2164161
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 19:09:21 2022 +0300

    fix(): export svg backgroundColor

commit 01c4a87
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 18:42:15 2022 +0300

    Update canvas.class.js

commit 2d5cc75
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 18:41:59 2022 +0300

    Update canvas.class.js

commit 9a223d0
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 18:37:33 2022 +0300

    Update canvas_events.mixin.js

commit c0f5571
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 18:37:14 2022 +0300

    perf(): refrain from `contains`

commit c58a274
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 18:14:01 2022 +0300

    _shouldSetNestedCoords

commit d8f8251
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 17:51:46 2022 +0300

    invalidate groups after active selection change

commit e9afc89
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 17:39:30 2022 +0300

    refactor `enterGroup`

commit b6fa3dc
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 17:14:20 2022 +0300

    Update group.class.js

commit 11c828f
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 16:12:02 2022 +0300

    fix(): calling sendPointToPlane

commit 1ad5cc8
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 16:05:38 2022 +0300

    Update canvas_grouping.mixin.js

commit 2b1f680
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 15:55:47 2022 +0300

    remove redundant logic

commit 5e3fc1f
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 15:54:26 2022 +0300

    Update group_layout.js

commit 2a426e7
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 15:40:34 2022 +0300

    Update group_layout.js

commit a56d55e
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 14:40:41 2022 +0300

    Update canvas.class.js

commit 347f80d
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 14:38:48 2022 +0300

    Update canvas_grouping.mixin.js

commit cb20b81
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 14:18:12 2022 +0300

    patch tests from v6!

commit f0145b5
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 13:59:16 2022 +0300

    Update object_ancestry.mixin.js

commit c2ef2f5
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 13:55:41 2022 +0300

    safeguard from adding group to itself

commit 58e9be2
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 12:08:49 2022 +0300

    lint

commit 3fd4af2
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 11:39:43 2022 +0300

    Update canvas_events.mixin.js

commit 8c1c535
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 11:35:59 2022 +0300

    Update canvas.class.js

commit 04aad5b
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 11:28:34 2022 +0300

    Update eraser_brush.mixin.js

commit db76c44
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 11:24:25 2022 +0300

    fix(): center object in case object is nested

commit 053946c
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 11:22:59 2022 +0300

    fix(): clear canvas from entire object tree

    in case object is a collection

commit 812f02a
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 11:21:29 2022 +0300

    render bg

commit ff0346a
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 11:10:07 2022 +0300

    migrate back to isDescendantOf

commit 0d3690f
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 10:29:14 2022 +0300

    enable text editing under group

commit 02a8ffa
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 10:28:58 2022 +0300

    Update spray_brush.class.js

commit 2708029
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 10:28:53 2022 +0300

    patch2

commit 7d793b3
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Mon Apr 4 00:06:18 2022 +0300

    commit #7744 review

    #7744 (review)

commit 26e8392
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Sun Apr 3 23:33:04 2022 +0300

    apply 7744 patch (binaries)

commit 1a191a7
Author: ShaMan123 <shacharnen@gmail.com>
Date:   Sun Apr 3 23:32:55 2022 +0300

    apply 7744 patch (no binaries)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asturur asturur Awaiting requested review from asturur

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ShaMan123