Skip to content

Commit 815ba6e

Browse files
committed
angular-material: Rename AutocompleteControlRenderer to EnumControlRenderer
1 parent 3a9bc74 commit 815ba6e

5 files changed

Lines changed: 28 additions & 26 deletions

File tree

packages/angular-material/src/library/controls/autocomplete.renderer.ts renamed to packages/angular-material/src/library/controls/enum.renderer.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import { MatInputModule } from '@angular/material/input';
5353
import { MatAutocompleteModule } from '@angular/material/autocomplete';
5454

5555
@Component({
56-
selector: 'AutocompleteControlRenderer',
56+
selector: 'EnumControlRenderer, AutocompleteControlRenderer',
5757
template: `
5858
<mat-form-field [ngStyle]="{ display: hidden ? 'none' : '' }">
5959
<mat-label>{{ label }}</mat-label>
@@ -106,10 +106,7 @@ import { MatAutocompleteModule } from '@angular/material/autocomplete';
106106
MatAutocompleteModule,
107107
],
108108
})
109-
export class AutocompleteControlRenderer
110-
extends JsonFormsControl
111-
implements OnInit
112-
{
109+
export class EnumControlRenderer extends JsonFormsControl implements OnInit {
113110
@Input() options?: EnumOption[] | string[];
114111
valuesToTranslatedOptions?: Map<string, EnumOption>;
115112
filteredOptions: Observable<EnumOption[]>;
@@ -234,4 +231,9 @@ export class AutocompleteControlRenderer
234231
}
235232
}
236233

234+
/**
235+
* For {@link AutocompleteControlRenderer} class name backwards compatibility
236+
*/
237+
export { EnumControlRenderer as AutocompleteControlRenderer };
238+
237239
export const enumControlTester: RankedTester = rankWith(2, isEnumControl);

packages/angular-material/src/library/controls/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ export * from './number.renderer';
2929
export * from './range.renderer';
3030
export * from './date.renderer';
3131
export * from './toggle.renderer';
32-
export * from './autocomplete.renderer';
32+
export * from './enum.renderer';

packages/angular-material/src/library/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ import {
5454
ToggleControlRendererTester,
5555
} from './controls/toggle.renderer';
5656
import {
57-
AutocompleteControlRenderer,
57+
EnumControlRenderer,
5858
enumControlTester,
59-
} from './controls/autocomplete.renderer';
59+
} from './controls/enum.renderer';
6060
import {
6161
ObjectControlRenderer,
6262
ObjectControlRendererTester,
@@ -106,7 +106,7 @@ export const angularMaterialRenderers: {
106106
{ tester: RangeControlRendererTester, renderer: RangeControlRenderer },
107107
{ tester: DateControlRendererTester, renderer: DateControlRenderer },
108108
{ tester: ToggleControlRendererTester, renderer: ToggleControlRenderer },
109-
{ tester: enumControlTester, renderer: AutocompleteControlRenderer },
109+
{ tester: enumControlTester, renderer: EnumControlRenderer },
110110
{ tester: ObjectControlRendererTester, renderer: ObjectControlRenderer },
111111
// layouts
112112
{ tester: verticalLayoutTester, renderer: VerticalLayoutRenderer },

packages/angular-material/src/library/module.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ import { MatTabsModule } from '@angular/material/tabs';
4545
import { MatToolbarModule } from '@angular/material/toolbar';
4646
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
4747
import { JsonFormsModule } from '@jsonforms/angular';
48-
import { AutocompleteControlRenderer } from './controls/autocomplete.renderer';
4948
import { BooleanControlRenderer } from './controls/boolean.renderer';
5049
import { DateControlRenderer } from './controls/date.renderer';
50+
import { EnumControlRenderer } from './controls/enum.renderer';
5151
import { NumberControlRenderer } from './controls/number.renderer';
5252
import { RangeControlRenderer } from './controls/range.renderer';
5353
import { TextAreaRenderer } from './controls/textarea.renderer';
@@ -104,7 +104,7 @@ import { LayoutChildrenRenderPropsPipe } from './layouts';
104104
MasterListComponent,
105105
JsonFormsDetailComponent,
106106
ObjectControlRenderer,
107-
AutocompleteControlRenderer,
107+
EnumControlRenderer,
108108
TableRenderer,
109109
ArrayLayoutRenderer,
110110
LayoutChildrenRenderPropsPipe,
@@ -144,7 +144,7 @@ import { LayoutChildrenRenderPropsPipe } from './layouts';
144144
MasterListComponent,
145145
JsonFormsDetailComponent,
146146
ObjectControlRenderer,
147-
AutocompleteControlRenderer,
147+
EnumControlRenderer,
148148
TableRenderer,
149149
ArrayLayoutRenderer,
150150
LayoutChildrenRenderPropsPipe,

packages/angular-material/test/autocomplete-control.spec.ts renamed to packages/angular-material/test/enum-control.spec.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import {
5151
JsonFormsCore,
5252
EnumOption,
5353
} from '@jsonforms/core';
54-
import { AutocompleteControlRenderer } from '../src';
54+
import { EnumControlRenderer } from '../src';
5555
import { JsonFormsAngularService } from '@jsonforms/angular';
5656
import { ErrorObject } from 'ajv';
5757
import { HarnessLoader } from '@angular/cdk/testing';
@@ -81,16 +81,16 @@ const imports = [
8181
ReactiveFormsModule,
8282
];
8383
const providers = [JsonFormsAngularService];
84-
const componentUT: any = AutocompleteControlRenderer;
84+
const componentUT: any = EnumControlRenderer;
8585
const errorTest: ErrorTestExpectation = {
8686
errorInstance: MatError,
8787
numberOfElements: 1,
8888
indexOfElement: 0,
8989
};
9090

91-
describe('Autocomplete control Base Tests', () => {
92-
let fixture: ComponentFixture<AutocompleteControlRenderer>;
93-
let component: AutocompleteControlRenderer;
91+
describe('Enum control Base Tests', () => {
92+
let fixture: ComponentFixture<EnumControlRenderer>;
93+
let component: EnumControlRenderer;
9494
let inputElement: HTMLInputElement;
9595
beforeEach(waitForAsync(() => {
9696
TestBed.configureTestingModule({
@@ -215,9 +215,9 @@ describe('Autocomplete control Base Tests', () => {
215215
expect(inputElement.id).toBe('myId');
216216
});
217217
});
218-
describe('AutoComplete control Input Event Tests', () => {
219-
let fixture: ComponentFixture<AutocompleteControlRenderer>;
220-
let component: AutocompleteControlRenderer;
218+
describe('Enum control Input Event Tests', () => {
219+
let fixture: ComponentFixture<EnumControlRenderer>;
220+
let component: EnumControlRenderer;
221221
let loader: HarnessLoader;
222222
let inputElement: HTMLInputElement;
223223
beforeEach(waitForAsync(() => {
@@ -339,9 +339,9 @@ describe('AutoComplete control Input Event Tests', () => {
339339
expect(inputElement.value).toBe('Translated B');
340340
}));
341341
});
342-
describe('AutoComplete control Error Tests', () => {
343-
let fixture: ComponentFixture<AutocompleteControlRenderer>;
344-
let component: AutocompleteControlRenderer;
342+
describe('Enum control Error Tests', () => {
343+
let fixture: ComponentFixture<EnumControlRenderer>;
344+
let component: EnumControlRenderer;
345345
beforeEach(waitForAsync(() => {
346346
TestBed.configureTestingModule({
347347
imports: [componentUT, ...imports],
@@ -383,9 +383,9 @@ describe('AutoComplete control Error Tests', () => {
383383
});
384384
});
385385

386-
describe('AutoComplete control updateFilter function', () => {
387-
let fixture: ComponentFixture<AutocompleteControlRenderer>;
388-
let component: AutocompleteControlRenderer;
386+
describe('Enum control updateFilter function', () => {
387+
let fixture: ComponentFixture<EnumControlRenderer>;
388+
let component: EnumControlRenderer;
389389

390390
beforeEach(waitForAsync(() => {
391391
TestBed.configureTestingModule({

0 commit comments

Comments
 (0)