Merge commit '118663287acec269203c3850891cf145dc12f06e' into shirakaba/animated-support

* commit '118663287acec269203c3850891cf145dc12f06e':
  chore(release): 8.1.1 [skip ci]
  fix(Android): Don't show camera options for a file upload when they can not be used (react-native-webview#1210)
  chore(docs): Fix Getting Started Guide link in Breaking History (react-native-webview#1213)
  chore(docs): Update Android assets path (react-native-webview#1173)
  chore(docs): Update cookie links (react-native-webview#1149)
  chore(Android): Convert RNCWebViewPackage to Kotlin (react-native-webview#1194)
  chore(release): 8.1.0 [skip ci]
  feat(macOS): macOS Support (react-native-webview#1164)

Author: shirakaba

README.md

@@ -20,6 +20,7 @@ _This project is maintained for free by these people using both their free time
 
 - [x] iOS
 - [x] Android
+- [x] macOS
 
 _Note: Expo support for React Native WebView started with [Expo SDK v33.0.0](https://blog.expo.io/expo-sdk-v33-0-0-is-now-available-52d1c99dfe4c)._
 

android/build.gradle

@@ -123,6 +123,6 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 
 dependencies {
   //noinspection GradleDynamicVersion
-  api 'com.facebook.react:react-native:+'
+  implementation 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

android/src/main/java/com/reactnativecommunity/webview/RNCWebViewModule.java

@@ -32,6 +32,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import static android.app.Activity.RESULT_OK;
 
@@ -180,11 +181,13 @@ public boolean startPhotoPickerIntent(final ValueCallback<Uri[]> callback, final
     filePathCallback = callback;
 
     ArrayList<Parcelable> extraIntents = new ArrayList<>();
-    if (acceptsImages(acceptTypes)) {
-      extraIntents.add(getPhotoIntent());
-    }
-    if (acceptsVideo(acceptTypes)) {
-      extraIntents.add(getVideoIntent());
+    if (! needsCameraPermission()) {
+      if (acceptsImages(acceptTypes)) {
+        extraIntents.add(getPhotoIntent());
+      }
+      if (acceptsVideo(acceptTypes)) {
+        extraIntents.add(getVideoIntent());
+      }
     }
 
     Intent fileSelectionIntent = getFileChooserIntent(acceptTypes, allowMultiple);
@@ -233,6 +236,23 @@ public boolean grantFileDownloaderPermissions() {
     return result;
   }
 
+  protected boolean needsCameraPermission() {
+    boolean needed = false;
+
+    PackageManager packageManager = getCurrentActivity().getPackageManager();
+    try {
+      String[] requestedPermissions = packageManager.getPackageInfo(getReactApplicationContext().getPackageName(), PackageManager.GET_PERMISSIONS).requestedPermissions;
+      if (Arrays.asList(requestedPermissions).contains(Manifest.permission.CAMERA)
+        && ContextCompat.checkSelfPermission(getCurrentActivity(), Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+        needed = true;
+      }
+    } catch (PackageManager.NameNotFoundException e) {
+      needed = true;
+    }
+
+    return needed;
+  }
+
   private Intent getPhotoIntent() {
     Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
     outputFileUri = getOutputUri(MediaStore.ACTION_IMAGE_CAPTURE);

android/src/main/java/com/reactnativecommunity/webview/RNCWebViewPackage.java

@@ -0,0 +1,15 @@
+package com.reactnativecommunity.webview
+
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.ReactApplicationContext
+
+
+class RNCWebViewPackage: ReactPackage {
+  override fun createNativeModules(reactContext: ReactApplicationContext) = listOf(
+    RNCWebViewModule(reactContext)
+  )
+
+  override fun createViewManagers(reactContext: ReactApplicationContext) = listOf(
+    RNCWebViewManager()
+  )
+}

android/src/main/java/com/reactnativecommunity/webview/RNCWebViewPackage.kt

@@ -8,6 +8,44 @@ Secondly, we'd like the contribution experience to be as good as possible. While
 
 After you fork the repo, clone it to your machine, and make your changes, you'll want to test them in an app.
 
+There are two methods of testing:
+1) Testing within a clone of react-native-webview
+2) Testing in a new `react-native init` project
+
+### Testing within react-native-webview
+
+#### For all platforms:
+```
+$ yarn install
+```
+
+#### For Android:
+```
+$ yarn start:android
+```
+
+The Android example app will built, the Metro Bundler will launch, and the example app will be installed and started in the Android emulator.
+
+#### For iOS:
+```
+$ cd example/ios
+$ pod install
+$ cd ../..
+$ yarn start:ios
+```
+
+The iOS example app will be built, the Metro bundler will launch, and the example app will be install and started in the Simulator.
+
+#### for macOS:
+```
+$ open example/macos/example.xcodeproj
+$ yarn start:macos
+```
+
+The Metro Bundler will now be running in the Terminal for react-native-macos.  In XCode select the `example-macos` target and Run.
+
+### Testing in a new `react-native init` project
+
 In a new `react-native init` project, do this:
 
 ```

docs/Contributing.md

@@ -2,7 +2,7 @@
 
 Here's how to get started quickly with the React Native WebView.
 
-#### 1. Add react-native-webview to your dependencies
+## 1. Add react-native-webview to your dependencies
 
 ```
 $ yarn add react-native-webview
@@ -14,7 +14,7 @@ $ yarn add react-native-webview
 $ npm install --save react-native-webview
 ```
 
-#### 2. Link native dependencies
+## 2. Link native dependencies
 
 From react-native 0.60 autolinking will take care of the link step but don't forget to run `pod install`
 
@@ -24,13 +24,20 @@ React Native modules that include native Objective-C, Swift, Java, or Kotlin cod
 $ react-native link react-native-webview
 ```
 
-iOS:
+_NOTE: If you ever need to uninstall React Native WebView, run `react-native unlink react-native-webview` to unlink it._
+
+### iOS:
 
 If using cocoapods in the `ios/` directory run
 ```
 $ pod install
 ```
 
+For iOS, while you can manually link the old way using [react-native own tutorial](https://facebook.github.io/react-native/docs/linking-libraries-ios), we find it easier to use cocoapods.
+If you wish to use cocoapods and haven't set it up yet, please instead refer to [that article](https://engineering.brigad.co/demystifying-react-native-modules-linking-ae6c017a6b4a).
+
+### Android:
+
 Android - react-native-webview version <6:
 This module does not require any extra step after running the link command 🎉
 
@@ -44,12 +51,13 @@ android.enableJetifier=true
 
 For Android manual installation, please refer to [this article](https://engineering.brigad.co/demystifying-react-native-modules-linking-964399ec731b) where you can find detailed step on how to link any react-native project.
 
-For iOS, while you can manually link the old way using [react-native own tutorial](https://facebook.github.io/react-native/docs/linking-libraries-ios), we find it easier to use cocoapods.
-If you wish to use cocoapods and haven't set it up yet, please instead refer to [that article](https://engineering.brigad.co/demystifying-react-native-modules-linking-ae6c017a6b4a).
+### macOS:
 
-_NOTE: If you ever need to uninstall React Native WebView, run `react-native unlink react-native-webview` to unlink it._
+Cocoapod and autolinking is not yet support for react-native macOS but is coming soon.  In the meantime you must manually link.
+
+The method is nearly identical to the [manual linking method for iOS](https://facebook.github.io/react-native/docs/linking-libraries-ios#manual-linking) except that you will include the `node_modules/react-native-webview/macos/RNCWebView.xcodeproj` project in your main project and link the `RNCWebView-macOS.a` library. 
 
-#### 3. Import the webview into your component
+## 3. Import the webview into your component
 
 ```js
 import React, { Component } from 'react';

docs/Getting-Started.md

@@ -74,7 +74,7 @@ class MyWeb extends Component {
 }
 ```
 
-However on Android, you need to place the HTML file inside your android project's asset directory. For example, if `local-site.html` is your HTML file and you'd like to load it into the webview, you should move the file to your project's android asset directory which is `your-project/android/src/main/assets/`. Then you can load the html file as shown in the following code block
+However on Android, you need to place the HTML file inside your android project's asset directory. For example, if `local-site.html` is your HTML file and you'd like to load it into the webview, you should move the file to your project's android asset directory which is `your-project/android/app/src/main/assets/`. Then you can load the html file as shown in the following code block
 
 ```js
 import React, { Component } from 'react';
@@ -191,6 +191,12 @@ Add permission in AndroidManifest.xml:
 </manifest>
 ```
 
+###### Camera option availability in uploading for Android
+
+If the file input indicates that images or video is desired with [`accept`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/file#accept), then the WebView will attempt to provide options to the user to use their camera to take a picture or video.
+
+Normally, apps that do not have permission to use the camera can prompt the user to use an external app so that the requesting app has no need for permission. However, Android has made a special exception for this around the camera to reduce confusion for users. If an app *can* request the camera permission because it has been declared, and the user has not granted the permission, it may not fire an intent that would use the camera (`MediaStore.ACTION_IMAGE_CAPTURE` or `MediaStore.ACTION_VIDEO_CAPTURE`). In this scenario, it is up to the developer to request camera permission before a file upload directly using the camera is necessary.
+
 ##### Check for File Upload support, with `static isFileUploadSupported()`
 
 File Upload using `<input type="file" />` is not supported for Android 4.4 KitKat (see [details](https://github.com/delight-im/Android-AdvancedWebView/issues/4#issuecomment-70372146)):
@@ -301,7 +307,7 @@ _Under the hood_
 
 #### The `injectedJavaScriptBeforeContentLoaded` prop
 
-This is a script that runs **before** the web page loads for the first time. It only runs once, even if the page is reloaded or navigated away. This is useful if you want to inject anything into the window, localstorage, or document prior to the web code executing. 
+This is a script that runs **before** the web page loads for the first time. It only runs once, even if the page is reloaded or navigated away. This is useful if you want to inject anything into the window, localstorage, or document prior to the web code executing.
 
 ```jsx
 import React, { Component } from 'react';
@@ -329,7 +335,7 @@ export default class App extends Component {
 }
 ```
 
-This runs the JavaScript in the `runFirst` string before the page is loaded. In this case, the value of `window.isNativeApp` will be set to true before the web code executes. 
+This runs the JavaScript in the `runFirst` string before the page is loaded. In this case, the value of `window.isNativeApp` will be set to true before the web code executes.
 
 #### The `injectJavaScript` method
 
@@ -475,7 +481,7 @@ const CustomHeaderWebView = props => {
 
 #### Managing Cookies
 
-You can set cookies on the React Native side using the [react-native-cookies](https://github.com/joeferraro/react-native-cookies) package.
+You can set cookies on the React Native side using the [@react-native-community/cookies](https://github.com/react-native-community/cookies) package.
 
 When you do, you'll likely want to enable the [sharedCookiesEnabled](Reference#sharedCookiesEnabled) prop as well.
 

docs/Guide.md

@@ -36,7 +36,7 @@ Versão atual: ![version](https://img.shields.io/npm/v/react-native-webview.svg)
 
 - [7.0.1](https://github.com/react-native-community/react-native-webview/releases/tag/v7.0.1) - UIWebView removido
 
-- [6.0.**2**](https://github.com/react-native-community/react-native-webview/releases/tag/v6.0.2) - Update para AndroidX. Tenha certeza de habilitar no `android/gradle.properties` do seu projeto. Veja o [Getting Started Guide](docs/Getting-Started.md).
+- [6.0.**2**](https://github.com/react-native-community/react-native-webview/releases/tag/v6.0.2) - Update para AndroidX. Tenha certeza de habilitar no `android/gradle.properties` do seu projeto. Veja o [Getting Started Guide](https://github.com/react-native-community/react-native-webview/blob/master/docs/Getting-Started.md).
 
 - [5.0.**1**](https://github.com/react-native-community/react-native-webview/releases/tag/v5.0.0) - Refatorou a antiga implementação postMessage para comunicação da visualização da webview para nativa.
 - [4.0.0](https://github.com/react-native-community/react-native-webview/releases/tag/v4.0.0) - Cache adicionada(habilitada por padrão).

docs/README.portuguese.md

@@ -474,9 +474,9 @@ Note that this method will not be invoked on hash URL changes (e.g. from `https:
 
 Function that is invoked when the `WebView` content process is terminated.
 
-| Type     | Required | Platform      |
-| -------- | -------- | ------------- |
-| function | No       | iOS WKWebView |
+| Type     | Required | Platform                |
+| -------- | -------- | ----------------------- |
+| function | No       | iOS and macOS WKWebView |
 
 Example:
 
@@ -863,9 +863,9 @@ Possible values for `dataDetectorTypes` are:
 
 Boolean value that determines whether scrolling is enabled in the `WebView`. The default value is `true`. Setting this to `false` will prevent the webview from moving the document body when the keyboard appears over an input.
 
-| Type | Required | Platform |
-| ---- | -------- | -------- |
-| bool | No       | iOS      |
+| Type | Required | Platform      |
+| ---- | -------- | ------------- |
+| bool | No       | iOS and macOS |
 
 ---
 
@@ -934,9 +934,9 @@ Boolean that sets whether JavaScript running in the context of a file scheme URL
 
 A String value that indicates which URLs the WebView's file can then reference in scripts, AJAX requests, and CSS imports. This is only used in for WebViews that are loaded with a source.uri set to a `'file://'` URL. If not provided, the default is to only allow read access to the URL provided in source.uri itself.
 
-| Type   | Required | Platform |
-| ------ | -------- | -------- |
-| string | No       | iOS      |
+| Type   | Required | Platform      |
+| ------ | -------- | ------------- |
+| string | No       | iOS and macOS |
 
 ---
 
@@ -984,9 +984,9 @@ If true, this will hide the keyboard accessory view (< > and Done).
 
 If true, this will be able horizontal swipe gestures. The default value is `false`.
 
-| Type    | Required | Platform |
-| ------- | -------- | -------- |
-| boolean | No       | iOS      |
+| Type    | Required | Platform          |
+| ------- | -------- | ----------------- |
+| boolean | No       | iOS and macOS     |
 
 ---
 
@@ -1061,19 +1061,19 @@ If the value of this property is true, the scroll view stops on multiples of the
 
 A Boolean value that determines whether pressing on a link displays a preview of the destination for the link. In iOS this property is available on devices that support 3D Touch. In iOS 10 and later, the default value is true; before that, the default value is false.
 
-| Type    | Required | Platform |
-| ------- | -------- | -------- |
-| boolean | No       | iOS      |
+| Type    | Required | Platform          |
+| ------- | -------- | ----------------- |
+| boolean | No       | iOS and macOS     |
 
 ---
 
 ### `sharedCookiesEnabled`
 
 Set `true` if shared cookies from `[NSHTTPCookieStorage sharedHTTPCookieStorage]` should used for every load request in the WebView. The default value is `false`. For more on cookies, read the [Guide](Guide.md#Managing-Cookies)
 
-| Type    | Required | Platform |
-| ------- | -------- | -------- |
-| boolean | No       | iOS      |
+| Type    | Required | Platform          |
+| ------- | -------- | ----------------- |
+| boolean | No       | iOS and macOS     |
 
 ---
 

docs/Reference.md

@@ -20,7 +20,10 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-project.xcworkspace
+# exclude project.xcworkspace except for xcshareddata/WorkspaceSettings.xcsettings
+project.xcworkspace/*
+**/project.xcworkspace/contents.xcworkspacedata
+**/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 
 # Android/IntelliJ
 #