@sapphire-ion/framework 1.2.60 → 1.2.61

package/fesm2022/sapphire-ion-framework.mjs

@@ -8,7 +8,7 @@ import moment from 'moment';
 import { Buffer } from 'buffer';
 import mime from 'mime';
 import { Capacitor } from '@capacitor/core';
-import { BehaviorSubject, firstValueFrom, from, switchMap, Subject, takeUntil, distinctUntilChanged, debounceTime, lastValueFrom, Observable, tap, finalize, share, catchError } from 'rxjs';
+import { BehaviorSubject, firstValueFrom, from, switchMap, Subject, takeUntil, distinctUntilChanged, debounceTime, filter, lastValueFrom, Observable, tap, finalize, share, catchError } from 'rxjs';
 import * as i1$1 from '@angular/common/http';
 import { HttpClient, HttpEventType, HttpHeaders } from '@angular/common/http';
 import * as i2$1 from '@angular/forms';
@@ -19,7 +19,7 @@ import * as i2 from '@angular/platform-browser';
 import { Preferences } from '@capacitor/preferences';
 import { jwtDecode } from 'jwt-decode';
 import * as i2$2 from '@angular/router';
-import { ActivatedRoute, RouterLinkWithHref, RouterModule, RouterOutlet, RouterLink } from '@angular/router';
+import { NavigationEnd, ActivatedRoute, RouterLinkWithHref, RouterModule, RouterOutlet, RouterLink } from '@angular/router';
 import { maskitoTransform } from '@maskito/core';
 import { maskitoPhoneOptionsGenerator } from '@maskito/phone';
 import metadata from 'libphonenumber-js/min/metadata';
@@ -1062,8 +1062,13 @@ class HttpService {
         if (!redirectPath) {
             return;
         }
-        const path = redirectPath.replace(":id", id.toString());
-        this.navController.navigateRoot([`../${path}`], { relativeTo: activatedRoute });
+        const path = redirectPath.replace(':id', id.toString());
+        this.navController.navigateRoot([`../${path}`], {
+            relativeTo: activatedRoute,
+            state: {
+                __preserveBack: true
+            }
+        });
     }
     FilesToForm(object, formData = new FormData(), lstTableFieldsView = null) {
         if (!lstTableFieldsView) {
@@ -4610,10 +4615,106 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImpo
                 args: ['defList']
             }] } });
 
+class NavigationContextService {
+    constructor(router) {
+        this.router = router;
+        this.previousUrl = null;
+        this.currentUrl = null;
+        this.currentUrl = this.router.url;
+        this.router.events.pipe(filter(e => e instanceof NavigationEnd)).subscribe((e) => {
+            const nextUrl = e.urlAfterRedirects;
+            const preserve = history.state?.__preserveBack == true;
+            const currentBase = this.currentUrl ? this.getBaseRoute(this.currentUrl) : null;
+            const nextBase = this.getBaseRoute(nextUrl);
+            const nav = this.router.getCurrentNavigation();
+            const isBack = nav?.trigger == 'popstate';
+            // Redirect técnico - ignora
+            if (preserve) {
+                this.currentUrl = nextUrl;
+                return;
+            }
+            // Navegação interna da mesma view (Ex: Item <-> View Principal)
+            if (currentBase && currentBase == nextBase) {
+                // ajustes no histórico baseando-se estritamente na hierarquia.
+                const cleanNext = nextUrl.split('?')[0].replace(/\/$/, '');
+                const cleanBase = nextBase.replace(/\/$/, '');
+                if (cleanNext == cleanBase) {
+                    // voltou para a raiz da entidade
+                    this.previousUrl = this.getListRoute(nextBase);
+                }
+                else {
+                    // voltou de um filho → pai REAL
+                    this.previousUrl = this.getParentRoute(nextUrl);
+                }
+                this.currentUrl = nextUrl;
+                return;
+            }
+            // Chegou numa view base VIA BACK (de outro módulo)
+            if (isBack) {
+                // Se voltou de fora (OS -> Obra), recalcula para garantir
+                const cleanNext = nextUrl.split('?')[0].replace(/\/$/, '');
+                const cleanBase = nextBase.replace(/\/$/, '');
+                if (cleanNext === cleanBase) {
+                    this.previousUrl = this.getListRoute(nextBase);
+                }
+                else {
+                    this.previousUrl = nextBase;
+                }
+                this.currentUrl = nextUrl;
+                return;
+            }
+            // Navegação real (Entrando em um módulo novo ou avançando)
+            this.previousUrl = this.currentUrl;
+            this.currentUrl = nextUrl;
+        });
+    }
+    getBaseRoute(url) {
+        //pega a rota base
+        const parts = url.split('/').filter(Boolean);
+        const base = [];
+        for (const part of parts) {
+            base.push(part);
+            if (!isNaN(Number(part))) {
+                break;
+            }
+        }
+        return '/' + base.join('/');
+    }
+    getListRoute(baseRoute) {
+        //verifica se a rota de retorno é a inicial
+        const parts = baseRoute.split('/').filter(Boolean);
+        return '/' + parts[0];
+    }
+    getParentRoute(url) {
+        const clean = url.split('?')[0].replace(/\/$/, '');
+        const parts = clean.split('/').filter(Boolean);
+        if (parts.length <= 1) {
+            return '/' + parts.join('/');
+        }
+        if (!isNaN(Number(parts[parts.length - 1]))) {
+            parts.pop();
+        }
+        if (parts[parts.length - 1] === 'view') {
+            parts.pop();
+        }
+        return '/' + parts.join('/');
+    }
+    getBackRoute() {
+        return this.previousUrl;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: NavigationContextService, deps: [{ token: i2$2.Router }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: NavigationContextService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: NavigationContextService, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }], ctorParameters: () => [{ type: i2$2.Router }] });
+
 class HeaderViewComponent {
-    constructor(navController, activatedRoute) {
+    constructor(navController, activatedRoute, navContext) {
         this.navController = navController;
         this.activatedRoute = activatedRoute;
+        this.navContext = navContext;
         this.novo = false;
         this.progress = null;
         this.saveEmitter = new EventEmitter();
@@ -4632,17 +4733,7 @@ class HeaderViewComponent {
     }
     ngOnInit() { }
     get DefaultBackRoute() {
-        const fullRoute = window.location.pathname.split('/');
-        const li = fullRoute[fullRoute.length - 1];
-        var offset = 1;
-        if (Number(li)) {
-            offset++;
-        }
-        let route = [];
-        for (let i = 0; i < fullRoute.length - offset; i++) {
-            route.push(fullRoute[i]);
-        }
-        return route.join('/');
+        return this.navContext.getBackRoute() ?? '/';
     }
     Back($event = null) {
         this.IonBackButtonElement.onClick($event);
@@ -4655,13 +4746,13 @@ class HeaderViewComponent {
     Save() {
         this.saveEmitter.emit();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: HeaderViewComponent, deps: [{ token: i1.NavController }, { token: i2$2.ActivatedRoute }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: HeaderViewComponent, deps: [{ token: i1.NavController }, { token: i2$2.ActivatedRoute }, { token: NavigationContextService }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.2.14", type: HeaderViewComponent, selector: "header-view", inputs: { novo: "novo", loading: "loading", progress: "progress", focusInFirstField: "focusInFirstField", noBack: "noBack", noNew: "noNew", useDefaultRouting: "useDefaultRouting", backRouterLink: "backRouterLink" }, outputs: { saveEmitter: "save" }, viewQueries: [{ propertyName: "IonBackButtonElement", first: true, predicate: IonBackButton, descendants: true }, { propertyName: "NewIonButtonElement", first: true, predicate: ["new"], descendants: true }], ngImport: i0, template: "<div class=\"w-full h-7 flex\">\r\n  <div class=\"w-1/2 flex items-center justify-start gap-3\">\r\n    @if(!noBack){\r\n      @if(useDefaultRouting || backRouterLink){\r\n        <ion-button class=\"m-0\" fill=\"clear\" size=\"small\" [routerLink]=\"backRouterLink ? backRouterLink : DefaultBackRoute\">\r\n          <ion-icon class=\"text-[1.7rem]\" name=\"chevron-back\" slot=\"icon-only\"></ion-icon>\r\n          <ion-text class=\"text-base\">Voltar</ion-text>\r\n        </ion-button>\r\n      }\r\n      @else{\r\n        <ion-back-button style=\"--min-height: 100%;\" [disabled]=\"loading\" text=\"Voltar\" [defaultHref]=\"DefaultBackRoute\"></ion-back-button>\r\n      }\r\n\r\n      <!-- <ion-card button [disabled]=\"loading\" class=\"h-full w-12 m-0 default-transition\" style=\"border-color: var(--ion-color-primary)\">\r\n        <ion-card-content class=\"p-0 bg-transparent\">\r\n          @if(!useDefaultRouting){\r\n            <ion-back-button class=\"scale-75 size-full\" style=\"--min-height: 100%;\" text=\"\"  [defaultHref]=\"BackRoute\" >\r\n            </ion-back-button>\r\n          }@else {\r\n            <ion-button class=\"size-full\" size=\"small\" fill=\"clear\" [routerLink]=\"BackRoute\">\r\n              <ion-icon name=\"chevron-back\" slot=\"icon-only\"></ion-icon>\r\n            </ion-button>\r\n          }\r\n        </ion-card-content>\r\n      </ion-card> -->\r\n    }\r\n    @if(!noBack){\r\n      <div class=\"h-full border-r-2 border-r-primary border-solid mask-y/50\"></div>\r\n    }\r\n\r\n    <div class=\"relative\">\r\n      <ion-button class=\"-mx-2\" [disabled]=\"loading\" fill=\"clear\" size=\"small\" (click)=\"Save()\">\r\n        <ion-icon class=\"text-base\" slot=\"start\" name=\"save\"></ion-icon>\r\n        <ion-text class=\"text-base\">\r\n          Salvar\r\n        </ion-text>\r\n      </ion-button>\r\n\r\n      <div class=\"absolute w-[125%] h-[125%] -top-[12.5%] -left-[12.5%] flex flex-col items-center justify-center default-transition backdrop-blur-sm\" [ngClass]=\"{'opacity-0 -translate-y-8': !loading}\">\r\n        <ion-text color=\"success\" class=\"text-sm mt-1\"><b>\r\n          @if(progress){\r\n            {{(progress * 100) | number: '1.1-1'}}%\r\n          }@else {\r\n            {{0 | number: '1.1-1'}}%\r\n          }\r\n        </b></ion-text>\r\n        <ion-progress-bar [value]=\"progress\" color=\"success\" class=\"w-full default-transition\"></ion-progress-bar>\r\n      </div>\r\n    </div>\r\n    <ng-content select=\"[slot=start]\"></ng-content>\r\n  </div>\r\n  <div class=\"w-1/2 flex justify-end items-center gap-2\">\r\n    <ng-content select=\"[slot=end]\"></ng-content>\r\n\r\n    @if(!(noNew || novo)){\r\n      <ion-button #new [routerLink]=\"['../']\" class=\"m-0\" fill=\"clear\" size=\"small\">\r\n        <ion-icon class=\"text-base\" name=\"add\" slot=\"start\"></ion-icon> \r\n        <ion-text class=\"text-base\">\r\n          Novo\r\n        </ion-text>\r\n      </ion-button>\r\n    }\r\n  </div>\r\n</div>", styles: ["#back{margin:0;margin-right:.5rem;width:2rem;border-radius:1rem;padding:0}#back::part(native){padding-left:.5rem;padding-right:.5rem}\n"], dependencies: [{ kind: "component", type: i1.IonButton, selector: "ion-button", inputs: ["buttonType", "color", "disabled", "download", "expand", "fill", "form", "href", "mode", "rel", "routerAnimation", "routerDirection", "shape", "size", "strong", "target", "type"] }, { kind: "component", type: i1.IonIcon, selector: "ion-icon", inputs: ["color", "flipRtl", "icon", "ios", "lazy", "md", "mode", "name", "sanitize", "size", "src"] }, { kind: "component", type: i1.IonProgressBar, selector: "ion-progress-bar", inputs: ["buffer", "color", "mode", "reversed", "type", "value"] }, { kind: "component", type: i1.IonText, selector: "ion-text", inputs: ["color", "mode"] }, { kind: "component", type: i1.IonBackButton, selector: "ion-back-button" }, { kind: "directive", type: i1.RouterLinkDelegate, selector: ":not(a):not(area)[routerLink]" }, { kind: "directive", type: i1$2.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: i2$2.RouterLink, selector: "[routerLink]", inputs: ["target", "queryParams", "fragment", "queryParamsHandling", "state", "info", "relativeTo", "preserveFragment", "skipLocationChange", "replaceUrl", "routerLink"] }, { kind: "pipe", type: i1$2.DecimalPipe, name: "number" }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: HeaderViewComponent, decorators: [{
             type: Component,
             args: [{ selector: 'header-view', template: "<div class=\"w-full h-7 flex\">\r\n  <div class=\"w-1/2 flex items-center justify-start gap-3\">\r\n    @if(!noBack){\r\n      @if(useDefaultRouting || backRouterLink){\r\n        <ion-button class=\"m-0\" fill=\"clear\" size=\"small\" [routerLink]=\"backRouterLink ? backRouterLink : DefaultBackRoute\">\r\n          <ion-icon class=\"text-[1.7rem]\" name=\"chevron-back\" slot=\"icon-only\"></ion-icon>\r\n          <ion-text class=\"text-base\">Voltar</ion-text>\r\n        </ion-button>\r\n      }\r\n      @else{\r\n        <ion-back-button style=\"--min-height: 100%;\" [disabled]=\"loading\" text=\"Voltar\" [defaultHref]=\"DefaultBackRoute\"></ion-back-button>\r\n      }\r\n\r\n      <!-- <ion-card button [disabled]=\"loading\" class=\"h-full w-12 m-0 default-transition\" style=\"border-color: var(--ion-color-primary)\">\r\n        <ion-card-content class=\"p-0 bg-transparent\">\r\n          @if(!useDefaultRouting){\r\n            <ion-back-button class=\"scale-75 size-full\" style=\"--min-height: 100%;\" text=\"\"  [defaultHref]=\"BackRoute\" >\r\n            </ion-back-button>\r\n          }@else {\r\n            <ion-button class=\"size-full\" size=\"small\" fill=\"clear\" [routerLink]=\"BackRoute\">\r\n              <ion-icon name=\"chevron-back\" slot=\"icon-only\"></ion-icon>\r\n            </ion-button>\r\n          }\r\n        </ion-card-content>\r\n      </ion-card> -->\r\n    }\r\n    @if(!noBack){\r\n      <div class=\"h-full border-r-2 border-r-primary border-solid mask-y/50\"></div>\r\n    }\r\n\r\n    <div class=\"relative\">\r\n      <ion-button class=\"-mx-2\" [disabled]=\"loading\" fill=\"clear\" size=\"small\" (click)=\"Save()\">\r\n        <ion-icon class=\"text-base\" slot=\"start\" name=\"save\"></ion-icon>\r\n        <ion-text class=\"text-base\">\r\n          Salvar\r\n        </ion-text>\r\n      </ion-button>\r\n\r\n      <div class=\"absolute w-[125%] h-[125%] -top-[12.5%] -left-[12.5%] flex flex-col items-center justify-center default-transition backdrop-blur-sm\" [ngClass]=\"{'opacity-0 -translate-y-8': !loading}\">\r\n        <ion-text color=\"success\" class=\"text-sm mt-1\"><b>\r\n          @if(progress){\r\n            {{(progress * 100) | number: '1.1-1'}}%\r\n          }@else {\r\n            {{0 | number: '1.1-1'}}%\r\n          }\r\n        </b></ion-text>\r\n        <ion-progress-bar [value]=\"progress\" color=\"success\" class=\"w-full default-transition\"></ion-progress-bar>\r\n      </div>\r\n    </div>\r\n    <ng-content select=\"[slot=start]\"></ng-content>\r\n  </div>\r\n  <div class=\"w-1/2 flex justify-end items-center gap-2\">\r\n    <ng-content select=\"[slot=end]\"></ng-content>\r\n\r\n    @if(!(noNew || novo)){\r\n      <ion-button #new [routerLink]=\"['../']\" class=\"m-0\" fill=\"clear\" size=\"small\">\r\n        <ion-icon class=\"text-base\" name=\"add\" slot=\"start\"></ion-icon> \r\n        <ion-text class=\"text-base\">\r\n          Novo\r\n        </ion-text>\r\n      </ion-button>\r\n    }\r\n  </div>\r\n</div>", styles: ["#back{margin:0;margin-right:.5rem;width:2rem;border-radius:1rem;padding:0}#back::part(native){padding-left:.5rem;padding-right:.5rem}\n"] }]
-        }], ctorParameters: () => [{ type: i1.NavController }, { type: i2$2.ActivatedRoute }], propDecorators: { novo: [{
+        }], ctorParameters: () => [{ type: i1.NavController }, { type: i2$2.ActivatedRoute }, { type: NavigationContextService }], propDecorators: { novo: [{
                 type: Input
             }], loading: [{
                 type: Input
@@ -12386,5 +12477,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { AbstractList, AbstractView, ApiUrlProviderService, AuthGuard, AuthService, BindLabelFactory, BindValueFactory, BoolProperty, CarouselComponent, CarouselImageComponent, CarouselItemComponent, CarouselModule, Comparison, ComparisonOperator, ComparisonOperatorString, ComparisonValueType, CompileFilters, CompileLstTableField, ContentBlockComponent, ControlError, DateProperty, DateTimeProperty, DecimalProperty, DefaultDrawerEndComponent, DefaultListComponent, DefaultLoginComponent, DefaultModule, DefaultPage, DefaultPageConfiguration, DefaultPageImage, DefaultPaginationComponent, DefaultRoutingFactory, DefaultTableComponent, DefaultViewComponent, Download, DownloadButtonComponent, DragDropFileDirective, DragDropFileModule, DragDropOverlayComponent, DrawerComponent, DrawerGroupComponent, EnumProperty, Environment, EnvironmentInjectionToken, EnvironmentService, ErrorInterceptor, FilterComponent, Forbidden403Component, FormValidators, FormatCep, FormatCpfCnpj, FormatTelefoneCelular, GenericService, HeaderListComponent, HeaderViewComponent, HttpService, HttpServiceAtivo, ICarouselItem, INT_MAX, ImageComponent, ImplicitProperty, InfiniteScroll, InfiniteScrollConfiguration, InfoPopoverComponent, InputBoolComponent, InputBoolConfiguration, InputBoolType, InputCepComponent, InputCepConfiguration, InputColorComponent, InputCpfCnpjComponent, InputCpfCnpjConfiguration, InputCurrencyConfiguration, InputDateComponent, InputDateConfiguration, InputDecimalComponent, InputDecimalConfiguration, InputFileComponent, InputFileConfiguration, InputIconComponent, InputNumberConfiguration, InputPercentageConfiguration, InputProviderFactory, InputSelectComponent, InputSelectConfiguration, InputSelectDataLoader, InputStringComponent, InputStringConfiguration, InputStringType, InputTelefoneCelularConfiguration, InputTelefoneComponent, InputTextareaComponent, InputType, InputsDefaultConfigurations, InputsModule, IntProperty, List, LoadingComponent, LoginAdminComponent, LongProperty, MainContentComponent, Menu, NgVarDirective, RouteCacheService, RouteData, RouteProviderService, SIonLabelTemplateDirective, SIonOptionTemplateDirective, SIonPlaceholderTemplateDirective, SIonPopoverComponent, SIonPopoverModule, SapphireIonFrameworkModule, Search, SecurePipe, SelectInterfaces, SionCardComponent, StepComponent, StepperComponent, StepperModule, StorageService, StringProperty, TabComponent, TableField, TableFieldFormBuilder, TabsComponent, TabsModule, TelefoneCelular, TextTooltipComponent, ThFilterComponent, TimeProperty, Timeout, TokenInterceptor, TooltipComponent, UsuarioService, Utils, UtilsService, View, ViewFiltros, ViewRetorno, idPreloaderConfiguration, lstImage, lstImageTypes };
+export { AbstractList, AbstractView, ApiUrlProviderService, AuthGuard, AuthService, BindLabelFactory, BindValueFactory, BoolProperty, CarouselComponent, CarouselImageComponent, CarouselItemComponent, CarouselModule, Comparison, ComparisonOperator, ComparisonOperatorString, ComparisonValueType, CompileFilters, CompileLstTableField, ContentBlockComponent, ControlError, DateProperty, DateTimeProperty, DecimalProperty, DefaultDrawerEndComponent, DefaultListComponent, DefaultLoginComponent, DefaultModule, DefaultPage, DefaultPageConfiguration, DefaultPageImage, DefaultPaginationComponent, DefaultRoutingFactory, DefaultTableComponent, DefaultViewComponent, Download, DownloadButtonComponent, DragDropFileDirective, DragDropFileModule, DragDropOverlayComponent, DrawerComponent, DrawerGroupComponent, EnumProperty, Environment, EnvironmentInjectionToken, EnvironmentService, ErrorInterceptor, FilterComponent, Forbidden403Component, FormValidators, FormatCep, FormatCpfCnpj, FormatTelefoneCelular, GenericService, HeaderListComponent, HeaderViewComponent, HttpService, HttpServiceAtivo, ICarouselItem, INT_MAX, ImageComponent, ImplicitProperty, InfiniteScroll, InfiniteScrollConfiguration, InfoPopoverComponent, InputBoolComponent, InputBoolConfiguration, InputBoolType, InputCepComponent, InputCepConfiguration, InputColorComponent, InputCpfCnpjComponent, InputCpfCnpjConfiguration, InputCurrencyConfiguration, InputDateComponent, InputDateConfiguration, InputDecimalComponent, InputDecimalConfiguration, InputFileComponent, InputFileConfiguration, InputIconComponent, InputNumberConfiguration, InputPercentageConfiguration, InputProviderFactory, InputSelectComponent, InputSelectConfiguration, InputSelectDataLoader, InputStringComponent, InputStringConfiguration, InputStringType, InputTelefoneCelularConfiguration, InputTelefoneComponent, InputTextareaComponent, InputType, InputsDefaultConfigurations, InputsModule, IntProperty, List, LoadingComponent, LoginAdminComponent, LongProperty, MainContentComponent, Menu, NavigationContextService, NgVarDirective, RouteCacheService, RouteData, RouteProviderService, SIonLabelTemplateDirective, SIonOptionTemplateDirective, SIonPlaceholderTemplateDirective, SIonPopoverComponent, SIonPopoverModule, SapphireIonFrameworkModule, Search, SecurePipe, SelectInterfaces, SionCardComponent, StepComponent, StepperComponent, StepperModule, StorageService, StringProperty, TabComponent, TableField, TableFieldFormBuilder, TabsComponent, TabsModule, TelefoneCelular, TextTooltipComponent, ThFilterComponent, TimeProperty, Timeout, TokenInterceptor, TooltipComponent, UsuarioService, Utils, UtilsService, View, ViewFiltros, ViewRetorno, idPreloaderConfiguration, lstImage, lstImageTypes };
 //# sourceMappingURL=sapphire-ion-framework.mjs.map