@blocklet/pages-kit 0.5.53 → 0.5.55

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

@@ -2,6 +2,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { cx } from '@emotion/css';
 import { Skeleton, Fade, Box } from '@mui/material';
 import isEmpty from 'lodash/isEmpty';
+import omit from 'lodash/omit';
 import set from 'lodash/set';
 import { useDeferredValue, useEffect, useRef, useState, useMemo } from 'react';
 import { Helmet } from 'react-helmet';
@@ -290,21 +291,25 @@ function usePreloadComponent({ instanceId, componentId, properties, locale, dev
     const realLocale = getRealLocale(locale);
     const result = getComponentByComponentId({ componentId, locale: realLocale, instanceId });
     if (result) {
-        previousRef.current = result;
+        // 只缓存 props 以外的数据，props 会跟随语言动态更新
+        previousRef.current = omit(result, 'props');
         return result;
     }
     if (instanceId) {
         const key = [instanceId, realLocale].join('-');
-        COMPONENT_LOADER_MAP[key] ??= customComponentStates()
-            .getState()
-            .loadComponents({
-            mode: dev?.mode,
-            projectId: dev?.projectId ?? window.__PROJECT_ID__,
-            locale: realLocale,
-            instances: [{ id: instanceId, component: { id: componentId }, properties }],
-        });
-        if (previousRef.current)
-            return previousRef.current;
+        const componentState = customComponentStates().getState();
+        COMPONENT_LOADER_MAP[key] ??=
+            Promise.resolve(componentState.getComponent({ componentId, locale: realLocale ?? dev?.defaultLocale ?? 'en' })) ??
+                componentState.loadComponents({
+                    mode: dev?.mode,
+                    projectId: dev?.projectId ?? window.__PROJECT_ID__,
+                    locale: realLocale,
+                    instances: [{ id: instanceId, component: { id: componentId }, properties }],
+                });
+    }
+    // 如果前置 preload 已经触发过了，直接返回，不再触发下面的 /preload 逻辑
+    if (previousRef.current) {
+        return previousRef.current;
     }
     return null;
 }