@sumaris-net/ngx-components 1.19.5-rc2 → 1.19.5-rc5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -9231,7 +9231,8 @@
9231
9231
  return ToolbarToken;
9232
9232
  }());
9233
9233
  var ToolbarComponent = /** @class */ (function () {
9234
- function ToolbarComponent(router, routerOutlet, cd, progressBarService) {
9234
+ function ToolbarComponent(route, router, routerOutlet, cd, progressBarService) {
9235
+ this.route = route;
9235
9236
  this.router = router;
9236
9237
  this.routerOutlet = routerOutlet;
9237
9238
  this.cd = cd;
@@ -9334,33 +9335,47 @@
9334
9335
  };
9335
9336
  ToolbarComponent.prototype.goBack = function () {
9336
9337
  return __awaiter(this, void 0, void 0, function () {
9338
+ var replaceUrl;
9337
9339
  return __generator(this, function (_a) {
9338
9340
  switch (_a.label) {
9339
9341
  case 0:
9340
9342
  console.debug('[toolbar] calling goBack()');
9341
- if (!this._backHref) return [3 /*break*/, 2];
9342
- return [4 /*yield*/, this.router.navigateByUrl(this._backHref)];
9343
+ if (!this._backHref) return [3 /*break*/, 5];
9344
+ replaceUrl = !this.routerOutlet.canGoBack();
9345
+ if (!this._backHref.startsWith('.')) return [3 /*break*/, 2];
9346
+ return [4 /*yield*/, this.router.navigate([this._backHref], { relativeTo: this.route, replaceUrl: replaceUrl })];
9343
9347
  case 1:
9344
9348
  _a.sent();
9345
- return [3 /*break*/, 7];
9346
- case 2:
9347
- if (!this.routerOutlet.canGoBack()) return [3 /*break*/, 4];
9348
- return [4 /*yield*/, this.routerOutlet.pop()];
9349
+ return [3 /*break*/, 4];
9350
+ case 2: return [4 /*yield*/, this.router.navigateByUrl(this._backHref, { replaceUrl: replaceUrl })];
9349
9351
  case 3:
9350
9352
  _a.sent();
9351
- return [3 /*break*/, 7];
9352
- case 4:
9353
- if (!this._defaultBackHref) return [3 /*break*/, 6];
9354
- return [4 /*yield*/, this.router.navigateByUrl(this._defaultBackHref, {
9355
- replaceUrl: true
9356
- })];
9353
+ _a.label = 4;
9354
+ case 4: return [3 /*break*/, 13];
9357
9355
  case 5:
9358
- _a.sent();
9359
- return [3 /*break*/, 7];
9356
+ if (!this.routerOutlet.canGoBack()) return [3 /*break*/, 7];
9357
+ return [4 /*yield*/, this.routerOutlet.pop()];
9360
9358
  case 6:
9359
+ _a.sent();
9360
+ return [3 /*break*/, 13];
9361
+ case 7:
9362
+ if (!this._defaultBackHref) return [3 /*break*/, 12];
9363
+ if (!this._defaultBackHref.startsWith('.')) return [3 /*break*/, 9];
9364
+ return [4 /*yield*/, this.router.navigate([this._defaultBackHref], { relativeTo: this.route, replaceUrl: true })];
9365
+ case 8:
9366
+ _a.sent();
9367
+ return [3 /*break*/, 11];
9368
+ case 9: return [4 /*yield*/, this.router.navigateByUrl(this._defaultBackHref, {
9369
+ replaceUrl: true
9370
+ })];
9371
+ case 10:
9372
+ _a.sent();
9373
+ _a.label = 11;
9374
+ case 11: return [3 /*break*/, 13];
9375
+ case 12:
9361
9376
  console.error('[toolbar] Cannot go back. Missing attribute \'defaultBackHref\' or \'backHref\'');
9362
- _a.label = 7;
9363
- case 7: return [2 /*return*/];
9377
+ _a.label = 13;
9378
+ case 13: return [2 /*return*/];
9364
9379
  }
9365
9380
  });
9366
9381
  });
@@ -9420,7 +9435,7 @@
9420
9435
  ToolbarComponent.decorators = [
9421
9436
  { type: i0.Component, args: [{
9422
9437
  selector: 'app-toolbar',
9423
- template: "<ion-header [class]=\"class\">\n <ion-toolbar [color]=\"color\">\n\n <ion-buttons slot=\"start\">\n\n <!-- back button -->\n <ion-button class=\"back-button\"\n *ngIf=\"canGoBack\"\n (click)=\"doBackClick($event)\"\n routerDirection=\"back\" >\n <ion-icon slot=\"icon-only\" name=\"arrow-back\"></ion-icon>\n </ion-button>\n\n <!-- show menu button -->\n <ion-menu-toggle [hidden]=\"canGoBack || !canShowMenu\">\n <ion-button>\n <ion-icon slot=\"icon-only\" name=\"menu\"></ion-icon>\n </ion-button>\n </ion-menu-toggle>\n\n <ng-content select=\"[slot=start]\"></ng-content>\n </ion-buttons>\n\n <ion-title [innerHTML]=\"title\"></ion-title>\n\n <ng-content select=\"ion-title\"></ng-content>\n\n <ng-content select=\"ion-buttons[slot=end]\"></ng-content>\n\n <ion-buttons slot=\"end\" collapse=\"true\">\n\n <ng-content select=\"[slot=end]\"></ng-content>\n\n <!-- search bar -->\n <ion-searchbar #searchbar animated\n type=\"search\"\n *ngIf=\"hasSearch\"\n [class.cdk-visually-hidden]=\"!showSearchBar\"\n show-cancel-button=\"always\"\n (ionChange)=\"onSearch.emit($event)\"\n (ionCancel)=\"toggleSearchBar()\">\n </ion-searchbar>\n\n <!-- search button -->\n <ion-button (click)=\"toggleSearchBar()\"\n *ngIf=\"hasSearch && !showSearchBar\">\n <ion-icon slot=\"icon-only\" name=\"search\"></ion-icon>\n </ion-button>\n\n <!-- close button -->\n <ion-button *ngIf=\"hasClose\"\n (tap)=\"tapClose($event)\"\n class=\"visible-xs visible-sm visible-mobile\">\n <ion-icon slot=\"icon-only\" name=\"close\"></ion-icon>\n </ion-button>\n\n <!-- validate button -->\n <ion-button *ngIf=\"hasValidate\"\n (tap)=\"tapValidate($event)\"\n class=\"visible-xs visible-sm visible-mobile\">\n <ion-icon slot=\"icon-only\" name=\"save\"></ion-icon>\n </ion-button>\n </ion-buttons>\n </ion-toolbar>\n\n <!-- progress bar -->\n <mat-progress-bar [color]=\"color\" [mode]=\"progressBarMode$ | async\">\n </mat-progress-bar>\n</ion-header>\n",
9438
+ template: "<ion-header [class]=\"class\">\n <ion-toolbar [color]=\"color\">\n\n <ion-buttons slot=\"start\">\n\n <!-- back button -->\n <ion-button class=\"back-button\"\n *ngIf=\"canGoBack\"\n (click)=\"doBackClick($event)\"\n routerDirection=\"back\" >\n <ion-icon slot=\"icon-only\" name=\"arrow-back\"></ion-icon>\n </ion-button>\n\n <!-- show menu button -->\n <ion-menu-toggle [menu]=\"'left'\"\n [class.cdk-visually-hidden]=\"canGoBack || !canShowMenu\">\n <ion-button>\n <ion-icon slot=\"icon-only\" name=\"menu\"></ion-icon>\n </ion-button>\n </ion-menu-toggle>\n\n <ng-content select=\"[slot=start]\"></ng-content>\n </ion-buttons>\n\n <ion-title [innerHTML]=\"title\"></ion-title>\n\n <ng-content select=\"ion-title\"></ng-content>\n\n <ng-content select=\"ion-buttons[slot=end]\"></ng-content>\n\n <ion-buttons slot=\"end\" collapse=\"true\">\n\n <ng-content select=\"[slot=end]\"></ng-content>\n\n <!-- search bar -->\n <ion-searchbar #searchbar animated\n type=\"search\"\n *ngIf=\"hasSearch\"\n [class.cdk-visually-hidden]=\"!showSearchBar\"\n show-cancel-button=\"always\"\n (ionChange)=\"onSearch.emit($event)\"\n (ionCancel)=\"toggleSearchBar()\">\n </ion-searchbar>\n\n <!-- search button -->\n <ion-button (click)=\"toggleSearchBar()\"\n *ngIf=\"hasSearch && !showSearchBar\">\n <ion-icon slot=\"icon-only\" name=\"search\"></ion-icon>\n </ion-button>\n\n <!-- close button -->\n <ion-button *ngIf=\"hasClose\"\n (tap)=\"tapClose($event)\"\n class=\"visible-xs visible-sm visible-mobile\">\n <ion-icon slot=\"icon-only\" name=\"close\"></ion-icon>\n </ion-button>\n\n <!-- validate button -->\n <ion-button *ngIf=\"hasValidate\"\n (tap)=\"tapValidate($event)\"\n class=\"visible-xs visible-sm visible-mobile\">\n <ion-icon slot=\"icon-only\" name=\"save\"></ion-icon>\n </ion-button>\n </ion-buttons>\n </ion-toolbar>\n\n <!-- progress bar -->\n <mat-progress-bar [color]=\"color\" [mode]=\"progressBarMode$ | async\">\n </mat-progress-bar>\n</ion-header>\n",
9424
9439
  providers: [
9425
9440
  { provide: ToolbarToken, useExisting: ToolbarComponent }
9426
9441
  ],
@@ -9429,6 +9444,7 @@
9429
9444
  },] }
9430
9445
  ];
9431
9446
  ToolbarComponent.ctorParameters = function () { return [
9447
+ { type: i3.ActivatedRoute },
9432
9448
  { type: i3.Router },
9433
9449
  { type: i1$5.IonRouterOutlet },
9434
9450
  { type: i0.ChangeDetectorRef },
@@ -9450,7 +9466,8 @@
9450
9466
  onValidateAndClose: [{ type: i0.Output }],
9451
9467
  onBackClick: [{ type: i0.Output }],
9452
9468
  onSearch: [{ type: i0.Output }],
9453
- searchbar: [{ type: i0.ViewChild, args: ['searchbar', { static: true },] }]
9469
+ searchbar: [{ type: i0.ViewChild, args: ['searchbar', { static: true },] }],
9470
+ menuToggle: [{ type: i0.ViewChild, args: ['menuToggle', { static: true },] }]
9454
9471
  };
9455
9472
 
9456
9473
  var MatPaginatorI18n = /** @class */ (function (_super) {