Skip to content
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.

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

[TIMOB-16597] iOS: Exposing overCurrentContext and overFullScreenContext modal presentation style #10070

Merged
merged 9 commits into from
May 21, 2018
44 changes: 42 additions & 2 deletions apidoc/Titanium/UI/iOS/iOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1356,14 +1356,48 @@ properties:
description: |
Used with the <Titanium.UI.Window.open> and <Titanium.UI.Window.close> methods.

One of the group of modal window presentation style constants
One of the group of modal window presentation style constants
[MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN),
[MODAL_PRESENTATION_OVER_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_CONTEXT),
[MODAL_PRESENTATION_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_CURRENT_CONTEXT),
[MODAL_PRESENTATION_FORMSHEET](Titanium.UI.iOS.MODAL_PRESENTATION_FORMSHEET),
[MODAL_PRESENTATION_FULLSCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_FULLSCREEN),
and [MODAL_PRESENTATION_PAGESHEET](Titanium.UI.iOS.MODAL_PRESENTATION_PAGESHEET).
type: Number
since: "5.4.0"


- name: MODAL_PRESENTATION_OVER_CURRENT_CONTEXT
summary: View presented over its parent window.
description: |
Used with the <Titanium.UI.Window.open> and <Titanium.UI.Window.close> methods.

One of the group of modal window presentation style constants
[MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN),
[MODAL_PRESENTATION_OVER_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_CONTEXT),
[MODAL_PRESENTATION_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_CURRENT_CONTEXT),
[MODAL_PRESENTATION_FORMSHEET](Titanium.UI.iOS.MODAL_PRESENTATION_FORMSHEET),
[MODAL_PRESENTATION_FULLSCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_FULLSCREEN),
and [MODAL_PRESENTATION_PAGESHEET](Titanium.UI.iOS.MODAL_PRESENTATION_PAGESHEET).
type: Number
since: "7.3.0"

- name: MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN
summary: Presented view covers the screen.
description: |
The views beneath the presented content are not removed from the view hierarchy when the presentation finishes. So if the presented view controller does not fill the screen with opaque content, the underlying content shows through.

Used with the <Titanium.UI.Window.open> and <Titanium.UI.Window.close> methods.

One of the group of modal window presentation style constants
[MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN),
[MODAL_PRESENTATION_OVER_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_CONTEXT),
[MODAL_PRESENTATION_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_CURRENT_CONTEXT),
[MODAL_PRESENTATION_FORMSHEET](Titanium.UI.iOS.MODAL_PRESENTATION_FORMSHEET),
[MODAL_PRESENTATION_FULLSCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_FULLSCREEN),
and [MODAL_PRESENTATION_PAGESHEET](Titanium.UI.iOS.MODAL_PRESENTATION_PAGESHEET).
type: Number
since: "7.3.0"

- name: MODAL_PRESENTATION_FORMSHEET
summary: |
Window width and height are smaller than those of the screen and the view is centered on
Expand All @@ -1376,6 +1410,8 @@ properties:
Used with the <Titanium.UI.Window.open> and <Titanium.UI.Window.close> methods.

One of the group of modal window presentation style constants
[MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN),
[MODAL_PRESENTATION_OVER_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_CONTEXT),
[MODAL_PRESENTATION_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_CURRENT_CONTEXT),
[MODAL_PRESENTATION_FORMSHEET](Titanium.UI.iOS.MODAL_PRESENTATION_FORMSHEET),
[MODAL_PRESENTATION_FULLSCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_FULLSCREEN),
Expand All @@ -1390,6 +1426,8 @@ properties:
Used with the <Titanium.UI.Window.open> and <Titanium.UI.Window.close> methods.

One of the group of modal window presentation style constants
[MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN),
[MODAL_PRESENTATION_OVER_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_CONTEXT),
[MODAL_PRESENTATION_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_CURRENT_CONTEXT),
[MODAL_PRESENTATION_FORMSHEET](Titanium.UI.iOS.MODAL_PRESENTATION_FORMSHEET),
[MODAL_PRESENTATION_FULLSCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_FULLSCREEN),
Expand All @@ -1410,6 +1448,8 @@ properties:
Used with the <Titanium.UI.Window.open> and <Titanium.UI.Window.close> methods.

One of the group of modal window presentation style constants
[MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN),
[MODAL_PRESENTATION_OVER_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_CONTEXT),
[MODAL_PRESENTATION_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_CURRENT_CONTEXT),
[MODAL_PRESENTATION_FORMSHEET](Titanium.UI.iOS.MODAL_PRESENTATION_FORMSHEET),
[MODAL_PRESENTATION_FULLSCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_FULLSCREEN),
Expand Down
2 changes: 2 additions & 0 deletions iphone/Classes/TiUIiOSProxy.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@
@property (nonatomic, readonly) NSNumber *MODAL_PRESENTATION_PAGESHEET;
@property (nonatomic, readonly) NSNumber *MODAL_PRESENTATION_FORMSHEET;
@property (nonatomic, readonly) NSNumber *MODAL_PRESENTATION_CURRENT_CONTEXT;
@property (nonatomic, readonly) NSNumber *MODAL_PRESENTATION_OVER_CURRENT_CONTEXT;
@property (nonatomic, readonly) NSNumber *MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN;

@property (nonatomic, readonly) NSNumber *MODAL_TRANSITION_STYLE_COVER_VERTICAL;
@property (nonatomic, readonly) NSNumber *MODAL_TRANSITION_STYLE_FLIP_HORIZONTAL;
Expand Down
2 changes: 2 additions & 0 deletions iphone/Classes/TiUIiOSProxy.m
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,8 @@ - (id)createApplicationShortcuts:(id)args
MAKE_SYSTEM_PROP(MODAL_PRESENTATION_PAGESHEET, UIModalPresentationPageSheet);
MAKE_SYSTEM_PROP(MODAL_PRESENTATION_FORMSHEET, UIModalPresentationFormSheet);
MAKE_SYSTEM_PROP(MODAL_PRESENTATION_CURRENT_CONTEXT, UIModalPresentationCurrentContext);
MAKE_SYSTEM_PROP(MODAL_PRESENTATION_OVER_CURRENT_CONTEXT, UIModalPresentationOverCurrentContext);
MAKE_SYSTEM_PROP(MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN, UIModalPresentationOverFullScreen);

#if IS_XCODE_8
#ifdef USE_TI_UIIOSFEEDBACKGENERATOR
Expand Down
23 changes: 23 additions & 0 deletions tests/Resources/ti.ui.window.addontest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Appcelerator Titanium Mobile
* Copyright (c) 2011-Present by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the Apache Public License
* Please see the LICENSE included with this distribution for details.
*/
/* eslint-env mocha */
/* global Ti */
/* eslint no-unused-expressions: "off" */

'use strict';

var should = require('./utilities/assertions');

describe('Titanium.UI.Window', function () {
it.ios('.modalPresentationStyles', function () {
should(Ti.UI.iOS.MODAL_PRESENTATION_PAGESHEET).be.a.Number;
should(Ti.UI.iOS.MODAL_PRESENTATION_FORMSHEET).be.a.Number;
should(Ti.UI.iOS.MODAL_PRESENTATION_CURRENT_CONTEXT).be.a.Number;
should(Ti.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_CONTEXT).be.a.Number;
should(Ti.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN).be.a.Number;
});
});