Fixed tsc

src/WebView.macos.tsx

@@ -24,7 +24,6 @@ import {
   WebViewProgressEvent,
   WebViewTerminatedEvent,
   MacOSWebViewProps,
-  DecelerationRateConstant,
   NativeWebViewMacOS,
   ViewManager,
   State,
@@ -36,17 +35,6 @@ import styles from './WebView.styles';
 const UIManager = NotTypedUIManager as RNCWebViewUIManagerMacOS;
 
 const { resolveAssetSource } = Image;
-const processDecelerationRate = (
-  decelerationRate: DecelerationRateConstant | number | undefined,
-) => {
-  let newDecelerationRate = decelerationRate;
-  if (newDecelerationRate === 'normal') {
-    newDecelerationRate = 0.998;
-  } else if (newDecelerationRate === 'fast') {
-    newDecelerationRate = 0.99;
-  }
-  return newDecelerationRate;
-};
 
 const RNCWebViewManager = NativeModules.RNCWebViewManager as ViewManager;
 
@@ -267,7 +255,6 @@ class WebView extends React.Component<MacOSWebViewProps, State> {
     this.showRedboxOnPropChanges(prevProps, 'allowsInlineMediaPlayback');
     this.showRedboxOnPropChanges(prevProps, 'incognito');
     this.showRedboxOnPropChanges(prevProps, 'mediaPlaybackRequiresUserAction');
-    this.showRedboxOnPropChanges(prevProps, 'dataDetectorTypes');
   }
 
   showRedboxOnPropChanges(
@@ -283,7 +270,6 @@ class WebView extends React.Component<MacOSWebViewProps, State> {
 
   render() {
     const {
-      decelerationRate: decelerationRateProp,
       nativeConfig = {},
       onMessage,
       onShouldStartLoadWithRequest: onShouldStartLoadWithRequestProp,
@@ -323,8 +309,6 @@ class WebView extends React.Component<MacOSWebViewProps, State> {
       onShouldStartLoadWithRequestProp,
     );
 
-    const decelerationRate = processDecelerationRate(decelerationRateProp);
-
     const NativeWebView
       = (nativeConfig.component as typeof NativeWebViewMacOS | undefined)
       || RNCWebView;
@@ -333,7 +317,6 @@ class WebView extends React.Component<MacOSWebViewProps, State> {
       <NativeWebView
         key="webViewKey"
         {...otherProps}
-        decelerationRate={decelerationRate}
         messagingEnabled={typeof onMessage === 'function'}
         onLoadingError={this.onLoadingError}
         onLoadingFinish={this.onLoadingFinish}

src/WebViewTypes.ts

@@ -28,7 +28,7 @@ interface RNCWebViewUIManager<Commands extends string> extends UIManagerStatic {
 
 export type RNCWebViewUIManagerAndroid = RNCWebViewUIManager<WebViewCommands | AndroidWebViewCommands>
 export type RNCWebViewUIManagerIOS = RNCWebViewUIManager<WebViewCommands>
-
+export type RNCWebViewUIManagerMacOS = RNCWebViewUIManager<WebViewCommands>
 
 
 type WebViewState = 'IDLE' | 'LOADING' | 'ERROR';
@@ -57,6 +57,14 @@ declare const NativeWebViewIOSBase: Constructor<NativeMethodsMixin> &
   typeof NativeWebViewIOSComponent;
 export class NativeWebViewIOS extends NativeWebViewIOSBase {}
 
+// eslint-disable-next-line react/prefer-stateless-function
+declare class NativeWebViewMacOSComponent extends Component<
+  MacOSNativeWebViewProps
+> {}
+declare const NativeWebViewMacOSBase: Constructor<NativeMethodsMixin> &
+  typeof NativeWebViewMacOSComponent;
+export class NativeWebViewMacOS extends NativeWebViewMacOSBase {}
+
 // eslint-disable-next-line react/prefer-stateless-function
 declare class NativeWebViewAndroidComponent extends Component<
   AndroidNativeWebViewProps
@@ -104,7 +112,7 @@ export interface WebViewMessage extends WebViewNativeEvent {
 
 export interface WebViewError extends WebViewNativeEvent {
   /**
-   * `domain` is only used on iOS
+   * `domain` is only used on iOS and macOS
    */
   domain?: string;
   code: number;
@@ -195,7 +203,7 @@ export interface WebViewNativeConfig {
   /**
    * The native component used to render the WebView.
    */
-  component?: typeof NativeWebViewIOS | typeof NativeWebViewAndroid;
+  component?: typeof NativeWebViewIOS | typeof NativeWebViewMacOS | typeof NativeWebViewAndroid;
   /**
    * Set props directly on the native component WebView. Enables custom props which the
    * original WebView doesn't pass through.
@@ -203,7 +211,7 @@ export interface WebViewNativeConfig {
   props?: Object;
   /**
    * Set the ViewManager to use for communication with the native side.
-   * @platform ios
+   * @platform ios, macos
    */
   viewManager?: ViewManager;
 }
@@ -281,6 +289,27 @@ export interface IOSNativeWebViewProps extends CommonNativeWebViewProps {
   onContentProcessDidTerminate?: (event: WebViewTerminatedEvent) => void;
 }
 
+export interface MacOSNativeWebViewProps extends CommonNativeWebViewProps {
+  allowingReadAccessToURL?: string;
+  allowsBackForwardNavigationGestures?: boolean;
+  allowsInlineMediaPlayback?: boolean;
+  allowsLinkPreview?: boolean;
+  automaticallyAdjustContentInsets?: boolean;
+  bounces?: boolean;
+  contentInset?: ContentInsetProp;
+  contentInsetAdjustmentBehavior?:
+    | 'automatic'
+    | 'scrollableAxes'
+    | 'never'
+    | 'always';
+  directionalLockEnabled?: boolean;
+  hideKeyboardAccessoryView?: boolean;
+  pagingEnabled?: boolean;
+  scrollEnabled?: boolean;
+  useSharedProcessPool?: boolean;
+  onContentProcessDidTerminate?: (event: WebViewTerminatedEvent) => void;
+}
+
 export interface IOSWebViewProps extends WebViewSharedProps {
   /**
    * Does not store any data within the lifetime of the WebView.
@@ -460,6 +489,147 @@ export interface IOSWebViewProps extends WebViewSharedProps {
   onContentProcessDidTerminate?: (event: WebViewTerminatedEvent) => void;
 }
 
+export interface MacOSWebViewProps extends WebViewSharedProps {
+  /**
+   * Does not store any data within the lifetime of the WebView.
+   */
+  incognito?: boolean;
+
+  /**
+   * Boolean value that determines whether the web view bounces
+   * when it reaches the edge of the content. The default value is `true`.
+   * @platform macos
+   */
+  bounces?: boolean;
+
+  /**
+   * Boolean value that determines whether scrolling is enabled in the
+   * `WebView`. The default value is `true`.
+   * @platform macos
+   */
+  scrollEnabled?: boolean;
+
+  /**
+   * If the value of this property is true, the scroll view stops on multiples
+   * of the scroll view’s bounds when the user scrolls.
+   * The default value is false.
+   * @platform macos
+   */
+  pagingEnabled?: boolean;
+
+  /**
+   * Controls whether to adjust the content inset for web views that are
+   * placed behind a navigation bar, tab bar, or toolbar. The default value
+   * is `true`.
+   * @platform macos
+   */
+  automaticallyAdjustContentInsets?: boolean;
+
+  /**
+   * This property specifies how the safe area insets are used to modify the
+   * content area of the scroll view. The default value of this property is
+   * "never". Available on iOS 11 and later.
+   */
+  contentInsetAdjustmentBehavior?:
+    | 'automatic'
+    | 'scrollableAxes'
+    | 'never'
+    | 'always';
+
+  /**
+   * The amount by which the web view content is inset from the edges of
+   * the scroll view. Defaults to {top: 0, left: 0, bottom: 0, right: 0}.
+   * @platform macos
+   */
+  contentInset?: ContentInsetProp;
+
+  /**
+   * Boolean that determines whether HTML5 videos play inline or use the
+   * native full-screen controller. The default value is `false`.
+   *
+   * **NOTE** : In order for video to play inline, not only does this
+   * property need to be set to `true`, but the video element in the HTML
+   * document must also include the `webkit-playsinline` attribute.
+   * @platform macos
+   */
+  allowsInlineMediaPlayback?: boolean;
+  /**
+   * Hide the accessory view when the keyboard is open. Default is false to be
+   * backward compatible.
+   */
+  hideKeyboardAccessoryView?: boolean;
+  /**
+   * A Boolean value indicating whether horizontal swipe gestures will trigger
+   * back-forward list navigations.
+   */
+  allowsBackForwardNavigationGestures?: boolean;
+  /**
+   * A Boolean value indicating whether WebKit WebView should be created using a shared
+   * process pool, enabling WebViews to share cookies and localStorage between each other.
+   * Default is true but can be set to false for backwards compatibility.
+   * @platform macos
+   */
+  useSharedProcessPool?: boolean;
+
+  /**
+   * The custom user agent string.
+   */
+  userAgent?: string;
+
+  /**
+   * A Boolean value that determines whether pressing on a link
+   * displays a preview of the destination for the link.
+   *
+   * This property is available on devices that support Force Touch trackpad.
+   * @platform macos
+   */
+  allowsLinkPreview?: boolean;
+
+  /**
+   * Set true if shared cookies from HTTPCookieStorage should used for every load request.
+   * The default value is `false`.
+   * @platform macos
+   */
+  sharedCookiesEnabled?: boolean;
+
+  /**
+   * A Boolean value that determines whether scrolling is disabled in a particular direction.
+   * The default value is `true`.
+   * @platform macos
+   */
+  directionalLockEnabled?: boolean;
+
+  /**
+   * A Boolean value indicating whether web content can programmatically display the keyboard.
+   *
+   * When this property is set to true, the user must explicitly tap the elements in the
+   * web view to display the keyboard (or other relevant input view) for that element.
+   * When set to false, a focus event on an element causes the input view to be displayed
+   * and associated with that element automatically.
+   *
+   * The default value is `true`.
+   * @platform macos
+   */
+  keyboardDisplayRequiresUserAction?: boolean;
+
+  /**
+   * 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
+   * 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.
+   * @platform macos
+   */
+  allowingReadAccessToURL?: string;
+
+  /**
+   * Function that is invoked when the WebKit WebView content process gets terminated.
+   * @platform macos
+   */
+  onContentProcessDidTerminate?: (event: WebViewTerminatedEvent) => void;
+}
+
 export interface AndroidWebViewProps extends WebViewSharedProps {
   onNavigationStateChange?: (event: WebViewNavigation) => void;
   onContentSizeChange?: (event: WebViewEvent) => void;