Skip to content
Open
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
Expand Up @@ -57,6 +57,7 @@ export function GridSuggestionMenuWrapper<Item>(props: {
items,
columns,
onItemClickCloseMenu,
items.length > 0
);

// set basic aria attributes when the menu is open
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,18 @@ export function useGridSuggestionMenuKeyboardNavigation<Item>(
items: Item[],
columns: number,
onItemClick?: (item: Item) => void,
isMenuVisible?: boolean,
) {
const [selectedIndex, setSelectedIndex] = useState<number>(0);

const isGrid = columns !== undefined && columns > 1;

useEffect(() => {
const handleMenuNavigationKeys = (event: KeyboardEvent) => {
if (isMenuVisible === false) {
return false;
}

if (event.key === "ArrowLeft") {
event.preventDefault();
if (items.length) {
Expand Down Expand Up @@ -53,12 +58,24 @@ export function useGridSuggestionMenuKeyboardNavigation<Item>(
}

if (event.key === "Enter" && !event.isComposing) {

if (!items.length || selectedIndex < 0 || selectedIndex >= items.length) {
return false;
}

const suggestionMenuElement = document.querySelector('#bn-grid-suggestion-menu, .bn-grid-suggestion-menu');
const isMenuInDOM = !!suggestionMenuElement;

if (!isMenuVisible || !isMenuInDOM) {
return false;
}

event.stopPropagation();
event.preventDefault();

if (items.length) {
onItemClick?.(items[selectedIndex]);
}
if (onItemClick) {
onItemClick(items[selectedIndex]);
}

return true;
}
Expand All @@ -79,7 +96,7 @@ export function useGridSuggestionMenuKeyboardNavigation<Item>(
true,
);
};
}, [editor.domElement, items, selectedIndex, onItemClick, columns, isGrid]);
}, [editor.domElement, items, selectedIndex, onItemClick, columns, isGrid, isMenuVisible]);

// Resets index when items change
useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export function SuggestionMenuWrapper<Item>(props: {
query,
items,
onItemClickCloseMenu,
items.length > 0
);

// set basic aria attributes when the menu is open
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,19 @@ import React, { useState } from "react";
// & down arrow keys are used to select an item, enter is used to execute it.
export function useSuggestionMenuKeyboardHandler<Item>(
items: Item[],
onItemClick?: (item: Item) => void
onItemClick?: (item: Item) => void,
isMenuVisible?: boolean | undefined
) {
const [selectedIndex, setSelectedIndex] = useState<number>(0);

return {
selectedIndex,
setSelectedIndex,
handler: (event: KeyboardEvent | React.KeyboardEvent) => {
if (isMenuVisible === false) {
return false;
}

if (event.key === "ArrowUp") {
event.preventDefault();

Expand All @@ -37,12 +42,24 @@ export function useSuggestionMenuKeyboardHandler<Item>(
? event.nativeEvent.isComposing
: event.isComposing;
if (event.key === "Enter" && !isComposing) {

if (!items.length || selectedIndex < 0 || selectedIndex >= items.length) {
return false;
}

const suggestionMenuElement = document.querySelector('#bn-suggestion-menu, .bn-suggestion-menu, #ai-suggestion-menu');
const isMenuInDOM = !!suggestionMenuElement;

if (!isMenuVisible || !isMenuInDOM) {
return false;
}

event.preventDefault();
event.stopPropagation();

if (items.length) {
onItemClick?.(items[selectedIndex]);
}
if (onItemClick) {
onItemClick(items[selectedIndex]);
}

return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ export function useSuggestionMenuKeyboardNavigation<Item>(
query: string,
items: Item[],
onItemClick?: (item: Item) => void,
element?: HTMLElement,
isMenuVisible?: boolean,
) {
const { selectedIndex, setSelectedIndex, handler } =
useSuggestionMenuKeyboardHandler(items, onItemClick);
useSuggestionMenuKeyboardHandler(items, onItemClick, isMenuVisible);

useEffect(() => {
(element || editor.domElement)?.addEventListener("keydown", handler, true);
editor.domElement?.addEventListener("keydown", handler, true);

return () => {
(element || editor.domElement)?.removeEventListener(
editor.domElement?.removeEventListener(
"keydown",
handler,
true,
);
};
}, [editor.domElement, items, selectedIndex, onItemClick, element, handler]);
}, [editor.domElement, items, selectedIndex, onItemClick, handler]);

// Resets index when items change
useEffect(() => {
Expand Down