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 @@ -1005,6 +1005,23 @@ class EnrichedTextInputView :
selection?.validateStyles()
}

fun deleteAtSelection() {
val inputConnection = onCreateInputConnection(EditorInfo())

if (inputConnection != null) {
val start = selectionStart.coerceAtLeast(0)
val end = selectionEnd.coerceAtLeast(0)

if (start != end) {
// If we have selection - delete it
inputConnection.commitText("", 1)
} else {
// If we don't have selection - delete previous character
inputConnection.deleteSurroundingText(1, 0)
}
}
}

fun requestHTML(requestId: Int) {
val html =
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,10 @@ class EnrichedTextInputViewManager :
view?.setTextAlignment(alignment)
}

override fun deleteAtSelection(view: EnrichedTextInputView?) {
view?.deleteAtSelection()
}

override fun measure(
context: Context,
localData: ReadableMap?,
Expand Down
23 changes: 23 additions & 0 deletions ios/EnrichedTextInputView.mm
Original file line number Diff line number Diff line change
Expand Up @@ -1296,6 +1296,8 @@ - (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args {
if (!_placeholderLabel.isHidden) {
[self refreshPlaceholderLabelStyles];
}
} else if ([commandName isEqualToString:@"deleteAtSelection"]) {
[self deleteAtSelection];
}
}

Expand Down Expand Up @@ -1335,6 +1337,27 @@ - (void)setValue:(NSString *)value {
[self anyTextMayHaveBeenModified];
}

- (void)deleteAtSelection {
NSRange range = textView.selectedRange;

// Checking if there is anything to delete
if (range.location > 0 || range.length > 0) {
// If we have no selection - we want to manually set range
// to cover the character before the caret
if (range.length == 0) {
range.location -= 1;
range.length = 1;
}

// This imitates delete button on keyboard press
if ([textView.delegate textView:textView
shouldChangeTextInRange:range
replacementText:@""]) {
[textView deleteBackward];
}
}
}

- (void)setCustomSelection:(NSInteger)visibleStart end:(NSInteger)visibleEnd {
NSString *text = textView.textStorage.string;

Expand Down
3 changes: 3 additions & 0 deletions src/native/EnrichedTextInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,9 @@ export const EnrichedTextInput = ({
) => {
Commands.setTextAlignment(nullthrows(nativeRef.current), alignment);
},
deleteAtSelection: () => {
Commands.deleteAtSelection(nullthrows(nativeRef.current));
},
}));

const handleMentionEvent = (e: NativeSyntheticEvent<OnMentionEvent>) => {
Expand Down
2 changes: 2 additions & 0 deletions src/spec/EnrichedTextInputNativeComponent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,7 @@ interface NativeCommands {
viewRef: React.ElementRef<ComponentType>,
alignment: string
) => void;
deleteAtSelection: (viewRef: React.ElementRef<ComponentType>) => void;
}

export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
Expand Down Expand Up @@ -516,6 +517,7 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
'addMention',
'requestHTML',
'setTextAlignment',
'deleteAtSelection',
],
});

Expand Down
6 changes: 6 additions & 0 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,12 @@ export interface EnrichedTextInputInstance extends NativeMethods {
setTextAlignment: (
alignment: 'left' | 'center' | 'right' | 'justify' | 'auto'
) => void;

/**
* Deletes text at current selection. If there is no selection - deletes one character
* backwards.
*/
deleteAtSelection: () => void;
}

export interface ContextMenuItem {
Expand Down
22 changes: 22 additions & 0 deletions src/web/EnrichedTextInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,28 @@ export const EnrichedTextInput = ({
runFocused(editor, (c) => c.setTextAlign(alignment));
}
},
deleteAtSelection: () => {
runFocused(editor, (c) => {
const { from, empty, $from } = editor.state.selection;

// If have selection - we delete it
if (!empty) {
return c.deleteSelection();
}

const isAtBlockStart = $from.parentOffset === 0;

if (isAtBlockStart) {
// If caret is in the beginning of the line - we join two lines together
return c.joinBackward();
} else if (from > 1) {
// If caret is not in the beginning of the line - we delete previous character
return c.deleteRange({ from: from - 1, to: from });
}

return c.focus();
});
},
}),
[editor, mentionIndicatorsRef, useHtmlNormalizerRef]
);
Expand Down
Loading