react-native-ui-lib 7.46.2-snapshot.7314 → 7.46.2-snapshot.7316

package/babel.config.js

@@ -1,17 +1,5 @@
 module.exports = {
   presets: ['module:@react-native/babel-preset'],
-  env: {
-    test: {
-      presets: [
-        [
-          'module:@react-native/babel-preset',
-          {
-            disableStaticViewConfigsCodegen: true
-          }
-        ]
-      ]
-    }
-  },
   plugins: [
     'react-native-reanimated/plugin',
     [

package/index.js

@@ -1,4 +1,3 @@
-import 'setimmediate';
 require('./demo/src/index');
 require('./demo/src/demoApp'); // this is separated from demo/src/index by purpose
 

package/lib/android/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 project.ext {
-    buildToolsVersion = rootProject.ext.has("buildToolsVersion") ? rootProject.ext.buildToolsVersion : '35.0.0'
-    minSdkVersion = rootProject.ext.has("minSdkVersion") ? rootProject.ext.minSdkVersion : 24
-    compileSdkVersion = rootProject.ext.has("compileSdkVersion") ? rootProject.ext.compileSdkVersion : 35
-    targetSdkVersion = rootProject.ext.has("targetSdkVersion") ? rootProject.ext.targetSdkVersion : 34
-    supportLibVersion = rootProject.ext.has("supportLibVersion") ? rootProject.ext.supportLibVersion  : '28.0.0'
+    buildToolsVersion = rootProject.ext.has("buildToolsVersion") ? rootProject.ext.buildToolsVersion : '27.0.3'
+    minSdkVersion = rootProject.ext.has("minSdkVersion") ? rootProject.ext.minSdkVersion : 19
+    compileSdkVersion = rootProject.ext.has("compileSdkVersion") ? rootProject.ext.compileSdkVersion : 27
+    targetSdkVersion = rootProject.ext.has("targetSdkVersion") ? rootProject.ext.targetSdkVersion : 25
+    supportLibVersion = rootProject.ext.has("supportLibVersion") ? rootProject.ext.supportLibVersion  : '27.1.1'
 }
 
 android {

package/lib/android/src/main/java/com/wix/reactnativeuilib/UiLibPackageList.java

@@ -6,6 +6,7 @@ import com.facebook.react.ReactPackage;
 import com.wix.reactnativeuilib.dynamicfont.DynamicFontPackage;
 import com.wix.reactnativeuilib.highlighterview.HighlighterViewPackage;
 import com.wix.reactnativeuilib.keyboardinput.KeyboardInputPackage;
+import com.wix.reactnativeuilib.textinput.TextInputDelKeyHandlerPackage;
 
 import java.util.Arrays;
 import java.util.List;
@@ -22,6 +23,7 @@ public class UiLibPackageList {
         return Arrays.asList(
                 new DynamicFontPackage(),
                 new HighlighterViewPackage(),
+                new TextInputDelKeyHandlerPackage(),
                 new KeyboardInputPackage(application)
         );
     }

package/lib/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlighterViewManager.java

@@ -8,15 +8,12 @@ import android.util.SizeF;
 import android.view.View;
 
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.UIManager;
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.NativeViewHierarchyManager;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.uimanager.common.UIManagerType;
 
 import javax.annotation.Nullable;
 
@@ -78,38 +75,33 @@ class HighlighterViewManager extends SimpleViewManager<HighlighterView> {
 
     @ReactProp(name = "highlightViewTag")
     public void setHighlightViewTag(final HighlighterView view, Integer highlightViewTag) {
-        if (highlightViewTag != null) {
-            try {
-                UIManager uiManager = UIManagerHelper.getUIManagerForReactTag(context, highlightViewTag);
-                if (uiManager != null) {
-                    final View resolvedView = uiManager.resolveView(highlightViewTag);
-                    if (resolvedView != null) {
-                        if (resolvedView.getWidth() == 0 || resolvedView.getHeight() == 0) {
-                            resolvedView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-                                @Override
-                                public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                                    float width = right - left;
-                                    float height = bottom - top;
-                                    if (width > 0 && height > 0) {
-                                        setViewBasedHighlightFrame(view, resolvedView);
-                                        resolvedView.removeOnLayoutChangeListener(this);
-                                    }
-                                }
-                            });
-                        } else {
-                            setViewBasedHighlightFrame(view, resolvedView);
+        try {
+            NativeViewHierarchyManager nativeViewHierarchyManager = ReactHacks.getNativeViewHierarchyManager(context.getNativeModule(UIManagerModule.class));
+            if (nativeViewHierarchyManager == null) {
+                return;
+            }
+
+            final View resolvedView = nativeViewHierarchyManager.resolveView(highlightViewTag);
+            if (resolvedView != null) {
+                if (resolvedView.getWidth() == 0 || resolvedView.getHeight() == 0) {
+                    resolvedView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+                        @Override
+                        public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                            float width = right - left;
+                            float height = bottom - top;
+                            if (width > 0 && height > 0) {
+                                setViewBasedHighlightFrame(view, resolvedView);
+                                resolvedView.removeOnLayoutChangeListener(this);
+                            }
                         }
-                    } else {
-                        Log.e("HighlighterView", "was not able to resolve highlightViewTag: " + highlightViewTag.toString());
-                    }
+                    });
                 } else {
-                    Log.e("HighlighterView", "was not able to resolve get uiManager for highlightViewTag: " + highlightViewTag.toString());
+                    setViewBasedHighlightFrame(view, resolvedView);
                 }
-            } catch (IllegalViewOperationException e) {
-                Log.e("HighlighterView", "invalid highlightViewTag: " + highlightViewTag.toString() + " " + e.toString());
             }
-        } else {
-            Log.e("HighlighterView", "highlightViewTag is null");
+        }
+        catch (IllegalViewOperationException e) {
+            Log.e("HighlighterView", "invalid highlightViewTag: " + highlightViewTag.toString() + " " + e.toString());
         }
     }
 

package/lib/android/src/main/java/com/wix/reactnativeuilib/highlighterview/ReactHacks.java

@@ -0,0 +1,30 @@
+package com.wix.reactnativeuilib.highlighterview;
+
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.uimanager.NativeViewHierarchyManager;
+import com.facebook.react.uimanager.UIBlock;
+import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.UIViewOperationQueue;
+
+/**
+ * ¯\_(ツ)_/¯
+ */
+public class ReactHacks {
+
+    /**
+     * {@link NativeViewHierarchyManager} is used to resolve a native view by RN tag ({@link NativeViewHierarchyManager#resolveView}). The only way of obtaining it is by
+     * posting {@link UIBlock} which can take a noticeable amount of time to execute.
+     */
+    @Nullable
+    public static NativeViewHierarchyManager getNativeViewHierarchyManager(UIManagerModule uiManager) {
+        try {
+            UIViewOperationQueue mOperationsQueue = (UIViewOperationQueue) ReflectionUtils.getDeclaredField(uiManager.getUIImplementation(), "mOperationsQueue");
+            return (NativeViewHierarchyManager) ReflectionUtils.getDeclaredField(mOperationsQueue, "mNativeViewHierarchyManager");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

package/lib/android/src/main/java/com/wix/reactnativeuilib/highlighterview/ReflectionUtils.java

@@ -0,0 +1,34 @@
+package com.wix.reactnativeuilib.highlighterview;
+
+
+import androidx.annotation.Nullable;
+
+import java.lang.reflect.Field;
+
+class ReflectionUtils {
+
+    @Nullable
+    static Object getDeclaredField(Object obj, String fieldName) {
+        try {
+            Field f = getField(obj.getClass(), fieldName);
+            if (f == null) {
+                return null;
+            }
+            f.setAccessible(true);
+            return f.get(obj);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private static Field getField(Class clazz, String name) {
+        try {
+            return clazz.getDeclaredField(name);
+        } catch (NoSuchFieldException nsfe) {
+            return getField(clazz.getSuperclass(), name);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}

package/lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/utils/RuntimeUtils.java

@@ -9,7 +9,7 @@ public class RuntimeUtils {
     private static final Runnable sUIUpdateClosure = new Runnable() {
         @Override
         public void run() {
-            // ReactContextHolder.getContext().getNativeModule(UIManagerModule.class).onBatchComplete();
+            ReactContextHolder.getContext().getNativeModule(UIManagerModule.class).onBatchComplete();
         }
     };
 

package/lib/android/src/main/java/com/wix/reactnativeuilib/textinput/DefaultKeyListener.java

@@ -0,0 +1,33 @@
+package com.wix.reactnativeuilib.textinput;
+
+import android.text.Editable;
+import android.text.InputType;
+import android.text.method.KeyListener;
+import android.view.KeyEvent;
+import android.view.View;
+
+class DefaultKeyListener implements KeyListener {
+    @Override
+    public int getInputType() {
+        return InputType.TYPE_NULL;
+    }
+
+    @Override
+    public boolean onKeyDown(View view, Editable text, int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onKeyUp(View view, Editable text, int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onKeyOther(View view, Editable text, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public void clearMetaKeyState(View view, Editable content, int states) {
+    }
+}

package/lib/android/src/main/java/com/wix/reactnativeuilib/textinput/KeyListenerProxy.java

@@ -0,0 +1,53 @@
+package com.wix.reactnativeuilib.textinput;
+
+import android.text.Editable;
+import android.text.method.KeyListener;
+import android.view.KeyEvent;
+import android.view.View;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+
+public class KeyListenerProxy implements KeyListener {
+
+    final private ReactApplicationContext mContext;
+    final private KeyListener mKeyListener;
+
+    KeyListenerProxy(ReactApplicationContext context, KeyListener keyListener) {
+        mContext = context;
+        mKeyListener = keyListener == null ? new DefaultKeyListener() : keyListener;
+    }
+
+    @Override
+    public int getInputType() {
+        return mKeyListener.getInputType();
+    }
+
+    @Override
+    public boolean onKeyDown(View view, Editable text, int keyCode, KeyEvent event) {
+        return mKeyListener.onKeyDown(view, text, keyCode, event);
+    }
+
+    @Override
+    public boolean onKeyUp(View view, Editable text, int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_DEL) {
+            emitBackspacePressEvent();
+        }
+        return mKeyListener.onKeyUp(view, text, keyCode, event);
+    }
+
+    @Override
+    public boolean onKeyOther(View view, Editable text, KeyEvent event) {
+        return mKeyListener.onKeyOther(view, text, event);
+    }
+
+    @Override
+    public void clearMetaKeyState(View view, Editable content, int states) {
+        mKeyListener.clearMetaKeyState(view, content, states);
+    }
+
+    private void emitBackspacePressEvent() {
+        mContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit("onBackspacePress", Arguments.createMap());
+    }
+}

package/lib/android/src/main/java/com/wix/reactnativeuilib/textinput/TextInputDelKeyHandlerModule.java

@@ -0,0 +1,54 @@
+package com.wix.reactnativeuilib.textinput;
+
+import android.util.Log;
+import android.view.View;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.uimanager.IllegalViewOperationException;
+import com.facebook.react.uimanager.NativeViewHierarchyManager;
+import com.facebook.react.uimanager.UIBlock;
+import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.views.textinput.ReactEditText;
+
+public class TextInputDelKeyHandlerModule extends ReactContextBaseJavaModule {
+
+    private final static String REACT_CLASS = "TextInputDelKeyHandler";
+
+    TextInputDelKeyHandlerModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @ReactMethod
+    public void register(final Integer textInputTag) {
+        final ReactApplicationContext reactContext = this.getReactApplicationContext();
+        final UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
+
+        uiManager.addUIBlock(new UIBlock() {
+            public void execute(NativeViewHierarchyManager viewHierarchyManager) {
+                Log.d("ReactNativeJS","registering tag = " + textInputTag);
+                final View view;
+                try {
+                    view = viewHierarchyManager.resolveView(textInputTag);
+                } catch (IllegalViewOperationException e) {
+                    Log.d("ReactNativeJS","no view for tag = " + textInputTag);
+                    e.printStackTrace();
+                    return;
+                }
+                final ReactEditText editText = ViewUtils.getEditTextInView(view);
+
+                if (editText != null) {
+                    Log.d("ReactNativeJS","has editText for tag = " + textInputTag);
+                    final KeyListenerProxy keyListenerProxy = new KeyListenerProxy(reactContext, editText.getKeyListener());
+                    editText.setKeyListener(keyListenerProxy);
+                }
+            }
+        });
+    }
+}

package/lib/android/src/main/java/com/wix/reactnativeuilib/textinput/TextInputDelKeyHandlerPackage.java

@@ -0,0 +1,28 @@
+package com.wix.reactnativeuilib.textinput;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.JavaScriptModule;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class TextInputDelKeyHandlerPackage implements ReactPackage {
+    @Override
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+        return Arrays.<NativeModule>asList(new TextInputDelKeyHandlerModule(reactContext));
+    }
+
+//    @Override
+//    public List<Class<? extends JavaScriptModule>> createJSModules() {
+//        return Collections.emptyList();
+//    }
+
+    @Override
+    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+        return Collections.emptyList();
+    }
+}

package/lib/android/src/main/java/com/wix/reactnativeuilib/textinput/ViewUtils.java

@@ -0,0 +1,36 @@
+package com.wix.reactnativeuilib.textinput;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.views.textinput.ReactEditText;
+
+class ViewUtils {
+
+    @Nullable
+    static ReactEditText getEditTextInView(View view) {
+        if (view == null) {
+            return null;
+        }
+
+        if (view instanceof ReactEditText) {
+            return (ReactEditText) view;
+        }
+
+        if (view instanceof ViewGroup) {
+            final ViewGroup viewGroup = (ViewGroup) view;
+
+            for (int i = 0; i < viewGroup.getChildCount(); i++) {
+                final View child = viewGroup.getChildAt(i);
+                final View childView = getEditTextInView(child);
+
+                if (childView != null) {
+                    return (ReactEditText) childView;
+                }
+            }
+        }
+        return null;
+    }
+}

package/lib/components/{HighlighterOverlayView/index.d.ts → HighlighterOverlayView.d.ts}

@@ -19,7 +19,7 @@ export type HighlighterOverlayViewProps = {
     onRequestClose?: () => void;
     highlightFrame?: HighlightFrameType;
     style?: ViewStyle;
-    highlightViewTag?: number;
+    highlightViewTag?: number | null;
     children?: JSX.Element[] | JSX.Element;
     highlightViewTagParams?: HighlightViewTagParams;
     minimumRectSize?: Pick<HighlightFrameType, 'width' | 'height'>;

package/lib/components/HighlighterOverlayView.js

@@ -0,0 +1,40 @@
+import React from 'react';
+import { requireNativeComponent, processColor, Platform, StyleSheet, Modal } from 'react-native';
+const NativeHighlighterView = requireNativeComponent('HighlighterView');
+const DefaultOverlayColor = 'rgba(0, 0, 0, 0.5)';
+const HighlighterOverlayView = props => {
+  const {
+    overlayColor,
+    borderRadius,
+    strokeColor,
+    strokeWidth,
+    visible,
+    onRequestClose,
+    highlightFrame,
+    style,
+    children,
+    highlightViewTag,
+    highlightViewTagParams,
+    minimumRectSize,
+    innerPadding
+  } = props;
+  let overlayColorToUse = overlayColor || DefaultOverlayColor;
+  let strokeColorToUse = strokeColor;
+  if (Platform.OS === 'android') {
+    // @ts-ignore
+    overlayColorToUse = processColor(overlayColorToUse);
+    // @ts-ignore
+    strokeColorToUse = processColor(strokeColorToUse);
+  }
+  return <Modal visible={!!visible} animationType={'fade'} transparent onRequestClose={() => onRequestClose?.()}>
+      <NativeHighlighterView
+    // @ts-ignore, this became private, not sure if I should remove it 
+    highlightFrame={highlightFrame} style={[style, {
+      ...StyleSheet.absoluteFillObject,
+      backgroundColor: 'transparent'
+    }]} overlayColor={overlayColorToUse} borderRadius={borderRadius} strokeColor={strokeColorToUse} strokeWidth={strokeWidth} highlightViewTag={highlightViewTag} highlightViewTagParams={highlightViewTagParams} minimumRectSize={minimumRectSize} innerPadding={innerPadding} />
+      {children}
+    </Modal>;
+};
+HighlighterOverlayView.displayName = 'IGNORE';
+export default HighlighterOverlayView;

package/lib/components/{HighlighterOverlayView/index.web.d.ts → HighlighterOverlayView.web.d.ts}

@@ -19,7 +19,7 @@ export type HighlighterOverlayViewProps = {
     onRequestClose?: () => void;
     highlightFrame?: HighlightFrameType;
     style?: ViewStyle;
-    highlightViewTag?: number;
+    highlightViewTag?: number | null;
     children?: JSX.Element[] | JSX.Element;
     highlightViewTagParams?: HighlightViewTagParams;
     minimumRectSize?: Pick<HighlightFrameType, 'width' | 'height'>;

package/lib/components/Keyboard/{KeyboardAccessoryView → KeyboardInput}/CustomKeyboardView/CustomKeyboardView.android.d.ts

@@ -1,10 +1,7 @@
 import React from 'react';
-import CustomKeyboardViewBase, { CustomKeyboardViewBaseProps } from './CustomKeyboardViewBase';
+import CustomKeyboardViewBase, { CustomKeyboardViewBaseProps } from '../CustomKeyboardViewBase';
 export default class CustomKeyboardView extends CustomKeyboardViewBase<CustomKeyboardViewBaseProps> {
     static displayName: string;
     componentDidUpdate(prevProps: CustomKeyboardViewBaseProps): Promise<void>;
-    getStyle: () => {
-        height: number | undefined;
-    };
-    render(): React.JSX.Element | null;
+    render(): React.JSX.Element;
 }

package/lib/components/Keyboard/KeyboardInput/CustomKeyboardView/CustomKeyboardView.android.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import { requireNativeComponent } from 'react-native';
+import TextInputKeyboardManager from "../TextInputKeyboardManager/TextInputKeyboardManager.android";
+import KeyboardRegistry from "../KeyboardRegistry";
+import CustomKeyboardViewBase from "../CustomKeyboardViewBase";
+const CustomKeyboardViewNativeAndroid = requireNativeComponent('CustomKeyboardViewNativeTemp');
+export default class CustomKeyboardView extends CustomKeyboardViewBase {
+  static displayName = 'IGNORE';
+  async componentDidUpdate(prevProps) {
+    const {
+      component
+    } = this.props;
+    if (prevProps.component !== component && !component) {
+      await TextInputKeyboardManager.reset();
+    }
+    super.componentDidUpdate(prevProps);
+  }
+  render() {
+    const {
+      component,
+      initialProps
+    } = this.props;
+    const KeyboardComponent = component && KeyboardRegistry.getKeyboard(component);
+    return <CustomKeyboardViewNativeAndroid>
+        {KeyboardComponent && <KeyboardComponent {...initialProps} />}
+      </CustomKeyboardViewNativeAndroid>;
+  }
+}

package/lib/components/Keyboard/{KeyboardAccessoryView → KeyboardInput}/CustomKeyboardView/CustomKeyboardView.ios.d.ts

@@ -1,4 +1,4 @@
-import CustomKeyboardViewBase, { CustomKeyboardViewBaseProps } from './CustomKeyboardViewBase';
+import CustomKeyboardViewBase, { CustomKeyboardViewBaseProps } from './../CustomKeyboardViewBase';
 export type CustomKeyboardViewProps = CustomKeyboardViewBaseProps & {
     /**
      * The reference to the actual text input (or the keyboard may not reset when instructed to, etc.)

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

@@ -1,6 +1,6 @@
-import TextInputKeyboardManager from "../TextInputKeyboardManager/TextInputKeyboardManager.ios";
-import KeyboardRegistry from "../KeyboardRegistry";
-import CustomKeyboardViewBase from "./CustomKeyboardViewBase";
+import TextInputKeyboardManager from "./../TextInputKeyboardManager/TextInputKeyboardManager.ios";
+import KeyboardRegistry from "./../KeyboardRegistry";
+import CustomKeyboardViewBase from "./../CustomKeyboardViewBase";
 export default class CustomKeyboardView extends CustomKeyboardViewBase {
   static displayName = 'IGNORE';
   static defaultProps = {

package/lib/components/Keyboard/{KeyboardAccessoryView/CustomKeyboardView → KeyboardInput}/CustomKeyboardViewBase.d.ts

@@ -3,9 +3,6 @@ import { EventSubscription } from 'react-native';
 export type CustomKeyboardViewBaseProps = {
     inputRef?: any;
     initialProps?: any;
-    keyboardHeight?: number;
-    onKeyboardDismiss?: () => void;
-    shouldFocus?: boolean;
     component?: string;
     onItemSelected?: (component?: string, args?: any) => void;
     onRequestShowKeyboard?: (keyboardId: string) => void;

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

@@ -1,5 +1,5 @@
 import { Component } from 'react';
-import KeyboardRegistry from "../KeyboardRegistry";
+import KeyboardRegistry from "./KeyboardRegistry";
 export default class CustomKeyboardViewBase extends Component {
   static defaultProps = {
     initialProps: {}

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

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { LayoutChangeEvent } from 'react-native';
-import { KeyboardTrackingViewProps } from '../KeyboardTrackingView';
+import { KeyboardTrackingViewProps } from '../KeyboardTracking/KeyboardTrackingView';
 type kbTrackingViewProps = Pick<KeyboardTrackingViewProps, 'scrollBehavior' | 'revealKeyboardInteractive' | 'manageScrollView' | 'requiresSameParentToManageScrollView' | 'allowHitsOutsideBounds' | 'addBottomView' | 'bottomViewColor' | 'useSafeArea' | 'usesBottomTabs'>;
 export type KeyboardAccessoryViewProps = kbTrackingViewProps & {
     /**
@@ -58,16 +58,9 @@ declare class KeyboardAccessoryView extends Component<KeyboardAccessoryViewProps
         allowHitsOutsideBounds: boolean;
         scrollBehavior: any;
     };
-    static currentId: number;
     customInputControllerEventsSubscriber: any;
     trackingViewRef: any;
-    subscription: any;
-    id: number;
     constructor(props: KeyboardAccessoryViewProps);
-    state: {
-        keyboardHeight: number;
-        shouldFocus: boolean;
-    };
     componentWillUnmount(): void;
     onContainerComponentHeightChanged(event: LayoutChangeEvent): void;
     onAndroidBackPressed(): boolean;
@@ -76,9 +69,6 @@ declare class KeyboardAccessoryView extends Component<KeyboardAccessoryViewProps
     registerAndroidBackHandler(): void;
     processInitialProps(): any;
     scrollToStart(): void;
-    onKeyboardHeightChange: (keyboardHeight: number) => void;
-    onDismiss: () => void;
-    onKeyboardDismiss: () => void;
     render(): React.JSX.Element;
 }
 export default KeyboardAccessoryView;