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
1 change: 1 addition & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ module.name_mapper='^@lexical/react/LexicalCollaborationPlugin$' -> '<PROJECT_RO
module.name_mapper='^@lexical/react/LexicalComposer$' -> '<PROJECT_ROOT>/packages/lexical-react/flow/LexicalComposer.js.flow'
module.name_mapper='^@lexical/react/LexicalComposerContext$' -> '<PROJECT_ROOT>/packages/lexical-react/flow/LexicalComposerContext.js.flow'
module.name_mapper='^@lexical/react/LexicalContentEditable$' -> '<PROJECT_ROOT>/packages/lexical-react/flow/LexicalContentEditable.js.flow'
module.name_mapper='^@lexical/react/LexicalContextMenuPlugin$' -> '<PROJECT_ROOT>/packages/lexical-react/flow/LexicalContextMenuPlugin.js.flow'
module.name_mapper='^@lexical/react/LexicalDecoratorBlockNode$' -> '<PROJECT_ROOT>/packages/lexical-react/flow/LexicalDecoratorBlockNode.js.flow'
module.name_mapper='^@lexical/react/LexicalDraggableBlockPlugin$' -> '<PROJECT_ROOT>/packages/lexical-react/flow/LexicalDraggableBlockPlugin.js.flow'
module.name_mapper='^@lexical/react/LexicalEditorRefPlugin$' -> '<PROJECT_ROOT>/packages/lexical-react/flow/LexicalEditorRefPlugin.js.flow'
Expand Down
3 changes: 3 additions & 0 deletions packages/lexical-devtools/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@
"@lexical/react/LexicalContentEditable": [
"../lexical-react/src/LexicalContentEditable.tsx"
],
"@lexical/react/LexicalContextMenuPlugin": [
"../lexical-react/src/LexicalContextMenuPlugin.tsx"
],
"@lexical/react/LexicalDecoratorBlockNode": [
"../lexical-react/src/LexicalDecoratorBlockNode.ts"
],
Expand Down
12 changes: 12 additions & 0 deletions packages/lexical-playground/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,22 @@ pre::-webkit-scrollbar-thumb {
background-position: center;
}

.component-picker-menu {
width: 200px;
}

.mentions-menu {
width: 250px;
}

.auto-embed-menu {
width: 150px;
}

.emoji-menu {
width: 200px;
}

i.palette {
background-image: url(images/icons/palette.svg);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import {
} from '@lexical/react/LexicalAutoEmbedPlugin';
import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
import {useMemo, useState} from 'react';
import * as React from 'react';
import * as ReactDOM from 'react-dom';

import useModal from '../../hooks/useModal';
import Button from '../../ui/Button';
Expand Down Expand Up @@ -153,6 +155,68 @@ export const EmbedConfigs = [
FigmaEmbedConfig,
];

function AutoEmbedMenuItem({
index,
isSelected,
onClick,
onMouseEnter,
option,
}: {
index: number;
isSelected: boolean;
onClick: () => void;
onMouseEnter: () => void;
option: AutoEmbedOption;
}) {
let className = 'item';
if (isSelected) {
className += ' selected';
}
return (
<li
key={option.key}
tabIndex={-1}
className={className}
ref={option.setRefElement}
role="option"
aria-selected={isSelected}
id={'typeahead-item-' + index}
onMouseEnter={onMouseEnter}
onClick={onClick}>
<span className="text">{option.title}</span>
</li>
);
}

function AutoEmbedMenu({
options,
selectedItemIndex,
onOptionClick,
onOptionMouseEnter,
}: {
selectedItemIndex: number | null;
onOptionClick: (option: AutoEmbedOption, index: number) => void;
onOptionMouseEnter: (index: number) => void;
options: Array<AutoEmbedOption>;
}) {
return (
<div className="typeahead-popover">
<ul>
{options.map((option: AutoEmbedOption, i: number) => (
<AutoEmbedMenuItem
index={i}
isSelected={selectedItemIndex === i}
onClick={() => onOptionClick(option, i)}
onMouseEnter={() => onOptionMouseEnter(i)}
key={option.key}
option={option}
/>
))}
</ul>
</div>
);
}

const debounce = (callback: (text: string) => void, delay: number) => {
let timeoutId: number;
return (text: string) => {
Expand Down Expand Up @@ -257,6 +321,37 @@ export default function AutoEmbedPlugin(): JSX.Element {
embedConfigs={EmbedConfigs}
onOpenEmbedModalForConfig={openEmbedModal}
getMenuOptions={getMenuOptions}
menuRenderFn={(
anchorElementRef,
{selectedIndex, options, selectOptionAndCleanUp, setHighlightedIndex},
) =>
anchorElementRef.current
? ReactDOM.createPortal(
<div
className="typeahead-popover auto-embed-menu"
style={{
marginLeft: `${Math.max(
parseFloat(anchorElementRef.current.style.width) - 200,
0,
)}px`,
width: 200,
}}>
<AutoEmbedMenu
options={options}
selectedItemIndex={selectedIndex}
onOptionClick={(option: AutoEmbedOption, index: number) => {
setHighlightedIndex(index);
selectOptionAndCleanUp(option);
}}
onOptionMouseEnter={(index: number) => {
setHighlightedIndex(index);
}}
/>
</div>,
anchorElementRef.current,
)
: null
}
/>
</>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import {
TextNode,
} from 'lexical';
import {useCallback, useMemo, useState} from 'react';
import * as ReactDOM from 'react-dom';

import useModal from '../../hooks/useModal';
import catTypingGif from '../../images/cat-typing.gif';
Expand Down Expand Up @@ -78,6 +79,40 @@ class ComponentPickerOption extends MenuOption {
}
}

function ComponentPickerMenuItem({
index,
isSelected,
onClick,
onMouseEnter,
option,
}: {
index: number;
isSelected: boolean;
onClick: () => void;
onMouseEnter: () => void;
option: ComponentPickerOption;
}) {
let className = 'item';
if (isSelected) {
className += ' selected';
}
return (
<li
key={option.key}
tabIndex={-1}
className={className}
ref={option.setRefElement}
role="option"
aria-selected={isSelected}
id={'typeahead-item-' + index}
onMouseEnter={onMouseEnter}
onClick={onClick}>
{option.icon}
<span className="text">{option.title}</span>
</li>
);
}

function getDynamicOptions(editor: LexicalEditor, queryString: string) {
const options: Array<ComponentPickerOption> = [];

Expand Down Expand Up @@ -371,6 +406,35 @@ export default function ComponentPickerMenuPlugin(): JSX.Element {
onSelectOption={onSelectOption}
triggerFn={checkForTriggerMatch}
options={options}
menuRenderFn={(
anchorElementRef,
{selectedIndex, selectOptionAndCleanUp, setHighlightedIndex},
) =>
anchorElementRef.current && options.length
? ReactDOM.createPortal(
<div className="typeahead-popover component-picker-menu">
<ul>
{options.map((option, i: number) => (
<ComponentPickerMenuItem
index={i}
isSelected={selectedIndex === i}
onClick={() => {
setHighlightedIndex(i);
selectOptionAndCleanUp(option);
}}
onMouseEnter={() => {
setHighlightedIndex(i);
}}
key={option.key}
option={option}
/>
))}
</ul>
</div>,
anchorElementRef.current,
)
: null
}
/>
</>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ import {
$isRangeSelection,
TextNode,
} from 'lexical';
import * as React from 'react';
import {useCallback, useEffect, useMemo, useState} from 'react';
import * as ReactDOM from 'react-dom';

class EmojiOption extends MenuOption {
title: string;
Expand All @@ -38,6 +40,40 @@ class EmojiOption extends MenuOption {
this.keywords = options.keywords || [];
}
}
function EmojiMenuItem({
index,
isSelected,
onClick,
onMouseEnter,
option,
}: {
index: number;
isSelected: boolean;
onClick: () => void;
onMouseEnter: () => void;
option: EmojiOption;
}) {
let className = 'item';
if (isSelected) {
className += ' selected';
}
return (
<li
key={option.key}
tabIndex={-1}
className={className}
ref={option.setRefElement}
role="option"
aria-selected={isSelected}
id={'typeahead-item-' + index}
onMouseEnter={onMouseEnter}
onClick={onClick}>
<span className="text">
{option.emoji} {option.title}
</span>
</li>
);
}

type Emoji = {
emoji: string;
Expand Down Expand Up @@ -66,7 +102,7 @@ export default function EmojiPickerPlugin() {
emojis != null
? emojis.map(
({emoji, aliases, tags}) =>
new EmojiOption(`${emoji} ${aliases[0]}`, emoji, {
new EmojiOption(aliases[0], emoji, {
keywords: [...aliases, ...tags],
}),
)
Expand Down Expand Up @@ -125,6 +161,39 @@ export default function EmojiPickerPlugin() {
onSelectOption={onSelectOption}
triggerFn={checkForTriggerMatch}
options={options}
menuRenderFn={(
anchorElementRef,
{selectedIndex, selectOptionAndCleanUp, setHighlightedIndex},
) => {
if (anchorElementRef.current == null || options.length === 0) {
return null;
}

return anchorElementRef.current && options.length
? ReactDOM.createPortal(
<div className="typeahead-popover emoji-menu">
<ul>
{options.map((option: EmojiOption, index) => (
<EmojiMenuItem
key={option.key}
index={index}
isSelected={selectedIndex === index}
onClick={() => {
setHighlightedIndex(index);
selectOptionAndCleanUp(option);
}}
onMouseEnter={() => {
setHighlightedIndex(index);
}}
option={option}
/>
))}
</ul>
</div>,
anchorElementRef.current,
)
: null;
}}
/>
);
}
Loading
Loading