@wavemaker/app-runtime-wm-build 11.5.0-next.40002 → 11.5.0-next.40301

app-runtime-wm-build/wmapp/scripts/wm-loader.js

@@ -4168,7 +4168,7 @@
         EXCLUDEDAYS: "excludedays"
     };
     var transformFileURI = function(url) {
-        if (_.isString(url) && hasCordova() && url.startsWith("file://")) {
+        if (url && hasCordova() && url.startsWith("file://")) {
             if (isIos()) {
                 return url.replace("file://", "/_app_file_");
             } else if (isAndroid() && location.href.startsWith("http")) {
@@ -4387,7 +4387,7 @@
     }();
     var MINIMUM_MOBILE_WIDTH = 480;
     var MINIMUM_TAB_WIDTH = 768;
-    var MINIMUM_LARGE_SCREEN_WIDTH = 1200;
+    var MINIMUM_LARGE_SCREEN_WIDTH = 1280;
     var IViewportService = function() {
         function IViewportService() {}
         return IViewportService;
@@ -4472,13 +4472,11 @@
             } else {
                 MINIMUM_MOBILE_WIDTH = parseInt(getComputedStyle(document.documentElement).getPropertyValue("--screen-xs")) || 480;
                 MINIMUM_TAB_WIDTH = parseInt(getComputedStyle(document.documentElement).getPropertyValue("--screen-sm")) || 768;
-                MINIMUM_LARGE_SCREEN_WIDTH = parseInt(getComputedStyle(document.documentElement).getPropertyValue("--screen-lg")) || 1200;
-                if (this.screenWidth >= MINIMUM_LARGE_SCREEN_WIDTH) {
-                    this.isTabletType = isAndroid() || isIos() || isAndroidTablet();
-                    this.isMobileType = false;
-                } else if (this.screenWidth >= MINIMUM_TAB_WIDTH) {
+                if (minValue >= MINIMUM_MOBILE_WIDTH && maxValue >= MINIMUM_TAB_WIDTH) {
                     this.type = 1;
-                    this.isTabletType = true;
+                    if (isAndroid() || isIos() || isAndroidTablet()) {
+                        this.isTabletType = true;
+                    }
                 } else {
                     this.type = 0;
                     this.isMobileType = true;
@@ -4976,7 +4974,7 @@
             if (!_.get(parsedObj, [ stateParam ]) && !_.get(parsedObj, key)) {
                 return;
             }
-            if (_.get(parsedObj, stateParam + "." + key) || parsedObj && parsedObj[stateParam] && parsedObj[stateParam][key]) {
+            if (_.get(parsedObj, stateParam + "." + key)) {
                 if (subParam) {
                     delete parsedObj[stateParam][key][subParam];
                 } else {
@@ -17071,7 +17069,9 @@
         };
         BaseFormCustomComponent.prototype.invokeOnChange = function(value, $event, valid) {
             this._onChange(value);
-            _super.prototype.invokeOnChange.call(this, value, $event);
+            if (valid) {
+                _super.prototype.invokeOnChange.call(this, value, $event);
+            }
         };
         BaseFormCustomComponent.prototype.invokeOnTouched = function($event) {
             this._onTouched();
@@ -17279,9 +17279,6 @@
                 core$1.$appDigest();
             }), 150);
             _this.handleHeaderClick = core$1.noop;
-            _this.cancelLocaleChangeSubscription = _this.getAppInstance().subscribe("locale-changed", (function() {
-                _this._debouncedInitDatasetItems();
-            }));
             return _this;
         }
         Object.defineProperty(DatasetAwareFormComponent.prototype, "modelByKey", {
@@ -17494,11 +17491,6 @@
                 this.toggleAllHeaders = base.toggleAllHeaders.bind(undefined, this);
             }
         };
-        DatasetAwareFormComponent.prototype.ngOnDestroy = function() {
-            if (this.cancelLocaleChangeSubscription) {
-                this.cancelLocaleChangeSubscription();
-            }
-        };
         return DatasetAwareFormComponent;
     }(BaseFormCustomComponent);
     DatasetAwareFormComponent.decorators = [ {
@@ -22309,11 +22301,17 @@
             });
         };
         SearchComponent.prototype.onFocusOut = function() {
+            var _this = this;
             this._unsubscribeDv = false;
             this._loadingItems = false;
             this.page = 1;
             if (!this._domUpdated && this._isOpen) {
                 this.listenQuery = false;
+                setTimeout((function() {
+                    if (_this.typeahead._typeahead.isShown) {
+                        _this.typeahead.hide();
+                    }
+                }), 200);
             }
             this._isOpen = false;
             if (this._domUpdated && this.typeahead && this.typeahead._container) {
@@ -23187,17 +23185,16 @@
     var defaultTreeIconClass = "plus-minus";
     var TreeComponent = function(_super) {
         __extends(TreeComponent, _super);
-        function TreeComponent(inj, binddatavalue, bindnodelabel, bindnodeicon, bindnodechildren, bindnodeid) {
+        function TreeComponent(inj) {
             var _this = _super.call(this, inj, WIDGET_INFO) || this;
-            _this.binddatavalue = binddatavalue;
-            _this.bindnodelabel = bindnodelabel;
-            _this.bindnodeicon = bindnodeicon;
-            _this.bindnodechildren = bindnodechildren;
-            _this.bindnodeid = bindnodeid;
             _this.setting = {
                 data: {
                     simpleData: {
                         enable: false
+                    },
+                    key: {
+                        children: "children",
+                        name: "label"
                     }
                 },
                 view: {
@@ -23211,53 +23208,53 @@
                 callback: {}
             };
             base.styler(_this.nativeElement, _this, base.APPLY_STYLES_TYPE.CONTAINER);
-            _this.setting.view["nodeClasses"] = _this.setNodeClasses;
-            _this.setting.callback["onClick"] = _this.onClick.bind(_this);
-            _this.setting.callback["onExpand"] = _this.onExpand.bind(_this);
-            _this.setting.callback["onCollapse"] = _this.onCollapse.bind(_this);
             return _this;
         }
         TreeComponent.prototype.onPropertyChange = function(key, nv, ov) {
             switch (key) {
               case "dataset":
                 this.nodes = this.getNodes(nv);
+                if (this.level > 0) {
+                    this.expandTree(this.level, this.nodes, 0);
+                }
                 this.renderTree();
                 break;
 
               case "levels":
-                this.level = nv;
+                if (nv > 0) {
+                    this.level = nv;
+                }
                 this.renderTree();
                 break;
 
-              case "nodeicon":
-                this.nodeicon = nv;
+              case "treeicons":
+                this.treeicon = nv;
                 this.renderTree();
                 break;
 
               case "nodelabel":
-                this.nodelabel = nv;
+                this.setting.data.key.name = this.labelKey;
                 this.renderTree();
                 break;
 
               case "nodechildren":
-                this.nodechildren = nv;
+                this.setting.data.key.children = this.childrenKey;
                 this.renderTree();
                 break;
 
-              case "orderby":
-                this.orderby = nv;
+              case "nodeicon":
+                this.nodeicon = this.iconKey;
                 this.renderTree();
                 break;
 
-              case "treeicons":
-                this.treeicons = nv;
+              case "orderby":
                 this.renderTree();
                 break;
 
               case "class":
                 this.treeClass = nv;
-                this.setTreeTemplate(this.treeClass);
                 this.renderTree();
+                break;
 
               default:
                 _super.prototype.onPropertyChange.call(this, key, nv, ov);
@@ -23267,9 +23264,9 @@
         TreeComponent.prototype.expandTree = function(level, node, childLevel) {
             var _this = this;
             node.map((function(childNode) {
-                var children = childNode.children;
-                if (children && childLevel < level) {
-                    childNode.open = true;
+                var children = _this.getChildren(childNode);
+                if (children && !("open" in childNode) && childLevel < level) {
+                    childNode["open"] = true;
                     _this.expandTree(level, children, childLevel + 1);
                 } else {
                     childLevel = 0;
@@ -23278,13 +23275,12 @@
             }));
         };
         TreeComponent.prototype.setTreeTemplate = function(value) {
-            var classList = value.split(" ");
-            if (classList.includes("Classic")) {
+            if (value === "Classic") {
                 this.setting.check["enable"] = false;
-            } else if (classList.includes("Checkbox")) {
+            } else if (value === "Checkbox") {
                 this.setting.check["enable"] = true;
                 this.setting.check["chkStyle"] = "checkbox";
-            } else if (classList.includes("Radio")) {
+            } else if (value === "Radio") {
                 this.setting.check["enable"] = true;
                 this.setting.check["chkStyle"] = "radio";
                 this.setting.check["radioType"] = "all";
@@ -23311,11 +23307,48 @@
             }
             return nodes;
         };
-        TreeComponent.prototype.setNodeClasses = function(treeId, treeNode) {
+        TreeComponent.prototype.setNodeclasses = function(treeId, treeNode) {
             return treeNode.icon ? {
                 add: [ "" + treeNode.icon ]
             } : "";
         };
+        TreeComponent.prototype.setNodeData = function(nodes, depth, level, parentNode, type) {
+            var _this = this;
+            if (depth === 0) {
+                nodes.map((function(node) {
+                    var children = _this.getChildren(node);
+                    if (children) {
+                        _this.setNodeData(children, depth, level, parentNode, type);
+                    }
+                    if (node.icon && _this.nodelabel == "icon") {
+                        node[type] = node.icon;
+                    } else if (node.name && _this.nodelabel == "name") {
+                        node[type] = node.name;
+                    } else {
+                        return;
+                    }
+                }));
+            } else {
+                nodes.map((function(node) {
+                    var children = _this.getChildren(node);
+                    if (children && level > 1) {
+                        if (depth === level) {
+                            parentNode = node;
+                        }
+                        _this.setNodeData(children, depth, level - 1, parentNode, type);
+                    }
+                    if (level === 1 && (type === "name" ? _this.nodelabel.includes("label") || _this.nodelabel.includes("name") : _this.nodeicon.includes("label") || _this.nodeicon.includes("name"))) {
+                        parentNode[type] = node.name || node.label;
+                        return;
+                    } else if (level === 1 && node.icon !== undefined && (type === "name" ? _this.nodelabel.includes("icon") : _this.nodeicon.includes("icon"))) {
+                        parentNode[type] = node.icon;
+                        return;
+                    } else {
+                        return;
+                    }
+                }));
+            }
+        };
         TreeComponent.prototype.changeTreeIcons = function(nv) {
             var eleClose = $('ul[name="' + this.name + '"] li span.button.switch');
             $(eleClose).map((function(idx, ele) {
@@ -23329,38 +23362,45 @@
         };
         TreeComponent.prototype.getPath = function(treeNode, path) {
             if (treeNode.getParentNode() === null) {
-                path = "/" + treeNode.name + path;
+                path = "/" + treeNode[this.labelKey] + path;
             } else {
-                path = this.getPath(treeNode.getParentNode(), path) + "/" + treeNode.name;
+                path = this.getPath(treeNode.getParentNode(), path) + "/" + treeNode[this.labelKey];
             }
             return path;
         };
         TreeComponent.prototype.onClick = function(event, treeId, treeNode, clickFlag) {
             if (this.nodeclick === "expand") {
-                var nodes = this.zTree.getSelectedNodes();
+                var nodes = this.treeObj.getSelectedNodes();
                 if (nodes.length > 0) {
                     this.expandNode(nodes[0], !nodes[0].open, true);
                 }
             }
-            this.selectNode(event, treeNode);
+            var path = this.getPath(treeNode, "");
+            var eventParams = {
+                $event: event,
+                $item: treeNode,
+                $path: path
+            };
+            this.setSelectedItem(treeNode);
+            this.invokeEventCallback("select", eventParams);
         };
         TreeComponent.prototype.onExpand = function(event, treeId, treeNode) {
             var self = this;
             var path = this.getPath(treeNode, "");
             var eventParams = {
                 $event: event,
-                $item: core.getClonedObject(treeNode.data),
+                $item: treeNode,
                 $path: path
             };
             this.invokeEventCallback("expand", eventParams);
-            var children = treeNode.children;
+            var children = this.getChildren(treeNode);
             children === null || children === void 0 ? void 0 : children.map((function(el) {
                 if (el.isParent) {
                     var ele_1 = $("#" + el.tId + "_switch");
-                    $(ele_1).addClass(self.treeicons || defaultTreeIconClass);
+                    $(ele_1).addClass(self.treeicon || defaultTreeIconClass);
                     $(ele_1).on("click", (function(e) {
                         setTimeout((function() {
-                            $(ele_1).addClass(self.treeicons || defaultTreeIconClass);
+                            $(ele_1).addClass(self.treeicon || defaultTreeIconClass);
                         }), 0);
                     }));
                 }
@@ -23370,138 +23410,185 @@
             var path = this.getPath(treeNode, "");
             var eventParams = {
                 $event: event,
-                $item: core.getClonedObject(treeNode.data),
+                $item: treeNode,
                 $path: path
             };
             this.invokeEventCallback("collapse", eventParams);
         };
-        TreeComponent.prototype.constructZTreeData = function(data, zTreeData) {
+        TreeComponent.prototype.getChildren = function(node) {
+            return node[this.childrenKey];
+        };
+        Object.defineProperty(TreeComponent.prototype, "childrenKey", {
+            get: function() {
+                if (!this.nodechildren) {
+                    return "children";
+                }
+                var depth = this.countDepth(this.nodechildren);
+                return depth ? this.nodechildren.split(".").pop() : this.nodechildren;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(TreeComponent.prototype, "labelKey", {
+            get: function() {
+                if (!this.nodelabel) {
+                    return "label";
+                }
+                var depth = this.countDepth(this.nodelabel);
+                return depth ? this.nodelabel.split(".").pop() : this.nodelabel;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(TreeComponent.prototype, "iconKey", {
+            get: function() {
+                if (!this.nodeicon) {
+                    return "icon";
+                }
+                var depth = this.countDepth(this.nodeicon);
+                return depth ? this.nodeicon.split(".").pop() : this.nodeicon;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(TreeComponent.prototype, "treeObj", {
+            get: function() {
+                return $.fn.zTree.getZTreeObj("" + this.name);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        TreeComponent.prototype.modifyObjects = function(array) {
             var _this = this;
-            data.forEach((function(node) {
-                var zNode = {};
-                var name = base.getEvaluatedData(node, {
-                    field: _this.nodelabel,
-                    bindExpression: _this.bindnodelabel
-                }, _this.viewParent) || node.label;
-                var icon = base.getEvaluatedData(node, {
-                    field: _this.nodeicon,
-                    bindExpression: _this.bindnodeicon
-                }, _this.viewParent) || node.icon;
-                var nodeId = base.getEvaluatedData(node, {
-                    field: _this.nodeid,
-                    bindExpression: _this.bindnodeid
-                }, _this.viewParent);
-                var children = base.getEvaluatedData(node, {
-                    field: _this.nodechildren,
-                    bindExpression: _this.bindnodechildren
-                }, _this.viewParent) || node.children;
-                zNode["name"] = name;
-                zNode["icon"] = icon;
-                zNode["nodeId"] = nodeId;
-                zNode["data"] = core.getClonedObject(node);
-                if (_.isArray(children) && children.length) {
-                    zNode["children"] = [];
-                    _this.constructZTreeData(children, zNode["children"]);
-                }
-                zTreeData.push(zNode);
+            array.forEach((function(obj) {
+                obj.icon = obj[_this.nodeicon];
+                var children = _this.getChildren(obj);
+                if (children === null || children === void 0 ? void 0 : children.length) {
+                    _this.modifyObjects(children);
+                }
             }));
         };
-        TreeComponent.prototype.renderTree = function() {
-            var _a;
-            this.zTreeNodes = [];
-            if ((_a = this.nodes) === null || _a === void 0 ? void 0 : _a.length) {
-                this.nativeElement.setAttribute("id", this.name);
-                this.constructZTreeData(this.nodes, this.zTreeNodes);
-                if (this.level > 0) {
-                    this.expandTree(this.level, this.zTreeNodes, 0);
+        TreeComponent.prototype.setNodeChildren = function(nodes, depth, level, parentNode) {
+            var _this = this;
+            if (depth <= 0) {
+                return nodes;
+            }
+            for (var i = 0; i < nodes.length; i++) {
+                var node = nodes[i];
+                if (depth === level) {
+                    parentNode = nodes[i];
+                }
+                var children = this.getChildren(node);
+                if (children === null || children === void 0 ? void 0 : children.length) {
+                    if (level === 1) {
+                        parentNode[this.childrenKey] = children.map((function(child) {
+                            var _a;
+                            return _a = {}, _a[_this.labelKey] = child[_this.labelKey], _a[_this.childrenKey] = _this.getChildren(child), 
+                            _a.icon = child[_this.iconKey], _a;
+                        }));
+                        return;
+                    } else {
+                        this.setNodeChildren(children, depth, level - 1, parentNode);
+                    }
                 }
             }
-            this.zTree = $.fn.zTree.init($('ul[name="' + this.name + '"]'), this.setting, this.zTreeNodes);
-            $.fn.zTreeKeyboardNavigation(this.zTree, $('ul[name="' + this.name + '"]'), null, this.treeicons || defaultTreeIconClass);
-            this.postRenderTree();
+            return nodes;
         };
-        TreeComponent.prototype.setChecked = function(zNode, node) {
-            var _this = this;
-            node.checked = zNode.checked;
-            var children = base.getEvaluatedData(node, {
-                field: this.nodechildren,
-                bindExpression: this.bindnodechildren
-            }, this.viewParent) || node.children;
-            if (children === null || children === void 0 ? void 0 : children.length) {
-                children.forEach((function(node, index) {
-                    _this.setChecked(zNode.children[index], node);
-                }));
+        TreeComponent.prototype.countDepth = function(str) {
+            var e_1, _a;
+            var regex = /\[.*?\]/g;
+            var matches = str.match(regex);
+            var count = 1;
+            if (matches === null) return count;
+            try {
+                for (var matches_1 = __values(matches), matches_1_1 = matches_1.next(); !matches_1_1.done; matches_1_1 = matches_1.next()) {
+                    var match = matches_1_1.value;
+                    count++;
+                }
+            } catch (e_1_1) {
+                e_1 = {
+                    error: e_1_1
+                };
+            } finally {
+                try {
+                    if (matches_1_1 && !matches_1_1.done && (_a = matches_1.return)) _a.call(matches_1);
+                } finally {
+                    if (e_1) throw e_1.error;
+                }
             }
+            return count;
         };
-        TreeComponent.prototype.selectNode = function(event, node) {
-            var deSelectElm = $(".app-tree[name=" + this.name + "] li[treenode].selected");
-            deSelectElm.removeClass("selected");
-            if (!node) {
-                return;
+        TreeComponent.prototype.renderTree = function() {
+            if (this.nodes) {
+                this.nativeElement.setAttribute("id", this.name);
+                if (this.nodeicon && this.nodeicon !== "icon") {
+                    this.modifyObjects(this.nodes);
+                }
+                this.setTreeTemplate(this.treeClass);
+                if (this.nodelabel) {
+                    var depth = 0;
+                    if (this.nodelabel.includes("children")) {
+                        depth = this.countDepth(this.nodelabel);
+                    }
+                    this.setNodeData(this.nodes, depth, depth, null, "name");
+                }
+                if (this.nodeicon) {
+                    var depth = 0;
+                    if (this.nodeicon.includes("children")) {
+                        depth = this.countDepth(this.nodeicon);
+                    }
+                    this.setNodeData(this.nodes, depth, depth, null, "icon");
+                }
+                if (this.nodechildren) {
+                    var depth = this.countDepth(this.nodechildren);
+                    if (depth > 1) {
+                        this.nodes = this.setNodeChildren(this.nodes, depth, depth, null);
+                    }
+                }
             }
-            var selectElm = $("#" + node.tId + ":has(.curSelectedNode)");
+            this.setting.view["nodeClasses"] = this.setNodeclasses;
+            this.setting.callback["onClick"] = this.onClick.bind(this);
+            this.setting.callback["onExpand"] = this.onExpand.bind(this);
+            this.setting.callback["onCollapse"] = this.onCollapse.bind(this);
+            var zTree = $.fn.zTree.init($('ul[name="' + this.name + '"]'), this.setting, this.nodes);
+            $.fn.zTreeKeyboardNavigation(zTree, $('ul[name="' + this.name + '"]'), null, this.treeicon || defaultTreeIconClass);
+        };
+        TreeComponent.prototype.setSelectedItem = function(treeNode) {
+            this.selecteditem = core.getClonedObject(treeNode) || {};
+            this.selecteditem.path = this.getPath(treeNode, "");
+            var deSelectElm = $("li[treenode].selected");
+            deSelectElm.removeClass("selected");
+            var selectElm = $("#" + treeNode.tId + ":has(.curSelectedNode)");
             selectElm.addClass("selected");
-            var classList = (this.treeClass || "").split(" ");
-            if (classList.includes("Checkbox") || classList.includes("Radio")) {
-                this.setChecked(node, node.data);
-            }
-            var path = this.getPath(node, "");
-            this.selecteditem = core.getClonedObject(node.data) || {};
-            this.selecteditem.path = path;
-            var eventParams = {
-                $event: event,
-                $item: core.getClonedObject(node.data),
-                $path: path
-            };
-            var nodeAction = node.data[this.nodeaction || "action"];
-            if (nodeAction) {
-                core.$parseEvent(nodeAction)(this);
-            }
-            this.invokeEventCallback("select", eventParams);
         };
         TreeComponent.prototype.expandNode = function(node, expand, eventFlag) {
-            this.zTree.expandNode(node, expand, false, false, eventFlag);
+            this.treeObj.expandNode(node, expand, false, false, eventFlag);
             var el = $("#" + node.tId + "_switch");
-            $(el).addClass(this.treeicons || defaultTreeIconClass);
+            $(el).addClass(this.treeicon || defaultTreeIconClass);
         };
-        TreeComponent.prototype.postRenderTree = function() {
+        TreeComponent.prototype.ngAfterViewInit = function() {
             var _this = this;
             setTimeout((function() {
-                _this.changeTreeIcons(_this.treeicons || defaultTreeIconClass);
-                if (_this.datavalue && !_this.selecteditem) {
-                    var nodes = _this.zTree.getNodes();
-                    var node = void 0;
-                    if (nodes.length) {
-                        if (_this.datavalue === "FirstNode") {
-                            node = nodes[0];
-                        }
-                        if (_this.datavalue === "LastNode") {
-                            node = nodes[nodes.length - 1];
+                _this.changeTreeIcons(_this.treeicon || defaultTreeIconClass);
+                if (_this.datavalue) {
+                    var nodes = _this.treeObj.getNodes();
+                    var selectNode = void 0;
+                    if (_this.datavalue === "FirstNode") {
+                        if (nodes.length) {
+                            selectNode = nodes[0];
                         }
                     }
-                    if (node) {
-                        _this.zTree.selectNode(node, false);
-                        _this.selectNode(undefined, node);
-                        _this.expandNode(node, true, false);
+                    if (_this.datavalue === "LastNode") {
+                        if (nodes.length) {
+                            selectNode = nodes[nodes.length - 1];
+                        }
                     }
+                    _this.treeObj.selectNode(selectNode, false);
+                    _this.setSelectedItem(selectNode);
+                    _this.expandNode(selectNode, true, false);
                 }
             }), 200);
         };
-        TreeComponent.prototype.selectById = function(value) {
-            var _a;
-            var simpleNodes = (_a = this.zTree) === null || _a === void 0 ? void 0 : _a.transformToArray(this.zTree.getNodes());
-            var node = simpleNodes === null || simpleNodes === void 0 ? void 0 : simpleNodes.find((function(node) {
-                return value === node.nodeId;
-            }));
-            if (node) {
-                this.zTree.selectNode(node, false);
-                this.selectNode(undefined, node);
-            }
-        };
-        TreeComponent.prototype.deselectById = function(value) {
-            this.selecteditem = {};
-            this.selectById();
-        };
         return TreeComponent;
     }(base.StylableComponent);
     TreeComponent.initializeProps = registerProps();
@@ -23517,36 +23604,6 @@
     TreeComponent.ctorParameters = function() {
         return [ {
             type: core$1.Injector
-        }, {
-            type: undefined,
-            decorators: [ {
-                type: core$1.Attribute,
-                args: [ "datavalue.bind" ]
-            } ]
-        }, {
-            type: undefined,
-            decorators: [ {
-                type: core$1.Attribute,
-                args: [ "nodelabel.bind" ]
-            } ]
-        }, {
-            type: undefined,
-            decorators: [ {
-                type: core$1.Attribute,
-                args: [ "nodeicon.bind" ]
-            } ]
-        }, {
-            type: undefined,
-            decorators: [ {
-                type: core$1.Attribute,
-                args: [ "nodechildren.bind" ]
-            } ]
-        }, {
-            type: undefined,
-            decorators: [ {
-                type: core$1.Attribute,
-                args: [ "nodeid.bind" ]
-            } ]
         } ];
     };
     var components = [ TreeComponent ];
@@ -24052,11 +24109,6 @@
                 i18nService.initCalendarLocale();
                 FullCalendar.__wm_locale_initialized = true;
             }
-            _this.cancelLocaleChangeSubscription = _this.getAppInstance().subscribe("locale-changed", (function(libLocale) {
-                _this.setLocale();
-                _this.applyCalendarOptions("option", "locale", libLocale.fullCalendar || "en");
-                _this.redraw();
-            }));
             return _this;
         }
         CalendarComponent.prototype.selectDate = function() {
@@ -24519,11 +24571,6 @@
                 }));
             }));
         };
-        CalendarComponent.prototype.ngOnDestroy = function() {
-            if (this.cancelLocaleChangeSubscription) {
-                this.cancelLocaleChangeSubscription();
-            }
-        };
         return CalendarComponent;
     }(base.StylableComponent);
     CalendarComponent.initializeProps = registerProps();
@@ -27111,7 +27158,7 @@
         type: core.Component,
         args: [ {
             selector: "wm-datetimepicker",
-            template: '\n    <ng-template #datetimepickerTemplate>\n        <div class="app-datetime-picker">\n            <div class="modal-body">\n                <div class="mobile-datetime-picker-options">\n\n                </div>\n                <bs-datepicker-inline\n                    [bsConfig]="bsDatepickerConfig"\n                    [datesDisabled]="excludedDatesToDisable"\n                    bsDatepicker\n                    [bsValue]="changedValue"\n                    (bsValueChange)="onDateUpdate($event)"\n                    *ngIf="mode === \'DATE_TIME\' || mode === \'DATE\'">\n                </bs-datepicker-inline>\n                <wm-timepicker\n                    [value]="changedValue"\n                    [min]="minTime"\n                    [max]="maxTime"\n                    (change)="onTimeUpdate($event)"\n                    *ngIf="mode === \'DATE_TIME\' || mode === \'TIME\'"></wm-timepicker>\n                <span class="text-primary date-picker-value">\n                    {{getDateLabel()}}\n                </span>\n            </div>\n            <div class="modal-footer">\n                <button\n                    *ngIf="mode === \'DATE_TIME\' || mode === \'DATE\'"\n                    class="btn btn-secondary today-btn"\n                    (click)="setToday()">{{appLocale.LABEL_TODAY_DATE || "Today" }}</button>\n                <button\n                    class="btn btn-primary pull-right ok-btn"\n                    *ngIf="mode === \'DATE_TIME\' || mode === \'TIME\'"\n                    (click)="onOkClick()">{{appLocale.LABEL_OK || "Ok" }}</button>\n                <button\n                    class="btn btn-secondary pull-right clear-btn"\n                    (click)="clear()">{{appLocale.LABEL_CLEAR_DATE || "Clear" }}</button>\n            </div>\n        </div>\n    </ng-template>\n    '
+            template: ' \n    <ng-template #datetimepickerTemplate>\n        <div class="app-datetime-picker">\n            <div class="modal-body">\n                <div class="mobile-datetime-picker-options">\n                    \n                </div>\n                <bs-datepicker-inline\n                    [bsConfig]="bsDatepickerConfig"\n                    [datesDisabled]="excludedDatesToDisable"\n                    bsDatepicker\n                    [bsValue]="changedValue"\n                    (bsValueChange)="onDateUpdate($event)"\n                    *ngIf="mode === \'DATE_TIME\' || mode === \'DATE\'">\n                </bs-datepicker-inline>\n                <wm-timepicker\n                    [value]="changedValue"\n                    [min]="minTime"\n                    [max]="maxTime"\n                    (change)="onTimeUpdate($event)"\n                    *ngIf="mode === \'DATE_TIME\' || mode === \'TIME\'"></wm-timepicker>\n                <span class="text-primary date-picker-value">\n                    {{getDateLabel()}}\n                </span>\n            </div>\n            <div class="modal-footer">\n                <button\n                    *ngIf="mode === \'DATE_TIME\' || mode === \'DATE\'"\n                    class="btn btn-secondary today-btn"\n                    (click)="setToday()">{{appLocale.MESSAGE_DATE_PICKER_TODAY || "Today" }}</button>\n                <button\n                    class="btn btn-primary pull-right ok-btn"\n                    *ngIf="mode === \'DATE_TIME\' || mode === \'TIME\'"\n                    (click)="onOkClick()">{{appLocale.MESSAGE_DATE_PICKER_OK || "Ok" }}</button>\n                <button\n                    class="btn btn-secondary pull-right clear-btn"\n                    (click)="clear()">{{appLocale.MESSAGE_DATE_PICKER_CLEAR || "Clear" }}</button>\n            </div>\n        </div>\n    </ng-template>\n    '
         } ]
     } ];
     DateTimePickerComponent.ctorParameters = function() {
@@ -27251,7 +27298,7 @@
         type: core.Component,
         args: [ {
             selector: "wm-timepicker",
-            template: '\n        <wm-pickergroup>\n            <wm-picker\n                [options]="options.hour"\n                [selectedValue]="hour"\n                (change)="set($event, \'HOUR\')"></wm-picker>\n            <span class="app-time-separator">:</span>\n            <wm-picker\n                [options]="options.minute"\n                [selectedValue]="minute"\n                (change)="set($event, \'MINUTE\')"></wm-picker>\n            <span class="app-time-separator">:</span>\n            <wm-picker\n                [options]="options.minute"\n                [selectedValue]="second"\n                (change)="set($event, \'SECOND\')"></wm-picker>\n        </wm-pickergroup>\n    '
+            template: ' \n        <wm-pickergroup>\n            <wm-picker \n                [options]="options.hour"\n                [selectedValue]="hour"\n                (change)="set($event, \'HOUR\')"></wm-picker>\n            <span class="app-time-separator">:</span>\n            <wm-picker \n                [options]="options.minute"\n                [selectedValue]="minute"\n                (change)="set($event, \'MINUTE\')"></wm-picker>\n            <span class="app-time-separator">:</span>\n            <wm-picker \n                [options]="options.minute"\n                [selectedValue]="second"\n                (change)="set($event, \'SECOND\')"></wm-picker>\n        </wm-pickergroup>\n    '
         } ]
     } ];
     TimePickerComponent.ctorParameters = function() {
@@ -27306,11 +27353,6 @@
             _this._dateOptions.clearPosition = "right";
             _this.meridians = common.getLocaleDayPeriods(_this.selectedLocale, common.FormStyle.Format, common.TranslationWidth.Abbreviated);
             _this.loadNativeDateInput = core$1.isMobile() && !_this.showcustompicker;
-            _this.cancelLocaleChangeSubscription = _this.getAppInstance().subscribe("locale-changed", (function(locale) {
-                _this.datePipe.datePipe.locale = locale.angular;
-                _this._dateOptions.todayButtonLabel = _this.i18nService.getLocalizedMessage("LABEL_TODAY_DATE");
-                _this._dateOptions.clearButtonLabel = _this.i18nService.getLocalizedMessage("LABEL_CLEAR_DATE");
-            }));
             return _this;
         }
         Object.defineProperty(BaseDateTimeComponent.prototype, "timeZone", {
@@ -27531,8 +27573,6 @@
                 if (event.originalEvent) {
                     _this.setFocusForDate(-1);
                 }
-                var prevMon = _this.getMonth(_this.activeDate, -1);
-                $(".bs-datepicker-head .previous").prepend('<p aria-hidden="false" class="sr-only">Changed to Previous Month, ' + prevMon.fullMonth + " and year " + prevMon.date.getFullYear() + "</p>");
                 setTimeout((function() {
                     $(".bs-datepicker-head .previous").focus();
                 }));
@@ -27544,8 +27584,6 @@
                 if (event.originalEvent) {
                     _this.setFocusForDate(1);
                 }
-                var nextMon = _this.getMonth(_this.activeDate, 1);
-                $(".bs-datepicker-head .next").prepend('<p aria-hidden="false" class="sr-only">Changed to Next Month, ' + nextMon.fullMonth + " and year " + nextMon.date.getFullYear() + "</p>");
                 setTimeout((function() {
                     $(".bs-datepicker-head .next").focus();
                 }));
@@ -27561,10 +27599,21 @@
                     _this.setFocusForMonthOrDay();
                 }
             }));
-            if (!this.clicked) {
-                datePickerHead.find(".next").attr("aria-label", "Next Month, " + this.next.fullMonth + " " + this.next.date.getFullYear());
-                datePickerHead.find(".previous").attr("aria-label", "Previous Month, " + this.prev.fullMonth + " " + this.prev.date.getFullYear());
-            }
+            datePickerHead.find(".next").attr("aria-label", "Next Month, " + this.next.fullMonth + " " + this.next.date.getFullYear());
+            datePickerHead.find(".previous").attr("aria-label", "Previous Month, " + this.prev.fullMonth + " " + this.prev.date.getFullYear());
+            setTimeout((function() {
+                var currentNodes = datePickerHead.find(".current span");
+                var msg = "Changed to month ";
+                datePickerHead.find(".current").attr("aria-live", "assertive").attr("aria-atomic", "false");
+                if (_this.clicked) {
+                    if ($(currentNodes[0]).text()) {
+                        datePickerHead.find(".ng-star-inserted").prepend('<div class="sr-only">' + msg + "</div>");
+                    }
+                    if ($(currentNodes[1]).text()) {
+                        datePickerHead.find(".current").last().prepend('<div class="sr-only"> and year </div>');
+                    }
+                }
+            }));
         };
         BaseDateTimeComponent.prototype.setFocusForMonthOrDay = function() {
             var activeMonthOrYear = $(".bs-datepicker-head .current").first().text();
@@ -28084,9 +28133,6 @@
             if (this.dateOnShowSubscription) {
                 this.dateOnShowSubscription.unsubscribe();
             }
-            if (this.cancelLocaleChangeSubscription) {
-                this.cancelLocaleChangeSubscription();
-            }
             _super.prototype.ngOnDestroy.call(this);
         };
         BaseDateTimeComponent.prototype.ngOnDetach = function() {
@@ -28215,11 +28261,8 @@
                 return core$1.getFormattedDate(this.datePipe, this.bsDataValue, this.outputformat, this.timeZone, null, this.isCurrentDate, this) || "";
             },
             set: function(newVal) {
-                var _this = this;
                 if (newVal === CURRENT_DATE$1) {
-                    setTimeout((function() {
-                        _this.bsDataValue = _this.timeZone ? core$1.getMomentLocaleObject(_this.timeZone) : new Date;
-                    }), 50);
+                    this.bsDataValue = this.timeZone ? core$1.getMomentLocaleObject(this.timeZone) : new Date;
                     this.isCurrentDate = true;
                 } else {
                     this.bsDataValue = newVal ? core$1.getDateObj(newVal, {
@@ -28320,6 +28363,7 @@
                 this.invokeEventCallback("click", {
                     $event: $event
                 });
+                this.focusOnInputEl();
             }
             if ($event.target && $($event.target).is("input") && !this.isDropDownDisplayEnabledOnInput(this.showdropdownon)) {
                 $event.stopPropagation();
@@ -28706,6 +28750,7 @@
                 this.invokeEventCallback("click", {
                     $event: $event
                 });
+                this.focusOnInputEl();
             }
             if ($event.target && $($event.target).is("input") && !this.isDropDownDisplayEnabledOnInput(this.showdropdownon)) {
                 $event.stopPropagation();
@@ -29027,6 +29072,7 @@
                 this.invokeEventCallback("click", {
                     $event: $event
                 });
+                this.focusOnInputEl();
             }
             if ($event.target && $($event.target).is("input") && !this.isDropDownDisplayEnabledOnInput(this.showdropdownon)) {
                 return;
@@ -32388,11 +32434,7 @@
             var value = _.get(dataObj, xKey);
             if (isLineTypeChart(this.type) && !core.isNumberType(this.xAxisDataType)) {
                 this.xDataKeyArr.push(value);
-                if (value instanceof Date) {
-                    return value;
-                } else {
-                    return index;
-                }
+                return value;
             }
             return value;
         };
@@ -51200,14 +51242,9 @@
             }));
         } else {
             var element = self.$element.find('[wmformfield][key="' + fieldName + '"]');
-            if (!element.length) {
-                element = self.$element.find('[wmformfield][name="' + fieldName + '"]');
-            }
-            if (element.length) {
-                element[0].setAttribute("__errormsg", element[0].getAttribute("__validationId"));
-                (_a = element[0].querySelector("input")) === null || _a === void 0 ? void 0 : _a.setAttribute("aria-invalid", ngForm.invalid);
-                (_b = element[0].querySelector("input")) === null || _b === void 0 ? void 0 : _b.setAttribute("aria-describedby", element[0].getAttribute("__validationId"));
-            }
+            element[0].setAttribute("__errormsg", element[0].getAttribute("__validationId"));
+            (_a = element[0].querySelector("input")) === null || _a === void 0 ? void 0 : _a.setAttribute("aria-invalid", ngForm.invalid);
+            (_b = element[0].querySelector("input")) === null || _b === void 0 ? void 0 : _b.setAttribute("aria-describedby", element[0].getAttribute("__validationId"));
             ngForm.markAsTouched();
         }
     };
@@ -58659,7 +58696,6 @@
             _this.heading = heading;
             _this.title = title;
             _this._isFirstLoad = true;
-            _this._isOnLoadTriggered = false;
             _this.$lazyLoad = core.noop;
             _this.isActive = false;
             _this.disabled = false;
@@ -58710,10 +58746,6 @@
                         return c.redraw();
                     }));
                 }
-                if (!_this._isOnLoadTriggered && !_this.content) {
-                    _this.invokeEventCallback("load");
-                    _this._isOnLoadTriggered = true;
-                }
             }), 100);
         };
         TabPaneComponent.prototype.notifyParent = function(evt) {
@@ -68323,7 +68355,6 @@
                 timezone: "",
                 number: ""
             };
-            _this.bundleLoaded = {};
             _this.appLocale = {};
             _this.prefabLocale = new Map;
             return _this;
@@ -68390,8 +68421,6 @@
                 _this.extendMessages(bundle.messages);
                 _this.extendPrefabMessages(bundle);
                 _this.appDefaults.setFormats(bundle.formats);
-                _this.bundleLoaded.app = true;
-                _this.notifyLocaleChanged();
             }));
         };
         I18nServiceImpl.prototype.loadMomentLocaleBundle = function(momentLocale) {
@@ -68408,8 +68437,6 @@
                 _config = _config && _config._config;
                 chronos.defineLocale(_this.selectedLocale, _config);
                 _this.bsLocaleService.use(_this.getSelectedLocale() || _this.defaultSupportedLocale);
-                _this.bundleLoaded.moment = true;
-                _this.notifyLocaleChanged();
             }));
         };
         I18nServiceImpl.prototype.loadAngularLocaleBundle = function(angLocale) {
@@ -68439,7 +68466,6 @@
                 return Promise.resolve();
             }
             if (!force && (i2.isMobile() || i2.isMobileApp() || this.selectedLocale === this.defaultSupportedLocale)) {
-                this.bundleLoaded.fullCalendar = true;
                 return;
             }
             return i2.loadScripts([ path ], true);
@@ -68469,21 +68495,11 @@
             }));
         };
         I18nServiceImpl.prototype.loadLocaleBundles = function(libLocale) {
-            var _this = this;
-            var _a;
             if (libLocale.moment) {
                 this.loadMomentLocaleBundle(libLocale.moment);
-            } else if (this.selectedLocale === this.defaultSupportedLocale) {
-                this.bsLocaleService.use(this.getSelectedLocale() || this.defaultSupportedLocale);
-                this.bundleLoaded.moment = true;
             }
             if (libLocale.fullCalendar && window["FullCalendar"]) {
-                (_a = this.loadCalendarLocaleBundle(libLocale.fullCalendar)) === null || _a === void 0 ? void 0 : _a.then((function() {
-                    _this.bundleLoaded.fullCalendar = true;
-                    _this.notifyLocaleChanged();
-                }));
-            } else {
-                this.bundleLoaded.fullCalendar = true;
+                this.loadCalendarLocaleBundle(libLocale.fullCalendar);
             }
             if (libLocale.angular) {
                 this.loadAppLocaleBundle();
@@ -68523,15 +68539,8 @@
             i2.setSessionStorageItem("selectedLocale", locale);
             this.selectedLocale = locale;
             this.init();
-            this.bundleLoaded.moment = false;
-            this.bundleLoaded.fullCalendar = false;
-            this.bundleLoaded.app = false;
-            this.bundleLoaded.angular = false;
-            this.bundleLoaded.libLocale = libLocale;
             return this.loadLocaleBundles(libLocale).then((function() {
-                _this.updateLocaleDirection();
-                _this.bundleLoaded.angular = true;
-                _this.notifyLocaleChanged();
+                return _this.updateLocaleDirection();
             }));
         };
         I18nServiceImpl.prototype.deduceAppLocale = function() {
@@ -68567,7 +68576,6 @@
             return defaultLanguage;
         };
         I18nServiceImpl.prototype.loadDefaultLocale = function() {
-            Date.prototype["month"] = Date.prototype.getMonth;
             var locale = this.deduceAppLocale();
             return this.setSelectedLocale(locale);
         };
@@ -68605,11 +68613,6 @@
         I18nServiceImpl.prototype.getwidgetLocale = function() {
             return this.formatsByLocale;
         };
-        I18nServiceImpl.prototype.notifyLocaleChanged = function() {
-            if (this.bundleLoaded.moment && this.bundleLoaded.fullCalendar && this.bundleLoaded.angular && this.bundleLoaded.app) {
-                this.app.notify("locale-changed", this.bundleLoaded.libLocale);
-            }
-        };
         return I18nServiceImpl;
     }(i2.AbstractI18nService);
     I18nServiceImpl.decorators = [ {