@morozeckiy/dd-lib 0.7.111 → 0.7.113

package/assets/scss/common.scss

@@ -232,7 +232,9 @@ html {
 }
 
 .black-svg {
-  filter: brightness(0);
+  svg path {
+    stroke: var(--light-black-color);
+  }
 }
 
 .disabled {

package/assets/scss/reset.scss

@@ -1,154 +1,156 @@
-html,
-body,
-div,
-span,
-applet,
-object,
-iframe,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-big,
-cite,
-code,
-del,
-dfn,
-em,
-img,
-ins,
-kbd,
-q,
-s,
-samp,
-small,
-strike,
-strong,
-sub,
-sup,
-tt,
-var,
-b,
-u,
-i,
-center,
-dl,
-dt,
-dd,
-ol,
-ul,
-li,
-fieldset,
-form,
-label,
-legend,
-table,
-caption,
-tbody,
-tfoot,
-thead,
-tr,
-th,
-td,
-article,
-aside,
-canvas,
-details,
-embed,
-figure,
-figcaption,
-footer,
-header,
-hgroup,
-menu,
-nav,
-output,
-ruby,
-section,
-summary,
-time,
-mark,
-audio,
-video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline;
-}
-
-/* HTML5 display-role reset for older browsers */
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-menu,
-nav,
-section {
-  display: block;
-}
-
-body {
-  line-height: 1;
-}
-
-ol,
-ul {
-  list-style: none;
-}
-
-blockquote,
-q {
-  quotes: none;
-}
-
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
-  content: '';
-  content: none;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-a {
-  text-decoration: none;
-  color: inherit;
-}
-
-span,
-div,
-input {
-  box-sizing: border-box;
-}
-
-input:focus-visible {
-  outline: none;
-}
-
-button,
-textarea {
-  font-family: inherit;
-}
-
-textarea {
-  outline: none;
-}
+html,
+body,
+div,
+span,
+applet,
+object,
+iframe,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+big,
+cite,
+code,
+del,
+dfn,
+em,
+img,
+ins,
+kbd,
+q,
+s,
+samp,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+var,
+b,
+u,
+i,
+center,
+dl,
+dt,
+dd,
+ol,
+ul,
+li,
+fieldset,
+form,
+label,
+legend,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td,
+article,
+aside,
+canvas,
+details,
+embed,
+figure,
+figcaption,
+footer,
+header,
+hgroup,
+menu,
+nav,
+output,
+ruby,
+section,
+summary,
+time,
+mark,
+audio,
+video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
+}
+
+/* HTML5 display-role reset for older browsers */
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+menu,
+nav,
+section {
+  display: block;
+}
+
+body {
+  line-height: 1;
+}
+
+ol,
+ul {
+  list-style: none;
+}
+
+blockquote,
+q {
+  quotes: none;
+}
+
+blockquote:before,
+blockquote:after,
+q:before,
+q:after {
+  content: '';
+  content: none;
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+a {
+  text-decoration: none;
+  color: inherit;
+}
+
+span,
+div,
+input {
+  box-sizing: border-box;
+}
+
+input:focus-visible {
+  outline: none;
+}
+
+input,
+button,
+textarea {
+  font-family: inherit;
+  color: inherit;
+}
+
+textarea {
+  outline: none;
+}

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);
             }
@@ -4559,17 +4555,33 @@ class LibFileLoaderComponent {
         this.multiple = false;
         this.maxFileSize = 50;
         this.showLoader = false;
+        this.externalFiles = []; // Новый входной параметр для синхронизации
         this.inputFiles = new EventEmitter();
         this.files = [];
     }
+    ngOnChanges(changes) {
+        if (changes['externalFiles'] && !changes['externalFiles'].firstChange) {
+            this.files = [...this.externalFiles];
+        }
+    }
     openFileLoader() {
         this.fileLoader.nativeElement.click();
     }
     loadFile($event) {
         const input = $event.target;
-        const files = $event.target?.files;
+        const files = Array.from(input.files || []);
+        if (!files.length)
+            return;
         let acceptedFiles = [];
+        let currentFileCount = this.files.length;
         for (let i = 0; i < files.length; i++) {
+            if (this.maxFiles && currentFileCount >= this.maxFiles) {
+                this.toast.show({
+                    type: 'warning',
+                    title: 'Превышено допустимое количество файлов'
+                });
+                break;
+            }
             let error = false;
             if (!this.validateFileSize(files[i])) {
                 this.toast.show({
@@ -4585,59 +4597,45 @@ class LibFileLoaderComponent {
                 });
                 error = true;
             }
-            if (this.maxFiles && this.maxFiles === this.files.length) {
-                this.toast.show({
-                    type: 'warning',
-                    title: 'Превышено допустимое колличество файлов'
-                });
-                error = true;
-                return;
-            }
             if (!error) {
-                if (this.multiple) {
-                    this.files.push(files[i]);
+                const fileExists = this.files.some(f => f.name === files[i].name &&
+                    f.size === files[i].size &&
+                    f.lastModified === files[i].lastModified);
+                if (!fileExists) {
                     acceptedFiles.push(files[i]);
-                }
-                else {
-                    this.files = [files[0]];
-                    acceptedFiles = [files[0]];
+                    currentFileCount++;
                 }
             }
-            this.files = this.files.reduce((acc, current) => {
-                const existingItem = acc.find(item => item.name === current.name);
-                if (!existingItem) {
-                    acc.push(current);
-                }
-                return acc;
-            }, []);
-            if (error) {
-                this.files = [];
-            }
         }
         if (acceptedFiles.length) {
+            if (this.multiple) {
+                this.files = [...this.files, ...acceptedFiles];
+            }
+            else {
+                this.files = acceptedFiles.slice(0, 1); // Берем только первый файл
+                acceptedFiles = this.files.slice();
+            }
             this.inputFiles.emit(acceptedFiles);
         }
         input.value = '';
     }
     clear() {
         this.files = [];
-        if (this.multiple) {
-        }
-        else {
-            this.fileLoader.nativeElement.value = '';
-            this.fileLoader.nativeElement.files = null;
-        }
+        this.fileLoader.nativeElement.value = '';
+        this.fileLoader.nativeElement.files = new DataTransfer().files;
     }
     validateExtension(file) {
-        const fileParts = file.name.split('.');
-        const extension = fileParts.pop()?.toLowerCase();
-        return this.extensions?.includes(extension);
+        if (!this.extensions || this.extensions.length === 0) {
+            return true;
+        }
+        const fileName = file.name.toLowerCase();
+        return this.extensions.some(ext => fileName.endsWith(ext.toLowerCase()));
     }
     validateFileSize(file) {
         return file.size / 1048576 <= this.maxFileSize;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.2", ngImport: i0, type: LibFileLoaderComponent, deps: [{ token: ToastService }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.2", type: LibFileLoaderComponent, isStandalone: true, selector: "dd-lib-file-loader", inputs: { title: "title", description: "description", btnTitle: "btnTitle", multiple: "multiple", maxFiles: "maxFiles", maxFileSize: "maxFileSize", style: "style", extensions: "extensions", disabled: "disabled", showLoader: "showLoader", template: "template" }, outputs: { inputFiles: "inputFiles" }, viewQueries: [{ propertyName: "fileLoader", first: true, predicate: ["fileLoader"], descendants: true }], ngImport: i0, template: "<div (click)=\"openFileLoader()\">\r\n  @if (template) {\r\n    <ng-template [ngTemplateOutlet]=\"template\"></ng-template>\r\n  } @else {\r\n    @if (title) {\r\n      <div class=\"g-text mb-4\">{{ title }}</div>\r\n    }\r\n    @if (description) {\r\n      <div class=\"g-text-sm gray mb-16\">{{ description }}</div>\r\n    }\r\n    <dd-lib-button [showLoader]=\"showLoader\" [btnColor]=\"'white'\" [ngStyle]=\"style\" >\r\n      <div class=\"d-flex align-center\">\r\n        <div class=\"mr-8\">\r\n          <dd-lib-svg-icon  icon=\"paperclip\"></dd-lib-svg-icon>\r\n        </div>\r\n        <div class=\"title-soc-btn\">{{ btnTitle }}</div>\r\n      </div>\r\n    </dd-lib-button>\r\n  }\r\n</div>\r\n\r\n<input type=\"file\"\r\n       [multiple]=\"multiple\"\r\n       [hidden]=\"true\" #fileLoader\r\n       (change)=\"loadFile($event)\">\r\n", styles: [""], dependencies: [{ kind: "component", type: LibButtonComponent, selector: "dd-lib-button", inputs: ["noPadding", "loaderColor"] }, { kind: "component", type: LibSvgIconComponent, selector: "dd-lib-svg-icon", inputs: ["width", "height", "color", "icon"] }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: NgStyle, selector: "[ngStyle]", inputs: ["ngStyle"] }, { kind: "directive", type: NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.2", type: LibFileLoaderComponent, isStandalone: true, selector: "dd-lib-file-loader", inputs: { title: "title", description: "description", btnTitle: "btnTitle", multiple: "multiple", maxFiles: "maxFiles", maxFileSize: "maxFileSize", style: "style", extensions: "extensions", disabled: "disabled", showLoader: "showLoader", template: "template", externalFiles: "externalFiles" }, outputs: { inputFiles: "inputFiles" }, viewQueries: [{ propertyName: "fileLoader", first: true, predicate: ["fileLoader"], descendants: true }], usesOnChanges: true, ngImport: i0, template: "<div (click)=\"openFileLoader()\">\r\n  @if (template) {\r\n    <ng-template [ngTemplateOutlet]=\"template\"></ng-template>\r\n  } @else {\r\n    @if (title) {\r\n      <div class=\"g-text mb-4\">{{ title }}</div>\r\n    }\r\n    @if (description) {\r\n      <div class=\"g-text-sm gray mb-16\">{{ description }}</div>\r\n    }\r\n    <dd-lib-button [showLoader]=\"showLoader\" [btnColor]=\"'white'\" [ngStyle]=\"style\" >\r\n      <div class=\"d-flex align-center\">\r\n        <div class=\"mr-8\">\r\n          <dd-lib-svg-icon  icon=\"paperclip\"></dd-lib-svg-icon>\r\n        </div>\r\n        <div class=\"title-soc-btn\">{{ btnTitle }}</div>\r\n      </div>\r\n    </dd-lib-button>\r\n  }\r\n</div>\r\n\r\n<input type=\"file\"\r\n       [multiple]=\"multiple\"\r\n       [hidden]=\"true\" #fileLoader\r\n       (change)=\"loadFile($event)\">\r\n", styles: [""], dependencies: [{ kind: "component", type: LibButtonComponent, selector: "dd-lib-button", inputs: ["noPadding", "loaderColor"] }, { kind: "component", type: LibSvgIconComponent, selector: "dd-lib-svg-icon", inputs: ["width", "height", "color", "icon"] }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: NgStyle, selector: "[ngStyle]", inputs: ["ngStyle"] }, { kind: "directive", type: NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.2", ngImport: i0, type: LibFileLoaderComponent, decorators: [{
             type: Component,
@@ -4667,6 +4665,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.2", ngImpor
                 type: Input
             }], template: [{
                 type: Input
+            }], externalFiles: [{
+                type: Input
             }], inputFiles: [{
                 type: Output
             }] } });