Merge pull request #71 from darrencamp/fix-polyfil-ripple-style-for-ios

Ehesp · Ehesp · commit c6ea64c80273 · 2016-05-26T21:20:19.000+01:00
iOS bugfix: Check styles instance of Object
diff --git a/lib/polyfill/Ripple.js b/lib/polyfill/Ripple.js
@@ -42,7 +42,7 @@ export default class Ripple extends Component {
         // Extract padding, margin from style since IOS overflow: hidden has issues with the shadow
         if(Platform.OS == 'ios') {
             ({outerStyle, innerStyle} = (style instanceof Array ? style : [style]).reduce((obj, styles) => {
-                if (styles !== null) {
+                if (styles instanceof Object) {
                     Object.entries(styles).forEach(
                         ([name, value]) =>
                             [

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export default class Ripple extends Component {`
`42`	`42`	`// Extract padding, margin from style since IOS overflow: hidden has issues with the shadow`
`43`	`43`	`if(Platform.OS == 'ios') {`
`44`	`44`	`({outerStyle, innerStyle} = (style instanceof Array ? style : [style]).reduce((obj, styles) => {`
`45`		`- if (styles !== null) {`
	`45`	`+ if (styles instanceof Object) {`
`46`	`46`	`Object.entries(styles).forEach(`
`47`	`47`	`([name, value]) =>`
`48`	`48`	`[`