@wavemaker/app-ng-runtime 11.4.0-next.28701 → 11.4.0-rc.5342

app-ng-runtime/mobile/components/page/default/esm2015/page.directive.js

@@ -1,18 +1,33 @@
 import { Directive, ElementRef } from '@angular/core';
+import { BsModalService } from 'ngx-bootstrap/modal';
 import { addClass, AbstractNavigationService, App } from '@wm/core';
 import { PageDirective } from '@wm/components/page';
 import { DeviceService } from '@wm/mobile/core';
 export class MobilePageDirective {
-    constructor(app, elRef, deviceService, page, navigationService) {
+    constructor(app, elRef, modalService, deviceService, page, navigationService) {
+        this.modalService = modalService;
         this.deviceService = deviceService;
         this.page = page;
         this.navigationService = navigationService;
+        this.subscriptions = [];
         addClass(elRef.nativeElement, 'mobile-app-page');
         this._$ele = $(elRef.nativeElement);
         page.subscribe('wmMobileTabbar:ready', () => this._$ele.addClass('has-tabbar'));
+        let modalsOpened = [];
+        this.subscriptions = [
+            modalService.onShown.subscribe(({ id }) => {
+                id && modalsOpened.push(id);
+            }),
+            modalService.onHidden.subscribe(({ id }) => {
+                id && _.remove(modalsOpened, id);
+            })
+        ];
         // add backbutton listener on every page.
         this._backBtnListenerDestroyer = deviceService.onBackButtonTap($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 {
@@ -22,6 +37,7 @@ export class MobilePageDirective {
         });
     }
     ngOnDestroy() {
+        this.subscriptions.map((s) => s.unsubscribe());
         this._backBtnListenerDestroyer();
     }
 }
@@ -33,8 +49,9 @@ MobilePageDirective.decorators = [
 MobilePageDirective.ctorParameters = () => [
     { type: App },
     { type: ElementRef },
+    { type: BsModalService },
     { type: DeviceService },
     { type: PageDirective },
     { type: AbstractNavigationService }
 ];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFnZS5kaXJlY3RpdmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9tb2JpbGUvY29tcG9uZW50cy9wYWdlL2RlZmF1bHQvc3JjL3BhZ2UuZGlyZWN0aXZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFhLE1BQU0sZUFBZSxDQUFDO0FBRWpFLE9BQU8sRUFBRSxRQUFRLEVBQUUseUJBQXlCLEVBQUUsR0FBRyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ3BFLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFPaEQsTUFBTSxPQUFPLG1CQUFtQjtJQU01QixZQUFZLEdBQVEsRUFDUixLQUFpQixFQUNULGFBQTRCLEVBQzVCLElBQW1CLEVBQ25CLGlCQUE0QztRQUY1QyxrQkFBYSxHQUFiLGFBQWEsQ0FBZTtRQUM1QixTQUFJLEdBQUosSUFBSSxDQUFlO1FBQ25CLHNCQUFpQixHQUFqQixpQkFBaUIsQ0FBMkI7UUFDNUQsUUFBUSxDQUFDLEtBQUssQ0FBQyxhQUFhLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUNqRCxJQUFJLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDcEMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxzQkFBc0IsRUFBRSxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO1FBRWhGLHlDQUF5QztRQUN6QyxJQUFJLENBQUMseUJBQXlCLEdBQUcsYUFBYSxDQUFDLGVBQWUsQ0FBQyxNQUFNLENBQUMsRUFBRTtZQUNwRSxJQUFJLEdBQUcsQ0FBQyxlQUFlLEtBQUssR0FBRyxDQUFDLGNBQWMsRUFBRTtnQkFDNUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQzthQUNyQztpQkFBTTtnQkFDSCxJQUFJLENBQUMsaUJBQWlCLENBQUMsWUFBWSxFQUFFLENBQUM7YUFDekM7WUFDRCxPQUFPLEtBQUssQ0FBQztRQUNqQixDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFFTSxXQUFXO1FBQ2QsSUFBSSxDQUFDLHlCQUF5QixFQUFFLENBQUM7SUFDckMsQ0FBQzs7O1lBL0JKLFNBQVMsU0FBQztnQkFDUCxRQUFRLEVBQUUsVUFBVTthQUN2Qjs7O1lBUjZDLEdBQUc7WUFGN0IsVUFBVTtZQUlyQixhQUFhO1lBRGIsYUFBYTtZQURILHlCQUF5QiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERpcmVjdGl2ZSwgRWxlbWVudFJlZiwgT25EZXN0cm95IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5cbmltcG9ydCB7IGFkZENsYXNzLCBBYnN0cmFjdE5hdmlnYXRpb25TZXJ2aWNlLCBBcHAgfSBmcm9tICdAd20vY29yZSc7XG5pbXBvcnQgeyBQYWdlRGlyZWN0aXZlIH0gZnJvbSAnQHdtL2NvbXBvbmVudHMvcGFnZSc7XG5pbXBvcnQgeyBEZXZpY2VTZXJ2aWNlIH0gZnJvbSAnQHdtL21vYmlsZS9jb3JlJztcblxuZGVjbGFyZSBjb25zdCAkO1xuXG5ARGlyZWN0aXZlKHtcbiAgICBzZWxlY3RvcjogJ1t3bVBhZ2VdJ1xufSlcbmV4cG9ydCBjbGFzcyBNb2JpbGVQYWdlRGlyZWN0aXZlIGltcGxlbWVudHMgT25EZXN0cm95IHtcblxuICAgIHByaXZhdGUgXyRlbGU7XG5cbiAgICBwcml2YXRlIF9iYWNrQnRuTGlzdGVuZXJEZXN0cm95ZXI7XG5cbiAgICBjb25zdHJ1Y3RvcihhcHA6IEFwcCxcbiAgICAgICAgICAgICAgICBlbFJlZjogRWxlbWVudFJlZixcbiAgICAgICAgICAgICAgICBwcml2YXRlIGRldmljZVNlcnZpY2U6IERldmljZVNlcnZpY2UsXG4gICAgICAgICAgICAgICAgcHJpdmF0ZSBwYWdlOiBQYWdlRGlyZWN0aXZlLFxuICAgICAgICAgICAgICAgIHByaXZhdGUgbmF2aWdhdGlvblNlcnZpY2U6IEFic3RyYWN0TmF2aWdhdGlvblNlcnZpY2UpIHtcbiAgICAgICAgYWRkQ2xhc3MoZWxSZWYubmF0aXZlRWxlbWVudCwgJ21vYmlsZS1hcHAtcGFnZScpO1xuICAgICAgICB0aGlzLl8kZWxlID0gJChlbFJlZi5uYXRpdmVFbGVtZW50KTtcbiAgICAgICAgcGFnZS5zdWJzY3JpYmUoJ3dtTW9iaWxlVGFiYmFyOnJlYWR5JywgKCkgPT4gdGhpcy5fJGVsZS5hZGRDbGFzcygnaGFzLXRhYmJhcicpKTtcblxuICAgICAgICAvLyBhZGQgYmFja2J1dHRvbiBsaXN0ZW5lciBvbiBldmVyeSBwYWdlLlxuICAgICAgICB0aGlzLl9iYWNrQnRuTGlzdGVuZXJEZXN0cm95ZXIgPSBkZXZpY2VTZXJ2aWNlLm9uQmFja0J1dHRvblRhcCgkZXZlbnQgPT4ge1xuICAgICAgICAgICAgaWYgKGFwcC5sYW5kaW5nUGFnZU5hbWUgPT09IGFwcC5hY3RpdmVQYWdlTmFtZSkge1xuICAgICAgICAgICAgICAgIHdpbmRvdy5uYXZpZ2F0b3JbJ2FwcCddLmV4aXRBcHAoKTtcbiAgICAgICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICAgICAgdGhpcy5uYXZpZ2F0aW9uU2VydmljZS5nb1RvUHJldmlvdXMoKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICAgIHJldHVybiBmYWxzZTtcbiAgICAgICAgfSk7XG4gICAgfVxuXG4gICAgcHVibGljIG5nT25EZXN0cm95KCkge1xuICAgICAgICB0aGlzLl9iYWNrQnRuTGlzdGVuZXJEZXN0cm95ZXIoKTtcbiAgICB9XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFnZS5kaXJlY3RpdmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9tb2JpbGUvY29tcG9uZW50cy9wYWdlL2RlZmF1bHQvc3JjL3BhZ2UuZGlyZWN0aXZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFhLE1BQU0sZUFBZSxDQUFDO0FBQ2pFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUdyRCxPQUFPLEVBQUUsUUFBUSxFQUFFLHlCQUF5QixFQUFFLEdBQUcsRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUNwRSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDcEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBT2hELE1BQU0sT0FBTyxtQkFBbUI7SUFPNUIsWUFBWSxHQUFRLEVBQ1IsS0FBaUIsRUFDVCxZQUE0QixFQUM1QixhQUE0QixFQUM1QixJQUFtQixFQUNuQixpQkFBNEM7UUFINUMsaUJBQVksR0FBWixZQUFZLENBQWdCO1FBQzVCLGtCQUFhLEdBQWIsYUFBYSxDQUFlO1FBQzVCLFNBQUksR0FBSixJQUFJLENBQWU7UUFDbkIsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUEyQjtRQVJ4RCxrQkFBYSxHQUFtQixFQUFFLENBQUM7UUFTdkMsUUFBUSxDQUFDLEtBQUssQ0FBQyxhQUFhLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUNqRCxJQUFJLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDcEMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxzQkFBc0IsRUFBRSxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO1FBQ2hGLElBQUksWUFBWSxHQUFHLEVBQUUsQ0FBQztRQUN0QixJQUFJLENBQUMsYUFBYSxHQUFHO1lBQ2pCLFlBQVksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBQyxFQUFFLEVBQUMsRUFBRSxFQUFFO2dCQUNwQyxFQUFFLElBQUksWUFBWSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNoQyxDQUFDLENBQUM7WUFDRixZQUFZLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUMsRUFBRSxFQUFDLEVBQUUsRUFBRTtnQkFDckMsRUFBRSxJQUFJLENBQUMsQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ3JDLENBQUMsQ0FBQztTQUNMLENBQUM7UUFDRix5Q0FBeUM7UUFDekMsSUFBSSxDQUFDLHlCQUF5QixHQUFHLGFBQWEsQ0FBQyxlQUFlLENBQUMsTUFBTSxDQUFDLEVBQUU7WUFDcEUsSUFBSSxZQUFZLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRTtnQkFDekIsWUFBWSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQzthQUN6QztpQkFBTSxJQUFJLEdBQUcsQ0FBQyxlQUFlLEtBQUssR0FBRyxDQUFDLGNBQWMsRUFBRTtnQkFDbkQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQzthQUNyQztpQkFBTTtnQkFDSCxJQUFJLENBQUMsaUJBQWlCLENBQUMsWUFBWSxFQUFFLENBQUM7YUFDekM7WUFDRCxPQUFPLEtBQUssQ0FBQztRQUNqQixDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFFTSxXQUFXO1FBQ2QsSUFBSSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDO1FBQy9DLElBQUksQ0FBQyx5QkFBeUIsRUFBRSxDQUFDO0lBQ3JDLENBQUM7OztZQTVDSixTQUFTLFNBQUM7Z0JBQ1AsUUFBUSxFQUFFLFVBQVU7YUFDdkI7OztZQVI2QyxHQUFHO1lBSjdCLFVBQVU7WUFDckIsY0FBYztZQUtkLGFBQWE7WUFEYixhQUFhO1lBREgseUJBQXlCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRGlyZWN0aXZlLCBFbGVtZW50UmVmLCBPbkRlc3Ryb3kgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEJzTW9kYWxTZXJ2aWNlIH0gZnJvbSAnbmd4LWJvb3RzdHJhcC9tb2RhbCc7XG5pbXBvcnQgeyBTdWJzY3JpcHRpb24gfSBmcm9tICdyeGpzJztcblxuaW1wb3J0IHsgYWRkQ2xhc3MsIEFic3RyYWN0TmF2aWdhdGlvblNlcnZpY2UsIEFwcCB9IGZyb20gJ0B3bS9jb3JlJztcbmltcG9ydCB7IFBhZ2VEaXJlY3RpdmUgfSBmcm9tICdAd20vY29tcG9uZW50cy9wYWdlJztcbmltcG9ydCB7IERldmljZVNlcnZpY2UgfSBmcm9tICdAd20vbW9iaWxlL2NvcmUnO1xuXG5kZWNsYXJlIGNvbnN0ICQsIF87XG5cbkBEaXJlY3RpdmUoe1xuICAgIHNlbGVjdG9yOiAnW3dtUGFnZV0nXG59KVxuZXhwb3J0IGNsYXNzIE1vYmlsZVBhZ2VEaXJlY3RpdmUgaW1wbGVtZW50cyBPbkRlc3Ryb3kge1xuXG4gICAgcHJpdmF0ZSBfJGVsZTtcblxuICAgIHByaXZhdGUgc3Vic2NyaXB0aW9uczogU3Vic2NyaXB0aW9uW10gPSBbXTtcbiAgICBwcml2YXRlIF9iYWNrQnRuTGlzdGVuZXJEZXN0cm95ZXI7XG5cbiAgICBjb25zdHJ1Y3RvcihhcHA6IEFwcCxcbiAgICAgICAgICAgICAgICBlbFJlZjogRWxlbWVudFJlZixcbiAgICAgICAgICAgICAgICBwcml2YXRlIG1vZGFsU2VydmljZTogQnNNb2RhbFNlcnZpY2UsXG4gICAgICAgICAgICAgICAgcHJpdmF0ZSBkZXZpY2VTZXJ2aWNlOiBEZXZpY2VTZXJ2aWNlLFxuICAgICAgICAgICAgICAgIHByaXZhdGUgcGFnZTogUGFnZURpcmVjdGl2ZSxcbiAgICAgICAgICAgICAgICBwcml2YXRlIG5hdmlnYXRpb25TZXJ2aWNlOiBBYnN0cmFjdE5hdmlnYXRpb25TZXJ2aWNlKSB7XG4gICAgICAgIGFkZENsYXNzKGVsUmVmLm5hdGl2ZUVsZW1lbnQsICdtb2JpbGUtYXBwLXBhZ2UnKTtcbiAgICAgICAgdGhpcy5fJGVsZSA9ICQoZWxSZWYubmF0aXZlRWxlbWVudCk7XG4gICAgICAgIHBhZ2Uuc3Vic2NyaWJlKCd3bU1vYmlsZVRhYmJhcjpyZWFkeScsICgpID0+IHRoaXMuXyRlbGUuYWRkQ2xhc3MoJ2hhcy10YWJiYXInKSk7XG4gICAgICAgIGxldCBtb2RhbHNPcGVuZWQgPSBbXTtcbiAgICAgICAgdGhpcy5zdWJzY3JpcHRpb25zID0gW1xuICAgICAgICAgICAgbW9kYWxTZXJ2aWNlLm9uU2hvd24uc3Vic2NyaWJlKCh7aWR9KSA9PiB7XG4gICAgICAgICAgICAgICAgaWQgJiYgbW9kYWxzT3BlbmVkLnB1c2goaWQpO1xuICAgICAgICAgICAgfSksXG4gICAgICAgICAgICBtb2RhbFNlcnZpY2Uub25IaWRkZW4uc3Vic2NyaWJlKCh7aWR9KSA9PiB7XG4gICAgICAgICAgICAgICAgaWQgJiYgXy5yZW1vdmUobW9kYWxzT3BlbmVkLCBpZCk7XG4gICAgICAgICAgICB9KVxuICAgICAgICBdO1xuICAgICAgICAvLyBhZGQgYmFja2J1dHRvbiBsaXN0ZW5lciBvbiBldmVyeSBwYWdlLlxuICAgICAgICB0aGlzLl9iYWNrQnRuTGlzdGVuZXJEZXN0cm95ZXIgPSBkZXZpY2VTZXJ2aWNlLm9uQmFja0J1dHRvblRhcCgkZXZlbnQgPT4ge1xuICAgICAgICAgICAgaWYgKG1vZGFsc09wZW5lZC5sZW5ndGggPiAwKSB7XG4gICAgICAgICAgICAgICAgbW9kYWxTZXJ2aWNlLmhpZGUobW9kYWxzT3BlbmVkLnBvcCgpKTtcbiAgICAgICAgICAgIH0gZWxzZSBpZiAoYXBwLmxhbmRpbmdQYWdlTmFtZSA9PT0gYXBwLmFjdGl2ZVBhZ2VOYW1lKSB7XG4gICAgICAgICAgICAgICAgd2luZG93Lm5hdmlnYXRvclsnYXBwJ10uZXhpdEFwcCgpO1xuICAgICAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICAgICAgICB0aGlzLm5hdmlnYXRpb25TZXJ2aWNlLmdvVG9QcmV2aW91cygpO1xuICAgICAgICAgICAgfVxuICAgICAgICAgICAgcmV0dXJuIGZhbHNlO1xuICAgICAgICB9KTtcbiAgICB9XG5cbiAgICBwdWJsaWMgbmdPbkRlc3Ryb3koKSB7XG4gICAgICAgIHRoaXMuc3Vic2NyaXB0aW9ucy5tYXAoKHMpID0+IHMudW5zdWJzY3JpYmUoKSk7XG4gICAgICAgIHRoaXMuX2JhY2tCdG5MaXN0ZW5lckRlc3Ryb3llcigpO1xuICAgIH1cbn1cbiJdfQ==

app-ng-runtime/mobile/components/page/default/fesm2015/index.js

@@ -1,6 +1,7 @@
 import { Component, ElementRef, Directive, NgModule } from '@angular/core';
 import { addClass, App, AbstractNavigationService } from '@wm/core';
 import { provideAsWidgetRef, WmComponentsModule } from '@wm/components/base';
+import { BsModalService } from 'ngx-bootstrap/modal';
 import { PageDirective } from '@wm/components/page';
 import { DeviceService } from '@wm/mobile/core';
 import { CommonModule } from '@angular/common';
@@ -24,16 +25,30 @@ PageContentLoaderComponent.ctorParameters = () => [
 ];
 
 class MobilePageDirective {
-    constructor(app, elRef, deviceService, page, navigationService) {
+    constructor(app, elRef, modalService, deviceService, page, navigationService) {
+        this.modalService = modalService;
         this.deviceService = deviceService;
         this.page = page;
         this.navigationService = navigationService;
+        this.subscriptions = [];
         addClass(elRef.nativeElement, 'mobile-app-page');
         this._$ele = $(elRef.nativeElement);
         page.subscribe('wmMobileTabbar:ready', () => this._$ele.addClass('has-tabbar'));
+        let modalsOpened = [];
+        this.subscriptions = [
+            modalService.onShown.subscribe(({ id }) => {
+                id && modalsOpened.push(id);
+            }),
+            modalService.onHidden.subscribe(({ id }) => {
+                id && _.remove(modalsOpened, id);
+            })
+        ];
         // add backbutton listener on every page.
         this._backBtnListenerDestroyer = deviceService.onBackButtonTap($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 {
@@ -43,6 +58,7 @@ class MobilePageDirective {
         });
     }
     ngOnDestroy() {
+        this.subscriptions.map((s) => s.unsubscribe());
         this._backBtnListenerDestroyer();
     }
 }
@@ -54,6 +70,7 @@ MobilePageDirective.decorators = [
 MobilePageDirective.ctorParameters = () => [
     { type: App },
     { type: ElementRef },
+    { type: BsModalService },
     { type: DeviceService },
     { type: PageDirective },
     { type: AbstractNavigationService }

app-ng-runtime/mobile/components/page/default/fesm2015/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../../projects/mobile/components/page/default/src/page-content-loader/page-content-loader.component.ts","../../../../../../projects/mobile/components/page/default/src/page.directive.ts","../../../../../../projects/mobile/components/page/default/src/page.module.ts","../../../../../../projects/mobile/components/page/default/src/index.ts"],"sourcesContent":["import { Component, ElementRef } from '@angular/core';\n\nimport { addClass } from '@wm/core';\nimport { provideAsWidgetRef } from '@wm/components/base';\n\n@Component({\n    selector: '[wmPageContentLoader]',\n    templateUrl: './page-content-loader.component.html',\n    providers: [\n        provideAsWidgetRef(PageContentLoaderComponent)\n    ]\n})\nexport class PageContentLoaderComponent {\n\n    constructor(el: ElementRef) {\n        addClass(el.nativeElement, 'app-page-content-loader');\n    }\n}\n","import { Directive, ElementRef, OnDestroy } from '@angular/core';\n\nimport { addClass, AbstractNavigationService, App } from '@wm/core';\nimport { PageDirective } from '@wm/components/page';\nimport { DeviceService } from '@wm/mobile/core';\n\ndeclare const $;\n\n@Directive({\n    selector: '[wmPage]'\n})\nexport class MobilePageDirective implements OnDestroy {\n\n    private _$ele;\n\n    private _backBtnListenerDestroyer;\n\n    constructor(app: App,\n                elRef: ElementRef,\n                private deviceService: DeviceService,\n                private page: PageDirective,\n                private navigationService: AbstractNavigationService) {\n        addClass(elRef.nativeElement, 'mobile-app-page');\n        this._$ele = $(elRef.nativeElement);\n        page.subscribe('wmMobileTabbar:ready', () => this._$ele.addClass('has-tabbar'));\n\n        // add backbutton listener on every page.\n        this._backBtnListenerDestroyer = deviceService.onBackButtonTap($event => {\n            if (app.landingPageName === app.activePageName) {\n                window.navigator['app'].exitApp();\n            } else {\n                this.navigationService.goToPrevious();\n            }\n            return false;\n        });\n    }\n\n    public ngOnDestroy() {\n        this._backBtnListenerDestroyer();\n    }\n}\n","import { NgModule } from '@angular/core';\nimport { CommonModule } from '@angular/common';\n\nimport { WmComponentsModule } from '@wm/components/base';\n\nimport { MobilePageDirective } from './page.directive';\nimport { PageContentLoaderComponent } from './page-content-loader/page-content-loader.component';\n\nconst components = [\n    MobilePageDirective,\n    PageContentLoaderComponent\n];\n\n@NgModule({\n    imports: [\n        CommonModule,\n        WmComponentsModule\n    ],\n    declarations: [...components],\n    exports: [...components],\n    entryComponents: []\n})\nexport class PageModule {\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public_api';\n"],"names":[],"mappings":";;;;;;;MAYa,0BAA0B;IAEnC,YAAY,EAAc;QACtB,QAAQ,CAAC,EAAE,CAAC,aAAa,EAAE,yBAAyB,CAAC,CAAC;KACzD;;;YAXJ,SAAS,SAAC;gBACP,QAAQ,EAAE,uBAAuB;gBACjC,oFAAmD;gBACnD,SAAS,EAAE;oBACP,kBAAkB,CAAC,0BAA0B,CAAC;iBACjD;aACJ;;;YAXmB,UAAU;;;MCWjB,mBAAmB;IAM5B,YAAY,GAAQ,EACR,KAAiB,EACT,aAA4B,EAC5B,IAAmB,EACnB,iBAA4C;QAF5C,kBAAa,GAAb,aAAa,CAAe;QAC5B,SAAI,GAAJ,IAAI,CAAe;QACnB,sBAAiB,GAAjB,iBAAiB,CAA2B;QAC5D,QAAQ,CAAC,KAAK,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACpC,IAAI,CAAC,SAAS,CAAC,sBAAsB,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;;QAGhF,IAAI,CAAC,yBAAyB,GAAG,aAAa,CAAC,eAAe,CAAC,MAAM;YACjE,IAAI,GAAG,CAAC,eAAe,KAAK,GAAG,CAAC,cAAc,EAAE;gBAC5C,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;aACrC;iBAAM;gBACH,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;aACzC;YACD,OAAO,KAAK,CAAC;SAChB,CAAC,CAAC;KACN;IAEM,WAAW;QACd,IAAI,CAAC,yBAAyB,EAAE,CAAC;KACpC;;;YA/BJ,SAAS,SAAC;gBACP,QAAQ,EAAE,UAAU;aACvB;;;YAR6C,GAAG;YAF7B,UAAU;YAIrB,aAAa;YADb,aAAa;YADH,yBAAyB;;;ACM5C,MAAM,UAAU,GAAG;IACf,mBAAmB;IACnB,0BAA0B;CAC7B,CAAC;MAWW,UAAU;;;YATtB,QAAQ,SAAC;gBACN,OAAO,EAAE;oBACL,YAAY;oBACZ,kBAAkB;iBACrB;gBACD,YAAY,EAAE,CAAC,GAAG,UAAU,CAAC;gBAC7B,OAAO,EAAE,CAAC,GAAG,UAAU,CAAC;gBACxB,eAAe,EAAE,EAAE;aACtB;;;ACrBD;;;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../../../projects/mobile/components/page/default/src/page-content-loader/page-content-loader.component.ts","../../../../../../projects/mobile/components/page/default/src/page.directive.ts","../../../../../../projects/mobile/components/page/default/src/page.module.ts","../../../../../../projects/mobile/components/page/default/src/index.ts"],"sourcesContent":["import { Component, ElementRef } from '@angular/core';\n\nimport { addClass } from '@wm/core';\nimport { provideAsWidgetRef } from '@wm/components/base';\n\n@Component({\n    selector: '[wmPageContentLoader]',\n    templateUrl: './page-content-loader.component.html',\n    providers: [\n        provideAsWidgetRef(PageContentLoaderComponent)\n    ]\n})\nexport class PageContentLoaderComponent {\n\n    constructor(el: ElementRef) {\n        addClass(el.nativeElement, 'app-page-content-loader');\n    }\n}\n","import { Directive, ElementRef, OnDestroy } from '@angular/core';\nimport { BsModalService } from 'ngx-bootstrap/modal';\nimport { Subscription } from 'rxjs';\n\nimport { addClass, AbstractNavigationService, App } from '@wm/core';\nimport { PageDirective } from '@wm/components/page';\nimport { DeviceService } from '@wm/mobile/core';\n\ndeclare const $, _;\n\n@Directive({\n    selector: '[wmPage]'\n})\nexport class MobilePageDirective implements OnDestroy {\n\n    private _$ele;\n\n    private subscriptions: Subscription[] = [];\n    private _backBtnListenerDestroyer;\n\n    constructor(app: App,\n                elRef: ElementRef,\n                private modalService: BsModalService,\n                private deviceService: DeviceService,\n                private page: PageDirective,\n                private navigationService: AbstractNavigationService) {\n        addClass(elRef.nativeElement, 'mobile-app-page');\n        this._$ele = $(elRef.nativeElement);\n        page.subscribe('wmMobileTabbar:ready', () => this._$ele.addClass('has-tabbar'));\n        let modalsOpened = [];\n        this.subscriptions = [\n            modalService.onShown.subscribe(({id}) => {\n                id && modalsOpened.push(id);\n            }),\n            modalService.onHidden.subscribe(({id}) => {\n                id && _.remove(modalsOpened, id);\n            })\n        ];\n        // add backbutton listener on every page.\n        this._backBtnListenerDestroyer = deviceService.onBackButtonTap($event => {\n            if (modalsOpened.length > 0) {\n                modalService.hide(modalsOpened.pop());\n            } else if (app.landingPageName === app.activePageName) {\n                window.navigator['app'].exitApp();\n            } else {\n                this.navigationService.goToPrevious();\n            }\n            return false;\n        });\n    }\n\n    public ngOnDestroy() {\n        this.subscriptions.map((s) => s.unsubscribe());\n        this._backBtnListenerDestroyer();\n    }\n}\n","import { NgModule } from '@angular/core';\nimport { CommonModule } from '@angular/common';\n\nimport { WmComponentsModule } from '@wm/components/base';\n\nimport { MobilePageDirective } from './page.directive';\nimport { PageContentLoaderComponent } from './page-content-loader/page-content-loader.component';\n\nconst components = [\n    MobilePageDirective,\n    PageContentLoaderComponent\n];\n\n@NgModule({\n    imports: [\n        CommonModule,\n        WmComponentsModule\n    ],\n    declarations: [...components],\n    exports: [...components],\n    entryComponents: []\n})\nexport class PageModule {\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public_api';\n"],"names":[],"mappings":";;;;;;;;MAYa,0BAA0B;IAEnC,YAAY,EAAc;QACtB,QAAQ,CAAC,EAAE,CAAC,aAAa,EAAE,yBAAyB,CAAC,CAAC;KACzD;;;YAXJ,SAAS,SAAC;gBACP,QAAQ,EAAE,uBAAuB;gBACjC,oFAAmD;gBACnD,SAAS,EAAE;oBACP,kBAAkB,CAAC,0BAA0B,CAAC;iBACjD;aACJ;;;YAXmB,UAAU;;;MCajB,mBAAmB;IAO5B,YAAY,GAAQ,EACR,KAAiB,EACT,YAA4B,EAC5B,aAA4B,EAC5B,IAAmB,EACnB,iBAA4C;QAH5C,iBAAY,GAAZ,YAAY,CAAgB;QAC5B,kBAAa,GAAb,aAAa,CAAe;QAC5B,SAAI,GAAJ,IAAI,CAAe;QACnB,sBAAiB,GAAjB,iBAAiB,CAA2B;QARxD,kBAAa,GAAmB,EAAE,CAAC;QASvC,QAAQ,CAAC,KAAK,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACpC,IAAI,CAAC,SAAS,CAAC,sBAAsB,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;QAChF,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,aAAa,GAAG;YACjB,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAC,EAAE,EAAC;gBAChC,EAAE,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAC/B,CAAC;YACF,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAC,EAAE,EAAC;gBACjC,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;aACpC,CAAC;SACL,CAAC;;QAEF,IAAI,CAAC,yBAAyB,GAAG,aAAa,CAAC,eAAe,CAAC,MAAM;YACjE,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC;aACzC;iBAAM,IAAI,GAAG,CAAC,eAAe,KAAK,GAAG,CAAC,cAAc,EAAE;gBACnD,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;aACrC;iBAAM;gBACH,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;aACzC;YACD,OAAO,KAAK,CAAC;SAChB,CAAC,CAAC;KACN;IAEM,WAAW;QACd,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAC/C,IAAI,CAAC,yBAAyB,EAAE,CAAC;KACpC;;;YA5CJ,SAAS,SAAC;gBACP,QAAQ,EAAE,UAAU;aACvB;;;YAR6C,GAAG;YAJ7B,UAAU;YACrB,cAAc;YAKd,aAAa;YADb,aAAa;YADH,yBAAyB;;;ACI5C,MAAM,UAAU,GAAG;IACf,mBAAmB;IACnB,0BAA0B;CAC7B,CAAC;MAWW,UAAU;;;YATtB,QAAQ,SAAC;gBACN,OAAO,EAAE;oBACL,YAAY;oBACZ,kBAAkB;iBACrB;gBACD,YAAY,EAAE,CAAC,GAAG,UAAU,CAAC;gBAC7B,OAAO,EAAE,CAAC,GAAG,UAAU,CAAC;gBACxB,eAAe,EAAE,EAAE;aACtB;;;ACrBD;;;;;;"}

app-ng-runtime/mobile/components/page/default/index.metadata.json

@@ -1 +1 @@
-{"__symbolic":"module","version":4,"metadata":{"PageContentLoaderComponent":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":5,"character":1},"arguments":[{"selector":"[wmPageContentLoader]","providers":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@wm/components/base","name":"provideAsWidgetRef","line":9,"character":8},"arguments":[{"__symbolic":"reference","name":"PageContentLoaderComponent"}]}],"template":"<div class=\"loader bg-primary\"></div>\n<div class=\"load-info\"></div>"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":14,"character":20}]}]}},"MobilePageDirective":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Directive","line":8,"character":1},"arguments":[{"selector":"[wmPage]"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@wm/core","name":"App","line":17,"character":21},{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":18,"character":23},{"__symbolic":"reference","module":"@wm/mobile/core","name":"DeviceService","line":19,"character":39},{"__symbolic":"reference","module":"@wm/components/page","name":"PageDirective","line":20,"character":30},{"__symbolic":"reference","module":"@wm/core","name":"AbstractNavigationService","line":21,"character":43}]}],"ngOnDestroy":[{"__symbolic":"method"}]}},"PageModule":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"NgModule","line":13,"character":1},"arguments":[{"imports":[{"__symbolic":"reference","module":"@angular/common","name":"CommonModule","line":15,"character":8},{"__symbolic":"reference","module":"@wm/components/base","name":"WmComponentsModule","line":16,"character":8}],"declarations":[{"__symbolic":"reference","name":"MobilePageDirective"},{"__symbolic":"reference","name":"PageContentLoaderComponent"}],"exports":[{"__symbolic":"reference","name":"MobilePageDirective"},{"__symbolic":"reference","name":"PageContentLoaderComponent"}],"entryComponents":[]}]}],"members":{}}},"origins":{"PageContentLoaderComponent":"./page-content-loader/page-content-loader.component","MobilePageDirective":"./page.directive","PageModule":"./page.module"},"importAs":"@wm/mobile/components/page"}
+{"__symbolic":"module","version":4,"metadata":{"PageContentLoaderComponent":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":5,"character":1},"arguments":[{"selector":"[wmPageContentLoader]","providers":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@wm/components/base","name":"provideAsWidgetRef","line":9,"character":8},"arguments":[{"__symbolic":"reference","name":"PageContentLoaderComponent"}]}],"template":"<div class=\"loader bg-primary\"></div>\n<div class=\"load-info\"></div>"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":14,"character":20}]}]}},"MobilePageDirective":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Directive","line":10,"character":1},"arguments":[{"selector":"[wmPage]"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@wm/core","name":"App","line":20,"character":21},{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":21,"character":23},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":22,"character":38},{"__symbolic":"reference","module":"@wm/mobile/core","name":"DeviceService","line":23,"character":39},{"__symbolic":"reference","module":"@wm/components/page","name":"PageDirective","line":24,"character":30},{"__symbolic":"reference","module":"@wm/core","name":"AbstractNavigationService","line":25,"character":43}]}],"ngOnDestroy":[{"__symbolic":"method"}]}},"PageModule":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"NgModule","line":13,"character":1},"arguments":[{"imports":[{"__symbolic":"reference","module":"@angular/common","name":"CommonModule","line":15,"character":8},{"__symbolic":"reference","module":"@wm/components/base","name":"WmComponentsModule","line":16,"character":8}],"declarations":[{"__symbolic":"reference","name":"MobilePageDirective"},{"__symbolic":"reference","name":"PageContentLoaderComponent"}],"exports":[{"__symbolic":"reference","name":"MobilePageDirective"},{"__symbolic":"reference","name":"PageContentLoaderComponent"}],"entryComponents":[]}]}],"members":{}}},"origins":{"PageContentLoaderComponent":"./page-content-loader/page-content-loader.component","MobilePageDirective":"./page.directive","PageModule":"./page.module"},"importAs":"@wm/mobile/components/page"}

app-ng-runtime/mobile/components/page/default/page.directive.d.ts

@@ -1,13 +1,16 @@
 import { ElementRef, OnDestroy } from '@angular/core';
+import { BsModalService } from 'ngx-bootstrap/modal';
 import { AbstractNavigationService, App } from '@wm/core';
 import { PageDirective } from '@wm/components/page';
 import { DeviceService } from '@wm/mobile/core';
 export declare class MobilePageDirective implements OnDestroy {
+    private modalService;
     private deviceService;
     private page;
     private navigationService;
     private _$ele;
+    private subscriptions;
     private _backBtnListenerDestroyer;
-    constructor(app: App, elRef: ElementRef, deviceService: DeviceService, page: PageDirective, navigationService: AbstractNavigationService);
+    constructor(app: App, elRef: ElementRef, modalService: BsModalService, deviceService: DeviceService, page: PageDirective, navigationService: AbstractNavigationService);
     ngOnDestroy(): void;
 }

app-ng-runtime/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/app-ng-runtime",
-    "version": "11.4.0-next.28701",
+    "version": "11.4.0-rc.5342",
     "description": "All modules required for a wavemaker application.",
     "main": "index.js",
     "scripts": {

app-ng-runtime/scripts/datatable/datatable.js

@@ -983,7 +983,7 @@ $.widget('wm.datatable', {
         this._render(true);
     },
     _setGridEditMode: function (val) {
-        if ($.isFunction(this.options.setGridEditMode)) {
+        if (_.isFunction(this.options.setGridEditMode)) {
             this.options.setGridEditMode(val);
         }
     },
@@ -1041,7 +1041,7 @@ $.widget('wm.datatable', {
             $gridBody,
             $alwaysNewRow;
 
-        if (!alwaysNewRow && $.isFunction(this.options.beforeRowInsert)) {
+        if (!alwaysNewRow && _.isFunction(this.options.beforeRowInsert)) {
             this.options.beforeRowInsert();
         }
 
@@ -1680,10 +1680,10 @@ $.widget('wm.datatable', {
             isQuickEdit = this.options.editmode === this.CONSTANTS.QUICK_EDIT;
 
         function callRowSelectionEvents() {
-            if (selected && $.isFunction(self.options.onRowSelect)) {
+            if (selected && _.isFunction(self.options.onRowSelect)) {
                 self.options.onRowSelect(data, e);
             }
-            if (!selected && $.isFunction(self.options.onRowDeselect)) {
+            if (!selected && _.isFunction(self.options.onRowDeselect)) {
                 self.options.onRowDeselect(data, e);
             }
         }
@@ -1728,7 +1728,7 @@ $.widget('wm.datatable', {
         if (!rowData) {
             return;
         }
-        if ($.isFunction(this.options.onRowDblClick)) {
+        if (_.isFunction(this.options.onRowDblClick)) {
             this.options.onRowDblClick(rowData, e);
         }
     },
@@ -1770,13 +1770,13 @@ $.widget('wm.datatable', {
         if (selected) {
             $column.addClass(selectedClass);
             $th.addClass(selectedClass);
-            if ($.isFunction(this.options.onColumnSelect) && e) {
+            if (_.isFunction(this.options.onColumnSelect) && e) {
                 this.options.onColumnSelect(colInfo, e);
             }
         } else {
             $column.removeClass(selectedClass);
             $th.removeClass(selectedClass);
-            if ($.isFunction(this.options.onColumnDeselect) && e) {
+            if (_.isFunction(this.options.onColumnDeselect) && e) {
                 this.options.onColumnDeselect(colInfo, e);
             }
         }
@@ -2029,7 +2029,7 @@ $.widget('wm.datatable', {
 
         //On success of update or delete
         function onSaveSuccess(skipFocus, error) {
-            if ($.isFunction(options.success)) {
+            if (_.isFunction(options.success)) {
                 options.success(skipFocus, error);
             }
             if (!advancedEdit || self.options.actionsEnabled.edit) {
@@ -2060,7 +2060,7 @@ $.widget('wm.datatable', {
                 return;
             }
             $row.addClass('row-editing');
-            if ($.isFunction(this.options.beforeRowUpdate)) {
+            if (_.isFunction(this.options.beforeRowUpdate)) {
                 this.options.beforeRowUpdate(rowData, e);
             }
 
@@ -2073,7 +2073,7 @@ $.widget('wm.datatable', {
                 self.toggleNewRowActions(true);
             }
             //Event for on before form render. User can update row data here.
-            if ($.isFunction(this.options.onBeforeFormRender)) {
+            if (_.isFunction(this.options.onBeforeFormRender)) {
                 isValid = this.options.onBeforeFormRender(rowData, e, options.operation || action);
                 if (isValid === false) {
                     return;
@@ -2096,7 +2096,7 @@ $.widget('wm.datatable', {
                 });
             }
             //Event for on before form render. User can access form widgets here.
-            if ($.isFunction(this.options.onFormRender)) {
+            if (_.isFunction(this.options.onFormRender)) {
                 this.options.onFormRender($row, e, options.operation || action, $row.hasClass('always-new-row'));
             }
         } else {
@@ -2160,7 +2160,7 @@ $.widget('wm.datatable', {
                             }
                             self.options.setTouched($invalidTd.find('[formcontrolname]').attr('formcontrolname'));
                         });
-                        if ($.isFunction(options.success)) {
+                        if (_.isFunction(options.success)) {
                             options.success(false, true);
                         }
                         return;
@@ -2168,14 +2168,14 @@ $.widget('wm.datatable', {
 
                     if (isNewRow && advancedEdit && _.isEmpty(rowData)) {
                         self.removeNewRow($row);
-                        if ($.isFunction(options.success)) {
+                        if (_.isFunction(options.success)) {
                             options.success(false, undefined, true);
                         }
                         return;
                     }
 
                     if (isNewRow) {
-                        if ($.isFunction(this.options.onBeforeRowInsert)) {
+                        if (_.isFunction(this.options.onBeforeRowInsert)) {
                             isValid = this.options.onBeforeRowInsert(rowData, e, editOptions);
                             if (isValid === false) {
                                 return;
@@ -2192,7 +2192,7 @@ $.widget('wm.datatable', {
                             self.removeNewRow($row);
                         }
                     } else {
-                        if ($.isFunction(this.options.onBeforeRowUpdate)) {
+                        if (_.isFunction(this.options.onBeforeRowUpdate)) {
                             isValid = this.options.onBeforeRowUpdate(rowData, e, editOptions);
                             if (isValid === false) {
                                 return;
@@ -2205,7 +2205,7 @@ $.widget('wm.datatable', {
                     if (!options.noMsg) {
                         this.options.noChangesDetected();
                     }
-                    if ($.isFunction(options.success)) {
+                    if (_.isFunction(options.success)) {
                         options.success(false);
                     }
                 }
@@ -2315,7 +2315,7 @@ $.widget('wm.datatable', {
         this.options.setActionRowIndex(rowId);
         this.options.setLastActionPerformed(this.options.ACTIONS.DELETE);
 
-        if ($.isFunction(this.options.beforeRowDelete)) {
+        if (_.isFunction(this.options.beforeRowDelete)) {
             this.options.beforeRowDelete(rowData, e);
         }
         if (isNewRow) {
@@ -2331,13 +2331,13 @@ $.widget('wm.datatable', {
             return;
         }
         /* calling onbeforerowDelete callback function.*/
-        if($.isFunction(this.options.onBeforeRowDelete)) {
+        if(_.isFunction(this.options.onBeforeRowDelete)) {
             isValid = this.options.onBeforeRowDelete(rowData, e, options);
             if (isValid === false) {
                 return;
             }
         }
-        if ($.isFunction(this.options.onRowDelete)) {
+        if (_.isFunction(this.options.onRowDelete)) {
             className = this.options.cssClassNames.deleteRow;
             isActiveRow = $row.attr('class').indexOf('active') !== -1;
             if (isActiveRow) {
@@ -2982,10 +2982,10 @@ $.widget('wm.datatable', {
                 // If we enable multiselect and check header checkbox then updating selecteditem in datatable.
                 self.options.assignSelectedItems(rowData, e);
                 self.toggleRowSelection($row, checked, e, true);
-                if (checked && $.isFunction(self.options.onRowSelect)) {
+                if (checked && _.isFunction(self.options.onRowSelect)) {
                     self.options.onRowSelect(rowData, e);
                 }
-                if (!checked && $.isFunction(self.options.onRowDeselect)) {
+                if (!checked && _.isFunction(self.options.onRowDeselect)) {
                     self.options.onRowDeselect(rowData, e);
                 }
             });
@@ -3020,7 +3020,7 @@ $.widget('wm.datatable', {
         /**Add event handler, to the select all checkbox on the header**/
         $header.on('click', '.app-datagrid-header-cell input:checkbox', toggleSelectAll);
 
-        if ($.isFunction(this.options.onHeaderClick)) {
+        if (_.isFunction(this.options.onHeaderClick)) {
             this.gridHeaderElement.find('th.app-datagrid-header-cell').on('click', this.headerClickHandler.bind(this));
         }
 
@@ -3168,7 +3168,7 @@ $.widget('wm.datatable', {
         if (isCreated) {
             this._setColSpan(this.options.headerConfig);
         }
-        if ($.isFunction(this.options.onDataRender)) {
+        if (_.isFunction(this.options.onDataRender)) {
             this.options.onDataRender();
         }
         if (!isCreated && this.options.selectFirstRow) {

app-ng-runtime/scripts/tree-keyboard-navigation/keyboard-navigation.js

@@ -0,0 +1,251 @@
+(function ($) {
+	/**
+	 * Dummy function to provide a placeholder for the destroy function
+	 */
+	$.fn.zTreeKeyboardNavigationDestroy = function () {
+	}
+
+	/**
+	 * Creates a function that adds keyboard navigation:
+	 * Home: home key (keycode 36)				Goes to the first root element is visible
+	 * End: end key (keycode 35)				Goes to the last leaf node and will expand nodes and scroll the element into view
+	 * Down: right cursor key (keycode 39)		Goes to the next visible node in the tree following the hierarchy
+	 * Next: down cursor key (keycode 40)		Goes to the next visible node at the same level
+	 * Up: up cursor key (keycode 37)			Goes to the prior visible node at the same level
+	 * Previous: left cursor key (keycode 38)	Goes to the prior visible node following the hierarchy
+	 * Toggle: space key (keycode 32)			Toggles the expand/collapse state of a parent node
+	 * @param {IxTreeObj} zTree
+	 * @param {string|JQuery<HTMLElement} element
+	 * @param {IJSON[]} selectedNodes
+	 */
+	$.fn.zTreeKeyboardNavigation = function (zTree, element, selectedNodes = null, treeicon) {
+		if (typeof element === 'string' || element instanceof String) {
+			element = $(element);
+		}
+
+		var rootNodes = zTree.getNodes();
+		if (!rootNodes) return;
+
+		var focusSelectedNode = function () {
+			if ((selectedNodes = zTree.getSelectedNodes()) && selectedNodes.length) {
+				$("#" + selectedNodes[0].tId).focus();
+			}
+		}
+
+		// Clear the previous event handler (there may be none)
+		$.fn.zTreeKeyboardNavigationDestroy();
+
+		/**
+		 * Make it possible to destroy (remove the event handlers)
+		 */
+		$.fn.zTreeKeyboardNavigationDestroy = function () {
+			$(element).off('keydown');
+		}
+
+		$.fn.changeTreeIcons = function () {
+			let eleClose = $('.app-tree li span.button.switch');
+
+			$(eleClose).map((idx, ele) => {
+				$(ele).addClass(treeicon);
+				$(ele).on("click", function (e) {
+					setTimeout(() => {
+						$(ele).addClass(treeicon);
+					}, 0);
+				});
+			})
+		}
+
+
+		$(element).on('keydown', function (e) {
+			var selectedNodes = zTree.getSelectedNodes();
+			var selectedNode = selectedNodes.length ? selectedNodes[0] : null;
+
+			var processSpace = function () {
+				// If there are no nodes or the selected node is not a parent, get out
+				if (selectedNode && selectedNode.isParent) {
+					// Toggle the node
+					zTree.expandNode(selectedNode, selectedNode.open ? false : true, true, true);
+					$.fn.changeTreeIcons()
+				}
+			}
+
+			var processHome = function () {
+				zTree.selectNode(rootNodes[0], false, true);
+			}
+
+			var processEnd = function () {
+				var nodes = zTree.transformToArray(rootNodes);
+				// Select the last node
+				zTree.selectNode(nodes[nodes.length - 1]);
+			}
+
+			var processUp = function () {
+				var priorNode;
+				if (selectedNode) {
+					priorNode = selectedNode.getPreNode();
+					if (!priorNode) return;
+				}
+				else {
+					processEnd();
+				}
+
+				if (!priorNode) return;
+
+				zTree.selectNode(priorNode);
+			}
+
+			var processDown = function () {
+				var nextNode;
+				if (selectedNode) {
+					nextNode = selectedNode.getNextNode();
+					if (!nextNode) return;
+				}
+				else {
+					processHome();
+				}
+
+				if (!nextNode) return;
+
+				zTree.selectNode(nextNode);
+			}
+
+			var processOut = function () {
+				if (!selectedNode) return;
+
+				var parentNode = selectedNode.getParentNode();
+				var priorNode = selectedNode.getPreNode();
+				if (!parentNode && !priorNode) return; // Must have been the root node
+
+				if (priorNode) {
+					if (priorNode.isParent) {
+						// There is a prior node, now the the question is where is the last open node?
+						while (priorNode) {
+							if (!priorNode.isParent || !priorNode.open || !priorNode.children) break;
+
+							priorNode = priorNode.children[priorNode.children.length - 1];
+						}
+
+						zTree.selectNode(priorNode);
+						return;
+					}
+					else {
+						zTree.selectNode(priorNode);
+						return;
+					}
+				}
+
+				// Find the parent node with a valid prior sibling
+				if (parentNode) {
+					// This call should be silent otherwise (in my view a bug in) 
+					// selectNode causes the root node to blur
+					zTree.selectNode(parentNode, false, true);
+				}
+			}
+
+			var processIn = function () {
+				if (!selectedNode) return;
+
+				if (selectedNode.isParent && selectedNode.open && selectedNode.children) {
+					zTree.selectNode(selectedNode.children[0]);
+					return;
+				}
+
+				var nextNode = selectedNode.getNextNode();
+				if (nextNode) {
+					zTree.selectNode(nextNode);
+				}
+				else {
+					// Cannot be root if there is a selected node that is not a parent
+					var node = selectedNode;
+					// Find the parent node with a valid next sibling
+					while (node = node.getParentNode()) {
+						var nextNode = node.getNextNode();
+						if (nextNode) {
+							zTree.selectNode(nextNode);
+							break;
+						}
+					}
+				}
+			}
+
+			var processLetter = function (keyCode) {
+				if (!Array.from({ length: 26 }, (v, i) => i + 65).includes(keyCode & 95)) return false;
+
+				var nodes = zTree.transformToArray(rootNodes);
+				nodes = nodes.filter(node => {
+					return 'accesskey' in node && node.accesskey.length && (node.accesskey.charCodeAt(0) & 95) == keyCode;
+				});
+
+				if (!nodes.length) return false;
+
+				var selectedNodes = zTree.getSelectedNodes();
+				if (!selectedNodes.length) return false;
+
+				if (selectedNodes[0] == nodes[0]) return false;
+
+				zTree.selectNode(nodes[0]);
+
+				return true;
+			}
+
+			// console.log('before');
+			// console.log(document.activeElement);
+
+			switch (e.keyCode) {
+				case 32: /* Toggle parent nodes */
+					processSpace();
+					return;
+
+				case 36: /* Home - go to the root node */
+					processHome();
+					break;
+
+				case 35: /* End - go to the last node */
+					processEnd();
+					break;
+
+				case 33: /* PageUp */
+					// Do nothing
+					break;
+
+				case 34: /* PageDown */
+					// Do nothing
+					break;
+
+				case 37: /* Left */
+					processOut();
+					break;
+
+				case 38: /* Up */
+					processUp();
+					break;
+
+				case 39: /* Right */
+					processIn();
+					break;
+
+				case 40: /* Down */
+					processDown();
+					break;
+
+				default:
+					if (!processLetter(e.keyCode & 95)) return;
+					break;
+			}
+
+			// console.log('after');
+			// console.log(document.activeElement);
+			focusSelectedNode();
+		});
+
+		if (selectedNodes && selectedNodes.length) {
+			zTree.selectNode(selectedNodes[0]);
+			focusSelectedNode();
+		}
+		else {
+			$(element).trigger({ type: 'keydown', which: 36, keyCode: 36 });
+		}
+
+	}
+
+})(jQuery);