@sumaris-net/ngx-components 2.11.7 → 2.12.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sumaris-net/ngx-components",
   "description": "SUMARiS Angular components",
-  "version": "2.11.7",
+  "version": "2.12.0",
   "author": "contact@e-is.pro",
   "license": "AGPL-3.0",
   "readmeFilename": "README.md",

package/src/app/core/form/form.class.d.ts

@@ -4,7 +4,7 @@ import { BehaviorSubject, Subject, Subscription } from 'rxjs';
 import { IAppForm } from './form.utils';
 import { LocalSettingsService } from '../services/local-settings.service';
 import { WaitForOptions } from '../../shared/observables';
-import { FormErrorTranslateOptions, FormErrorTranslator, FormErrorTranslatorOptions, IFormPathTranslator } from '../../shared/validator/form-error-adapter.class';
+import { FormErrorTranslateOptions, FormErrorTranslator, IFormPathTranslator } from '../../shared/validator/form-error-adapter.class';
 import { TranslateService } from '@ngx-translate/core';
 import { MatAutocompleteConfigHolder, MatAutocompleteFieldAddOptions, MatAutocompleteFieldConfig } from '../../shared/material/autocomplete/material.autocomplete.config';
 import * as i0 from "@angular/core";
@@ -44,11 +44,6 @@ export declare class AppForm<T> implements IAppForm<T>, OnInit, OnDestroy, IForm
      */
     protected get _enable(): boolean;
     protected set _enable(value: boolean);
-    /**
-     * @deprecated use errorTranslateOptions instead
-     */
-    get errorTranslatorOptions(): FormErrorTranslatorOptions;
-    set errorTranslatorOptions(options: FormErrorTranslatorOptions);
     disable(opts?: {
         onlySelf?: boolean;
         emitEvent?: boolean;

package/src/app/core/services/base-entity-service.class.d.ts

@@ -112,7 +112,7 @@ export declare abstract class BaseEntityService<T extends Entity<T, ID>, F exten
     isNewFn(data: T): boolean;
     protected ngOnStart(): Promise<void>;
     protected fillDefaultProperties(source: T): void;
-    protected asObject(entity: T, opts?: EntityAsObjectOptions): any;
+    protected asObject(source: T, opts?: EntityAsObjectOptions): any;
     protected getRefetchQueriesForMutation(opts?: EntitySaveOptions): ((result: FetchResult<{
         data: any;
     }>) => InternalRefetchQueriesInclude) | InternalRefetchQueriesInclude;

package/src/app/core/table/async-table.class.d.ts

@@ -18,7 +18,7 @@ import { WaitForOptions } from '../../shared/observables';
 import { ShowToastOptions } from '../../shared/toast/toasts';
 import { CdkColumnDef } from '@angular/cdk/table';
 import { LoadResult } from '../../shared/services/entity-service.class';
-import { FormErrorTranslateOptions, FormErrorTranslator, FormErrorTranslatorOptions, IFormPathTranslator } from '../../shared/validator/form-error-adapter.class';
+import { FormErrorTranslateOptions, FormErrorTranslator, IFormPathTranslator } from '../../shared/validator/form-error-adapter.class';
 import { SaveActionType } from './table.model';
 import { AsyncTableElement } from '@e-is/ngx-material-table';
 import { EntitiesAsyncTableDataSource } from './entities-async-table-datasource.class';
@@ -50,7 +50,7 @@ export declare abstract class AppAsyncTable<T extends IEntity<T, ID>, F = any, I
     displayedColumns: string[];
     totalRowCount: number | null;
     visibleRowCount: number;
-    errorTranslateOptions: FormErrorTranslateOptions | FormErrorTranslatorOptions;
+    errorTranslateOptions: FormErrorTranslateOptions;
     readonly readySubject: BehaviorSubject<boolean>;
     readonly loadingSubject: BehaviorSubject<boolean>;
     readonly savingSubject: BehaviorSubject<boolean>;
@@ -59,14 +59,6 @@ export declare abstract class AppAsyncTable<T extends IEntity<T, ID>, F = any, I
     readonly errorSubject: BehaviorSubject<string>;
     get error(): string;
     set error(error: string);
-    /**
-     * @deprecated use errorTranslateOptions instead
-     */
-    get errorTranslatorOptions(): FormErrorTranslatorOptions;
-    /**
-     * @deprecated use errorTranslateOptions instead
-     */
-    set errorTranslatorOptions(options: FormErrorTranslatorOptions);
     selection: SelectionModel<AsyncTableElement<T>>;
     permanentSelection: SelectionModel<T>;
     permanentSelectionChangedPrevented: boolean;

package/src/app/core/table/table.class.d.ts

@@ -18,7 +18,7 @@ import { WaitForOptions } from '../../shared/observables';
 import { ShowToastOptions } from '../../shared/toast/toasts';
 import { CdkColumnDef } from '@angular/cdk/table';
 import { LoadResult } from '../../shared/services/entity-service.class';
-import { FormErrorTranslateOptions, FormErrorTranslator, FormErrorTranslatorOptions, IFormPathTranslator } from '../../shared/validator/form-error-adapter.class';
+import { FormErrorTranslateOptions, FormErrorTranslator, IFormPathTranslator } from '../../shared/validator/form-error-adapter.class';
 import { SaveActionType } from './table.model';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatTable } from '@angular/material/table';
@@ -50,7 +50,7 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     displayedColumns: string[];
     totalRowCount: number | null;
     visibleRowCount: number;
-    errorTranslateOptions: FormErrorTranslateOptions | FormErrorTranslatorOptions;
+    errorTranslateOptions: FormErrorTranslateOptions;
     readonly readySubject: BehaviorSubject<boolean>;
     readonly loadingSubject: BehaviorSubject<boolean>;
     readonly savingSubject: BehaviorSubject<boolean>;
@@ -63,14 +63,6 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
      * @deprecated
      */
     get error$(): Observable<string>;
-    /**
-     * @deprecated use errorTranslateOptions instead
-     */
-    get errorTranslatorOptions(): FormErrorTranslatorOptions;
-    /**
-     * @deprecated use errorTranslateOptions instead
-     */
-    set errorTranslatorOptions(options: FormErrorTranslatorOptions);
     selection: SelectionModel<TableElement<T>>;
     permanentSelection: SelectionModel<T>;
     permanentSelectionChangedPrevented: boolean;

package/src/app/shared/inputs.d.ts

@@ -16,7 +16,7 @@ export interface InputElement extends FocusableElement {
 }
 export declare function isInputElement(object: any): object is InputElement;
 export declare function asInputElement(object: ElementRef): InputElement | undefined;
-export declare function tabindexComparator(a: InputElement, b: InputElement): 0 | 1 | -1;
+export declare function tabindexComparator(a: InputElement, b: InputElement): 1 | 0 | -1;
 export interface CanGainFocusOptions {
     minTabindex?: number;
     maxTabindex?: number;

package/src/app/shared/pipes/form.pipes.d.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectorRef, OnDestroy, PipeTransform } from '@angular/core';
 import { AbstractControl, UntypedFormArray, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
-import { FormErrorTranslateOptions, FormErrorTranslator, FormErrorTranslatorOptions } from '../validator/form-error-adapter.class';
+import { FormErrorTranslateOptions, FormErrorTranslator } from '../validator/form-error-adapter.class';
 import * as i0 from "@angular/core";
 export declare class FormErrorPipe implements PipeTransform, OnDestroy {
     private service;
@@ -26,7 +26,7 @@ export declare class FormErrorPipe implements PipeTransform, OnDestroy {
  */
 export declare class FormErrorTranslatePipe extends FormErrorPipe {
     constructor(service: FormErrorTranslator, _ref: ChangeDetectorRef);
-    transform(form: UntypedFormGroup, opts?: FormErrorTranslateOptions | FormErrorTranslatorOptions): string;
+    transform(form: UntypedFormGroup, opts?: FormErrorTranslateOptions): string;
     static ɵfac: i0.ɵɵFactoryDeclaration<FormErrorTranslatePipe, never>;
     static ɵpipe: i0.ɵɵPipeDeclaration<FormErrorTranslatePipe, "translateFormError", false>;
 }

package/src/app/shared/validator/form-error-adapter.class.d.ts

@@ -6,48 +6,27 @@ import { FormErrors } from '../forms';
 import { TranslateContextService } from '../services/translate-context.service';
 import * as i0 from "@angular/core";
 export declare const APP_FORM_ERROR_I18N_KEYS: InjectionToken<ObjectMap<string>>;
-export interface IFormPathTranslator {
-    translateFormPath: (path: string) => string;
-}
-export interface FormErrorTranslateOptions {
+export interface IFormPathTranslatorOptions {
     i18nPrefix?: string;
     i18nSuffix?: string;
+    [key: string]: any;
+}
+export interface IFormPathTranslator<O extends IFormPathTranslatorOptions = IFormPathTranslatorOptions> {
+    translateFormPath: (path: string, opts?: O) => string;
+}
+export interface FormErrorTranslateOptions extends IFormPathTranslatorOptions {
     pathTranslator?: IFormPathTranslator;
     separator?: string;
     recursive?: boolean;
 }
-/**
- * @deprecated use IFormPathTranslator instead
- */
-export interface IFormControlPathTranslator {
-    /**
-     * @Deprecated use 'translateControlPath' from IFormPathTranslator interface
-     */
-    translateControlPath: (path: string) => string;
-}
-/**
- * @Deprecated use 'FormErrorTranslateOptions' instead
- */
-export interface FormErrorTranslatorOptions extends FormErrorTranslateOptions {
-    /**
-     * @Deprecated use 'pathTranslator' instead
-     */
-    controlPathTranslator?: IFormControlPathTranslator;
-}
-export declare class FormErrorTranslator implements IFormPathTranslator, IFormControlPathTranslator {
+export declare class FormErrorTranslator implements IFormPathTranslator {
     private translate;
     private translateContext;
     private readonly errorI18nKeys;
     constructor(translate: TranslateService, translateContext: TranslateContextService, errorI18nKeys: ObjectMap<string>);
-    translateFormErrors(control: AbstractControl, opts?: FormErrorTranslateOptions | FormErrorTranslatorOptions): string;
+    translateFormErrors(control: AbstractControl, opts?: FormErrorTranslateOptions): string;
     translateErrors(errors: FormErrors, opts?: FormErrorTranslateOptions): string;
-    translateFormPath(path: string, opts?: FormErrorTranslateOptions | FormErrorTranslatorOptions): string;
-    /**
-     * @Deprecated use translateFormPath() instead
-     * @param path
-     * @param opts
-     */
-    translateControlPath(path: string, opts?: FormErrorTranslatorOptions): string;
+    translateFormPath(path: string, opts?: FormErrorTranslateOptions): string;
     translateError(errorKey: string, errorContent?: any): any;
     static ɵfac: i0.ɵɵFactoryDeclaration<FormErrorTranslator, [null, null, { optional: true; }]>;
     static ɵprov: i0.ɵɵInjectableDeclaration<FormErrorTranslator>;

package/src/assets/manifest.json

@@ -2,7 +2,7 @@
   "name": "ngx-sumaris-components",
   "short_name": "ngx-sumaris-components",
   "manifest_version": 1,
-  "version": "2.11.7",
+  "version": "2.12.0",
   "default_locale": "fr",
   "description": "Angular components for building beautiful and responsive Apps",
   "icons": [{

package/src/theme/_mixins.scss

@@ -138,8 +138,8 @@
   --app-form-color-disabled: #{$app-form-color-disabled};
   --app-form-color-computed: #{$app-form-color-computed};
   --app-form-field-background-color: #{$app-form-field-background-color};
-  --app-form-field-focus-background-color: #{$app-form-field-focus-background-color};
   --app-form-field-background-color-shade: #{$app-form-color-background-color-shade};
+  --app-form-field-focus-background-color: #{$app-form-field-focus-background-color};
   --app-form-field-disabled-background-color: #{$app-form-field-disabled-background-color};
   --app-form-field-label-color: #{$app-form-field-label-color};
   --app-form-field-disabled-label-color: #{$app-form-field-disabled-label-color};

package/src/theme/_ngx-components.globals.scss

@@ -10,16 +10,20 @@ $app-table-cell-focus-background-color: transparent !default;
 
 $app-paginator-height: 34px !default;
 $app-form-buttons-bar-height: 56px !default;
+
+// Form's field text and label
 $app-form-color: #{$text-color} !default;
 $app-form-color-rgb: #{$text-color-rgb} !default;
 $app-form-color-disabled: rgba(#{$text-color-rgb}, 0.55) !default;
 $app-form-color-computed: var(--ion-color-primary-tint) !default;
+$app-form-field-label-color: rgba(#{$text-color-rgb}, 0.6) !default;
+$app-form-field-disabled-label-color: rgba(#{$text-color-rgb}, 0.38) !default;
+
+// Form's field background
 $app-form-field-background-color: #f5f5f5 !default; // Field background
+$app-form-color-background-color-shade: #b9b9b9 !default; // Darker color (e.g. for toggle slide bar - see settings field 'dark mode')
 $app-form-field-focus-background-color: transparent !default; // Focused field background
-$app-form-color-background-color-shade: #b9b9b9 !default;
 $app-form-field-disabled-background-color: #fafafa !default;
-$app-form-field-label-color: rgba(#{$text-color-rgb}, 0.6) !default;
-$app-form-field-disabled-label-color: rgba(#{$text-color-rgb}, 0.38) !default;
 
 $app-select-option-border-color: rgba(#{$text-color-rgb}, 0.12) !default;
 $app-table-border-color: rgba(#{$text-color-rgb}, 0.08) !default;