@mpxjs/webpack-plugin 2.10.24-test.1 → 2.11.0

package/lib/runtime/components/react/mpx-picker-view-column/pickerViewColumnItem.tsx

@@ -3,16 +3,14 @@ import { LayoutChangeEvent } from 'react-native'
 import Reanimated, { Extrapolation, interpolate, useAnimatedStyle } from 'react-native-reanimated'
 import { extendObject } from '../utils'
 import { createFaces } from './pickerViewFaces'
-import { usePickerViewColumnAnimationContext, usePickerViewStyleContext } from '../mpx-picker-view/pickerVIewContext'
+import { usePickerViewColumnAnimationContext } from '../mpx-picker-view/pickerVIewContext'
 
 interface PickerColumnItemProps {
   item: React.ReactElement
   index: number
   itemHeight: number
   itemWidth?: number | '100%'
-  textStyle: Record<string, any>
   visibleCount: number
-  textProps?: any
   onItemLayout?: (e: LayoutChangeEvent) => void
 }
 
@@ -21,12 +19,9 @@ const PickerViewColumnItem: React.FC<PickerColumnItemProps> = ({
   index,
   itemHeight,
   itemWidth = '100%',
-  textStyle,
-  textProps,
   visibleCount,
   onItemLayout
 }) => {
-  const textStyleFromAncestor = usePickerViewStyleContext()
   const offsetYShared = usePickerViewColumnAnimationContext()
   const facesShared = useMemo(() => createFaces(itemHeight, visibleCount), [itemHeight, visibleCount])
 
@@ -48,12 +43,9 @@ const PickerViewColumnItem: React.FC<PickerColumnItemProps> = ({
     {
       style: extendObject(
         { height: itemHeight, width: '100%' },
-        textStyleFromAncestor,
-        textStyle,
         item.props.style
       )
     },
-    textProps,
     restProps
   )
   const realItem = React.cloneElement(item, itemProps)

package/lib/runtime/components/react/mpx-picker-view-column/pickerViewColumnItemLite.tsx

@@ -1,15 +1,12 @@
 import React from 'react'
 import { LayoutChangeEvent, View } from 'react-native'
 import { extendObject } from '../utils'
-import { usePickerViewStyleContext } from '../mpx-picker-view/pickerVIewContext'
 
 interface PickerColumnItemProps {
   item: React.ReactElement
   index: number
   itemHeight: number
   itemWidth?: number | '100%'
-  textStyle: Record<string, any>
-  textProps?: any
   onItemLayout?: (e: LayoutChangeEvent) => void
 }
 
@@ -18,23 +15,17 @@ const PickerViewColumnItem: React.FC<PickerColumnItemProps> = ({
   index,
   itemHeight,
   itemWidth = '100%',
-  textStyle,
-  textProps,
   onItemLayout
 }) => {
-  const textStyleFromAncestor = usePickerViewStyleContext()
   const strKey = `picker-column-item-${index}`
   const restProps = index === 0 ? { onLayout: onItemLayout } : {}
   const itemProps = extendObject(
     {
       style: extendObject(
         { height: itemHeight, width: '100%' },
-        textStyleFromAncestor,
-        textStyle,
         item.props.style
       )
     },
-    textProps,
     restProps
   )
   const realItem = React.cloneElement(item, itemProps)

package/lib/runtime/components/react/mpx-popup/index.tsx

@@ -11,6 +11,10 @@ export interface IUsePopupOptions {
   type?: PopupType
 }
 
+type PopupOptions = {
+  contentHeight?: number
+}
+
 /**
  * 根据 type 返回对应的弹窗壳子组件
  */
@@ -44,7 +48,7 @@ const createPopupManager = (options: IUsePopupOptions = {}) => {
   const open = (
     childComponent: React.ReactNode,
     pageId: number | undefined,
-    options?: { contentHeight?: number }
+    options?: PopupOptions
   ) => {
     if (!isOpen && pageId != null) {
       isOpen = true
@@ -57,9 +61,9 @@ const createPopupManager = (options: IUsePopupOptions = {}) => {
     }
   }
 
-  const update = (updatedChild: ReactElement | null) => {
+  const update = (updatedChild: ReactElement | null, options?: PopupOptions) => {
     if (popupKey !== null && child !== null && updatedChild !== null) {
-      child = cloneElement(child, { children: updatedChild })
+      child = cloneElement(child, Object.assign({ children: updatedChild }, options))
       Portal.update(popupKey, child)
     }
   }

package/lib/runtime/components/react/mpx-popup/popupBase.tsx

@@ -59,8 +59,9 @@ const PopupBase = (props: PopupBaseProps = {}) => {
     contentHeight = MOVEOUT_HEIGHT,
     visible = false
   } = props
+  const moveoutHeight = contentHeight + bottom
   const fade = useSharedValue<number>(MASK_OFF)
-  const slide = useSharedValue<number>(contentHeight)
+  const slide = useSharedValue<number>(moveoutHeight)
 
   const animatedStylesMask = useAnimatedStyle(() => ({
     opacity: fade.value
@@ -87,7 +88,7 @@ const PopupBase = (props: PopupBaseProps = {}) => {
       duration: 300
     })
     slide.value = withTiming(
-      contentHeight,
+      moveoutHeight,
       {
         easing: Easing.inOut(Easing.poly(3)),
         duration: 300

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

@@ -51,7 +51,6 @@ export interface ProgressProps {
   style?: ViewStyle & Record<string, any>
   'enable-offset'?: boolean
   'enable-var'?: boolean
-  'parent-font-size'?: number
   'parent-width'?: number
   'parent-height'?: number
 }
@@ -71,7 +70,6 @@ const Progress = forwardRef<
     duration = 30,
     style = {},
     'enable-var': enableVar,
-    'parent-font-size': parentFontSize,
     'parent-width': parentWidth,
     'parent-height': parentHeight
   } = props
@@ -92,7 +90,6 @@ const Progress = forwardRef<
     hasPositionFixed
   } = useTransformStyle(style, {
     enableVar,
-    parentFontSize,
     parentWidth,
     parentHeight
   })

package/lib/runtime/components/react/mpx-radio-group.tsx

@@ -29,7 +29,6 @@ export interface RadioGroupProps {
   style?: ViewStyle & Record<string, any>
   'enable-offset'?: boolean
   'enable-var'?: boolean
-  'parent-font-size'?: number
   'parent-width'?: number
   'parent-height'?: number
   children: ReactNode
@@ -43,7 +42,6 @@ const radioGroup = forwardRef<
   const {
     style = {},
     'enable-var': enableVar,
-    'parent-font-size': parentFontSize,
     'parent-width': parentWidth,
     'parent-height': parentHeight
   } = props
@@ -75,7 +73,7 @@ const radioGroup = forwardRef<
     varContextRef,
     setWidth,
     setHeight
-  } = useTransformStyle(style, { enableVar, parentFontSize, parentWidth, parentHeight, defaultStyle })
+  } = useTransformStyle(style, { enableVar, parentWidth, parentHeight, defaultStyle })
 
   const nodeRef = useRef(null)
   useNodesRef(props, ref, nodeRef, { style: normalStyle })

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

@@ -23,7 +23,6 @@ export interface RadioProps {
   'enable-offset'?: boolean
   'enable-var'?: boolean
   'enable-text-pass-through'?: boolean
-  'parent-font-size'?: number
   'parent-width'?: number
   'parent-height'?: number
   children: ReactNode
@@ -76,7 +75,6 @@ const Radio = forwardRef<HandlerRef<View, RadioProps>, RadioProps>(
       style = [],
       'enable-var': enableVar,
       'enable-text-pass-through': enableTextPassThrough,
-      'parent-font-size': parentFontSize,
       'parent-width': parentWidth,
       'parent-height': parentHeight,
       bindtap
@@ -123,7 +121,7 @@ const Radio = forwardRef<HandlerRef<View, RadioProps>, RadioProps>(
       varContextRef,
       setWidth,
       setHeight
-    } = useTransformStyle(style, { enableVar, parentFontSize, parentWidth, parentHeight, defaultStyle: styles.container })
+    } = useTransformStyle(style, { enableVar, parentWidth, parentHeight, defaultStyle: styles.container })
 
     const { textStyle, backgroundStyle, innerStyle = {} } = splitStyle(normalStyle)
     const textPassThrough = useTextPassThrough(textStyle, textProps, { enableTextPassThrough })

package/lib/runtime/components/react/mpx-rich-text/index.tsx

@@ -23,7 +23,6 @@ interface _RichTextProps extends ViewProps {
   style?: ViewStyle
   nodes: string | Array<Node>
   'enable-var'?: boolean
-  'parent-font-size'?: number
   'parent-width'?: number
   'parent-height'?: number
 }
@@ -56,7 +55,6 @@ const _RichText = forwardRef<HandlerRef<View, _RichTextProps>, _RichTextProps>((
     style = {},
     nodes,
     'enable-var': enableVar,
-    'parent-font-size': parentFontSize,
     'parent-width': parentWidth,
     'parent-height': parentHeight
   } = props
@@ -75,7 +73,6 @@ const _RichText = forwardRef<HandlerRef<View, _RichTextProps>, _RichTextProps>((
     height: webViewHeight
   }, style), {
     enableVar,
-    parentFontSize,
     parentWidth,
     parentHeight
   })

package/lib/runtime/components/react/mpx-scroll-view.tsx

@@ -67,7 +67,6 @@ interface ScrollViewProps {
   'enable-trigger-intersection-observer'?: boolean;
   'enable-var'?: boolean;
   'enable-text-pass-through'?: boolean;
-  'parent-font-size'?: number;
   'parent-width'?: number;
   'parent-height'?: number;
   'enable-sticky'?: boolean;
@@ -146,7 +145,6 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     'refresher-triggered': refresherTriggered,
     'enable-var': enableVar,
     'enable-text-pass-through': enableTextPassThrough,
-    'parent-font-size': parentFontSize,
     'parent-width': parentWidth,
     'parent-height': parentHeight,
     'simultaneous-handlers': originSimultaneousHandlers,
@@ -200,7 +198,7 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     hasPositionFixed,
     setWidth,
     setHeight
-  } = useTransformStyle(style, { enableVar, parentFontSize, parentWidth, parentHeight })
+  } = useTransformStyle(style, { enableVar, parentWidth, parentHeight })
 
   const { textStyle, innerStyle = {} } = splitStyle(normalStyle)
   const textPassThrough = useTextPassThrough(textStyle, textProps, { enableTextPassThrough })