-
Notifications
You must be signed in to change notification settings - Fork 611
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '25_1' of https://github.com/DevExpress/DevExtreme into …
…fix-bug-T1269950(1)
- Loading branch information
Showing
15 changed files
with
383 additions
and
202 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
apps/demos/Demos/DataGrid/ToolbarCustomization/React/description.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
apps/demos/Demos/DataGrid/ToolbarCustomization/ReactJs/description.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
apps/demos/Demos/DataGrid/ToolbarCustomization/description.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
apps/demos/Demos/DataGrid/ToolbarCustomization/jQuery/description.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
178 changes: 178 additions & 0 deletions
178
packages/devextreme/js/__internal/ui/collection/m_search_box_mixin.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,178 @@ | ||
| import messageLocalization from '@js/common/core/localization/message'; | ||
| import $ from '@js/core/renderer'; | ||
| import { Deferred } from '@js/core/utils/deferred'; | ||
| import { extend } from '@js/core/utils/extend'; | ||
| import { stubComponent } from '@js/core/utils/stubs'; | ||
| import errors from '@js/ui/widget/ui.errors'; | ||
|
|
||
| let EditorClass = stubComponent('TextBox'); | ||
|
|
||
| export default { | ||
| _getDefaultOptions() { | ||
| return extend(this.callBase(), { | ||
| searchMode: '', | ||
| searchExpr: null, | ||
| searchValue: '', | ||
| searchEnabled: false, | ||
| searchEditorOptions: {}, | ||
| }); | ||
| }, | ||
|
|
||
| _initMarkup(): void { | ||
| this._renderSearch(); | ||
| this.callBase(); | ||
| }, | ||
|
|
||
| _renderSearch(): void { | ||
| const $element = this.$element(); | ||
| const searchEnabled = this.option('searchEnabled'); | ||
| const searchBoxClassName = this._addWidgetPrefix('search'); | ||
| const rootElementClassName = this._addWidgetPrefix('with-search'); | ||
|
|
||
| if (!searchEnabled) { | ||
| $element.removeClass(rootElementClassName); | ||
| this._removeSearchBox(); | ||
| return; | ||
| } | ||
|
|
||
| const editorOptions = this._getSearchEditorOptions(); | ||
|
|
||
| if (this._searchEditor) { | ||
| this._searchEditor.option(editorOptions); | ||
| } else { | ||
| $element.addClass(rootElementClassName); | ||
| this._$searchEditorElement = $('<div>').addClass(searchBoxClassName).prependTo($element); | ||
| this._searchEditor = this._createComponent(this._$searchEditorElement, EditorClass, editorOptions); | ||
| } | ||
| }, | ||
|
|
||
| _removeSearchBox(): void { | ||
| this._$searchEditorElement && this._$searchEditorElement.remove(); | ||
| delete this._$searchEditorElement; | ||
| delete this._searchEditor; | ||
| }, | ||
|
|
||
| _getSearchEditorOptions() { | ||
| const that = this; | ||
| const userEditorOptions = that.option('searchEditorOptions'); | ||
| const searchText = messageLocalization.format('Search'); | ||
|
|
||
| return extend({ | ||
| mode: 'search', | ||
| placeholder: searchText, | ||
| tabIndex: that.option('tabIndex'), | ||
| value: that.option('searchValue'), | ||
| valueChangeEvent: 'input', | ||
| inputAttr: { | ||
| 'aria-label': searchText, | ||
| }, | ||
| onValueChanged(e) { | ||
| const searchTimeout = that.option('searchTimeout'); | ||
| that._valueChangeDeferred = Deferred(); | ||
| clearTimeout(that._valueChangeTimeout); | ||
|
|
||
| that._valueChangeDeferred.done(function () { | ||
| this.option('searchValue', e.value); | ||
| }.bind(that)); | ||
|
|
||
| if (e.event && e.event.type === 'input' && searchTimeout) { | ||
| that._valueChangeTimeout = setTimeout(() => { | ||
| that._valueChangeDeferred.resolve(); | ||
| }, searchTimeout); | ||
| } else { | ||
| that._valueChangeDeferred.resolve(); | ||
| } | ||
| }, | ||
| }, userEditorOptions); | ||
| }, | ||
|
|
||
| _getAriaTarget() { | ||
| if (this.option('searchEnabled')) { | ||
| return this._itemContainer(true); | ||
| } | ||
| return this.callBase(); | ||
| }, | ||
|
|
||
| _focusTarget() { | ||
| if (this.option('searchEnabled')) { | ||
| return this._itemContainer(true); | ||
| } | ||
|
|
||
| return this.callBase(); | ||
| }, | ||
|
|
||
| _updateFocusState(e, isFocused): void { | ||
| if (this.option('searchEnabled')) { | ||
| this._toggleFocusClass(isFocused, this.$element()); | ||
| } | ||
| this.callBase(e, isFocused); | ||
| }, | ||
|
|
||
| getOperationBySearchMode(searchMode) { | ||
| return searchMode === 'equals' ? '=' : searchMode; | ||
| }, | ||
|
|
||
| _optionChanged(args) { | ||
| switch (args.name) { | ||
| case 'searchEnabled': | ||
| case 'searchEditorOptions': | ||
| this._invalidate(); | ||
| break; | ||
| case 'searchExpr': | ||
| case 'searchMode': | ||
| case 'searchValue': | ||
| if (!this._dataSource) { | ||
| errors.log('W1009'); | ||
| return; | ||
| } | ||
| if (args.name === 'searchMode') { | ||
| this._dataSource.searchOperation(this.getOperationBySearchMode(args.value)); | ||
| } else { | ||
| this._dataSource[args.name](args.value); | ||
| } | ||
| this._dataSource.load(); | ||
| break; | ||
| case 'searchTimeout': | ||
| break; | ||
| default: | ||
| this.callBase(args); | ||
| } | ||
| }, | ||
|
|
||
| focus() { | ||
| if (!this.option('focusedElement') && this.option('searchEnabled')) { | ||
| this._searchEditor && this._searchEditor.focus(); | ||
| return; | ||
| } | ||
|
|
||
| this.callBase(); | ||
| }, | ||
|
|
||
| _cleanAria(): void { | ||
| const $element = this.$element(); | ||
|
|
||
| this.setAria({ | ||
| role: null, | ||
| activedescendant: null, | ||
| }, $element); | ||
|
|
||
| $element.attr('tabIndex', null); | ||
| }, | ||
|
|
||
| _clean(): void { | ||
| this.callBase(); | ||
| this._cleanAria(); | ||
| }, | ||
|
|
||
| _refresh(): void { | ||
| if (this._valueChangeDeferred) { | ||
| this._valueChangeDeferred.resolve(); | ||
| } | ||
|
|
||
| this.callBase(); | ||
| }, | ||
|
|
||
| setEditorClass(value): void { | ||
| EditorClass = value; | ||
| }, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.