@mpxjs/webpack-plugin 2.9.69-beta.11 → 2.9.69-beta.12

package/lib/runtime/components/react/dist/mpx-portal.jsx

@@ -1,9 +1,10 @@
+import { useContext } from 'react';
 import { PortalContext, VarContext } from './context';
 import PortalConsumer from './mpx-portal/portal-consumer';
 import PortalHost, { portal } from './mpx-portal/portal-host';
-const Portal = ({ children, varContext }) => {
-    const hasVarContext = varContext && Object.keys(varContext).length;
-    if (hasVarContext) {
+const Portal = ({ children }) => {
+    const varContext = useContext(VarContext);
+    if (varContext) {
         children = (<VarContext.Provider value={varContext} key='varContextWrap'>{children}</VarContext.Provider>);
     }
     return (<PortalContext.Consumer>

package/lib/runtime/components/react/dist/mpx-root-portal.jsx

@@ -1,18 +1,16 @@
 /**
  * ✔ enable
  */
-import { createElement, Fragment, useContext } from 'react';
+import { createElement, Fragment } from 'react';
 import Portal from './mpx-portal';
 import { warn } from '@mpxjs/utils';
-import { VarContext } from './context';
 const _RootPortal = (props) => {
     const { children, enable = true } = props;
     if (props.style) {
         warn('The root-portal component does not support the style prop.');
     }
-    const varContext = useContext(VarContext);
     return enable
-        ? createElement(Portal, { varContext }, children)
+        ? createElement(Portal, null, children)
         : createElement(Fragment, null, children);
 };
 _RootPortal.displayName = 'MpxRootPortal';

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

@@ -1,4 +1,4 @@
-import { ReactNode } from 'react'
+import { ReactNode, useContext } from 'react'
 import { PortalContext, PortalContextValue, VarContext } from './context'
 import PortalConsumer from './mpx-portal/portal-consumer'
 import PortalHost, { portal } from './mpx-portal/portal-host'
@@ -13,10 +13,10 @@ export type PortalProps = {
   varContext?: Record<string, any> | undefined
 }
 
-const Portal = ({ children, varContext }:PortalProps): JSX.Element => {
-  const hasVarContext = varContext && Object.keys(varContext).length
-  if (hasVarContext) {
-      children = (<VarContext.Provider value={varContext} key='varContextWrap'>{children}</VarContext.Provider>)
+const Portal = ({ children }:PortalProps): JSX.Element => {
+  const varContext = useContext(VarContext)
+  if (varContext) {
+    children = (<VarContext.Provider value={varContext} key='varContextWrap'>{children}</VarContext.Provider>)
   }
   return (
     <PortalContext.Consumer>

package/lib/runtime/components/react/mpx-root-portal.tsx

@@ -1,7 +1,7 @@
 /**
  * ✔ enable
  */
-import { ReactNode, createElement, Fragment, useContext } from 'react'
+import { ReactNode, createElement, Fragment } from 'react'
 import Portal from './mpx-portal'
 import { warn } from '@mpxjs/utils'
 import { VarContext } from './context'
@@ -16,9 +16,9 @@ const _RootPortal = (props: RootPortalProps) => {
   if (props.style) {
     warn('The root-portal component does not support the style prop.')
   }
-  const varContext = useContext(VarContext)
+  
   return enable
-    ? createElement(Portal, { varContext }, children)
+    ? createElement(Portal, null, children)
     : createElement(Fragment, null, children)
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.9.69-beta.11",
+  "version": "2.9.69-beta.12",
   "description": "mpx compile core",
   "keywords": [
     "mpx"