@mpxjs/webpack-plugin 2.10.24 → 2.11.0

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

@@ -4,13 +4,18 @@ import Portal from './mpx-portal/index'
 import { usePreventRemove, PreventRemoveEvent } from '@react-navigation/native'
 import { getCustomEvent } from './getInnerListeners'
 import { promisify, redirectTo, navigateTo, navigateBack, reLaunch, switchTab } from '@mpxjs/api-proxy'
-import { WebView } from 'react-native-webview'
+import { WebView, WebViewProps as RNWebViewProps } from 'react-native-webview'
 import useNodesRef, { HandlerRef } from './useNodesRef'
 import { getCurrentPage, useNavigation } from './utils'
 import { WebViewHttpErrorEvent, WebViewEvent, WebViewMessageEvent, WebViewNavigation, WebViewProgressEvent } from 'react-native-webview/lib/WebViewTypes'
 import { RouteContext } from './context'
 import { StyleSheet, View, Text } from 'react-native'
 
+// react-native-webview@13.17+ 将 WebView 泛型默认值由 {} 改为 undefined，
+// 导致 WebViewProps & undefined 塌成 never、JSX 直接使用时 props 全部不可赋值。
+// 显式实参化为 WebView<object>（其 props 即 WebViewProps），保留类实例签名使 ref 仍解析为 WebView，兼容各版本声明。
+const RNWebView = WebView as unknown as new (props: RNWebViewProps) => WebView<object>
+
 type OnMessageCallbackEvent = {
   detail: {
     data: any[]
@@ -30,6 +35,7 @@ interface WebViewProps {
   binderror?: (event: CommonCallbackEvent) => void
   [x: string]: any
 }
+type WebViewInstance = WebView<any>
 type Listener = (type: string, callback: (e: Event) => void) => () => void
 
 interface PayloadData {
@@ -77,7 +83,7 @@ const styles = StyleSheet.create({
   }
 })
 
-const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((props, ref): JSX.Element | null => {
+const _WebView = forwardRef<HandlerRef<WebViewInstance, WebViewProps>, WebViewProps>((props, ref): JSX.Element | null => {
   const { src, bindmessage, bindload, binderror } = props
   const mpx = global.__mpx
   const errorText: ErrorTextMap = {
@@ -98,7 +104,7 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
   const { pageId } = useContext(RouteContext) || {}
   const [pageLoadErr, setPageLoadErr] = useState<boolean>(false)
   const currentPage = useMemo(() => getCurrentPage(pageId), [pageId])
-  const webViewRef = useRef<WebView>(null)
+  const webViewRef = useRef<WebViewInstance>(null)
   const fristLoaded = useRef<boolean>(false)
   const isLoadError = useRef<boolean>(false)
   const isNavigateBack = useRef<boolean>(false)
@@ -123,7 +129,7 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
     isNavigateBack.current = false
   })
 
-  useNodesRef<WebView, WebViewProps>(props, ref, webViewRef, {
+  useNodesRef<WebViewInstance, WebViewProps>(props, ref, webViewRef, {
     style: defaultWebViewStyle
   })
 
@@ -352,7 +358,7 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
             </View>
             )
           : (
-          <WebView
+          <RNWebView
             containerStyle={ defaultWebViewStyle }
             source={{ uri: src }}
             ref={webViewRef}
@@ -365,7 +371,7 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
             onHttpError={onHttpError}
             onError={onError}
             allowsBackForwardNavigationGestures={true}
-          ></WebView>)}
+          ></RNWebView>)}
       </Portal>
   )
 })

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

@@ -0,0 +1,150 @@
+const namedColorSet: Record<string, boolean> = {
+  transparent: true,
+  aliceblue: true,
+  antiquewhite: true,
+  aqua: true,
+  aquamarine: true,
+  azure: true,
+  beige: true,
+  bisque: true,
+  black: true,
+  blanchedalmond: true,
+  blue: true,
+  blueviolet: true,
+  brown: true,
+  burlywood: true,
+  cadetblue: true,
+  chartreuse: true,
+  chocolate: true,
+  coral: true,
+  cornflowerblue: true,
+  cornsilk: true,
+  crimson: true,
+  cyan: true,
+  darkblue: true,
+  darkcyan: true,
+  darkgoldenrod: true,
+  darkgray: true,
+  darkgreen: true,
+  darkgrey: true,
+  darkkhaki: true,
+  darkmagenta: true,
+  darkolivegreen: true,
+  darkorange: true,
+  darkorchid: true,
+  darkred: true,
+  darksalmon: true,
+  darkseagreen: true,
+  darkslateblue: true,
+  darkslategrey: true,
+  darkturquoise: true,
+  darkviolet: true,
+  deeppink: true,
+  deepskyblue: true,
+  dimgray: true,
+  dimgrey: true,
+  dodgerblue: true,
+  firebrick: true,
+  floralwhite: true,
+  forestgreen: true,
+  fuchsia: true,
+  gainsboro: true,
+  ghostwhite: true,
+  gold: true,
+  goldenrod: true,
+  gray: true,
+  green: true,
+  greenyellow: true,
+  grey: true,
+  honeydew: true,
+  hotpink: true,
+  indianred: true,
+  indigo: true,
+  ivory: true,
+  khaki: true,
+  lavender: true,
+  lavenderblush: true,
+  lawngreen: true,
+  lemonchiffon: true,
+  lightblue: true,
+  lightcoral: true,
+  lightcyan: true,
+  lightgoldenrodyellow: true,
+  lightgray: true,
+  lightgreen: true,
+  lightgrey: true,
+  lightpink: true,
+  lightsalmon: true,
+  lightseagreen: true,
+  lightskyblue: true,
+  lightslategrey: true,
+  lightsteelblue: true,
+  lightyellow: true,
+  lime: true,
+  limegreen: true,
+  linen: true,
+  magenta: true,
+  maroon: true,
+  mediumaquamarine: true,
+  mediumblue: true,
+  mediumorchid: true,
+  mediumpurple: true,
+  mediumseagreen: true,
+  mediumslateblue: true,
+  mediumspringgreen: true,
+  mediumturquoise: true,
+  mediumvioletred: true,
+  midnightblue: true,
+  mintcream: true,
+  mistyrose: true,
+  moccasin: true,
+  navajowhite: true,
+  navy: true,
+  oldlace: true,
+  olive: true,
+  olivedrab: true,
+  orange: true,
+  orangered: true,
+  orchid: true,
+  palegoldenrod: true,
+  palegreen: true,
+  paleturquoise: true,
+  palevioletred: true,
+  papayawhip: true,
+  peachpuff: true,
+  peru: true,
+  pink: true,
+  plum: true,
+  powderblue: true,
+  purple: true,
+  rebeccapurple: true,
+  red: true,
+  rosybrown: true,
+  royalblue: true,
+  saddlebrown: true,
+  salmon: true,
+  sandybrown: true,
+  seagreen: true,
+  seashell: true,
+  sienna: true,
+  silver: true,
+  skyblue: true,
+  slateblue: true,
+  slategray: true,
+  snow: true,
+  springgreen: true,
+  steelblue: true,
+  tan: true,
+  teal: true,
+  thistle: true,
+  tomato: true,
+  turquoise: true,
+  violet: true,
+  wheat: true,
+  white: true,
+  whitesmoke: true,
+  yellow: true,
+  yellowgreen: true
+}
+
+export default namedColorSet

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

@@ -43,6 +43,14 @@ interface EventConfigDetail {
   hasCatch: boolean
 }
 
+interface EventMeta {
+  bitFlag: string
+  events: string[]
+  eventName: string
+  eventType: EventType
+  hasCatch: boolean
+}
+
 type EventConfig = {
   innerRef: InnerRef
   propsRef: PropsRef
@@ -52,6 +60,15 @@ type EventConfig = {
   [index: string]: EventConfigDetail
 }
 
+type EventConfigRef = MutableRefObject<EventConfig>
+
+type TouchHandler = (e: ExtendedNativeTouchEvent, type: EventType, eventConfig: EventConfig) => void
+
+interface TouchHandlerConfig {
+  type: EventType
+  handler: TouchHandler
+}
+
 interface RawConfig {
   layoutRef?: LayoutRef
   disableTap?: boolean
@@ -101,7 +118,10 @@ export {
   Navigation,
   ExtendedNativeTouchEvent,
   EventConfig,
+  EventConfigRef,
+  EventMeta,
   RawConfig,
   EventType,
-  GlobalEventState
+  GlobalEventState,
+  TouchHandlerConfig
 }

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

@@ -14,6 +14,7 @@ declare module '@mpxjs/utils' {
     diff: boolean
     diffData: Object | null
   }
+  export function shallowEqual (a: unknown, b: unknown): boolean
   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