Merge branch 'master' of https://git.genarrative.world/GenarrativeAI/Genarrative

src/components/rpg-entry/RpgEntryHomeView.tsx

@@ -131,6 +131,7 @@ import {
   findPublicWorkForHistoryEntry,
   isEdutainmentEntryEnabled,
 } from '../platform-entry/platformEdutainmentVisibility';
+import { getInitialPlatformDesktopLayout } from '../platform-entry/platformEntryResponsive';
 import { ResolvedAssetImage } from '../ResolvedAssetImage';
 import { RpgEntryBrandLogo } from './RpgEntryBrandLogo';
 import {
@@ -165,6 +166,7 @@ export type PlatformHomeTab =
   | 'profile';
 export interface RpgEntryHomeViewProps {
   activeTab: PlatformHomeTab;
+  isDesktopLayout?: boolean;
   onTabChange: (tab: PlatformHomeTab) => void;
   hasSavedGame: boolean;
   savedSnapshot: HydratedSavedGameSnapshot | null;
@@ -234,7 +236,6 @@ const DESKTOP_PAGE_STAGE_CLASS =
   'platform-page-stage platform-remap-surface min-w-0 space-y-5 pb-4';
 const DESKTOP_DISCOVER_PAGE_STAGE_CLASS =
   'platform-remap-surface min-w-0 space-y-5 pb-4';
-const DESKTOP_LAYOUT_QUERY = '(min-width: 1024px)';
 const PLATFORM_HOME_TABS: PlatformHomeTab[] = [
   'home',
   'category',
@@ -416,46 +417,6 @@ const PLATFORM_RANKING_TABS: Array<{
     emptyText: '公开广场暂时还没有点赞作品。',
   },
 ];
-function usePlatformDesktopLayout() {
-  const [isDesktopLayout, setIsDesktopLayout] = useState(() => {
-    if (
-      typeof window === 'undefined' ||
-      typeof window.matchMedia !== 'function'
-    ) {
-      return false;
-    }
-
-    return window.matchMedia(DESKTOP_LAYOUT_QUERY).matches;
-  });
-
-  useEffect(() => {
-    if (
-      typeof window === 'undefined' ||
-      typeof window.matchMedia !== 'function'
-    ) {
-      return;
-    }
-
-    const mediaQuery = window.matchMedia(DESKTOP_LAYOUT_QUERY);
-    const updateLayout = (event?: MediaQueryListEvent) => {
-      setIsDesktopLayout(event?.matches ?? mediaQuery.matches);
-    };
-
-    updateLayout();
-
-    // 平台页只挂载当前断点外壳，避免隐藏的移动端/桌面端内容重复抢占查询。
-    if (typeof mediaQuery.addEventListener === 'function') {
-      mediaQuery.addEventListener('change', updateLayout);
-      return () => mediaQuery.removeEventListener('change', updateLayout);
-    }
-
-    mediaQuery.addListener(updateLayout);
-    return () => mediaQuery.removeListener(updateLayout);
-  }, []);
-
-  return isDesktopLayout;
-}
-
 function ResolvedAssetBackdrop({
   src,
   fallbackSrc,
@@ -3978,6 +3939,7 @@ function ProfilePlayedWorksModal({
 
 export function RpgEntryHomeView({
   activeTab,
+  isDesktopLayout: isDesktopLayoutProp,
   onTabChange,
   saveEntries,
   saveError,
@@ -4137,7 +4099,8 @@ export function RpgEntryHomeView({
   const [isSavingAvatar, setIsSavingAvatar] = useState(false);
   const isAuthenticated = Boolean(authUi?.user);
   const edutainmentEntryEnabled = isEdutainmentEntryEnabled();
-  const isDesktopLayout = usePlatformDesktopLayout();
+  const [fallbackDesktopLayout] = useState(getInitialPlatformDesktopLayout);
+  const isDesktopLayout = isDesktopLayoutProp ?? fallbackDesktopLayout;
   const openRecommendGalleryDetail =
     onOpenRecommendGalleryDetail ?? onOpenGalleryDetail;
   const generalFeaturedEntries = useMemo(
@@ -5494,7 +5457,7 @@ export function RpgEntryHomeView({
             {recommendRuntimeError}
           </button>
         </section>
-      ) : isStartingRecommendEntry || !recommendRuntimeContent ? (
+      ) : isStartingRecommendEntry ? (
         <section className="platform-recommend-runtime-panel">
           <div className="platform-recommend-runtime-state">加载中...</div>
         </section>
@@ -6670,10 +6633,7 @@ export function RpgEntryHomeView({
   );
 
   const tabContentById = {
-    home:
-      !isAuthenticated || !isDesktopLayout
-        ? mobileRecommendContent
-        : desktopHomeContent,
+    home: isDesktopLayout ? desktopHomeContent : mobileRecommendContent,
     category: categoryContent,
     create: createContent,
     saves: savesContent,
@@ -6885,12 +6845,6 @@ export function RpgEntryHomeView({
                     return;
                   }
 
-                  if (!isAuthenticated && tab === 'home') {
-                    onTabChange(tab);
-                    authUi?.openLoginModal();
-                    return;
-                  }
-
                   onTabChange(tab);
                 }}
               />
@@ -7049,12 +7003,6 @@ export function RpgEntryHomeView({
                   emphasized={tab === 'create'}
                   showDot={tab === 'saves' && hasUnreadDraftUpdate}
                   onClick={() => {
-                    if (!isAuthenticated && tab === 'home') {
-                      onTabChange(tab);
-                      authUi?.openLoginModal();
-                      return;
-                    }
-
                     onTabChange(tab);
                   }}
                 />