Skip to content

Commit

Permalink
[WEB-1736] fix: drag drop task list (#4959)
Browse files Browse the repository at this point in the history
* fix: drag drop issues with h4,h5,h6,images and drag handle position in tables solved

* fix: drag drop fixed for task lists

* fix: drag drop fixed for task lists

* fix: drag drop task list items
  • Loading branch information
Palanikannan1437 authored Jul 1, 2024
1 parent fa2cfbb commit f3347c5
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/editor/src/core/extensions/drag-drop.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ function nodeDOMAtCoords(coords: { x: number; y: number }) {
"blockquote",
"img",
"h1, h2, h3, h4, h5, h6",
".table-wrapper",
"[data-type=horizontalRule]",
".table-wrapper",
].join(", ");

for (const elem of elements) {
Expand Down Expand Up @@ -120,7 +120,7 @@ function calcNodePos(pos: number, view: EditorView, node: Element) {
const $pos = view.state.doc.resolve(safePos);

if ($pos.depth > 1) {
if (node.matches("ul:not([data-type=taskList]) li, ol li")) {
if (node.matches("ul li, ol li")) {
// only for nested lists
const newPos = $pos.before($pos.depth);
return Math.max(0, Math.min(newPos, maxPos));
Expand Down
31 changes: 31 additions & 0 deletions packages/editor/src/styles/drag-drop.css
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,37 @@
border-radius: 4px;
}

/* for targetting the taks list items */
li.ProseMirror-selectednode:not(.dragging)[data-checked]::after {
margin-left: -5px;
}

/* for targetting the unordered list items */
ul > li.ProseMirror-selectednode:not(.dragging)::after {
margin-left: -10px; /* Adjust as needed */
}

/* Initialize a counter for the ordered list */
ol {
counter-reset: item;
}

/* for targetting the ordered list items */
ol > li.ProseMirror-selectednode:not(.dragging)::after {
counter-increment: item;
margin-left: -18px;
}

/* for targetting the ordered list items after the 9th item */
ol > li:nth-child(n + 10).ProseMirror-selectednode:not(.dragging)::after {
margin-left: -25px;
}

/* for targetting the ordered list items after the 99th item */
ol > li:nth-child(n + 100).ProseMirror-selectednode:not(.dragging)::after {
margin-left: -35px;
}

.ProseMirror img {
transition: filter 0.1s ease-in-out;
cursor: pointer;
Expand Down

0 comments on commit f3347c5

Please sign in to comment.