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

Allow LexicalTypeaheadMenuPlugin to work when inside an iframe #5044

Merged
merged 3 commits into from
Sep 28, 2023
Merged

Allow LexicalTypeaheadMenuPlugin to work when inside an iframe #5044

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd778fe
allow LexicalTypeaheadMenuPlugin to work inside an iframe
lestertay Sep 25, 2023
30dfea8
Update packages/lexical-react/src/LexicalTypeaheadMenuPlugin.tsx
lestertay Sep 27, 2023
86724fd
Update LexicalTypeaheadMenuPlugin.tsx
lestertay Sep 27, 2023
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
9 changes: 5 additions & 4 deletions packages/lexical-react/src/LexicalTypeaheadMenuPlugin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ function getTextUpToAnchor(selection: RangeSelection): string | null {
return anchorNode.getTextContent().slice(0, anchorOffset);
}

function tryToPositionRange(leadOffset: number, range: Range): boolean {
const domSelection = window.getSelection();
function tryToPositionRange(leadOffset: number, range: Range, _window: Window): boolean {
const domSelection = _window.getSelection();
if (domSelection === null || !domSelection.isCollapsed) {
return false;
}
Expand Down Expand Up @@ -236,7 +236,8 @@ export function LexicalTypeaheadMenuPlugin<TOption extends MenuOption>({
useEffect(() => {
const updateListener = () => {
editor.getEditorState().read(() => {
const range = document.createRange();
const _window = editor._window ?? window;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lestertay @fantactuka - I wonder if editor._window should always be set to avoid the fallback to the ?? window in getDefaultView that powers this setter https://github.com/facebookexternal/Outline//blob/02f01f160e8894f133e076ab5e38e7a3fd6a5f7a/packages/lexical/src/LexicalEditor.ts#L961-L967

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fantactuka i think that'll be useful and a sensible fallback. I'll be happy to make another PR to enable this since i've seen quite a few places within Lexical using editor._window.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, that was an idea for a follow up 👍

const range = _window.document.createRange();
const selection = $getSelection();
const text = getQueryTextForSearch(editor);

Expand All @@ -257,7 +258,7 @@ export function LexicalTypeaheadMenuPlugin<TOption extends MenuOption>({
match !== null &&
!isSelectionOnEntityBoundary(editor, match.leadOffset)
) {
const isRangePositioned = tryToPositionRange(match.leadOffset, range);
const isRangePositioned = tryToPositionRange(match.leadOffset, range, _window);
if (isRangePositioned !== null) {
startTransition(() =>
openTypeahead({
Expand Down