@sumaris-net/ngx-components 2.4.23-rc1 → 2.4.23-rc3

package/fesm2020/sumaris-net.ngx-components.mjs

@@ -60,7 +60,7 @@ import { timer, merge, fromEvent, BehaviorSubject, Subscription, Subject, isObse
 import { filter, map, takeUntil, first, switchMap, tap, debounceTime, startWith, distinctUntilChanged, mergeMap, catchError, throttleTime, skip, bufferWhen, mapTo, take } from 'rxjs/operators';
 import { trigger, transition, style, animate, state } from '@angular/animations';
 import * as i1 from '@ionic/angular';
-import { IonicModule, Platform, ToastController, IonicSafeString, createAnimation, IonicRouteStrategy, ModalController, AlertController, IonContent, IonItem, IonModal, IonInfiniteScroll } from '@ionic/angular';
+import { IonicModule, Platform, ToastController, IonicSafeString, createAnimation, IonicRouteStrategy, ModalController, AlertController, IonContent, IonRouterOutlet, IonItem, IonModal, IonInfiniteScroll } from '@ionic/angular';
 import { Capacitor } from '@capacitor/core';
 import { Keyboard } from '@capacitor/keyboard';
 import * as i1$2 from '@ngx-translate/core';
@@ -19053,28 +19053,29 @@ class ToolbarComponent {
             const replaceUrl = !this.routerOutlet.canGoBack();
             // Relative href
             if (this._backHref.startsWith('.')) {
-                await this.router.navigate([this._backHref], { relativeTo: this.route, replaceUrl });
+                return this.router.navigate([this._backHref], { relativeTo: this.route, replaceUrl });
             }
             else {
-                await this.router.navigateByUrl(this._backHref, { replaceUrl });
+                return this.router.navigateByUrl(this._backHref, { replaceUrl });
             }
         }
         else if (this.routerOutlet.canGoBack()) {
-            await this.routerOutlet.pop();
+            return this.routerOutlet.pop();
         }
         else if (this._defaultBackHref) {
             // Relative href
             if (this._defaultBackHref.startsWith('.')) {
-                await this.router.navigate([this._defaultBackHref], { relativeTo: this.route, replaceUrl: true });
+                return this.router.navigate([this._defaultBackHref], { relativeTo: this.route, replaceUrl: true });
             }
             else {
-                await this.router.navigateByUrl(this._defaultBackHref, {
+                return this.router.navigateByUrl(this._defaultBackHref, {
                     replaceUrl: true
                 });
             }
         }
         else {
             console.error('[toolbar] Cannot go back. Missing attribute \'defaultBackHref\' or \'backHref\'');
+            return false;
         }
     }
     tapClose(event) {
@@ -28075,6 +28076,7 @@ class AppEntityEditor extends AppTabEditor {
         };
         this.settings = injector.get(LocalSettingsService);
         this.errorTranslator = injector.get(FormErrorTranslator);
+        this.routerOutlet = injector.get(IonRouterOutlet);
         this.cd = injector.get(ChangeDetectorRef);
         this.dateFormat = injector.get(DateFormatService);
         this.toastController = injector.get(ToastController);
@@ -28639,15 +28641,23 @@ class AppEntityEditor extends AppTabEditor {
             this.markForCheck();
         }
     }
-    updateRoute(data, queryParams) {
+    async updateRoute(data, queryParams) {
         const path = this.computePageUrl(isNotNil(data.id) ? data.id : 'new');
         const commands = (path && typeof path === 'string') ? path.split('/') : path;
         if (isNotEmptyArray(commands)) {
             this.queryParams = queryParams || this.queryParams;
-            return this.router.navigate(commands, {
-                replaceUrl: true,
-                queryParams: this.queryParams
-            });
+            // Disabling router animation
+            this.routerOutlet.animated = false;
+            try {
+                return await this.router.navigate(commands, {
+                    replaceUrl: true,
+                    queryParams: this.queryParams
+                });
+            }
+            finally {
+                // Re enabling router animation
+                this.routerOutlet.animated = true;
+            }
         }
         else {
             console.warn('Skip page route update. Invalid page path: ', path);