Commit d5def9d7 authored by Gaëtan Renaudeau's avatar Gaëtan Renaudeau

update to RN 0.18 & fix style to be used with StyleSheet

parent 782d622a
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
"gl-react-native": "file:../..", "gl-react-native": "file:../..",
"glsl-transitions": "^2015.11.8", "glsl-transitions": "^2015.11.8",
"react": "^0.14.5", "react": "^0.14.5",
"react-native": "0.18.0-rc" "react-native": "^0.18.0"
} }
} }
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"gl-react": "^2.1.0", "gl-react": "^2.1.0",
"gl-react-native": "file:../..", "gl-react-native": "file:../..",
"react": "^0.14.5", "react": "^0.14.5",
"react-native": "0.18.0-rc", "react-native": "^0.18.0",
"seedrandom": "gre/seedrandom#released" "seedrandom": "gre/seedrandom#released"
} }
} }
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"gl-react": "^2.1.0", "gl-react": "^2.1.0",
"gl-react-native": "file:../..", "gl-react-native": "file:../..",
"react": "^0.14.5", "react": "^0.14.5",
"react-native": "0.18.0-rc", "react-native": "^0.18.0",
"react-native-fs": "^1.1.0", "react-native-fs": "^1.1.0",
"react-native-material-kit": "gre/react-native-material-kit#no-peerDependencies" "react-native-material-kit": "gre/react-native-material-kit#no-peerDependencies"
} }
......
...@@ -10,6 +10,6 @@ ...@@ -10,6 +10,6 @@
"gl-react": "^2.1.0", "gl-react": "^2.1.0",
"gl-react-native": "file:../..", "gl-react-native": "file:../..",
"react": "^0.14.5", "react": "^0.14.5",
"react-native": "0.18.0-rc" "react-native": "^0.18.0"
} }
} }
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
"author": "Project September <tech@projectseptember.com>", "author": "Project September <tech@projectseptember.com>",
"license": "MIT", "license": "MIT",
"peerDependencies": { "peerDependencies": {
"react-native": "0.18.0-rc", "react-native": "^0.18.0",
"gl-react": "^2.1.0" "gl-react": "^2.1.0"
}, },
"dependencies": { "dependencies": {
......
...@@ -27,13 +27,17 @@ function renderVGL (props) { ...@@ -27,13 +27,17 @@ function renderVGL (props) {
} }
function renderVcontainer ({ style, width, height, visibleContent, eventsThrough }, contents, renderer) { function renderVcontainer ({ style, width, height, visibleContent, eventsThrough }, contents, renderer) {
const parentStyle = { const parentStyle = [
position: "relative", {
...style, position: "relative",
width: width, },
height: height, style,
overflow: "hidden", {
}; width: width,
height: height,
overflow: "hidden",
}
];
return <View return <View
pointerEvents={!visibleContent && eventsThrough ? "none" : "auto"} pointerEvents={!visibleContent && eventsThrough ? "none" : "auto"}
style={parentStyle}> style={parentStyle}>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment