uilib-native 3.0.6 → 3.0.8

package/android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/debug/jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/debug/jniLibs"/></dataSet></merger>

package/android/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/debug/shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/debug/shaders"/></dataSet></merger>

package/android/build/intermediates/incremental/packageDebugAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/assets"/><source path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/debug/assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/assets"/><source path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/debug/assets"/></dataSet></merger>

package/android/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,2 +1,2 @@
-#Mon Jan 10 14:28:29 IST 2022
-/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/res/layout/wheel_picker.xml=/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/build/intermediates/packaged_res/debug/layout/wheel_picker.xml
+#Wed Mar 16 10:21:34 IST 2022
+/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/res/layout/wheel_picker.xml=/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/build/intermediates/packaged_res/debug/layout/wheel_picker.xml

package/android/build/intermediates/incremental/packageDebugResources/merger.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/res"/><source path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/build/generated/res/rs/debug"/><source path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/res"><file name="wheel_picker" path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/res/layout/wheel_picker.xml" qualifiers="" type="layout"/><file path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/res/values/colors.xml" qualifiers=""><color name="colorPrimary">#3F51B5</color><color name="colorPrimaryDark">#303F9F</color><color name="colorAccent">#FF4081</color><color name="dividerColor">#459FED</color><color name="numberPickerDivider">#FF4081</color><color name="title">#20303c</color></file><file path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/res/values/styles.xml" qualifiers=""><style name="NumberPickerTextColorStyle">
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/res"/><source path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/build/generated/res/rs/debug"/><source path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/res"><file name="wheel_picker" path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/res/layout/wheel_picker.xml" qualifiers="" type="layout"/><file path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/res/values/colors.xml" qualifiers=""><color name="colorPrimary">#3F51B5</color><color name="colorPrimaryDark">#303F9F</color><color name="colorAccent">#FF4081</color><color name="dividerColor">#459FED</color><color name="numberPickerDivider">#FF4081</color><color name="title">#20303c</color></file><file path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/res/values/styles.xml" qualifiers=""><style name="NumberPickerTextColorStyle">
         <item name="android:textColorPrimary">@color/dividerColor</item>
         <item name="android:editTextColor">@color/dividerColor</item>
         <item name="android:textSize">20dp</item>
         <item name="colorControlNormal">@color/dividerColor</item>
-    </style></file></source><source path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/build/generated/res/rs/debug"/><source path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/debug/res"/></dataSet><mergedItems/></merger>
+    </style></file></source><source path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/build/generated/res/rs/debug"/><source path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/debug/res"/></dataSet><mergedItems/></merger>

package/android/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -4,8 +4,8 @@
 4
 5    <uses-sdk
 6        android:minSdkVersion="21"
-6-->/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
+6-->/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
 7        android:targetSdkVersion="30" />
-7-->/Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
+7-->/Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
 8
 9</manifest>

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,25 +1,25 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml:2:1-5:12
-INJECTED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml:2:1-5:12
-INJECTED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml:2:1-5:12
+ADDED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml:2:1-5:12
+INJECTED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml:2:1-5:12
+INJECTED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml:2:1-5:12
 	package
-		ADDED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml:4:5-39
-		INJECTED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
+		ADDED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml:4:5-39
+		INJECTED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
 	xmlns:android
-		ADDED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml:3:5-63
+		ADDED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml:3:5-63
 uses-sdk
-INJECTED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
-INJECTED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
-INJECTED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
-INJECTED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
+INJECTED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
+INJECTED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
+INJECTED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
+INJECTED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
-		ADDED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
+		ADDED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
-		ADDED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/ethans/Documents/workspace/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
+		ADDED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/inbalti/Documents/WIX_PUBLIC/react-native-ui-lib/lib/android/src/main/AndroidManifest.xml

package/components/Keyboard/KeyboardInput/KeyboardAccessoryView.tsx

@@ -9,31 +9,20 @@ import {
   BackHandler,
   LayoutChangeEvent
 } from 'react-native';
-import KeyboardTrackingView from '../KeyboardTracking/KeyboardTrackingView';
+import KeyboardTrackingView, {KeyboardTrackingViewProps} from '../KeyboardTracking/KeyboardTrackingView';
 import CustomKeyboardView from './CustomKeyboardView';
 import KeyboardUtils from './utils/KeyboardUtils';
 
 const IsIOS = Platform.OS === 'ios';
 const IsAndroid = Platform.OS === 'android';
 
-const IOS_SCROLL_BEHAVIORS = IsIOS
-  ? {
-    NONE: NativeModules.KeyboardTrackingViewTempManager?.KeyboardTrackingScrollBehaviorNone,
-    SCROLL_TO_BOTTOM_INVERTED_ONLY:
-        NativeModules.KeyboardTrackingViewTempManager?.KeyboardTrackingScrollBehaviorScrollToBottomInvertedOnly,
-    FIXED_OFFSET: NativeModules.KeyboardTrackingViewTempManager?.KeyboardTrackingScrollBehaviorFixedOffset
-  }
-  : {};
+type kbTrackingViewProps = Pick<KeyboardTrackingViewProps, 'scrollBehavior' | 'revealKeyboardInteractive' | 'manageScrollView' | 'requiresSameParentToManageScrollView' | 'allowHitsOutsideBounds' | 'addBottomView' | 'bottomViewColor' | 'useSafeArea' | 'usesBottomTabs'>;
 
-export type KeyboardAccessoryViewProps = {
+export type KeyboardAccessoryViewProps = kbTrackingViewProps & {
   /**
    * Content to be rendered above the keyboard
    */
   renderContent?: () => React.ReactElement;
-  /**
-   * A callback for when the height is changed
-   */
-  onHeightChanged?: (height: number) => void;
   /**
    * iOS only.
    * The reference to the actual text input (or the keyboard may not reset when instructed to, etc.).
@@ -48,10 +37,14 @@ export type KeyboardAccessoryViewProps = {
    * The props that will be sent to the KeyboardComponent
    */
   kbInitialProps?: any;
+  /**
+   * A callback for when the height is changed
+   */
+  onHeightChanged?: (height: number) => void;
   /**
    * Callback that will be called when an item on the keyboard has been pressed.
    */
-  onItemSelected?: () => void;
+  onItemSelected?: (component?: string, args?: any) => void;
   /**
    * Callback that will be called if KeyboardRegistry.requestShowKeyboard is called.
    */
@@ -61,84 +54,33 @@ export type KeyboardAccessoryViewProps = {
    */
   onKeyboardResigned?: () => void;
   /**
-   * iOS only.
-   * The scrolling behavior, use KeyboardAccessoryView.iosScrollBehaviors.X where X is:
-   * NONE, SCROLL_TO_BOTTOM_INVERTED_ONLY or FIXED_OFFSET
-   *
-   * default: FIXED_OFFSET
+   * @deprecated
+   * Please use 'scrollBehavior' prop instead
+   * The scrolling behavior (use KeyboardAccessoryView.scrollBehaviors.NONE | SCROLL_TO_BOTTOM_INVERTED_ONLY | FIXED_OFFSET)
    */
   iOSScrollBehavior?: number;
-  /**
-   * iOS only.
-   * Show the keyboard on a negative scroll
-   *
-   * default: false
-   */
-  revealKeyboardInteractive?: boolean;
-  /**
-   * iOS only.
-   * Set to false to turn off inset management and manage it yourself
-   *
-   * default: true
-   */
-  manageScrollView?: boolean;
-  /**
-   * iOS only.
-   * Set to true manageScrollView is set to true and still does not work,
-   * it means that the ScrollView found is the wrong one and you'll have
-   * to have the KeyboardAccessoryView and the ScrollView as siblings
-   * and set this to true
-   *
-   * default: false
-   */
-  requiresSameParentToManageScrollView?: boolean;
-  /**
-   * iOS only.
-   * Add a (white) SafeArea view beneath the KeyboardAccessoryView
-   *
-   * default: false
-   */
-  addBottomView?: boolean;
-  /**
-   * iOS only.
-   * Allow hitting sub-views that are placed beyond the view bounds
-   *
-   * default: false
-   */
-  allowHitsOutsideBounds?: boolean;
-
-  /**
-   * iOS only.
-   * Whether or not to handle SafeArea
-   * default: true
-   */
-  useSafeArea?: boolean;
-  /**
-   * iOS only.
-   * Whether or not to include bottom tab bat inset
-   * default: true
-   */
-  usesBottomTabs?: boolean;
-
   children?: React.ReactChild;
 };
 
 /**
  * @description: View that allows replacing the default keyboard with other components
- * @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/nativeComponentScreens/keyboardInput/KeyboardInputViewScreen.js
+ * @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/nativeComponentScreens/keyboardAccessory/KeyboardAccessoryViewScreen.js
  * @gif: https://github.com/wix/react-native-ui-lib/blob/master/demo/showcase/KeyboardAccessoryView/KeyboardAccessoryView.gif?raw=true
  */
 class KeyboardAccessoryView extends Component<KeyboardAccessoryViewProps> {
-
-  static iosScrollBehaviors = IOS_SCROLL_BEHAVIORS;
+  /**
+   * @deprecated Please use KeyboardAccessoryView.scrollBehaviors instead
+   */
+  static iosScrollBehaviors = KeyboardTrackingView.scrollBehaviors; //TODO: remove on V7
+  static scrollBehaviors = KeyboardTrackingView.scrollBehaviors;
 
   static defaultProps = {
-    iOSScrollBehavior: -1,
     revealKeyboardInteractive: false,
     manageScrollView: true,
     requiresSameParentToManageScrollView: false,
     addBottomView: false,
-    allowHitsOutsideBounds: false
+    allowHitsOutsideBounds: false,
+    scrollBehavior: KeyboardTrackingView.scrollBehaviors.FIXED_OFFSET
   };
 
   // TODO: fix
@@ -185,16 +127,6 @@ class KeyboardAccessoryView extends Component<KeyboardAccessoryViewProps> {
     return false;
   }
 
-  getIOSTrackingScrollBehavior() {
-    const {iOSScrollBehavior} = this.props;
-
-    let scrollBehavior = iOSScrollBehavior;
-    if (IsIOS && scrollBehavior === -1) {
-      scrollBehavior = KeyboardAccessoryView.iosScrollBehaviors.FIXED_OFFSET;
-    }
-    return scrollBehavior;
-  }
-
   async getNativeProps() {
     if (this.trackingViewRef) {
       return await this.trackingViewRef.getNativeProps();
@@ -248,44 +180,32 @@ class KeyboardAccessoryView extends Component<KeyboardAccessoryViewProps> {
 
   render() {
     const {
-      revealKeyboardInteractive,
-      manageScrollView,
-      requiresSameParentToManageScrollView,
-      addBottomView,
-      allowHitsOutsideBounds,
       renderContent,
       kbInputRef,
       kbComponent,
       onItemSelected,
       onRequestShowKeyboard,
-      useSafeArea,
-      usesBottomTabs
+      scrollBehavior,
+      iOSScrollBehavior,
+      ...others
     } = this.props;
 
     return (
       <KeyboardTrackingView
+        {...others}
+        scrollBehavior={IsIOS ? iOSScrollBehavior || scrollBehavior : undefined}
         ref={(r: any) => (this.trackingViewRef = r)}
         style={styles.trackingToolbarContainer}
-        // @ts-ignore
         onLayout={this.onContainerComponentHeightChanged}
-        scrollBehavior={this.getIOSTrackingScrollBehavior()}
-        revealKeyboardInteractive={revealKeyboardInteractive}
-        manageScrollView={manageScrollView}
-        requiresSameParentToManageScrollView={requiresSameParentToManageScrollView}
-        addBottomView={addBottomView}
-        allowHitsOutsideBounds={allowHitsOutsideBounds}
-        usesBottomTabs={usesBottomTabs}
       >
-        <>
-          {renderContent?.()}
-        </>
+        <>{renderContent?.()}</>
         <CustomKeyboardView
           inputRef={kbInputRef}
           component={kbComponent}
           initialProps={this.processInitialProps()}
           onItemSelected={onItemSelected}
           onRequestShowKeyboard={onRequestShowKeyboard}
-          useSafeArea={useSafeArea}
+          useSafeArea={others.useSafeArea}
         />
       </KeyboardTrackingView>
     );

package/components/Keyboard/KeyboardInput/KeyboardRegistry.ts

@@ -17,7 +17,7 @@ const getKeyboardsWithIDs = (keyboardIDs: string[]) => {
 
 /**
  * @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/keyboardInput/demoKeyboards.js
+ * @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/nativeComponentScreens/keyboardAccessory/demoKeyboards.js
  */
 export default class KeyboardRegistry {
   static displayName = 'KeyboardRegistry';
@@ -115,6 +115,7 @@ export default class KeyboardRegistry {
   };
 
   /**
+   * @deprecated
    * iOS only (experimental)
    * Call to make the keyboard full screen
    * componentID (string) - the ID of the keyboard.

package/components/Keyboard/KeyboardInput/keyboardAccessoryView.api.json

@@ -0,0 +1,57 @@
+{
+  "name": "KeyboardAccessoryView",
+  "category": "keyboard",
+  "description": "View that allows replacing the default keyboard with other components",
+  "example": "https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/nativeComponentScreens/keyboardAccessory/KeyboardAccessoryViewScreen.js",
+  "images": [
+    "https://github.com/wix/react-native-ui-lib/blob/master/demo/showcase/KeyboardAccessoryView/KeyboardAccessoryView.gif?raw=true"
+  ],
+  "props": [
+    {
+      "name": "renderContent",
+      "type": "() => React.ReactElement",
+      "description": "Content to be rendered above the keyboard"
+    },
+    {
+      "name": "kbInputRef",
+      "type": "any",
+      "description": "The reference to the actual text input (or the keyboard may not reset when instructed to, etc.).\niOS only.",
+      "required": true
+    },
+    {
+      "name": "kbComponent",
+      "type": "string",
+      "description": "The keyboard ID (the componentID sent to KeyboardRegistry)"
+    },
+    {"name": "kbInitialProps", "type": "any", "description": "The props that will be sent to the KeyboardComponent"},
+    {
+      "name": "onHeightChanged",
+      "type": "(height: number) => void",
+      "description": "A callback for when the height is changed"
+    },
+    {
+      "name": "onItemSelected",
+      "type": "() => void",
+      "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."
+    },
+    {
+      "name": "onKeyboardResigned",
+      "type": "() => void",
+      "description": "Callback that will be called once the keyboard has been closed"
+    }
+  ],
+  "snippet": [
+    "<KeyboardAccessoryView",
+    " renderContent={this.renderContent()}",
+    " kbInputRef={this.inputRef}",
+    " kbComponent={$1}",
+    " kbInitialProps={$2}",
+    " onHeightChanged={this.onHeightChanged()}",
+    " scrollBehavior={KeyboardAccessoryView.scrollBehaviors.NONE$3}",
+    "/>"
+  ]}

package/components/Keyboard/KeyboardInput/keyboardRegistry.api.json

@@ -0,0 +1,50 @@
+{
+  "name": "KeyboardRegistry",
+  "category": "keyboard",
+  "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)."
+    },
+    {
+      "name": "getKeyboard",
+      "type": "static function",
+      "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."
+    },
+    {"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"
+    },
+    {
+      "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."
+    },
+    {
+      "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')"
+    },
+    {
+      "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."
+    },
+    {
+      "name": "requestShowKeyboard",
+      "type": "static function",
+      "description": "Request to show the keyboard\ncomponentID (string) - the ID of the keyboard."
+    }
+  ],
+  "snippet": ["KeyboardRegistry.registerKeyboard('keyboardName$1', () => KeyboardComponent$2)"]
+}

package/components/Keyboard/KeyboardTracking/KeyboardTrackingView/index.tsx

@@ -1,49 +1,89 @@
 import React, {forwardRef} from 'react';
-import {Platform, ViewStyle, ViewProps} from 'react-native';
+import {Platform, NativeModules, ViewStyle, ViewProps} from 'react-native';
 import {default as KeyboardTrackingViewIOS} from './KeyboardTrackingView.ios';
 import {default as KeyboardTrackingViewAndroid} from './KeyboardTrackingView.android';
 
 const isAndroid = Platform.OS === 'android';
+const SCROLL_BEHAVIORS = {
+  NONE: NativeModules.KeyboardTrackingViewTempManager?.KeyboardTrackingScrollBehaviorNone,
+  SCROLL_TO_BOTTOM_INVERTED_ONLY: 
+    NativeModules.KeyboardTrackingViewTempManager?.KeyboardTrackingScrollBehaviorScrollToBottomInvertedOnly,
+  FIXED_OFFSET: NativeModules.KeyboardTrackingViewTempManager?.KeyboardTrackingScrollBehaviorFixedOffset
+};
 
 export type KeyboardTrackingViewProps = ViewProps & {
   /**
-     * Enables tracking of the keyboard when it's dismissed interactively (false by default).
-     * Why? When using an external keyboard (BT),
-     * you still get the keyboard events and the view just hovers when you focus the input.
-     * Also, if you're not using interactive style of dismissing the keyboard
-     * (or if you don't have an input inside this view) it doesn't make sense to track it anyway.
-     * (This is caused because of the usage of inputAccessory to be able to track the
-     * keyboard interactive change and it introduces this bug)
-     */
-   trackInteractive?: boolean;
-   /**
-    * Allow control safe area
-    */
-   useSafeArea?: boolean;
-   /**
-    * Whether or not to include bottom tab bar inset
-    */
-   usesBottomTabs?: boolean;
-
-   scrollToFocusedInput?: boolean;
-   scrollBehavior?: number;
-   revealKeyboardInteractive?: boolean;
-   manageScrollView?: boolean;
-   requiresSameParentToManageScrollView?: boolean;
-   addBottomView?: boolean;
-   allowHitsOutsideBounds?: boolean;
-
-   // Can't figure out what it's supposed to be
-   ref?: any;
-
-   children?: React.ReactChild | React.ReactChild[];
-
-   style?: ViewStyle;
-}
+   * Enables tracking of the keyboard when it's dismissed interactively (false by default).
+   * Why? When using an external keyboard (BT),
+   * you still get the keyboard events and the view just hovers when you focus the input.
+   * Also, if you're not using interactive style of dismissing the keyboard
+   * (or if you don't have an input inside this view) it doesn't make sense to track it anyway.
+   * (This is caused because of the usage of inputAccessory to be able to track the
+   * keyboard interactive change and it introduces this bug)
+   */
+  trackInteractive?: boolean;
+  /**
+   * iOS only.
+   * Show the keyboard on a negative scroll
+   * default: false
+   */
+  revealKeyboardInteractive?: boolean;
+  /**
+   * iOS only.
+   * Set to false to turn off inset management and manage it yourself
+   * default: true
+   */
+  manageScrollView?: boolean;
+  /**
+   * iOS only.
+   * Set to true manageScrollView is set to true and still does not work,
+   * it means that the ScrollView found is the wrong one and you'll have
+   * to have the KeyboardAccessoryView and the ScrollView as siblings
+   * and set this to true
+   *
+   * default: false
+   */
+  requiresSameParentToManageScrollView?: boolean;
+  /**
+   * iOS only.
+   * Allow hitting sub-views that are placed beyond the view bounds
+   *
+   * default: false
+   */
+  allowHitsOutsideBounds?: boolean;
+  scrollToFocusedInput?: boolean;
+  /**
+   * iOS only.
+   * The scrolling behavior (NONE | SCROLL_TO_BOTTOM_INVERTED_ONLY | FIXED_OFFSET)
+   */
+  scrollBehavior?: number;
+  /**
+   * iOS only.
+   * Add a SafeArea view beneath the KeyboardAccessoryView
+   * default: false
+   */
+  addBottomView?: boolean;
+  /**
+   * iOS only.
+   * The bottom view's color
+   * default: 'white'
+   */
+  bottomViewColor?: string;
+  /**
+   * Allow control safe area
+   */
+  useSafeArea?: boolean;
+  /**
+   * Whether or not to include bottom tab bar inset
+   */
+  usesBottomTabs?: boolean;
+  ref?: any;
+  style?: ViewStyle;
+  children?: React.ReactChild | React.ReactChild[];
+};
 
 const KeyboardTrackingView = forwardRef(({children, ...others}: KeyboardTrackingViewProps, ref: any) => {
   const KeyboardTrackingViewContainer = isAndroid ? KeyboardTrackingViewAndroid : KeyboardTrackingViewIOS;
-  
   return (
     <KeyboardTrackingViewContainer {...others} ref={ref}>
       {children}
@@ -51,4 +91,6 @@ const KeyboardTrackingView = forwardRef(({children, ...others}: KeyboardTracking
   );
 });
 
-export default KeyboardTrackingView;
+export default KeyboardTrackingView as (typeof KeyboardTrackingView & {scrollBehaviors: typeof SCROLL_BEHAVIORS});
+// @ts-expect-error
+KeyboardTrackingView.scrollBehaviors = SCROLL_BEHAVIORS;

package/components/Keyboard/KeyboardTracking/KeyboardTrackingView/keyboardTrackingView.api.json

@@ -0,0 +1,95 @@
+{
+  "name": "KeyboardTrackingView",
+  "category": "keyboard",
+  "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"
+  ],
+  "props": [
+    {
+      "name": "trackInteractive",
+      "type": "boolean",
+      "description": "Enables tracking of the keyboard when it's dismissed interactively (false by default).\nWhy? When using an external keyboard (BT),\nyou still get the keyboard events and the view just hovers when you focus the input.\nAlso, if you're not using interactive style of dismissing the keyboard\n(or if you don't have an input inside this view) it doesn't make sense to track it anyway.\n(This is caused because of the usage of inputAccessory to be able to track the keyboard interactive change and it introduces this bug)"
+    },
+    {
+      "name": "scrollToFocusedInput",
+      "type": "boolean",
+      "description": "Should the scrollView scroll to the focused input"
+    },
+    {
+      "name": "scrollBehavior",
+      "type": "number",
+      "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\niOS only.",
+      "note": "iOS only",
+      "default": "false"
+    },
+    {
+      "name": "manageScrollView",
+      "type": "boolean",
+      "description": "Set to false to turn off inset management and manage it yourself\niOS only.",
+      "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\niOS only.",
+      "note": "iOS only",
+      "default": "false"
+    },
+    {
+      "name": "allowHitsOutsideBounds",
+      "type": "boolean",
+      "description": "Allow hitting sub-views that are placed beyond the view bounds\niOS only.",
+      "note": "iOS only",
+      "default": "false"
+    },
+    {
+      "name": "addBottomView",
+      "type": "boolean",
+      "description": "Add a view beneath the KeyboardAccessoryView\niOS only.",
+      "note": "iOS only",
+      "default": "false"
+    },
+    {
+      "name": "bottomViewColor", 
+      "type": "string", 
+      "description": "The bottom view's color\niOS only.",       
+      "note": "iOS only",
+      "default": "white"
+    },
+    {
+      "name": "useSafeArea",
+      "type": "boolean",
+      "description": "Whether or not to handle SafeArea\niOS only.",
+      "note": "iOS only",
+      "default": "true"
+    },
+    {
+      "name": "usesBottomTabs",
+      "type": "boolean",
+      "description": "Whether or not to include bottom tab bar inset\niOS only.",
+      "note": "iOS only",
+      "default": "false"
+    },
+    {"name": "ref", "type": "any", "description": ""},
+    {"name": "style", "type": "ViewStyle", "description": ""}
+  ],
+  "snippet": [
+    "<KeyboardTrackingView",
+    " style={$1}",
+    " trackInteractive",
+    " useSafeArea",
+    ">",
+    " $2",
+    "</KeyboardTrackingView>"
+  ]
+}

package/components/Keyboard/KeyboardTracking/keyboardAwareInsetsView.api.json

@@ -0,0 +1,14 @@
+{
+  "name": "KeyboardAwareInsetsView",
+  "category": "keyboard",
+  "description": "Used to add an inset when a keyboard is used and might hide part of the screen.",
+  "note": "This view is useful only for iOS.",
+  "extends": ["keyboard/KeyboardTrackingView"],
+  "example": "https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/incubatorScreens/IncubatorTextFieldScreen.tsx",
+  "snippet": ["<ScrollView>",
+    "  <TextField/>",
+    "  <TextField/>",
+    "  <KeyboardAwareInsetsView/>",
+    "<ScrollView>"    
+  ]
+}

package/components/index.ts

@@ -2,7 +2,7 @@ import HighlighterOverlayView from './HighlighterOverlayView';
 import SafeAreaSpacerView from './SafeArea/SafeAreaSpacerView';
 import WheelPicker, {WheelPickerProps} from './WheelPicker';
 import SafeAreaInsetsManager from './SafeArea/SafeAreaInsetsManager';
-import Keyboard from './Keyboard';
+import Keyboard, {KeyboardTrackingViewProps, KeyboardAccessoryViewProps} from './Keyboard';
 
 export {
   HighlighterOverlayView,
@@ -10,5 +10,7 @@ export {
   WheelPicker,
   WheelPickerProps,
   SafeAreaInsetsManager,
-  Keyboard
+  Keyboard,
+  KeyboardTrackingViewProps,
+  KeyboardAccessoryViewProps
 };

package/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m

@@ -50,6 +50,7 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
 @property (nonatomic) CGFloat originalHeight;
 @property (nonatomic) KeyboardTrackingScrollBehavior scrollBehavior;
 @property (nonatomic) BOOL addBottomView;
+@property (nonatomic, strong) UIColor *bottomViewColor;
 @property (nonatomic) BOOL useSafeArea;
 @property (nonatomic) BOOL usesBottomTabs;
 @property (nonatomic) BOOL scrollToFocusedInput;
@@ -82,6 +83,7 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
         _bottomViewHeight = kBottomViewHeightTemp;
         
         self.addBottomView = NO;
+        self.bottomViewColor = [UIColor whiteColor];
         self.scrollToFocusedInput = NO;
         self.usesBottomTabs = NO;
         
@@ -443,15 +445,26 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
 -(void)setAddBottomView:(BOOL)addBottomView
 {
     _addBottomView = addBottomView;
+    
     [self addBottomViewIfNecessary];
 }
 
+-(void)setBottomViewColor:(UIColor *)bottomViewColor
+{
+    _bottomViewColor = bottomViewColor;
+
+    if (self.addBottomView && _bottomView != nil) {
+        _bottomView.backgroundColor = _bottomViewColor;
+    }
+}
+
 -(void)addBottomViewIfNecessary
 {
     if (self.addBottomView && _bottomView == nil)
     {
         _bottomView = [UIView new];
-        _bottomView.backgroundColor = [UIColor whiteColor];
+        _bottomView.backgroundColor = self.bottomViewColor;
+        
         [self addSubview:_bottomView];
         [self updateBottomViewFrame];
     }
@@ -505,30 +518,11 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
     });
 }
 
-#pragma mark - root view controller and presenting style
-
-
-- (BOOL)isModal {
-    UIWindow *window = UIApplication.sharedApplication.windows.firstObject;
-    UIViewController *presentedViewController = window.rootViewController.presentedViewController;
-
-    if (presentedViewController != nil) {
-        if ([presentedViewController isKindOfClass:[UINavigationController class]]) {
-            UINavigationController *presented = (UINavigationController*)presentedViewController;
-            if (presented.visibleViewController) {
-                return YES;
-            }
-        }
-    }
-    return NO;
-}
-
 #pragma mark - TabBarController
 
 -(CGFloat)getTabBarHeight
 {
     if (@available(iOS 11.0, *)) {
-        NSLog(@"INBAL usesBottomTabs: %d", self.usesBottomTabs);
         if (self.usesBottomTabs == YES)
         {
             UITabBarController *tabBarController = [UITabBarController new];
@@ -672,6 +666,7 @@ RCT_REMAP_VIEW_PROPERTY(revealKeyboardInteractive, revealKeyboardInteractive, BO
 RCT_REMAP_VIEW_PROPERTY(manageScrollView, manageScrollView, BOOL)
 RCT_REMAP_VIEW_PROPERTY(requiresSameParentToManageScrollView, requiresSameParentToManageScrollView, BOOL)
 RCT_REMAP_VIEW_PROPERTY(addBottomView, addBottomView, BOOL)
+RCT_REMAP_VIEW_PROPERTY(bottomViewColor, bottomViewColor, UIColor)
 RCT_REMAP_VIEW_PROPERTY(useSafeArea, useSafeArea, BOOL)
 RCT_REMAP_VIEW_PROPERTY(usesBottomTabs, usesBottomTabs, BOOL)
 RCT_REMAP_VIEW_PROPERTY(scrollToFocusedInput, scrollToFocusedInput, BOOL)

package/ios/reactnativeuilib.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/reactnativeuilib.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/ios/reactnativeuilib.xcodeproj/xcuserdata/inbalti.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>reactnativeuilib.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uilib-native",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "homepage": "https://github.com/wix/react-native-ui-lib",
   "description": "uilib native components (separated from js components)",
   "main": "components/index.js",

package/android/build/.transforms/faa2afe0bc7898c632042480c288ecc2/results.bin

@@ -1 +0,0 @@
-o/classes