Skip to content

Fixed missing layout shadows on iOS #5

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

Open
alexziskind1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed missing layout shadows on iOS #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 14 additions & 11 deletions src/angular/ng-shadow.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { Directive, ElementRef, HostListener,
Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
import {
Directive, ElementRef, HostListener,
Input, OnChanges, OnInit, SimpleChanges
} from '@angular/core';
import { Color } from 'tns-core-modules/color';
import { isAndroid, isIOS } from 'tns-core-modules/platform';

Expand All @@ -26,7 +28,7 @@ export class NativeShadowDirective implements OnInit, OnChanges {
private loaded = false;
private initialized = false;

constructor(private el: ElementRef) {}
constructor(private el: ElementRef) { }

ngOnInit() {
if (this.shadow === null || (this.shadow === '' && !this.elevation)) {
Expand Down Expand Up @@ -73,7 +75,7 @@ export class NativeShadowDirective implements OnInit, OnChanges {
if (
this.loaded &&
!!changes &&
( changes.hasOwnProperty('shadow') ||
(changes.hasOwnProperty('shadow') ||
changes.hasOwnProperty('elevation') ||
changes.hasOwnProperty('shape') ||
changes.hasOwnProperty('bgcolor') ||
Expand All @@ -82,7 +84,7 @@ export class NativeShadowDirective implements OnInit, OnChanges {
changes.hasOwnProperty('shadowColor') ||
changes.hasOwnProperty('shadowOffset') ||
changes.hasOwnProperty('shadowOpacity') ||
changes.hasOwnProperty('shadowRadius') )
changes.hasOwnProperty('shadowRadius'))
) {
if (
changes.shadow &&
Expand All @@ -106,6 +108,7 @@ export class NativeShadowDirective implements OnInit, OnChanges {
if (tnsView.android) {
this.applyOnAndroid(tnsView.android);
} else if (tnsView.ios) {
tnsView.clipToBounds = false;
this.applyOnIOS(tnsView.ios);
}
}
Expand Down Expand Up @@ -167,16 +170,16 @@ export class NativeShadowDirective implements OnInit, OnChanges {
nativeView.layer.shadowColor = new Color(this.shadowColor).ios.CGColor;
nativeView.layer.shadowOffset =
this.shadowOffset ?
CGSizeMake(0, parseFloat(this.shadowOffset as string)) :
CGSizeMake(0, 0.35 * elevation);
CGSizeMake(0, parseFloat(this.shadowOffset as string)) :
CGSizeMake(0, 0.35 * elevation);
nativeView.layer.shadowOpacity =
this.shadowOpacity ?
parseFloat(this.shadowOpacity as string) :
0.015 * elevation + 0.18;
parseFloat(this.shadowOpacity as string) :
0.015 * elevation + 0.18;
nativeView.layer.shadowRadius =
this.shadowRadius ?
parseFloat(this.shadowRadius as string) :
0.35 * elevation - 0.1;
parseFloat(this.shadowRadius as string) :
0.35 * elevation - 0.1;
}

private loadFromAndroidData(data: AndroidData) {
Expand Down