Skip to content

fix: correctly handle empty textareas #170

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 9, 2019
Merged

fix: correctly handle empty textareas #170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 17 additions & 7 deletions src/Textarea.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* eslint react/no-multi-comp: 0 */

import React from "react";
import ReactDOM from 'react-dom'
import ReactDOM from "react-dom";
import PropTypes from "prop-types";
import getCaretCoordinates from "textarea-caret";
import CustomEvent from "custom-event";
Expand Down Expand Up @@ -151,7 +151,7 @@ class Autocomplete extends React.Component<AutocompleteProps> {
unusedClasses.push(POSITION_CONFIGURATION.Y.TOP);
}

if(this.props.renderToBody) {
if (this.props.renderToBody) {
topPosition += textareaBounds.top;
leftPosition += textareaBounds.left;
}
Expand Down Expand Up @@ -181,7 +181,9 @@ class Autocomplete extends React.Component<AutocompleteProps> {
</div>
);

return renderToBody && body !== null ? ReactDOM.createPortal(autocompleteContainer, body) : autocompleteContainer;
return renderToBody && body !== null
? ReactDOM.createPortal(autocompleteContainer, body)
: autocompleteContainer;
}
}

Expand Down Expand Up @@ -327,27 +329,33 @@ class ReactTextareaAutocomplete extends React.Component<
};

_handleCaretChange = (e: Event) => {
const cleanLastTrigger = () => {
const beforeHandle = this.getCaretPosition() - 1;

this.lastTrigger = this.lastTrigger ? beforeHandle : 0;
};

if (e.type === "keydown") {
// $FlowFixMe
const code = e.keyCode || e.which;
switch (code) {
case KEY_CODES.UP:
case KEY_CODES.DOWN:
if (!this._isAutocompleteOpen()) {
this.lastTrigger = this.getCaretPosition() - 1;
cleanLastTrigger();
}
break;
case KEY_CODES.LEFT:
case KEY_CODES.RIGHT:
this.lastTrigger = this.getCaretPosition() - 1;
cleanLastTrigger();
break;
default:
}

return;
}

this.lastTrigger = this.getCaretPosition() - 1;
cleanLastTrigger();
};

_onSelect = (newToken: textToReplaceType) => {
Expand Down Expand Up @@ -422,7 +430,9 @@ class ReactTextareaAutocomplete extends React.Component<
? insertedTrigger[0].length
: 1;

this.lastTrigger = newCaretPosition - insertedTriggerModifier;
this.lastTrigger = newCaretPosition
? newCaretPosition - insertedTriggerModifier
: newCaretPosition;
this.textareaRef.value = newValue;
this.textareaRef.selectionEnd = newCaretPosition;
this._changeHandler();
Expand Down