Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Plugin, PluginKey } from 'prosemirror-state';
import { Plugin, PluginKey, Selection, TextSelection } from 'prosemirror-state';
import { __endComposition } from 'prosemirror-view';
import { Extension } from '../Extension.js';

Expand All @@ -22,7 +22,14 @@ const appendStoryInputDebugLog = (entry) => {

const isStorySurfaceEditor = (editor) => {
const documentId = editor?.options?.documentId ?? '';
return documentId.startsWith('hf:') || documentId.startsWith('fn:') || documentId.startsWith('en:');
return (
documentId.startsWith('hf:') ||
documentId.startsWith('fn:') ||
documentId.startsWith('en:') ||
editor?.options?.isHeaderOrFooter === true ||
editor?.options?.headerFooterType === 'header' ||
editor?.options?.headerFooterType === 'footer'
);
};

const recordStoryInputDebug = (view, event, editor, phase, extra = {}) => {
Expand Down Expand Up @@ -78,6 +85,12 @@ const handleInsertTextBeforeInput = (view, event, editor) => {
}

const tr = view.state.tr.insertText(event.data, selection.from, selection.to);
const insertedTo = Math.max(0, Math.min(selection.from + event.data.length, tr.doc.content.size));
try {
tr.setSelection(TextSelection.create(tr.doc, insertedTo));
} catch {
tr.setSelection(Selection.near(tr.doc.resolve(insertedTo), 1));
}
tr.setMeta('inputType', 'insertText');
view.dispatch(tr);
event.preventDefault();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,33 @@ describe('Editable extension insertText beforeinput handling', () => {
expect(prevented).toBe(false);
expect(editor.state.doc.textContent).toBe('QA');
});

it('intercepts collapsed beforeinput insertText for active footer editors', () => {
({ editor } = initTestEditor({
mode: 'text',
content: '<p>QA</p>',
documentId: 'rId10',
isHeaderOrFooter: true,
headerFooterType: 'footer',
}));

const range = findTextRange(editor.state.doc, 'QA');
expect(range).not.toBeNull();

const cursor = TextSelection.create(editor.state.doc, range.to, range.to);
editor.view.dispatch(editor.state.tr.setSelection(cursor));

const beforeInputEvent = new InputEvent('beforeinput', {
data: '!',
inputType: 'insertText',
bubbles: true,
cancelable: true,
});
const prevented = !editor.view.dom.dispatchEvent(beforeInputEvent);

expect(prevented).toBe(true);
expect(editor.state.doc.textContent).toBe('QA!');
});
});

describe('Editable extension – allowSelectionInViewMode', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2733,6 +2733,10 @@ export class EditorInputManager {
// actual activeElement decides where keyboard input goes, so only skip the
// focus handoff when the browser is already focused inside this editor.
if (activeIsEditor) {
// Hidden story editors still need ProseMirror to replay the current PM
// selection into the off-screen DOM after pointer-driven selection
// updates on the rendered surface.
this.#focusEditorView(view);
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,60 @@ describe('EditorInputManager - Footnote click selection behavior', () => {
expect(activeHeaderEditor.view.focus).toHaveBeenCalled();
});

it('replays active header editor focus when native focus is already inside the hidden editor', () => {
const activeHeaderEditor = createActiveSessionEditor();
const pageContainer = document.createElement('div');
pageContainer.className = 'superdoc-page';
viewportHost.appendChild(pageContainer);

activeHeaderEditor.view.dom.tabIndex = -1;
document.body.appendChild(activeHeaderEditor.view.dom);
activeHeaderEditor.view.dom.focus();

(mockDeps.getActiveEditor as Mock).mockReturnValue(activeHeaderEditor);
(mockDeps.getHeaderFooterSession as Mock).mockReturnValue({
session: { mode: 'header' },
});
mockCallbacks.hitTest = vi.fn(() => ({
pos: 18,
layoutEpoch: 3,
pageIndex: 0,
blockId: 'header-1',
column: 0,
lineIndex: -1,
}));
mockCallbacks.hitTestHeaderFooterRegion = vi.fn(() => ({
kind: 'header',
pageIndex: 0,
pageNumber: 1,
sectionType: 'default',
localX: 0,
localY: 0,
width: 200,
height: 40,
}));
stubElementsFromPoint([pageContainer]);

expect(document.activeElement).toBe(activeHeaderEditor.view.dom);

const target = document.createElement('span');
viewportHost.appendChild(target);

const PointerEventImpl = getPointerEventImpl();
target.dispatchEvent(
new PointerEventImpl('pointerdown', {
bubbles: true,
cancelable: true,
button: 0,
buttons: 1,
clientX: 24,
clientY: 12,
} as PointerEventInit),
);

expect(activeHeaderEditor.view.focus).toHaveBeenCalled();
});

it('keeps active header editing when the pointer stack only exposes the page container', () => {
const activeHeaderEditor = createActiveSessionEditor();
const exitHeaderFooterMode = vi.fn();
Expand Down
Loading
Loading