javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Muammer YILMAZ
2020-03-10 09:43:28 +03:00
committed by GitHub
parent 1a316b8a72 458943111e
commit 39473ecd65
17 changed files with 474 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nativescript-core/ui/core/view/view-common.ts
View File

@@ -26,6 +26,7 @@ import { sanitizeModuleName } from "../../builder/module-name-sanitizer";
import { StyleScope } from "../../styling/style-scope";
import { LinearGradient } from "../../styling/linear-gradient";
import { BackgroundRepeat } from "../../styling/style-properties";
import { TextTransform } from "../../text-base";
export * from "../../styling/style-properties";
export * from "../view-base";
@@ -718,6 +719,13 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
this.style.perspective = value;
}
get textTransform(): TextTransform {
return this.style.textTransform;
}
set textTransform(value: TextTransform) {
this.style.textTransform = value;
}
get translateX(): dip {
return this.style.translateX;
}

7
nativescript-core/ui/core/view/view.ios.ts
View File

@@ -180,7 +180,7 @@ export class View extends ViewCommon implements ViewDefinition {
if (adjustedFrame) {
nativeView.frame = adjustedFrame;
}
if (this._hasTransfrom) {
// re-apply the transform after the frame is adjusted
nativeView.layer.transform = transform;
@@ -359,7 +359,7 @@ export class View extends ViewCommon implements ViewDefinition {
if (this.rotateX || this.rotateY) {
transform.m34 = -1 / perspective;
}
transform = CATransform3DTranslate(transform, this.translateX, this.translateY, 0);
transform = iosNativeHelper.applyRotateTransform(transform, this.rotateX, this.rotateY, this.rotate);
transform = CATransform3DScale(transform, scaleX, scaleY, 1);
@@ -479,8 +479,7 @@ export class View extends ViewCommon implements ViewDefinition {
parentController.presentViewControllerAnimatedCompletion(controller, animated, null);
const transitionCoordinator = parentController.transitionCoordinator;
if (transitionCoordinator) {
UIViewControllerTransitionCoordinator.prototype.animateAlongsideTransitionCompletion
.call(transitionCoordinator, null, () => this._raiseShownModallyEvent());
transitionCoordinator.animateAlongsideTransitionCompletion(null, () => this._raiseShownModallyEvent());
} else {
// Apparently iOS 9+ stops all transitions and animations upon application suspend and transitionCoordinator becomes null here in this case.
// Since we are not waiting for any transition to complete, i.e. transitionCoordinator is null, we can directly raise our shownModally event.