@blocklet/pages-kit 0.4.106 → 0.4.107

package/lib/cjs/utils/property.js

@@ -22,9 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initDynamicParsePropertyValueHandlers = exports.RenderNestedComponent = void 0;
 exports.componentUMDName = componentUMDName;
@@ -34,7 +31,6 @@ exports.safeYamlParse = safeYamlParse;
 exports.parsePropertyValue = parsePropertyValue;
 exports.assignNullableFields = assignNullableFields;
 exports.getComponentDependencies = getComponentDependencies;
-const isNil_1 = __importDefault(require("lodash/isNil"));
 const yaml = __importStar(require("yaml"));
 const common_1 = require("./common");
 function componentUMDName({ componentId }) {
@@ -134,11 +130,15 @@ function parsePropertyValue(property, value, { locale, defaultLocale, propertyHa
         ...(propertyHandlers ?? {}),
     };
     if (mixedPropertyHandlers && property.type && typeof mixedPropertyHandlers[property.type] === 'function') {
-        const handler = mixedPropertyHandlers[property.type];
-        const result = handler?.(value);
-        if (!(0, isNil_1.default)(result)) {
+        try {
+            const handler = mixedPropertyHandlers[property.type];
+            const result = handler?.(value);
             return result;
         }
+        catch (error) {
+            console.error('parse property value in handler error', error);
+            return undefined;
+        }
     }
     if (property.type === 'json') {
         if (!value)

package/lib/esm/components/CustomComponentRenderer/index.js

@@ -28,7 +28,7 @@ function ComponentRenderer({ renderCount = 0, blockletId, blockletTitle, compone
         throw component.error;
     }
     const renderComponentChildren = (Component) => {
-        const children = (_jsx(Renderer, { renderCount: renderCount + 1, ...props, Component: Component, props: { ...component?.props, ...props.props } }));
+        const children = (_jsx(Renderer, { renderCount: renderCount + 1, ...props, Component: Component, props: { ...component?.props } }));
         return ctx?.customRendererComponent ? (_jsx(ctx.customRendererComponent, { Component: Component, children: children })) : (children);
     };
     if (component?.Component && renderType === 'view') {
@@ -45,10 +45,14 @@ function ComponentRenderer({ renderCount = 0, blockletId, blockletTitle, compone
 }
 function Renderer({ renderCount, Component, locale, props, }) {
     const componentProps = Object.fromEntries(Object.entries(props).map(([key, val]) => {
-        return [
-            key,
-            val?.type === RenderNestedComponent ? (_jsx(ComponentRenderer, { locale: locale, renderCount: renderCount, componentId: val.componentId, properties: val.properties, props: val.props })) : (val),
-        ];
+        // if is NestedComponent, render it
+        if (val?.type === RenderNestedComponent) {
+            return [
+                key,
+                _jsx(ComponentRenderer, { locale: locale, renderCount: renderCount, componentId: val.componentId, properties: val.properties, props: val.props }),
+            ];
+        }
+        return [key, val];
     }));
     return _jsx(Component, { locale: locale, ...componentProps });
 }

package/lib/esm/components/CustomComponentRenderer/state.js

@@ -76,7 +76,10 @@ function importCustomComponent(m, { componentId }) {
                 }
                 return null;
             }, [loading, error, ResolvedComponent, props]);
-            return (_jsx(Fade, { in: !loading, timeout: 500, children: _jsx(Box, { className: "CustomComponent-root", children: content }) }));
+            return (_jsx(Fade, { in: !loading, timeout: 500, children: _jsx(Box, { className: "CustomComponent-root", sx: {
+                        // 使用 display: contents 避免外层包裹的 div 样式影响组件内部样式
+                        display: 'contents',
+                    }, children: content }) }));
         };
     }
     // non-Promise case
@@ -234,7 +237,7 @@ async function loadComponents(input) {
         instances: Object.fromEntries(result.instances.map(({ id, ...instance }) => [id, instance])),
     };
 }
-export function useComponent({ instanceId, componentId, properties, locale, dev }) {
+export function useComponent({ instanceId, componentId, properties, locale, dev, props, }) {
     const transpile = useTranspileComponent({ componentId, locale, properties, dev });
     const preload = usePreloadComponent({ instanceId, componentId, properties, locale, dev });
     const componentProperties = transpile?.componentProperties ?? preload?.componentProperties;
@@ -248,8 +251,12 @@ export function useComponent({ instanceId, componentId, properties, locale, dev
                 const property = componentProperties?.[key]?.data;
                 if (!property)
                     return undefined;
+                // 如果提供了 key 优先使用 key
+                const propKey = property.key ?? property.id;
+                // 如果提供了 props 优先使用 props 中的值
+                const propValue = props?.[propKey] ?? value;
                 // keep preload props
-                let v = parsePropertyValue(property, value, {
+                let v = parsePropertyValue(property, propValue, {
                     locale,
                     defaultLocale: dev?.defaultLocale,
                 });
@@ -263,7 +270,7 @@ export function useComponent({ instanceId, componentId, properties, locale, dev
                     };
                 }
                 // if key is undefined, use id
-                return [property.key || property.id, v];
+                return [propKey, v];
             })
                 .filter((i) => !!i)),
         },