@wavemaker/app-runtime-wm-build 11.4.0-next.141076 → 11.4.0-next.141078

app-runtime-wm-build/wmmobile/scripts/wm-mobileloader.js

@@ -11229,7 +11229,7 @@
             if (openedDialogs.indexOf(ref) !== -1) {
                 openedDialogs.splice(openedDialogs.indexOf(ref), 1);
             }
-            if (openedDialogs.length === 0 && core$1.isMobileApp()) {
+            if (openedDialogs.length === 0 && (core$1.isMobile() || core$1.isMobileApp())) {
                 var parentSelector = $("body > app-root")[0];
                 parentSelector.removeAttribute("aria-hidden");
             }
@@ -26924,22 +26924,24 @@
             configurable: true
         });
         DateTimePickerComponent.prototype.validateSelectedDate = function() {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e;
             if (!this.changedValue) {
                 return true;
             }
             var cd = moment(this.changedValue);
-            if (((_a = this._bsDatepickerConfig) === null || _a === void 0 ? void 0 : _a.minDate) && ((_b = this._bsDatepickerConfig) === null || _b === void 0 ? void 0 : _b.minDate) > this.changedValue) {
+            var minDate = (_a = this._bsDatepickerConfig) === null || _a === void 0 ? void 0 : _a.minDate;
+            var maxDate = (_b = this._bsDatepickerConfig) === null || _b === void 0 ? void 0 : _b.maxDate;
+            if (minDate && (this.mode === "DATE" && moment(minDate).startOf("day").toDate() > this.changedValue || this.mode !== "DATE" && minDate > this.changedValue)) {
                 return false;
             }
-            if (((_c = this._bsDatepickerConfig) === null || _c === void 0 ? void 0 : _c.maxDate) && ((_d = this._bsDatepickerConfig) === null || _d === void 0 ? void 0 : _d.maxDate) < this.changedValue) {
+            if (maxDate && (this.mode === "DATE" && moment(maxDate).endOf("day").toDate() < this.changedValue || this.mode !== "DATE" && maxDate < this.changedValue)) {
                 return false;
             }
-            if (((_f = (_e = this._bsDatepickerConfig) === null || _e === void 0 ? void 0 : _e.daysDisabled) === null || _f === void 0 ? void 0 : _f.indexOf(cd.day())) >= 0) {
+            if (((_d = (_c = this._bsDatepickerConfig) === null || _c === void 0 ? void 0 : _c.daysDisabled) === null || _d === void 0 ? void 0 : _d.indexOf(cd.day())) >= 0) {
                 return false;
             }
             var cdSt = cd.startOf("day").toDate().getTime();
-            if ((_g = this.excludedDatesToDisable) === null || _g === void 0 ? void 0 : _g.find((function(d) {
+            if ((_e = this.excludedDatesToDisable) === null || _e === void 0 ? void 0 : _e.find((function(d) {
                 return d.getTime() === cdSt;
             }))) {
                 return false;
@@ -26988,6 +26990,9 @@
                 newVal.setMilliseconds(oldVal.getMilliseconds());
             }
             this.changedValue = newVal;
+            if (this.mode === "DATE" && oldVal !== newVal && this.validateSelectedDate()) {
+                this.onOkClick();
+            }
         };
         DateTimePickerComponent.prototype.onTimeUpdate = function(newVal) {
             this.changedValue = newVal;
@@ -27009,6 +27014,10 @@
             this.triggerChange();
             this.hideModal();
         };
+        DateTimePickerComponent.prototype.setToday = function() {
+            var today = moment().startOf("day").toDate();
+            this.onDateUpdate(today);
+        };
         DateTimePickerComponent.prototype.reset = function() {
             this.changedValue = this._value;
         };
@@ -27043,7 +27052,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                    class="btn btn-secondary clear-btn"\n                    (click)="clear()">{{appLocale.MESSAGE_DATE_PICKER_CLEAR || "Clear" }}</button>\n                <button\n                    class="btn btn-primary pull-right ok-btn"\n                    (click)="onOkClick()">{{appLocale.MESSAGE_DATE_PICKER_OK || "Ok" }}</button>\n                <button\n                    class="btn btn-secondary pull-right cancel-btn"\n                    (click)="hideModal()">{{appLocale.MESSAGE_DATE_PICKER_CANCEL || "Cancel" }}</button>\n                \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() {
@@ -27126,8 +27135,8 @@
             }
             return arr;
         };
-        TimePickerComponent.prototype.set = function(_h, unit) {
-            var index = _h.index, value = _h.value;
+        TimePickerComponent.prototype.set = function(_f, unit) {
+            var index = _f.index, value = _f.value;
             if (unit === "HOUR") {
                 this.value = moment(this.value).hour(parseInt(value)).toDate();
             } else if (unit === "MINUTE") {
@@ -36432,15 +36441,22 @@
             _this.dialogService = inj.get(core.AbstractDialogService);
             _this.bsModal = inj.get(modal.BsModalService);
             var router$1 = inj.get(router.Router);
-            var subscriptions = [ _this.bsModal.onShown.subscribe((function() {
+            var subscriptions = [ _this.bsModal.onShown.subscribe((function(_a) {
+                var id = _a.id;
                 var ref = _this.dialogService.getLastOpenedDialog();
                 if (ref === _this) {
                     invokeOpenedCallback(ref);
+                    _this.dialogId = id;
                 }
             })), _this.bsModal.onShow.subscribe((function() {
                 focusTrapObj.activeElement = document.activeElement;
             })), _this.bsModal.onHidden.subscribe((function(closeReason) {
-                var ref = closeReason === "esc" || closeReason === "backdrop-click" ? _this.dialogService.getLastOpenedDialog() : _this.dialogService.getDialogRefFromClosedDialogs();
+                var ref = _this.dialogService.getDialogRefFromClosedDialogs();
+                if (_this.dialogId && (closeReason === null || closeReason === void 0 ? void 0 : closeReason.id) === _this.dialogId) {
+                    ref = _this;
+                } else if (closeReason === "esc" || closeReason === "backdrop-click") {
+                    ref = _this.dialogService.getLastOpenedDialog();
+                }
                 if (ref === _this) {
                     _this.dialogService.removeFromOpenedDialogs(ref);
                     _this.dialogService.removeFromClosedDialogs(ref);
@@ -36480,7 +36496,7 @@
             Object.assign(this.context, initState);
             this.modalOptions.ariaLabelledBy = this.titleId;
             this.dialogRef = this.bsModal.show(this.getTemplateRef(), this.modalOptions);
-            if (this.dialogService.getOpenedDialogs().length === 1 && core.isMobileApp()) {
+            if (this.dialogService.getOpenedDialogs().length === 1 && (core.isMobile() || core.isMobileApp())) {
                 var parentSelector = $("body > app-root")[0];
                 parentSelector.setAttribute("aria-hidden", "true");
             }
@@ -42315,11 +42331,31 @@
                         $index: _this.dn.currentPage
                     });
                     _this.goToPage();
+                    if (_this.navigation === "Basic") {
+                        _this._setAriaForBasicNavigation();
+                    }
                 }
             }), base.DEBOUNCE_TIMES.PAGINATION_DEBOUNCE_TIME);
             base.styler(_this.nativeElement, _this);
             return _this;
         }
+        PaginationComponent.prototype._setAriaForBasicNavigation = function() {
+            _.forEach(this.nativeElement.getElementsByTagName("a"), (function(item) {
+                item.setAttribute("href", "javascript:void(0);");
+                var childNode = item.querySelector("span");
+                if ((childNode === null || childNode === void 0 ? void 0 : childNode.dataset.isacitvepage) === "true") {
+                    item.setAttribute("aria-current", "true");
+                    setTimeout((function() {
+                        return item.focus();
+                    }));
+                }
+                if ((childNode === null || childNode === void 0 ? void 0 : childNode.dataset.isdisabled) === "true") {
+                    item.setAttribute("aria-disabled", "true");
+                } else {
+                    item.removeAttribute("aria-disabled");
+                }
+            }));
+        };
         PaginationComponent.prototype.setResult = function(result) {
             this.result = result;
             this.resultEmitter.emit(this.result);
@@ -42436,9 +42472,7 @@
                     this.resetPageNavigation();
                 }
                 if (this.navigation === "Basic") {
-                    _.forEach(this.nativeElement.getElementsByTagName("a"), (function(item) {
-                        item.setAttribute("href", "javascript:void(0);");
-                    }));
+                    this._setAriaForBasicNavigation();
                 }
             } else {
                 if (newVal && !_.isString(newVal)) {
@@ -42715,7 +42749,7 @@
         type: core.Component,
         args: [ {
             selector: "[wmPagination]",
-            template: '\n<ul class="pagination advanced {{navigationClass}}" *ngIf="navcontrols === \'Classic\'">\n    <li [ngClass]="{\'disabled\':isDisableFirst}">\n        <a [title]="appLocale.LABEL_FIRST" name="first" href="javascript:void(0);" aria-label="First"\n           (click)="navigatePage(\'first\', $event)">\n            <span aria-hidden="true"><i class="wi wi-first-page"></i></span>\n            <span class="sr-only">{{appLocale.LABEL_FIRST}}</span>\n        </a>\n    </li>\n    <li [ngClass]="{\'disabled\':isDisablePrevious}">\n        <a [title]="appLocale.LABEL_PREVIOUS" name="prev" href="javascript:void(0);" aria-label="Previous"\n           (click)="navigatePage(\'prev\', $event)">\n            <span aria-hidden="true"><i class="wi wi-chevron-left"></i></span>\n            <span class="sr-only">{{appLocale.LABEL_PREVIOUS}}</span>\n        </a>\n    </li>\n    <li class="pagecount disabled">\n        <a><input type="number" [disabled]="isDisableCurrent" [(ngModel)]="dn.currentPage" [attr.aria-label]="\'Page Navigation \' + dn.currentPage"\n                  (keydown)="onKeyDown($event)" (change)="onModelChange($event)" class="form-control"/></a>\n    </li>\n    <li class="disabled">\n        <a [hidden]="isDisableCount"> / {{pageCount}}</a>\n    </li>\n    <li [ngClass]="{\'disabled\':isDisableNext}">\n        <a [title]="appLocale.LABEL_NEXT" name="next" href="javascript:void(0);" aria-label="Next"\n           (click)="navigatePage(\'next\', $event)">\n            <span aria-hidden="true"><i class="wi wi-chevron-right"></i></span>\n            <span class="sr-only">{{appLocale.LABEL_NEXT}}</span>\n        </a>\n    </li>\n    <li [ngClass]="{\'disabled\':isDisableLast}">\n        <a [title]="appLocale.LABEL_LAST" name="last" href="javascript:void(0);" aria-label="Last"\n           (click)="navigatePage(\'last\', $event)">\n            <span aria-hidden="true"><i class="wi wi-last-page"></i></span>\n            <span class="sr-only">{{appLocale.LABEL_LAST}}</span>\n        </a>\n    </li>\n    <li *ngIf="showrecordcount" class="totalcount disabled">\n        <a>{{appLocale.LABEL_TOTAL_RECORDS}}: {{dataSize}}</a>\n    </li>\n</ul>\n<ul class="pager {{navigationClass}}" *ngIf="navcontrols === \'Pager\'">\n    <li class="previous" [ngClass]="{\'disabled\':isDisablePrevious}">\n        <a href="javascript:void(0);" (click)="navigatePage(\'prev\', $event)" aria-label="Previous">\n            <span aria-hidden="true"><i class="wi wi-chevron-left"></i></span>\n            {{appLocale.LABEL_PREVIOUS}}\n            <span class="sr-only">{{appLocale.LABEL_PREVIOUS}}</span>\n        </a>\n    </li>\n    <li class="next" [ngClass]="{\'disabled\':isDisableNext}">\n        <a href="javascript:void(0);" (click)="navigatePage(\'next\', $event)" aria-label="Next">\n            {{appLocale.LABEL_NEXT}}\n            <span aria-hidden="true"><i class="wi wi-chevron-right"></i></span>\n            <span class="sr-only">{{appLocale.LABEL_NEXT}}</span>\n        </a>\n    </li>\n</ul>\n\n<pagination class="pagination basic" [ngClass]="navigationClass" *ngIf="navcontrols === \'Basic\'" role="navigation"\n            [itemsPerPage]="maxResults" [totalItems]="dataSize"\n            [ngModel]="dn.currentPage" (pageChanged)="pageChanged($event)"\n            [attr.aria-label]="\'Page \' + dn.currentPage + \' of \' + pageCount + \' pages\'"\n            [boundaryLinks]="boundarylinks" [maxSize]="maxsize"\n            [directionLinks]="directionlinks" previousText="." nextText="." firstText="." lastText="."></pagination>\n\n<ul *ngIf="navcontrols === \'Basic\' && showrecordcount" class="pagination">\n    <li class="totalcount disabled basiccount"><a>{{appLocale.LABEL_TOTAL_RECORDS}}: {{dataSize}}</a></li>\n</ul>\n',
+            template: '\n<ul class="pagination advanced {{navigationClass}}" *ngIf="navcontrols === \'Classic\'">\n    <li [ngClass]="{\'disabled\':isDisableFirst}">\n        <a [title]="appLocale.LABEL_FIRST" name="first" href="javascript:void(0);"\n           [attr.aria-disabled]="isDisableFirst"\n           (click)="navigatePage(\'first\', $event)">\n            <span aria-hidden="true"><i class="wi wi-first-page"></i></span>\n            <span class="sr-only">Go to first page {{ isDisableFirst ? \' , Disabled\' : \'\'}}</span>\n        </a>\n    </li>\n    <li [ngClass]="{\'disabled\':isDisablePrevious}">\n        <a [title]="appLocale.LABEL_PREVIOUS" name="prev" href="javascript:void(0);"\n            [attr.aria-disabled]="isDisablePrevious"\n            (click)="navigatePage(\'prev\', $event)">\n            <span aria-hidden="true"><i class="wi wi-chevron-left"></i></span>\n            <span class="sr-only">Go to previous page {{ isDisablePrevious ? \', Disabled\' : \'\'}}</span>\n        </a>\n    </li>\n    <li class="pagecount disabled">\n        <a href="javascript:void(0);">\n            <input type="number" [disabled]="isDisableCurrent" [(ngModel)]="dn.currentPage" [attr.aria-label]="\'Showing Page \' + dn.currentPage + \' of \' + pageCount"\n                  (keydown)="onKeyDown($event)" (change)="onModelChange($event)" class="form-control"/>\n        </a>\n    </li>\n    <li class="disabled">\n        <a [hidden]="isDisableCount"> / {{pageCount}}</a>\n    </li>\n    <li [ngClass]="{\'disabled\':isDisableNext}">\n        <a [title]="appLocale.LABEL_NEXT" name="next" href="javascript:void(0);"\n           [attr.aria-disabled]="isDisableNext"\n           (click)="navigatePage(\'next\', $event)">\n            <span aria-hidden="true"><i class="wi wi-chevron-right"></i></span>\n            <span class="sr-only">Go to next page {{ isDisableNext ? \' , Disabled\' : \'\'}}</span>\n        </a>\n    </li>\n    <li [ngClass]="{\'disabled\':isDisableLast}">\n        <a [title]="appLocale.LABEL_LAST" name="last" href="javascript:void(0);"\n           [attr.aria-disabled]="isDisableLast"\n           (click)="navigatePage(\'last\', $event)">\n            <span aria-hidden="true"><i class="wi wi-last-page"></i></span>\n            <span class="sr-only">Go to last page {{ isDisableLast ? \' , Disabled\' : \'\'}}</span>\n        </a>\n    </li>\n    <li *ngIf="showrecordcount" class="totalcount disabled">\n        <a href="javascript:void(0);" tabindex="-1" aria-disabled="true">{{appLocale.LABEL_TOTAL_RECORDS}}: {{dataSize}}</a>\n    </li>\n</ul>\n<ul class="pager {{navigationClass}}" *ngIf="navcontrols === \'Pager\'">\n    <li class="previous" [ngClass]="{\'disabled\':isDisablePrevious}">\n        <a href="javascript:void(0);" (click)="navigatePage(\'prev\', $event)"\n           [attr.aria-disabled]="isDisablePrevious">\n            <span aria-hidden="true"><i class="wi wi-chevron-left"></i></span>\n            {{appLocale.LABEL_PREVIOUS}}\n            <span class="sr-only">{{ isDisablePrevious ? \' , Disabled\' : \'\'}}</span>\n        </a>\n    </li>\n    <li class="next" [ngClass]="{\'disabled\':isDisableNext}">\n        <a href="javascript:void(0);" (click)="navigatePage(\'next\', $event)"\n           [attr.aria-disabled]="isDisableNext">\n            <span aria-hidden="true"><i class="wi wi-chevron-right"></i></span>\n            {{appLocale.LABEL_NEXT}}\n            <span class="sr-only">{{ isDisableNext ? \' , Disabled\' : \'\'}}</span>\n        </a>\n    </li>\n</ul>\n\n<pagination class="pagination basic" [ngClass]="navigationClass" *ngIf="navcontrols === \'Basic\'" role="navigation"\n            [itemsPerPage]="maxResults" [totalItems]="dataSize"\n            [ngModel]="dn.currentPage" (pageChanged)="pageChanged($event)"\n            [attr.aria-label]="\'Showing Page \' + dn.currentPage + \' of \' + pageCount + \' pages\'"\n            [boundaryLinks]="boundarylinks" [maxSize]="maxsize"\n            [directionLinks]="directionlinks"\n            firstText="Firtst" lastText="Last"\n            [customPreviousTemplate]="prevTemplate"\n            [customNextTemplate]="nextTemplate"\n            [customPageTemplate]="pageTemplate"></pagination>\n\n<ul *ngIf="navcontrols === \'Basic\' && showrecordcount" class="pagination">\n    <li class="totalcount disabled basiccount">\n        <a href="javascript:void(0);" tabindex="-1" aria-disabled="true">{{appLocale.LABEL_TOTAL_RECORDS}}: {{dataSize}}</a>\n    </li>\n</ul>\n\n<ng-template #pageTemplate let-page>\n    <span class="sr-only" [attr.data-isacitvepage]="page.active">{{\'Page \'}}</span>\n    {{page.number}}\n    <span class="sr-only" *ngIf="page.active"> {{\', Showing page \' + page.number + \' of \' + pageCount}}</span>\n</ng-template>\n<ng-template #prevTemplate let-disabled="disabled">\n    <span class="sr-only" [attr.data-isdisabled]="disabled">Go to Previous page {{disabled ? \', Disabled\' : \'\'}}</span>\n</ng-template>\n<ng-template #nextTemplate let-disabled="disabled">\n    <span class="sr-only" [attr.data-isdisabled]="disabled">Go to Next page {{disabled ? \', Disabled\' : \'\'}}</span>\n</ng-template>\n',
             providers: [ base.provideAsWidgetRef(PaginationComponent) ]
         } ]
     } ];
@@ -44748,7 +44782,7 @@
             return this.datasource.execute(operation, options);
         };
         ListComponent.prototype.handleKeyDown = function($event, action) {
-            var _this = this;
+            var _d, _e;
             $event.stopPropagation();
             if ($event.keyCode !== 13 && $event.keyCode !== 9 && !(($event.target.classList.contains("form-control") || $event.target.classList.contains("note-editable")) && $event.keyCode === 32)) {
                 $event.preventDefault();
@@ -44790,27 +44824,21 @@
             }
             if (action === "focusPrev") {
                 if (this.isListElementMovable) {
-                    var prev_1;
                     presentIndex = presentIndex <= 0 ? 0 : presentIndex;
-                    this.lastSelectedItem = this.getListItemByIndex(presentIndex);
                     if (presentIndex === 0) {
-                        prev_1 = this.listItems.last;
                         return;
                     }
-                    this.listItems.forEach((function($liItem, idx) {
-                        if (idx === presentIndex) {
-                            prev_1.nativeElement.before($liItem.nativeElement);
-                            _this.lastSelectedItem.nativeElement.focus();
-                            var arr = _this.listItems.toArray();
-                            var temp = arr[presentIndex];
-                            arr[presentIndex] = arr[presentIndex - 1];
-                            arr[presentIndex - 1] = temp;
-                            _this.listItems.reset(arr);
-                            _this.currentIndex = presentIndex;
-                            _this.ariaText = "selected ";
-                        }
-                        prev_1 = $liItem;
-                    }));
+                    this.lastSelectedItem = this.getListItemByIndex(presentIndex);
+                    var prevElt = this.getListItemByIndex(presentIndex - 1);
+                    prevElt.nativeElement.before(this.lastSelectedItem.nativeElement);
+                    this.lastSelectedItem.nativeElement.focus();
+                    this.statePersistence.removeWidgetState(this, "selectedItem");
+                    var arr = this.listItems.toArray();
+                    _d = __read([ arr[presentIndex], arr[presentIndex - 1] ], 2), arr[presentIndex - 1] = _d[0], 
+                    arr[presentIndex] = _d[1];
+                    this.listItems.reset(arr);
+                    this.currentIndex = presentIndex;
+                    this.ariaText = "selected ";
                 } else {
                     presentIndex = presentIndex <= 0 ? 0 : presentIndex - 1;
                     this.lastSelectedItem = this.getListItemByIndex(presentIndex);
@@ -44820,27 +44848,21 @@
                 }
             } else if (action === "focusNext") {
                 if (this.isListElementMovable) {
-                    var prev_2;
                     presentIndex = presentIndex < listItems.length - 1 ? presentIndex : listItems.length - 1;
-                    this.lastSelectedItem = this.getListItemByIndex(presentIndex);
                     if (presentIndex === this.listItems.length - 1) {
-                        prev_2 = this.listItems.first;
                         return;
                     }
-                    this.listItems.forEach((function($liItem, idx) {
-                        if (idx === presentIndex + 1) {
-                            prev_2.nativeElement.before($liItem.nativeElement);
-                            _this.lastSelectedItem.nativeElement.focus();
-                            var arr = _this.listItems.toArray();
-                            var temp = arr[presentIndex + 1];
-                            arr[presentIndex + 1] = arr[presentIndex];
-                            arr[presentIndex] = temp;
-                            _this.listItems.reset(arr);
-                            _this.currentIndex = idx + 1;
-                            _this.ariaText = "selected ";
-                        }
-                        prev_2 = $liItem;
-                    }));
+                    this.lastSelectedItem = this.getListItemByIndex(presentIndex);
+                    var nextElt = this.getListItemByIndex(presentIndex + 1);
+                    nextElt.nativeElement.after(this.lastSelectedItem.nativeElement);
+                    this.lastSelectedItem.nativeElement.focus();
+                    this.statePersistence.removeWidgetState(this, "selectedItem");
+                    var arr = this.listItems.toArray();
+                    _e = __read([ arr[presentIndex + 1], arr[presentIndex] ], 2), arr[presentIndex] = _e[0], 
+                    arr[presentIndex + 1] = _e[1];
+                    this.listItems.reset(arr);
+                    this.currentIndex = presentIndex + 2;
+                    this.ariaText = "selected ";
                 } else {
                     presentIndex = presentIndex < listItems.length - 1 ? presentIndex + 1 : listItems.length - 1;
                     this.lastSelectedItem = this.getListItemByIndex(presentIndex);
@@ -44862,11 +44884,10 @@
                 this.isListElementMovable = !this.isListElementMovable;
                 this.onItemClick($event, this.getListItemByIndex(presentIndex));
                 this.currentIndex = presentIndex + 1;
-                var name = this.getListItemByIndex(presentIndex).item.name;
                 if (this.isListElementMovable) {
-                    this.ariaText = name + " grabbed, current position ";
+                    this.ariaText = "Item " + this.currentIndex + " grabbed, current position ";
                 } else {
-                    this.ariaText = name + " dropped, final position ";
+                    this.ariaText = "Item " + this.currentIndex + " dropped, final position ";
                 }
             }
         };
@@ -45104,7 +45125,7 @@
         type: core$1.Component,
         args: [ {
             selector: "div[wmList]",
-            template: '<div class="panel-heading" *ngIf="title || subheading || iconclass">\n    <h3 class="panel-title">\n        <div class="pull-left">\n            <i class="app-icon panel-icon {{iconclass}}" aria-hidden="true" [hidden]="!iconclass"></i>\n        </div>\n        <div class="pull-left">\n            <div class="heading" [innerHTML]="title"></div>\n            <div class="description" [innerHTML]="subheading"></div>\n        </div>\n    </h3>\n</div>\n\n<nav class="app-datanavigator" [attr.aria-disabled]="dataNavigator.isDisablePrevious" aria-label="Page navigation" *ngIf="navigation === \'Inline\' && !noDataFound">\n    <ul class="pager">\n        <li class="previous" [ngClass]="{\'disabled\': (dataNavigator ? dataNavigator.isDisablePrevious : true)}">\n            <a href="javascript:void(0);" (click)="dataNavigator.navigatePage(\'prev\', $event)">\n                <i class="wi wi-chevron-left" aria-hidden="true"></i>\n                <span class="sr-only">Previous</span>\n            </a>\n        </li>\n    </ul>\n</nav>\n<div *ngIf="navigation === \'Inline\' && !noDataFound" aria-live="polite" aria-atomic="true" class="sr-only"> {{\'Item \' + dataNavigator.dn.currentPage + \' of \' + dataNavigator.pageCount }}</div>\n\n<div>\n    <div id={{titleId}} class="sr-only" *ngIf="enablereorder">\n        Press space bar to toggle drag drop mode, use arrow keys to move selected elements.\n    </div>\n\n    <div aria-live="assertive" *ngIf="listItems && enablereorder && currentIndex" class="sr-only" >\n        {{ariaText + currentIndex + \' of \' +  listItems.length}}\n    </div>    \n</div>\n\n<ul [attr.tabindex]="tabindex" [attr.aria-describedby] = "titleId"  class="app-livelist-container clearfix {{direction === \'horizontal\' ? \'app-horizontal-list\': \'\'}} {{listclass}}" role="list"\n    (keydown.enter)="handleKeyDown($event, \'select\')"\n\n    (keydown.space)="handleKeyDown($event, \'space\')"\n\n    (keydown.arrowup)="handleKeyDown($event, \'focusPrev\')"\n    (keydown.arrowdown)="handleKeyDown($event, \'focusNext\')"\n    (keydown.arrowleft)="handleKeyDown($event, \'focusPrev\')"\n    (keydown.arrowright)="handleKeyDown($event, \'focusNext\')"\n\n    (keydown.shift.arrowup)="handleKeyDown($event, \'selectPrev\')"\n    (keydown.shift.arrowdown)="handleKeyDown($event, \'selectNext\')"\n    (keydown.shift.arrowleft)="handleKeyDown($event, \'selectPrev\')"\n    (keydown.shift.arrowright)="handleKeyDown($event, \'selectNext\')"\n    [hidden]="noDataFound && !variableInflight"\n>\n    <ng-template [ngIf]="!groupby" [ngIfElse]="groupedListTemplate">\n        <li *ngFor="let item of fieldDefs; index as $index; first as $first; last as $last;" class="app-list-item {{direction === \'horizontal\' ? \'\' : itemsPerRowClass}}" [ngClass]="listItemRef.itemClass"\n            [wmListItem]="item"\n            #listItemRef="listItemRef"\n            [attr.tabindex]="tabindex"\n            role="listitem">\n            <ng-container [ngTemplateOutlet]="listTemplate" [ngTemplateOutletContext]="{item: item, $index: $index, itemRef: listItemRef, $first: $first, $last: $last, currentItemWidgets: listItemRef.currentItemWidgets}"></ng-container>\n        </li>\n    </ng-template>\n    <ng-container [ngTemplateOutlet]="listLeftActionTemplate"></ng-container>\n    <ng-container [ngTemplateOutlet]="listRightActionTemplate"></ng-container>\n</ul>\n\n<div class="no-data-msg" *ngIf="noDataFound && !variableInflight" [textContent]="nodatamessage"></div>\n\n<div class="loading-data-msg" *ngIf="variableInflight && !pulltorefresh">\n    <span>\n        <i class="app-icon panel-icon fa-spin" aria-hidden="true" [ngClass]="loadingicon"></i>\n        <span class="sr-only">Loading</span>\n        <span class="loading-text" [textContent]="loadingdatamsg"></span>\n    </span>\n</div>\n\n<nav class="app-datanavigator" [attr.aria-disabled]="dataNavigator.isDisableNext" *ngIf="navigation === \'Inline\' && !noDataFound">\n    <ul class="pager">\n        <li class="next" [ngClass]="{\'disabled\': (dataNavigator ? dataNavigator.isDisableNext  : true)}">\n            <a href="javascript:void(0);" (click)="dataNavigator.navigatePage(\'next\', $event)">\n                <i class="wi wi-chevron-right" aria-hidden="true"></i>\n                <span class="sr-only">Next</span>\n            </a>\n        </li>\n    </ul>\n</nav>\n\n<div class="panel-footer" *ngIf="navigation !== \'None\'" [hidden]="!showNavigation || (onDemandLoad && dataNavigator.isDisableNext) || (dataNavigator.dataSize <= pagesize) || (!dataNavigator.dataSize && !dataNavigator.datasource?.pagination?.next)">\n    <nav wmPagination\n         navigationalign.bind="navigationalign"\n         navigation.bind="navControls"\n         showrecordcount.bind="showrecordcount"\n         maxsize.bind="maxsize"\n         boundarylinks.bind="boundarylinks"\n         forceellipses.bind="forceellipses"\n         directionlinks.bind="directionlinks"\n         show.bind="!onDemandLoad"\n         paginationchange.event="beforePaginationChange($event, $index)"\n    ></nav>\n    <a *ngIf="onDemandLoad" href="javascript:void(0);"\n       (click)="dataNavigator.navigatePage(\'next\', $event)"\n       class="app-button btn btn-block"\n       [ngClass]="paginationclass"\n       [textContent]="ondemandmessage"\n    ></a>\n</div>\n\n\x3c!--This template will be displayed when groupby is specified--\x3e\n<ng-template #groupedListTemplate>\n    <li *ngFor="let groupObj of groupedData" class="app-list-item-group clearfix">\n        <ul [attr.tabindex]="tabindex" class="list-group item-group" [ngClass]="listclass">\n            <li class="app-list-item-header list-item list-group-header" (click)="handleHeaderClick($event)" [ngClass]="{\'collapsible-content\': collapsible}">\n            <h4>{{groupObj.key}}\n                <div class="header-action">\n                    <i class="app-icon wi action wi-chevron-up" *ngIf="collapsible"></i>\n                    <span *ngIf="showcount" class="label label-default">{{groupObj.data.length}}</span>\n                    </div>\n                </h4>\n            </li>\n            <ul class="list-group clearfix {{direction === \'horizontal\' ? \'app-horizontal-list\': \'\'}}">\n                <li *ngFor="let item of groupObj.data; index as $index; first as $first; last as $last;" [attr.tabindex]="tabindex"\n                    class="app-list-item group-list-item {{itemsPerRowClass}}"\n                    [ngClass]="listItemRef.itemClass"\n                    [wmListItem]="item" #listItemRef="listItemRef">\n                    <ng-container [ngTemplateOutlet]="listTemplate" [ngTemplateOutletContext]="{item: item, $index: $index, itemRef: listItemRef, $first: $first, $last: $last, currentItemWidgets: listItemRef.currentItemWidgets}"></ng-container>\n                </li>\n            </ul>\n        </ul>\n    </li>\n</ng-template>\n',
+            template: '<div class="panel-heading" *ngIf="title || subheading || iconclass">\n    <h3 class="panel-title">\n        <div class="pull-left">\n            <i class="app-icon panel-icon {{iconclass}}" aria-hidden="true" [hidden]="!iconclass"></i>\n        </div>\n        <div class="pull-left">\n            <div class="heading" [innerHTML]="title"></div>\n            <div class="description" [innerHTML]="subheading"></div>\n        </div>\n    </h3>\n</div>\n\n<div class="app-datanavigator" [attr.aria-disabled]="dataNavigator.isDisablePrevious" aria-label="Page navigation" *ngIf="navigation === \'Inline\' && !noDataFound">\n    <ul class="pager">\n        <li class="previous" [ngClass]="{\'disabled\': (dataNavigator ? dataNavigator.isDisablePrevious : true)}">\n            <a href="javascript:void(0);" (click)="dataNavigator.navigatePage(\'prev\', $event)"\n               [attr.aria-disabled]="dataNavigator.isDisablePrevious">\n                <i class="wi wi-chevron-left" aria-hidden="true"></i>\n                <span class="sr-only">Go to Previous page {{dataNavigator.isDisablePrevious ? \', Disabled\' : \'\'}}</span>\n            </a>\n        </li>\n    </ul>\n</div>\n<div *ngIf="navigation === \'Inline\' && !noDataFound" aria-live="polite" aria-atomic="true" class="sr-only"> {{\'Page \' + dataNavigator.dn.currentPage + \' of \' + dataNavigator.pageCount }}</div>\n\n<div>\n    <div id={{titleId}} class="sr-only" *ngIf="enablereorder">\n        Press space bar to toggle drag drop mode, use arrow keys to move selected elements.\n    </div>\n\n    <div aria-live="assertive" *ngIf="listItems && enablereorder && currentIndex" class="sr-only" >\n        {{ariaText + currentIndex + \' of \' +  listItems.length}}\n    </div>\n</div>\n\n<ul [attr.tabindex]="tabindex" [attr.aria-describedby] = "titleId"  class="app-livelist-container clearfix {{direction === \'horizontal\' ? \'app-horizontal-list\': \'\'}} {{listclass}}" role="list"\n    (keydown.enter)="handleKeyDown($event, \'select\')"\n\n    (keydown.space)="handleKeyDown($event, \'space\')"\n\n    (keydown.arrowup)="handleKeyDown($event, \'focusPrev\')"\n    (keydown.arrowdown)="handleKeyDown($event, \'focusNext\')"\n    (keydown.arrowleft)="handleKeyDown($event, \'focusPrev\')"\n    (keydown.arrowright)="handleKeyDown($event, \'focusNext\')"\n\n    (keydown.shift.arrowup)="handleKeyDown($event, \'selectPrev\')"\n    (keydown.shift.arrowdown)="handleKeyDown($event, \'selectNext\')"\n    (keydown.shift.arrowleft)="handleKeyDown($event, \'selectPrev\')"\n    (keydown.shift.arrowright)="handleKeyDown($event, \'selectNext\')"\n    [hidden]="noDataFound && !variableInflight"\n>\n    <ng-template [ngIf]="!groupby" [ngIfElse]="groupedListTemplate">\n        <li *ngFor="let item of fieldDefs; index as $index; first as $first; last as $last;" class="app-list-item {{direction === \'horizontal\' ? \'\' : itemsPerRowClass}}" [ngClass]="listItemRef.itemClass"\n            [wmListItem]="item"\n            #listItemRef="listItemRef"\n            [attr.tabindex]="tabindex"\n            role="listitem">\n            <ng-container [ngTemplateOutlet]="listTemplate" [ngTemplateOutletContext]="{item: item, $index: $index, itemRef: listItemRef, $first: $first, $last: $last, currentItemWidgets: listItemRef.currentItemWidgets}"></ng-container>\n        </li>\n    </ng-template>\n    <ng-container [ngTemplateOutlet]="listLeftActionTemplate"></ng-container>\n    <ng-container [ngTemplateOutlet]="listRightActionTemplate"></ng-container>\n</ul>\n\n<div class="no-data-msg" *ngIf="noDataFound && !variableInflight" [textContent]="nodatamessage"></div>\n\n<div class="loading-data-msg" *ngIf="variableInflight && !pulltorefresh">\n    <span>\n        <i class="app-icon panel-icon fa-spin" aria-hidden="true" [ngClass]="loadingicon"></i>\n        <span class="sr-only">Loading</span>\n        <span class="loading-text" [textContent]="loadingdatamsg"></span>\n    </span>\n</div>\n\n<div class="app-datanavigator" [attr.aria-disabled]="dataNavigator.isDisableNext" *ngIf="navigation === \'Inline\' && !noDataFound">\n    <ul class="pager">\n        <li class="next" [ngClass]="{\'disabled\': (dataNavigator ? dataNavigator.isDisableNext  : true)}">\n            <a href="javascript:void(0);" (click)="dataNavigator.navigatePage(\'next\', $event)"\n               [attr.aria-disabled]="dataNavigator.isDisableNext">\n                <i class="wi wi-chevron-right" aria-hidden="true"></i>\n                <span class="sr-only">Go to Next page {{dataNavigator.isDisableNext ? \', Disabled\' : \'\'}}</span>\n            </a>\n        </li>\n    </ul>\n</div>\n\n<div class="panel-footer" *ngIf="navigation !== \'None\'" [hidden]="!showNavigation || (onDemandLoad && dataNavigator.isDisableNext) || (dataNavigator.dataSize <= pagesize) || (!dataNavigator.dataSize && !dataNavigator.datasource?.pagination?.next)">\n    <nav wmPagination\n         navigationalign.bind="navigationalign"\n         navigation.bind="navControls"\n         showrecordcount.bind="showrecordcount"\n         maxsize.bind="maxsize"\n         boundarylinks.bind="boundarylinks"\n         forceellipses.bind="forceellipses"\n         directionlinks.bind="directionlinks"\n         show.bind="!onDemandLoad"\n         paginationchange.event="beforePaginationChange($event, $index)"\n    ></nav>\n    <a *ngIf="onDemandLoad" href="javascript:void(0);"\n       (click)="dataNavigator.navigatePage(\'next\', $event)"\n       class="app-button btn btn-block"\n       [ngClass]="paginationclass"\n       [textContent]="ondemandmessage"\n    ></a>\n</div>\n\n\x3c!--This template will be displayed when groupby is specified--\x3e\n<ng-template #groupedListTemplate>\n    <li *ngFor="let groupObj of groupedData" class="app-list-item-group clearfix">\n        <ul [attr.tabindex]="tabindex" class="list-group item-group" [ngClass]="listclass">\n            <li class="app-list-item-header list-item list-group-header" (click)="handleHeaderClick($event)" [ngClass]="{\'collapsible-content\': collapsible}">\n            <h4>{{groupObj.key}}\n                <div class="header-action">\n                    <i class="app-icon wi action wi-chevron-up" *ngIf="collapsible"></i>\n                    <span *ngIf="showcount" class="label label-default">{{groupObj.data.length}}</span>\n                    </div>\n                </h4>\n            </li>\n            <ul class="list-group clearfix {{direction === \'horizontal\' ? \'app-horizontal-list\': \'\'}}">\n                <li *ngFor="let item of groupObj.data; index as $index; first as $first; last as $last;" [attr.tabindex]="tabindex"\n                    class="app-list-item group-list-item {{itemsPerRowClass}}"\n                    [ngClass]="listItemRef.itemClass"\n                    [wmListItem]="item" #listItemRef="listItemRef">\n                    <ng-container [ngTemplateOutlet]="listTemplate" [ngTemplateOutletContext]="{item: item, $index: $index, itemRef: listItemRef, $first: $first, $last: $last, currentItemWidgets: listItemRef.currentItemWidgets}"></ng-container>\n                </li>\n            </ul>\n        </ul>\n    </li>\n</ng-template>\n',
             providers: [ base.provideAsWidgetRef(ListComponent) ]
         } ]
     } ];
@@ -58402,40 +58423,36 @@
     var TabsAnimator = function(_super) {
         __extends(TabsAnimator, _super);
         function TabsAnimator(tabs) {
-            var e_1, _a;
             var _this = _super.call(this) || this;
             _this.tabs = tabs;
             _this._$el = $(_this.tabs.getNativeElement()).find(">.tab-content");
-            var childEls = _this._$el.find(">[wmTabPane]");
-            _this._noOfTabs = childEls.length;
-            var maxWidth = _this._noOfTabs * 100 + "%";
-            core.addClass(_this.tabs.getNativeElement(), "has-transition");
-            core.setCSSFromObj(_this._$el[0], {
-                maxWidth: maxWidth,
-                width: maxWidth
-            });
-            var width = 100 / _this._noOfTabs + "%";
-            try {
-                for (var _b = __values(Array.from(childEls)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var child = _c.value;
-                    core.setCSS(child, "width", width);
-                }
-            } catch (e_1_1) {
-                e_1 = {
-                    error: e_1_1
-                };
-            } finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                } finally {
-                    if (e_1) throw e_1.error;
-                }
-            }
             _this.init(_this._$el);
             return _this;
         }
+        TabsAnimator.prototype.calibrate = function() {
+            var activeTabIndex = this.tabs.getActiveTabIndex();
+            var panes = this._$el.find(">.tab-pane");
+            var activeTabVisibleIndex = 0;
+            var noOfVisiblePanes = 0;
+            var visiblePanes = [];
+            panes.each((function(i, p) {
+                if (!$(p).prop("hidden")) {
+                    noOfVisiblePanes++;
+                    if (i === activeTabIndex) {
+                        activeTabVisibleIndex = noOfVisiblePanes - 1;
+                    }
+                    visiblePanes.push(p);
+                }
+                return true;
+            }));
+            return {
+                activeTabIndex: activeTabVisibleIndex,
+                noOfTabs: noOfVisiblePanes,
+                panes: visiblePanes
+            };
+        };
         TabsAnimator.prototype.bounds = function() {
-            var activeTabIndex = this.tabs.getActiveTabIndex(), w = this._$el.find(">.tab-pane").first().width(), noOfTabs = this._$el.find(">.tab-pane:visible").length, centerVal = -1 * activeTabIndex * w;
+            var _a = this.calibrate(), activeTabIndex = _a.activeTabIndex, noOfTabs = _a.noOfTabs, panes = _a.panes, w = $(panes[0]).width(), centerVal = -1 * activeTabIndex * w;
             this.clearContentFocus();
             return {
                 strict: false,
@@ -58462,8 +58479,18 @@
             }
         };
         TabsAnimator.prototype.transitionTabIntoView = function() {
-            var activeTabIndex = this.tabs.getActiveTabIndex();
-            core.setCSS(this._$el[0], "transform", "translate3d(" + -1 * activeTabIndex / this._noOfTabs * 100 + "%, 0, 0)");
+            var _a = this.calibrate(), activeTabIndex = _a.activeTabIndex, noOfTabs = _a.noOfTabs, panes = _a.panes;
+            var maxWidth = noOfTabs * 100 + "%";
+            core.setCSSFromObj(this._$el[0], {
+                maxWidth: maxWidth,
+                width: maxWidth
+            });
+            core.addClass(this.tabs.getNativeElement(), "has-transition");
+            var width = 100 / noOfTabs + "%";
+            panes.forEach((function(p) {
+                core.setCSS(p, "width", width);
+            }));
+            core.setCSS(this._$el[0], "transform", "translate3d(" + -1 * activeTabIndex / noOfTabs * 100 + "%, 0, 0)");
         };
         TabsAnimator.prototype.onUpper = function($event) {
             this.tabs.prev($event);
@@ -58589,6 +58616,7 @@
         };
         TabPaneComponent.prototype.onPropertyChange = function(key, nv, ov) {
             var _this = this;
+            var _a;
             if (key === "content") {
                 if (this.isActive) {
                     setTimeout((function() {
@@ -58599,6 +58627,10 @@
                 this.nativeElement.hidden = !nv;
                 if (this._isFirstLoad) {
                     this.tabsRef.selectDefaultPaneByIndex(this.tabsRef.defaultpaneindex);
+                } else if (!nv && this.isActive) {
+                    this.tabsRef.next();
+                } else if (nv || !this.isActive) {
+                    (_a = this.tabsRef.tabsAnimator) === null || _a === void 0 ? void 0 : _a.transitionTabIntoView();
                 }
                 this._isFirstLoad = false;
             } else {
@@ -67554,10 +67586,10 @@
 }));
 
 (function(global, factory) {
-    typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@angular/core"), require("@wm/core"), require("@wm/components/base"), require("@wm/components/page"), require("@wm/mobile/core"), require("@angular/common")) : typeof define === "function" && define.amd ? define("@wm/mobile/components/page", [ "exports", "@angular/core", "@wm/core", "@wm/components/base", "@wm/components/page", "@wm/mobile/core", "@angular/common" ], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, 
+    typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@angular/core"), require("@wm/core"), require("@wm/components/base"), require("ngx-bootstrap/modal"), require("@wm/components/page"), require("@wm/mobile/core"), require("@angular/common")) : typeof define === "function" && define.amd ? define("@wm/mobile/components/page", [ "exports", "@angular/core", "@wm/core", "@wm/components/base", "ngx-bootstrap/modal", "@wm/components/page", "@wm/mobile/core", "@angular/common" ], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, 
     factory((global.wm = global.wm || {}, global.wm.mobile = global.wm.mobile || {}, 
-    global.wm.mobile.components = global.wm.mobile.components || {}, global.wm.mobile.components.page = {}), global.ng.core, global.wm.core, global.wm.components.base, global.wm.components.page, global.wm.mobile.core, global.ng.common));
-})(this, (function(exports, core$1, core, base, page, core$2, common) {
+    global.wm.mobile.components = global.wm.mobile.components || {}, global.wm.mobile.components.page = {}), global.ng.core, global.wm.core, global.wm.components.base, global.modal, global.wm.components.page, global.wm.mobile.core, global.ng.common));
+})(this, (function(exports, core$1, core, base, modal, page, core$2, common) {
     "use strict";
     var PageContentLoaderComponent = function() {
         function PageContentLoaderComponent(el) {
@@ -67579,18 +67611,30 @@
         } ];
     };
     var MobilePageDirective = function() {
-        function MobilePageDirective(app, elRef, deviceService, page, navigationService) {
+        function MobilePageDirective(app, elRef, modalService, deviceService, page, navigationService) {
             var _this = this;
+            this.modalService = modalService;
             this.deviceService = deviceService;
             this.page = page;
             this.navigationService = navigationService;
+            this.subscriptions = [];
             core.addClass(elRef.nativeElement, "mobile-app-page");
             this._$ele = $(elRef.nativeElement);
             page.subscribe("wmMobileTabbar:ready", (function() {
                 return _this._$ele.addClass("has-tabbar");
             }));
+            var modalsOpened = [];
+            this.subscriptions = [ modalService.onShown.subscribe((function(_a) {
+                var id = _a.id;
+                id && modalsOpened.push(id);
+            })), modalService.onHidden.subscribe((function(_a) {
+                var id = _a.id;
+                id && _.remove(modalsOpened, id);
+            })) ];
             this._backBtnListenerDestroyer = deviceService.onBackButtonTap((function($event) {
-                if (app.landingPageName === app.activePageName) {
+                if (modalsOpened.length > 0) {
+                    modalService.hide(modalsOpened.pop());
+                } else if (app.landingPageName === app.activePageName) {
                     window.navigator["app"].exitApp();
                 } else {
                     _this.navigationService.goToPrevious();
@@ -67599,6 +67643,9 @@
             }));
         }
         MobilePageDirective.prototype.ngOnDestroy = function() {
+            this.subscriptions.map((function(s) {
+                return s.unsubscribe();
+            }));
             this._backBtnListenerDestroyer();
         };
         return MobilePageDirective;
@@ -67614,6 +67661,8 @@
             type: core.App
         }, {
             type: core$1.ElementRef
+        }, {
+            type: modal.BsModalService
         }, {
             type: core$2.DeviceService
         }, {
@@ -72947,6 +72996,13 @@
             type: core.AbstractHttpService
         } ];
     };
+    var Formatter = function() {
+        function Formatter() {}
+        Formatter.prototype.format = function(value, format) {
+            return exports.appManager.getPipe("date").transform(value, format);
+        };
+        return Formatter;
+    }();
     var VariablesService = function() {
         function VariablesService(httpService, metadataService, navigationService, routerService, toasterService, oAuthService, securityService, dialogService) {
             this.httpService = httpService;
@@ -73053,6 +73109,7 @@
                 if (this.isVariableSeperated(variablesJson, variableName)) {
                     this.processBinding(varInstance, scope, "dataBinding", this.getBindSourceTarget(varInstance));
                     varInstance.httpService = this.httpService;
+                    varInstance.dateFormatter = new Formatter;
                     varInstance.subscribe("afterInvoke", (function() {
                         return core.$invokeWatchers(true);
                     }));
@@ -73142,6 +73199,7 @@
     exports.DB_CONSTANTS = DB_CONSTANTS;
     exports.DeviceVariableManager = DeviceVariableManager;
     exports.DeviceVariableService = DeviceVariableService;
+    exports.Formatter = Formatter;
     exports.MetadataService = MetadataService;
     exports.SWAGGER_CONSTANTS = SWAGGER_CONSTANTS;
     exports.VARIABLE_CONSTANTS = VARIABLE_CONSTANTS;