@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
|
@@ -28,7 +28,7 @@ function ComponentRenderer({ renderCount = 0, blockletId, blockletTitle, compone
|
|
|
28
28
|
throw component.error;
|
|
29
29
|
}
|
|
30
30
|
const renderComponentChildren = (Component) => {
|
|
31
|
-
const children = (_jsx(Renderer, { renderCount: renderCount + 1, ...props, Component: Component, props: { ...component?.props } }));
|
|
31
|
+
const children = (_jsx(Renderer, { renderCount: renderCount + 1, ...props, Component: Component, props: { ...component?.props, ...props.props } }));
|
|
32
32
|
return ctx?.customRendererComponent ? (_jsx(ctx.customRendererComponent, { Component: Component, children: children })) : (children);
|
|
33
33
|
};
|
|
34
34
|
if (component?.Component && renderType === 'view') {
|
|
@@ -49,7 +49,7 @@ function Renderer({ renderCount, Component, locale, props, }) {
|
|
|
49
49
|
if (val?.type === RenderNestedComponent) {
|
|
50
50
|
return [
|
|
51
51
|
key,
|
|
52
|
-
_jsx(ComponentRenderer, { locale: locale, renderCount: renderCount, componentId: val.componentId, properties: val.properties
|
|
52
|
+
_jsx(ComponentRenderer, { locale: locale, renderCount: renderCount, componentId: val.componentId, properties: val.properties }),
|
|
53
53
|
];
|
|
54
54
|
}
|
|
55
55
|
return [key, val];
|
|
@@ -237,7 +237,7 @@ async function loadComponents(input) {
|
|
|
237
237
|
instances: Object.fromEntries(result.instances.map(({ id, ...instance }) => [id, instance])),
|
|
238
238
|
};
|
|
239
239
|
}
|
|
240
|
-
export function useComponent({ instanceId, componentId, properties, locale, dev
|
|
240
|
+
export function useComponent({ instanceId, componentId, properties, locale, dev }) {
|
|
241
241
|
const transpile = useTranspileComponent({ componentId, locale, properties, dev });
|
|
242
242
|
const preload = usePreloadComponent({ instanceId, componentId, properties, locale, dev });
|
|
243
243
|
const componentProperties = transpile?.componentProperties ?? preload?.componentProperties;
|
|
@@ -253,8 +253,7 @@ export function useComponent({ instanceId, componentId, properties, locale, dev,
|
|
|
253
253
|
return undefined;
|
|
254
254
|
// 如果提供了 key 优先使用 key
|
|
255
255
|
const propKey = property.key ?? property.id;
|
|
256
|
-
|
|
257
|
-
const propValue = props?.[propKey] ?? value;
|
|
256
|
+
const propValue = value;
|
|
258
257
|
// keep preload props
|
|
259
258
|
let v = parsePropertyValue(property, propValue, {
|
|
260
259
|
locale,
|