fix: 移除 setInterval 轮询,改用纯事件驱动 selectionChange — 修复 CI 卡死问题
This commit is contained in:
+21
-41
@@ -83,7 +83,6 @@ export class MarkdownEditor {
|
||||
_themeCtx: any;
|
||||
_i18nCtx!: InstanceI18n;
|
||||
_floatingToolbar!: HTMLElement | null;
|
||||
_selectionTimer!: ReturnType<typeof setInterval> | null;
|
||||
_floatingEnabled!: boolean;
|
||||
|
||||
constructor(container: string | HTMLElement, options: EditorOptions = {}) {
|
||||
@@ -108,7 +107,7 @@ export class MarkdownEditor {
|
||||
this._shortcuts = []; this._contextMenuItems = []; this._customActions = {};
|
||||
this._outlineTimer = null; this._zenMode = false; this._wordWrap = true; this._syncing = false;
|
||||
this._zenMouseHandler = null;
|
||||
this._floatingToolbar = null; this._selectionTimer = null;
|
||||
this._floatingToolbar = null;
|
||||
this._floatingEnabled = this.config.floatingToolbar !== false;
|
||||
|
||||
this._renderFn = (typeof this.config.render === 'function') ? this.config.render : parseMarkdown;
|
||||
@@ -721,14 +720,25 @@ export class MarkdownEditor {
|
||||
if (!this._floatingEnabled) return;
|
||||
|
||||
const ta = this.textarea;
|
||||
let _lastSelStart = ta.selectionStart;
|
||||
let _lastSelEnd = ta.selectionEnd;
|
||||
|
||||
const emitSelectionChange = () => {
|
||||
const s = ta.selectionStart; const e = ta.selectionEnd;
|
||||
if (s !== _lastSelStart || e !== _lastSelEnd) {
|
||||
_lastSelStart = s; _lastSelEnd = e;
|
||||
this._emit('selectionChange', { start: s, end: e, text: this._value.slice(s, e) });
|
||||
}
|
||||
};
|
||||
|
||||
const show = () => {
|
||||
if (this._destroyed || this.config.readOnly || !this._floatingEnabled) return;
|
||||
emitSelectionChange();
|
||||
const start = ta.selectionStart; const end = ta.selectionEnd;
|
||||
if (start === end) { this._hideFloatingToolbar(); return; }
|
||||
|
||||
if (!this._floatingToolbar || !this._floatingToolbar.parentNode) this._buildFloatingToolbar();
|
||||
|
||||
// Position the toolbar near the selection (toolbar is absolute inside editorPane)
|
||||
const taRect = ta.getBoundingClientRect();
|
||||
const paneRect = this.editorPane.getBoundingClientRect();
|
||||
const taStyle = getComputedStyle(ta);
|
||||
@@ -736,27 +746,21 @@ export class MarkdownEditor {
|
||||
const paddingTop = parseFloat(taStyle.paddingTop) || 16;
|
||||
const paddingLeft = parseFloat(taStyle.paddingLeft) || 18;
|
||||
const fontSize = parseFloat(taStyle.fontSize) || 13.5;
|
||||
// Monospace: char width ≈ fontSize * 0.6
|
||||
const charWidth = fontSize * 0.6;
|
||||
|
||||
const textBefore = ta.value.substring(0, start);
|
||||
const lines = textBefore.split('\n');
|
||||
const currentLine = lines.length - 1;
|
||||
const currentCol = textBefore.length - textBefore.lastIndexOf('\n') - 1;
|
||||
// Middle column of selection
|
||||
const midCol = currentCol + Math.floor((end - start) / 2 * ((ta.selectionDirection === 'backward') ? -1 : 1));
|
||||
|
||||
// Vertical: line position in textarea content, then convert to pane-local
|
||||
const lineViewportTop = taRect.top + paddingTop + currentLine * lineHeight - ta.scrollTop;
|
||||
const lineLocalTop = lineViewportTop - paneRect.top;
|
||||
const toolbarHeight = 36;
|
||||
const gap = 4;
|
||||
let top = lineLocalTop - toolbarHeight - gap;
|
||||
if (top < gap) {
|
||||
top = lineLocalTop + lineHeight + gap;
|
||||
}
|
||||
if (top < gap) top = lineLocalTop + lineHeight + gap;
|
||||
|
||||
// Horizontal: column position in textarea content, convert to pane-local
|
||||
const colX = taRect.left + paddingLeft + midCol * charWidth - ta.scrollLeft;
|
||||
let left = colX - paneRect.left - 80;
|
||||
left = Math.max(4, Math.min(left, paneRect.width - 200));
|
||||
@@ -768,46 +772,23 @@ export class MarkdownEditor {
|
||||
|
||||
const hide = () => { this._hideFloatingToolbar(); };
|
||||
|
||||
let lastSelStart = ta.selectionStart;
|
||||
let lastSelEnd = ta.selectionEnd;
|
||||
this._selectionTimer = setInterval(() => {
|
||||
if (this._destroyed || !document.body.contains(ta) || !this._floatingEnabled) return;
|
||||
const s = ta.selectionStart; const e = ta.selectionEnd;
|
||||
if (s !== lastSelStart || e !== lastSelEnd) {
|
||||
lastSelStart = s; lastSelEnd = e;
|
||||
const text = this._value.slice(s, e);
|
||||
this._emit('selectionChange', { start: s, end: e, text });
|
||||
}
|
||||
}, 500) as any;
|
||||
this._cleanups.push(() => { if (this._selectionTimer) { clearInterval(this._selectionTimer); this._selectionTimer = null; } });
|
||||
|
||||
ta.addEventListener('mouseup', () => { if (this._floatingEnabled) setTimeout(show, 0); });
|
||||
ta.addEventListener('mouseup', () => setTimeout(show, 0));
|
||||
ta.addEventListener('keyup', () => {
|
||||
if (!this._floatingEnabled) return;
|
||||
emitSelectionChange();
|
||||
if (ta.selectionStart !== ta.selectionEnd) setTimeout(show, 0);
|
||||
else setTimeout(hide, 0);
|
||||
this._emit('cursorMove', this.getCursorPosition());
|
||||
});
|
||||
ta.addEventListener('blur', () => setTimeout(hide, 300));
|
||||
ta.addEventListener('click', () => { if (ta.selectionStart === ta.selectionEnd) setTimeout(hide, 0); });
|
||||
ta.addEventListener('click', () => {
|
||||
emitSelectionChange();
|
||||
if (ta.selectionStart === ta.selectionEnd) hide();
|
||||
});
|
||||
}
|
||||
|
||||
toggleFloatingToolbar(): this {
|
||||
this._floatingEnabled = !this._floatingEnabled;
|
||||
if (this._floatingEnabled) {
|
||||
// Re-enable: restart the interval
|
||||
if (!this._selectionTimer) {
|
||||
const ta = this.textarea;
|
||||
this._selectionTimer = setInterval(() => {
|
||||
if (this._destroyed || !this._floatingEnabled) return;
|
||||
const s = ta.selectionStart; const e = ta.selectionEnd;
|
||||
if (s !== e) { /* will show via keyup/mouseup */ }
|
||||
}, 500) as any;
|
||||
this._cleanups.push(() => { if (this._selectionTimer) { clearInterval(this._selectionTimer); this._selectionTimer = null; } });
|
||||
}
|
||||
} else {
|
||||
// Disable: clear interval and hide toolbar
|
||||
if (this._selectionTimer) { clearInterval(this._selectionTimer); this._selectionTimer = null; }
|
||||
if (!this._floatingEnabled) {
|
||||
if (this._floatingToolbar) {
|
||||
if (this._floatingToolbar.parentNode) this._floatingToolbar.parentNode.removeChild(this._floatingToolbar);
|
||||
this._floatingToolbar = null;
|
||||
@@ -1161,7 +1142,6 @@ export class MarkdownEditor {
|
||||
if (this._renderRaf) cancelAnimationFrame(this._renderRaf);
|
||||
if (this._historyTimer) clearTimeout(this._historyTimer);
|
||||
if (this._outlineTimer) clearTimeout(this._outlineTimer);
|
||||
if (this._selectionTimer) { clearInterval(this._selectionTimer); this._selectionTimer = null; }
|
||||
this._cleanups.forEach((fn) => { try { fn(); } catch (_) {} }); this._cleanups = [];
|
||||
this._shortcuts = []; this._contextMenuItems = []; this._customActions = {};
|
||||
if (this._floatingToolbar && this._floatingToolbar.parentNode) this._floatingToolbar.parentNode.removeChild(this._floatingToolbar);
|
||||
|
||||
Reference in New Issue
Block a user