ng-easycommerce 1.1.3 → 1.1.4

package/fesm5/ng-easycommerce.js

@@ -1,5 +1,5 @@
 import { Pipe, InjectionToken, Injectable, PLATFORM_ID, Inject, ɵɵdefineInjectable, ɵɵinject, Injector, INJECTOR, RendererFactory2, NgZone, Component, Input, HostListener, EventEmitter, Output, Renderer2, ViewChild, ElementRef, ViewChildren, ChangeDetectorRef, Directive, TemplateRef, ViewContainerRef, NgModule } from '@angular/core';
-import { isPlatformBrowser, DOCUMENT, CurrencyPipe, CommonModule } from '@angular/common';
+import { isPlatformBrowser, DOCUMENT, LocationStrategy, CurrencyPipe, CommonModule } from '@angular/common';
 import { TranslateService, TranslateModule } from '@ngx-translate/core';
 import { Router, NavigationEnd, NavigationStart, ActivatedRoute, RouterModule } from '@angular/router';
 import { HttpHeaders, HttpParams, HttpClient, HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
@@ -27145,19 +27145,20 @@ var ParamsContext = /** @class */ (function () {
     return ParamsContext;
 }());
 var AddActionRedirectDirective = /** @class */ (function () {
-    function AddActionRedirectDirective(document, elementRef, renderer, blocksService, router) {
-        var _this = this;
+    function AddActionRedirectDirective(document, elementRef, renderer, blocksService, router, locationStrategy) {
         this.document = document;
         this.elementRef = elementRef;
         this.renderer = renderer;
         this.blocksService = blocksService;
         this.router = router;
+        this.locationStrategy = locationStrategy;
         this.redirectUrl = '';
         this.linstenEvent = null;
         this.transparent = true;
-        this.redirectFromUrl = function (evt) {
-            _this.router.navigateByUrl(_this.redirectUrl);
-        };
+        this.targetManaged = false;
+        this.originalTarget = null;
+        this.relManaged = false;
+        this.originalRel = null;
     }
     Object.defineProperty(AddActionRedirectDirective.prototype, "ecAddActionRedirect", {
         set: function (value) {
@@ -27184,10 +27185,19 @@ var AddActionRedirectDirective = /** @class */ (function () {
     AddActionRedirectDirective.prototype.ngOnChanges = function (changes) {
         var _this = this;
         var _a;
+        var element = this.elementRef.nativeElement;
+        var target = this.targetManaged ? this.originalTarget : element.getAttribute('target');
+        var rel = this.relManaged ? this.originalRel : element.getAttribute('rel');
         if (this.linstenEvent) {
             this.linstenEvent();
             this.linstenEvent = null;
         }
+        this.restoreManagedAttribute('target', this.targetManaged, this.originalTarget);
+        this.restoreManagedAttribute('rel', this.relManaged, this.originalRel);
+        this.targetManaged = false;
+        this.originalTarget = null;
+        this.relManaged = false;
+        this.originalRel = null;
         this.transparent && this.renderer.setStyle(this.elementRef.nativeElement, 'color', 'transparent');
         (_a = this.classStr) === null || _a === void 0 ? void 0 : _a.split(" ").forEach(function (cl) {
             try {
@@ -27202,18 +27212,101 @@ var AddActionRedirectDirective = /** @class */ (function () {
         if (accessibleLabel) {
             this.renderer.setAttribute(this.elementRef.nativeElement, 'aria-label', accessibleLabel);
         }
-        this.renderer.setProperty(this.elementRef.nativeElement, "href", this.redirectUrl);
         if (this.isExternalUrl(this.redirectUrl)) {
-            this.renderer.setAttribute(this.elementRef.nativeElement, "target", "_blank");
-            this.renderer.setAttribute(this.elementRef.nativeElement, "rel", "noopener noreferrer");
+            this.renderer.setProperty(element, "href", this.redirectUrl);
+            var effectiveTarget = target === null ? '_blank' : target;
+            if (target === null) {
+                this.renderer.setAttribute(element, "target", "_blank");
+                this.targetManaged = true;
+                this.originalTarget = null;
+            }
+            if (effectiveTarget.trim().toLowerCase() === '_blank') {
+                var relTokens = (rel || '').split(/\s+/).filter(Boolean);
+                var existingRelTokens = relTokens.map(function (token) { return token.toLowerCase(); });
+                if (existingRelTokens.indexOf('noopener') === -1)
+                    relTokens.push('noopener');
+                if (existingRelTokens.indexOf('noreferrer') === -1)
+                    relTokens.push('noreferrer');
+                var secureRel = relTokens.join(' ');
+                if (secureRel !== rel) {
+                    this.renderer.setAttribute(element, "rel", secureRel);
+                    this.relManaged = true;
+                    this.originalRel = rel;
+                }
+            }
         }
         else {
-            this.renderer.removeAttribute(this.elementRef.nativeElement, "target");
-            this.renderer.removeAttribute(this.elementRef.nativeElement, "rel");
-            this.linstenEvent = this.renderer.listen(this.elementRef.nativeElement, 'click', function (evt) {
-                evt.preventDefault();
-                _this.redirectFromUrl(evt);
-            });
+            var routerUrl_1 = this.toRouterUrl(this.redirectUrl);
+            this.renderer.setProperty(element, "href", this.locationStrategy.prepareExternalUrl(routerUrl_1));
+            if (target === null) {
+                this.linstenEvent = this.renderer.listen(element, 'click', function (evt) {
+                    if (!_this.shouldHandleSpaClick(evt))
+                        return;
+                    evt.preventDefault();
+                    _this.router.navigateByUrl(routerUrl_1);
+                });
+            }
+        }
+    };
+    AddActionRedirectDirective.prototype.shouldHandleSpaClick = function (event) {
+        return !event.defaultPrevented && event.button === 0 &&
+            !event.ctrlKey && !event.metaKey && !event.shiftKey && !event.altKey;
+    };
+    AddActionRedirectDirective.prototype.toRouterUrl = function (url) {
+        var routerUrl;
+        if (this.isAbsoluteUrl(url) || url.startsWith('#') || url.startsWith('?')) {
+            var target = new URL(url, this.getDocumentHref());
+            routerUrl = target.pathname + target.search + target.hash;
+        }
+        else {
+            routerUrl = this.router.serializeUrl(this.router.parseUrl(url));
+        }
+        return this.stripBaseHref(routerUrl);
+    };
+    AddActionRedirectDirective.prototype.stripBaseHref = function (url) {
+        var pathEnd = url.search(/[?#]/);
+        var path = pathEnd === -1 ? url : url.substring(0, pathEnd);
+        var suffix = pathEnd === -1 ? '' : url.substring(pathEnd);
+        var baseHref = this.locationStrategy.getBaseHref();
+        if (!baseHref)
+            return url;
+        try {
+            var current = new URL(this.getDocumentHref());
+            var base = new URL(baseHref, current.href);
+            var basePath = base.origin === current.origin ? base.pathname : '';
+            basePath = basePath.replace(/\/index\.html$/i, '').replace(/\/+$/, '');
+            if (!basePath || basePath === '/')
+                return url;
+            if (path === basePath)
+                return '/' + suffix;
+            if (path.indexOf(basePath + '/') === 0) {
+                return path.substring(basePath.length) + suffix;
+            }
+        }
+        catch (e) {
+            // Keep the URL unchanged when the browser cannot resolve the base href.
+        }
+        return url;
+    };
+    AddActionRedirectDirective.prototype.getDocumentHref = function () {
+        var location = this.document && this.document.location;
+        if (location && location.href)
+            return location.href;
+        if (location && location.origin)
+            return location.origin + '/';
+        return 'http://localhost/';
+    };
+    AddActionRedirectDirective.prototype.isAbsoluteUrl = function (url) {
+        return /^[a-z][a-z\d+.-]*:/i.test(url) || url.indexOf('//') === 0;
+    };
+    AddActionRedirectDirective.prototype.restoreManagedAttribute = function (name, managed, originalValue) {
+        if (!managed)
+            return;
+        if (originalValue === null) {
+            this.renderer.removeAttribute(this.elementRef.nativeElement, name);
+        }
+        else {
+            this.renderer.setAttribute(this.elementRef.nativeElement, name, originalValue);
         }
     };
     AddActionRedirectDirective.prototype.getAccessibleLabel = function () {
@@ -27233,22 +27326,36 @@ var AddActionRedirectDirective = /** @class */ (function () {
         return ((_k = (_j = this.banner) === null || _j === void 0 ? void 0 : _j.name) === null || _k === void 0 ? void 0 : _k.trim()) || 'Ver más';
     };
     AddActionRedirectDirective.prototype.isExternalUrl = function (url) {
-        var _a, _b;
-        if (!url)
-            return false;
-        if (url.startsWith('/') || url.startsWith('#'))
+        if (!url || !this.isAbsoluteUrl(url))
             return false;
         try {
-            var base = ((_b = (_a = this.document) === null || _a === void 0 ? void 0 : _a.location) === null || _b === void 0 ? void 0 : _b.origin) || '';
-            var target = new URL(url, base);
-            if (!base)
+            var current = new URL(this.getDocumentHref());
+            var target = new URL(url, current.href);
+            if (target.origin !== current.origin)
                 return true;
-            return target.origin !== base;
+            return this.isOutsideBaseHref(target.pathname, current);
         }
         catch (e) {
             return true;
         }
     };
+    AddActionRedirectDirective.prototype.isOutsideBaseHref = function (pathname, current) {
+        var baseHref = this.locationStrategy.getBaseHref();
+        if (!baseHref)
+            return false;
+        try {
+            var base = new URL(baseHref, current.href);
+            if (base.origin !== current.origin)
+                return false;
+            var basePath = base.pathname.replace(/\/index\.html$/i, '').replace(/\/+$/, '');
+            if (!basePath || basePath === '/')
+                return false;
+            return pathname !== basePath && pathname.indexOf(basePath + '/') !== 0;
+        }
+        catch (e) {
+            return false;
+        }
+    };
     AddActionRedirectDirective.prototype.ngOnDestroy = function () {
         this.linstenEvent && this.linstenEvent();
     };
@@ -27257,7 +27364,8 @@ var AddActionRedirectDirective = /** @class */ (function () {
         { type: ElementRef },
         { type: Renderer2 },
         { type: BlocksService },
-        { type: Router }
+        { type: Router },
+        { type: LocationStrategy }
     ]; };
     __decorate$2a([
         Input()