@mpxjs/webpack-plugin 2.9.66 → 2.9.69-beta.0

package/lib/runtime/components/react/mpx-canvas/utils.tsx

@@ -0,0 +1,150 @@
+import { useEffect, useRef } from 'react'
+import { WebView } from 'react-native-webview'
+import Bus from './Bus'
+
+export const WEBVIEW_TARGET = '@@WEBVIEW_TARGET'
+
+export const constructors: Record<string, any> = {}
+
+export const ID = () => Math.random().toString(32).slice(2)
+
+const SPECIAL_CONSTRUCTOR: Record<string, { className: string, paramNum: number }> = {
+  ImageData: {
+    className: 'Uint8ClampedArray',
+    paramNum: 0
+  }
+}
+
+export interface Instance {
+  postMessage: (...args: any[]) => void;
+  [WEBVIEW_TARGET]?: string;
+  [key: string]: any;
+}
+
+export interface WebviewConstructor {
+  new (...args: any[]): Instance;
+  constructLocally?: (...args: unknown[]) => Instance;
+}
+
+export interface WebviewMessage {
+  type: 'set' | 'exec' | 'listen' | 'event' | 'construct'
+  payload: {
+    target?: string | { [key: string]: any }
+    key?: string
+    value?: any
+    method?: string
+    args?: any[]
+    types?: string[]
+    type?: string
+    constructor?: string | Function
+    id?: string
+  }
+}
+
+export interface CanvasInstance {
+  webview: WebView | null;
+  bus: Bus | null;
+  context2D: CanvasRenderingContext2D;
+  getContext: (contextType: string) => CanvasRenderingContext2D | null;
+  createImage: (width?: number, height?: number) => any;
+  postMessage: (message: WebviewMessage) => Promise<any>;
+  listeners: Array<(payload: any) => void>;
+  addMessageListener: (listener: (payload: any) => void) => () => void;
+  removeMessageListener: (listener: (payload: any) => void) => void;
+  createImageData: (dataArray: number[], width?: number, height?: number) => any;
+}
+
+export const registerWebviewTarget = (instance: Instance, targetName: string): void => {
+  instance[WEBVIEW_TARGET] = targetName
+}
+
+export const registerWebviewProperties = (instance: Instance, properties: Record<string, any>): void => {
+  Object.entries(properties).forEach(([key, initialValue]) => {
+    const privateKey = `__${key}__`
+    instance[privateKey] = initialValue
+    Object.defineProperty(instance, key, {
+      configurable: true,
+      enumerable: true,
+      get () {
+        return instance[privateKey]
+      },
+      set (value) {
+        instance.postMessage({
+          type: 'set',
+          payload: {
+            target: instance[WEBVIEW_TARGET],
+            key,
+            value
+          }
+        })
+
+        if (instance.forceUpdate) {
+          instance.forceUpdate()
+        }
+        return (instance[privateKey] = value)
+      }
+    })
+  })
+}
+
+export const registerWebviewMethods = (instance: Instance, methods: string[]): void => {
+  methods.forEach(method => {
+    instance[method] = (...args: any[]) => {
+      return instance.postMessage({
+        type: 'exec',
+        payload: {
+          target: instance[WEBVIEW_TARGET],
+          method,
+          args
+        }
+      })
+    }
+  })
+}
+
+export const registerWebviewConstructor = (constructor: WebviewConstructor, constructorName: string): void => {
+  constructors[constructorName] = constructor
+  constructor.constructLocally = function (...args: unknown[]): Instance {
+    return new (constructor as any)(...args, true)
+  }
+
+  constructor.prototype.onConstruction = function (...args: any[]): void {
+    if (SPECIAL_CONSTRUCTOR[constructorName] !== undefined) {
+      const { className, paramNum } = SPECIAL_CONSTRUCTOR[constructorName]
+      args[paramNum] = { className, classArgs: [args[paramNum]] }
+    }
+    this[WEBVIEW_TARGET] = ID()
+    this.postMessage({
+      type: 'construct',
+      payload: {
+        constructor: constructorName,
+        id: this[WEBVIEW_TARGET],
+        args
+      }
+    })
+  }
+  constructor.prototype.toJSON = function () {
+    return { __ref__: this[WEBVIEW_TARGET] }
+  }
+}
+export const useWebviewBinding = ({
+  targetName,
+  properties = {},
+  methods = []
+}: {
+  targetName: string;
+  properties?: Record<string, any>;
+  methods?: string[]
+}) => {
+  const instanceRef = useRef({})
+
+  useEffect(() => {
+    if (instanceRef.current) {
+      registerWebviewTarget(instanceRef.current as Instance, targetName)
+      registerWebviewProperties(instanceRef.current as Instance, properties)
+      registerWebviewMethods(instanceRef.current as Instance, methods)
+    }
+  }, [])
+
+  return instanceRef
+}

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

@@ -1,13 +1,26 @@
 /**
  * ✔ bindchange
  */
-import { JSX, useRef, forwardRef, ReactNode, useContext } from 'react'
-import { View, NativeSyntheticEvent, ViewStyle } from 'react-native'
+import {
+  JSX,
+  useRef,
+  forwardRef,
+  ReactNode,
+  useContext,
+  useMemo,
+  useEffect,
+  createElement
+} from 'react'
+import {
+  View,
+  NativeSyntheticEvent,
+  ViewStyle
+} from 'react-native'
 import { warn } from '@mpxjs/utils'
 import { FormContext, FormFieldValue, CheckboxGroupContext, GroupValue } from './context'
 import useInnerProps, { getCustomEvent } from './getInnerListeners'
 import useNodesRef, { HandlerRef } from './useNodesRef'
-import { useLayout, useTransformStyle, wrapChildren } from './utils'
+import { useLayout, useTransformStyle, wrapChildren, extendObject } from './utils'
 
 export interface CheckboxGroupProps {
   name: string
@@ -26,14 +39,15 @@ const CheckboxGroup = forwardRef<
   HandlerRef<View, CheckboxGroupProps>,
   CheckboxGroupProps
 >((props, ref): JSX.Element => {
+  const propsRef = useRef({} as CheckboxGroupProps)
+  propsRef.current = props
   const {
     style = {},
     'enable-var': enableVar,
     'external-var-context': externalVarContext,
     'parent-font-size': parentFontSize,
     'parent-width': parentWidth,
-    'parent-height': parentHeight,
-    bindchange
+    'parent-height': parentHeight
   } = props
 
   const formContext = useContext(FormContext)
@@ -51,10 +65,7 @@ const CheckboxGroup = forwardRef<
     flexWrap: 'wrap'
   }
 
-  const styleObj = {
-    ...defaultStyle,
-    ...style
-  }
+  const styleObj = extendObject({}, defaultStyle, style)
 
   const {
     hasSelfPercent,
@@ -67,11 +78,11 @@ const CheckboxGroup = forwardRef<
 
   const nodeRef = useRef(null)
 
-  useNodesRef(props, ref, nodeRef, { defaultStyle })
+  useNodesRef(props, ref, nodeRef, { style: normalStyle })
 
   const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef })
 
-  const getSelectionValue = (): string[] => {
+  const getValue = (): string[] => {
     const arr: string[] = []
     for (const key in groupValue) {
       if (groupValue[key].checked) {
@@ -81,10 +92,6 @@ const CheckboxGroup = forwardRef<
     return arr
   }
 
-  const getValue = () => {
-    return getSelectionValue()
-  }
-
   const resetValue = () => {
     Object.keys(groupValue).forEach((key) => {
       groupValue[key].checked = false
@@ -100,55 +107,74 @@ const CheckboxGroup = forwardRef<
     }
   }
 
-  const notifyChange = (
-    evt: NativeSyntheticEvent<TouchEvent>
-  ) => {
-    bindchange &&
-      bindchange(
-        getCustomEvent(
-          'tap',
-          evt,
-          {
-            layoutRef,
-            detail: {
-              value: getSelectionValue()
-            }
-          },
-          props
-        )
-      )
-  }
+  useEffect(() => {
+    return () => {
+      if (formValuesMap && props.name) {
+        formValuesMap.delete(props.name)
+      }
+    }
+  }, [])
 
   const innerProps = useInnerProps(
     props,
-    {
-      ref: nodeRef,
-      style: { ...normalStyle, ...layoutStyle },
-      ...layoutProps
-    },
-    [],
+    extendObject(
+      {
+        ref: nodeRef,
+        style: extendObject({}, normalStyle, layoutStyle)
+      },
+      layoutProps
+    ),
+    [
+      'name'
+    ],
     {
       layoutRef
     }
   )
 
-  return (
-    <View {...innerProps}>
-      <CheckboxGroupContext.Provider value={{ groupValue, notifyChange }}>
-        {
-          wrapChildren(
-            props,
+  const contextValue = useMemo(() => {
+    const notifyChange = (
+      evt: NativeSyntheticEvent<TouchEvent>
+    ) => {
+      const { bindchange } = propsRef.current
+      bindchange &&
+        bindchange(
+          getCustomEvent(
+            'tap',
+            evt,
             {
-              hasVarDec,
-              varContext: varContextRef.current
-            }
+              layoutRef,
+              detail: {
+                value: getValue()
+              }
+            },
+            propsRef.current
           )
+        )
+    }
+    return {
+      groupValue,
+      notifyChange
+    }
+  }, [])
+
+  return createElement(
+    View,
+    innerProps,
+    createElement(
+      CheckboxGroupContext.Provider,
+      { value: contextValue },
+      wrapChildren(
+        props,
+        {
+          hasVarDec,
+          varContext: varContextRef.current
         }
-      </CheckboxGroupContext.Provider>
-    </View>
+      )
+    )
   )
 })
 
-CheckboxGroup.displayName = 'mpx-checkbox-group'
+CheckboxGroup.displayName = 'MpxCheckboxGroup'
 
 export default CheckboxGroup

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

@@ -13,7 +13,8 @@ import {
   ReactNode,
   useContext,
   Dispatch,
-  SetStateAction
+  SetStateAction,
+  createElement
 } from 'react'
 import {
   View,
@@ -25,7 +26,7 @@ import { warn } from '@mpxjs/utils'
 import useInnerProps, { getCustomEvent } from './getInnerListeners'
 import useNodesRef, { HandlerRef } from './useNodesRef'
 import Icon from './mpx-icon'
-import { splitProps, splitStyle, useLayout, useTransformStyle, wrapChildren } from './utils'
+import { splitProps, splitStyle, useLayout, useTransformStyle, wrapChildren, extendObject } from './utils'
 import { CheckboxGroupContext, LabelContext } from './context'
 
 interface Selection {
@@ -46,7 +47,7 @@ export interface CheckboxProps extends Selection {
   'parent-height'?: number;
   children?: ReactNode
   bindtap?: (evt: NativeSyntheticEvent<TouchEvent> | unknown) => void
-  catchtap?: (evt: NativeSyntheticEvent<TouchEvent> | unknown) => void
+  _onChange?: (evt: NativeSyntheticEvent<TouchEvent> | unknown, { checked }: { checked: boolean }) => void
 }
 
 const styles = StyleSheet.create({
@@ -92,7 +93,7 @@ const Checkbox = forwardRef<HandlerRef<View, CheckboxProps>, CheckboxProps>(
       'parent-width': parentWidth,
       'parent-height': parentHeight,
       bindtap,
-      catchtap
+      _onChange
     } = props
 
     const [isChecked, setIsChecked] = useState<boolean>(!!checked)
@@ -101,15 +102,13 @@ const Checkbox = forwardRef<HandlerRef<View, CheckboxProps>, CheckboxProps>(
     let groupValue: { [key: string]: { checked: boolean; setValue: Dispatch<SetStateAction<boolean>>; } } | undefined
     let notifyChange: (evt: NativeSyntheticEvent<TouchEvent>) => void | undefined
 
-    const defaultStyle = {
-      ...styles.wrapper,
-      ...(disabled && styles.wrapperDisabled)
-    }
+    const defaultStyle = extendObject(
+      {},
+      styles.wrapper,
+      disabled ? styles.wrapperDisabled : null
+    )
 
-    const styleObj = {
-      ...styles.container,
-      ...style
-    }
+    const styleObj = extendObject({}, styles.container, style)
 
     const onChange = (evt: NativeSyntheticEvent<TouchEvent>) => {
       if (disabled) return
@@ -119,20 +118,15 @@ const Checkbox = forwardRef<HandlerRef<View, CheckboxProps>, CheckboxProps>(
         groupValue[value].checked = checked
       }
       notifyChange && notifyChange(evt)
+      // Called when the switch type attribute is checkbox
+      _onChange && _onChange(evt, { checked })
     }
 
     const onTap = (evt: NativeSyntheticEvent<TouchEvent>) => {
-      if (disabled) return
       bindtap && bindtap(getCustomEvent('tap', evt, { layoutRef }, props))
       onChange(evt)
     }
 
-    const catchTap = (evt: NativeSyntheticEvent<TouchEvent>) => {
-      if (disabled) return
-      catchtap && catchtap(getCustomEvent('tap', evt, { layoutRef }, props))
-      onChange(evt)
-    }
-
     const {
       hasSelfPercent,
       normalStyle,
@@ -145,13 +139,13 @@ const Checkbox = forwardRef<HandlerRef<View, CheckboxProps>, CheckboxProps>(
     const nodeRef = useRef(null)
 
     useNodesRef(props, ref, nodeRef, {
-      defaultStyle,
+      style: extendObject({}, defaultStyle, normalStyle),
       change: onChange
     })
 
     const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef })
 
-    const { textStyle, backgroundStyle, innerStyle } = splitStyle(normalStyle)
+    const { textStyle, backgroundStyle, innerStyle = {} } = splitStyle(normalStyle)
 
     if (backgroundStyle) {
       warn('Checkbox does not support background image-related styles!')
@@ -170,14 +164,21 @@ const Checkbox = forwardRef<HandlerRef<View, CheckboxProps>, CheckboxProps>(
 
     const innerProps = useInnerProps(
       props,
-      {
-        ref: nodeRef,
-        style: { ...innerStyle, ...layoutStyle },
-        ...layoutProps,
-        bindtap: onTap,
-        catchtap: catchTap
-      },
-      [],
+      extendObject(
+        {
+          ref: nodeRef,
+          style: extendObject({}, innerStyle, layoutStyle)
+        },
+        layoutProps,
+        {
+          bindtap: !disabled && onTap
+        }
+      ),
+      [
+        'value',
+        'disabled',
+        'checked'
+      ],
       {
         layoutRef
       }
@@ -206,32 +207,30 @@ const Checkbox = forwardRef<HandlerRef<View, CheckboxProps>, CheckboxProps>(
       }
     }, [checked])
 
-    return (
-      <View {...innerProps}>
-        <View style={defaultStyle}>
-          <Icon
-            type='success_no_circle'
-            size={18}
-            color={disabled ? '#ADADAD' : color}
-            style={isChecked ? styles.iconChecked : styles.icon}
-          />
-        </View>
+    return createElement(View, innerProps,
+      createElement(
+        View,
+        { style: defaultStyle },
+        createElement(Icon, {
+          type: 'success_no_circle',
+          size: 18,
+          color: disabled ? '#ADADAD' : color,
+          style: isChecked ? styles.iconChecked : styles.icon
+        })
+      ),
+      wrapChildren(
+        props,
         {
-          wrapChildren(
-            props,
-            {
-              hasVarDec,
-              varContext: varContextRef.current,
-              textStyle,
-              textProps
-            }
-          )
+          hasVarDec,
+          varContext: varContextRef.current,
+          textStyle,
+          textProps
         }
-      </View>
+      )
     )
   }
 )
 
-Checkbox.displayName = 'mpx-checkbox'
+Checkbox.displayName = 'MpxCheckbox'
 
 export default Checkbox

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

@@ -4,16 +4,15 @@
  * ✔ bindsubmit
  * ✔ bindreset
  */
-
 import { View } from 'react-native'
-import { JSX, useRef, forwardRef, ReactNode } from 'react'
+import { JSX, useRef, forwardRef, ReactNode, useMemo, createElement } from 'react'
 import useNodesRef, { HandlerRef } from './useNodesRef'
 import useInnerProps, { getCustomEvent } from './getInnerListeners'
 import { FormContext } from './context'
-import { useTransformStyle, splitProps, splitStyle, useLayout, wrapChildren } from './utils'
+import { useTransformStyle, splitProps, splitStyle, useLayout, wrapChildren, extendObject } from './utils'
 interface FormProps {
   style?: Record<string, any>;
-  children: ReactNode;
+  children?: ReactNode;
   'enable-offset'?: boolean;
   'enable-var'?: boolean
   'external-var-context'?: Record<string, any>;
@@ -30,7 +29,6 @@ interface FormProps {
 
 const _Form = forwardRef<HandlerRef<View, FormProps>, FormProps>((fromProps: FormProps, ref): JSX.Element => {
   const { textProps, innerProps: props = {} } = splitProps(fromProps)
-  const formValuesMap = useRef(new Map()).current
   const {
     style,
     'enable-var': enableVar,
@@ -49,70 +47,77 @@ const _Form = forwardRef<HandlerRef<View, FormProps>, FormProps>((fromProps: For
     setHeight
   } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight })
 
-  const { textStyle, innerStyle } = splitStyle(normalStyle)
+  const { textStyle, innerStyle = {} } = splitStyle(normalStyle)
 
   const formRef = useRef(null)
-  useNodesRef(props, ref, formRef)
-
-  const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef: formRef })
+  useNodesRef(props, ref, formRef, {
+    style: normalStyle
+  })
 
-  const submit = () => {
-    const { bindsubmit } = props
-    const formValue: Record<string, any> = {}
-    for (const name of formValuesMap.keys()) {
-      if (formValuesMap.get(name).getValue) {
-        formValue[name] = formValuesMap.get(name).getValue()
-      }
-    }
-    bindsubmit && bindsubmit(getCustomEvent(
-      'submit',
-      {},
-      {
-        detail: {
-          value: formValue
-        },
-        layoutRef
-      },
-      props
-    ))
-  }
+  const propsRef = useRef<FormProps>({})
+  propsRef.current = props
 
-  const reset = () => {
-    const { bindreset } = props
-    bindreset && bindreset()
-    formValuesMap.forEach(item => item.resetValue())
-  }
+  const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef: formRef })
 
-  const innerProps = useInnerProps(props, {
-    style: { ...innerStyle, ...layoutStyle },
-    ref: formRef,
-    ...layoutProps
-  }, [
+  const innerProps = useInnerProps(props, extendObject({
+    style: extendObject({}, innerStyle, layoutStyle),
+    ref: formRef
+  }, layoutProps)
+  , [
     'bindsubmit',
     'bindreset'
   ], { layoutRef })
 
-  return (
-    <View
-      {...innerProps}
-    >
-      <FormContext.Provider value={{ formValuesMap, submit, reset }}>
+  const contextValue = useMemo(() => {
+    const formValuesMap = new Map()
+    const submit = () => {
+      const { bindsubmit } = propsRef.current
+      const formValue: Record<string, any> = {}
+      for (const name of formValuesMap.keys()) {
+        if (formValuesMap.get(name).getValue) {
+          formValue[name] = formValuesMap.get(name).getValue()
+        }
+      }
+      bindsubmit && bindsubmit(getCustomEvent(
+        'submit',
+        {},
         {
-          wrapChildren(
-            props,
-            {
-              hasVarDec,
-              varContext: varContextRef.current,
-              textStyle,
-              textProps
-            }
-          )
+          detail: {
+            value: formValue
+          },
+          layoutRef
+        },
+        propsRef.current
+      ))
+    }
+
+    const reset = () => {
+      const { bindreset } = propsRef.current
+      bindreset && bindreset()
+      formValuesMap.forEach(item => item.resetValue())
+    }
+    return {
+      formValuesMap,
+      submit,
+      reset
+    }
+  }, [])
+
+  return createElement(View, innerProps, createElement(
+    FormContext.Provider,
+    { value: contextValue },
+    wrapChildren(
+      props,
+      {
+        hasVarDec,
+        varContext: varContextRef.current,
+        textStyle,
+        textProps
       }
-      </FormContext.Provider>
-    </View>
-  )
+    )
+  ))
 })
 
-_Form.displayName = 'mpx-form'
+_Form.displayName = 'MpxForm'
 
 export default _Form