devextreme 19.1.6 → 19.1.7

package/ui/tag_box.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/tag_box.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -67,12 +67,13 @@ var NATIVE_CLICK_CLASS = "dx-native-click";
 var TAGBOX_MOUSE_WHEEL_DELTA_MULTIPLIER = -.3;
 var TagBox = _select_box2.default.inherit({
     _supportedKeys: function() {
-        var _this = this;
+        var _this = this,
+            _arguments = arguments;
         var parent = this.callBase();
         var sendToList = function(e) {
             return _this._list._keyboardProcessor.process(e)
         };
-        return (0, _extend.extend)(parent, {
+        return (0, _extend.extend)({}, parent, {
             backspace: function(e) {
                 if (!this._isCaretAtTheStart()) {
                     return
@@ -91,8 +92,14 @@ var TagBox = _select_box2.default.inherit({
                 this._removeTagElement($tagToDelete);
                 delete this._preserveFocusedTag
             },
-            upArrow: sendToList,
-            downArrow: sendToList,
+            upArrow: function(e) {
+                var handler = e.altKey || !_this._list ? parent.upArrow : sendToList;
+                return handler.apply(_this, _arguments)
+            },
+            downArrow: function(e) {
+                var handler = e.altKey || !_this._list ? parent.downArrow : sendToList;
+                return handler.apply(_this, _arguments)
+            },
             del: function(e) {
                 if (!this._$focusedTag || !this._isCaretAtTheStart()) {
                     return
@@ -396,16 +403,20 @@ var TagBox = _select_box2.default.inherit({
         this._toggleEmptinessEventHandler()
     },
     _focusInHandler: function(e) {
-        this.callBase(e);
-        this._scrollContainer("end")
+        if (!this._preventNestedFocusEvent(e)) {
+            this._scrollContainer("end")
+        }
+        this.callBase(e)
     },
     _restoreInputText: function() {
         this._clearTextValue()
     },
     _focusOutHandler: function(e) {
-        this.callBase(e);
-        this._clearTagFocus();
-        this._scrollContainer("start")
+        if (!this._preventNestedFocusEvent(e)) {
+            this._clearTagFocus();
+            this._scrollContainer("start")
+        }
+        this.callBase(e)
     },
     _getFirstPopupElement: function() {
         return this.option("showSelectionControls") ? this._list.$element() : this.callBase()
@@ -473,11 +484,12 @@ var TagBox = _select_box2.default.inherit({
     _renderInputSize: function() {
         var $input = this._input();
         var value = $input.val();
+        var isEmptyInput = (0, _type.isString)(value) && value;
         var cursorWidth = 5;
         var width = "";
         var size = "";
-        var canTypeText = this.option("searchEnabled") || this.option("editEnabled");
-        if (value && canTypeText) {
+        var canTypeText = this.option("searchEnabled") || this.option("acceptCustomValue");
+        if (isEmptyInput && canTypeText) {
             var $calculationElement = (0, _dom.createTextElementHiddenCopy)($input, value, {
                 includePaddings: true
             });
@@ -597,12 +609,37 @@ var TagBox = _select_box2.default.inherit({
             return customItem
         }
     },
+    _isGroupedData: function() {
+        return this.option("grouped") && !this._dataSource.group()
+    },
+    _getItemsByValues: function(values) {
+        var resultItems = [];
+        values.forEach(function(value) {
+            var item = this._getItemFromPlain(value);
+            if ((0, _type.isDefined)(item)) {
+                resultItems.push(item)
+            }
+        }.bind(this));
+        return resultItems
+    },
+    _getFilteredGroupedItems: function(values) {
+        var selectedItems = new _deferred.Deferred;
+        if (!this._dataSource.items().length) {
+            this._dataSource.load().done(function() {
+                selectedItems.resolve(this._getItemsByValues(values))
+            }.bind(this)).fail(selectedItems.resolve([]))
+        } else {
+            selectedItems.resolve(this._getItemsByValues(values))
+        }
+        return selectedItems.promise()
+    },
     _loadTagsData: function() {
         var _this8 = this;
         var values = this._getValue();
         var tagData = new _deferred.Deferred;
         this._selectedItems = [];
-        this._getFilteredItems(values).done(function(filteredItems) {
+        var filteredItemsPromise = this._isGroupedData() ? this._getFilteredGroupedItems(values) : this._getFilteredItems(values);
+        filteredItemsPromise.done(function(filteredItems) {
             var items = _this8._createTagsData(values, filteredItems);
             items.always(function(data) {
                 tagData.resolve(data)

package/ui/text_area.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExtreme (ui/text_area.d.ts)
-* Version: 19.1.6
-* Build date: Wed Sep 11 2019
+* Version: 19.1.7
+* Build date: Fri Oct 11 2019
 *
 * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
 * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/

package/ui/text_area.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/text_area.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -26,6 +26,7 @@ var _uiEventsEmitterGesture = require("../ui/scroll_view/ui.events.emitter.gestu
 var _uiEventsEmitterGesture2 = _interopRequireDefault(_uiEventsEmitterGesture);
 var _size = require("../core/utils/size");
 var _size2 = _interopRequireDefault(_size);
+var _utils3 = require("./text_box/utils.scroll");
 var _text_box = require("./text_box");
 var _text_box2 = _interopRequireDefault(_text_box);
 
@@ -75,7 +76,7 @@ var TextArea = _text_box2.default.inherit({
         var initScrollData = {
             validate: function(e) {
                 if (_utils2.default.isDxMouseWheelEvent(e) && (0, _renderer2.default)(e.target).is(_this._input())) {
-                    if (_this._allowScroll(-e.delta, e.shiftKey)) {
+                    if ((0, _utils3.allowScroll)($input, -e.delta, e.shiftKey)) {
                         e._needSkipEvent = true;
                         return true
                     }
@@ -93,29 +94,12 @@ var TextArea = _text_box2.default.inherit({
     _pointerMoveHandler: function(e) {
         var currentEventY = _utils2.default.eventData(e).y;
         var delta = this._eventY - currentEventY;
-        if (this._allowScroll(delta)) {
+        if ((0, _utils3.allowScroll)(this._input(), delta)) {
             e.isScrollingEvent = true;
             e.stopPropagation()
-        } else {
-            return false
         }
         this._eventY = currentEventY
     },
-    _allowScroll: function(delta, shiftKey) {
-        var $input = this._input();
-        var scrollTopPos = shiftKey ? $input.scrollLeft() : $input.scrollTop();
-        var prop = shiftKey ? "Width" : "Height";
-        var scrollBottomPos = $input.prop("scroll" + prop) - $input.prop("client" + prop) - scrollTopPos;
-        if (0 === scrollTopPos && 0 === scrollBottomPos) {
-            return false
-        }
-        var isScrollFromTop = 0 === scrollTopPos && delta >= 0;
-        var isScrollFromBottom = 0 === scrollBottomPos && delta <= 0;
-        var isScrollFromMiddle = scrollTopPos > 0 && scrollBottomPos > 0;
-        if (isScrollFromTop || isScrollFromBottom || isScrollFromMiddle) {
-            return true
-        }
-    },
     _renderDimensions: function() {
         var $element = this.$element();
         var element = $element.get(0);
@@ -170,7 +154,10 @@ var TextArea = _text_box2.default.inherit({
             inputHeight = Math.max(inputHeight, minHeight - heightDifference)
         }
         if (void 0 !== maxHeight) {
-            inputHeight = Math.min(inputHeight, maxHeight - heightDifference)
+            var adjustedMaxHeight = maxHeight - heightDifference;
+            var needScroll = inputHeight > adjustedMaxHeight;
+            inputHeight = Math.min(inputHeight, adjustedMaxHeight);
+            this._updateInputAutoResizeAppearance($input, !needScroll)
         }
         $input.css("height", inputHeight);
         if (autoHeightResizing) {
@@ -189,15 +176,16 @@ var TextArea = _text_box2.default.inherit({
             this._updateInputHeight()
         }
     },
-    _updateInputAutoResizeAppearance: function($input) {
+    _updateInputAutoResizeAppearance: function($input, isAutoResizeEnabled) {
         if ($input) {
-            $input.toggleClass(TEXTEDITOR_INPUT_CLASS_AUTO_RESIZE, this.option("autoResizeEnabled"))
+            var autoResizeEnabled = (0, _common.ensureDefined)(isAutoResizeEnabled, this.option("autoResizeEnabled"));
+            $input.toggleClass(TEXTEDITOR_INPUT_CLASS_AUTO_RESIZE, autoResizeEnabled)
         }
     },
     _optionChanged: function(args) {
         switch (args.name) {
             case "autoResizeEnabled":
-                this._updateInputAutoResizeAppearance(this._input());
+                this._updateInputAutoResizeAppearance(this._input(), args.value);
                 this._refreshEvents();
                 this._updateInputHeight();
                 break;

package/ui/text_box/text_box.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/text_box/text_box.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -63,12 +63,8 @@ var TextBox = TextEditor.inherit({
         this._toggleMaxLengthProp()
     },
     _toggleMaxLengthProp: function() {
-        if (this._isAndroidOrIE()) {
-            return
-        }
-        var maxLength = this.option("maxLength");
-        var isMaskSpecified = !!this.option("mask");
-        if (maxLength > 0 && !isMaskSpecified) {
+        var maxLength = this._getMaxLength();
+        if (maxLength && maxLength > 0) {
             this._input().attr("maxLength", maxLength)
         } else {
             this._input().removeAttr("maxLength")
@@ -110,12 +106,12 @@ var TextBox = TextEditor.inherit({
         }
     },
     _onKeyDownCutOffHandler: function(e) {
-        var maxLength = this.option("maxLength");
-        if (maxLength) {
+        var actualMaxLength = this._getMaxLength();
+        if (actualMaxLength) {
             var $input = $(e.target),
                 key = eventUtils.normalizeKeyName(e);
             this._cutOffExtraChar($input);
-            return $input.val().length < maxLength || inArray(key, ignoreKeys) !== -1 || "" !== window.getSelection().toString()
+            return $input.val().length < actualMaxLength || inArray(key, ignoreKeys) !== -1 || "" !== window.getSelection().toString()
         } else {
             return true
         }
@@ -127,12 +123,16 @@ var TextBox = TextEditor.inherit({
         }
     },
     _cutOffExtraChar: function($input) {
-        var maxLength = this.option("maxLength"),
+        var actualMaxLength = this._getMaxLength(),
             textInput = $input.val();
-        if (textInput.length > maxLength) {
-            $input.val(textInput.substr(0, maxLength))
+        if (actualMaxLength && textInput.length > actualMaxLength) {
+            $input.val(textInput.substr(0, actualMaxLength))
         }
     },
+    _getMaxLength: function() {
+        var isMaskSpecified = !!this.option("mask");
+        return isMaskSpecified ? null : this.option("maxLength")
+    },
     _isAndroidOrIE: function() {
         var realDevice = devices.real();
         var version = realDevice.version.join(".");

package/ui/text_box/texteditor_button_collection/button.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/text_box/texteditor_button_collection/button.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/

package/ui/text_box/texteditor_button_collection/custom.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/text_box/texteditor_button_collection/custom.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/

package/ui/text_box/texteditor_button_collection/index.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/text_box/texteditor_button_collection/index.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/

package/ui/text_box/ui.text_editor.base.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/text_box/ui.text_editor.base.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -362,9 +362,34 @@ var TextEditorBase = Editor.inherit({
     _focusTarget: function() {
         return this._input()
     },
+    _focusEventTarget: function() {
+        return this.element()
+    },
+    _preventNestedFocusEvent: function(event) {
+        if (event.isDefaultPrevented()) {
+            return true
+        }
+        var result = this._isNestedTarget(event.relatedTarget);
+        if ("focusin" === event.type) {
+            result = result && this._isNestedTarget(event.target)
+        }
+        result && event.preventDefault();
+        return result
+    },
+    _isNestedTarget: function(target) {
+        return !!this.$element().find(target).length
+    },
     _focusClassTarget: function() {
         return this.$element()
     },
+    _focusInHandler: function(event) {
+        this._preventNestedFocusEvent(event);
+        this.callBase.apply(this, arguments)
+    },
+    _focusOutHandler: function(event) {
+        this._preventNestedFocusEvent(event);
+        this.callBase.apply(this, arguments)
+    },
     _toggleFocusClass: function(isFocused, $element) {
         this.callBase(isFocused, this._focusClassTarget($element))
     },

package/ui/text_box/ui.text_editor.clear.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/text_box/ui.text_editor.clear.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -136,7 +136,7 @@ var ClearButton = function(_TextEditorButton) {
             var editor = this.editor;
             var editorName = editor.NAME;
             _events_engine2.default.on($button, (0, _utils.addNamespace)(_pointer.down, editorName), function(e) {
-                "mouse" === e.pointerType && e.preventDefault()
+                "mouse" === e.pointerType ? e.preventDefault() : editor._clearValueHandler(e)
             });
             _events_engine2.default.on($button, (0, _utils.addNamespace)(_click.name, editorName), function(e) {
                 return editor._clearValueHandler(e)

package/ui/text_box/ui.text_editor.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/text_box/ui.text_editor.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/

package/ui/text_box/ui.text_editor.mask.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/text_box/ui.text_editor.mask.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -150,8 +150,7 @@ var TextEditorMask = TextEditorBase.inherit({
         this.$element().addClass(TEXTEDITOR_MASKED_CLASS);
         this._maskStrategy.attachEvents();
         this._parseMask();
-        this._renderMaskedValue();
-        this._changedValue = this._input().val()
+        this._renderMaskedValue()
     },
     _suppressCaretChanging: function(callback, args) {
         var originalCaret = caret;
@@ -303,21 +302,32 @@ var TextEditorMask = TextEditorBase.inherit({
     _replaceMaskCharWithEmpty: function(text) {
         return text.replace(new RegExp(this.option("maskChar"), "g"), EMPTY_CHAR)
     },
-    _maskKeyHandler: function(e, tryHandleKeyCallback) {
+    _maskKeyHandler: function(e, keyHandler) {
+        var _this = this;
         if (this.option("readOnly")) {
             return
         }
         this.setForwardDirection();
         e.preventDefault();
         this._handleSelection();
-        if (!tryHandleKeyCallback.call(this)) {
-            return
+        var previousText = this._input().val();
+        var raiseInputEvent = function() {
+            if (previousText !== _this._input().val()) {
+                _this._maskStrategy.runWithoutEventProcessing(function() {
+                    return eventsEngine.trigger(_this._input(), "input")
+                })
+            }
+        };
+        var handled = keyHandler();
+        if (handled) {
+            handled.then(raiseInputEvent)
+        } else {
+            this.setForwardDirection();
+            this._adjustCaret();
+            this._displayMask();
+            this._maskRulesChain.reset();
+            raiseInputEvent()
         }
-        this.setForwardDirection();
-        this._adjustCaret();
-        this._changedValue = this._input().val();
-        this._displayMask();
-        this._maskRulesChain.reset()
     },
     _handleKey: function(key, direction) {
         this._direction(direction || FORWARD_DIRECTION);

package/ui/text_box/ui.text_editor.mask.rule.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/text_box/ui.text_editor.mask.rule.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/

package/ui/text_box/ui.text_editor.mask.strategy.android.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/text_box/ui.text_editor.mask.strategy.android.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -128,11 +128,6 @@ var AndroidMaskStrategy = function(_BaseMaskStrategy) {
         value: function() {
             this._prevCaret = this.editorCaret()
         }
-    }, {
-        key: "_keyDownHandler",
-        value: function() {
-            this._keyPressHandled = false
-        }
     }, {
         key: "_inputHandler",
         value: function(_ref) {

package/ui/text_box/ui.text_editor.mask.strategy.base.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/text_box/ui.text_editor.mask.strategy.base.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -161,8 +161,7 @@ var BaseMaskStrategy = function() {
             var caret = this.editorCaret();
             var selectedText = this.editorInput().val().substring(caret.start, caret.end);
             this.editor._maskKeyHandler(event, function() {
-                (0, _dom.clipboardText)(event, selectedText);
-                return true
+                return (0, _dom.clipboardText)(event, selectedText)
             })
         }
     }, {
@@ -178,42 +177,55 @@ var BaseMaskStrategy = function() {
         value: function() {
             clearTimeout(this._dragTimer)
         }
+    }, {
+        key: "_keyDownHandler",
+        value: function() {
+            this._keyPressHandled = false
+        }
     }, {
         key: "_pasteHandler",
         value: function(event) {
+            var editor = this.editor;
             this._keyPressHandled = true;
             var caret = this.editorCaret();
-            this.editor._maskKeyHandler(event, function() {
+            editor._maskKeyHandler(event, function() {
                 var pastingText = (0, _dom.clipboardText)(event);
-                var restText = this._maskRulesChain.text().substring(caret.end);
-                var accepted = this._handleChain({
+                var restText = editor._maskRulesChain.text().substring(caret.end);
+                var accepted = editor._handleChain({
                     text: pastingText,
                     start: caret.start,
                     length: pastingText.length
                 });
                 var newCaret = caret.start + accepted;
-                this._handleChain({
+                editor._handleChain({
                     text: restText,
                     start: newCaret,
                     length: restText.length
                 });
-                this._caret({
+                editor._caret({
                     start: newCaret,
                     end: newCaret
-                });
-                return true
+                })
             })
         }
+    }, {
+        key: "runWithoutEventProcessing",
+        value: function(action) {
+            var keyPressHandled = this._keyPressHandled;
+            this._keyPressHandled = true;
+            action();
+            this._keyPressHandled = keyPressHandled
+        }
     }, {
         key: "_backspaceHandler",
         value: function() {}
     }, {
         key: "_delHandler",
         value: function(event) {
+            var editor = this.editor;
             this._keyPressHandled = true;
-            this.editor._maskKeyHandler(event, function() {
-                !this._hasSelection() && this._handleKey(EMPTY_CHAR);
-                return true
+            editor._maskKeyHandler(event, function() {
+                return !editor._hasSelection() && editor._handleKey(EMPTY_CHAR)
             })
         }
     }, {