Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@angular/platform-browser": "^15.0.0",
"@angular/platform-browser-dynamic": "^15.0.0",
"@angular/router": "^15.0.0",
"@elemental-concept/dynamic-form": "^1.0.2",
"@elemental-concept/dynamic-form": "^1.3.1",
"@ngneat/until-destroy": "^9.2.3",
"@ngx-translate/core": "^14.0.0",
"@ngx-translate/http-loader": "^7.0.0",
Expand Down
4 changes: 2 additions & 2 deletions projects/lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elemental-concept/dynamic-form-material",
"version": "1.0.3",
"version": "1.3.0",
"description": "This library generates Angular `FormGroup` and related DOM from a specified JSON configuration.",
"repository": {
"type": "git",
Expand All @@ -22,7 +22,7 @@
"@angular/common": "^15.0.0",
"@angular/core": "^15.0.0",
"@ngneat/until-destroy": "^9.2.3",
"@elemental-concept/dynamic-form": "^1.0.2"
"@elemental-concept/dynamic-form": "^1.3.0"
},
"dependencies": {
"tslib": "^2.3.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ import { CommonInputDirective } from '../../directives';
templateUrl: './checkbox-input.component.html',
styleUrls: ['./checkbox-input.component.scss']
})
export class CheckboxInputComponent extends CommonInputDirective {
export class CheckboxInputComponent extends CommonInputDirective<boolean> {
openExternalLink = (event: Event) => event.stopPropagation();
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ import { CommonInputDirective } from '../../directives';
templateUrl: './datepicker-input.component.html',
styleUrls: ['./datepicker-input.component.scss']
})
export class DatepickerInputComponent extends CommonInputDirective {
export class DatepickerInputComponent extends CommonInputDirective<string> {
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import { MaterialInputMeta } from '../../types';
templateUrl: './description.component.html',
styleUrls: ['./description.component.scss']
})
export class DescriptionComponent implements DynamicFormDescriptionControl<MaterialInputMeta> {
export class DescriptionComponent implements DynamicFormDescriptionControl<MaterialInputMeta, string> {
readonly type = 'description';

formControl: AbstractControl; // not used, but needed when compiling

dynamicFormElement: DynamicFormElement<MaterialInputMeta>;
dynamicFormElement: DynamicFormElement<MaterialInputMeta, string>;

visible = true;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ import { CommonInputDirective } from '../../directives';
templateUrl: './multi-select-input.component.html',
styleUrls: ['./multi-select-input.component.scss']
})
export class MultiSelectInputComponent extends CommonInputDirective {
export class MultiSelectInputComponent extends CommonInputDirective<string | number> {
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ import { CommonInputDirective } from '../../directives';
templateUrl: './radio-input.component.html',
styleUrls: ['./radio-input.component.scss']
})
export class RadioInputComponent extends CommonInputDirective {
export class RadioInputComponent extends CommonInputDirective<boolean> {
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ import { CommonInputDirective } from '../../directives';
templateUrl: './select-input.component.html',
styleUrls: ['./select-input.component.scss']
})
export class SelectInputComponent extends CommonInputDirective {
export class SelectInputComponent extends CommonInputDirective<string | number> {
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { SuffixType } from '../../types';
templateUrl: './string-input.component.html',
styleUrls: ['./string-input.component.scss']
})
export class StringInputComponent extends CommonInputDirective {
export class StringInputComponent extends CommonInputDirective<string> {
SuffixType = SuffixType;

onPasswordToggle = (e: Event) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ import { CommonInputDirective } from '../../directives';
templateUrl: './text-input.component.html',
styleUrls: ['./text-input.component.scss']
})
export class TextInputComponent extends CommonInputDirective {
export class TextInputComponent extends CommonInputDirective<string> {
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import { inputModeMap, MaterialInputMeta } from '../../types';

@UntilDestroy()
@Directive()
export class CommonInputDirective implements DynamicFormPassThroughControl<MaterialInputMeta> {
export class CommonInputDirective<T> implements DynamicFormPassThroughControl<MaterialInputMeta, T> {
readonly type = 'passthrough';

formGroup: UntypedFormGroup;

config: DynamicFormElement<MaterialInputMeta>;
config: DynamicFormElement<MaterialInputMeta, T>;

visible = true;

Expand All @@ -42,7 +42,7 @@ export class CommonInputDirective implements DynamicFormPassThroughControl<Mater
.subscribe(errors => this.errors = errors);
}

set dynamicFormElement(element: DynamicFormElement<MaterialInputMeta>) {
set dynamicFormElement(element: DynamicFormElement<MaterialInputMeta, T>) {
this.config = { ...element };

if (this.config.errors === undefined) {
Expand Down
2 changes: 1 addition & 1 deletion projects/lib/src/lib/material-component-map.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
TextInputComponent
} from './components';

export const materialComponentMap: DynamicFormComponentMap<MaterialInputMeta> = {
export const materialComponentMap: DynamicFormComponentMap<MaterialInputMeta, string | number | boolean> = {
string: StringInputComponent,
number: StringInputComponent,
email: StringInputComponent,
Expand Down