Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(material): simple strings as textPreffix/textSuffix for form-fields #3867

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat(material): simple strings as textPreffix/textSuffix for form-fields #3867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abaf3e9
feat(primeng): select filtering prop (#3856)
13dante04 Jan 31, 2024
980a64c
feat(material): simple strings as textPreffix/textSuffix for form-fields
RomainPrevot Feb 13, 2024
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
1 change: 1 addition & 0 deletions demo/src/app/ui/ui-primeng/select/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export class AppComponent {
type: 'select',
props: {
label: 'Select',
filter: true,
placeholder: 'Placeholder',
description: 'Description',
required: true,
Expand Down
14 changes: 10 additions & 4 deletions src/ui/material/form-field/src/form-field.wrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ interface MatFormlyFieldConfig extends FormlyFieldConfig<FormlyFieldProps> {
export interface FormlyFieldProps extends CoreFormlyFieldProps {
prefix?: TemplateRef<any>;
suffix?: TemplateRef<any>;
textPrefix?: TemplateRef<any>;
textSuffix?: TemplateRef<any>;
textPrefix?: TemplateRef<any> | string;
textSuffix?: TemplateRef<any> | string;
hideLabel?: boolean;
hideRequiredMarker?: boolean;
hideFieldUnderline?: boolean;
Expand Down Expand Up @@ -63,15 +63,21 @@ export interface FormlyFieldProps extends CoreFormlyFieldProps {
</mat-label>

<ng-container matTextPrefix *ngIf="props.textPrefix">
<ng-container [ngTemplateOutlet]="props.textPrefix" [ngTemplateOutletContext]="{ field: field }"></ng-container>
<ng-container
[ngTemplateOutlet]="stringOrTemplate"
[ngTemplateOutletContext]="{ content: props.textPrefix }"
></ng-container>
</ng-container>

<ng-container matPrefix *ngIf="props.prefix">
<ng-container [ngTemplateOutlet]="props.prefix" [ngTemplateOutletContext]="{ field: field }"></ng-container>
</ng-container>

<ng-container matTextSuffix *ngIf="props.textSuffix">
<ng-container [ngTemplateOutlet]="props.textSuffix" [ngTemplateOutletContext]="{ field: field }"></ng-container>
<ng-container
[ngTemplateOutlet]="stringOrTemplate"
[ngTemplateOutletContext]="{ content: props.textSuffix }"
></ng-container>
</ng-container>

<ng-container matSuffix *ngIf="props.suffix">
Expand Down
27 changes: 27 additions & 0 deletions src/ui/primeng/select/src/select.type.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,31 @@ describe('ui-primeng: Select Type', () => {
expect(field.formControl.value).toEqual(2);
expect(changeSpy).toHaveBeenCalledOnce();
});

it('should filter results on search', () => {
const { query, queryAll, fixture } = renderComponent({
key: 'name',
type: 'enum',
props: {
label: 'Select',
filter: true,
options: [
{ value: 1, label: 'apple label' },
{ value: 2, label: 'apple-pie label' },
{ value: 3, label: 'pie label' },
],
},
});

expect(query('formly-wrapper-primeng-form-field')).not.toBeNull();
const inputQuery = 'p-dropdown input.p-dropdown-filter';

query('p-dropdown div').triggerEventHandler('click', ɵCustomEvent({ isSameNode: () => false }));
expect(queryAll('p-dropdownItem')).toHaveLength(3);

query(inputQuery).triggerEventHandler('input', { target: { value: 'pie' } });
fixture.detectChanges();
expect(queryAll('p-dropdownItem')).toHaveLength(2);
expect(queryAll('p-dropdownItem>li')[0].nativeElement.textContent).toEqual('apple-pie label');
});
});
2 changes: 2 additions & 0 deletions src/ui/primeng/select/src/select.type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { FormlyFieldSelectProps } from '@ngx-formly/core/select';

interface SelectProps extends FormlyFieldProps, FormlyFieldSelectProps {
appendTo?: any;
filter?: boolean;
}

export interface FormlySelectFieldConfig extends FormlyFieldConfig<SelectProps> {
Expand All @@ -21,6 +22,7 @@ export interface FormlySelectFieldConfig extends FormlyFieldConfig<SelectProps>
[formlyAttributes]="field"
[showClear]="!props.required"
[appendTo]="props.appendTo"
[filter]="props.filter"
(onChange)="props.change && props.change(field, $event)"
>
</p-dropdown>
Expand Down