From d5def9d7b7c8c56444e35778ab8bd9e941f0ce0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= <renaudeau.gaetan@gmail.com>
Date: Mon, 18 Jan 2016 21:04:25 +0100
Subject: [PATCH] update to RN 0.18 & fix style to be used with StyleSheet

---
 Examples/AdvancedEffects/package.json |  2 +-
 Examples/Hearts/package.json          |  2 +-
 Examples/Simple/package.json          |  2 +-
 Examples/Tests/package.json           |  2 +-
 package.json                          |  2 +-
 src/Surface.js                        | 18 +++++++++++-------
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Examples/AdvancedEffects/package.json b/Examples/AdvancedEffects/package.json
index 528d8cf..7b9b3df 100644
--- a/Examples/AdvancedEffects/package.json
+++ b/Examples/AdvancedEffects/package.json
@@ -11,6 +11,6 @@
     "gl-react-native": "file:../..",
     "glsl-transitions": "^2015.11.8",
     "react": "^0.14.5",
-    "react-native": "0.18.0-rc"
+    "react-native": "^0.18.0"
   }
 }
diff --git a/Examples/Hearts/package.json b/Examples/Hearts/package.json
index 9c82504..74074ea 100644
--- a/Examples/Hearts/package.json
+++ b/Examples/Hearts/package.json
@@ -11,7 +11,7 @@
     "gl-react": "^2.1.0",
     "gl-react-native": "file:../..",
     "react": "^0.14.5",
-    "react-native": "0.18.0-rc",
+    "react-native": "^0.18.0",
     "seedrandom": "gre/seedrandom#released"
   }
 }
diff --git a/Examples/Simple/package.json b/Examples/Simple/package.json
index f8262c5..7de94e6 100644
--- a/Examples/Simple/package.json
+++ b/Examples/Simple/package.json
@@ -10,7 +10,7 @@
     "gl-react": "^2.1.0",
     "gl-react-native": "file:../..",
     "react": "^0.14.5",
-    "react-native": "0.18.0-rc",
+    "react-native": "^0.18.0",
     "react-native-fs": "^1.1.0",
     "react-native-material-kit": "gre/react-native-material-kit#no-peerDependencies"
   }
diff --git a/Examples/Tests/package.json b/Examples/Tests/package.json
index cec5049..1b80edc 100644
--- a/Examples/Tests/package.json
+++ b/Examples/Tests/package.json
@@ -10,6 +10,6 @@
     "gl-react": "^2.1.0",
     "gl-react-native": "file:../..",
     "react": "^0.14.5",
-    "react-native": "0.18.0-rc"
+    "react-native": "^0.18.0"
   }
 }
diff --git a/package.json b/package.json
index 30983e5..4702eaf 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "author": "Project September <tech@projectseptember.com>",
   "license": "MIT",
   "peerDependencies": {
-    "react-native": "0.18.0-rc",
+    "react-native": "^0.18.0",
     "gl-react": "^2.1.0"
   },
   "dependencies": {
diff --git a/src/Surface.js b/src/Surface.js
index d6d497e..b2f75f7 100644
--- a/src/Surface.js
+++ b/src/Surface.js
@@ -27,13 +27,17 @@ function renderVGL (props) {
 }
 
 function renderVcontainer ({ style, width, height, visibleContent, eventsThrough }, contents, renderer) {
-  const parentStyle = {
-    position: "relative",
-    ...style,
-    width: width,
-    height: height,
-    overflow: "hidden",
-  };
+  const parentStyle = [
+    {
+      position: "relative",
+    },
+    style,
+    {
+      width: width,
+      height: height,
+      overflow: "hidden",
+    }
+  ];
   return <View
     pointerEvents={!visibleContent && eventsThrough ? "none" : "auto"}
     style={parentStyle}>
-- 
2.26.2