@mpxjs/webpack-plugin 2.10.14-beta.4 → 2.10.14-beta.5

package/lib/runtime/components/react/dist/mpx-web-view.d.ts

@@ -0,0 +1,22 @@
+/// <reference types="react" />
+import { WebView } from 'react-native-webview';
+import { HandlerRef } from './useNodesRef';
+type OnMessageCallbackEvent = {
+    detail: {
+        data: any[];
+    };
+};
+type CommonCallbackEvent = {
+    detail: {
+        src?: string;
+    };
+};
+interface WebViewProps {
+    src?: string;
+    bindmessage?: (event: OnMessageCallbackEvent) => void;
+    bindload?: (event: CommonCallbackEvent) => void;
+    binderror?: (event: CommonCallbackEvent) => void;
+    [x: string]: any;
+}
+declare const _WebView: import("react").ForwardRefExoticComponent<Omit<WebViewProps, "ref"> & import("react").RefAttributes<HandlerRef<WebView<{}>, WebViewProps>>>;
+export default _WebView;

package/lib/runtime/components/react/dist/nav.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="react" />
+export declare function useInnerHeaderHeight(pageConfig: PageConfig): number;
+export interface MpxNavProps {
+    pageConfig: PageConfig;
+    navigation: any;
+}
+export interface MpxNavFactorOptions {
+    Mpx: any;
+}
+declare function createMpxNav(options: MpxNavFactorOptions): import("react").MemoExoticComponent<({ pageConfig, navigation }: MpxNavProps) => import("react").JSX.Element>;
+export default createMpxNav;

package/lib/runtime/components/react/dist/nav.jsx

@@ -0,0 +1,141 @@
+/* eslint-disable space-before-function-paren */
+import { useState, useMemo, memo } from 'react';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import { StatusBar, processColor, TouchableWithoutFeedback, Image, View, StyleSheet, Text } from 'react-native';
+import { useNavShared } from './useNavShared';
+function convertToHex(color) {
+    try {
+        const intColor = processColor(color);
+        if (intColor === null || intColor === undefined) {
+            return null;
+        }
+        // 将32位整数颜色值转换为RGBA
+        const r = (intColor >> 16) & 255;
+        const g = (intColor >> 8) & 255;
+        const b = intColor & 255;
+        // 转换为十六进制
+        const hexR = r.toString(16).padStart(2, '0');
+        const hexG = g.toString(16).padStart(2, '0');
+        const hexB = b.toString(16).padStart(2, '0');
+        return `#${hexR}${hexG}${hexB}`;
+    }
+    catch (error) {
+        return null;
+    }
+}
+const titleHeight = 44;
+export function useInnerHeaderHeight(pageConfig) {
+    const safeArea = useSafeAreaInsets();
+    if (pageConfig.navigationStyle === 'custom') {
+        return 0;
+    }
+    else {
+        const safeAreaTop = safeArea?.top || 0;
+        const headerHeight = safeAreaTop + titleHeight;
+        return headerHeight;
+    }
+}
+const styles = StyleSheet.create({
+    header: {
+        elevation: 3
+    },
+    headerContent: {
+        flexDirection: 'row',
+        alignItems: 'center',
+        justifyContent: 'center'
+    },
+    backButton: {
+        position: 'absolute',
+        height: '100%',
+        width: 40,
+        left: 0,
+        top: 0,
+        alignItems: 'center',
+        justifyContent: 'center'
+    },
+    backButtonImage: {
+        width: 22,
+        height: 22
+    },
+    title: {
+        fontSize: 17,
+        fontWeight: 600,
+        width: '60%',
+        textAlign: 'center'
+    }
+});
+const NavColor = {
+    White: '#ffffff',
+    Black: '#000000'
+};
+// navigationBarTextStyle 只支持黑白 'white'/'black
+const validBarTextStyle = (textStyle) => {
+    const textStyleColor = convertToHex(textStyle);
+    if (textStyle && textStyleColor && [NavColor.White, NavColor.Black].includes(textStyleColor)) {
+        return textStyleColor;
+    }
+    else {
+        return NavColor.White;
+    }
+};
+const BACK_ICON = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAABICAYAAACqT5alAAAA2UlEQVR4nO3bMQrCUBRE0Yla6AYEN2nnBrTL+izcitW3MRDkEUWSvPzJvfCqgMwhZbAppWhNbbIHzB1g9wATERFRVyvpkj1irlpJ5X326D7WHh1hbdFD2CLpLmmftm7kfsEe09aNHFiBrT+wAlt/YAW2/sAKbP2BFdj6Ayuwy+ufz6XPL893krZ//O6iu2n4LT8kndLWTRTo4EC7BDo40C6BDg60S6CDA+0S6OBAuwQ6uNWiD2nrJmoIfU7cNWkR2hbb1UfbY7uuWhGWiIg+a/iHuHmA3QPs3gu4JW9Gan+OJAAAAABJRU5ErkJggg==';
+function createMpxNav(options) {
+    const { Mpx } = options;
+    const innerNav = memo(({ pageConfig, navigation }) => {
+        const [innerPageConfig, setPageConfig] = useState(pageConfig || {});
+        const [customNav] = useNavShared();
+        const safeAreaTop = useSafeAreaInsets()?.top || 0;
+        navigation.setPageConfig = (config) => {
+            setPageConfig(Object.assign({}, innerPageConfig, config));
+        };
+        const isCustom = innerPageConfig.navigationStyle === 'custom';
+        const navigationBarTextStyle = useMemo(() => validBarTextStyle(innerPageConfig.navigationBarTextStyle), [innerPageConfig.navigationBarTextStyle]);
+        // 状态栏的颜色
+        const statusBarElement = (<StatusBar translucent backgroundColor='transparent' barStyle={navigationBarTextStyle === NavColor.White ? 'light-content' : 'dark-content'}></StatusBar>);
+        if (isCustom)
+            return (<>
+          {statusBarElement}
+          {customNav}
+        </>);
+        // 假设是栈导航，获取栈的长度
+        const stackLength = navigation.getState()?.routes?.length;
+        const onStackTopBack = Mpx.config?.rnConfig?.onStackTopBack;
+        const isHandleStackTopBack = typeof onStackTopBack === 'function';
+        // 回退按钮与图标
+        // prettier-ignore
+        const backElement = stackLength > 1 || isHandleStackTopBack
+            ? (<TouchableWithoutFeedback onPress={() => {
+                    if (stackLength <= 1 && isHandleStackTopBack) {
+                        onStackTopBack();
+                        return;
+                    }
+                    navigation.goBack();
+                }}>
+          <View style={[styles.backButton]}>
+            <Image style={[styles.backButtonImage, { tintColor: navigationBarTextStyle }]} source={{ uri: BACK_ICON }}></Image>
+          </View>
+        </TouchableWithoutFeedback>)
+            : null;
+        return (<View style={[
+                styles.header,
+                {
+                    paddingTop: safeAreaTop,
+                    backgroundColor: innerPageConfig.navigationBarBackgroundColor || '#000000'
+                }
+            ]}>
+        {statusBarElement}
+        {/* TODO: 确定 height 的有效性 */}
+        {/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */}
+        {/* @ts-expect-error */}
+        <View style={styles.headerContent} height={titleHeight}>
+          {backElement}
+          <Text style={[styles.title, { color: navigationBarTextStyle }]} numberOfLines={1}>
+            {innerPageConfig.navigationBarTitleText?.trim() || ''}
+          </Text>
+        </View>
+      </View>);
+    });
+    innerNav.displayName = 'MpxNav';
+    return innerNav;
+}
+export default createMpxNav;

package/lib/runtime/components/react/dist/parser.d.ts

@@ -0,0 +1,39 @@
+interface Token {
+    type: string;
+    value: string | number;
+}
+interface ExpressionNode {
+    type: 'NUMBER';
+    value: number;
+}
+export declare class ExpressionParser {
+    private tokens;
+    private formatter;
+    private functions;
+    private current;
+    constructor(input: string, formatter?: (val: string) => number, functions?: {
+        [key: string]: (...args: number[]) => number;
+    });
+    tokenize(input: string): Token[];
+    parse(): ExpressionNode;
+    private expression;
+    private term;
+    private factor;
+    private parseArguments;
+    private applyOperator;
+    private applyFunction;
+}
+interface FuncInfo {
+    start: number;
+    end: number;
+    args: string[];
+}
+export declare function parseFunc(str: string, funcName: string): FuncInfo[];
+export declare class ReplaceSource {
+    private _source;
+    private _replacements;
+    constructor(source: string);
+    replace(start: number, end: number, content: string): void;
+    source(): string;
+}
+export {};

package/lib/runtime/components/react/dist/useAnimationHooks.d.ts

@@ -0,0 +1,32 @@
+import type { MutableRefObject } from 'react';
+import type { NativeSyntheticEvent } from 'react-native';
+import { ExtendedViewStyle } from './types/common';
+import type { _ViewProps } from './mpx-view';
+type AnimatedOption = {
+    duration: number;
+    delay: number;
+    useNativeDriver: boolean;
+    timingFunction: 'linear' | 'ease' | 'ease-in' | 'ease-in-out' | 'ease-out';
+    transformOrigin: string;
+};
+export type AnimationStepItem = {
+    animatedOption: AnimatedOption;
+    rules: Map<string, number | string>;
+    transform: Map<string, number>;
+};
+export type AnimationProp = {
+    id: number;
+    actions: AnimationStepItem[];
+};
+export default function useAnimationHooks<T, P>(props: _ViewProps & {
+    enableAnimation?: boolean;
+    layoutRef: MutableRefObject<any>;
+    transitionend?: (event: NativeSyntheticEvent<TouchEvent> | unknown) => void;
+}): {
+    enableStyleAnimation: boolean;
+    animationStyle?: undefined;
+} | {
+    enableStyleAnimation: true;
+    animationStyle: ExtendedViewStyle;
+};
+export {};

package/lib/runtime/components/react/dist/useNavShared.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare function useNavShared(): readonly [import("react").ReactNode, (value: import("react").ReactNode) => void];

package/lib/runtime/components/react/dist/useNavShared.js

@@ -0,0 +1,6 @@
+import { useContext } from 'react';
+import { NavSharedContext } from './context';
+export function useNavShared() {
+    const navSharedValue = useContext(NavSharedContext);
+    return [navSharedValue.customNav, navSharedValue.setCustomNav];
+}

package/lib/runtime/components/react/dist/useNodesRef.d.ts

@@ -0,0 +1,11 @@
+import { RefObject, ForwardedRef } from 'react';
+type Obj = Record<string, any>;
+export type HandlerRef<T, P> = {
+    getNodeInstance(): {
+        props: RefObject<P>;
+        nodeRef: RefObject<T>;
+        instance: Obj;
+    };
+};
+export default function useNodesRef<T, P>(props: P, ref: ForwardedRef<HandlerRef<T, P>>, nodeRef: RefObject<T>, instance?: Obj): void;
+export {};

package/lib/runtime/components/react/dist/utils.d.ts

@@ -0,0 +1,122 @@
+import { ReactNode, ReactElement, Dispatch, SetStateAction, MutableRefObject } from 'react';
+import { LayoutChangeEvent, TextStyle, ImageProps } from 'react-native';
+import { FastImageProps } from '@d11/react-native-fast-image';
+import type { AnyFunc } from './types/common';
+export declare const TEXT_STYLE_REGEX: RegExp;
+export declare const PERCENT_REGEX: RegExp;
+export declare const URL_REGEX: RegExp;
+export declare const SVG_REGEXP: RegExp;
+export declare const BACKGROUND_REGEX: RegExp;
+export declare const TEXT_PROPS_REGEX: RegExp;
+export declare const DEFAULT_FONT_SIZE = 16;
+export declare const HIDDEN_STYLE: {
+    opacity: number;
+};
+export declare const isIOS: boolean;
+export declare const isAndroid: boolean;
+export declare const isHarmony: boolean;
+export declare function useNavigation(): Record<string, any> | undefined;
+export declare function omit<T, K extends string>(obj: T, fields: K[]): Omit<T, K>;
+/**
+ * 用法等同于 useEffect，但是会忽略首次执行，只在依赖更新时执行
+ */
+export declare const useUpdateEffect: (effect: any, deps: any) => void;
+export declare const parseUrl: (cssUrl?: string) => string | undefined;
+export declare const getRestProps: (transferProps?: any, originProps?: any, deletePropsKey?: any) => any;
+export declare function isText(ele: ReactNode): ele is ReactElement;
+export declare function every(children: ReactNode, callback: (children: ReactNode) => boolean): boolean;
+type GroupData<T> = Record<string, Partial<T>>;
+export declare function groupBy<T extends Record<string, any>>(obj: T, callback: (key: string, val: T[keyof T]) => string, group?: GroupData<T>): GroupData<T>;
+export declare function splitStyle<T extends Record<string, any>>(styleObj: T): {
+    textStyle?: Partial<T>;
+    backgroundStyle?: Partial<T>;
+    innerStyle?: Partial<T>;
+};
+interface TransformStyleConfig {
+    enableVar?: boolean;
+    externalVarContext?: Record<string, any>;
+    parentFontSize?: number;
+    parentWidth?: number;
+    parentHeight?: number;
+}
+export declare function useTransformStyle(styleObj: Record<string, any> | undefined, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight }: TransformStyleConfig): {
+    hasVarDec: boolean;
+    varContextRef: MutableRefObject<{}>;
+    setWidth: Dispatch<SetStateAction<number>>;
+    setHeight: Dispatch<SetStateAction<number>>;
+    normalStyle: Record<string, any>;
+    hasSelfPercent: boolean;
+    hasPositionFixed: boolean;
+};
+export interface VisitorArg {
+    target: Record<string, any>;
+    key: string;
+    value: any;
+    keyPath: Array<string>;
+}
+export declare function traverseStyle(styleObj: Record<string, any>, visitors: Array<(arg: VisitorArg) => void>): void;
+export declare function setStyle(styleObj: Record<string, any>, keyPath: Array<string>, setter: (arg: VisitorArg) => void): void;
+export declare function splitProps<T extends Record<string, any>>(props: T): {
+    textProps?: Partial<T>;
+    innerProps?: Partial<T>;
+};
+interface LayoutConfig {
+    props: Record<string, any>;
+    hasSelfPercent: boolean;
+    setWidth?: Dispatch<SetStateAction<number>>;
+    setHeight?: Dispatch<SetStateAction<number>>;
+    onLayout?: (event?: LayoutChangeEvent) => void;
+    nodeRef: React.RefObject<any>;
+}
+export declare const useLayout: ({ props, hasSelfPercent, setWidth, setHeight, onLayout, nodeRef }: LayoutConfig) => {
+    layoutRef: MutableRefObject<{}>;
+    layoutStyle: {};
+    layoutProps: Record<string, any>;
+};
+export interface WrapChildrenConfig {
+    hasVarDec: boolean;
+    varContext?: Record<string, any>;
+    textStyle?: TextStyle;
+    textProps?: Record<string, any>;
+}
+export declare function wrapChildren(props: Record<string, any> | undefined, { hasVarDec, varContext, textStyle, textProps }: WrapChildrenConfig): any;
+export declare const debounce: <T extends AnyFunc>(func: T, delay: number) => ((...args: Parameters<T>) => void) & {
+    clear: () => void;
+};
+export declare const useDebounceCallback: <T extends AnyFunc>(func: T, delay: number) => ((...args: Parameters<T>) => void) & {
+    clear: () => void;
+};
+export declare const useStableCallback: <T extends AnyFunc | null | undefined>(callback: T) => T extends AnyFunc ? T : () => void;
+export declare function usePrevious<T>(value: T): T | undefined;
+export interface GestureHandler {
+    nodeRefs?: Array<{
+        getNodeInstance: () => {
+            nodeRef: unknown;
+        };
+    }>;
+    current?: unknown;
+}
+export declare function flatGesture(gestures?: Array<GestureHandler>): any[];
+export declare const extendObject: {
+    <T extends {}, U>(target: T, source: U): T & U;
+    <T_1 extends {}, U_1, V>(target: T_1, source1: U_1, source2: V): T_1 & U_1 & V;
+    <T_2 extends {}, U_2, V_1, W>(target: T_2, source1: U_2, source2: V_1, source3: W): T_2 & U_2 & V_1 & W;
+    (target: object, ...sources: any[]): any;
+};
+export declare function getCurrentPage(pageId: number | null | undefined): any;
+export declare function renderImage(imageProps: ImageProps | FastImageProps, enableFastImage?: boolean): ReactElement<ImageProps | FastImageProps, string | import("react").JSXElementConstructor<any>>;
+export declare function pickStyle(styleObj: Record<string, any> | undefined, pickedKeys: Array<string>, callback?: (key: string, val: number | string) => number | string): Record<string, any>;
+export declare function useHover({ enableHover, hoverStartTime, hoverStayTime, disabled }: {
+    enableHover: boolean;
+    hoverStartTime: number;
+    hoverStayTime: number;
+    disabled?: boolean;
+}): {
+    isHover: boolean;
+    gesture?: undefined;
+} | {
+    isHover: boolean;
+    gesture: import("react-native-gesture-handler/lib/typescript/handlers/gestures/panGesture").PanGesture;
+};
+export declare function useRunOnJSCallback(callbackMapRef: MutableRefObject<Record<string, AnyFunc>>): (key: string, ...args: any) => any;
+export {};

package/lib/runtime/components/react/mpx-input.tsx

@@ -102,6 +102,13 @@ export interface InputProps {
   'parent-width'?: number
   'parent-height'?: number
   'adjust-position': boolean,
+  /**
+   * @default true
+   * @platform android
+   *
+   * adnroid 是否开启原生键盘遮挡
+   */
+  'enable-native-keyboard-avoiding'?: boolean,
   bindinput?: (evt: NativeSyntheticEvent<TextInputTextInputEventData> | unknown) => void
   bindfocus?: (evt: NativeSyntheticEvent<TextInputFocusEventData> | unknown) => void
   bindblur?: (evt: NativeSyntheticEvent<TextInputFocusEventData> | unknown) => void
@@ -150,6 +157,7 @@ const Input = forwardRef<HandlerRef<TextInput, FinalInputProps>, FinalInputProps
     'parent-width': parentWidth,
     'parent-height': parentHeight,
     'adjust-position': adjustPosition = true,
+    'enable-native-keyboard-avoiding': enableNativeKeyboardAvoiding = true,
     bindinput,
     bindfocus,
     bindblur,
@@ -280,8 +288,8 @@ const Input = forwardRef<HandlerRef<TextInput, FinalInputProps>, FinalInputProps
   }
 
   const setKeyboardAvoidContext = () => {
-    if (adjustPosition && keyboardAvoid) {
-      keyboardAvoid.current = { cursorSpacing, ref: nodeRef }
+    if (keyboardAvoid) {
+      keyboardAvoid.current = { cursorSpacing, ref: nodeRef, adjustPosition, enableNativeKeyboardAvoiding }
     }
   }
 
@@ -295,20 +303,39 @@ const Input = forwardRef<HandlerRef<TextInput, FinalInputProps>, FinalInputProps
   }
 
   const onFocus = (evt: NativeSyntheticEvent<TextInputFocusEventData>) => {
-    setKeyboardAvoidContext()
-    bindfocus && bindfocus(
-      getCustomEvent(
-        'focus',
-        evt,
-        {
-          detail: {
-            value: tmpValue.current || ''
-          },
-          layoutRef
-        },
-        props
-      )
-    )
+    if (!keyboardAvoid?.current) {
+      setKeyboardAvoidContext()
+    }
+
+    if (bindfocus && keyboardAvoid?.current) {
+      const focusAction = () => {
+        bindfocus(
+          getCustomEvent(
+            'focus',
+            evt,
+            {
+              detail: {
+                value: tmpValue.current || '',
+                height: keyboardAvoid.current?.keyboardHeight,
+              },
+              layoutRef
+            },
+            props
+          )
+        )
+        if (keyboardAvoid.current?.onKeyboardShow) {
+          keyboardAvoid.current.onKeyboardShow = undefined
+        }
+      }
+      if (keyboardAvoid.current.keyboardHeight) {
+        // iOS: keyboard 获取高度时机 keyboardWillShow 在 input focus 之前，可以立即执行
+        focusAction()
+      } else {
+        // Android,Harmony: keyboard 获取高度时机 keyboardDidShow 在 input focus 之后，需要延迟回调
+        evt.persist()
+        keyboardAvoid.current.onKeyboardShow = focusAction
+      }
+    }
   }
 
   const onBlur = (evt: NativeSyntheticEvent<TextInputFocusEventData>) => {

package/lib/runtime/components/react/mpx-keyboard-avoiding-view.tsx

@@ -2,7 +2,7 @@ import React, { ReactNode, useContext, useEffect, useRef } from 'react'
 import { DimensionValue, EmitterSubscription, Keyboard, View, ViewStyle, NativeSyntheticEvent, NativeTouchEvent } from 'react-native'
 import Animated, { useSharedValue, useAnimatedStyle, withTiming, Easing, cancelAnimation } from 'react-native-reanimated'
 import { KeyboardAvoidContext } from './context'
-import { isIOS } from './utils'
+import { isAndroid, isIOS } from './utils'
 
 type KeyboardAvoidViewProps = {
   children?: ReactNode
@@ -25,7 +25,8 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }: Keyboa
   const timerRef = useRef<NodeJS.Timeout | null>(null)
 
   const animatedStyle = useAnimatedStyle(() => ({
-    transform: [{ translateY: -offset.value }],
+    // translate/position top可能会导致地步渲染区域缺失
+    marginTop: -offset.value,
     flexBasis: basic.value as DimensionValue
   }))
 
@@ -38,6 +39,11 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }: Keyboa
     timerRef.current && clearTimeout(timerRef.current)
 
     if (keyboardAvoid?.current) {
+      const inputRef = keyboardAvoid.current.ref?.current
+      if (inputRef && inputRef.isFocused()) {
+        // 修复 Android 点击键盘收起按钮时当前 input 没触发失焦的问题
+        inputRef.blur()
+      }
       keyboardAvoid.current = null
     }
 
@@ -55,64 +61,62 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }: Keyboa
   useEffect(() => {
     let subscriptions: EmitterSubscription[] = []
 
-    if (isIOS) {
-      subscriptions = [
-        Keyboard.addListener('keyboardWillShow', (evt: any) => {
-          if (!keyboardAvoid?.current || isShow.current) {
-            return
-          }
+    function keybaordAvoding(evt: any, ios = false) {
+      if (!keyboardAvoid?.current || isShow.current) {
+        return
+      }
 
-          isShow.current = true
-          timerRef.current && clearTimeout(timerRef.current)
+      isShow.current = true
 
-          const { endCoordinates } = evt
-          const { ref, cursorSpacing = 0 } = keyboardAvoid.current
+      if (ios) {
+        timerRef.current && clearTimeout(timerRef.current)
+      }
+
+      const { endCoordinates } = evt
+      const { ref, cursorSpacing = 0, adjustPosition, onKeyboardShow, enableNativeKeyboardAvoiding } = keyboardAvoid.current
+      keyboardAvoid.current.keyboardHeight = endCoordinates.height
+      onKeyboardShow?.()
+      if (adjustPosition) {
+        timerRef.current = setTimeout(() => {
+          ref?.current?.measure((x: number, y: number, width: number, height: number, pageX: number, pageY: number) => {
+            function calculateOffset() {
+              // enableNativeKeyboardAvoding 默认开启
+              if (enableNativeKeyboardAvoiding && isAndroid) {
+                const aboveOffset = pageY + height - endCoordinates.screenY
+                const belowOffset = endCoordinates.height - aboveOffset
+                const aboveValue = -aboveOffset >= cursorSpacing ? 0 : aboveOffset + cursorSpacing
+                const belowValue = Math.min(belowOffset, cursorSpacing)
+                return aboveOffset > 0 ? belowValue : aboveValue
+              }
 
-          timerRef.current = setTimeout(() => {
-            ref?.current?.measure((x: number, y: number, width: number, height: number, pageX: number, pageY: number) => {
               const aboveOffset = offset.value + pageY + height - endCoordinates.screenY
               const aboveValue = -aboveOffset >= cursorSpacing ? 0 : aboveOffset + cursorSpacing
               const belowValue = Math.min(endCoordinates.height, aboveOffset + cursorSpacing)
-              const value = aboveOffset > 0 ? belowValue : aboveValue
-              cancelAnimation(offset)
-              offset.value = withTiming(value, { duration, easing }, (finished) => {
-                if (finished) {
-                  // Set flexBasic after animation to trigger re-layout and reset layout information
-                  basic.value = '99.99%'
-                }
-              })
-            })
-          })
-        }),
-        Keyboard.addListener('keyboardWillHide', resetKeyboard)
-      ]
-    } else {
-      subscriptions = [
-        Keyboard.addListener('keyboardDidShow', (evt: any) => {
-          if (!keyboardAvoid?.current || isShow.current) {
-            return
-          }
+              return aboveOffset > 0 ? belowValue : aboveValue
+            }
 
-          isShow.current = true
-
-          const { endCoordinates } = evt
-          const { ref, cursorSpacing = 0 } = keyboardAvoid.current
-
-          ref?.current?.measure((x: number, y: number, width: number, height: number, pageX: number, pageY: number) => {
-            const aboveOffset = pageY + height - endCoordinates.screenY
-            const belowOffset = endCoordinates.height - aboveOffset
-            const aboveValue = -aboveOffset >= cursorSpacing ? 0 : aboveOffset + cursorSpacing
-            const belowValue = Math.min(belowOffset, cursorSpacing)
-            const value = aboveOffset > 0 ? belowValue : aboveValue
             cancelAnimation(offset)
-            offset.value = withTiming(value, { duration, easing }, (finished) => {
+            offset.value = withTiming(calculateOffset(), { duration, easing }, finished => {
               if (finished) {
                 // Set flexBasic after animation to trigger re-layout and reset layout information
                 basic.value = '99.99%'
               }
             })
           })
+        })
+      }
+    }
+
+    if (isIOS) {
+      subscriptions = [
+        Keyboard.addListener('keyboardWillShow', (evt: any) => {
+          keybaordAvoding(evt, true)
         }),
+        Keyboard.addListener('keyboardWillHide', resetKeyboard)
+      ]
+    } else {
+      subscriptions = [
+        Keyboard.addListener('keyboardDidShow', keybaordAvoding),
         Keyboard.addListener('keyboardDidHide', resetKeyboard)
       ]
     }
@@ -124,15 +128,8 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }: Keyboa
   }, [keyboardAvoid])
 
   return (
-    <View style={style} onTouchEnd={onTouchEnd}>
-      <Animated.View
-        style={[
-          contentContainerStyle,
-          animatedStyle
-        ]}
-      >
-        {children}
-      </Animated.View>
+    <View style={style} onTouchEnd={onTouchEnd} onTouchMove={onTouchEnd}>
+      <Animated.View style={[contentContainerStyle, animatedStyle]}>{children}</Animated.View>
     </View>
   )
 }

package/lib/runtime/components/react/mpx-nav-container.tsx

@@ -0,0 +1,33 @@
+import { AnimatedStyle } from 'react-native-reanimated'
+import { useNavShared } from './useNavShared'
+import { NavSharedContext, NavSharedValue } from './context'
+import { useLayoutEffect, useMemo, useState } from 'react'
+import { StyleProp } from 'react-native'
+import { isAndroid } from './utils'
+
+interface MpxNavContainerProps {
+  children?: React.ReactNode
+}
+
+export default function MpxNavContainer(props: MpxNavContainerProps) {
+  const [, setCustomNav] = useNavShared()
+
+  useLayoutEffect(() => {
+    if (!isAndroid) return
+    if (props.children) {
+      setCustomNav(props.children)
+    }
+
+    return () => {
+      setCustomNav(undefined)
+    }
+  }, [props.children])
+
+  return isAndroid ? null : props.children
+}
+
+export function NavSharedProvider({ children }: { children?: React.ReactNode }) {
+  const [customNav, setCustomNav] = useState()
+  const value = useMemo(() => ({ customNav, setCustomNav } as NavSharedValue), [customNav])
+  return <NavSharedContext.Provider value={value}>{children}</NavSharedContext.Provider>
+}