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.

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

keyUp/keyDown event dispatch and textarea style support #4

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ React.render(<Demo />, container);
| onChange | Trigger when value changed |(text: string) => void | - |
| onSelect | Trigger when user select the option | (option: OptionProps, prefix: string) => void | - |
| onSearch | Trigger when prefix hit | (text: string, prefix: string) => void | - |
| onKeyDown | Trigger when textarea keyDown before measuring detect | (event: React.KeyboardEvent<HTMLTextAreaElement>, payload?: { measuring: boolean }) => void; | - |
| onKeyUp | Trigger when textarea keyUp before measuring detect | (event: React.KeyboardEvent<HTMLTextAreaElement>, payload?: { measuring: boolean }) => void; | - |
| onFocus | Trigger when mentions get focus | React.FocusEventHandler<HTMLTextAreaElement> | - |
| onBlur | Trigger when mentions lose focus | React.FocusEventHandler<HTMLTextAreaElement> | - |

Expand Down
22 changes: 21 additions & 1 deletion src/Mentions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ type BaseTextareaAttrs = Omit<

export type Placement = 'top' | 'bottom';

export interface MentionKeyBoardEventPayload {
measuring: MentionsState['measuring'];
Copy link
Member

Choose a reason for hiding this comment

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

boolean

}

export type MentionKeyBoardEventHandler = (
event: React.KeyboardEvent<HTMLTextAreaElement>,
payload?: MentionKeyBoardEventPayload,
Copy link
Member

Choose a reason for hiding this comment

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

payload? => payload

Copy link
Author

Choose a reason for hiding this comment

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

image
此处不为可选的话过不了类型验证

Copy link
Member

Choose a reason for hiding this comment

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

Omit 掉再自定义就行了。

) => void;

export interface MentionsProps extends BaseTextareaAttrs {
autoFocus?: boolean;
className?: string;
Expand All @@ -41,6 +50,8 @@ export interface MentionsProps extends BaseTextareaAttrs {
onChange?: (text: string) => void;
onSelect?: (option: OptionProps, prefix: string) => void;
onSearch?: (text: string, prefix: string) => void;
onKeyDown?: MentionKeyBoardEventHandler;
onKeyUp?: MentionKeyBoardEventHandler;
onFocus?: React.FocusEventHandler<HTMLTextAreaElement>;
onBlur?: React.FocusEventHandler<HTMLTextAreaElement>;
}
Expand Down Expand Up @@ -121,6 +132,11 @@ class Mentions extends React.Component<MentionsProps, MentionsState> {
public onKeyDown: React.KeyboardEventHandler<HTMLTextAreaElement> = event => {
const { which } = event;
const { activeIndex, measuring } = this.state;
const { onKeyDown } = this.props;

if (onKeyDown) {
onKeyDown(event, { measuring });
}
zombieJ marked this conversation as resolved.
Show resolved Hide resolved

// Skip if not measuring
if (!measuring) {
Expand Down Expand Up @@ -162,14 +178,18 @@ class Mentions extends React.Component<MentionsProps, MentionsState> {
public onKeyUp: React.KeyboardEventHandler<HTMLTextAreaElement> = event => {
const { key, which } = event;
const { measureText: prevMeasureText, measuring } = this.state;
const { prefix = '', onSearch, validateSearch } = this.props;
const { prefix = '', onSearch, validateSearch, onKeyUp } = this.props;
const target = event.target as HTMLTextAreaElement;
const selectionStartText = getBeforeSelectionText(target);
const { location: measureIndex, prefix: measurePrefix } = getLastMeasureIndex(
selectionStartText,
prefix,
);

if (onKeyUp) {
onKeyUp(event, { measuring });
}

// Skip if match the white key list
if ([KeyCode.ESC, KeyCode.UP, KeyCode.DOWN, KeyCode.ENTER].indexOf(which) !== -1) {
return;
Expand Down