From 819511126855501d97b6a84eacd0093421b12176 Mon Sep 17 00:00:00 2001 From: bbroereES <44869448+bbroereES@users.noreply.github.com> Date: Tue, 16 Jun 2020 14:59:27 +0200 Subject: [PATCH 1/6] fix(ios-angular): Topmost deprecation --- src/datetimepicker.common.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/datetimepicker.common.ts b/src/datetimepicker.common.ts index 058dd35..43a807a 100644 --- a/src/datetimepicker.common.ts +++ b/src/datetimepicker.common.ts @@ -2,7 +2,7 @@ import { View } from "tns-core-modules/ui/core/view"; import { ContentView } from "tns-core-modules/ui/content-view"; import { Page } from "tns-core-modules/ui/page"; import { Color } from "tns-core-modules/color"; -import * as frameModule from "tns-core-modules/ui/frame"; +import { Frame } from "tns-core-modules/ui/frame"; import { DateTimePicker as DateTimePickerDefinition, DateTimePickerStyle as DateTimePickerStyleDefinition @@ -76,7 +76,7 @@ export class DateTimePickerStyleBase implements DateTimePickerStyleDefinition { } export function getCurrentPage(): Page { - let topmostFrame = frameModule.topmost(); + let topmostFrame = Frame.topmost(); if (topmostFrame) { return topmostFrame.currentPage; } @@ -122,4 +122,4 @@ function applySelectors(view: T, callback: (view: T) => void) { view.onUnloaded(); } } -} \ No newline at end of file +} From 0bf3bec4133fc46b7e65ed3a4a9779671e00b0ff Mon Sep 17 00:00:00 2001 From: bbroereES <44869448+bbroereES@users.noreply.github.com> Date: Tue, 16 Jun 2020 15:00:25 +0200 Subject: [PATCH 2/6] fix(ios-angular): Not rendering on top of modal --- src/datetimepicker.ios.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/datetimepicker.ios.ts b/src/datetimepicker.ios.ts index bceac1f..6c72182 100644 --- a/src/datetimepicker.ios.ts +++ b/src/datetimepicker.ios.ts @@ -148,6 +148,7 @@ export class DateTimePicker extends DateTimePickerBase { const parentWithController = iosView.getParentWithViewController(view); viewController = parentWithController ? parentWithController.viewController : undefined; } + viewController = viewController.presentedViewController; } if (viewController) { @@ -243,4 +244,4 @@ export class DateTimePicker extends DateTimePickerBase { } return null; } -} \ No newline at end of file +} From b7b2e34067ce71caddde3bca3466dad77c3a7969 Mon Sep 17 00:00:00 2001 From: bbroereES <44869448+bbroereES@users.noreply.github.com> Date: Mon, 22 Jun 2020 07:20:13 +0200 Subject: [PATCH 3/6] fix(ios-angular): Non-defined viewcontroller --- src/datetimepicker.ios.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/datetimepicker.ios.ts b/src/datetimepicker.ios.ts index 6c72182..12b9885 100644 --- a/src/datetimepicker.ios.ts +++ b/src/datetimepicker.ios.ts @@ -144,11 +144,12 @@ export class DateTimePicker extends DateTimePickerBase { if (view.ios instanceof UIViewController) { viewController = view.ios; + } else if (viewController.presentedViewController) { + viewController = viewController.presentedViewController; } else { const parentWithController = iosView.getParentWithViewController(view); viewController = parentWithController ? parentWithController.viewController : undefined; } - viewController = viewController.presentedViewController; } if (viewController) { From aa375fa1927a0b1837878856d1095fe20b265d23 Mon Sep 17 00:00:00 2001 From: bbroereES <44869448+bbroereES@users.noreply.github.com> Date: Mon, 22 Jun 2020 07:43:05 +0200 Subject: [PATCH 4/6] fix(ios-angular): Defined check fix --- src/datetimepicker.ios.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/datetimepicker.ios.ts b/src/datetimepicker.ios.ts index 12b9885..bf87127 100644 --- a/src/datetimepicker.ios.ts +++ b/src/datetimepicker.ios.ts @@ -144,12 +144,14 @@ export class DateTimePicker extends DateTimePickerBase { if (view.ios instanceof UIViewController) { viewController = view.ios; - } else if (viewController.presentedViewController) { - viewController = viewController.presentedViewController; } else { const parentWithController = iosView.getParentWithViewController(view); viewController = parentWithController ? parentWithController.viewController : undefined; } + + if (viewController.presentedViewController) { + viewController = viewController.presentedViewController; + } } if (viewController) { From 6b3902b96ad21c27857f8ea29b6d4d935a62d79a Mon Sep 17 00:00:00 2001 From: bbroereES <44869448+bbroereES@users.noreply.github.com> Date: Tue, 23 Jun 2020 07:11:34 +0200 Subject: [PATCH 5/6] ios(fix): Lint --- src/datetimepicker.ios.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/datetimepicker.ios.ts b/src/datetimepicker.ios.ts index bf87127..7de9216 100644 --- a/src/datetimepicker.ios.ts +++ b/src/datetimepicker.ios.ts @@ -148,7 +148,7 @@ export class DateTimePicker extends DateTimePickerBase { const parentWithController = iosView.getParentWithViewController(view); viewController = parentWithController ? parentWithController.viewController : undefined; } - + if (viewController.presentedViewController) { viewController = viewController.presentedViewController; } From ffb2c8c1ecd524d559943857d99a56260047949e Mon Sep 17 00:00:00 2001 From: bbroereES <44869448+bbroereES@users.noreply.github.com> Date: Fri, 26 Jun 2020 12:35:01 +0200 Subject: [PATCH 6/6] ios(fix): Now also on nested modals --- src/datetimepicker.ios.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/datetimepicker.ios.ts b/src/datetimepicker.ios.ts index 7de9216..15b4952 100644 --- a/src/datetimepicker.ios.ts +++ b/src/datetimepicker.ios.ts @@ -149,7 +149,7 @@ export class DateTimePicker extends DateTimePickerBase { viewController = parentWithController ? parentWithController.viewController : undefined; } - if (viewController.presentedViewController) { + while (viewController.presentedViewController) { viewController = viewController.presentedViewController; } }