react-native-system-ui 0.0.7 → 1.0.1

package/dist/cjs/components/popup/Popup.js

@@ -20,6 +20,7 @@ function _reactNative() {
 }
 var _safeAreaView = require("../safe-area-view");
 var _platform = require("../../platform");
+var _animation = require("../../hooks/animation");
 var _createPlatformShadow = require("../../utils/createPlatformShadow");
 var _validate = require("../../utils/validate");
 function _reactNativeSystemIcon() {
@@ -31,13 +32,16 @@ function _reactNativeSystemIcon() {
 }
 var _Portal = _interopRequireDefault(require("../portal/Portal"));
 var _hooks = require("../../hooks");
+var _useLocale = require("../config-provider/useLocale");
+var _useDirection = require("../config-provider/useDirection");
 var _tokens = require("./tokens");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 const AnimatedPressable = _reactNative().Animated.createAnimatedComponent(_reactNative().Pressable);
-const EASING_IN_CUBIC = _reactNative().Easing.bezier(0.55, 0.055, 0.675, 0.19);
-const EASING_OUT_CIRC = _reactNative().Easing.bezier(0.075, 0.82, 0.165, 1.0);
+const EASE_OUT = _reactNative().Easing.bezier(0.075, 0.82, 0.165, 1.0);
+const EASE_IN = _reactNative().Easing.bezier(0.55, 0.055, 0.675, 0.19);
+const CAPTURE = () => true;
 const placementConfig = {
   top: {
     container: {
@@ -75,66 +79,37 @@ const placementConfig = {
     axis: 'y'
   }
 };
-const buildRadius = (round, placement, radius) => {
+const buildRadius = (round, p, r) => {
   if (!round) return;
-  switch (placement) {
-    case 'top':
-      return {
-        borderBottomLeftRadius: radius,
-        borderBottomRightRadius: radius
-      };
-    case 'bottom':
-      return {
-        borderTopLeftRadius: radius,
-        borderTopRightRadius: radius
-      };
-    case 'left':
-      return {
-        borderTopRightRadius: radius,
-        borderBottomRightRadius: radius
-      };
-    case 'right':
-      return {
-        borderTopLeftRadius: radius,
-        borderBottomLeftRadius: radius
-      };
-    default:
-      return {
-        borderRadius: radius
-      };
-  }
-};
-const renderHeaderNode = (node, options) => {
-  if (!(0, _validate.isRenderable)(node)) return null;
-  if ((0, _validate.isText)(node)) {
-    return /*#__PURE__*/_react().default.createElement(_reactNative().Text, {
-      style: options.textStyle
-    }, node);
-  }
-  return /*#__PURE__*/_react().default.createElement(_reactNative().View, {
-    style: options.wrapperStyle
-  }, node);
-};
-const renderWithSafeArea = (children, opts, onSafeAreaTopLayout) => {
-  if (opts.safeArea) {
-    return /*#__PURE__*/_react().default.createElement(_safeAreaView.SafeAreaView, null, children);
-  }
-  return /*#__PURE__*/_react().default.createElement(_react().default.Fragment, null, opts.safeAreaInsetTop ? /*#__PURE__*/_react().default.createElement(_safeAreaView.SafeAreaView, {
-    edge: "top",
-    onLayout: onSafeAreaTopLayout,
-    pointerEvents: "none"
-  }) : null, children, opts.safeAreaInsetBottom && /*#__PURE__*/_react().default.createElement(_safeAreaView.SafeAreaView, {
-    edge: "bottom",
-    pointerEvents: "none"
-  }));
+  if (p === 'top') return {
+    borderBottomLeftRadius: r,
+    borderBottomRightRadius: r
+  };
+  if (p === 'bottom') return {
+    borderTopLeftRadius: r,
+    borderTopRightRadius: r
+  };
+  if (p === 'left') return {
+    borderTopRightRadius: r,
+    borderBottomRightRadius: r
+  };
+  if (p === 'right') return {
+    borderTopLeftRadius: r,
+    borderBottomLeftRadius: r
+  };
+  return {
+    borderRadius: r
+  };
 };
-const hiddenContentStyle = {
+const hiddenStyle = {
   opacity: 0,
   shadowOpacity: 0,
   shadowRadius: 0,
   elevation: 0
 };
-const Popup = props => {
+const PopupImpl = props => {
+  const locale = (0, _useLocale.useLocale)();
+  const layoutDir = (0, _useDirection.useDirection)();
   const {
     visible,
     placement: placementProp,
@@ -144,7 +119,7 @@ const Popup = props => {
     tokensOverride,
     overlay = true,
     overlayStyle,
-    overlayAccessibilityLabel = '关闭弹层',
+    overlayAccessibilityLabel = locale?.vanPopup?.closeOverlay ?? 'Close overlay',
     closeOnOverlayPress,
     closeOnClickOverlay,
     overlayTestID = 'popup-overlay',
@@ -154,7 +129,7 @@ const Popup = props => {
     round,
     safeArea = false,
     safeAreaInsetTop = false,
-    safeAreaInsetBottom: safeAreaInsetBottomProp,
+    safeAreaInsetBottom: safeBottomP,
     lockScroll = true,
     destroyOnClose = true,
     duration = 300,
@@ -174,155 +149,167 @@ const Popup = props => {
     ...rest
   } = props;
   const placement = placementProp ?? position ?? 'center';
-  const shouldCloseOnOverlay = closeOnClickOverlay ?? closeOnOverlayPress ?? true;
-  const shouldTranslate = placement !== 'center';
-  const safeAreaInsetBottom = safeAreaInsetBottomProp ?? false;
+  const closeOvl = closeOnClickOverlay ?? closeOnOverlayPress ?? true;
+  const isCenter = placement === 'center';
+  const safeAreaInsetBottom = safeBottomP ?? false;
   const tokens = (0, _tokens.usePopupTokens)(tokensOverride);
-  const shadow = (0, _react().useMemo)(() => (0, _createPlatformShadow.createPlatformShadow)({
-    color: tokens.shadow.color,
-    opacity: tokens.shadow.opacity,
-    radius: tokens.shadow.radius,
-    offsetY: tokens.shadow.offsetY,
-    elevation: tokens.shadow.elevation
-  }), [tokens.shadow.color, tokens.shadow.elevation, tokens.shadow.offsetY, tokens.shadow.opacity, tokens.shadow.radius]);
-  const dynamicStyles = (0, _react().useMemo)(() => ({
-    popup: {
-      backgroundColor: tokens.colors.background,
-      padding: tokens.spacing.padding,
-      ...shadow
-    },
-    title: {
-      color: tokens.colors.title,
-      fontSize: tokens.typography.titleSize,
-      fontWeight: tokens.typography.titleWeight,
-      marginHorizontal: tokens.spacing.descriptionHorizontal,
-      textAlign: 'center'
-    },
-    titleWrapper: {
-      marginTop: tokens.spacing.titleTop,
-      marginBottom: tokens.spacing.titleBottom,
-      marginHorizontal: tokens.spacing.descriptionHorizontal,
-      alignItems: 'center'
-    },
-    description: {
-      color: tokens.colors.description,
-      fontSize: tokens.typography.descriptionSize,
-      lineHeight: tokens.typography.descriptionLineHeight
-    },
-    descriptionWrapper: {
-      marginHorizontal: tokens.spacing.descriptionHorizontal,
-      marginBottom: tokens.spacing.descriptionBottom
-    },
-    closeIconBase: {
-      minWidth: tokens.spacing.closeIconSize,
-      minHeight: tokens.spacing.closeIconSize,
-      padding: tokens.spacing.closeIconPadding
-    },
-    closeIconDefault: {
-      width: tokens.spacing.closeIconSize,
-      height: tokens.spacing.closeIconSize
-    },
-    popupSide: {
-      width: tokens.layout.sideWidth,
-      maxWidth: tokens.layout.maxWidth
-    },
-    popupCenter: {
-      minWidth: tokens.layout.minWidth,
-      maxWidth: tokens.layout.centerMaxWidth
-    }
-  }), [shadow, tokens.colors.background, tokens.colors.description, tokens.colors.title, tokens.layout.centerMaxWidth, tokens.layout.maxWidth, tokens.layout.minWidth, tokens.layout.sideWidth, tokens.spacing.closeIconPadding, tokens.spacing.closeIconSize, tokens.spacing.descriptionBottom, tokens.spacing.descriptionHorizontal, tokens.spacing.padding, tokens.spacing.titleBottom, tokens.spacing.titleTop, tokens.typography.descriptionLineHeight, tokens.typography.descriptionSize, tokens.typography.titleSize, tokens.typography.titleWeight]);
+  const reducedMotion = (0, _animation.useReducedMotion)();
+  const cbRef = (0, _react().useRef)({
+    onOpened,
+    onClosed,
+    onOpen,
+    onClose,
+    beforeClose,
+    onClickOverlay
+  });
+  cbRef.current = {
+    onOpened,
+    onClosed,
+    onOpen,
+    onClose,
+    beforeClose,
+    onClickOverlay
+  };
+  const ds = (0, _react().useMemo)(() => {
+    const shadow = (0, _createPlatformShadow.createPlatformShadow)(tokens.shadow);
+    const {
+      colors: c,
+      spacing: s,
+      typography: t,
+      layout: l
+    } = tokens;
+    return {
+      popup: {
+        backgroundColor: c.background,
+        padding: s.padding,
+        ...shadow
+      },
+      title: {
+        color: c.title,
+        fontFamily: t.fontFamily,
+        fontSize: t.titleSize,
+        fontWeight: t.titleWeight,
+        marginHorizontal: s.descriptionHorizontal,
+        textAlign: 'center'
+      },
+      titleWrap: {
+        marginTop: s.titleTop,
+        marginBottom: s.titleBottom,
+        marginHorizontal: s.descriptionHorizontal,
+        alignItems: 'center'
+      },
+      desc: {
+        color: c.description,
+        fontFamily: t.fontFamily,
+        fontSize: t.descriptionSize,
+        lineHeight: t.descriptionLineHeight
+      },
+      descWrap: {
+        marginHorizontal: s.descriptionHorizontal,
+        marginBottom: s.descriptionBottom
+      },
+      closeBase: {
+        minWidth: s.closeIconSize,
+        minHeight: s.closeIconSize,
+        padding: s.closeIconPadding
+      },
+      closeDef: {
+        width: s.closeIconSize,
+        height: s.closeIconSize
+      },
+      side: {
+        width: l.sideWidth,
+        maxWidth: l.maxWidth
+      },
+      center: {
+        minWidth: l.minWidth,
+        maxWidth: l.centerMaxWidth
+      }
+    };
+  }, [tokens]);
   const [mounted, setMounted] = (0, _react().useState)(visible);
-  const [interactionVisible, setInteractionVisible] = (0, _react().useState)(visible);
-  const isOpen = visible || interactionVisible;
-  const canCloseOnOverlay = shouldCloseOnOverlay && (onClose || beforeClose);
+  const [interVis, setInterVis] = (0, _react().useState)(visible);
+  const isOpen = visible || interVis;
+  const canCloseOvl = closeOvl && (onClose || beforeClose);
   const progress = (0, _react().useRef)(new (_reactNative().Animated.Value)(0)).current;
-  const animationRef = (0, _react().useRef)(null);
-  const animationSeqRef = (0, _react().useRef)(0);
-  const prevVisible = (0, _react().useRef)(visible);
+  const animRef = (0, _react().useRef)(null);
+  const seqRef = (0, _react().useRef)(0);
+  const prevVis = (0, _react().useRef)(visible);
   const closingRef = (0, _react().useRef)(false);
-  const isVertical = placement === 'top' || placement === 'bottom';
-  const isHorizontal = placement === 'left' || placement === 'right';
-  const direction = placement === 'top' || placement === 'left' ? -1 : 1;
-  const runAnimation = (0, _react().useCallback)(show => {
-    animationSeqRef.current += 1;
-    const currentSeq = animationSeqRef.current;
-    const easing = show ? EASING_OUT_CIRC : EASING_IN_CUBIC;
-    animationRef.current?.stop();
-    const animation = _reactNative().Animated.timing(progress, {
+  const isV = placement === 'top' || placement === 'bottom';
+  const isH = placement === 'left' || placement === 'right';
+  const dir = placement === 'top' || placement === 'left' ? -1 : 1;
+  const runAnim = (0, _react().useCallback)((show, rm) => {
+    seqRef.current += 1;
+    const seq = seqRef.current;
+    animRef.current?.stop();
+    const d = rm ? 0 : duration;
+    const a = _reactNative().Animated.timing(progress, {
       toValue: show ? 1 : 0,
-      duration,
-      easing,
+      duration: d,
+      easing: show ? EASE_OUT : EASE_IN,
       useNativeDriver: _platform.nativeDriverEnabled,
       isInteraction: false
     });
-    animationRef.current = animation;
-    animation.start(({
+    animRef.current = a;
+    a.start(({
       finished
     }) => {
-      if (!finished || currentSeq !== animationSeqRef.current) return;
-      if (show) {
-        onOpened?.();
-      } else {
-        setInteractionVisible(false);
-        if (destroyOnClose) {
-          setMounted(false);
-        }
-        onClosed?.();
+      if (!finished || seq !== seqRef.current) return;
+      if (show) cbRef.current.onOpened?.();else {
+        setInterVis(false);
+        if (destroyOnClose) setMounted(false);
+        cbRef.current.onClosed?.();
       }
     });
-  }, [destroyOnClose, duration, onClosed, onOpened, progress]);
+  }, [destroyOnClose, duration, progress]);
   (0, _react().useEffect)(() => {
     if (visible) {
       setMounted(true);
-      setInteractionVisible(true);
-      runAnimation(true);
+      setInterVis(true);
+      runAnim(true, reducedMotion);
     } else {
-      if (!prevVisible.current) return;
-      runAnimation(false);
+      if (prevVis.current) runAnim(false, reducedMotion);
     }
-  }, [runAnimation, visible]);
+  }, [runAnim, visible, reducedMotion]);
   (0, _react().useEffect)(() => {
-    if (visible && !prevVisible.current) {
-      onOpen?.();
-    }
-    prevVisible.current = visible;
-  }, [onOpen, visible]);
+    if (visible && !prevVis.current) cbRef.current.onOpen?.();
+    prevVis.current = visible;
+  }, [visible]);
   (0, _react().useEffect)(() => () => {
-    animationRef.current?.stop();
+    animRef.current?.stop();
   }, []);
   const requestClose = (0, _react().useCallback)(async reason => {
     if (closingRef.current) return;
     closingRef.current = true;
     try {
-      if (beforeClose) {
-        const result = await beforeClose(reason);
-        if (result === false) {
-          return;
-        }
+      if (cbRef.current.beforeClose) {
+        const r = await cbRef.current.beforeClose(reason);
+        if (r === false) return;
       }
-      onClose?.();
+      ;
+      cbRef.current.onClose?.();
     } finally {
       closingRef.current = false;
     }
-  }, [beforeClose, onClose]);
+  }, []);
   (0, _react().useEffect)(() => {
-    if (!closeOnPopstate) {
-      return;
-    }
-    const handler = () => {
-      if (!visible) return;
-      requestClose('close');
-    };
-    return (0, _platform.addPopStateListener)(handler);
+    if (!closeOnPopstate) return;
+    return (0, _platform.addPopStateListener)(() => {
+      if (visible) requestClose('close');
+    });
   }, [closeOnPopstate, requestClose, visible]);
-  const handleStackClose = (0, _react().useCallback)(() => {
-    requestClose('close');
-  }, [requestClose]);
+  const handleOvlPress = (0, _react().useCallback)(() => {
+    cbRef.current.onClickOverlay?.();
+    if (closeOvl) requestClose('overlay');
+  }, [requestClose, closeOvl]);
+  const handleClosePress = (0, _react().useCallback)(() => requestClose('close-icon'), [requestClose]);
+  const handleEscape = (0, _react().useCallback)(() => requestClose('close'), [requestClose]);
   const {
-    zIndex: stackZIndex
+    zIndex: stackZ
   } = (0, _hooks.useOverlayStack)({
     visible: isOpen,
-    onClose: handleStackClose,
+    onClose: handleEscape,
     closeOnBack: closeOnBackPress,
     lockScroll,
     zIndex,
@@ -334,7 +321,7 @@ const Popup = props => {
   } = (0, _hooks.useAriaOverlay)({
     isOpen,
     onClose: () => requestClose('overlay'),
-    isDismissable: shouldCloseOnOverlay,
+    isDismissable: closeOvl,
     overlayProps: {
       ...(_reactNative().Platform.OS === 'android' ? {} : {
         accessibilityRole: 'dialog'
@@ -343,175 +330,165 @@ const Popup = props => {
     }
   });
   const {
-    onLayout: overlayOnLayout,
-    ...overlayRestProps
+    onLayout: ovlOnLayout,
+    ...ovlRest
   } = overlayProps;
-  const contentInteractionProps = stopPropagation ? {
-    ...overlayRestProps,
-    onStartShouldSetResponder: () => true
-  } : overlayRestProps;
-  const config = placementConfig[placement];
+  const contentProps = (0, _react().useMemo)(() => stopPropagation ? {
+    ...ovlRest,
+    onStartShouldSetResponder: CAPTURE
+  } : ovlRest, [ovlRest, stopPropagation]);
+  const cfg = placementConfig[placement];
   const radiusStyle = buildRadius(round, placement, tokens.radius.round);
   const {
-    width: windowWidth,
-    height: windowHeight
+    width: wW,
+    height: wH
   } = (0, _reactNative().useWindowDimensions)();
-  const translateDistance = placement === 'left' || placement === 'right' ? windowWidth : placement === 'top' || placement === 'bottom' ? windowHeight : 0;
-  const translateTransform = (0, _react().useMemo)(() => {
-    if (!shouldTranslate) return null;
-    const outputRange = [translateDistance * direction, 0];
-    return config.axis === 'y' ? {
+  const dist = isH ? wW : isV ? wH : 0;
+  const translateT = (0, _react().useMemo)(() => {
+    if (isCenter) return null;
+    const out = [dist * dir, 0];
+    return cfg.axis === 'y' ? {
       translateY: progress.interpolate({
         inputRange: [0, 1],
-        outputRange
+        outputRange: out
       })
     } : {
       translateX: progress.interpolate({
         inputRange: [0, 1],
-        outputRange
+        outputRange: out
       })
     };
-  }, [config.axis, direction, progress, shouldTranslate, translateDistance]);
-  const baseTransform = translateTransform ? [translateTransform] : [];
-  const animatedContentStyle = (0, _react().useMemo)(() => {
-    const extraTransform = contentAnimationStyle?.transform;
-    const transform = Array.isArray(extraTransform) ? [...baseTransform, ...extraTransform] : baseTransform;
-    const baseStyle = {
+  }, [cfg.axis, dir, dist, isCenter, progress]);
+  const baseT = (0, _react().useMemo)(() => translateT ? [translateT] : [], [translateT]);
+  const animStyle = (0, _react().useMemo)(() => {
+    const et = contentAnimationStyle?.transform;
+    const t = Array.isArray(et) ? [...baseT, ...et] : baseT;
+    const s = {
       ...contentAnimationStyle,
-      transform
+      transform: t
     };
-    if (placement === 'center') {
-      return {
-        ...baseStyle,
-        opacity: progress
-      };
-    }
-    if (contentAnimationStyle?.opacity == null) {
-      return {
-        ...baseStyle,
-        opacity: 1
-      };
-    }
-    return baseStyle;
-  }, [baseTransform, contentAnimationStyle, placement, progress]);
-  const handleContentLayout = (0, _react().useCallback)(event => {
-    overlayOnLayout?.(event);
-  }, [overlayOnLayout]);
-  const [safeAreaTopHeight, setSafeAreaTopHeight] = (0, _react().useState)(0);
-  const handleSafeAreaTopLayout = (0, _react().useCallback)(event => {
-    setSafeAreaTopHeight(event.nativeEvent.layout.height);
-  }, []);
+    if (isCenter) return {
+      ...s,
+      opacity: progress
+    };
+    if (contentAnimationStyle?.opacity == null) return {
+      ...s,
+      opacity: 1
+    };
+    return s;
+  }, [baseT, contentAnimationStyle, isCenter, progress]);
+  const [saTopH, setSaTopH] = (0, _react().useState)(0);
+  const onSaTop = (0, _react().useCallback)(e => setSaTopH(e.nativeEvent.layout.height), []);
   const shouldRender = mounted || visible;
   const hidden = !isOpen;
-  const hasCustomCloseIcon = closeIcon != null;
   const hasHeader = (0, _validate.isRenderable)(title) || (0, _validate.isRenderable)(description);
-  const headerPadding = tokens.spacing.closeIconRight + tokens.spacing.closeIconSize;
-  const headerPaddingStyle = closeable && closeIconPosition.startsWith('top-') ? closeIconPosition.endsWith('right') ? {
-    paddingRight: headerPadding
-  } : {
-    paddingLeft: headerPadding
-  } : undefined;
-  const closeIconTopValue = closeIconPosition.includes('top') ? tokens.spacing.closeIconTop + safeAreaTopHeight : undefined;
-  const closeIconBottomValue = closeIconPosition.includes('bottom') ? tokens.spacing.closeIconTop : undefined;
-  const closeIconVerticalStyle = closeIconBottomValue !== undefined ? {
-    bottom: closeIconBottomValue
-  } : {
-    top: closeIconTopValue
-  };
-  const closeIconHorizontalStyle = closeIconPosition.endsWith('left') ? {
-    left: tokens.spacing.closeIconRight
-  } : {
-    right: tokens.spacing.closeIconRight
-  };
   const headerNode = (0, _react().useMemo)(() => {
     if (!hasHeader) return null;
+    const pad = tokens.spacing.closeIconRight + tokens.spacing.closeIconSize;
+    const ps = closeable && closeIconPosition.startsWith('top-') ? closeIconPosition.endsWith('right') ? {
+      paddingRight: pad
+    } : {
+      paddingLeft: pad
+    } : undefined;
+    const renderH = (n, ts, ws) => !(0, _validate.isRenderable)(n) ? null : (0, _validate.isText)(n) ? /*#__PURE__*/_react().default.createElement(_reactNative().Text, {
+      style: ts
+    }, n) : /*#__PURE__*/_react().default.createElement(_reactNative().View, {
+      style: ws
+    }, n);
     return /*#__PURE__*/_react().default.createElement(_reactNative().View, {
-      style: [styles.header, headerPaddingStyle]
-    }, renderHeaderNode(title, {
-      textStyle: [styles.title, dynamicStyles.title],
-      wrapperStyle: dynamicStyles.titleWrapper
-    }), renderHeaderNode(description, {
-      textStyle: [styles.description, dynamicStyles.description],
-      wrapperStyle: dynamicStyles.descriptionWrapper
-    }));
-  }, [description, dynamicStyles.description, dynamicStyles.descriptionWrapper, dynamicStyles.title, dynamicStyles.titleWrapper, hasHeader, headerPaddingStyle, title]);
-  const contentBody = (0, _react().useMemo)(() => hasHeader ? /*#__PURE__*/_react().default.createElement(_react().default.Fragment, null, headerNode, children) : children, [children, hasHeader, headerNode]);
-  const closeIconNode = (0, _react().useMemo)(() => {
+      style: [S.header, ps]
+    }, renderH(title, [S.title, ds.title], ds.titleWrap), renderH(description, [S.desc, ds.desc], ds.descWrap));
+  }, [closeable, closeIconPosition, description, ds, hasHeader, title, tokens.spacing.closeIconRight, tokens.spacing.closeIconSize]);
+  const closeNode = (0, _react().useMemo)(() => {
     if (!closeable) return null;
+    const custom = closeIcon != null;
+    const v = closeIconPosition.includes('bottom') ? {
+      bottom: tokens.spacing.closeIconTop
+    } : {
+      top: tokens.spacing.closeIconTop + saTopH
+    };
+    const isRtl = layoutDir === 'rtl';
+    const h = closeIconPosition.endsWith('left') ? isRtl ? {
+      right: tokens.spacing.closeIconRight
+    } : {
+      left: tokens.spacing.closeIconRight
+    } : isRtl ? {
+      left: tokens.spacing.closeIconRight
+    } : {
+      right: tokens.spacing.closeIconRight
+    };
     return /*#__PURE__*/_react().default.createElement(_reactNative().Pressable, {
-      style: [styles.closeIconBase, dynamicStyles.closeIconBase, closeIconVerticalStyle, closeIconHorizontalStyle, !hasCustomCloseIcon ? dynamicStyles.closeIconDefault : null],
+      style: [S.closeBase, ds.closeBase, v, h, !custom && ds.closeDef],
       hitSlop: 8,
-      onPress: () => requestClose('close-icon')
-    }, hasCustomCloseIcon ? closeIcon : /*#__PURE__*/_react().default.createElement(_reactNativeSystemIcon().Cross, {
+      onPress: handleClosePress
+    }, custom ? closeIcon : /*#__PURE__*/_react().default.createElement(_reactNativeSystemIcon().Cross, {
       size: 22,
       fill: tokens.colors.closeIcon,
       color: tokens.colors.closeIcon
     }));
-  }, [closeIcon, closeIconHorizontalStyle, closeIconVerticalStyle, closeable, dynamicStyles.closeIconBase, dynamicStyles.closeIconDefault, hasCustomCloseIcon, requestClose, tokens.colors.closeIcon]);
-  const content = (0, _react().useMemo)(() => /*#__PURE__*/_react().default.createElement(_reactNative().Animated.View, _extends({
-    ref: overlayRef
-  }, contentInteractionProps, {
-    onLayout: handleContentLayout,
-    renderToHardwareTextureAndroid: _reactNative().Platform.OS === 'android',
-    shouldRasterizeIOS: _reactNative().Platform.OS === 'ios',
-    style: [dynamicStyles.popup, placement === 'center' ? dynamicStyles.popupCenter : null, isVertical ? styles.popupVertical : null, isHorizontal ? dynamicStyles.popupSide : null, radiusStyle, animatedContentStyle, style, hidden ? hiddenContentStyle : null]
-  }, rest), closeIconNode, renderWithSafeArea(contentBody, {
-    safeArea,
-    safeAreaInsetTop,
-    safeAreaInsetBottom
-  }, safeAreaInsetTop ? handleSafeAreaTopLayout : undefined)), [animatedContentStyle, closeIconNode, contentBody, contentInteractionProps, dynamicStyles.popup, dynamicStyles.popupCenter, dynamicStyles.popupSide, handleContentLayout, handleSafeAreaTopLayout, hidden, isHorizontal, isVertical, overlayRef, placement, radiusStyle, rest, safeArea, safeAreaInsetBottom, safeAreaInsetTop, style]);
+  }, [closeIcon, closeIconPosition, closeable, ds, handleClosePress, saTopH, tokens.colors.closeIcon, tokens.spacing.closeIconRight, tokens.spacing.closeIconTop]);
+  const body = hasHeader ? /*#__PURE__*/_react().default.createElement(_react().default.Fragment, null, headerNode, children) : children;
   if (!shouldRender) return null;
-  const resolvedZIndex = stackZIndex ?? zIndex;
+  const rz = stackZ ?? zIndex;
+  const safeContent = safeArea ? /*#__PURE__*/_react().default.createElement(_safeAreaView.SafeAreaView, null, body) : /*#__PURE__*/_react().default.createElement(_react().default.Fragment, null, safeAreaInsetTop && /*#__PURE__*/_react().default.createElement(_safeAreaView.SafeAreaView, {
+    edge: "top",
+    onLayout: onSaTop,
+    pointerEvents: "none"
+  }), body, safeAreaInsetBottom && /*#__PURE__*/_react().default.createElement(_safeAreaView.SafeAreaView, {
+    edge: "bottom",
+    pointerEvents: "none"
+  }));
   return /*#__PURE__*/_react().default.createElement(_Portal.default, null, /*#__PURE__*/_react().default.createElement(_reactNative().View, {
-    style: [styles.portalRoot, webFixedRootStyle, resolvedZIndex ? {
-      zIndex: resolvedZIndex
+    style: [S.root, rz ? {
+      zIndex: rz
     } : undefined],
     pointerEvents: "box-none"
   }, /*#__PURE__*/_react().default.createElement(_reactNative().View, {
-    style: [styles.container, config.container],
+    style: [S.ctr, cfg.container],
     pointerEvents: isOpen ? 'auto' : 'none',
     accessibilityViewIsModal: isOpen,
     accessibilityLiveRegion: "polite",
-    onAccessibilityEscape: () => requestClose('close')
+    onAccessibilityEscape: handleEscape
   }, overlay && isOpen ? /*#__PURE__*/_react().default.createElement(AnimatedPressable, _extends({
     testID: overlayTestID,
-    style: [styles.overlay, {
+    style: [S.ovl, {
       backgroundColor: tokens.colors.overlay,
       opacity: progress
     }, overlayStyle],
     renderToHardwareTextureAndroid: _reactNative().Platform.OS === 'android',
     shouldRasterizeIOS: _reactNative().Platform.OS === 'ios',
     pointerEvents: isOpen ? 'auto' : 'none'
-  }, canCloseOnOverlay ? {
+  }, canCloseOvl ? {
     accessibilityRole: 'button',
     accessibilityLabel: overlayAccessibilityLabel,
-    accessibilityHint: '双击即可关闭弹层'
+    accessibilityHint: locale?.vanPopup?.closeHint ?? 'Double-tap to close'
   } : {
     accessible: false
   }, {
-    onPress: () => {
-      onClickOverlay?.();
-      if (shouldCloseOnOverlay) {
-        requestClose('overlay');
-      }
-    }
+    onPress: handleOvlPress
   })) : null, !overlay && lockScroll && isOpen ? /*#__PURE__*/_react().default.createElement(_reactNative().View, {
-    style: styles.lockLayer,
+    style: S.lock,
     pointerEvents: "auto",
-    onStartShouldSetResponder: () => true,
-    onMoveShouldSetResponder: () => true
-  }) : null, content)));
+    onStartShouldSetResponder: CAPTURE,
+    onMoveShouldSetResponder: CAPTURE
+  }) : null, /*#__PURE__*/_react().default.createElement(_reactNative().Animated.View, _extends({
+    ref: overlayRef
+  }, contentProps, {
+    onLayout: ovlOnLayout,
+    renderToHardwareTextureAndroid: _reactNative().Platform.OS === 'android',
+    shouldRasterizeIOS: _reactNative().Platform.OS === 'ios',
+    style: [ds.popup, isCenter && ds.center, isV && S.popV, isH && ds.side, radiusStyle, animStyle, style, hidden && hiddenStyle]
+  }, rest), closeNode, safeContent))));
 };
-exports.Popup = Popup;
-const styles = _reactNative().StyleSheet.create({
-  portalRoot: {
+const S = _reactNative().StyleSheet.create({
+  root: {
     ..._reactNative().StyleSheet.absoluteFillObject,
     justifyContent: 'center'
   },
-  container: {
+  ctr: {
     flex: 1
   },
-  overlay: {
+  ovl: {
     ..._reactNative().StyleSheet.absoluteFillObject,
     opacity: 0
   },
@@ -521,28 +498,21 @@ const styles = _reactNative().StyleSheet.create({
   title: {
     includeFontPadding: false
   },
-  description: {
+  desc: {
     includeFontPadding: false
   },
-  popupVertical: {
+  popV: {
     alignSelf: 'stretch'
   },
-  closeIconBase: {
+  closeBase: {
     position: 'absolute',
     zIndex: 999,
     alignItems: 'center',
     justifyContent: 'center'
   },
-  lockLayer: {
+  lock: {
     ..._reactNative().StyleSheet.absoluteFillObject
   }
 });
-const webFixedRootStyle = _reactNative().Platform.OS === 'web' ? {
-  position: 'fixed',
-  top: 0,
-  left: 0,
-  right: 0,
-  bottom: 0
-} : undefined;
-Popup.displayName = 'Popup';
+const Popup = exports.Popup = /*#__PURE__*/_react().default.memo(PopupImpl);
 var _default = exports.default = Popup;