suneditor 3.2.4 → 3.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "suneditor",
-	"version": "3.2.4",
+	"version": "3.2.6",
 	"description": "Vanilla JavaScript based WYSIWYG web editor",
 	"author": "Yi JiHong",
 	"license": "MIT",

package/src/core/event/rules/keydown.rule.backspace.js

@@ -40,6 +40,7 @@ export function reduceBackspaceDown(actions, ports, ctx) {
 
 	if (selectRange && hardDelete(ports)) {
 		actions.push(A.preventStop());
+		actions.push(A.caretScrollTo(range));
 		return true;
 	}
 
@@ -66,6 +67,7 @@ export function reduceBackspaceDown(actions, ports, ctx) {
 		actions.push(A.preventStop());
 		actions.push(A.delFormatRemoveAndMove(range.startContainer, formatEl));
 		actions.push(A.historyPush(true));
+		actions.push(A.caretScrollTo(range));
 		return false;
 	}
 
@@ -107,6 +109,7 @@ export function reduceBackspaceDown(actions, ports, ctx) {
 		}
 
 		actions.push(A.editorNativeFocus());
+		actions.push(A.caretScrollTo(range));
 		return false;
 	}
 
@@ -201,6 +204,7 @@ export function reduceBackspaceDown(actions, ports, ctx) {
 				}
 			}
 
+			actions.push(A.caretScrollTo(range));
 			return true;
 		}
 
@@ -233,6 +237,7 @@ export function reduceBackspaceDown(actions, ports, ctx) {
 					),
 				);
 				actions.push(A.historyPush(true));
+				actions.push(A.caretScrollTo(range));
 				return true;
 			}
 		}
@@ -244,6 +249,7 @@ export function reduceBackspaceDown(actions, ports, ctx) {
 		if (fileComponentInfo) {
 			actions.push(A.preventStop());
 			actions.push(A.backspaceComponentRemove(false, formatEl.firstChild, formatEl, fileComponentInfo));
+			actions.push(A.caretScrollTo(range));
 			return true;
 		}
 	}
@@ -276,6 +282,7 @@ export function reduceBackspaceDown(actions, ports, ctx) {
 				actions.push(A.preventStop());
 				actions.push(A.domUtilsRemoveItem(prev));
 			}
+			actions.push(A.caretScrollTo(range));
 			return true;
 		}
 
@@ -283,6 +290,7 @@ export function reduceBackspaceDown(actions, ports, ctx) {
 		if (sel && dom.check.isNonEditable(sel.previousSibling)) {
 			actions.push(A.preventStop());
 			actions.push(A.domUtilsRemoveItem(sel.previousSibling));
+			actions.push(A.caretScrollTo(range));
 			return true;
 		}
 	}
@@ -300,6 +308,7 @@ export function reduceBackspaceDown(actions, ports, ctx) {
 			actions.push(A.preventStop());
 			actions.push(A.backspaceBrLineRowMerge(range.startContainer, rowStartBr));
 			actions.push(A.historyPush(true));
+			actions.push(A.caretScrollTo(range));
 			return false;
 		}
 	}
@@ -315,6 +324,7 @@ export function reduceBackspaceDown(actions, ports, ctx) {
 		actions.push(A.preventStop());
 		actions.push(A.backspaceSoftBreakMerge(range.startContainer));
 		actions.push(A.historyPush(true));
+		actions.push(A.caretScrollTo(range));
 		return false;
 	}
 
@@ -331,6 +341,7 @@ export function reduceBackspaceDown(actions, ports, ctx) {
 		actions.push(A.preventStop());
 		actions.push(A.backspaceEmptyLineMergePrev(formatEl, emptyLinePrev));
 		actions.push(A.historyPush(true));
+		actions.push(A.caretScrollTo(range));
 		return false;
 	}
 

package/src/core/logic/dom/selection.js

@@ -482,21 +482,28 @@ class Selection_ {
 				el?.scrollIntoView(scrollOption);
 			}
 
-			if (scrollOption?.behavior === 'auto' && scrollY !== _w.scrollY) {
-				if (positionToolbarHeight) {
-					if (isBottom) {
+			if (scrollOption?.behavior === 'auto') {
+				if (positionToolbarHeight && !isBottom) {
+					// A sticky toolbar overlays the viewport band [0 .. positionToolbarHeight].
+					// caret on a wrapped line — and nudge it below the toolbar. Guards:
+					//   height > 0 — skip a collapsed range's zero rect (phantom full-toolbar scroll)
+					//   top >= 0   — skip off-screen / mid-animation rects; `behavior:'auto'` follows
+					//                the page's CSS scroll-behavior, so on `smooth` hosts it's async
+					//   top < band — only correct when actually under the toolbar; caps the nudge at
+					//                toolbar height so a stale measurement can't overshoot
+					const caretNow = ref?.getBoundingClientRect?.();
+					if (caretNow?.height > 0 && caretNow.top >= 0 && caretNow.top < positionToolbarHeight) {
+						_w.scrollBy(0, -(positionToolbarHeight - caretNow.top));
+					}
+				} else if (scrollY !== _w.scrollY) {
+					if (positionToolbarHeight) {
 						// bottom toolbar covers the bottom — scroll down more so the element clears the toolbar
 						if (scrollY < _w.scrollY) {
 							_w.scrollBy(0, positionToolbarHeight);
 						}
-					} else {
-						// top toolbar covers the top — scroll up more so the element clears the toolbar
-						if (scrollY > _w.scrollY) {
-							_w.scrollBy(0, -positionToolbarHeight);
-						}
+					} else if (isAutoHeight) {
+						_w.scrollBy(0, statusbarHeight);
 					}
-				} else if (isAutoHeight) {
-					_w.scrollBy(0, statusbarHeight);
 				}
 			}
 
@@ -524,22 +531,28 @@ class Selection_ {
 				if (topMargin >= 0 && bottomMargin >= 0) return;
 
 				const newScrollTop = scrollY - (topMargin < 0 ? -(topMargin - PADDING) : bottomMargin);
+				const clearTopToolbar = topToolbarH > 0 && topMargin < 0;
 				_w.scrollTo({
-					top: newScrollTop < scrollY ? newScrollTop - topToolbarH : newScrollTop,
+					top: clearTopToolbar ? newScrollTop - topToolbarH : newScrollTop,
 					behavior,
 				});
 			} else {
 				const rectTop = refRect?.height > 0 ? refRect.top + scrollY : this.#$.offset.getGlobal(el).top;
 				const scrollMargin = viewHeight + scrollY - rectTop - elH;
 
-				if (scrollMargin - PADDING > 0 && viewHeight > scrollMargin + PADDING + topToolbarH) return;
+				// Top clearance: with a sticky toolbar, the caret is already clear once its top
+				// felt right. With no toolbar (topToolbarH === 0), keep the original PADDING.
+				const caretTop = rectTop - scrollY;
+				const topClear = topToolbarH > 0 ? caretTop >= topToolbarH : viewHeight > scrollMargin + PADDING;
+				if (scrollMargin - PADDING > 0 && topClear) return;
 
 				const newScrollTop =
 					scrollMargin <= PADDING
 						? scrollY - scrollMargin + PADDING + statusbarHeight
 						: scrollY - scrollMargin + (viewHeight - elH - PADDING);
+				const clearTopToolbar = topToolbarH > 0 && !topClear;
 				_w.scrollTo({
-					top: newScrollTop < scrollY ? newScrollTop - topToolbarH : newScrollTop,
+					top: clearTopToolbar ? newScrollTop - topToolbarH : newScrollTop,
 					behavior,
 				});
 			}