@morozeckiy/dd-lib 0.7.112 → 0.7.116

package/fesm2022/morozeckiy-dd-lib.mjs

@@ -2339,15 +2339,13 @@ class LibSvgViewerComponent {
             const elements = svg.querySelectorAll(rule.selector);
             elements.forEach(el => {
                 if (rule.attribute === 'fill' || rule.attribute === 'both' || !rule.attribute) {
-                    if (el.hasAttribute('fill') &&
-                        el.getAttribute('fill') !== 'none' &&
+                    if (el.getAttribute('fill') !== 'none' &&
                         el.getAttribute('fill') !== 'transparent') {
                         el.setAttribute('fill', rule.color);
                     }
                 }
                 if (rule.attribute === 'stroke' || rule.attribute === 'both' || !rule.attribute) {
-                    if (el.hasAttribute('stroke') &&
-                        el.getAttribute('stroke') !== 'none' &&
+                    if (el.getAttribute('stroke') !== 'none' &&
                         el.getAttribute('stroke') !== 'transparent') {
                         el.setAttribute('stroke', rule.color);
                     }
@@ -2358,13 +2356,11 @@ class LibSvgViewerComponent {
     applyColor(svg) {
         const elements = svg.querySelectorAll('[stroke], [fill]');
         elements.forEach(el => {
-            if (el.hasAttribute('stroke') &&
-                el.getAttribute('stroke') !== 'none' &&
+            if (el.getAttribute('stroke') !== 'none' &&
                 el.getAttribute('stroke') !== 'transparent') {
                 el.setAttribute('stroke', this.color);
             }
-            if (el.hasAttribute('fill') &&
-                el.getAttribute('fill') !== 'none' &&
+            if (el.getAttribute('fill') !== 'none' &&
                 el.getAttribute('fill') !== 'transparent') {
                 el.setAttribute('fill', this.color);
             }
@@ -4401,8 +4397,12 @@ class LibTabsFragmentComponent {
             if (this.rout && !this.noFragment) {
                 this.router.navigate([this.rout], { fragment: tab.fragment });
             }
-            else if (this.rout && this.noFragment && tab.path) {
-                this.router.navigate([this.rout, tab.path]);
+            else if (this.rout && this.noFragment) {
+                const route = tab.path ? [this.rout, tab.path] : [this.rout];
+                this.router.navigate(route);
+            }
+            else if (!this.rout && tab.path) {
+                this.router.navigate([tab.path || '']);
             }
             else if (!this.rout && !this.noFragment) {
                 const currentUrl = this.location.path(); // Получаем текущий URL без фрагмента
@@ -4411,7 +4411,7 @@ class LibTabsFragmentComponent {
             }
             if (callEvent) {
                 this.setActiveTab.emit(this.activeFragment);
-                this.onChange(tab); // Notify Angular Forms
+                this.onChange(tab);
                 this.onTouched();
             }
         }
@@ -4458,7 +4458,7 @@ class LibTabsFragmentComponent {
         }
         else if (this.needInitEvent) {
             if (this.noFragment && this.tabs?.[0].path) {
-                this.activeFragment = this.tabs?.length ? this.tabs.find(f => (this.rout ? this.rout + '/' : '/') + f.path === this.location.path())?.id : 0;
+                this.activeFragment = this.tabs?.length ? this.tabs.find(f => '/' + (this.rout ? this.rout + '/' : '') + f.path === this.location.path())?.id : 0;
             }
         }
         this.setActiveTab.emit(this.activeFragment);