@bravobit/bb-foundation 0.53.1 → 0.53.2

package/elements/lib/file-picker/file-picker.component.d.ts

@@ -46,9 +46,6 @@ export declare class BbFilePicker implements ControlValueAccessor {
     };
     saveFile(files: File[]): void;
     private getFilesFromEvent;
-    private isValidFileType;
-    private isValidFileSize;
-    private isFileLike;
     static ɵfac: i0.ɵɵFactoryDeclaration<BbFilePicker, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<BbFilePicker, "bb-file-picker", never, { "label": { "alias": "label"; "required": false; }; "hint": { "alias": "hint"; "required": false; }; "accept": { "alias": "accept"; "required": false; }; "maxFileSize": { "alias": "maxFileSize"; "required": false; }; "showImages": { "alias": "showImages"; "required": false; }; "grouped": { "alias": "grouped"; "required": false; }; "required": { "alias": "required"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "hideErrors": { "alias": "hideErrors"; "required": false; }; "value": { "alias": "value"; "required": false; }; }, { "valueChange": "valueChange"; }, ["extraTemplate"], never, true, never>;
     static ngAcceptInputType_maxFileSize: unknown;

package/elements/lib/multi-file-control/multi-file-control.component.d.ts

@@ -61,9 +61,6 @@ export declare class BbMultiFileControl implements ControlValueAccessor {
         maxFileSize?: undefined;
     };
     addFiles(files: File[]): void;
-    private isValidFileSize;
-    private isValidFileType;
-    private isFileLike;
     static ɵfac: i0.ɵɵFactoryDeclaration<BbMultiFileControl, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<BbMultiFileControl, "bb-multi-file-control", never, { "label": { "alias": "label"; "required": false; }; "hint": { "alias": "hint"; "required": false; }; "accept": { "alias": "accept"; "required": false; }; "maxFileSize": { "alias": "maxFileSize"; "required": false; }; "maxTotalFileSize": { "alias": "maxTotalFileSize"; "required": false; }; "grouped": { "alias": "grouped"; "required": false; }; "required": { "alias": "required"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "hideErrors": { "alias": "hideErrors"; "required": false; }; "items": { "alias": "items"; "required": false; }; }, { "delete": "delete"; }, never, never, true, never>;
     static ngAcceptInputType_maxFileSize: unknown;

package/fesm2022/bravobit-bb-foundation-elements.mjs

@@ -12,7 +12,7 @@ import { BbTemplate } from '@bravobit/bb-foundation/utils';
 import * as i1$1 from '@angular/cdk/platform';
 import { Platform } from '@angular/cdk/platform';
 import * as i2 from '@bravobit/bb-foundation';
-import { Files, clamp, hsvToHex, hexToHsv, formatFileSize, Exif, FileLoader, parseDate } from '@bravobit/bb-foundation';
+import { Files, clamp, hsvToHex, hexToHsv, formatFileSize, Exif, FileLoader, parseDate, isValidFileType, isValidFileSize, isFileLike } from '@bravobit/bb-foundation';
 import { Overlay } from '@angular/cdk/overlay';
 import { ComponentPortal } from '@angular/cdk/portal';
 import * as i3 from '@angular/platform-browser';
@@ -1768,7 +1768,7 @@ class BbMultiFileControl {
     validate(control) {
         const value = control?.value ?? [];
         const errors = value.reduce((previous, current, index) => {
-            if (this.isValidFileType(current)) {
+            if (isValidFileType(current, this.accept)) {
                 return previous;
             }
             return { ...previous, [index]: true };
@@ -1777,7 +1777,7 @@ class BbMultiFileControl {
             return { invalidFiles: errors };
         }
         for (const file of value) {
-            if (!this.isValidFileSize(file)) {
+            if (!isValidFileSize(file, this.maxFileSize)) {
                 return { maxFileSize: { maxSize: formatFileSize(this.maxFileSize) } };
             }
         }
@@ -1785,7 +1785,7 @@ class BbMultiFileControl {
         if (totalSize > this.maxTotalFileSize) {
             return {
                 maxTotalFileSize: {
-                    max: formatFileSize(this.maxFileSize),
+                    max: formatFileSize(this.maxTotalFileSize),
                     current: formatFileSize(totalSize)
                 }
             };
@@ -1798,36 +1798,13 @@ class BbMultiFileControl {
         }
         for (let index = 0; index < files?.length; index++) {
             const file = files?.[index] ?? null;
-            if (!this.isFileLike(file)) {
+            if (!isFileLike(file)) {
                 continue;
             }
             this.value.push(file);
         }
         this.onChangeCallback?.(this.value);
     }
-    isValidFileSize(file) {
-        if (!this.isFileLike(file)) {
-            return false;
-        }
-        return file?.size <= this.maxFileSize;
-    }
-    isValidFileType(file) {
-        if (!this.isFileLike(file)) {
-            return false;
-        }
-        if (this.accept === null || this.accept === undefined) {
-            return true;
-        }
-        const regexString = this.accept
-            .replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')
-            .replace(/,/g, '|');
-        const mimeTypeRegex = new RegExp(regexString);
-        return mimeTypeRegex.test(file?.type);
-    }
-    isFileLike(input) {
-        return 'File' in window && input instanceof File
-            || 'Blob' in window && input instanceof Blob;
-    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.6", ngImport: i0, type: BbMultiFileControl, deps: [], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.1.6", type: BbMultiFileControl, isStandalone: true, selector: "bb-multi-file-control", inputs: { label: "label", hint: "hint", accept: "accept", maxFileSize: ["maxFileSize", "maxFileSize", numberAttribute], maxTotalFileSize: ["maxTotalFileSize", "maxTotalFileSize", numberAttribute], grouped: ["grouped", "grouped", booleanAttribute], required: ["required", "required", booleanAttribute], disabled: ["disabled", "disabled", booleanAttribute], hideErrors: ["hideErrors", "hideErrors", booleanAttribute], items: "items" }, outputs: { delete: "delete" }, host: { properties: { "class.required": "required", "class.disabled": "disabled", "class.grouped": "grouped", "class.error": "error" }, classAttribute: "bb-multi-file-control" }, providers: [
             { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => BbMultiFileControl), multi: true },
@@ -1956,10 +1933,10 @@ class BbFilePicker {
         if (value === null || value === undefined) {
             return null;
         }
-        if (!this.isValidFileType(value)) {
+        if (!isValidFileType(value, this.accept)) {
             return { invalidFileType: true };
         }
-        if (!this.isValidFileSize(value)) {
+        if (!isValidFileSize(value, this.maxFileSize)) {
             return { maxFileSize: { maxSize: formatFileSize(this.maxFileSize) } };
         }
         return null;
@@ -1979,29 +1956,6 @@ class BbFilePicker {
         }
         return Array.from(element.files);
     }
-    isValidFileType(file) {
-        if (!this.isFileLike(file)) {
-            return false;
-        }
-        if (this.accept === null || this.accept === undefined) {
-            return true;
-        }
-        const regexString = this.accept
-            .replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')
-            .replace(/,/g, '|');
-        const mimeTypeRegex = new RegExp(regexString);
-        return mimeTypeRegex.test(file?.type);
-    }
-    isValidFileSize(file) {
-        if (!this.isFileLike(file)) {
-            return false;
-        }
-        return file?.size <= this.maxFileSize;
-    }
-    isFileLike(input) {
-        return 'File' in window && input instanceof File
-            || 'Blob' in window && input instanceof Blob;
-    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.6", ngImport: i0, type: BbFilePicker, deps: [], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.1.6", type: BbFilePicker, isStandalone: true, selector: "bb-file-picker", inputs: { label: "label", hint: "hint", accept: "accept", maxFileSize: ["maxFileSize", "maxFileSize", numberAttribute], showImages: ["showImages", "showImages", booleanAttribute], grouped: ["grouped", "grouped", booleanAttribute], required: ["required", "required", booleanAttribute], disabled: ["disabled", "disabled", booleanAttribute], hideErrors: ["hideErrors", "hideErrors", booleanAttribute], value: "value" }, outputs: { valueChange: "valueChange" }, host: { properties: { "class.required": "required", "class.disabled": "disabled", "class.grouped": "grouped", "class.error": "error" }, classAttribute: "bb-file-picker" }, providers: [
             {