yyppaag
/
react-native-webview
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 180 Wiki Activity
Browse Source

feat(compatibility): Support React Native 0.62 (#1364 by @jussikinnula and @kaiguo) 

Co-authored-by: Kai Guo <kaigu@microsoft.com>
Co-authored-by: Jamon Holmgren <jamonholmgren@gmail.com>
Jussi Kinnula 3 years ago
parent
89886c820d
commit
228f10d917
No account linked to committer's email address
17 changed files with 1685 additions and 2453 deletions
Split View Show Diff Stats
  1. 2
    2
      example/android/build.gradle
  2. 1
    1
      example/android/gradle/wrapper/gradle-wrapper.properties
  3. 2
    2
      example/android/gradlew
  4. 3
    3
      example/ios/Podfile
  5. 181
    157
      example/ios/Podfile.lock
  6. 11
    7
      example/ios/example.xcodeproj/project.pbxproj
  7. 2
    43
      example/ios/example.xcodeproj/xcshareddata/xcschemes/example-tvOS.xcscheme
  8. 2
    43
      example/ios/example.xcodeproj/xcshareddata/xcschemes/example.xcscheme
  9. 1
    0
      example/windows/WebViewWindows.sln
  10. 0
    5
      example/windows/WebViewWindows/App.cpp
  11. 3
    4
      example/windows/WebViewWindows/WebViewWindows.vcxproj
  12. 14
    14
      package.json
  13. 14
    0
      react-native.config.js
  14. 18
    3
      src/WebView.tsx
  15. 26
    28
      windows/ReactNativeWebView/ReactWebViewManager.cpp
  16. 2
    4
      windows/ReactNativeWebView/ReactWebViewManager.h
  17. 1403
    2137
      yarn.lock

+ 2
- 2
example/android/build.gradle View File 

@@ -12,7 +12,7 @@ buildscript {
12 12 
         jcenter()
13 13 
     }
14 14 
     dependencies {
15 
-        classpath("com.android.tools.build:gradle:3.4.2")
15 
+        classpath("com.android.tools.build:gradle:3.5.2")
16 16
17 17 
         // NOTE: Do not place your application dependencies here; they belong
18 18 
         // in the individual module build.gradle files
 
@@ -33,6 +33,6 @@ allprojects {
33 33
34 34 
         google()
35 35 
         jcenter()
36 
-        maven { url 'https://jitpack.io' }
36 
+        maven { url 'https://www.jitpack.io' }
37 37 
     }
38 38 
 }

+ 1
- 1
example/android/gradle/wrapper/gradle-wrapper.properties View File 

@@ -1,5 +1,5 @@
1 1 
 distributionBase=GRADLE_USER_HOME
2 2 
 distributionPath=wrapper/dists
3 
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
3 
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
4 4 
 zipStoreBase=GRADLE_USER_HOME
5 5 
 zipStorePath=wrapper/dists

+ 2
- 2
example/android/gradlew View File 

@@ -7,7 +7,7 @@
7 7 
 # you may not use this file except in compliance with the License.
8 8 
 # You may obtain a copy of the License at
9 9 
 #
10 
-#      http://www.apache.org/licenses/LICENSE-2.0
10 
+#      https://www.apache.org/licenses/LICENSE-2.0
11 11 
 #
12 12 
 # Unless required by applicable law or agreed to in writing, software
13 13 
 # distributed under the License is distributed on an "AS IS" BASIS,
 
@@ -126,7 +126,7 @@ if $darwin; then
126 126 
 fi
127 127
128 128 
 # For Cygwin, switch paths to Windows format before running java
129 
-if $cygwin ; then
129 
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130 130 
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131 131 
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
132 132 
     JAVACMD=`cygpath --unix "$JAVACMD"`

+ 3
- 3
example/ios/Podfile View File 

@@ -31,9 +31,9 @@ target 'example' do
31 31 
   pod 'React-jsi', :path => '../../node_modules/react-native/ReactCommon/jsi'
32 32 
   pod 'React-jsiexecutor', :path => '../../node_modules/react-native/ReactCommon/jsiexecutor'
33 33 
   pod 'React-jsinspector', :path => '../../node_modules/react-native/ReactCommon/jsinspector'
34 
-  pod 'ReactCommon/jscallinvoker', :path => "../../node_modules/react-native/ReactCommon"
34 
+  pod 'ReactCommon/callinvoker', :path => "../../node_modules/react-native/ReactCommon"
35 35 
   pod 'ReactCommon/turbomodule/core', :path => "../../node_modules/react-native/ReactCommon"
36 
-  pod 'Yoga', :path => '../../node_modules/react-native/ReactCommon/yoga'
36 
+  pod 'Yoga', :path => '../../node_modules/react-native/ReactCommon/yoga', :modular_headers => true
37 37
38 38 
   pod 'DoubleConversion', :podspec => '../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
39 39 
   pod 'glog', :podspec => '../../node_modules/react-native/third-party-podspecs/glog.podspec'
 
@@ -49,7 +49,7 @@ target 'example-tvOS' do
49 49 
   # Pods for example-tvOS
50 50
51 51 
   target 'example-tvOSTests' do
52 
-    inherit! :search_paths
52 
+    inherit! :complete
53 53 
     # Pods for testing
54 54 
   end
55 55

+ 181
- 157
example/ios/Podfile.lock View File 

@@ -1,14 +1,14 @@
1 1 
 PODS:
2 2 
   - boost-for-react-native (1.63.0)
3 3 
   - DoubleConversion (1.1.6)
4 
-  - FBLazyVector (0.61.5)
5 
-  - FBReactNativeSpec (0.61.5):
4 
+  - FBLazyVector (0.62.2)
5 
+  - FBReactNativeSpec (0.62.2):
6 6 
     - Folly (= 2018.10.22.00)
7 
-    - RCTRequired (= 0.61.5)
8 
-    - RCTTypeSafety (= 0.61.5)
9 
-    - React-Core (= 0.61.5)
10 
-    - React-jsi (= 0.61.5)
11 
-    - ReactCommon/turbomodule/core (= 0.61.5)
7 
+    - RCTRequired (= 0.62.2)
8 
+    - RCTTypeSafety (= 0.62.2)
9 
+    - React-Core (= 0.62.2)
10 
+    - React-jsi (= 0.62.2)
11 
+    - ReactCommon/turbomodule/core (= 0.62.2)
12 12 
   - Folly (2018.10.22.00):
13 13 
     - boost-for-react-native
14 14 
     - DoubleConversion
 
@@ -19,206 +19,230 @@ PODS:
19 19 
     - DoubleConversion
20 20 
     - glog
21 21 
   - glog (0.3.5)
22 
-  - RCTRequired (0.61.5)
23 
-  - RCTTypeSafety (0.61.5):
24 
-    - FBLazyVector (= 0.61.5)
22 
+  - RCTRequired (0.62.2)
23 
+  - RCTTypeSafety (0.62.2):
24 
+    - FBLazyVector (= 0.62.2)
25 25 
     - Folly (= 2018.10.22.00)
26 
-    - RCTRequired (= 0.61.5)
27 
-    - React-Core (= 0.61.5)
28 
-  - React (0.61.5):
29 
-    - React-Core (= 0.61.5)
30 
-    - React-Core/DevSupport (= 0.61.5)
31 
-    - React-Core/RCTWebSocket (= 0.61.5)
32 
-    - React-RCTActionSheet (= 0.61.5)
33 
-    - React-RCTAnimation (= 0.61.5)
34 
-    - React-RCTBlob (= 0.61.5)
35 
-    - React-RCTImage (= 0.61.5)
36 
-    - React-RCTLinking (= 0.61.5)
37 
-    - React-RCTNetwork (= 0.61.5)
38 
-    - React-RCTSettings (= 0.61.5)
39 
-    - React-RCTText (= 0.61.5)
40 
-    - React-RCTVibration (= 0.61.5)
41 
-  - React-Core (0.61.5):
26 
+    - RCTRequired (= 0.62.2)
27 
+    - React-Core (= 0.62.2)
28 
+  - React (0.62.2):
29 
+    - React-Core (= 0.62.2)
30 
+    - React-Core/DevSupport (= 0.62.2)
31 
+    - React-Core/RCTWebSocket (= 0.62.2)
32 
+    - React-RCTActionSheet (= 0.62.2)
33 
+    - React-RCTAnimation (= 0.62.2)
34 
+    - React-RCTBlob (= 0.62.2)
35 
+    - React-RCTImage (= 0.62.2)
36 
+    - React-RCTLinking (= 0.62.2)
37 
+    - React-RCTNetwork (= 0.62.2)
38 
+    - React-RCTSettings (= 0.62.2)
39 
+    - React-RCTText (= 0.62.2)
40 
+    - React-RCTVibration (= 0.62.2)
41 
+  - React-Core (0.62.2):
42 42 
     - Folly (= 2018.10.22.00)
43 43 
     - glog
44 
-    - React-Core/Default (= 0.61.5)
45 
-    - React-cxxreact (= 0.61.5)
46 
-    - React-jsi (= 0.61.5)
47 
-    - React-jsiexecutor (= 0.61.5)
44 
+    - React-Core/Default (= 0.62.2)
45 
+    - React-cxxreact (= 0.62.2)
46 
+    - React-jsi (= 0.62.2)
47 
+    - React-jsiexecutor (= 0.62.2)
48 48 
     - Yoga
49 
-  - React-Core/CoreModulesHeaders (0.61.5):
49 
+  - React-Core/CoreModulesHeaders (0.62.2):
50 50 
     - Folly (= 2018.10.22.00)
51 51 
     - glog
52 52 
     - React-Core/Default
53 
-    - React-cxxreact (= 0.61.5)
54 
-    - React-jsi (= 0.61.5)
55 
-    - React-jsiexecutor (= 0.61.5)
53 
+    - React-cxxreact (= 0.62.2)
54 
+    - React-jsi (= 0.62.2)
55 
+    - React-jsiexecutor (= 0.62.2)
56 56 
     - Yoga
57 
-  - React-Core/Default (0.61.5):
57 
+  - React-Core/Default (0.62.2):
58 58 
     - Folly (= 2018.10.22.00)
59 59 
     - glog
60 
-    - React-cxxreact (= 0.61.5)
61 
-    - React-jsi (= 0.61.5)
62 
-    - React-jsiexecutor (= 0.61.5)
60 
+    - React-cxxreact (= 0.62.2)
61 
+    - React-jsi (= 0.62.2)
62 
+    - React-jsiexecutor (= 0.62.2)
63 63 
     - Yoga
64 
-  - React-Core/DevSupport (0.61.5):
64 
+  - React-Core/DevSupport (0.62.2):
65 65 
     - Folly (= 2018.10.22.00)
66 66 
     - glog
67 
-    - React-Core/Default (= 0.61.5)
68 
-    - React-Core/RCTWebSocket (= 0.61.5)
69 
-    - React-cxxreact (= 0.61.5)
70 
-    - React-jsi (= 0.61.5)
71 
-    - React-jsiexecutor (= 0.61.5)
72 
-    - React-jsinspector (= 0.61.5)
67 
+    - React-Core/Default (= 0.62.2)
68 
+    - React-Core/RCTWebSocket (= 0.62.2)
69 
+    - React-cxxreact (= 0.62.2)
70 
+    - React-jsi (= 0.62.2)
71 
+    - React-jsiexecutor (= 0.62.2)
72 
+    - React-jsinspector (= 0.62.2)
73 73 
     - Yoga
74 
-  - React-Core/RCTActionSheetHeaders (0.61.5):
74 
+  - React-Core/RCTActionSheetHeaders (0.62.2):
75 75 
     - Folly (= 2018.10.22.00)
76 76 
     - glog
77 77 
     - React-Core/Default
78 
-    - React-cxxreact (= 0.61.5)
79 
-    - React-jsi (= 0.61.5)
80 
-    - React-jsiexecutor (= 0.61.5)
78 
+    - React-cxxreact (= 0.62.2)
79 
+    - React-jsi (= 0.62.2)
80 
+    - React-jsiexecutor (= 0.62.2)
81 81 
     - Yoga
82 
-  - React-Core/RCTAnimationHeaders (0.61.5):
82 
+  - React-Core/RCTAnimationHeaders (0.62.2):
83 83 
     - Folly (= 2018.10.22.00)
84 84 
     - glog
85 85 
     - React-Core/Default
86 
-    - React-cxxreact (= 0.61.5)
87 
-    - React-jsi (= 0.61.5)
88 
-    - React-jsiexecutor (= 0.61.5)
86 
+    - React-cxxreact (= 0.62.2)
87 
+    - React-jsi (= 0.62.2)
88 
+    - React-jsiexecutor (= 0.62.2)
89 89 
     - Yoga
90 
-  - React-Core/RCTBlobHeaders (0.61.5):
90 
+  - React-Core/RCTBlobHeaders (0.62.2):
91 91 
     - Folly (= 2018.10.22.00)
92 92 
     - glog
93 93 
     - React-Core/Default
94 
-    - React-cxxreact (= 0.61.5)
95 
-    - React-jsi (= 0.61.5)
96 
-    - React-jsiexecutor (= 0.61.5)
94 
+    - React-cxxreact (= 0.62.2)
95 
+    - React-jsi (= 0.62.2)
96 
+    - React-jsiexecutor (= 0.62.2)
97 97 
     - Yoga
98 
-  - React-Core/RCTImageHeaders (0.61.5):
98 
+  - React-Core/RCTImageHeaders (0.62.2):
99 99 
     - Folly (= 2018.10.22.00)
100 100 
     - glog
101 101 
     - React-Core/Default
102 
-    - React-cxxreact (= 0.61.5)
103 
-    - React-jsi (= 0.61.5)
104 
-    - React-jsiexecutor (= 0.61.5)
102 
+    - React-cxxreact (= 0.62.2)
103 
+    - React-jsi (= 0.62.2)
104 
+    - React-jsiexecutor (= 0.62.2)
105 105 
     - Yoga
106 
-  - React-Core/RCTLinkingHeaders (0.61.5):
106 
+  - React-Core/RCTLinkingHeaders (0.62.2):
107 107 
     - Folly (= 2018.10.22.00)
108 108 
     - glog
109 109 
     - React-Core/Default
110 
-    - React-cxxreact (= 0.61.5)
111 
-    - React-jsi (= 0.61.5)
112 
-    - React-jsiexecutor (= 0.61.5)
110 
+    - React-cxxreact (= 0.62.2)
111 
+    - React-jsi (= 0.62.2)
112 
+    - React-jsiexecutor (= 0.62.2)
113 113 
     - Yoga
114 
-  - React-Core/RCTNetworkHeaders (0.61.5):
114 
+  - React-Core/RCTNetworkHeaders (0.62.2):
115 115 
     - Folly (= 2018.10.22.00)
116 116 
     - glog
117 117 
     - React-Core/Default
118 
-    - React-cxxreact (= 0.61.5)
119 
-    - React-jsi (= 0.61.5)
120 
-    - React-jsiexecutor (= 0.61.5)
118 
+    - React-cxxreact (= 0.62.2)
119 
+    - React-jsi (= 0.62.2)
120 
+    - React-jsiexecutor (= 0.62.2)
121 121 
     - Yoga
122 
-  - React-Core/RCTSettingsHeaders (0.61.5):
122 
+  - React-Core/RCTSettingsHeaders (0.62.2):
123 123 
     - Folly (= 2018.10.22.00)
124 124 
     - glog
125 125 
     - React-Core/Default
126 
-    - React-cxxreact (= 0.61.5)
127 
-    - React-jsi (= 0.61.5)
128 
-    - React-jsiexecutor (= 0.61.5)
126 
+    - React-cxxreact (= 0.62.2)
127 
+    - React-jsi (= 0.62.2)
128 
+    - React-jsiexecutor (= 0.62.2)
129 129 
     - Yoga
130 
-  - React-Core/RCTTextHeaders (0.61.5):
130 
+  - React-Core/RCTTextHeaders (0.62.2):
131 131 
     - Folly (= 2018.10.22.00)
132 132 
     - glog
133 133 
     - React-Core/Default
134 
-    - React-cxxreact (= 0.61.5)
135 
-    - React-jsi (= 0.61.5)
136 
-    - React-jsiexecutor (= 0.61.5)
134 
+    - React-cxxreact (= 0.62.2)
135 
+    - React-jsi (= 0.62.2)
136 
+    - React-jsiexecutor (= 0.62.2)
137 137 
     - Yoga
138 
-  - React-Core/RCTVibrationHeaders (0.61.5):
138 
+  - React-Core/RCTVibrationHeaders (0.62.2):
139 139 
     - Folly (= 2018.10.22.00)
140 140 
     - glog
141 141 
     - React-Core/Default
142 
-    - React-cxxreact (= 0.61.5)
143 
-    - React-jsi (= 0.61.5)
144 
-    - React-jsiexecutor (= 0.61.5)
142 
+    - React-cxxreact (= 0.62.2)
143 
+    - React-jsi (= 0.62.2)
144 
+    - React-jsiexecutor (= 0.62.2)
145 145 
     - Yoga
146 
-  - React-Core/RCTWebSocket (0.61.5):
146 
+  - React-Core/RCTWebSocket (0.62.2):
147 147 
     - Folly (= 2018.10.22.00)
148 148 
     - glog
149 
-    - React-Core/Default (= 0.61.5)
150 
-    - React-cxxreact (= 0.61.5)
151 
-    - React-jsi (= 0.61.5)
152 
-    - React-jsiexecutor (= 0.61.5)
149 
+    - React-Core/Default (= 0.62.2)
150 
+    - React-cxxreact (= 0.62.2)
151 
+    - React-jsi (= 0.62.2)
152 
+    - React-jsiexecutor (= 0.62.2)
153 153 
     - Yoga
154 
-  - React-CoreModules (0.61.5):
155 
-    - FBReactNativeSpec (= 0.61.5)
154 
+  - React-CoreModules (0.62.2):
155 
+    - FBReactNativeSpec (= 0.62.2)
156 156 
     - Folly (= 2018.10.22.00)
157 
-    - RCTTypeSafety (= 0.61.5)
158 
-    - React-Core/CoreModulesHeaders (= 0.61.5)
159 
-    - React-RCTImage (= 0.61.5)
160 
-    - ReactCommon/turbomodule/core (= 0.61.5)
161 
-  - React-cxxreact (0.61.5):
157 
+    - RCTTypeSafety (= 0.62.2)
158 
+    - React-Core/CoreModulesHeaders (= 0.62.2)
159 
+    - React-RCTImage (= 0.62.2)
160 
+    - ReactCommon/turbomodule/core (= 0.62.2)
161 
+  - React-cxxreact (0.62.2):
162 162 
     - boost-for-react-native (= 1.63.0)
163 163 
     - DoubleConversion
164 164 
     - Folly (= 2018.10.22.00)
165 165 
     - glog
166 
-    - React-jsinspector (= 0.61.5)
167 
-  - React-jsi (0.61.5):
166 
+    - React-jsinspector (= 0.62.2)
167 
+  - React-jsi (0.62.2):
168 168 
     - boost-for-react-native (= 1.63.0)
169 169 
     - DoubleConversion
170 170 
     - Folly (= 2018.10.22.00)
171 171 
     - glog
172 
-    - React-jsi/Default (= 0.61.5)
173 
-  - React-jsi/Default (0.61.5):
172 
+    - React-jsi/Default (= 0.62.2)
173 
+  - React-jsi/Default (0.62.2):
174 174 
     - boost-for-react-native (= 1.63.0)
175 175 
     - DoubleConversion
176 176 
     - Folly (= 2018.10.22.00)
177 177 
     - glog
178 
-  - React-jsiexecutor (0.61.5):
178 
+  - React-jsiexecutor (0.62.2):
179 179 
     - DoubleConversion
180 180 
     - Folly (= 2018.10.22.00)
181 181 
     - glog
182 
-    - React-cxxreact (= 0.61.5)
183 
-    - React-jsi (= 0.61.5)
184 
-  - React-jsinspector (0.61.5)
185 
-  - react-native-webview (9.3.0):
182 
+    - React-cxxreact (= 0.62.2)
183 
+    - React-jsi (= 0.62.2)
184 
+  - React-jsinspector (0.62.2)
185 
+  - react-native-webview (9.4.0):
186 186 
     - React
187 
-  - React-RCTActionSheet (0.61.5):
188 
-    - React-Core/RCTActionSheetHeaders (= 0.61.5)
189 
-  - React-RCTAnimation (0.61.5):
190 
-    - React-Core/RCTAnimationHeaders (= 0.61.5)
191 
-  - React-RCTBlob (0.61.5):
192 
-    - React-Core/RCTBlobHeaders (= 0.61.5)
193 
-    - React-Core/RCTWebSocket (= 0.61.5)
194 
-    - React-jsi (= 0.61.5)
195 
-    - React-RCTNetwork (= 0.61.5)
196 
-  - React-RCTImage (0.61.5):
197 
-    - React-Core/RCTImageHeaders (= 0.61.5)
198 
-    - React-RCTNetwork (= 0.61.5)
199 
-  - React-RCTLinking (0.61.5):
200 
-    - React-Core/RCTLinkingHeaders (= 0.61.5)
201 
-  - React-RCTNetwork (0.61.5):
202 
-    - React-Core/RCTNetworkHeaders (= 0.61.5)
203 
-  - React-RCTSettings (0.61.5):
204 
-    - React-Core/RCTSettingsHeaders (= 0.61.5)
205 
-  - React-RCTText (0.61.5):
206 
-    - React-Core/RCTTextHeaders (= 0.61.5)
207 
-  - React-RCTVibration (0.61.5):
208 
-    - React-Core/RCTVibrationHeaders (= 0.61.5)
209 
-  - ReactCommon/jscallinvoker (0.61.5):
187 
+  - React-RCTActionSheet (0.62.2):
188 
+    - React-Core/RCTActionSheetHeaders (= 0.62.2)
189 
+  - React-RCTAnimation (0.62.2):
190 
+    - FBReactNativeSpec (= 0.62.2)
191 
+    - Folly (= 2018.10.22.00)
192 
+    - RCTTypeSafety (= 0.62.2)
193 
+    - React-Core/RCTAnimationHeaders (= 0.62.2)
194 
+    - ReactCommon/turbomodule/core (= 0.62.2)
195 
+  - React-RCTBlob (0.62.2):
196 
+    - FBReactNativeSpec (= 0.62.2)
197 
+    - Folly (= 2018.10.22.00)
198 
+    - React-Core/RCTBlobHeaders (= 0.62.2)
199 
+    - React-Core/RCTWebSocket (= 0.62.2)
200 
+    - React-jsi (= 0.62.2)
201 
+    - React-RCTNetwork (= 0.62.2)
202 
+    - ReactCommon/turbomodule/core (= 0.62.2)
203 
+  - React-RCTImage (0.62.2):
204 
+    - FBReactNativeSpec (= 0.62.2)
205 
+    - Folly (= 2018.10.22.00)
206 
+    - RCTTypeSafety (= 0.62.2)
207 
+    - React-Core/RCTImageHeaders (= 0.62.2)
208 
+    - React-RCTNetwork (= 0.62.2)
209 
+    - ReactCommon/turbomodule/core (= 0.62.2)
210 
+  - React-RCTLinking (0.62.2):
211 
+    - FBReactNativeSpec (= 0.62.2)
212 
+    - React-Core/RCTLinkingHeaders (= 0.62.2)
213 
+    - ReactCommon/turbomodule/core (= 0.62.2)
214 
+  - React-RCTNetwork (0.62.2):
215 
+    - FBReactNativeSpec (= 0.62.2)
216 
+    - Folly (= 2018.10.22.00)
217 
+    - RCTTypeSafety (= 0.62.2)
218 
+    - React-Core/RCTNetworkHeaders (= 0.62.2)
219 
+    - ReactCommon/turbomodule/core (= 0.62.2)
220 
+  - React-RCTSettings (0.62.2):
221 
+    - FBReactNativeSpec (= 0.62.2)
222 
+    - Folly (= 2018.10.22.00)
223 
+    - RCTTypeSafety (= 0.62.2)
224 
+    - React-Core/RCTSettingsHeaders (= 0.62.2)
225 
+    - ReactCommon/turbomodule/core (= 0.62.2)
226 
+  - React-RCTText (0.62.2):
227 
+    - React-Core/RCTTextHeaders (= 0.62.2)
228 
+  - React-RCTVibration (0.62.2):
229 
+    - FBReactNativeSpec (= 0.62.2)
230 
+    - Folly (= 2018.10.22.00)
231 
+    - React-Core/RCTVibrationHeaders (= 0.62.2)
232 
+    - ReactCommon/turbomodule/core (= 0.62.2)
233 
+  - ReactCommon/callinvoker (0.62.2):
210 234 
     - DoubleConversion
211 235 
     - Folly (= 2018.10.22.00)
212 236 
     - glog
213 
-    - React-cxxreact (= 0.61.5)
214 
-  - ReactCommon/turbomodule/core (0.61.5):
237 
+    - React-cxxreact (= 0.62.2)
238 
+  - ReactCommon/turbomodule/core (0.62.2):
215 239 
     - DoubleConversion
216 240 
     - Folly (= 2018.10.22.00)
217 241 
     - glog
218 
-    - React-Core (= 0.61.5)
219 
-    - React-cxxreact (= 0.61.5)
220 
-    - React-jsi (= 0.61.5)
221 
-    - ReactCommon/jscallinvoker (= 0.61.5)
242 
+    - React-Core (= 0.62.2)
243 
+    - React-cxxreact (= 0.62.2)
244 
+    - React-jsi (= 0.62.2)
245 
+    - ReactCommon/callinvoker (= 0.62.2)
222 246 
   - Yoga (1.14.0)
223 247
224 248 
 DEPENDENCIES:
 
@@ -248,7 +272,7 @@ DEPENDENCIES:
248 272 
   - React-RCTSettings (from `../../node_modules/react-native/Libraries/Settings`)
249 273 
   - React-RCTText (from `../../node_modules/react-native/Libraries/Text`)
250 274 
   - React-RCTVibration (from `../../node_modules/react-native/Libraries/Vibration`)
251 
-  - ReactCommon/jscallinvoker (from `../../node_modules/react-native/ReactCommon`)
275 
+  - ReactCommon/callinvoker (from `../../node_modules/react-native/ReactCommon`)
252 276 
   - ReactCommon/turbomodule/core (from `../../node_modules/react-native/ReactCommon`)
253 277 
   - Yoga (from `../../node_modules/react-native/ReactCommon/yoga`)
254 278 
 
@@ -313,32 +337,32 @@ EXTERNAL SOURCES:
313 337 
 SPEC CHECKSUMS:
314 338 
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
315 339 
   DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
316 
-  FBLazyVector: aaeaf388755e4f29cd74acbc9e3b8da6d807c37f
317 
-  FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
340 
+  FBLazyVector: 4aab18c93cd9546e4bfed752b4084585eca8b245
341 
+  FBReactNativeSpec: 5465d51ccfeecb7faa12f9ae0024f2044ce4044e
318 342 
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
319 343 
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
320 
-  RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
321 
-  RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
322 
-  React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78
323 
-  React-Core: 688b451f7d616cc1134ac95295b593d1b5158a04
324 
-  React-CoreModules: d04f8494c1a328b69ec11db9d1137d667f916dcb
325 
-  React-cxxreact: d0f7bcafa196ae410e5300736b424455e7fb7ba7
326 
-  React-jsi: cb2cd74d7ccf4cffb071a46833613edc79cdf8f7
327 
-  React-jsiexecutor: d5525f9ed5f782fdbacb64b9b01a43a9323d2386
328 
-  React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0
329 
-  react-native-webview: 60d883f994e96a560756c14592552e02a06d604d
330 
-  React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
331 
-  React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
332 
-  React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72
333 
-  React-RCTImage: 6b8e8df449eb7c814c99a92d6b52de6fe39dea4e
334 
-  React-RCTLinking: 121bb231c7503cf9094f4d8461b96a130fabf4a5
335 
-  React-RCTNetwork: fb353640aafcee84ca8b78957297bd395f065c9a
336 
-  React-RCTSettings: 8db258ea2a5efee381fcf7a6d5044e2f8b68b640
337 
-  React-RCTText: 9ccc88273e9a3aacff5094d2175a605efa854dbe
338 
-  React-RCTVibration: a49a1f42bf8f5acf1c3e297097517c6b3af377ad
339 
-  ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
340 
-  Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
344 
+  RCTRequired: cec6a34b3ac8a9915c37e7e4ad3aa74726ce4035
345 
+  RCTTypeSafety: 93006131180074cffa227a1075802c89a49dd4ce
346 
+  React: 29a8b1a02bd764fb7644ef04019270849b9a7ac3
347 
+  React-Core: b12bffb3f567fdf99510acb716ef1abd426e0e05
348 
+  React-CoreModules: 4a9b87bbe669d6c3173c0132c3328e3b000783d0
349 
+  React-cxxreact: e65f9c2ba0ac5be946f53548c1aaaee5873a8103
350 
+  React-jsi: b6dc94a6a12ff98e8877287a0b7620d365201161
351 
+  React-jsiexecutor: 1540d1c01bb493ae3124ed83351b1b6a155db7da
352 
+  React-jsinspector: 512e560d0e985d0e8c479a54a4e5c147a9c83493
353 
+  react-native-webview: cf5527893252b3b036eea024a1da6996f7344c74
354 
+  React-RCTActionSheet: f41ea8a811aac770e0cc6e0ad6b270c644ea8b7c
355 
+  React-RCTAnimation: 49ab98b1c1ff4445148b72a3d61554138565bad0
356 
+  React-RCTBlob: a332773f0ebc413a0ce85942a55b064471587a71
357 
+  React-RCTImage: e70be9b9c74fe4e42d0005f42cace7981c994ac3
358 
+  React-RCTLinking: c1b9739a88d56ecbec23b7f63650e44672ab2ad2
359 
+  React-RCTNetwork: 73138b6f45e5a2768ad93f3d57873c2a18d14b44
360 
+  React-RCTSettings: 6e3738a87e21b39a8cb08d627e68c44acf1e325a
361 
+  React-RCTText: fae545b10cfdb3d247c36c56f61a94cfd6dba41d
362 
+  React-RCTVibration: 4356114dbcba4ce66991096e51a66e61eda51256
363 
+  ReactCommon: ed4e11d27609d571e7eee8b65548efc191116eb3
364 
+  Yoga: 3ebccbdd559724312790e7742142d062476b698e
341 365
342 
-PODFILE CHECKSUM: c2e136f84288494fa269d79892a8a1cf7acd7c71
366 
+PODFILE CHECKSUM: 767ae042fafc1aba97b301c58c340ff6f992aa27
343 367
344 
-COCOAPODS: 1.8.4
368 
+COCOAPODS: 1.9.1

+ 11
- 7
example/ios/example.xcodeproj/project.pbxproj View File 

@@ -16,7 +16,7 @@
16 16 
 		2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
17 17 
 		2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
18 18 
 		2DCD954D1E0B4F2C00145EB5 /* exampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* exampleTests.m */; };
19 
-		A08B6FFAAF3CA0F03003FEB0 /* libPods-example-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5544B310E076E06B9E2EFF4C /* libPods-example-tvOSTests.a */; };
19 
+		646BD8E8CDDF5A464B5419B3 /* libPods-example-tvOS-example-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4830F7139A954350DD22DE4A /* libPods-example-tvOS-example-tvOSTests.a */; };
20 20 
 		C7D826CF866C25BE421302B6 /* libPods-example-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F9A8A9F158876EC099CFA57A /* libPods-example-tvOS.a */; };
21 21 
 		D0E3313DFCE78BFCB650F812 /* libPods-exampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CB301596D47BBAD9E9C0A45A /* libPods-exampleTests.a */; };
22 22 
 		E719A6E171791CD8906B3D55 /* libPods-example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 917A19FC1EBE6E8B85FE404D /* libPods-example.a */; };
 
@@ -55,9 +55,10 @@
55 55 
 		2D02E4901E0B4A5D006451C7 /* example-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "example-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
56 56 
 		41B6A4553C4F552488B69B01 /* Pods-exampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-exampleTests.release.xcconfig"; path = "Target Support Files/Pods-exampleTests/Pods-exampleTests.release.xcconfig"; sourceTree = "<group>"; };
57 57 
 		4372A2FD2D749DE5C9FD8D3E /* Pods-example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.debug.xcconfig"; path = "Target Support Files/Pods-example/Pods-example.debug.xcconfig"; sourceTree = "<group>"; };
58 
+		4830F7139A954350DD22DE4A /* libPods-example-tvOS-example-tvOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example-tvOS-example-tvOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
58 59 
 		4FDD34C422D711AC8A7B10A7 /* Pods-example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.release.xcconfig"; path = "Target Support Files/Pods-example/Pods-example.release.xcconfig"; sourceTree = "<group>"; };
59 
-		5544B310E076E06B9E2EFF4C /* libPods-example-tvOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example-tvOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
60 60 
 		59A4F27CAD1B7EFE80917453 /* Pods-example-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-example-tvOSTests/Pods-example-tvOSTests.release.xcconfig"; sourceTree = "<group>"; };
61 
+		6517B8E7187010A1D58A96EE /* Pods-example-tvOS-example-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS-example-tvOSTests.debug.xcconfig"; path = "Target Support Files/Pods-example-tvOS-example-tvOSTests/Pods-example-tvOS-example-tvOSTests.debug.xcconfig"; sourceTree = "<group>"; };
61 62 
 		775F6B7492793F5DB7ECE95B /* Pods-example-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-example-tvOS/Pods-example-tvOS.debug.xcconfig"; sourceTree = "<group>"; };
62 63 
 		8A20011E75A0AD2EC5C6EAE9 /* Pods-exampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-exampleTests.debug.xcconfig"; path = "Target Support Files/Pods-exampleTests/Pods-exampleTests.debug.xcconfig"; sourceTree = "<group>"; };
63 64 
 		917A19FC1EBE6E8B85FE404D /* libPods-example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 
@@ -65,6 +66,7 @@
65 66 
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
66 67 
 		ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
67 68 
 		EDF80BE96CF92848F4E926EA /* Pods-example-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS.release.xcconfig"; path = "Target Support Files/Pods-example-tvOS/Pods-example-tvOS.release.xcconfig"; sourceTree = "<group>"; };
69 
+		EE3925F4209E17ECF3E692D1 /* Pods-example-tvOS-example-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS-example-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-example-tvOS-example-tvOSTests/Pods-example-tvOS-example-tvOSTests.release.xcconfig"; sourceTree = "<group>"; };
68 70 
 		F67BC8D73DE103BA10A5488D /* Pods-example-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOSTests.debug.xcconfig"; path = "Target Support Files/Pods-example-tvOSTests/Pods-example-tvOSTests.debug.xcconfig"; sourceTree = "<group>"; };
69 71 
 		F9A8A9F158876EC099CFA57A /* libPods-example-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
70 72 
 /* End PBXFileReference section */
 
@@ -98,7 +100,7 @@
98 100 
 			isa = PBXFrameworksBuildPhase;
99 101 
 			buildActionMask = 2147483647;
100 102 
 			files = (
101 
-				A08B6FFAAF3CA0F03003FEB0 /* libPods-example-tvOSTests.a in Frameworks */,
103 
+				646BD8E8CDDF5A464B5419B3 /* libPods-example-tvOS-example-tvOSTests.a in Frameworks */,
102 104 
 			);
103 105 
 			runOnlyForDeploymentPostprocessing = 0;
104 106 
 		};
 
@@ -143,8 +145,8 @@
143 145 
 				ED2971642150620600B7C4FE /* JavaScriptCore.framework */,
144 146 
 				917A19FC1EBE6E8B85FE404D /* libPods-example.a */,
145 147 
 				F9A8A9F158876EC099CFA57A /* libPods-example-tvOS.a */,
146 
-				5544B310E076E06B9E2EFF4C /* libPods-example-tvOSTests.a */,
147 148 
 				CB301596D47BBAD9E9C0A45A /* libPods-exampleTests.a */,
149 
+				4830F7139A954350DD22DE4A /* libPods-example-tvOS-example-tvOSTests.a */,
148 150 
 			);
149 151 
 			name = Frameworks;
150 152 
 			sourceTree = "<group>";
 
@@ -193,6 +195,8 @@
193 195 
 				59A4F27CAD1B7EFE80917453 /* Pods-example-tvOSTests.release.xcconfig */,
194 196 
 				8A20011E75A0AD2EC5C6EAE9 /* Pods-exampleTests.debug.xcconfig */,
195 197 
 				41B6A4553C4F552488B69B01 /* Pods-exampleTests.release.xcconfig */,
198 
+				6517B8E7187010A1D58A96EE /* Pods-example-tvOS-example-tvOSTests.debug.xcconfig */,
199 
+				EE3925F4209E17ECF3E692D1 /* Pods-example-tvOS-example-tvOSTests.release.xcconfig */,
196 200 
 			);
197 201 
 			path = Pods;
198 202 
 			sourceTree = "<group>";
 
@@ -402,7 +406,7 @@
402 406 
 			outputFileListPaths = (
403 407 
 			);
404 408 
 			outputPaths = (
405 
-				"$(DERIVED_FILE_DIR)/Pods-example-tvOSTests-checkManifestLockResult.txt",
409 
+				"$(DERIVED_FILE_DIR)/Pods-example-tvOS-example-tvOSTests-checkManifestLockResult.txt",
406 410 
 			);
407 411 
 			runOnlyForDeploymentPostprocessing = 0;
408 412 
 			shellPath = /bin/sh;
 
@@ -718,7 +722,7 @@
718 722 
 		};
719 723 
 		2D02E4991E0B4A5E006451C7 /* Debug */ = {
720 724 
 			isa = XCBuildConfiguration;
721 
-			baseConfigurationReference = F67BC8D73DE103BA10A5488D /* Pods-example-tvOSTests.debug.xcconfig */;
725 
+			baseConfigurationReference = 6517B8E7187010A1D58A96EE /* Pods-example-tvOS-example-tvOSTests.debug.xcconfig */;
722 726 
 			buildSettings = {
723 727 
 				BUNDLE_LOADER = "$(TEST_HOST)";
724 728 
 				CLANG_ANALYZER_NONNULL = YES;
 
@@ -745,7 +749,7 @@
745 749 
 		};
746 750 
 		2D02E49A1E0B4A5E006451C7 /* Release */ = {
747 751 
 			isa = XCBuildConfiguration;
748 
-			baseConfigurationReference = 59A4F27CAD1B7EFE80917453 /* Pods-example-tvOSTests.release.xcconfig */;
752 
+			baseConfigurationReference = EE3925F4209E17ECF3E692D1 /* Pods-example-tvOS-example-tvOSTests.release.xcconfig */;
749 753 
 			buildSettings = {
750 754 
 				BUNDLE_LOADER = "$(TEST_HOST)";
751 755 
 				CLANG_ANALYZER_NONNULL = YES;

+ 2
- 43
example/ios/example.xcodeproj/xcshareddata/xcschemes/example-tvOS.xcscheme View File 

@@ -1,25 +1,11 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 2 
 <Scheme
3 
-   LastUpgradeVersion = "0940"
3 
+   LastUpgradeVersion = "1130"
4 4 
    version = "1.3">
5 5 
    <BuildAction
6 
-      parallelizeBuildables = "NO"
6 
+      parallelizeBuildables = "YES"
7 7 
       buildImplicitDependencies = "YES">
8 8 
       <BuildActionEntries>
9 
-         <BuildActionEntry
10 
-            buildForTesting = "YES"
11 
-            buildForRunning = "YES"
12 
-            buildForProfiling = "YES"
13 
-            buildForArchiving = "YES"
14 
-            buildForAnalyzing = "YES">
15 
-            <BuildableReference
16 
-               BuildableIdentifier = "primary"
17 
-               BlueprintIdentifier = "2D2A28121D9B038B00D4039D"
18 
-               BuildableName = "libReact.a"
19 
-               BlueprintName = "React-tvOS"
20 
-               ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
21 
-            </BuildableReference>
22 
-         </BuildActionEntry>
23 9 
          <BuildActionEntry
24 10 
             buildForTesting = "YES"
25 11 
             buildForRunning = "YES"
 
@@ -34,20 +20,6 @@
34 20 
                ReferencedContainer = "container:example.xcodeproj">
35 21 
             </BuildableReference>
36 22 
          </BuildActionEntry>
37 
-         <BuildActionEntry
38 
-            buildForTesting = "YES"
39 
-            buildForRunning = "YES"
40 
-            buildForProfiling = "NO"
41 
-            buildForArchiving = "NO"
42 
-            buildForAnalyzing = "YES">
43 
-            <BuildableReference
44 
-               BuildableIdentifier = "primary"
45 
-               BlueprintIdentifier = "2D02E48F1E0B4A5D006451C7"
46 
-               BuildableName = "example-tvOSTests.xctest"
47 
-               BlueprintName = "example-tvOSTests"
48 
-               ReferencedContainer = "container:example.xcodeproj">
49 
-            </BuildableReference>
50 
-         </BuildActionEntry>
51 23 
       </BuildActionEntries>
52 24 
    </BuildAction>
53 25 
    <TestAction
 
@@ -67,17 +39,6 @@
67 39 
             </BuildableReference>
68 40 
          </TestableReference>
69 41 
       </Testables>
70 
-      <MacroExpansion>
71 
-         <BuildableReference
72 
-            BuildableIdentifier = "primary"
73 
-            BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
74 
-            BuildableName = "example-tvOS.app"
75 
-            BlueprintName = "example-tvOS"
76 
-            ReferencedContainer = "container:example.xcodeproj">
77 
-         </BuildableReference>
78 
-      </MacroExpansion>
79 
-      <AdditionalOptions>
80 
-      </AdditionalOptions>
81 42 
    </TestAction>
82 43 
    <LaunchAction
83 44 
       buildConfiguration = "Debug"
 
@@ -99,8 +60,6 @@
99 60 
             ReferencedContainer = "container:example.xcodeproj">
100 61 
          </BuildableReference>
101 62 
       </BuildableProductRunnable>
102 
-      <AdditionalOptions>
103 
-      </AdditionalOptions>
104 63 
    </LaunchAction>
105 64 
    <ProfileAction
106 65 
       buildConfiguration = "Release"

+ 2
- 43
example/ios/example.xcodeproj/xcshareddata/xcschemes/example.xcscheme View File 

@@ -1,25 +1,11 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 2 
 <Scheme
3 
-   LastUpgradeVersion = "0940"
3 
+   LastUpgradeVersion = "1130"
4 4 
    version = "1.3">
5 5 
    <BuildAction
6 
-      parallelizeBuildables = "NO"
6 
+      parallelizeBuildables = "YES"
7 7 
       buildImplicitDependencies = "YES">
8 8 
       <BuildActionEntries>
9 
-         <BuildActionEntry
10 
-            buildForTesting = "YES"
11 
-            buildForRunning = "YES"
12 
-            buildForProfiling = "YES"
13 
-            buildForArchiving = "YES"
14 
-            buildForAnalyzing = "YES">
15 
-            <BuildableReference
16 
-               BuildableIdentifier = "primary"
17 
-               BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
18 
-               BuildableName = "libReact.a"
19 
-               BlueprintName = "React"
20 
-               ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
21 
-            </BuildableReference>
22 
-         </BuildActionEntry>
23 9 
          <BuildActionEntry
24 10 
             buildForTesting = "YES"
25 11 
             buildForRunning = "YES"
 
@@ -34,20 +20,6 @@
34 20 
                ReferencedContainer = "container:example.xcodeproj">
35 21 
             </BuildableReference>
36 22 
          </BuildActionEntry>
37 
-         <BuildActionEntry
38 
-            buildForTesting = "YES"
39 
-            buildForRunning = "YES"
40 
-            buildForProfiling = "NO"
41 
-            buildForArchiving = "NO"
42 
-            buildForAnalyzing = "YES">
43 
-            <BuildableReference
44 
-               BuildableIdentifier = "primary"
45 
-               BlueprintIdentifier = "00E356ED1AD99517003FC87E"
46 
-               BuildableName = "exampleTests.xctest"
47 
-               BlueprintName = "exampleTests"
48 
-               ReferencedContainer = "container:example.xcodeproj">
49 
-            </BuildableReference>
50 
-         </BuildActionEntry>
51 23 
       </BuildActionEntries>
52 24 
    </BuildAction>
53 25 
    <TestAction
 
@@ -67,17 +39,6 @@
67 39 
             </BuildableReference>
68 40 
          </TestableReference>
69 41 
       </Testables>
70 
-      <MacroExpansion>
71 
-         <BuildableReference
72 
-            BuildableIdentifier = "primary"
73 
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
74 
-            BuildableName = "example.app"
75 
-            BlueprintName = "example"
76 
-            ReferencedContainer = "container:example.xcodeproj">
77 
-         </BuildableReference>
78 
-      </MacroExpansion>
79 
-      <AdditionalOptions>
80 
-      </AdditionalOptions>
81 42 
    </TestAction>
82 43 
    <LaunchAction
83 44 
       buildConfiguration = "Debug"
 
@@ -99,8 +60,6 @@
99 60 
             ReferencedContainer = "container:example.xcodeproj">
100 61 
          </BuildableReference>
101 62 
       </BuildableProductRunnable>
102 
-      <AdditionalOptions>
103 
-      </AdditionalOptions>
104 63 
    </LaunchAction>
105 64 
    <ProfileAction
106 65 
       buildConfiguration = "Release"

+ 1
- 0
example/windows/WebViewWindows.sln View File 

@@ -55,6 +55,7 @@ Global
55 55 
 		..\..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
56 56 
 		..\..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
57 57 
 		..\..\node_modules\react-native-windows\JSI\Shared\JSI.Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
58 
+		..\..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
58 59 
 		..\..\node_modules\react-native-windows\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
59 60 
 		..\..\node_modules\react-native-windows\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
60 61 
 	EndGlobalSection

+ 0
- 5
example/windows/WebViewWindows/App.cpp View File 

@@ -37,11 +37,6 @@ App::App() noexcept
37 37 
     PackageProviders().Append(winrt::ReactNativeWebView::ReactPackageProvider());
38 38
39 39 
     InitializeComponent();
40 
-
41 
-    // This works around a cpp/winrt bug with composable/aggregable types tracked
42 
-    // by 22116519
43 
-    AddRef();
44 
-    m_inner.as<::IUnknown>()->Release();
45 40 
 }
46 41
47 42

+ 3
- 4
example/windows/WebViewWindows/WebViewWindows.vcxproj View File 

@@ -161,12 +161,11 @@
161 161 
   </ItemGroup>
162 162 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
163 163 
   <PropertyGroup>
164 
-    <BundleCommand>
165 
-      cd $(SolutionDir)..\..
166 
-      npx react-native bundle --platform windows --entry-file example/index.js --bundle-output example/windows/WebViewWindows/Bundle/index.windows.bundle --assets-dest example/windows/WebViewWindows/Bundle --use-react-native-windows
167 
-    </BundleCommand>
164 
+    <BundleEntryFile>example/index.js</BundleEntryFile>
165 
+    <BundlerExtraArgs>--use-react-native-windows</BundlerExtraArgs>
168 166 
   </PropertyGroup>
169 167 
   <Import Project="..\..\..\node_modules\react-native-windows\PropertySheets\Bundle.Cpp.targets" />
168 
+  <Import Project="..\..\..\node_modules\react-native-windows\PropertySheets\Bundle.props" />
170 169 
   <ImportGroup Label="ExtensionTargets">
171 170 
     <Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
172 171 
     <Import Project="$(SolutionDir)packages\Microsoft.UI.Xaml.2.3.191129002\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.UI.Xaml.2.3.191129002\build\native\Microsoft.UI.Xaml.targets')" />

+ 14
- 14
package.json View File 

@@ -12,8 +12,8 @@
12 12 
   "homepage": "https://github.com/react-native-community/react-native-webview#readme",
13 13 
   "scripts": {
14 14 
     "start": "node node_modules/react-native/local-cli/cli.js start",
15 
-    "start:android": "react-native run-android --root example/",
16 
-    "start:ios": "react-native run-ios --project-path example/ios --scheme example",
15 
+    "start:android": "react-native run-android",
16 
+    "start:ios": "react-native run-ios",
17 17 
     "start:macos": "node node_modules/react-native-macos/local-cli/cli.js start --use-react-native-macos",
18 18 
     "start:windows": "react-native start --use-react-native-windows",
19 19 
     "ci": "CI=true && yarn lint",

@@ -29,8 +29,8 @@
29 29 
     "type": "Component"
30 30 
   },
31 31 
   "peerDependencies": {
32 
-    "react": "^16.9",
33 
-    "react-native": ">=0.60 <0.62"
32 
+    "react": "16.11.0",
33 
+    "react-native": ">=0.60 <0.63"
34 34 
   },
35 35 
   "dependencies": {
36 36 
     "escape-string-regexp": "2.0.0",

@@ -39,14 +39,14 @@
39 39 
   "devDependencies": {
40 40 
     "@babel/core": "7.4.5",
41 41 
     "@babel/runtime": "7.4.5",
42 
-    "@react-native-community/cli": "^3.2.0",
43 
-    "@react-native-community/cli-platform-android": "^3.0.0",
44 
-    "@react-native-community/cli-platform-ios": "^3.0.0",
42 
+    "@react-native-community/cli": "^4.8.0",
43 
+    "@react-native-community/cli-platform-android": "^4.8.0",
44 
+    "@react-native-community/cli-platform-ios": "^4.8.0",
45 45 
     "@semantic-release/git": "7.0.16",
46 46 
     "@types/invariant": "^2.2.30",
47 47 
     "@types/jest": "24.0.18",
48 
-    "@types/react": "16.8.8",
49 
-    "@types/react-native": "0.60.11",
48 
+    "@types/react": "16.9.34",
49 
+    "@types/react-native": "0.62.5",
50 50 
     "@types/selenium-webdriver": "4.0.9",
51 51 
     "@typescript-eslint/eslint-plugin": "2.1.0",
52 52 
     "@typescript-eslint/parser": "2.1.0",

@@ -62,13 +62,13 @@
62 62 
     "eslint-plugin-react-native": "3.7.0",
63 63 
     "jest": "24.9.0",
64 64 
     "metro": "0.56.4",
65 
-    "metro-react-native-babel-preset": "0.54.1",
66 
-    "react": "16.9.0",
67 
-    "react-native": "0.61.5",
65 
+    "metro-react-native-babel-preset": "^0.59.0",
66 
+    "react": "16.11.0",
67 
+    "react-native": "0.62.2",
68 68 
     "react-native-macos": "0.60.0-microsoft.73",
69 
-    "react-native-windows": "0.61.5",
69 
+    "react-native-windows": "^0.62.0-0",
70 70 
     "semantic-release": "15.13.24",
71 
-    "typescript": "3.6.2",
71 
+    "typescript": "3.8.3",
72 72 
     "appium": "1.17.0",
73 73 
     "selenium-appium": "0.0.15",
74 74 
     "selenium-webdriver": "4.0.0-alpha.7"

+ 14
- 0
react-native.config.js View File 

@@ -15,6 +15,8 @@
15 15 
  */
16 16 
 'use strict';
17 17
18 
+const path = require('path');
19 
+
18 20 
 const macSwitch = '--use-react-native-macos';
19 21 
 const windowsSwitch = '--use-react-native-windows';
20 22 
 
@@ -31,4 +33,16 @@ else if (process.argv.includes(windowsSwitch)) {
31 33 
   module.exports = {
32 34 
     reactNativePath: 'node_modules/react-native-windows',
33 35 
   };
36 
+}
37 
+else {
38 
+  module.exports = {
39 
+    project: {
40 
+      ios: {
41 
+        project: 'example/ios/',
42 
+      },
43 
+      android: {
44 
+        sourceDir: 'example/android',
45 
+      },
46 
+    },
47 
+  };
34 48 
 }

+ 18
- 3
src/WebView.tsx View File 

@@ -1,5 +1,20 @@
1 
-// This files provides compatibility without tree platform.
2 
-import { WebView } from 'react-native';
1 
+import React from 'react';
2 
+import { View } from 'react-native';
3 
+import { IOSWebViewProps, AndroidWebViewProps } from './WebViewTypes';
4 
+
5 
+export type WebViewProps = IOSWebViewProps & AndroidWebViewProps;
6 
+
7 
+// This "dummy" WebView is to render something for unsupported platforms,
8 
+// like for example Expo SDK "web" platform. It matches the previous react-native
9 
+// implementation which is produced by Expo SDK 37.0.0.1 implementation, with
10 
+// similar interface than the native ones have.
11 
+const WebView: React.FunctionComponent<WebViewProps> = () => (
12 
+	<View style={{
13 
+		alignSelf: 'flex-start',
14 
+		borderColor: 'rgb(255, 0, 0)',
15 
+		borderWidth: 1
16 
+	}} />
17 
+);
3 18
4 19 
 export { WebView };
5 
-export default WebView;
20 
+export default WebView;

+ 26
- 28
windows/ReactNativeWebView/ReactWebViewManager.cpp View File 

@@ -101,42 +101,40 @@ namespace winrt::ReactNativeWebView::implementation {
101 101 
     }
102 102
103 103 
     // IViewManagerWithCommands
104 
-    IMapView<hstring, int64_t> ReactWebViewManager::Commands() noexcept {
105 
-        auto commands = winrt::single_threaded_map<hstring, int64_t>();
106 
-        commands.Insert(L"goForward", static_cast<int32_t>(WebViewCommands::GoForward));
107 
-        commands.Insert(L"goBack", static_cast<int32_t>(WebViewCommands::GoBack));
108 
-        commands.Insert(L"reload", static_cast<int32_t>(WebViewCommands::Reload));
109 
-        commands.Insert(L"stopLoading", static_cast<int32_t>(WebViewCommands::StopLoading));
110 
-        commands.Insert(L"injectJavaScript", static_cast<int32_t>(WebViewCommands::InjectJavaScript));
104 
+    IVectorView<hstring> ReactWebViewManager::Commands() noexcept {
105 
+        auto commands = winrt::single_threaded_vector<hstring>();
106 
+        commands.Append(L"goForward");
107 
+        commands.Append(L"goBack");
108 
+        commands.Append(L"reload");
109 
+        commands.Append(L"stopLoading");
110 
+        commands.Append(L"injectJavaScript");
111 111 
         return commands.GetView();
112 112 
     }
113 113
114 114 
     void ReactWebViewManager::DispatchCommand(
115 115 
         FrameworkElement const& view,
116 
-        int64_t commandId,
116 
+        winrt::hstring const& commandId,
117 117 
         winrt::IJSValueReader const& commandArgsReader) noexcept {
118 118 
         auto commandArgs = JSValue::ReadArrayFrom(commandArgsReader);
119 119 
         if (auto webView = view.try_as<winrt::WebView>()) {
120 
-            switch (commandId) {
121 
-                case static_cast<int64_t>(WebViewCommands::GoForward) :
122 
-                    if (webView.CanGoForward()) {
123 
-                        webView.GoForward();
124 
-                    }
125 
-                    break;
126 
-                case static_cast<int64_t>(WebViewCommands::GoBack) :
127 
-                    if (webView.CanGoBack()) {
128 
-                        webView.GoBack();
129 
-                    }
130 
-                    break;
131 
-                case static_cast<int64_t>(WebViewCommands::Reload) :
132 
-                    webView.Refresh();
133 
-                    break;
134 
-                case static_cast<int64_t>(WebViewCommands::StopLoading) :
135 
-                    webView.Stop();
136 
-                    break;
137 
-                case static_cast<int64_t>(WebViewCommands::InjectJavaScript) :
138 
-                    webView.InvokeScriptAsync(L"eval", { winrt::to_hstring(commandArgs[0].AsString()) });
139 
-                    break;
120 
+            if (commandId == L"goForward") {
121 
+                if (webView.CanGoForward()) {
122 
+                    webView.GoForward();
123 
+                }
124 
+            }
125 
+            else if (commandId == L"goBack") {
126 
+                if (webView.CanGoBack()) {
127 
+                    webView.GoBack();
128 
+                }
129 
+            }
130 
+            else if (commandId == L"reload") {
131 
+                webView.Refresh();
132 
+            }
133 
+            else if (commandId == L"stopLoading") {
134 
+                webView.Stop();
135 
+            }
136 
+            else if (commandId == L"injectJavaScript") {
137 
+                webView.InvokeScriptAsync(L"eval", { winrt::to_hstring(commandArgs[0].AsString()) });
140 138 
             }
141 139 
         }
142 140 
     }

+ 2
- 4
windows/ReactNativeWebView/ReactWebViewManager.h View File 

@@ -8,8 +8,6 @@
8 8
9 9 
 namespace winrt::ReactNativeWebView::implementation {
10 10
11 
-    enum class WebViewCommands : int32_t { GoForward = 0, GoBack = 1,  Reload = 2, StopLoading = 3, InjectJavaScript = 4 };
12 
-
13 11 
     class ReactWebViewManager : public winrt::implements<
14 12 
         ReactWebViewManager,
15 13 
         winrt::Microsoft::ReactNative::IViewManager,
 
@@ -41,11 +39,11 @@ namespace winrt::ReactNativeWebView::implementation {
41 39 
         winrt::Microsoft::ReactNative::ConstantProviderDelegate ExportedCustomDirectEventTypeConstants() noexcept;
42 40
43 41 
         // IViewManagerWithCommands
44 
-        winrt::Windows::Foundation::Collections::IMapView<winrt::hstring, int64_t> Commands() noexcept;
42 
+        winrt::Windows::Foundation::Collections::IVectorView<winrt::hstring> Commands() noexcept;
45 43
46 44 
         void DispatchCommand(
47 45 
             winrt::Windows::UI::Xaml::FrameworkElement const& view,
48 
-            int64_t commandId,
46 
+            winrt::hstring const& commandId,
49 47 
             winrt::Microsoft::ReactNative::IJSValueReader const& commandArgsReader) noexcept;
50 48
51 49 
     private:

+ 1403
- 2137
yarn.lock
File diff suppressed because it is too large
View File