From 9223abc1f8a6e80872c208e3168e7fb1b6dbd0df Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Thu, 11 Jun 2020 10:04:58 -0400 Subject: [PATCH 1/2] fix(angular): resolve issue when not using ngModel on components --- .../directives/control-value-accessors/value-accessor.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/angular/src/directives/control-value-accessors/value-accessor.ts b/angular/src/directives/control-value-accessors/value-accessor.ts index e7f3effaa1..cf02d4191f 100644 --- a/angular/src/directives/control-value-accessors/value-accessor.ts +++ b/angular/src/directives/control-value-accessors/value-accessor.ts @@ -62,7 +62,12 @@ export class ValueAccessor implements ControlValueAccessor, AfterViewInit, OnDes } ngAfterViewInit() { - const ngControl = this.injector.get(NgControl as Type); + let ngControl; + try { + ngControl = this.injector.get(NgControl as Type); + } catch { /* No FormControl or ngModel binding */ } + + if (!ngControl) { return; } // Listen for changes in validity, disabled, or pending states if (ngControl.statusChanges) { From 2969f9f9f2b3f47cc6a6ae8c62ec3de5691d2ad8 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Thu, 11 Jun 2020 10:13:59 -0400 Subject: [PATCH 2/2] 5.2.1 --- CHANGELOG.md | 9 +++++++++ angular/package.json | 4 ++-- core/package.json | 2 +- docs/package.json | 2 +- packages/angular-server/package.json | 4 ++-- packages/react-router/package.json | 10 +++++----- packages/react/package.json | 4 ++-- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71724da1b7..d9281fcc7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [5.2.1](https://github.com/ionic-team/ionic/compare/v5.2.0...v5.2.1) (2020-06-11) + + +### Bug Fixes + +* **angular:** resolve error when not using ngModel on components ([4083e32](https://github.com/ionic-team/ionic/commit/4083e32e103db71f6db86ed1ecd398fda407c28b)) + + + # [5.2.0 Silicon](https://github.com/ionic-team/ionic/compare/v5.1.1...v5.2.0) (2020-06-10) diff --git a/angular/package.json b/angular/package.json index 058dbf5660..72e0883b27 100644 --- a/angular/package.json +++ b/angular/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular", - "version": "5.2.0", + "version": "5.2.1", "description": "Angular specific wrappers for @ionic/core", "keywords": [ "ionic", @@ -42,7 +42,7 @@ "validate": "npm i && npm run lint && npm run test && npm run build" }, "dependencies": { - "@ionic/core": "5.2.0", + "@ionic/core": "5.2.1", "tslib": "^1.9.3" }, "peerDependencies": { diff --git a/core/package.json b/core/package.json index 614832c3fe..7f340a50cb 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/core", - "version": "5.2.0", + "version": "5.2.1", "description": "Base components for Ionic", "keywords": [ "ionic", diff --git a/docs/package.json b/docs/package.json index 944ca8fb9c..743441ee68 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/docs", - "version": "5.2.0", + "version": "5.2.1", "description": "Pre-packaged API documentation for the Ionic docs.", "main": "core.json", "types": "core.d.ts", diff --git a/packages/angular-server/package.json b/packages/angular-server/package.json index 8ad7e71e50..1687b848ac 100644 --- a/packages/angular-server/package.json +++ b/packages/angular-server/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular-server", - "version": "5.2.0", + "version": "5.2.1", "description": "Angular SSR Module for Ionic", "keywords": [ "ionic", @@ -49,7 +49,7 @@ "@angular/core": "8.2.13", "@angular/platform-browser": "8.2.13", "@angular/platform-server": "8.2.13", - "@ionic/core": "5.2.0", + "@ionic/core": "5.2.1", "ng-packagr": "5.7.1", "tslint": "^5.12.1", "tslint-ionic-rules": "0.0.21", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 713555df3d..a5ed9f14b2 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/react-router", - "version": "5.2.0", + "version": "5.2.1", "description": "React Router wrapper for @ionic/react", "keywords": [ "ionic", @@ -39,16 +39,16 @@ "tslib": "*" }, "peerDependencies": { - "@ionic/core": "5.2.0", - "@ionic/react": "5.2.0", + "@ionic/core": "5.2.1", + "@ionic/react": "5.2.1", "react": "^16.8.6", "react-dom": "^16.8.6", "react-router": "^5.0.1", "react-router-dom": "^5.0.1" }, "devDependencies": { - "@ionic/core": "5.2.0", - "@ionic/react": "5.2.0", + "@ionic/core": "5.2.1", + "@ionic/react": "5.2.1", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", diff --git a/packages/react/package.json b/packages/react/package.json index 1043e5574d..c3a6eaeba8 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/react", - "version": "5.2.0", + "version": "5.2.1", "description": "React specific wrapper for @ionic/core", "keywords": [ "ionic", @@ -39,7 +39,7 @@ "css/" ], "dependencies": { - "@ionic/core": "5.2.0", + "@ionic/core": "5.2.1", "ionicons": "^5.0.1", "tslib": "*" },