Skip to content

feat(dialogs): Setting the size of popup dialog thru dialog options #8041

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

Merged
vakrilov merged 14 commits into from
Dec 5, 2019
Merged

feat(dialogs): Setting the size of popup dialog thru dialog options #8041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9532d5a
Merge pull request #1 from NativeScript/master
slolam Oct 31, 2019
66e3da2
Added iOS specific height and width attributes to ShowModalOptions
slolam Oct 31, 2019
9592aef
Set the height and width of the popup dialog to the presenting contro…
slolam Oct 31, 2019
65931e7
dialog options ios attributes presentationStyle, height & width are m…
slolam Oct 31, 2019
9af0947
Merge branch 'master' into ios-dialog-size
slolam Oct 31, 2019
e02bdd0
Merge branch 'master' into ios-dialog-size
slolam Nov 18, 2019
b569a60
Merge branch 'master' into ios-dialog-size
Dec 2, 2019
fafbc60
Merge branch 'master' into ios-dialog-size
Dec 3, 2019
7a94daa
Updated NativeScript.api.md for public API changes
Dec 3, 2019
be2418e
Update with git properties
slolam Dec 3, 2019
f4037cc
Public API
slolam Dec 3, 2019
748fb97
CLA update
slolam Dec 4, 2019
ceead90
Merge branch 'master' into ios-dialog-size
vtrifonov Dec 5, 2019
e316a7c
Merge branch 'master' into ios-dialog-size
dtopuzov Dec 5, 2019
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
10 changes: 6 additions & 4 deletions api-reports/NativeScript.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1884,7 +1884,9 @@ export interface ShowModalOptions {
fullscreen?: boolean;

ios?: {
presentationStyle: any /* UIModalPresentationStyle */
presentationStyle?: any; /* UIModalPresentationStyle */
width?: number;
height?: number;
}

stretched?: boolean;
Expand Down Expand Up @@ -3065,9 +3067,9 @@ export class XmlParser {
// nativescript-core/index.d.ts:117:5 - (ae-forgotten-export) The symbol "layout" needs to be exported by the entry point index.d.ts
// nativescript-core/index.d.ts:118:5 - (ae-forgotten-export) The symbol "ad" needs to be exported by the entry point index.d.ts
// nativescript-core/index.d.ts:119:5 - (ae-forgotten-export) The symbol "ios" needs to be exported by the entry point index.d.ts
// nativescript-core/ui/core/view-base/view-base.d.ts:171:26 - (ae-forgotten-export) The symbol "Property" needs to be exported by the entry point index.d.ts
// nativescript-core/ui/core/view-base/view-base.d.ts:171:26 - (ae-forgotten-export) The symbol "CssProperty" needs to be exported by the entry point index.d.ts
// nativescript-core/ui/core/view-base/view-base.d.ts:171:26 - (ae-forgotten-export) The symbol "CssAnimationProperty" needs to be exported by the entry point index.d.ts
// nativescript-core/ui/core/view-base/view-base.d.ts:179:26 - (ae-forgotten-export) The symbol "Property" needs to be exported by the entry point index.d.ts
// nativescript-core/ui/core/view-base/view-base.d.ts:179:26 - (ae-forgotten-export) The symbol "CssProperty" needs to be exported by the entry point index.d.ts
// nativescript-core/ui/core/view-base/view-base.d.ts:179:26 - (ae-forgotten-export) The symbol "CssAnimationProperty" needs to be exported by the entry point index.d.ts

// (No @packageDocumentation comment for this package)

Expand Down
10 changes: 9 additions & 1 deletion nativescript-core/ui/core/view-base/view-base.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,15 @@ export interface ShowModalOptions {
/**
* The UIModalPresentationStyle to be used when showing the dialog in iOS .
*/
presentationStyle: any /* UIModalPresentationStyle */
presentationStyle?: any; /* UIModalPresentationStyle */
/**
* width of the popup dialog
*/
width?: number;
/**
* height of the popup dialog
*/
height?: number;
}
android?: {
/**
Expand Down
5 changes: 5 additions & 0 deletions nativescript-core/ui/core/view/view.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,11 @@ export class View extends ViewCommon implements ViewDefinition {
controller.modalPresentationStyle = UIModalPresentationStyle.FullScreen;
} else {
controller.modalPresentationStyle = UIModalPresentationStyle.FormSheet;
//check whether both height and width is provided and are positive numbers
// set it has prefered content size to the controller presenting the dialog
if (options.ios && options.ios.width > 0 && options.ios.height > 0) {
controller.preferredContentSize = CGSizeMake(options.ios.width, options.ios.height);
}
}

if (options.ios && options.ios.presentationStyle) {
Expand Down