fix(hmr): close modal views during livesync #7668

VladimirAmiorkov · VladimirAmiorkov · commit ae9ecffb253a · 2019-08-09T16:53:55.000+03:00
diff --git a/tns-core-modules/ui/core/view/view-common.ts b/tns-core-modules/ui/core/view/view-common.ts
@@ -153,6 +153,14 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
     }
 
     public _onLivesync(context?: ModuleContext): boolean {
+        if (_rootModalViews) {
+            _rootModalViews.forEach(v => {
+                v.closeModal();
+            });
+
+            return true;
+        }
+
         if (traceEnabled()) {
             traceWrite(`${this}._onLivesync(${JSON.stringify(context)})`, traceCategories.Livesync);
         }

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,14 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`public _onLivesync(context?: ModuleContext): boolean {`
	`156`	`+ if (_rootModalViews) {`
	`157`	`+ _rootModalViews.forEach(v => {`
	`158`	`+ v.closeModal();`
	`159`	`+ });`
	`160`	`+`
	`161`	`+ return true;`
	`162`	`+ }`
	`163`	`+`
`156`	`164`	`if (traceEnabled()) {`
`157`	`165`	traceWrite(`${this}._onLivesync(${JSON.stringify(context)})`, traceCategories.Livesync);
`158`	`166`	`}`