fixed angular builds

eclipsesource · Apr 13, 2023 · c8a681e · c8a681e
1 parent d972a51
commit c8a681e
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 6 deletions.
diff --git a/packages/angular-material/example/app/app.component.ts b/packages/angular-material/example/app/app.component.ts
@@ -44,12 +44,14 @@ const uiSchema = {
 const defaultI18n: JsonFormsI18nState = {
   locale: 'en-US'
 };
+
 const itemTester: UISchemaTester = (_schema, schemaPath, _path) => {
   if (schemaPath === '#/properties/warehouseitems/items') {
     return 10;
   }
   return -1;
 };
+
 @Component({
   selector: 'app-root',
   template: `
@@ -92,9 +94,11 @@ export class AppComponent {
   readonly examples = getExamples();
   selectedExample: ExampleDescription;
   i18n: JsonFormsI18nState;
+  currentLocale: string = defaultI18n.locale;
   private dateAdapter;
-  private readonly = false;
+  readonly = false;
   data: any;
+  config: any = {};
   uischemas: { tester: UISchemaTester; uischema: UISchemaElement; }[] = [
     { tester: itemTester, uischema: uiSchema }
   ];

diff --git a/packages/angular-material/example/app/app.module.ts b/packages/angular-material/example/app/app.module.ts
@@ -23,20 +23,22 @@
   THE SOFTWARE.
 */
 import { BrowserModule } from '@angular/platform-browser';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { AppComponent } from './app.component';
 import { JsonFormsAngularMaterialModule } from '../../src/module';
+import { JsonFormsModule } from '@jsonforms/angular';
 
 @NgModule({
   declarations: [AppComponent],
   imports: [
     BrowserModule,
     BrowserAnimationsModule,
-    JsonFormsAngularMaterialModule
+    JsonFormsAngularMaterialModule,
+    JsonFormsModule
   ],
   bootstrap: [AppComponent],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
-export class AppModule {
-}
+
+export class AppModule {}
diff --git a/packages/angular-material/src/controls/autocomplete.renderer.ts b/packages/angular-material/src/controls/autocomplete.renderer.ts
@@ -97,6 +97,8 @@ import { startWith } from 'rxjs/operators';
 })
 export class AutocompleteControlRenderer extends JsonFormsControl {
   @Input() options: string[];
+
+  focused: boolean = false;
   filteredOptions: Observable<string[]>;
   shouldFilter: boolean;
 

diff --git a/packages/angular-material/src/controls/date.renderer.ts b/packages/angular-material/src/controls/date.renderer.ts
@@ -62,6 +62,8 @@ export class DateControlRenderer extends JsonFormsControl {
     super(jsonformsService);
   }
 
+  focused: boolean = false;
+
   getEventValue = (event: any) => event.value.toISOString().substr(0, 10);
 }
 

diff --git a/packages/angular-material/src/controls/number.renderer.ts b/packages/angular-material/src/controls/number.renderer.ts
@@ -67,6 +67,7 @@ export class NumberControlRenderer extends JsonFormsControl {
   locale: string;
   numberFormat: Intl.NumberFormat;
   decimalSeparator: string;
+  focused: boolean = false;
 
   constructor(jsonformsService: JsonFormsAngularService) {
     super(jsonformsService);

diff --git a/packages/angular-material/src/controls/text.renderer.ts b/packages/angular-material/src/controls/text.renderer.ts
@@ -50,6 +50,7 @@ export class TextControlRenderer extends JsonFormsControl {
   constructor(jsonformsService: JsonFormsAngularService) {
     super(jsonformsService);
   }
+  focused: boolean = false;
   getEventValue = (event: any) => event.target.value || undefined;
   getType = (): string => {
     if (this.uischema.options && this.uischema.options.format) {

diff --git a/packages/angular-material/tsconfig.json b/packages/angular-material/tsconfig.json
@@ -6,7 +6,7 @@
     "target": "es5"
   },
   "exclude": ["node_modules"],
-  "files": ["./src/index.ts"],
+  "files": ["./src/index.ts", "./example/main.ts"],
   "angularCompilerOptions": {
     "strictMetadataEmit": true,
     "generateCodeForLibraries": false,

diff --git a/packages/angular-test/package.json b/packages/angular-test/package.json
@@ -5,6 +5,8 @@
   "main": "./lib/index.js",
   "dependencies": {
     "@angular/platform-browser-dynamic": "^14.2.0 || ^15.0.0 || ^15.2.6",
+    "@angular/core": "^14.2.0 || ^15.0.0 || ^15.2.6",
+    "@angular/platform-browser": "^14.2.0 || ^15.0.0 || ^15.2.6",
     "@jsonforms/angular": "^3.1.0-alpha.1",
     "@jsonforms/core": "^3.1.0-alpha.1"
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,8 @@ export class DateControlRenderer extends JsonFormsControl { @@
         super(jsonformsService);
       }
+      focused: boolean = false;
       getEventValue = (event: any) => event.value.toISOString().substr(0, 10);
     }
@@ Expand Down @@