@mpxjs/webpack-plugin 2.9.67 → 2.9.69-beta.1

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

@@ -1,11 +1,14 @@
-import { forwardRef, JSX, useEffect, useRef } from 'react'
-import { noop, warn } from '@mpxjs/utils'
+import { forwardRef, JSX, useRef, useContext, useMemo, createElement, useCallback, useEffect } from 'react'
+import { warn, getFocusedNavigation, isFunction } from '@mpxjs/utils'
 import { Portal } from '@ant-design/react-native'
 import { getCustomEvent } from './getInnerListeners'
 import { promisify, redirectTo, navigateTo, navigateBack, reLaunch, switchTab } from '@mpxjs/api-proxy'
 import { WebView } from 'react-native-webview'
 import useNodesRef, { HandlerRef } from './useNodesRef'
-import { WebViewNavigationEvent, WebViewErrorEvent, WebViewMessageEvent } from 'react-native-webview/lib/WebViewTypes'
+import { getCurrentPage, extendObject } from './utils'
+import { WebViewNavigationEvent, WebViewErrorEvent, WebViewMessageEvent, WebViewNavigation, WebViewProgressEvent } from 'react-native-webview/lib/WebViewTypes'
+import { RouteContext } from './context'
+import { BackHandler } from 'react-native'
 
 type OnMessageCallbackEvent = {
   detail: {
@@ -28,29 +31,25 @@ interface WebViewProps {
 }
 
 interface PayloadData {
-  data?: Record<string, any>
+  [x: string]: any
 }
 
 type MessageData = {
   payload?: PayloadData,
+  args?: Array<any>,
   type?: string,
   callbackId?: number
 }
 
-interface NativeEvent {
-  url: string,
-  data: string
-}
-
-interface FormRef {
-  postMessage: (value: any) => void;
-}
-
-const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((props, ref): JSX.Element => {
-  const { src = '', bindmessage = noop, bindload = noop, binderror = noop } = props
+const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((props, ref): JSX.Element | null => {
+  const { src, bindmessage, bindload, binderror } = props
+  const mpx = global.__mpx
   if (props.style) {
     warn('The web-view component does not support the style prop.')
   }
+  const pageId = useContext(RouteContext)
+  const currentPage = useMemo(() => getCurrentPage(pageId), [pageId])
+  const webViewRef = useRef<WebView>(null)
   const defaultWebViewStyle = {
     position: 'absolute' as 'absolute' | 'relative' | 'static',
     left: 0 as number,
@@ -58,29 +57,44 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
     top: 0 as number,
     bottom: 0 as number
   }
+  const canGoBack = useRef<boolean>(false)
 
-  const webViewRef = useRef<WebView>(null)
-  useNodesRef<WebView, WebViewProps>(props, ref, webViewRef, {
-    defaultStyle: defaultWebViewStyle
-  })
+  const onAndroidBackPress = useCallback(() => {
+      if (canGoBack.current) {
+          webViewRef.current?.goBack()
+          return true
+      }
+      return false
+  }, [canGoBack])
 
-  const _messageList: any[] = []
-  const handleUnload = () => {
-    // 这里是 WebView 销毁前执行的逻辑
-    bindmessage(getCustomEvent('messsage', {}, {
-      detail: {
-        data: _messageList
-      },
-      layoutRef: webViewRef
-    }))
-  }
+  const beforeRemoveHandle = useCallback((e: Event) => {
+    if (canGoBack.current) {
+        webViewRef.current?.goBack()
+        e.preventDefault()
+    }
+  }, [canGoBack])
+
+  const navigation = getFocusedNavigation()
+
+  navigation?.addListener('beforeRemove', beforeRemoveHandle)
 
   useEffect(() => {
-    // 组件卸载时执行
-    return () => {
-      handleUnload()
+    if (__mpx_mode__ === 'android') {
+        BackHandler.addEventListener('hardwareBackPress', onAndroidBackPress)
+        return () => {
+            BackHandler.removeEventListener('hardwareBackPress', onAndroidBackPress)
+        }
     }
   }, [])
+
+  useNodesRef<WebView, WebViewProps>(props, ref, webViewRef, {
+    style: defaultWebViewStyle
+  })
+
+  if (!src) {
+    return null
+  }
+
   const _load = function (res: WebViewNavigationEvent) {
     const result = {
       type: 'load',
@@ -101,6 +115,50 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
     }
     binderror(result)
   }
+  const injectedJavaScript = `
+    if (window.ReactNativeWebView && window.ReactNativeWebView.postMessage) {
+      var _documentTitle = document.title;
+      window.ReactNativeWebView.postMessage(JSON.stringify({
+        type: 'setTitle',
+        payload: {
+          _documentTitle: _documentTitle
+        }
+      }))
+      Object.defineProperty(document, 'title', {
+        set (val) {
+          _documentTitle = val
+          window.ReactNativeWebView.postMessage(JSON.stringify({
+            type: 'setTitle',
+            payload: {
+              _documentTitle: _documentTitle
+            }
+          }))
+        },
+        get () {
+          return _documentTitle
+        }
+      });
+    }
+    true;
+  `
+  const sendMessage = function(params: string) {
+    return `
+      window.mpxWebviewMessageCallback(${params})
+      true;
+    `
+  }
+  const _changeUrl = function (navState: WebViewNavigation) {
+    if (navState.navigationType) { // navigationType这个事件在页面开始加载时和页面加载完成时都会被触发所以判断这个避免其他无效触发执行该逻辑
+      canGoBack.current = navState.canGoBack
+      currentPage.__webViewUrl = navState.url
+    }
+  }
+
+  const _onLoadProgress = function (event: WebViewProgressEvent) {
+    if (__mpx_mode__ === 'android') {
+        canGoBack.current = event.nativeEvent.canGoBack
+    }
+  }
   const _message = function (res: WebViewMessageEvent) {
     let data: MessageData = {}
     let asyncCallback
@@ -110,56 +168,104 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
       if (typeof nativeEventData === 'string') {
         data = JSON.parse(nativeEventData)
       }
-    } catch (e) {
-      data = {}
-    }
+    } catch (e) {}
+    const args = data.args
     const postData: PayloadData = data.payload || {}
-    switch (data.type) {
+    const params = Array.isArray(args) ? args : [postData]
+    const type = data.type
+    switch (type) {
+      case 'setTitle':
+        { // case下不允许直接声明，包个块解决该问题
+          const title = postData._documentTitle
+          if (title) {
+            navigation && navigation.setOptions({ title })
+          }
+        }
+        break
       case 'postMessage':
-        _messageList.push(postData.data)
+        bindmessage && bindmessage(getCustomEvent('messsage', {}, { // RN组件销毁顺序与小程序不一致，所以改成和支付宝消息一致
+          detail: {
+            data: params[0]?.data
+          }
+        }))
         asyncCallback = Promise.resolve({
           errMsg: 'invokeWebappApi:ok'
         })
         break
       case 'navigateTo':
-        asyncCallback = navObj.navigateTo(postData)
+        asyncCallback = navObj.navigateTo(...params)
         break
       case 'navigateBack':
-        asyncCallback = navObj.navigateBack(postData)
+        asyncCallback = navObj.navigateBack(...params)
         break
       case 'redirectTo':
-        asyncCallback = navObj.redirectTo(postData)
+        asyncCallback = navObj.redirectTo(...params)
         break
       case 'switchTab':
-        asyncCallback = navObj.switchTab(postData)
+        asyncCallback = navObj.switchTab(...params)
         break
       case 'reLaunch':
-        asyncCallback = navObj.reLaunch(postData)
+        asyncCallback = navObj.reLaunch(...params)
+        break
+      default:
+        if (type) {
+          const implement = mpx.config.webviewConfig.apiImplementations && mpx.config.webviewConfig.apiImplementations[type]
+          if (isFunction(implement)) {
+            asyncCallback = Promise.resolve(implement(...params))
+          } else {
+            /* eslint-disable prefer-promise-reject-errors */
+            asyncCallback = Promise.reject({
+              errMsg: `未在apiImplementations中配置${type}方法`
+            })
+          }
+        }
         break
     }
 
     asyncCallback && asyncCallback.then((res: any) => {
       if (webViewRef.current?.postMessage) {
-        const test = JSON.stringify({
-          type: data.type,
+        const result = JSON.stringify({
+          type,
           callbackId: data.callbackId,
           result: res
         })
-        webViewRef.current.postMessage(test)
+        webViewRef.current.injectJavaScript(sendMessage(result))
       }
+    }).catch((error: any) => {
+      if (webViewRef.current?.postMessage) {
+        const result = JSON.stringify({
+          type,
+          callbackId: data.callbackId,
+          error
+        })
+        webViewRef.current.injectJavaScript(sendMessage(result))
+      }
+    })
+  }
+  const events = {}
+
+  if (bindload) {
+    extendObject(events, {
+      onLoad: _load
     })
   }
-  return (<Portal>
-    <WebView
-      style={defaultWebViewStyle}
-      source={{ uri: src }}
-      ref={webViewRef}
-      onLoad={_load}
-      onError={_error}
-      onMessage={_message}
-      javaScriptEnabled={true}
-    ></WebView>
-  </Portal>)
+  if (binderror) {
+    extendObject(events, {
+      onError: _error
+    })
+  }
+
+  return createElement(Portal, null, createElement(WebView, extendObject({
+    style: defaultWebViewStyle,
+    source: { uri: src },
+    ref: webViewRef,
+    javaScriptEnabled: true,
+    onNavigationStateChange: _changeUrl,
+    onMessage: _message,
+    injectedJavaScript: injectedJavaScript,
+    onLoadProgress: _onLoadProgress,
+    allowsBackForwardNavigationGestures: true
+  }, events)))
 })
 
 _WebView.displayName = 'MpxWebview'

package/lib/runtime/components/react/pickerFaces.ts

@@ -0,0 +1,112 @@
+/**
+ * Borrowed from open-source code: https://github.com/quidone/react-native-wheel-picker
+ * Special thanks to the authors for their contribution to the open-source community.
+ */
+
+export type Faces = {
+  index: number
+  deg: number
+  offsetY: number
+  opacity: number
+  scale: number
+  screenHeight: number
+}
+
+export const degToRad = (deg: number) => (Math.PI * deg) / 180
+
+// Calculates the height of the element after rotating it relative to the user's screen.
+const calcHeight = (degree: number, itemHeight: number) =>
+  itemHeight * Math.cos(degToRad(degree))
+
+export const calcPickerHeight = (faces: Faces[], itemHeight: number) => {
+  if (faces.length === 7) {
+    return itemHeight * 5
+  }
+  return faces.reduce((r, v) => r + calcHeight(Math.abs(v.deg), itemHeight), 0)
+}
+
+export const createFaces = (
+  itemHeight: number,
+  visibleCount: number
+): Faces[] => {
+  // e.g [30, 60, 90]
+  const getDegreesRelativeCenter = () => {
+    const maxStep = Math.trunc((visibleCount + 2) / 2) // + 2 because there are 2 more faces at 90 degrees
+    const stepDegree = 90 / maxStep
+
+    const result: number[] = []
+    for (let i = 1; i <= maxStep; i++) {
+      result.push(i * stepDegree)
+    }
+    return result
+  }
+
+  const getScreenHeightsAndOffsets = <T extends readonly number[]>(
+    degrees: T
+  ): [T, T] => {
+    const screenHeights = degrees.map((deg) =>
+      calcHeight(deg, itemHeight)
+    ) as unknown as T
+    const freeSpaces = screenHeights.map(
+      (screenHeight) => itemHeight - screenHeight
+    )
+    const offsets = freeSpaces.map((freeSpace, index) => {
+      let offset = freeSpace / 2
+      for (let i = 0; i < index; i++) {
+        offset += freeSpaces[i]
+      }
+      if (index === 0) {
+        offset *= 0.6
+      }
+      return offset
+    }) as unknown as T
+    return [screenHeights, offsets]
+  }
+
+  const getOpacity = (index: number) => {
+    const map: Record<number, number> = {
+      0: 0,
+      1: 0.8,
+      2: 0.9 // 0.35
+      // 3: 0.45, // 0.45
+      // 4: 0.5 // 0.5
+    }
+    return map[index] ?? Math.min(1, map[2] + index * 0.05)
+  }
+
+  const degrees = getDegreesRelativeCenter()
+  const [screenHeight, offsets] = getScreenHeightsAndOffsets(degrees)
+
+  const scales = [1, 0.925, 0.8]
+
+  return [
+    // top items
+    ...degrees
+      .map<Faces>((degree, index) => {
+        return {
+          index: -1 * (index + 1),
+          deg: degree,
+          opacity: getOpacity(degrees.length - 1 - index),
+          offsetY: -1 * offsets[index],
+          scale: scales[index],
+          screenHeight: screenHeight[index]
+        }
+      })
+      .reverse(),
+
+    // center item
+    { index: 0, deg: 0, opacity: 1, offsetY: 0, scale: 1, screenHeight: itemHeight },
+
+    // bottom items
+    ...degrees.map<Faces>((degree, index) => {
+      return {
+        index: index + 1,
+        deg: -1 * degree,
+        opacity: getOpacity(degrees.length - 1 - index),
+        offsetY: offsets[index],
+        scale: scales[index],
+        screenHeight: screenHeight[index]
+      }
+    })
+  ]
+}

package/lib/runtime/components/react/pickerVIewContext.ts

@@ -0,0 +1,18 @@
+import { createContext, useContext } from 'react'
+import { SharedValue } from 'react-native-reanimated'
+
+type ContextValue = SharedValue<number>
+
+export const PickerViewColumnAnimationContext = createContext<
+    ContextValue | undefined
+>(undefined)
+
+export const usePickerViewColumnAnimationContext = () => {
+  const value = useContext(PickerViewColumnAnimationContext)
+  if (value === undefined) {
+    throw new Error(
+      'usePickerViewColumnAnimationContext must be called from within PickerViewColumnAnimationContext.Provider!'
+    )
+  }
+  return value
+}

package/lib/runtime/components/react/pickerViewMask.tsx

@@ -0,0 +1,30 @@
+import React from 'react'
+import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native'
+import LinearGradient from 'react-native-linear-gradient'
+
+type OverlayProps = {
+  itemHeight: number
+  maskContainerStyle?: StyleProp<ViewStyle>
+}
+
+const _PickerViewMask = ({
+  itemHeight,
+  maskContainerStyle
+}: OverlayProps) => {
+  return (
+    <View style={[styles.overlayContainer, maskContainerStyle]} pointerEvents={'none'}>
+      <LinearGradient colors={['rgba(255,255,255,1)', 'rgba(255,255,255,0.5)']} style={{ flex: 1 }} />
+      <View style={{ height: itemHeight }} />
+      <LinearGradient colors={['rgba(255,255,255,0.5)', 'rgba(255,255,255,1)']} style={{ flex: 1 }} />
+    </View>
+  )
+}
+const styles = StyleSheet.create({
+  overlayContainer: {
+    ...StyleSheet.absoluteFillObject,
+    zIndex: 100
+  }
+})
+
+_PickerViewMask.displayName = 'MpxPickerViewMask'
+export default _PickerViewMask

package/lib/runtime/components/react/pickerViewOverlay.tsx

@@ -0,0 +1,34 @@
+import React from 'react'
+import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native'
+
+type OverlayProps = {
+  itemHeight: number
+  overlayItemStyle?: StyleProp<ViewStyle>
+  overlayContainerStyle?: StyleProp<ViewStyle>
+}
+
+const _PickerViewOverlay = ({ itemHeight, overlayItemStyle, overlayContainerStyle }: OverlayProps) => {
+  return (
+    <View style={[styles.overlayContainer, overlayContainerStyle]} pointerEvents={'none'}>
+      <View style={[styles.selection, { height: itemHeight }, overlayItemStyle]} />
+    </View>
+  )
+}
+
+const styles = StyleSheet.create({
+  overlayContainer: {
+    ...StyleSheet.absoluteFillObject,
+    justifyContent: 'center',
+    alignItems: 'center',
+    zIndex: 200
+  },
+  selection: {
+    borderTopWidth: 1,
+    borderBottomWidth: 1,
+    borderColor: 'rgba(0, 0, 0, 0.05)',
+    alignSelf: 'stretch'
+  }
+})
+
+_PickerViewOverlay.displayName = 'MpxPickerViewOverlay'
+export default _PickerViewOverlay

package/lib/runtime/components/react/types/common.ts

@@ -16,3 +16,5 @@ export type ExtendedViewStyle = ViewStyle & {
 export type ExtendedFunctionComponent = FunctionComponent & {
   isCustomText?: boolean
 }
+
+export type AnyFunc = (...args: ReadonlyArray<any>) => any

package/lib/runtime/components/react/types/global.d.ts

@@ -1,21 +1,8 @@
-declare module 'react-native-svg/css' {
-  import type { ImageSourcePropType, StyleProp, ImageStyle } from 'react-native'
-  import type { SvgProps as SvgCssUriProps } from 'react-native-svg'
-
-  export const SvgCssUri: React.ComponentType<SvgCssUriProps & { uri?: string }>
-
-  export interface WithLocalSvgProps {
-    asset: ImageSourcePropType
-    style?: StyleProp<ImageStyle>
-    width?: string | number
-    height?: string | number
-  }
-
-  export const WithLocalSvg: React.ComponentType<WithLocalSvgProps>
-}
-
+declare let __mpx_mode__: 'wx' | 'ali' | 'swan' | 'qq' | 'tt' | 'web' | 'dd' | 'qa' | 'jd' | 'android' | 'ios'
 declare module '@mpxjs/utils' {
   export function isEmptyObject (obj: Object): boolean
+  export function isFunction (fn: unknown): boolean
+  export function isNumber (num: unknown): boolean
   export function hasOwn (obj: Object, key: string): boolean
   export function noop (...arg: any): void
   export function diffAndCloneA<A, B> (a: A, b?: B): {
@@ -26,13 +13,16 @@ declare module '@mpxjs/utils' {
   export function isObject (value): value is Object
   export function error (msg: string, location?: string, e?: any): void
   export function warn (msg: string, location?: string, e?: any): void
+  export function collectDataset (props: Record<string, any>, needParse?: boolean): Record<string, any>
   export function getFocusedNavigation (): {
     insets: {
       top: number
       bottom: number
       left: number
       right: number
-    }
+    },
+    setOptions: (params: Record<string, any>) => void,
+    addListener: (eventName: string, callback: (e: Event) => void) => void
   } | undefined
 }
 

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

@@ -83,12 +83,34 @@ const InitialValue: ExtendedViewStyle = Object.assign({
 const TransformOrigin = 'transformOrigin'
 // transform
 const isTransform = (key: string) => Object.keys(TransformInitial).includes(key)
+// 多value解析
+const parseValues = (str: string, char = ' ') => {
+  let stack = 0
+  let temp = ''
+  const result = []
+  for (let i = 0; i < str.length; i++) {
+    if (str[i] === '(') {
+      stack++
+    } else if (str[i] === ')') {
+      stack--
+    }
+    // 非括号内 或者 非分隔字符且非空
+    if (stack !== 0 || (str[i] !== char && str[i] !== ' ')) {
+      temp += str[i]
+    }
+    if ((stack === 0 && str[i] === char) || i === str.length - 1) {
+      result.push(temp)
+      temp = ''
+    }
+  }
+  return result
+}
 // parse string transform, eg: transform: 'rotateX(45deg) rotateZ(0.785398rad)'
 const parseTransform = (transformStr: string) => {
-  const values = transformStr.trim().split(/\s+/)
+  const values = parseValues(transformStr)
   const transform: {[propName: string]: string|number|number[]}[] = []
   values.forEach(item => {
-    const match = item.match(/([/\w]+)\(([^)]+)\)/)
+    const match = item.match(/([/\w]+)\((.+)\)/)
     if (match && match.length >= 3) {
       let key = match[1]
       const val = match[2]
@@ -109,7 +131,7 @@ const parseTransform = (transformStr: string) => {
           break
         case 'matrix':
         case 'matrix3d':
-          transform.push({ [key]: val.split(',').map(val => +val) })
+          transform.push({ [key]: parseValues(val, ',').map(val => +val) })
           break
         case 'translate':
         case 'scale':
@@ -120,8 +142,8 @@ const parseTransform = (transformStr: string) => {
         {
           // 2 个以上的值处理
           key = key.replace('3d', '')
-          const vals = val.split(',', key === 'rotate' ? 4 : 3)
-          // scale(.5) === scaleX(.5) scaleY(.5) 这里处理一下
+          const vals = parseValues(val, ',').splice(0, key === 'rotate' ? 4 : 3)
+          // scale(.5) === scaleX(.5) scaleY(.5)
           if (vals.length === 1 && key === 'scale') {
             vals.push(vals[0])
           }
@@ -218,12 +240,15 @@ export default function useAnimationHooks<T, P> (props: _ViewProps) {
       }
       // 添加每个key的多次step动画
       animatedKeys.forEach(key => {
-        let toVal = (rules.get(key) || transform.get(key))
         // key不存在，第一轮取shareValMap[key]value，非第一轮取上一轮的
-        if (toVal === undefined) {
-          toVal = index > 0 ? lastValueMap[key] : shareValMap[key].value
-        }
-        const animation = getAnimation({ key, value: toVal }, { delay, duration, easing }, needSetCallback ? setTransformOrigin : undefined)
+        const toVal = rules.get(key) !== undefined
+          ? rules.get(key)
+          : transform.get(key) !== undefined
+            ? transform.get(key)
+            : index > 0
+              ? lastValueMap[key]
+              : shareValMap[key].value
+        const animation = getAnimation({ key, value: toVal! }, { delay, duration, easing }, needSetCallback ? setTransformOrigin : undefined)
         needSetCallback = false
         if (!sequence[key]) {
           sequence[key] = [animation]
@@ -231,7 +256,7 @@ export default function useAnimationHooks<T, P> (props: _ViewProps) {
           sequence[key].push(animation)
         }
         // 更新一下 lastValueMap
-        lastValueMap[key] = toVal
+        lastValueMap[key] = toVal!
       })
       // 赋值驱动动画
       animatedKeys.forEach((key) => {
@@ -327,6 +352,6 @@ export default function useAnimationHooks<T, P> (props: _ViewProps) {
         styles[key] = shareValMap[key].value
       }
       return styles
-    }, Object.assign({}, originalStyle) as ExtendedViewStyle)
+    }, {} as ExtendedViewStyle)
   })
 }