@dereekb/dbx-form 7.0.1 → 7.3.0

package/lib/formly/field/checklist/checklist.item.field.component.d.ts

@@ -1,11 +1,11 @@
 import { ChangeDetectorRef, OnDestroy, OnInit, Type } from '@angular/core';
 import { DbxInjectionComponentConfig, AbstractSubscriptionDirective } from '@dereekb/dbx-core';
 import { ValidationErrors, FormGroup } from '@angular/forms';
-import { FieldType, FieldTypeConfig, FormlyFieldConfig } from '@ngx-formly/core';
+import { FieldType, FieldTypeConfig, FormlyFieldProps } from '@ngx-formly/core';
 import { ChecklistItemFieldDisplayComponent, ChecklistItemFieldDisplayContentObs } from './checklist.item';
 import { Maybe } from '@dereekb/util';
 import * as i0 from "@angular/core";
-export interface DbxChecklistItemFieldConfig<T = unknown> {
+export interface DbxChecklistItemFieldProps<T = unknown> extends FormlyFieldProps {
     /**
      * Observable used to retrieve content to display for the item.
      */
@@ -15,10 +15,7 @@ export interface DbxChecklistItemFieldConfig<T = unknown> {
      */
     componentClass?: Type<ChecklistItemFieldDisplayComponent<T>>;
 }
-export interface ChecklistItemFormlyFieldConfig<T = unknown> extends FormlyFieldConfig {
-    checklistField: DbxChecklistItemFieldConfig<T>;
-}
-export declare class DbxChecklistItemFieldComponent<T = unknown> extends FieldType<ChecklistItemFormlyFieldConfig<T> & FieldTypeConfig> implements OnInit, OnDestroy {
+export declare class DbxChecklistItemFieldComponent<T = unknown> extends FieldType<FieldTypeConfig<DbxChecklistItemFieldProps<T>>> implements OnInit, OnDestroy {
     private _displayContent;
     readonly displayContent$: import("rxjs").Observable<import("./checklist.item").ChecklistItemDisplayContent<T>>;
     readonly anchor$: import("rxjs").Observable<Maybe<import("@dereekb/dbx-core").ClickableAnchor>>;
@@ -28,7 +25,7 @@ export declare class DbxChecklistItemFieldComponent<T = unknown> extends FieldTy
     get label(): Maybe<string>;
     get description(): Maybe<string>;
     get required(): Maybe<boolean>;
-    get checklistField(): DbxChecklistItemFieldConfig<T>;
+    get checklistField(): DbxChecklistItemFieldProps<T>;
     get errors(): Maybe<ValidationErrors>;
     get componentClass(): Type<ChecklistItemFieldDisplayComponent<T>>;
     ngOnInit(): void;

package/lib/formly/field/checklist/checklist.item.field.d.ts

@@ -1,6 +1,7 @@
+import { FormlyFieldConfig } from '@ngx-formly/core';
 import { LabeledFieldConfig } from '../field';
-import { DbxChecklistItemFieldConfig, ChecklistItemFormlyFieldConfig } from './checklist.item.field.component';
-export interface ChecklistItemFieldConfig<T = unknown> extends LabeledFieldConfig, DbxChecklistItemFieldConfig<T> {
+import { DbxChecklistItemFieldProps } from './checklist.item.field.component';
+export interface ChecklistItemFieldConfig<T = unknown> extends LabeledFieldConfig, DbxChecklistItemFieldProps<T> {
 }
 export declare type ChecklistItemFieldBuilderInput<T = unknown> = Partial<ChecklistItemFieldConfig<T>> & Pick<ChecklistItemFieldConfig<T>, 'key' | 'displayContentObs'>;
-export declare function checklistItemField<T = unknown>(config: ChecklistItemFieldBuilderInput<T>): ChecklistItemFormlyFieldConfig<T>;
+export declare function checklistItemField<T = unknown>(config: ChecklistItemFieldBuilderInput<T>): FormlyFieldConfig<DbxChecklistItemFieldProps<T>>;

package/lib/formly/field/field.d.ts

@@ -1,4 +1,5 @@
-import { FormlyFieldConfig, FormlyTemplateOptions } from '@ngx-formly/core';
+import { FilterKeyValueTuplesInput, GeneralFilterFromPOJOFunction } from '@dereekb/util';
+import { FormlyFieldConfig, FormlyFieldProps } from '@ngx-formly/core';
 export interface FieldConfig {
     key: string;
     required?: boolean;
@@ -32,10 +33,14 @@ export declare type PartialPotentialFieldConfig = Partial<FieldConfig> & Partial
  * Validates the configuration on the input field.
  */
 export declare function formlyField<T extends FormlyFieldConfig = FormlyFieldConfig>(fieldConfig: T): T;
-export declare function templateOptionsForFieldConfig<O extends object = object>(fieldConfig: Partial<FieldConfig> & Partial<LabeledFieldConfig> & Partial<AttributesFieldConfig> & Partial<DescriptionFieldConfig>, override?: PartialPotentialFieldConfig & O): {
-    templateOptions: Partial<FormlyTemplateOptions>;
+export declare function propsForFieldConfig<O extends object = object>(fieldConfig: Partial<FieldConfig> & Partial<LabeledFieldConfig> & Partial<AttributesFieldConfig> & Partial<DescriptionFieldConfig>, override?: PartialPotentialFieldConfig & O): {
+    props: Partial<FormlyFieldProps> & Partial<FieldConfig> & Partial<LabeledFieldConfig> & Partial<AttributesFieldConfig> & Partial<DescriptionFieldConfig> & O;
 };
-export declare function templateOptionsValueForFieldConfig<T extends FormlyTemplateOptions, O extends object = object>(fieldConfig: PartialPotentialFieldConfig, override?: PartialPotentialFieldConfig & O): Partial<T>;
+export declare const partialPotentialFieldConfigKeys: (keyof PartialPotentialFieldConfig)[];
+export declare const partialPotentialFieldConfigKeysFilter: FilterKeyValueTuplesInput<PartialPotentialFieldConfig>;
+export declare const mergePropsValueObjects: import("@dereekb/util").MergeObjectsFunction<PartialPotentialFieldConfig>;
+export declare const filterPartialPotentialFieldConfigValuesFromObject: GeneralFilterFromPOJOFunction<PartialPotentialFieldConfig>;
+export declare function propsValueForFieldConfig<T extends FormlyFieldProps, O extends object = object>(fieldConfig: PartialPotentialFieldConfig, override?: PartialPotentialFieldConfig & O): Partial<T> & O;
 /**
  * Returns configuration for a formlyField that will disable autofill/autocomplete for a field.
  */

package/lib/formly/field/selection/pickable/pickable.field.d.ts

@@ -3,11 +3,11 @@ import { Maybe } from '@dereekb/util';
 import { Observable } from 'rxjs';
 import { LabeledFieldConfig } from '../../field';
 import { PickableValueFieldDisplayValue } from './pickable';
-import { PickableItemFieldItem, PickableValueFieldsFieldConfig } from './pickable.field.directive';
+import { PickableItemFieldItem, PickableValueFieldsFieldProps } from './pickable.field.directive';
 export { PickableItemFieldItem };
 export declare function filterPickableItemFieldValuesByLabel<T>(filterText: Maybe<string>, values: PickableValueFieldDisplayValue<T>[]): Observable<T[]>;
 export declare function sortPickableItemsByLabel<T>(chips: PickableItemFieldItem<T>[]): PickableItemFieldItem<T>[];
-export interface PickableItemFieldConfig<T = unknown> extends LabeledFieldConfig, PickableValueFieldsFieldConfig<T> {
+export interface PickableItemFieldConfig<T = unknown> extends LabeledFieldConfig, PickableValueFieldsFieldProps<T> {
 }
 export declare function pickableItemChipField<T = unknown>(config: PickableItemFieldConfig<T>): FormlyFieldConfig;
 export declare function pickableItemListField<T = unknown>(config: PickableItemFieldConfig<T>): FormlyFieldConfig;

package/lib/formly/field/selection/pickable/pickable.field.directive.d.ts

@@ -4,7 +4,7 @@ import { PrimativeKey, Maybe, ArrayOrValue } from '@dereekb/util';
 import { OnDestroy, OnInit } from '@angular/core';
 import { FormControl, AbstractControl } from '@angular/forms';
 import { MatInput } from '@angular/material/input';
-import { FieldTypeConfig, FormlyFieldConfig } from '@ngx-formly/core';
+import { FieldTypeConfig, FormlyFieldProps } from '@ngx-formly/core';
 import { FieldType } from '@ngx-formly/material';
 import { Observable } from 'rxjs';
 import { PickableValueFieldDisplayFn, PickableValueFieldDisplayValue, PickableValueFieldFilterFn, PickableValueFieldHashFn, PickableValueFieldLoadValuesFn, PickableValueFieldValue } from './pickable';
@@ -15,7 +15,7 @@ import * as i0 from "@angular/core";
  */
 export declare type PickableItemFieldItem<T, M = unknown> = DbxValueListItem<PickableValueFieldDisplayValue<T, M>>;
 export declare type PickableItemFieldItemSortFn<T, M = unknown> = (items: PickableItemFieldItem<T, M>[]) => PickableItemFieldItem<T, M>[];
-export interface PickableValueFieldsFieldConfig<T, M = unknown, H extends PrimativeKey = PrimativeKey> {
+export interface PickableValueFieldsFieldProps<T, M = unknown, H extends PrimativeKey = PrimativeKey> extends FormlyFieldProps {
     /**
      * Loads all pickable values.
      */
@@ -79,9 +79,6 @@ export interface PickableValueFieldsFieldConfig<T, M = unknown, H extends Primat
      */
     changeSelectionModeToViewOnDisabled?: boolean;
 }
-export interface PickableValueFieldsFormlyFieldConfig<T, M = unknown, H extends PrimativeKey = PrimativeKey> extends FormlyFieldConfig {
-    pickableField: PickableValueFieldsFieldConfig<T, M, H>;
-}
 /**
  * Displayed value with the computed hash.
  */
@@ -91,7 +88,7 @@ export interface PickableValueFieldDisplayValueWithHash<T, M = unknown, H extend
 /**
  * Used for picking pre-set values using items as the presentation.
  */
-export declare class AbstractDbxPickableItemFieldDirective<T, M = unknown, H extends PrimativeKey = PrimativeKey> extends FieldType<PickableValueFieldsFormlyFieldConfig<T, M, H> & FieldTypeConfig> implements OnInit, OnDestroy {
+export declare class AbstractDbxPickableItemFieldDirective<T, M = unknown, H extends PrimativeKey = PrimativeKey> extends FieldType<FieldTypeConfig<PickableValueFieldsFieldProps<T, M, H>>> implements OnInit, OnDestroy {
     filterMatInput: MatInput;
     readonly inputCtrl: FormControl;
     private _formControlObs;
@@ -129,7 +126,7 @@ export declare class AbstractDbxPickableItemFieldDirective<T, M = unknown, H ext
     readonly noItemsAvailable$: Observable<boolean>;
     get readonly(): Maybe<boolean>;
     get isReadonlyOrDisabled(): boolean;
-    get pickableField(): PickableValueFieldsFieldConfig<T, M, H>;
+    get pickableField(): PickableValueFieldsFieldProps<T, M, H>;
     get multiSelect(): boolean;
     get asArrayValue(): boolean;
     get filterLabel(): Maybe<string>;

package/lib/formly/field/selection/searchable/searchable.chip.field.component.d.ts

@@ -1,14 +1,11 @@
 import { OnDestroy, OnInit } from '@angular/core';
 import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
 import { MatChipInputEvent } from '@angular/material/chips';
-import { AbstractDbxSearchableValueFieldDirective, SearchableValueFieldsFieldConfig, SearchableValueFieldsFormlyFieldConfig } from './searchable.field.directive';
+import { AbstractDbxSearchableValueFieldDirective, SearchableValueFieldsFieldProps } from './searchable.field.directive';
 import { PrimativeKey } from '@dereekb/util';
 import * as i0 from "@angular/core";
-export declare type SearchableChipValueFieldsFieldConfig<T, M = unknown, H extends PrimativeKey = PrimativeKey> = SearchableValueFieldsFieldConfig<T, M, H>;
-export interface SearchableChipValueFieldsFormlyFieldConfig<T, M = unknown, H extends PrimativeKey = PrimativeKey> extends SearchableValueFieldsFormlyFieldConfig<T, M, H> {
-    searchableField: SearchableChipValueFieldsFieldConfig<T, M, H>;
-}
-export declare class DbxSearchableChipFieldComponent<T, M = unknown, H extends PrimativeKey = PrimativeKey> extends AbstractDbxSearchableValueFieldDirective<T, M, H, SearchableChipValueFieldsFormlyFieldConfig<T, M, H>> implements OnInit, OnDestroy {
+export declare type SearchableChipValueFieldsFieldProps<T, M = unknown, H extends PrimativeKey = PrimativeKey> = SearchableValueFieldsFieldProps<T, M, H>;
+export declare class DbxSearchableChipFieldComponent<T, M = unknown, H extends PrimativeKey = PrimativeKey> extends AbstractDbxSearchableValueFieldDirective<T, M, H, SearchableChipValueFieldsFieldProps<T, M, H>> implements OnInit, OnDestroy {
     private _blur;
     private _blurSub;
     readonly separatorKeysCodes: number[];

package/lib/formly/field/selection/searchable/searchable.field.d.ts

@@ -3,8 +3,8 @@ import { FormlyFieldConfig } from '@ngx-formly/core';
 import { Observable } from 'rxjs';
 import { LabeledFieldConfig, DescriptionFieldConfig } from '../../field';
 import { SearchableValueFieldDisplayFn, SearchableValueFieldDisplayValue, SearchableValueFieldValue } from './searchable';
-import { SearchableChipValueFieldsFieldConfig } from './searchable.chip.field.component';
-import { SearchableTextValueFieldsFieldConfig } from './searchable.text.field.component';
+import { SearchableChipValueFieldsFieldProps } from './searchable.chip.field.component';
+import { SearchableTextValueFieldsFieldProps } from './searchable.text.field.component';
 /**
  * Used to create a SearchableValueFieldDisplayFn function that will retrieve the metadata for items that are missing their metadata so they can be displayed properly.
  *
@@ -17,9 +17,9 @@ export declare function makeMetaFilterSearchableFieldValueDisplayFn<T extends st
 }): SearchableValueFieldDisplayFn<T, M>;
 export declare type StringSearchableChipFieldConfig<M = unknown> = Omit<SearchableChipFieldConfig<string, M>, 'allowStringValues'>;
 export declare function searchableStringChipField<M = unknown>(config: StringSearchableChipFieldConfig<M>): FormlyFieldConfig;
-export interface SearchableChipFieldConfig<T = unknown, M = unknown, H extends PrimativeKey = PrimativeKey> extends LabeledFieldConfig, DescriptionFieldConfig, SearchableChipValueFieldsFieldConfig<T, M, H> {
+export interface SearchableChipFieldConfig<T = unknown, M = unknown, H extends PrimativeKey = PrimativeKey> extends LabeledFieldConfig, DescriptionFieldConfig, SearchableChipValueFieldsFieldProps<T, M, H> {
 }
 export declare function searchableChipField<T, M = unknown, H extends PrimativeKey = PrimativeKey>(config: SearchableChipFieldConfig<T, M, H>): FormlyFieldConfig;
-export interface SearchableTextFieldConfig<T = unknown, M = unknown, H extends PrimativeKey = PrimativeKey> extends LabeledFieldConfig, DescriptionFieldConfig, SearchableTextValueFieldsFieldConfig<T, M, H> {
+export interface SearchableTextFieldConfig<T = unknown, M = unknown, H extends PrimativeKey = PrimativeKey> extends LabeledFieldConfig, DescriptionFieldConfig, SearchableTextValueFieldsFieldProps<T, M, H> {
 }
 export declare function searchableTextField<T, M = unknown, H extends PrimativeKey = PrimativeKey>(config: SearchableTextFieldConfig<T, M, H>): FormlyFieldConfig;

package/lib/formly/field/selection/searchable/searchable.field.directive.d.ts

@@ -3,20 +3,18 @@ import { DbxInjectionComponentConfig } from '@dereekb/dbx-core';
 import { SubscriptionObject, LoadingState, LoadingStateContextInstance } from '@dereekb/rxjs';
 import { ChangeDetectorRef, ElementRef, OnDestroy, OnInit } from '@angular/core';
 import { AbstractControl, FormControl, ValidatorFn } from '@angular/forms';
-import { FieldTypeConfig, FormlyFieldConfig } from '@ngx-formly/core';
+import { FieldTypeConfig, FormlyFieldProps } from '@ngx-formly/core';
 import { FieldType } from '@ngx-formly/material';
 import { Observable } from 'rxjs';
 import { SearchableValueFieldHashFn, SearchableValueFieldStringSearchFn, SearchableValueFieldDisplayFn, SearchableValueFieldDisplayValue, SearchableValueFieldValue, SearchableValueFieldAnchorFn, ConfiguredSearchableValueFieldDisplayValue } from './searchable';
 import * as i0 from "@angular/core";
-export interface StringValueFieldsFieldConfig {
+export interface StringValueFieldsFieldProps extends FormlyFieldProps {
     /**
      * Custom input validators.
      */
     textInputValidator?: ValidatorFn | ValidatorFn[];
 }
-export interface StringValueFieldsFormlyFieldConfig extends StringValueFieldsFieldConfig, FormlyFieldConfig {
-}
-export interface SearchableValueFieldsFieldConfig<T, M = unknown, H extends PrimativeKey = PrimativeKey> extends StringValueFieldsFieldConfig {
+export interface SearchableValueFieldsFieldProps<T, M = unknown, H extends PrimativeKey = PrimativeKey> extends FormlyFieldProps, StringValueFieldsFieldProps {
     /**
      * Whether or not to allow string values to be used directly, or if values can only be chosen from searching.
      */
@@ -64,15 +62,12 @@ export interface SearchableValueFieldsFieldConfig<T, M = unknown, H extends Prim
      */
     showClearValue?: boolean;
 }
-export interface SearchableValueFieldsFormlyFieldConfig<T, M = unknown, H extends PrimativeKey = PrimativeKey> extends FormlyFieldConfig {
-    searchableField: SearchableValueFieldsFieldConfig<T, M, H>;
-}
 /**
  * Abstract searchable field that provides a feature for searching for values, and for displaying values using Observables.
  *
  * Display values are cached for performance.
  */
-export declare abstract class AbstractDbxSearchableValueFieldDirective<T, M = unknown, H extends PrimativeKey = PrimativeKey, C extends SearchableValueFieldsFormlyFieldConfig<T, M, H> = SearchableValueFieldsFormlyFieldConfig<T, M, H>> extends FieldType<C & FieldTypeConfig> implements OnInit, OnDestroy {
+export declare abstract class AbstractDbxSearchableValueFieldDirective<T, M = unknown, H extends PrimativeKey = PrimativeKey, C extends SearchableValueFieldsFieldProps<T, M, H> = SearchableValueFieldsFieldProps<T, M, H>> extends FieldType<FieldTypeConfig<C>> implements OnInit, OnDestroy {
     readonly cdRef: ChangeDetectorRef;
     /**
      * Whether or not to set/get values as an array.
@@ -100,7 +95,7 @@ export declare abstract class AbstractDbxSearchableValueFieldDirective<T, M = un
     get name(): string;
     get label(): Maybe<string>;
     get readonly(): Maybe<boolean>;
-    get searchableField(): SearchableValueFieldsFieldConfig<T, M, H>;
+    get searchableField(): SearchableValueFieldsFieldProps<T, M, H>;
     get searchOnEmptyText(): boolean;
     get autocomplete(): string;
     get hashForValue(): SearchableValueFieldHashFn<T, H>;

package/lib/formly/field/selection/searchable/searchable.text.field.component.d.ts

@@ -1,22 +1,19 @@
 import { OnDestroy, OnInit } from '@angular/core';
 import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
-import { AbstractDbxSearchableValueFieldDirective, SearchableValueFieldsFieldConfig, SearchableValueFieldsFormlyFieldConfig } from './searchable.field.directive';
+import { AbstractDbxSearchableValueFieldDirective, SearchableValueFieldsFieldProps } from './searchable.field.directive';
 import { PrimativeKey } from '@dereekb/util';
 import * as i0 from "@angular/core";
-export interface SearchableTextValueFieldsFieldConfig<T, M = unknown, H extends PrimativeKey = PrimativeKey> extends SearchableValueFieldsFieldConfig<T, M, H> {
+export interface SearchableTextValueFieldsFieldProps<T, M = unknown, H extends PrimativeKey = PrimativeKey> extends SearchableValueFieldsFieldProps<T, M, H> {
     showSelectedValue?: boolean;
 }
-export interface SearchableTextValueFieldsFormlyFieldConfig<T, M = unknown, H extends PrimativeKey = PrimativeKey> extends SearchableValueFieldsFormlyFieldConfig<T, M, H> {
-    searchableField: SearchableTextValueFieldsFieldConfig<T, M, H>;
-}
 /**
  * Display component for selecting a single item/value.
  */
-export declare class DbxSearchableTextFieldComponent<T, M = unknown, H extends PrimativeKey = PrimativeKey> extends AbstractDbxSearchableValueFieldDirective<T, M, H, SearchableTextValueFieldsFormlyFieldConfig<T, M, H>> implements OnInit, OnDestroy {
+export declare class DbxSearchableTextFieldComponent<T, M = unknown, H extends PrimativeKey = PrimativeKey> extends AbstractDbxSearchableValueFieldDirective<T, M, H, SearchableTextValueFieldsFieldProps<T, M, H>> implements OnInit, OnDestroy {
     readonly selectedDisplayValue$: import("rxjs").Observable<import("@dereekb/dbx-form").ConfiguredSearchableValueFieldDisplayValue<T, M>>;
     readonly hasValue$: import("rxjs").Observable<boolean>;
     readonly showSelectedDisplayValue$: import("rxjs").Observable<boolean>;
-    get searchableField(): SearchableTextValueFieldsFieldConfig<T, M, H>;
+    get searchableField(): SearchableTextValueFieldsFieldProps<T, M, H>;
     get showSelectedValue(): boolean;
     readonly multiSelect = false;
     private _clearInputSub;

package/lib/formly/field/selection/searchable/text.chip.field.d.ts

@@ -1,9 +1,8 @@
-import { FormlyFieldConfig } from '@ngx-formly/core';
 import { LabeledFieldConfig } from '../../field';
-import { StringValueFieldsFieldConfig, StringValueFieldsFormlyFieldConfig } from './searchable.field.directive';
-export interface ChipTextFieldConfig extends LabeledFieldConfig, StringValueFieldsFieldConfig {
-}
-export interface ChipTextFieldFormlyConfig extends StringValueFieldsFormlyFieldConfig, FormlyFieldConfig {
+import { StringValueFieldsFieldProps } from './searchable.field.directive';
+export interface ChipTextFieldConfig extends LabeledFieldConfig, StringValueFieldsFieldProps {
     caseSensitive?: boolean;
 }
-export declare function chipTextField<C extends ChipTextFieldFormlyConfig>(config: C): C;
+export declare function chipTextField(config: ChipTextFieldConfig): import("@ngx-formly/core").FormlyFieldConfig<import("@ngx-formly/core").FormlyFieldProps & {
+    [additionalProperties: string]: any;
+}>;

package/lib/formly/field/texteditor/texteditor.field.component.d.ts

@@ -1,13 +1,13 @@
 import { FormGroup } from '@angular/forms';
 import { CompactContextStore } from '@dereekb/dbx-web';
 import { OnDestroy, OnInit } from '@angular/core';
-import { FieldTypeConfig, FormlyFieldConfig } from '@ngx-formly/core';
+import { FieldTypeConfig, FormlyFieldProps } from '@ngx-formly/core';
 import { FieldType } from '@ngx-formly/material';
 import { Editor } from 'ngx-editor';
 import { Maybe } from '@dereekb/util';
 import * as i0 from "@angular/core";
-export declare type TextEditorComponentFieldConfig = FormlyFieldConfig;
-export declare class DbxTextEditorFieldComponent<T extends TextEditorComponentFieldConfig = TextEditorComponentFieldConfig> extends FieldType<T & FieldTypeConfig> implements OnInit, OnDestroy {
+export declare type TextEditorComponentFieldProps = FormlyFieldProps;
+export declare class DbxTextEditorFieldComponent<T extends TextEditorComponentFieldProps = TextEditorComponentFieldProps> extends FieldType<FieldTypeConfig<T>> implements OnInit, OnDestroy {
     readonly compact: CompactContextStore;
     private _editor?;
     private _sub;

package/lib/formly/field/value/array/array.field.d.ts

@@ -1,9 +1,9 @@
 import { FormlyFieldConfig } from '@ngx-formly/core';
 import { FieldConfig } from '../../field';
-import { DbxFormRepeatArrayConfig } from './array.field.component';
+import { DbxFormRepeatArrayConfig, DbxFormRepeatArrayFormlyConfig } from './array.field.component';
 export interface RepeatArrayFieldConfig extends DbxFormRepeatArrayConfig, FieldConfig {
     label?: string;
     repeatFieldGroup: FormlyFieldConfig[];
     maxLength?: number;
 }
-export declare function repeatArrayField(config: RepeatArrayFieldConfig): FormlyFieldConfig;
+export declare function repeatArrayField(config: RepeatArrayFieldConfig): DbxFormRepeatArrayFormlyConfig;

package/lib/formly/field/value/date/datetime.field.component.d.ts

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
 import { AbstractControl, FormControl } from '@angular/forms';
 import { FieldType } from '@ngx-formly/material';
-import { FieldTypeConfig, FormlyFieldConfig } from '@ngx-formly/core';
+import { FieldTypeConfig, FormlyFieldProps } from '@ngx-formly/core';
 import { MatDatepickerInputEvent } from '@angular/material/datepicker';
 import * as i0 from "@angular/core";
 export declare enum DbxDateTimeFieldTimeMode {
@@ -22,7 +22,7 @@ export declare enum DbxDateTimeFieldTimeMode {
     NONE = "none"
 }
 export declare type DateTimePickerConfiguration = Omit<DateTimeMinuteConfig, 'date'>;
-export interface DbxDateTimeFieldConfig {
+export interface DbxDateTimeFieldProps extends FormlyFieldProps {
     /**
      * Whether or not the date is hidden, and automatically uses today/input date.
      */
@@ -50,10 +50,7 @@ export interface DbxDateTimeFieldConfig {
      */
     getConfigObs?: () => Observable<DateTimePickerConfiguration>;
 }
-export interface DateTimeFormlyFieldConfig extends FormlyFieldConfig {
-    dateTimeField: DbxDateTimeFieldConfig;
-}
-export declare class DbxDateTimeFieldComponent extends FieldType<DateTimeFormlyFieldConfig & FieldTypeConfig> implements OnInit, OnDestroy {
+export declare class DbxDateTimeFieldComponent extends FieldType<FieldTypeConfig<DbxDateTimeFieldProps>> implements OnInit, OnDestroy {
     private readonly cdRef;
     private _sub;
     private _valueSub;
@@ -74,7 +71,7 @@ export declare class DbxDateTimeFieldComponent extends FieldType<DateTimeFormlyF
     readonly timeInputCtrl: FormControl;
     private _config;
     get dateOnly(): boolean;
-    get dateTimeField(): DbxDateTimeFieldConfig;
+    get dateTimeField(): DbxDateTimeFieldProps;
     get timeOnly(): Maybe<boolean>;
     get showDateInput(): boolean;
     get timeMode(): DbxDateTimeFieldTimeMode;

package/lib/formly/field/value/date/datetime.field.d.ts

@@ -1,8 +1,8 @@
 import { Observable } from 'rxjs';
 import { FormlyFieldConfig } from '@ngx-formly/core';
 import { LabeledFieldConfig, DescriptionFieldConfig } from '../../field';
-import { DbxDateTimeFieldConfig, DateTimePickerConfiguration } from './datetime.field.component';
-export interface DateTimeFieldConfig extends LabeledFieldConfig, DescriptionFieldConfig, DbxDateTimeFieldConfig {
+import { DbxDateTimeFieldProps, DateTimePickerConfiguration } from './datetime.field.component';
+export interface DateTimeFieldConfig extends LabeledFieldConfig, DescriptionFieldConfig, DbxDateTimeFieldProps {
 }
 export declare type TimeFieldConfig = Omit<DateTimeFieldConfig, 'showDate'>;
 export declare const TAKE_NEXT_UPCOMING_TIME_CONFIG_OBS: () => Observable<DateTimePickerConfiguration>;
@@ -10,4 +10,4 @@ export declare const TAKE_NEXT_UPCOMING_TIME_CONFIG_OBS: () => Observable<DateTi
  * Same as DateTime field but with the Date input hidden by default.
  */
 export declare function timeOnlyField(config?: Partial<TimeFieldConfig>): FormlyFieldConfig;
-export declare function dateTimeField(config?: Partial<DateTimeFieldConfig>): FormlyFieldConfig;
+export declare function dateTimeField(config?: Partial<DateTimeFieldConfig>): FormlyFieldConfig<DbxDateTimeFieldProps>;

package/lib/formly/field/value/phone/phone.field.component.d.ts

@@ -1,16 +1,13 @@
 import { FieldType } from '@ngx-formly/material';
-import { FieldTypeConfig, FormlyFieldConfig } from '@ngx-formly/core';
+import { FieldTypeConfig, FormlyFieldProps } from '@ngx-formly/core';
+import { Maybe } from '@dereekb/util';
 import * as i0 from "@angular/core";
-export interface DbxInternationalPhoneFieldConfig {
-    preferredCountries?: string[];
-    onlyCountries?: string[];
-}
-export interface InternationalPhoneFormlyFieldConfig extends FormlyFieldConfig {
-    phoneField: DbxInternationalPhoneFieldConfig;
+export interface InternationalPhoneFormlyFieldProps extends FormlyFieldProps {
+    preferredCountries?: Maybe<string[]>;
+    onlyCountries?: Maybe<string[]>;
 }
 export declare const DEFAULT_PREFERRED_COUNTRIES: string[];
-export declare class DbxPhoneFieldComponent extends FieldType<InternationalPhoneFormlyFieldConfig & FieldTypeConfig> {
-    get phoneField(): DbxInternationalPhoneFieldConfig;
+export declare class DbxPhoneFieldComponent extends FieldType<FieldTypeConfig<InternationalPhoneFormlyFieldProps>> {
     get preferredCountries(): string[];
     get onlyCountries(): string[];
     static ɵfac: i0.ɵɵFactoryDeclaration<DbxPhoneFieldComponent, never>;

package/lib/formly/field/value/phone/phone.field.d.ts

@@ -2,11 +2,11 @@ import { DbxFormSectionConfig } from '../../wrapper/section.wrapper.component';
 import { TextFieldConfig } from '../text/text.field';
 import { FormlyFieldConfig } from '@ngx-formly/core';
 import { LabeledFieldConfig } from '../../field';
-import { DbxInternationalPhoneFieldConfig } from './phone.field.component';
+import { InternationalPhoneFormlyFieldProps } from './phone.field.component';
 import { RepeatArrayFieldConfig } from '../array/array.field';
-export interface InternationalPhoneFieldConfig extends LabeledFieldConfig, DbxInternationalPhoneFieldConfig {
+export interface InternationalPhoneFieldConfig extends LabeledFieldConfig, InternationalPhoneFormlyFieldProps {
 }
-export declare function phoneField(config?: Partial<InternationalPhoneFieldConfig>): FormlyFieldConfig;
+export declare function phoneField(config?: Partial<InternationalPhoneFieldConfig>): FormlyFieldConfig<InternationalPhoneFormlyFieldProps>;
 export interface WrappedPhoneAndLabelFieldConfig {
     phoneField?: Partial<InternationalPhoneFieldConfig>;
     labelField?: TextFieldConfig;

package/lib/formly/field/wrapper/expandable.wrapper.delegate.d.ts

@@ -1,6 +1,5 @@
-import { FormlyFieldConfig } from '@ngx-formly/material/form-field';
 import { Maybe } from '@dereekb/util';
-import { FieldWrapper, FormlyTemplateOptions, FieldTypeConfig } from '@ngx-formly/core';
+import { FieldWrapper, FormlyFieldProps, FormlyFieldConfig } from '@ngx-formly/core';
 import { BehaviorSubject } from 'rxjs';
 import { OnDestroy, OnInit } from '@angular/core';
 import { AbstractControl } from '@angular/forms';
@@ -12,14 +11,11 @@ export interface AbstractFormExpandableSectionConfig<T extends object = object>
      */
     hasValueFn?: (value: T) => boolean;
 }
-export interface FormExpandableSectionWrapperTemplateOptions<T extends object = object, S extends AbstractFormExpandableSectionConfig<T> = AbstractFormExpandableSectionConfig<T>> extends FormlyTemplateOptions {
+export interface FormExpandableSectionWrapperFieldProps<T extends object = object, S extends AbstractFormExpandableSectionConfig<T> = AbstractFormExpandableSectionConfig<T>> extends Pick<FormlyFieldProps, 'label'> {
     expandWrapper?: S;
 }
-export interface FormExpandableSectionFormlyConfig<T extends object = object, S extends AbstractFormExpandableSectionConfig<T> = AbstractFormExpandableSectionConfig<T>> extends FormlyFieldConfig {
-    templateOptions?: FormExpandableSectionWrapperTemplateOptions<T, S> & FormlyTemplateOptions;
-}
 export declare const DEFAULT_HAS_VALUE_FN: (x: object) => boolean;
-export declare class AbstractFormExpandableSectionWrapperDirective<T extends object = object, S extends AbstractFormExpandableSectionConfig<T> = AbstractFormExpandableSectionConfig<T>> extends FieldWrapper<FormExpandableSectionFormlyConfig<T, S> & FieldTypeConfig> implements OnInit, OnDestroy {
+export declare class AbstractFormExpandableSectionWrapperDirective<T extends object = object, S extends AbstractFormExpandableSectionConfig<T> = AbstractFormExpandableSectionConfig<T>> extends FieldWrapper<FormlyFieldConfig<FormExpandableSectionWrapperFieldProps<T, S>>> implements OnInit, OnDestroy {
     protected _formControlObs: BehaviorSubject<Maybe<AbstractControl>>;
     readonly formControl$: import("rxjs").Observable<AbstractControl>;
     protected _toggleOpen: BehaviorSubject<Maybe<boolean>>;

package/lib/formly/field/wrapper/flex.wrapper.component.d.ts

@@ -1,18 +1,15 @@
 import { ScreenMediaWidthType } from '@dereekb/dbx-web';
 import { Maybe } from '@dereekb/util';
-import { FieldWrapper, FormlyFieldConfig, FormlyTemplateOptions } from '@ngx-formly/core';
+import { FieldWrapper, FormlyFieldConfig } from '@ngx-formly/core';
 import * as i0 from "@angular/core";
 export interface DbxFlexWrapperConfig {
     breakpoint?: ScreenMediaWidthType;
     relative?: boolean;
 }
-export interface DbxFlexWrapperWrapperTemplateOptions extends FormlyTemplateOptions {
+export interface DbxFlexWrapperWrapperProps {
     flexWrapper?: DbxFlexWrapperConfig;
 }
-export interface DbxFlexWrapperWrapperConfig extends FormlyFieldConfig {
-    templateOptions?: DbxFlexWrapperWrapperTemplateOptions;
-}
-export declare class DbxFormFlexWrapperComponent extends FieldWrapper<DbxFlexWrapperWrapperConfig> {
+export declare class DbxFormFlexWrapperComponent extends FieldWrapper<FormlyFieldConfig<DbxFlexWrapperWrapperProps>> {
     get flexWrapper(): Maybe<DbxFlexWrapperConfig>;
     get breakpoint(): ScreenMediaWidthType | undefined;
     get relative(): boolean;

package/lib/formly/field/wrapper/info.wrapper.component.d.ts

@@ -1,15 +1,12 @@
-import { FieldWrapper, FormlyFieldConfig, FormlyTemplateOptions } from '@ngx-formly/core';
+import { FieldWrapper, FormlyFieldConfig, FormlyFieldProps } from '@ngx-formly/core';
 import * as i0 from "@angular/core";
 export interface DbxFormInfoConfig {
     onInfoClick: () => void;
 }
-export interface DbxFormInfoWrapperTemplateOptions extends FormlyTemplateOptions {
+export interface DbxFormInfoWrapperProps extends FormlyFieldProps {
     infoWrapper: DbxFormInfoConfig;
 }
-export interface DbxFormInfoWrapperConfig extends FormlyFieldConfig {
-    templateOptions?: DbxFormInfoWrapperTemplateOptions;
-}
-export declare class DbxFormInfoWrapperComponent extends FieldWrapper<DbxFormInfoWrapperConfig> {
+export declare class DbxFormInfoWrapperComponent extends FieldWrapper<FormlyFieldConfig<DbxFormInfoWrapperProps>> {
     get infoWrapper(): DbxFormInfoConfig;
     onInfoClick(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<DbxFormInfoWrapperComponent, never>;

package/lib/formly/field/wrapper/section.wrapper.component.d.ts

@@ -1,17 +1,14 @@
 import { Maybe } from '@dereekb/util';
-import { FieldTypeConfig, FieldWrapper, FormlyFieldConfig, FormlyTemplateOptions } from '@ngx-formly/core';
+import { FieldWrapper, FormlyFieldConfig } from '@ngx-formly/core';
 import * as i0 from "@angular/core";
 export interface DbxFormSectionConfig {
     header?: string;
     hint?: string;
 }
-export interface DbxFormSectionWrapperTemplateOptions extends FormlyTemplateOptions {
+export interface DbxFormSectionWrapperProps {
     sectionWrapper?: DbxFormSectionConfig;
 }
-export interface FormSectionFormlyConfig extends FormlyFieldConfig {
-    templateOptions?: DbxFormSectionWrapperTemplateOptions;
-}
-export declare class DbxFormSectionWrapperComponent extends FieldWrapper<FormSectionFormlyConfig & FieldTypeConfig> {
+export declare class DbxFormSectionWrapperComponent extends FieldWrapper<FormlyFieldConfig<DbxFormSectionWrapperProps>> {
     get header(): Maybe<string>;
     get hint(): Maybe<string>;
     static ɵfac: i0.ɵɵFactoryDeclaration<DbxFormSectionWrapperComponent, never>;

package/lib/formly/field/wrapper/style.wrapper.component.d.ts

@@ -7,13 +7,9 @@ import * as i0 from "@angular/core";
 export interface DbxFormStyleWrapperConfig {
     style: ObservableOrValue<string>;
 }
-export interface DbxFormStyleWrapperFormlyConfig extends FormlyFieldConfig {
-    styleWrapper: DbxFormStyleWrapperConfig;
-}
-export declare class DbxFormStyleWrapperComponent extends FieldWrapper<DbxFormStyleWrapperFormlyConfig> implements OnInit, OnDestroy {
+export declare class DbxFormStyleWrapperComponent extends FieldWrapper<FormlyFieldConfig<DbxFormStyleWrapperConfig>> implements OnInit, OnDestroy {
     private _style;
     readonly style$: Observable<Maybe<string>>;
-    get styleWrapper(): DbxFormStyleWrapperConfig;
     get styleGetter(): ObservableOrValue<string>;
     ngOnInit(): void;
     ngOnDestroy(): void;

package/lib/formly/field/wrapper/subsection.wrapper.component.d.ts

@@ -1,17 +1,14 @@
 import { Maybe } from '@dereekb/util';
-import { FieldTypeConfig, FieldWrapper, FormlyFieldConfig, FormlyTemplateOptions } from '@ngx-formly/core';
+import { FieldTypeConfig, FieldWrapper } from '@ngx-formly/core';
 import * as i0 from "@angular/core";
 export interface DbxFormSubsectionConfig {
     header?: string;
     hint?: string;
 }
-export interface DbxFormSubsectionWrapperTemplateOptions extends FormlyTemplateOptions {
+export interface DbxFormSubsectionWrapperProps {
     subsectionWrapper?: DbxFormSubsectionConfig;
 }
-export interface DbxFormSubsectionFormlyConfig extends FormlyFieldConfig {
-    templateOptions?: DbxFormSubsectionWrapperTemplateOptions;
-}
-export declare class DbxFormSubsectionWrapperComponent extends FieldWrapper<DbxFormSubsectionFormlyConfig & FieldTypeConfig> {
+export declare class DbxFormSubsectionWrapperComponent extends FieldWrapper<FieldTypeConfig<DbxFormSubsectionWrapperProps>> {
     get header(): Maybe<string>;
     get hint(): Maybe<string>;
     static ɵfac: i0.ɵɵFactoryDeclaration<DbxFormSubsectionWrapperComponent, never>;

package/lib/formly/field/wrapper/working.wrapper.component.d.ts

@@ -6,15 +6,12 @@ import * as i0 from "@angular/core";
  * No configurable value for now.
  */
 export declare type DbxFormWorkingWrapperConfig = object;
-export interface DbxFormWorkingWrapperFormlyConfig extends FormlyFieldConfig {
-    styleWrapper: DbxFormWorkingWrapperConfig;
-}
 /**
  * Adds a loading bar to help signify asynchronos work is occuring.
  *
  * By default shows loading during asynchronous validation of a field (FormControl status is "PENDING")
  */
-export declare class DbxFormWorkingWrapperComponent extends FieldWrapper<DbxFormWorkingWrapperFormlyConfig> implements OnInit, OnDestroy {
+export declare class DbxFormWorkingWrapperComponent extends FieldWrapper<FormlyFieldConfig<DbxFormWorkingWrapperConfig>> implements OnInit, OnDestroy {
     readonly sub: SubscriptionObject;
     readonly workingContext: SimpleLoadingContext;
     ngOnInit(): void;

package/lib/formly/field/wrapper/wrapper.d.ts

@@ -1,5 +1,5 @@
 import { DbxFormStyleWrapperConfig } from './style.wrapper.component';
-import { DbxFlexWrapperConfig } from './flex.wrapper.component';
+import { DbxFlexWrapperConfig, DbxFlexWrapperWrapperProps } from './flex.wrapper.component';
 import { FormlyFieldConfig } from '@ngx-formly/core';
 import { DbxFormToggleWrapperConfig } from './toggle.wrapper.component';
 import { DbxFormSectionConfig } from './section.wrapper.component';
@@ -8,6 +8,7 @@ import { DbxFormInfoConfig } from './info.wrapper.component';
 import { DbxFormExpandWrapperConfig } from './expandable.wrapper.component';
 import { DbxFlexSize } from '@dereekb/dbx-web';
 import { DbxFormWorkingWrapperConfig } from './working.wrapper.component';
+export declare const AUTO_TOUCH_WRAPPER_KEY = "autotouch";
 export declare const EXPANDABLE_WRAPPER_KEY = "expandable";
 export declare const TOGGLE_WRAPPER_KEY = "toggle";
 export declare const SECTION_WRAPPER_KEY = "section";
@@ -16,14 +17,20 @@ export declare const INFO_WRAPPER_KEY = "info";
 export declare const FLEX_WRAPPER_KEY = "flex";
 export declare const STYLE_WRAPPER_KEY = "style";
 export declare const WORKING_WRAPPER_KEY = "working";
-export declare function addWrapperToFormlyFieldConfig<T extends object>(fieldConfig: FormlyFieldConfig, wrapperKey: string, wrapperTemplateOptionsConfig: T): FormlyFieldConfig;
-export declare function expandWrapper<T extends object = object>(fieldConfig: FormlyFieldConfig, expandWrapper?: DbxFormExpandWrapperConfig<T>): FormlyFieldConfig;
-export declare function toggleWrapper(fieldConfig: FormlyFieldConfig, expandWrapper?: DbxFormToggleWrapperConfig): FormlyFieldConfig;
-export declare function sectionWrapper(fieldConfig: FormlyFieldConfig, sectionWrapper?: DbxFormSectionConfig): FormlyFieldConfig;
-export declare function subsectionWrapper(fieldConfig: FormlyFieldConfig, subsectionWrapper?: DbxFormSubsectionConfig): FormlyFieldConfig;
-export declare function infoWrapper(fieldConfig: FormlyFieldConfig, infoWrapper: DbxFormInfoConfig): FormlyFieldConfig;
-export declare function styleWrapper(fieldConfig: FormlyFieldConfig, styleWrapper: DbxFormStyleWrapperConfig): FormlyFieldConfig;
-export declare function workingWrapper(fieldConfig: FormlyFieldConfig, workingWrapper?: DbxFormWorkingWrapperConfig): FormlyFieldConfig;
+export declare type WrapperFormlyFieldConfig<P, C extends FormlyFieldConfig> = FormlyFieldConfig<P> & {
+    wrappers: string[];
+    props: P;
+    fieldGroup: [C];
+};
+export declare function addWrapperToFormlyFieldConfig<C extends FormlyFieldConfig, P extends object>(fieldConfig: C, wrapperKey: string, wrapperProps: P): WrapperFormlyFieldConfig<P, C>;
+export declare function autoTouchWrapper<T extends object, C extends FormlyFieldConfig>(fieldConfig: C, autoTouchWrapper?: DbxFormExpandWrapperConfig<T>): WrapperFormlyFieldConfig<DbxFormExpandWrapperConfig<T>, C>;
+export declare function expandWrapper<T extends object, C extends FormlyFieldConfig>(fieldConfig: C, expandWrapper?: DbxFormExpandWrapperConfig<T>): WrapperFormlyFieldConfig<DbxFormExpandWrapperConfig<T>, C>;
+export declare function toggleWrapper<C extends FormlyFieldConfig>(fieldConfig: C, toggleWrapper?: DbxFormToggleWrapperConfig): WrapperFormlyFieldConfig<DbxFormToggleWrapperConfig<object>, C>;
+export declare function sectionWrapper<C extends FormlyFieldConfig>(fieldConfig: C, sectionWrapper?: DbxFormSectionConfig): WrapperFormlyFieldConfig<DbxFormSectionConfig, C>;
+export declare function subsectionWrapper<C extends FormlyFieldConfig>(fieldConfig: C, subsectionWrapper?: DbxFormSubsectionConfig): WrapperFormlyFieldConfig<DbxFormSubsectionConfig, C>;
+export declare function infoWrapper<C extends FormlyFieldConfig>(fieldConfig: C, infoWrapper: DbxFormInfoConfig): WrapperFormlyFieldConfig<DbxFormInfoConfig, C>;
+export declare function styleWrapper<C extends FormlyFieldConfig>(fieldConfig: C, styleWrapper: DbxFormStyleWrapperConfig): WrapperFormlyFieldConfig<DbxFormStyleWrapperConfig, C>;
+export declare function workingWrapper<C extends FormlyFieldConfig>(fieldConfig: C, workingWrapper?: DbxFormWorkingWrapperConfig): WrapperFormlyFieldConfig<object, C>;
 export interface DbxFlexLayoutWrapperGroupFieldConfig {
     field: FormlyFieldConfig;
     /**
@@ -34,4 +41,4 @@ export interface DbxFlexLayoutWrapperGroupFieldConfig {
 export interface DbxFlexLayoutWrapperGroupFieldConfigDefaults extends DbxFlexWrapperConfig, Omit<DbxFlexLayoutWrapperGroupFieldConfig, 'field'> {
 }
 export declare function checkIsFieldFlexLayoutGroupFieldConfig(input: FormlyFieldConfig | DbxFlexLayoutWrapperGroupFieldConfig): input is DbxFlexLayoutWrapperGroupFieldConfig;
-export declare function flexLayoutWrapper(fieldConfigs: (FormlyFieldConfig | DbxFlexLayoutWrapperGroupFieldConfig)[], { relative, breakpoint, size: defaultSize }?: DbxFlexLayoutWrapperGroupFieldConfigDefaults): FormlyFieldConfig;
+export declare function flexLayoutWrapper(fieldConfigs: (FormlyFieldConfig | DbxFlexLayoutWrapperGroupFieldConfig)[], { relative, breakpoint, size: defaultSize }?: DbxFlexLayoutWrapperGroupFieldConfigDefaults): FormlyFieldConfig<DbxFlexWrapperWrapperProps>;