react-native-ui-lib 7.45.0-snapshot.7266 → 7.46.0

package/lib/components/Keyboard/{KeyboardAccessoryView/index.js → KeyboardInput/KeyboardAccessoryView.js}

@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
 import { StyleSheet, Platform, NativeModules, NativeEventEmitter, DeviceEventEmitter, processColor, BackHandler } from 'react-native';
-import KeyboardTrackingView from "../KeyboardTrackingView";
+import KeyboardTrackingView from "../KeyboardTracking/KeyboardTrackingView";
 import CustomKeyboardView from "./CustomKeyboardView";
-import KeyboardUtils, { KeyboardHeightListener } from "./KeyboardUtils";
+import KeyboardUtils from "./utils/KeyboardUtils";
 const IsIOS = Platform.OS === 'ios';
 const IsAndroid = Platform.OS === 'android';
 /**
@@ -20,11 +20,9 @@ class KeyboardAccessoryView extends Component {
     allowHitsOutsideBounds: false,
     scrollBehavior: KeyboardTrackingView.scrollBehaviors.FIXED_OFFSET
   };
-  static currentId = 0;
 
   // TODO: fix
 
-  id = ++KeyboardAccessoryView.currentId;
   constructor(props) {
     super(props);
     this.onContainerComponentHeightChanged = this.onContainerComponentHeightChanged.bind(this);
@@ -35,16 +33,12 @@ class KeyboardAccessoryView extends Component {
     this.registerForKeyboardResignedEvent();
     this.registerAndroidBackHandler();
   }
-  state = {
-    keyboardHeight: 0,
-    shouldFocus: true
-  };
   componentWillUnmount() {
     if (this.customInputControllerEventsSubscriber) {
       this.customInputControllerEventsSubscriber.remove();
     }
     if (IsAndroid) {
-      this.subscription.remove();
+      BackHandler.removeEventListener('hardwareBackPress', this.onAndroidBackPressed);
     }
   }
   onContainerComponentHeightChanged(event) {
@@ -93,7 +87,7 @@ class KeyboardAccessoryView extends Component {
   }
   registerAndroidBackHandler() {
     if (IsAndroid) {
-      this.subscription = BackHandler.addEventListener('hardwareBackPress', this.onAndroidBackPressed);
+      BackHandler.addEventListener('hardwareBackPress', this.onAndroidBackPressed);
     }
   }
   processInitialProps() {
@@ -112,26 +106,7 @@ class KeyboardAccessoryView extends Component {
       this.trackingViewRef.scrollToStart();
     }
   }
-  onKeyboardHeightChange = keyboardHeight => {
-    this.setState({
-      keyboardHeight
-    });
-  };
-  onDismiss = () => {
-    this.setState({
-      shouldFocus: false
-    });
-  };
-  onKeyboardDismiss = () => {
-    this.setState({
-      shouldFocus: true
-    });
-  };
   render() {
-    const {
-      keyboardHeight,
-      shouldFocus
-    } = this.state;
     const {
       renderContent,
       kbInputRef,
@@ -142,9 +117,8 @@ class KeyboardAccessoryView extends Component {
       ...others
     } = this.props;
     return <KeyboardTrackingView {...others} scrollBehavior={scrollBehavior} ref={r => this.trackingViewRef = r} style={styles.trackingToolbarContainer} onLayout={this.onContainerComponentHeightChanged}>
-        <KeyboardHeightListener id={`${this.id}`} onDismiss={this.onDismiss} onKeyboardHeightChange={this.onKeyboardHeightChange} />
         <>{renderContent?.()}</>
-        <CustomKeyboardView keyboardHeight={keyboardHeight} shouldFocus={shouldFocus} onKeyboardDismiss={this.onKeyboardDismiss} inputRef={kbInputRef} component={kbComponent} initialProps={this.processInitialProps()} onItemSelected={onItemSelected} onRequestShowKeyboard={onRequestShowKeyboard} useSafeArea={others.useSafeArea} />
+        <CustomKeyboardView inputRef={kbInputRef} component={kbComponent} initialProps={this.processInitialProps()} onItemSelected={onItemSelected} onRequestShowKeyboard={onRequestShowKeyboard} useSafeArea={others.useSafeArea} />
       </KeyboardTrackingView>;
   }
 }

package/lib/components/Keyboard/{KeyboardAccessoryView/KeyboardRegistry/index.d.ts → KeyboardInput/KeyboardRegistry.d.ts}

@@ -1,4 +1,4 @@
-import EventEmitterManager from './EventEmitterManager';
+import EventEmitterManager from './utils/EventEmitterManager';
 /**
  * @description: used for registering keyboards and performing certain actions on the keyboards.
  * @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/nativeComponentScreens/keyboardAccessory/demoKeyboards.js

package/lib/components/Keyboard/{KeyboardAccessoryView/KeyboardRegistry/index.js → KeyboardInput/KeyboardRegistry.js}

@@ -1,7 +1,7 @@
 import _intersection from "lodash/intersection";
 import _isFunction from "lodash/isFunction";
 import { AppRegistry } from 'react-native';
-import EventEmitterManager from "./EventEmitterManager";
+import EventEmitterManager from "./utils/EventEmitterManager";
 
 /*
  * Tech debt: how to deal with multiple registries in the app?

package/lib/components/Keyboard/{KeyboardAccessoryView/KeyboardRegistry → KeyboardInput}/__tests__/KeyboardRegistry.spec.js

@@ -1,6 +1,6 @@
 import {AppRegistry, View} from 'react-native';
 import React from 'react';
-import KeyboardRegistry from '../index';
+import KeyboardRegistry from '../KeyboardRegistry';
 
 describe('KeyboardRegistry - components', () => {
   const mockComponent = 'test_component';

package/lib/components/Keyboard/{KeyboardAccessoryView → KeyboardInput}/keyboardAccessoryView.api.json

@@ -15,9 +15,9 @@
     {
       "name": "kbInputRef",
       "type": "any",
-      "description": "The reference to the actual text input (or the keyboard may not reset when instructed to, etc.)",
-      "note": "iOS only",
-      "required": true
+      "description": "The reference to the actual text input (or the keyboard may not reset when instructed to, etc.).",
+      "required": true,
+      "note": "iOS only"
     },
     {
       "name": "kbComponent",
@@ -33,12 +33,12 @@
     {
       "name": "onItemSelected",
       "type": "() => void",
-      "description": "Callback that will be called when an item on the keyboard has been pressed"
+      "description": "Callback that will be called when an item on the keyboard has been pressed."
     },
     {
       "name": "onRequestShowKeyboard",
       "type": "() => void",
-      "description": "Callback that will be called if KeyboardRegistry.requestShowKeyboard is called"
+      "description": "Callback that will be called if KeyboardRegistry.requestShowKeyboard is called."
     },
     {
       "name": "onKeyboardResigned",

package/lib/components/Keyboard/{KeyboardAccessoryView/KeyboardRegistry → KeyboardInput}/keyboardRegistry.api.json

@@ -1,49 +1,49 @@
 {
   "name": "KeyboardRegistry",
   "category": "infra",
-  "description": "used for registering keyboards and performing certain actions on the keyboards",
+  "description": "used for registering keyboards and performing certain actions on the keyboards.",
   "example": "https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/nativeComponentScreens/keyboardAccessory/demoKeyboards.js",
   "props": [
     {
       "name": "registerKeyboard",
       "type": "static function",
-      "description": "Register a new keyboard.\ncomponentID (string) - the ID of the keyboard.\ngenerator (function) - a function for the creation of the keyboard.\nparams (object) - to be returned when using other methods (i.e. getKeyboards and getAllKeyboards)"
+      "description": "Register a new keyboard.\ncomponentID (string) - the ID of the keyboard.\ngenerator (function) - a function for the creation of the keyboard.\nparams (object) - to be returned when using other methods (i.e. getKeyboards and getAllKeyboards)."
     },
     {
       "name": "getKeyboard",
       "type": "static function",
-      "description": "Get a specific keyboard\ncomponentID (string) - the ID of the keyboard"
+      "description": "Get a specific keyboard\ncomponentID (string) - the ID of the keyboard."
     },
     {
       "name": "getKeyboards",
       "type": "static function",
-      "description": "Get keyboards by IDs\ncomponentIDs (string[]) - the ID of the keyboard"
+      "description": "Get keyboards by IDs\ncomponentIDs (string[]) - the ID of the keyboard."
     },
     {"name": "getAllKeyboards", "type": "static function", "description": "Get all keyboards"},
     {
       "name": "addListener",
       "type": "static function",
-      "description": "Add a listener for a callback.\nglobalID (string) - ID that includes the componentID and the event name\n(i.e. if componentID='kb1' globalID='kb1.onItemSelected')\ncallback (function) - the callback to be called when the said event happens"
+      "description": "Add a listener for a callback.\nglobalID (string) - ID that includes the componentID and the event name\n                     (i.e. if componentID='kb1' globalID='kb1.onItemSelected')\ncallback (function) - the callback to be called when the said event happens"
     },
     {
       "name": "notifyListeners",
       "type": "static function",
-      "description": "Notify that an event has occurred.\nglobalID (string) - ID that includes the componentID and the event name\n(i.e. if componentID='kb1' globalID='kb1.onItemSelected')\nargs (object) - data to be sent to the listener"
+      "description": "Notify that an event has occurred.\nglobalID (string) - ID that includes the componentID and the event name\n                    (i.e. if componentID='kb1' globalID='kb1.onItemSelected')\nargs (object) - data to be sent to the listener."
     },
     {
       "name": "removeListeners",
       "type": "static function",
-      "description": "Remove a listener for a callback.\nglobalID (string) - ID that includes the componentID and the event name\n(i.e. if componentID='kb1' globalID='kb1.onItemSelected')"
+      "description": "Remove a listener for a callback.\nglobalID (string) - ID that includes the componentID and the event name\n                    (i.e. if componentID='kb1' globalID='kb1.onItemSelected')"
     },
     {
       "name": "onItemSelected",
       "type": "static function",
-      "description": "Default event to be used for when an item on the keyboard has been pressed.\ncomponentID (string) - the ID of the keyboard.\nargs (object) - data to be sent to the listener"
+      "description": "Default event to be used for when an item on the keyboard has been pressed.\ncomponentID (string) - the ID of the keyboard.\nargs (object) - data to be sent to the listener."
     },
     {
       "name": "requestShowKeyboard",
       "type": "static function",
-      "description": "Request to show the keyboard\ncomponentID (string) - the ID of the keyboard"
+      "description": "Request to show the keyboard\ncomponentID (string) - the ID of the keyboard."
     }
   ],
   "snippet": ["KeyboardRegistry.registerKeyboard('keyboardName$1', () => KeyboardComponent$2)"]

package/lib/components/Keyboard/KeyboardInput/utils/KeyboardUtils.d.ts

@@ -0,0 +1,11 @@
+/**
+ * @description: util for managing the keyboard.
+ * @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/nativeComponentScreens/keyboardInput/KeyboardInputViewScreen.js
+ */
+export default class KeyboardUtils {
+    static displayName: string;
+    /**
+     * Used to dismiss (close) the keyboard.
+     */
+    static dismiss: () => void;
+}

package/lib/components/Keyboard/KeyboardInput/utils/KeyboardUtils.js

@@ -0,0 +1,17 @@
+import { Keyboard } from 'react-native';
+import TextInputKeyboardManager from "../TextInputKeyboardManager";
+
+/**
+ * @description: util for managing the keyboard.
+ * @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/nativeComponentScreens/keyboardInput/KeyboardInputViewScreen.js
+ */
+export default class KeyboardUtils {
+  static displayName = 'KeyboardUtils';
+  /**
+   * Used to dismiss (close) the keyboard.
+   */
+  static dismiss = () => {
+    Keyboard.dismiss();
+    TextInputKeyboardManager.dismissKeyboard();
+  };
+}

package/lib/components/Keyboard/{KeyboardAccessoryView/KeyboardRegistry/EventEmitterManager → KeyboardInput/utils}/__tests__/EventEmitterManager.spec.js

@@ -1,4 +1,4 @@
-const EventEmitterManager = require('../index').default;
+const EventEmitterManager = require('../EventEmitterManager').default;
 
 let EventEmitter;
 

package/lib/components/Keyboard/{KeyboardAwareInsetsView/index.d.ts → KeyboardTracking/KeyboardAwareInsetsView.d.ts}

@@ -1,5 +1,5 @@
 import React from 'react';
-import { KeyboardTrackingViewProps } from '../KeyboardTrackingView';
+import { KeyboardTrackingViewProps } from './KeyboardTrackingView';
 type Props = KeyboardTrackingViewProps & {
     offset?: number;
 };

package/lib/components/Keyboard/{KeyboardAwareInsetsView/index.js → KeyboardTracking/KeyboardAwareInsetsView.js}

@@ -1,6 +1,6 @@
 import React from 'react';
 import { StyleSheet, Dimensions } from 'react-native';
-import KeyboardTrackingView from "../KeyboardTrackingView";
+import KeyboardTrackingView from "./KeyboardTrackingView";
 /**
  * @description: Used to add an inset when a keyboard is used and might hide part of the screen.
  *

package/lib/components/Keyboard/{KeyboardTrackingView → KeyboardTracking/KeyboardTrackingView}/KeyboardTrackingView.ios.d.ts

@@ -1,7 +1,10 @@
+/**
+ * Created by artald on 15/05/2016.
+ */
 import React, { PureComponent } from 'react';
 import { KeyboardTrackingViewProps } from './index';
 /**
- * @description: A UI component that enables "keyboard tracking" for this view and it's sub-views.
+ * @description: A UI component that enables “keyboard tracking" for this view and it's sub-views.
  * Would typically be used when you have a TextField or TextInput inside this view.
  *
  * @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/nativeComponentScreens/KeyboardTrackingViewScreen.js

package/lib/components/Keyboard/{KeyboardTrackingView → KeyboardTracking/KeyboardTrackingView}/KeyboardTrackingView.ios.js

@@ -1,11 +1,14 @@
+/**
+ * Created by artald on 15/05/2016.
+ */
+
 import React, { PureComponent } from 'react';
-import ReactNative, { NativeModules } from 'react-native';
-// Import the Codegen specification for New Architecture
-import KeyboardTrackingViewNativeComponent from "../../../specs/KeyboardTrackingViewNativeComponent";
+import ReactNative, { requireNativeComponent, NativeModules } from 'react-native';
+const NativeKeyboardTrackingView = requireNativeComponent('KeyboardTrackingViewTemp');
 const KeyboardTrackingViewTempManager = NativeModules.KeyboardTrackingViewTempManager;
 
 /**
- * @description: A UI component that enables "keyboard tracking" for this view and it's sub-views.
+ * @description: A UI component that enables “keyboard tracking" for this view and it's sub-views.
  * Would typically be used when you have a TextField or TextInput inside this view.
  *
  * @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/nativeComponentScreens/KeyboardTrackingViewScreen.js
@@ -18,7 +21,7 @@ class KeyboardTrackingView extends PureComponent {
     useSafeArea: false
   };
   render() {
-    return <KeyboardTrackingViewNativeComponent {...this.props} ref={r => this.ref = r} />;
+    return <NativeKeyboardTrackingView {...this.props} ref={r => this.ref = r} />;
   }
   async getNativeProps() {
     if (this.ref && KeyboardTrackingViewTempManager && KeyboardTrackingViewTempManager.getNativeProps) {

package/lib/components/Keyboard/{KeyboardTrackingView → KeyboardTracking/KeyboardTrackingView}/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { StyleProp, ViewStyle, ViewProps } from 'react-native';
+import { ViewStyle, ViewProps } from 'react-native';
 declare const SCROLL_BEHAVIORS: {
     NONE: any;
     SCROLL_TO_BOTTOM_INVERTED_ONLY: any;
@@ -72,7 +72,7 @@ export type KeyboardTrackingViewProps = ViewProps & {
      */
     usesBottomTabs?: boolean;
     ref?: any;
-    style?: StyleProp<ViewStyle>;
+    style?: ViewStyle;
     children?: React.ReactChild | React.ReactChild[];
 };
 declare const _default: React.ForwardRefExoticComponent<Omit<KeyboardTrackingViewProps, "ref"> & React.RefAttributes<unknown>> & {

package/lib/components/Keyboard/{KeyboardTrackingView → KeyboardTracking/KeyboardTrackingView}/keyboardTrackingView.api.json

@@ -1,8 +1,8 @@
 {
   "name": "KeyboardTrackingView",
   "category": "infra",
-  "description": "A UI component that enables 'keyboard tracking' for this view and it's sub-views.\nWould typically be used when you have a TextField or TextInput inside this view",
-  "note": "This view is useful only for iOS",
+  "description": "A UI component that enables 'keyboard tracking' for this view and it's sub-views.\nWould typically be used when you have a TextField or TextInput inside this view.",
+  "note": "This view is useful only for iOS.",
   "example": "https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/nativeComponentScreens/KeyboardTrackingViewScreen.js",
   "images": [
     "https://github.com/wix/react-native-ui-lib/blob/master/demo/showcase/KeyboardTrackingView/KeyboardTrackingView.gif?raw=true"
@@ -21,54 +21,63 @@
     {
       "name": "scrollBehavior",
       "type": "number",
-      "description": "The scrolling behavior (use KeyboardTrackingView.scrollBehaviors.NONE | SCROLL_TO_BOTTOM_INVERTED_ONLY | FIXED_OFFSET)"
+      "description": "The scrolling behavior (use KeyboardTrackingView.scrollBehaviors.NONE | SCROLL_TO_BOTTOM_INVERTED_ONLY | FIXED_OFFSET)",
+      "note": "iOS only"
     },
     {
       "name": "revealKeyboardInteractive",
       "type": "boolean",
-      "description": "Show the keyboard on a negative scroll",
+      "description": "Show the keyboard on a negative scroll.",
+      "note": "iOS only",
       "default": "false"
     },
     {
       "name": "manageScrollView",
       "type": "boolean",
-      "description": "Set to false to turn off inset management and manage it yourself",
+      "description": "Set to false to turn off inset management and manage it yourself.",
+      "note": "iOS only",
       "default": "true"
     },
     {
       "name": "requiresSameParentToManageScrollView",
       "type": "boolean",
-      "description": "Set to true manageScrollView is set to true and still does not work,\nit means that the ScrollView found is the wrong one and you'll have\nto have the KeyboardAccessoryView and the ScrollView as siblings\nand set this to true",
+      "description": "Set to true manageScrollView is set to true and still does not work,\nit means that the ScrollView found is the wrong one and you'll have\nto have the KeyboardAccessoryView and the ScrollView as siblings\nand set this to true.",
+      "note": "iOS only",
       "default": "false"
     },
     {
       "name": "allowHitsOutsideBounds",
       "type": "boolean",
-      "description": "Allow hitting sub-views that are placed beyond the view bounds",
+      "description": "Allow hitting sub-views that are placed beyond the view bounds.",
+      "note": "iOS only",
       "default": "false"
     },
     {
       "name": "addBottomView",
       "type": "boolean",
-      "description": "Add a view beneath the KeyboardAccessoryView",
+      "description": "Add a view beneath the KeyboardAccessoryView.",
+      "note": "iOS only",
       "default": "false"
     },
     {
       "name": "bottomViewColor", 
       "type": "string", 
-      "description": "The bottom view's color",       
+      "description": "The bottom view's color.",       
+      "note": "iOS only",
       "default": "white"
     },
     {
       "name": "useSafeArea",
       "type": "boolean",
-      "description": "Whether or not to handle SafeArea",
+      "description": "Whether or not to handle SafeArea.",
+      "note": "iOS only",
       "default": "true"
     },
     {
       "name": "usesBottomTabs",
       "type": "boolean",
-      "description": "Whether or not to include bottom tab bar inset",
+      "description": "Whether or not to include bottom tab bar inset.",
+      "note": "iOS only",
       "default": "false"
     },
     {"name": "ref", "type": "any", "description": ""},

package/lib/components/Keyboard/index.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
-import { KeyboardTrackingViewProps } from './KeyboardTrackingView';
-import KeyboardAccessoryView, { KeyboardAccessoryViewProps } from './KeyboardAccessoryView';
-import KeyboardRegistry from './KeyboardAccessoryView/KeyboardRegistry';
-import KeyboardUtils from './KeyboardAccessoryView/KeyboardUtils';
+import { KeyboardTrackingViewProps } from './KeyboardTracking/KeyboardTrackingView';
+import KeyboardRegistry from './KeyboardInput/KeyboardRegistry';
+import KeyboardAccessoryView, { KeyboardAccessoryViewProps } from './KeyboardInput/KeyboardAccessoryView';
+import KeyboardUtils from './KeyboardInput/utils/KeyboardUtils';
 export { KeyboardTrackingViewProps, KeyboardAccessoryViewProps };
 declare const _default: {
     KeyboardTrackingView: import("react").ForwardRefExoticComponent<Omit<KeyboardTrackingViewProps, "ref"> & import("react").RefAttributes<unknown>> & {
@@ -26,15 +26,15 @@ declare const _default: {
             useSafeArea?: boolean | undefined;
             usesBottomTabs?: boolean | undefined;
             ref?: any;
-            style?: import("react-native/types").StyleProp<import("react-native/types").ViewStyle>;
+            style?: import("react-native/types").ViewStyle | undefined;
             children?: import("react").ReactChild | import("react").ReactChild[] | undefined;
         } & {
             offset?: number | undefined;
         }): import("react").JSX.Element;
         displayName: string;
     };
-    KeyboardAccessoryView: typeof KeyboardAccessoryView;
     KeyboardRegistry: typeof KeyboardRegistry;
+    KeyboardAccessoryView: typeof KeyboardAccessoryView;
     KeyboardUtils: typeof KeyboardUtils;
 };
 export default _default;

package/lib/components/Keyboard/index.js

@@ -1,13 +1,13 @@
-import KeyboardTrackingView, { KeyboardTrackingViewProps } from "./KeyboardTrackingView";
-import KeyboardAwareInsetsView from "./KeyboardAwareInsetsView";
-import KeyboardAccessoryView, { KeyboardAccessoryViewProps } from "./KeyboardAccessoryView";
-import KeyboardRegistry from "./KeyboardAccessoryView/KeyboardRegistry";
-import KeyboardUtils from "./KeyboardAccessoryView/KeyboardUtils";
+import KeyboardTrackingView, { KeyboardTrackingViewProps } from "./KeyboardTracking/KeyboardTrackingView";
+import KeyboardAwareInsetsView from "./KeyboardTracking/KeyboardAwareInsetsView";
+import KeyboardRegistry from "./KeyboardInput/KeyboardRegistry";
+import KeyboardAccessoryView, { KeyboardAccessoryViewProps } from "./KeyboardInput/KeyboardAccessoryView";
+import KeyboardUtils from "./KeyboardInput/utils/KeyboardUtils";
 export { KeyboardTrackingViewProps, KeyboardAccessoryViewProps };
 export default {
   KeyboardTrackingView,
   KeyboardAwareInsetsView,
-  KeyboardAccessoryView,
   KeyboardRegistry,
+  KeyboardAccessoryView,
   KeyboardUtils
 };

package/lib/components/SafeArea/SafeAreaInsetsManager.d.ts

@@ -1,34 +1,20 @@
-export type SafeAreaInsetsType = {
+type SafeAreaInsetsType = {
     top: number;
     left: number;
     bottom: number;
     right: number;
 } | null;
-export type SafeAreaChangedDelegateType = {
-    onSafeAreaInsetsDidChangeEvent?: (insets: SafeAreaInsetsType) => void;
-};
-export declare const DEFAULT_INSETS: {
-    top: number;
-    left: number;
-    bottom: number;
-    right: number;
-};
 declare class SafeAreaInsetsManager {
     _defaultInsets: SafeAreaInsetsType;
     _safeAreaInsets: SafeAreaInsetsType;
-    _safeAreaChangedDelegates: Array<SafeAreaChangedDelegateType>;
-    _nativeModule: any;
+    _safeAreaChangedDelegates: Array<any>;
     constructor();
-    setupNativeConnection(): void;
-    setupEventListener(): void;
-    getInitialInsets(): Promise<void>;
-    notifyDelegates(insets: SafeAreaInsetsType): void;
+    addSafeAreaChangedListener(): void;
     _updateInsets(): Promise<void>;
     getSafeAreaInsets(): Promise<SafeAreaInsetsType>;
-    addSafeAreaChangedDelegate(delegate: SafeAreaChangedDelegateType): void;
-    removeSafeAreaChangedDelegate(delegateToRemove: SafeAreaChangedDelegateType): void;
+    addSafeAreaChangedDelegate(delegate: any): void;
+    removeSafeAreaChangedDelegate(delegateToRemove: any): void;
     get defaultInsets(): SafeAreaInsetsType;
-    refreshSafeAreaInsets(): Promise<void>;
 }
-declare const instance: SafeAreaInsetsManager;
-export default instance;
+declare const _default: SafeAreaInsetsManager;
+export default _default;

package/lib/components/SafeArea/SafeAreaInsetsManager.js

@@ -1,99 +1,48 @@
-import _isEqual from "lodash/isEqual";
 import _remove from "lodash/remove";
 import _forEach from "lodash/forEach";
 /* eslint no-underscore-dangle: 0 */
-import { NativeModules, DeviceEventEmitter } from 'react-native';
-export const DEFAULT_INSETS = {
-  top: 47,
-  left: 0,
-  bottom: 34,
-  right: 0
-};
+
+import { NativeModules, NativeEventEmitter } from 'react-native';
 let SafeAreaInsetsCache = null;
+const NativeSafeAreaManager = NativeModules.SafeAreaManager;
 class SafeAreaInsetsManager {
-  _defaultInsets = DEFAULT_INSETS; // Common iPhone safe area values
-
+  _defaultInsets = {
+    top: 0,
+    left: 0,
+    bottom: 0,
+    right: 0
+  };
+  _safeAreaInsets = {
+    top: 0,
+    left: 0,
+    bottom: 0,
+    right: 0
+  };
   _safeAreaChangedDelegates = [];
-  _nativeModule = null;
   constructor() {
-    // Initialize with default values
-    this._safeAreaInsets = this._defaultInsets;
-
-    // Try to connect to native module
-    this.setupNativeConnection();
+    this.addSafeAreaChangedListener();
   }
-  setupNativeConnection() {
-    try {
-      // Access the native module directly without causing getConstants
-      this._nativeModule = NativeModules.SafeAreaManager;
-      if (this._nativeModule) {
-        // Set up event listener using DeviceEventEmitter instead of NativeEventEmitter
-        // This avoids getConstants issues
-        this.setupEventListener();
-
-        // Get initial safe area insets
-        this.getInitialInsets();
-      } else {
-        console.log('SafeAreaInsetsManager: Native SafeAreaManager not available, using defaults');
-      }
-    } catch (error) {
-      console.warn('SafeAreaInsetsManager: Failed to connect to native module:', error);
+  addSafeAreaChangedListener() {
+    if (!NativeSafeAreaManager) {
+      return;
     }
-  }
-  setupEventListener() {
-    try {
-      // Use DeviceEventEmitter instead of NativeEventEmitter to avoid getConstants
-      DeviceEventEmitter.addListener('SafeAreaInsetsDidChangeEvent', data => {
-        if (data) {
-          SafeAreaInsetsCache = data;
-          this._safeAreaInsets = data;
-          this.notifyDelegates(data);
+    const NativeSafeAreaEvents = new NativeEventEmitter(NativeSafeAreaManager);
+    NativeSafeAreaEvents.addListener('SafeAreaInsetsDidChangeEvent', safeAreaInsets => {
+      SafeAreaInsetsCache = safeAreaInsets;
+      this._safeAreaInsets = SafeAreaInsetsCache;
+      _forEach(this._safeAreaChangedDelegates, delegate => {
+        if (delegate.onSafeAreaInsetsDidChangeEvent) {
+          delegate.onSafeAreaInsetsDidChangeEvent(this._safeAreaInsets);
+        } else {
+          console.warn('ERROR', 'SafeAreaInsetsManager', 'safe area changed delegate was added, but it does not implement the onSafeAreaInsetsDidChangeEvent method'); //eslint-disable-line
         }
       });
-    } catch (error) {
-      console.warn('SafeAreaInsetsManager: Failed to setup event listener:', error);
-    }
-  }
-  async getInitialInsets() {
-    if (!this._nativeModule) {
-      return;
-    }
-    try {
-      const insets = await this._nativeModule.getSafeAreaInsets();
-      if (insets) {
-        SafeAreaInsetsCache = insets;
-        this._safeAreaInsets = insets;
-        // Don't notify delegates yet as components might not be ready
-      }
-    } catch (error) {
-      console.warn('SafeAreaInsetsManager: Failed to get initial insets:', error);
-    }
-  }
-  notifyDelegates(insets) {
-    _forEach(this._safeAreaChangedDelegates, delegate => {
-      if (delegate.onSafeAreaInsetsDidChangeEvent) {
-        delegate.onSafeAreaInsetsDidChangeEvent(insets);
-      }
     });
   }
   async _updateInsets() {
-    if (this._nativeModule && SafeAreaInsetsCache === null) {
-      try {
-        const insets = await this._nativeModule.getSafeAreaInsets();
-        if (insets) {
-          SafeAreaInsetsCache = insets;
-          this._safeAreaInsets = SafeAreaInsetsCache;
-        } else {
-          this._safeAreaInsets = this._defaultInsets;
-        }
-      } catch (error) {
-        console.warn('SafeAreaInsetsManager: Failed to get native insets:', error);
-        this._safeAreaInsets = this._defaultInsets;
-      }
-    } else if (SafeAreaInsetsCache !== null) {
+    if (NativeSafeAreaManager && SafeAreaInsetsCache === null) {
+      SafeAreaInsetsCache = await NativeSafeAreaManager.getSafeAreaInsets();
       this._safeAreaInsets = SafeAreaInsetsCache;
-    } else {
-      this._safeAreaInsets = this._defaultInsets;
     }
   }
   async getSafeAreaInsets() {
@@ -111,18 +60,5 @@ class SafeAreaInsetsManager {
   get defaultInsets() {
     return this._defaultInsets;
   }
-
-  // Method to manually refresh safe area insets and notify delegates
-  async refreshSafeAreaInsets() {
-    const previousInsets = this._safeAreaInsets;
-    SafeAreaInsetsCache = null; // Force refresh
-    await this._updateInsets();
-
-    // Notify delegates if insets changed
-    if (!_isEqual(previousInsets, this._safeAreaInsets)) {
-      this.notifyDelegates(this._safeAreaInsets);
-    }
-  }
 }
-const instance = new SafeAreaInsetsManager();
-export default instance;
+export default new SafeAreaInsetsManager();