Skip to content

fix(autocomplete): fixed minChar with afterWhitespace behavior #144

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
Mar 10, 2019
Merged

fix(autocomplete): fixed minChar with afterWhitespace behavior #144

Show file tree
Hide file tree
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
41 changes: 40 additions & 1 deletion cypress/integration/textarea.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ describe("React Textarea Autocomplete", () => {
context("basic", () => {
beforeEach(() => {
cy.get(".rta__textarea").clear({ force: true });
cy.get('[data-test="minChar"]').clear({ force: true })
});

it("basic test with keyboard", () => {
Expand Down Expand Up @@ -114,6 +115,7 @@ describe("React Textarea Autocomplete", () => {
context("advanced", () => {
beforeEach(() => {
cy.get(".rta__textarea").clear({ force: true });
cy.get('[data-test="minChar"]').clear({ force: true })
});

it("should have place caret before outputted word", () => {
Expand Down Expand Up @@ -233,8 +235,45 @@ describe("React Textarea Autocomplete", () => {
it("show autocomplete only after whitespace", () => {
cy.get(".rta__textarea").type("This is test;");
cy.get(".rta__autocomplete").should("not.be.visible");
cy.get(".rta__textarea").type(" ;");
cy.get(".rta__textarea").clear({ force: true });

cy.get(".rta__textarea").type("This is test;a");
cy.get(".rta__autocomplete").should("not.be.visible");
cy.get(".rta__textarea").clear({ force: true });

cy.get(".rta__textarea").type(";");
cy.get(".rta__autocomplete").should("be.visible");
cy.get(".rta__textarea").clear({ force: true });

cy.get(".rta__textarea").type("something ;");
cy.get(".rta__autocomplete").should("be.visible");
cy.get(".rta__textarea").clear({ force: true });

cy.get(".rta__textarea").type("something ;somethingmore");
cy.get(".rta__autocomplete").should("be.visible");
cy.get(".rta__textarea").clear({ force: true });

cy.get('[data-test="minChar"]').type("{uparrow}");

cy.get(".rta__textarea").type("This is test;");
cy.get(".rta__autocomplete").should("not.be.visible");
cy.get(".rta__textarea").clear({ force: true });

cy.get(".rta__textarea").type("This is test;a");
cy.get(".rta__autocomplete").should("not.be.visible");
cy.get(".rta__textarea").clear({ force: true });

cy.get(".rta__textarea").type(";a");
cy.get(".rta__autocomplete").should("be.visible");
cy.get(".rta__textarea").clear({ force: true });

cy.get(".rta__textarea").type("something ;a");
cy.get(".rta__autocomplete").should("be.visible");
cy.get(".rta__textarea").clear({ force: true });

cy.get(".rta__textarea").type("something ;somethingmore");
cy.get(".rta__autocomplete").should("be.visible");
cy.get(".rta__textarea").clear({ force: true });
});

it("test multi-character triggers and its possible combo", () => {
Expand Down
23 changes: 21 additions & 2 deletions example/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class App extends React.Component {
caretPosition: 0,
movePopupAsYouType: false,
text: "",
minChar: 0,
optionsCaret: "start",
actualTokenInProvider: "",
showSecondTextarea: false
Expand Down Expand Up @@ -81,6 +82,12 @@ class App extends React.Component {
});
};

_handleMinChar = ({ target: { value } }) => {
this.setState({
minChar: +value
});
};

_setCaretPosition = () => {
this.rtaRef.setCaretPosition(1);
};
Expand Down Expand Up @@ -122,7 +129,8 @@ class App extends React.Component {
movePopupAsYouType,
actualTokenInProvider,
showSecondTextarea,
text
text,
minChar
} = this.state;

return (
Expand Down Expand Up @@ -180,6 +188,17 @@ class App extends React.Component {
Move popup as you type
</label>
</div>
<div>
<label>
<input
data-test="minChar"
type="number"
value={minChar}
onChange={this._handleMinChar}
/>
Minimal characters typed to trigger autocomplete
</label>
</div>
<div>
Actual caret position:{" "}
<span data-test="actualCaretPosition">{caretPosition}</span>
Expand Down Expand Up @@ -233,7 +252,7 @@ class App extends React.Component {
}}
movePopupAsYouType={movePopupAsYouType}
onCaretPositionChange={this._onCaretPositionChangeHandle}
minChar={0}
minChar={minChar}
value={text}
onChange={this._onChangeHandle}
trigger={{
Expand Down
5 changes: 4 additions & 1 deletion src/Textarea.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,11 +752,14 @@ class ReactTextareaAutocomplete extends React.Component<
* from currentTrigger not this.state.currentTrigger
*
* Check if the currently typed token has to be afterWhitespace, or not.
*
* This setting means that there has to be whitespace before the token (on it has to be the the first character typed into textarea)
*/
if (
currentTrigger &&
trigger[currentTrigger].afterWhitespace &&
value[selectionEnd - 2] !== " "
(value[selectionEnd - lastToken.length - 1] !== " " &&
value[selectionEnd - lastToken.length - 1] !== undefined)
) {
this._closeAutocomplete();
return;
Expand Down
2 changes: 1 addition & 1 deletion src/types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export type TextareaProps = {
closeOnClickOutside?: boolean,
movePopupAsYouType?: boolean,
boundariesElement: string | HTMLElement,
minChar: ?number,
minChar: number,
value?: string,
style: ?Object,
listStyle: ?Object,
Expand Down