Merge pull request #3022 from AndyJinSS/config-provider

fix(renderer): remove the replacement 'div' for ConfigProvider when i…
This commit is contained in:
唐澜 2024-07-03 10:36:42 +08:00 committed by GitHub
commit 6950329d1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -15,7 +15,7 @@ export default function rendererFactory(): IRenderComponent {
const AppContext = contextFactory(); const AppContext = contextFactory();
const Div = divFactory(); const Div = divFactory();
const ConfigProvider = adapter.getConfigProvider() || Div; const ConfigProvider = adapter.getConfigProvider();
const debug = Debug('renderer:entry'); const debug = Debug('renderer:entry');
@ -157,16 +157,7 @@ export default function rendererFactory(): IRenderComponent {
} }
if (Comp) { if (Comp) {
return createElement(AppContext.Provider, { const comp = createElement(Comp, {
value: {
appHelper,
components: allComponents,
engine: this,
},
}, createElement(ConfigProvider, {
device: this.props.device,
locale: this.props.locale,
}, createElement(Comp, {
key: schema.__ctx && `${schema.__ctx.lceKey}_${schema.__ctx.idx || '0'}`, key: schema.__ctx && `${schema.__ctx.lceKey}_${schema.__ctx.idx || '0'}`,
ref: this.__getRef, ref: this.__getRef,
__appHelper: appHelper, __appHelper: appHelper,
@ -174,7 +165,17 @@ export default function rendererFactory(): IRenderComponent {
__schema: schema, __schema: schema,
__designMode: designMode, __designMode: designMode,
...this.props, ...this.props,
}))); });
return createElement(AppContext.Provider, {
value: {
appHelper,
components: allComponents,
engine: this,
},
}, ConfigProvider ? createElement(ConfigProvider, {
device: this.props.device,
locale: this.props.locale,
}, comp) : comp);
} }
return null; return null;
} }