@blocklet/pages-kit 0.4.107 → 0.4.108
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cjs/components/CustomComponentRenderer/index.js +2 -2
- package/lib/cjs/components/CustomComponentRenderer/state.js +2 -3
- package/lib/cjs/tsconfig.tsbuildinfo +1 -1
- package/lib/esm/components/CustomComponentRenderer/index.js +2 -2
- package/lib/esm/components/CustomComponentRenderer/state.js +2 -3
- package/lib/esm/tsconfig.tsbuildinfo +1 -1
- package/lib/types/components/CustomComponentRenderer/state.d.ts +1 -1
- package/lib/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -48,7 +48,7 @@ function ComponentRenderer({ renderCount = 0, blockletId, blockletTitle, compone
|
|
|
48
48
|
throw component.error;
|
|
49
49
|
}
|
|
50
50
|
const renderComponentChildren = (Component) => {
|
|
51
|
-
const children = ((0, jsx_runtime_1.jsx)(Renderer, { renderCount: renderCount + 1, ...props, Component: Component, props: { ...component?.props } }));
|
|
51
|
+
const children = ((0, jsx_runtime_1.jsx)(Renderer, { renderCount: renderCount + 1, ...props, Component: Component, props: { ...component?.props, ...props.props } }));
|
|
52
52
|
return ctx?.customRendererComponent ? ((0, jsx_runtime_1.jsx)(ctx.customRendererComponent, { Component: Component, children: children })) : (children);
|
|
53
53
|
};
|
|
54
54
|
if (component?.Component && renderType === 'view') {
|
|
@@ -69,7 +69,7 @@ function Renderer({ renderCount, Component, locale, props, }) {
|
|
|
69
69
|
if (val?.type === property_1.RenderNestedComponent) {
|
|
70
70
|
return [
|
|
71
71
|
key,
|
|
72
|
-
(0, jsx_runtime_1.jsx)(ComponentRenderer, { locale: locale, renderCount: renderCount, componentId: val.componentId, properties: val.properties
|
|
72
|
+
(0, jsx_runtime_1.jsx)(ComponentRenderer, { locale: locale, renderCount: renderCount, componentId: val.componentId, properties: val.properties }),
|
|
73
73
|
];
|
|
74
74
|
}
|
|
75
75
|
return [key, val];
|
|
@@ -270,7 +270,7 @@ async function loadComponents(input) {
|
|
|
270
270
|
instances: Object.fromEntries(result.instances.map(({ id, ...instance }) => [id, instance])),
|
|
271
271
|
};
|
|
272
272
|
}
|
|
273
|
-
function useComponent({ instanceId, componentId, properties, locale, dev
|
|
273
|
+
function useComponent({ instanceId, componentId, properties, locale, dev }) {
|
|
274
274
|
const transpile = useTranspileComponent({ componentId, locale, properties, dev });
|
|
275
275
|
const preload = usePreloadComponent({ instanceId, componentId, properties, locale, dev });
|
|
276
276
|
const componentProperties = transpile?.componentProperties ?? preload?.componentProperties;
|
|
@@ -286,8 +286,7 @@ function useComponent({ instanceId, componentId, properties, locale, dev, props,
|
|
|
286
286
|
return undefined;
|
|
287
287
|
// 如果提供了 key 优先使用 key
|
|
288
288
|
const propKey = property.key ?? property.id;
|
|
289
|
-
|
|
290
|
-
const propValue = props?.[propKey] ?? value;
|
|
289
|
+
const propValue = value;
|
|
291
290
|
// keep preload props
|
|
292
291
|
let v = (0, property_1.parsePropertyValue)(property, propValue, {
|
|
293
292
|
locale,
|