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

Refactor sorter #6149

Merged
merged 93 commits into from
Sep 30, 2024
Merged

Refactor sorter #6149

merged 93 commits into from
Sep 30, 2024

Conversation

mohamedsalem401
Copy link
Member

@mohamedsalem401 mohamedsalem401 commented Sep 16, 2024 •
edited
Loading

For #6122 and possibly #4323 (as we will significantly reduce calls to the DOM).

Changes

  • Split the sorter into multiple classes.
  • Change how we calculate drop position.
  • Fix the issue with the StyleManager.

Pre-Merge Checklist:

  • Canvas
  • Style manager
  • Layers
  • Blocks
  • Sorter event triggering: Is the sorter triggering events as expected (e.g., sorter:drag:start)?
  • Dropping image into the canvas
  • D&D multiple components
  • Rollback button
  • Textable component D&D

@mohamedsalem401
Add canMove and getChildren to Sorter
8c6cbdb
@mohamedsalem401
Make the canvas use Components.canMove function
9d711e7
@mohamedsalem401
Fix StyleManager issue
4c81586
@mohamedsalem401
Make Sorter dependent on an abstract datastructure
21e4ca2
@mohamedsalem401
Remove unneeded properties
85c9dab
@mohamedsalem401
Add drag direction enum
185ef8d
@mohamedsalem401
extract method
19e7145
@mohamedsalem401
Add default values for the sorter
67e2e71
@mohamedsalem401
reverse avoidSelectOnEnd
3638a8a
@mohamedsalem401
Group related options for the Sorter
20c7990
@mohamedsalem401
Fix types, and fix canvas sorter
f8088e5
@mohamedsalem401
Add method to clear source element freeze
c62ab28
@mohamedsalem401
Add DropLocationDeterminer class
4f17832
@mohamedsalem401
Refactor some methods in the sorter
37cc27b
@mohamedsalem401
Refactor endMove method
d27af86
@mohamedsalem401
Refactor rollback method
332bec7
@mohamedsalem401
Merge branch 'dev' of https://github.com/GrapesJS/grapesjs into refac…
726dbdf 
…tor-sorter
@mohamedsalem401
Add DropLocationDeterminer, refactor methods in Sorter class
1d0e52d
@mohamedsalem401
Break the sorter into multiple classes
8c94152
@mohamedsalem401
Fix placeholder class jsdocs
99edd1e
@mohamedsalem401
Fix bug while dropping items near the border
fb2b4c0
@mohamedsalem401
Refactor DropLocationDeterminer
69fc8ea
@mohamedsalem401
Add helping methods to the ComponentSorter
8fd7ed9
@mohamedsalem401
Remove unwanted fields in DropLocationDeterminer
f17d164
@mohamedsalem401
Add componentSorter Class
e3e16c0
@mohamedsalem401
Refactor DropLocationDeterminer Class
6729c33
@mohamedsalem401
Rename file
0037371
@mohamedsalem401
Fix style manager class
c459498
@mohamedsalem401
Move files into a new folder
90cf6ea
@mohamedsalem401
Move types to a new file
ef40cea
mohamedsalem401 and others added 22 commits September 25, 2024 08:37
@mohamedsalem401
Fix legacyOnMove not being triggered
c0be6bd
@mohamedsalem401
Some refactor
f4c3512
@mohamedsalem401
Fix selection after cancelling
a907d1f
@mohamedsalem401
Fix triggering update event without moving any component
894c8e4
@mohamedsalem401
fix the sort of dragged components
57a0b09
@mohamedsalem401
make style manager droppable even if the mouse is outside the continer
ae5fe69
@mohamedsalem401
Fix selecting blocks after being dropped
1069558
@artf
Merge branch 'dev' into refactor-sorter
59836e7
@mohamedsalem401
Fix placeholder for empty containers
d5cf3de
@mohamedsalem401
Fix blocks drag cancel issue
2712206
@mohamedsalem401
Fix style manager cancel
115ccea
@mohamedsalem401
Fix autoscroll not stopping issue
eb84892
@mohamedsalem401
Fix comment components drag
280d1bb
@mohamedsalem401
Fix issue with hidden elements
85847cb
@mohamedsalem401
Fix selection after dropping
a64af92
@mohamedsalem401
Format
67fa7f7
@mohamedsalem401
Fix position on scroll
fd6a6d2
@mohamedsalem401
remove console.log
fbf4c45
@mohamedsalem401
Change target calculation with scroll
da50ac8
@mohamedsalem401
Fix blocks not activating issue
057dce5
@mohamedsalem401
Fix block drop in wrapper issue
f4f90ef
@mohamedsalem401
Fix dropping multiple components in the same position
846d4e9
@mohamedsalem401 mohamedsalem401 merged commit 2124bdc into dev Sep 30, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@artf artf artf approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@mohamedsalem401 @artf