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
10 changes: 7 additions & 3 deletions src/TextArea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ import useControlledState from '@rc-component/util/lib/hooks/useControlledState'
import { clsx } from 'clsx';
import type { ReactNode } from 'react';
import React, { useEffect, useImperativeHandle, useRef } from 'react';
import ResizableTextArea from './ResizableTextArea';
import type {
ChangeEventInfo,
ResizableTextAreaRef,
TextAreaProps,
TextAreaRef,
} from './interface';
import ResizableTextArea from './ResizableTextArea';

const TextArea = React.forwardRef<TextAreaRef, TextAreaProps>(
(
Expand Down Expand Up @@ -105,6 +106,7 @@ const TextArea = React.forwardRef<TextAreaRef, TextAreaProps>(
| React.ChangeEvent<HTMLTextAreaElement>
| React.CompositionEvent<HTMLTextAreaElement>,
currentValue: string,
info: ChangeEventInfo,
) => {
let cutValue = currentValue;

Expand All @@ -124,6 +126,8 @@ const TextArea = React.forwardRef<TextAreaRef, TextAreaProps>(
getTextArea().selectionEnd || 0,
]);
}
} else if (info.source === 'compositionEnd') {
return;
}
setValue(cutValue);

Expand All @@ -142,12 +146,12 @@ const TextArea = React.forwardRef<TextAreaRef, TextAreaProps>(
HTMLTextAreaElement
> = (e) => {
compositionRef.current = false;
triggerChange(e, e.currentTarget.value);
triggerChange(e, e.currentTarget.value, { source: 'compositionEnd' });
onCompositionEnd?.(e);
};

const onInternalChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
triggerChange(e, e.target.value);
triggerChange(e, e.target.value, { source: 'change' });
};

const handleKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
Expand Down
4 changes: 4 additions & 0 deletions src/interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,7 @@ export type TextAreaRef = {
blur: () => void;
nativeElement: HTMLElement;
};

export interface ChangeEventInfo {
source: 'compositionEnd' | 'change';
}