Skip to content

fix(ios-angular): Topmost deprecation and not rendering on top of modal #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

fix(ios-angular): Topmost deprecation and not rendering on top of modal #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8195111
fix(ios-angular): Topmost deprecation
bbroereES Jun 16, 2020
0bf3bec
fix(ios-angular): Not rendering on top of modal
bbroereES Jun 16, 2020
b7b2e34
fix(ios-angular): Non-defined viewcontroller
bbroereES Jun 22, 2020
aa375fa
fix(ios-angular): Defined check fix
bbroereES Jun 22, 2020
6b3902b
ios(fix): Lint
bbroereES Jun 23, 2020
ffb2c8c
ios(fix): Now also on nested modals
bbroereES Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/datetimepicker.common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -122,4 +122,4 @@ function applySelectors<T extends View>(view: T, callback: (view: T) => void) {
view.onUnloaded();
}
}
}
}
6 changes: 5 additions & 1 deletion src/datetimepicker.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ export class DateTimePicker extends DateTimePickerBase {
const parentWithController = iosView.getParentWithViewController(view);
viewController = parentWithController ? parentWithController.viewController : undefined;
}

while (viewController.presentedViewController) {
viewController = viewController.presentedViewController;
}
}

if (viewController) {
Expand Down Expand Up @@ -243,4 +247,4 @@ export class DateTimePicker extends DateTimePickerBase {
}
return null;
}
}
}