Skip to content

Commit

Permalink
Добавлено свойство autoload
Browse files Browse the repository at this point in the history
  • Loading branch information
Vitaly Baev committed Aug 23, 2017
1 parent 9c7f7e8 commit a0bc64e
Show file tree
Hide file tree
Showing 5 changed files with 83 additions and 16 deletions.
10 changes: 9 additions & 1 deletion dist/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export declare namespace ReactDadata {
token: string;
placeholder?: string;
query?: string;
autoload?: boolean;
onChange?: (suggestion: DadataSuggestion) => void;
}
interface State {
Expand All @@ -28,17 +29,24 @@ export declare namespace ReactDadata {
}
}
export declare class ReactDadata extends React.Component<ReactDadata.Props, ReactDadata.State> {
/**
* HTML-input
*/
protected textInput: HTMLInputElement;
/**
* XMLHttpRequest instance
*/
protected xhr: XMLHttpRequest;
constructor(props: ReactDadata.Props);
componentDidMount(): void;
onInputFocus: () => void;
onInputBlur: () => void;
onInputChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
onKeyPress: (event: React.KeyboardEvent<HTMLInputElement>) => void;
fetchSuggestions: () => void;
onSuggestionClick: (index: number, event: React.MouseEvent<HTMLDivElement>) => void;
selectSuggestion: (index: number) => void;
setCursorToEnd: (ele: any) => void;
setCursorToEnd: (element: any) => void;
getHighlightWords: () => string[];
render(): JSX.Element;
}
18 changes: 12 additions & 6 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@ var ReactDadata = (function (_super) {
}
}
};
_this.setCursorToEnd = function (ele) {
var valueLength = ele.value.length;
if (ele.selectionStart || ele.selectionStart == '0') {
_this.setCursorToEnd = function (element) {
var valueLength = element.value.length;
if (element.selectionStart || element.selectionStart == '0') {
// Firefox/Chrome
ele.selectionStart = valueLength;
ele.selectionEnd = valueLength;
ele.focus();
element.selectionStart = valueLength;
element.selectionEnd = valueLength;
element.focus();
}
};
_this.getHighlightWords = function () {
Expand All @@ -127,6 +127,12 @@ var ReactDadata = (function (_super) {
};
return _this;
}
ReactDadata.prototype.componentDidMount = function () {
if (this.props.autoload && this.state.query) {
this.fetchSuggestions();
}
};
;
ReactDadata.prototype.render = function () {
var _this = this;
return (React.createElement("div", { className: "react-dadata react-dadata__container" },
Expand Down
2 changes: 1 addition & 1 deletion license
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License

Copyright (c) 2016 Vitaly Baev. vitalybaev.ru
Copyright (c) 2016 Vitaly Baev <[email protected]>, vitalybaev.ru

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
44 changes: 42 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,51 @@
# React Dadata
React компонент для подсказок адресов с помощью сервиса DaData.ru

## Пример
### Пример
```javascript
import ReactDadata from 'react-dadata';

// ...

<ReactDadata token="API_KEY" query="Москва" placeholder="" />
```
```

### Свойства

| Свойство | Обязательный | Тип | Описание |
| ------------- | ------------- | ------------- | ------------- |
| token | Да | string | Авторизационный токен DaData.ru |
| placeholder | Нет | string | Текст placeholder |
| query | Нет | string | Начальное значение поля ввода |
| autoload | Нет | boolean | Если `true`, то запрос на получение подсказок будет инициирован в фоне сразу, после монтирования компонента |
| onChange | Нет | function(suggestion: ReactDadata.DadataSuggestion) | Функция, вызываемая при выборе подсказки |

### Лицензия

```
The MIT License
Copyright (c) 2016 Vitaly Baev <[email protected]>, vitalybaev.ru
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
```

### TODO
* Тесты
* Доработка функционала
25 changes: 19 additions & 6 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export namespace ReactDadata {
token: string
placeholder?: string
query?: string
autoload?: boolean
onChange?: (suggestion: DadataSuggestion) => void
}

Expand All @@ -34,8 +35,14 @@ export namespace ReactDadata {

export class ReactDadata extends React.Component<ReactDadata.Props, ReactDadata.State> {

/**
* HTML-input
*/
protected textInput: HTMLInputElement;

/**
* XMLHttpRequest instance
*/
protected xhr: XMLHttpRequest;

constructor(props: ReactDadata.Props) {
Expand All @@ -51,6 +58,12 @@ export class ReactDadata extends React.Component<ReactDadata.Props, ReactDadata.
}
}

componentDidMount() {
if (this.props.autoload && this.state.query) {
this.fetchSuggestions();
}
};

onInputFocus = () => {
this.setState({inputFocused: true});
if (this.state.suggestions.length == 0) {
Expand Down Expand Up @@ -142,13 +155,13 @@ export class ReactDadata extends React.Component<ReactDadata.Props, ReactDadata.
}
};

setCursorToEnd = (ele) => {
const valueLength = ele.value.length;
if (ele.selectionStart || ele.selectionStart == '0') {
setCursorToEnd = (element) => {
const valueLength = element.value.length;
if (element.selectionStart || element.selectionStart == '0') {
// Firefox/Chrome
ele.selectionStart = valueLength;
ele.selectionEnd = valueLength;
ele.focus();
element.selectionStart = valueLength;
element.selectionEnd = valueLength;
element.focus();
}
};

Expand Down

0 comments on commit a0bc64e

Please sign in to comment.