diff --git a/.hermes/shared-memory/decision-log.md b/.hermes/shared-memory/decision-log.md index 534f6046..ad62c3d1 100644 --- a/.hermes/shared-memory/decision-log.md +++ b/.hermes/shared-memory/decision-log.md @@ -54,6 +54,7 @@ - 2026-06-10 追加:RPG 大编辑器主壳层和紧凑对话壳层的右上角关闭入口使用 `PlatformModalCloseButton variant="platformIcon"`,暗色编辑器保留 `platform-icon-button` 视觉 token,但业务 JSX 不再手写关闭按钮 aria、默认 X 图标和禁用态拼接。 - 2026-06-10 追加:`PlatformModalCloseButton variant="editorDark"` 承接 RPG 暗色弹窗中非像素风的圆形 X 关闭入口,根节点固定带 `platform-modal-close-button--editor-dark` 稳定类名;自定义选择弹窗头部关闭按钮已迁移,并补齐 `aria-label`,业务 JSX 不再手写暗色关闭按钮边框、底色、hover 和默认 X 图标。验证命令:`npm run test -- src/components/common/PlatformModalCloseButton.test.tsx src/components/SelectionCustomizationModals.test.tsx`。 - 2026-06-10 追加:`PlatformModalCloseButton variant="pixel"` 承接 `UnifiedModal variant="pixel"` 头部圆形关闭入口;`UnifiedModal` 只选择 `platformIcon / pixel` 变体并保留 closeDisabled、Backdrop、Escape 和 portal 语义,不再手写 X 图标、aria 和关闭按钮 class。验证命令:`npm run test -- src/components/common/UnifiedModal.test.tsx src/components/common/PlatformModalCloseButton.test.tsx src/components/common/UnifiedConfirmDialog.test.tsx`。 +- 2026-06-10 追加:`UnifiedModal` 新增 `closeVariant`、`closeOnEscape`、`titleClassName` 和 `descriptionClassName`,用于在收口标准平台弹窗壳层时保留个人中心 `profile / profileCompact` 关闭按钮、原有标题层级和“不响应 Escape / backdrop”的交互语义;RPG 首页个人中心里的昵称修改、账户充值、每日任务和兑换码弹窗已迁移到 `UnifiedModal`,支付结果 / 支付确认遮罩 / 泥点账单这类头部结构不同的弹窗继续保留专用实现。验证命令:`npm run test -- src/components/common/UnifiedModal.test.tsx src/components/rpg-entry/RpgEntryHomeView.recharge.test.tsx`。 - 2026-06-09 追加:RPG 大编辑器暗色面板内的保存和角色槽动作继续走本地 `ActionButton`,不再混用白底平台 `platform-button` class;平台白底动作收口和编辑器暗色动作收口保持两套视觉边界。 - 2026-06-10 追加:`PlatformActionButton surface="editorDark"` 承接 RPG 暗色弹窗 / 运行面板里的普通取消、确认、刷新和编组动作,支持 `size="xxs"` 与 `tone="success" | "warning"`;`tone="accent"` 承接暗色壳层内的琥珀实心 CTA,`tone="accentSoft"` 承接依赖局部 accent 变量的柔和强调按钮。角色自定义 footer、自定义世界生成 footer、地图切换确认、营地编组普通动作和角色聊天刷新动作已迁移。暗色可选项卡仍使用 `PlatformDarkOptionCard`,像素风发送 / 强品牌动作继续保留专用布局。验证命令:`npm run test -- src/components/common/platformActionButtonModel.test.ts src/components/common/PlatformActionButton.test.tsx src/components/SelectionCustomizationModals.test.tsx src/components/CompanionCampModal.test.tsx src/components/MapModal.test.tsx src/components/CharacterChatModal.test.tsx`。 - 2026-06-10 追加:RPG 首页创作 / 草稿顶栏的钱包快捷入口通过同文件 `TopbarWalletShortcutButton` 复用 `PlatformActionButton tone="accentSoft" shape="pill" size="xs"` 与 `PlatformIconBadge`;移动端 / 桌面端继续保留 `.platform-mobile-create-wallet-chip`、`.platform-desktop-create-wallet-chip` 和 `.platform-desktop-search` 兼容 class,承接余额截断、桌面顶栏胶囊壳和既有测试锚点,点击语义仍统一走 `openRechargeOrRewardCodeModal`。验证命令:`npm run test -- src/components/rpg-entry/RpgEntryHomeView.recharge.test.tsx`。 diff --git a/docs/technical/【前端架构】PlatformUiKit弹窗组件收口计划-2026-06-08.md b/docs/technical/【前端架构】PlatformUiKit弹窗组件收口计划-2026-06-08.md index bfb3d416..bee37d27 100644 --- a/docs/technical/【前端架构】PlatformUiKit弹窗组件收口计划-2026-06-08.md +++ b/docs/technical/【前端架构】PlatformUiKit弹窗组件收口计划-2026-06-08.md @@ -223,6 +223,7 @@ 19.2. 拼图广场详情 hero 的返回、上一张 / 下一张关卡图入口迁移到 `PlatformIconButton variant="darkMini"`,修改作品和进入第 1 关迁移到 `PlatformActionButton`,分享动作继续使用 `CopyFeedbackButton` 但复用共享动作按钮 chrome;详情页只保留轮播、复制和跳转语义,不再手写 hero 区按钮壳。 19.3. 个人中心充值商品卡里的“购买 / 处理中”胶囊暂保留局部 `span`,不直接套用 `PlatformActionButton`,避免在 `PlatformSubpanel as="button"` 内再嵌套交互按钮;待出现第二个同形态的非交互 action chip 后,再决定是否沉淀独立的共享展示基元。 19.3.1. RPG 首页创作 / 草稿顶栏的钱包快捷入口迁移到同文件适配器 `TopbarWalletShortcutButton`,内部复用 `PlatformActionButton tone="accentSoft" shape="pill" size="xs"` 与 `PlatformIconBadge`;移动端和桌面端继续保留 `.platform-mobile-create-wallet-chip`、`.platform-desktop-create-wallet-chip` 和 `.platform-desktop-search` 兼容 class,承接移动端余额截断、桌面顶栏胶囊底色以及既有测试锚点。入口点击仍统一走 `openRechargeOrRewardCodeModal`,不把充值 / 兑换码平台分流逻辑改散到两个顶栏分支里。 +19.3.2. 个人中心昵称修改、账户充值、每日任务和兑换码四类标准头部弹窗迁移到 `UnifiedModal`;`UnifiedModal` 新增 `closeVariant`、`closeOnEscape`、`titleClassName` 和 `descriptionClassName`,用于在收口弹窗壳层时保留个人中心 `profile / profileCompact` 关闭按钮、居中浮层布局和标题层级。上述弹窗统一通过 `closeOnBackdrop={false}`、`closeOnEscape={false}` 保持原有交互语义,不把 backdrop / Escape 关闭行为悄悄带进个人中心;支付确认遮罩、支付结果提示和泥点账单这类头部结构不同或浮动关闭语义不同的弹窗继续保留专用实现,等出现更多同构 case 再扩充 `UnifiedModal` 能力。 19.3. creative-agent 首页的侧边栏菜单、账号入口、开启新对话、我的创作、首页激励 CTA 和 prompt suggestion 按钮迁移到 `PlatformIconButton` / `PlatformActionButton`;首页继续保留 `creative-agent-home__*` 本地 class 承接透明顶栏、抽屉和品牌化胶囊视觉,不把视觉回收和语义收口绑成一次大改。`Beta` 徽标和历史记录纯文本行暂保留本地实现,等出现更多同构轻量列表行后再评估是否抽新的共享 row primitive。 19.4. 大鱼吃小鱼结果页 hero 的返回入口迁移到 `PlatformIconButton variant="darkMini"`,测试 / 发布动作迁移到 `PlatformActionButton surface="editorDark"`;结果页只保留测试运行、发布提交和文案状态语义,不再手写 hero 顶栏按钮壳。 20. 平台方形上传入口和紧凑虚线新增入口迁移到 `PlatformUploadTile`,上传后的图片预览迁移到 `PlatformUploadPreviewCard`;反馈页上传凭证入口 / 预览、敲木鱼工作台新增功德词条入口、通用创作图片面板的提示词参考图缩略图、抓大鹅封面编辑参考图缩略图、通用输入 Composer 已选参考图条、creation-agent 已选参考图条和拼图结果页关卡引用图横条已先迁移。方形缩略图使用默认 `layout="square"`,横向“已选择参考图 / 文件名 / 素材名 / 移除”条使用 `layout="inline"`;只读引用图条不传 `onRemove`,避免公共组件额外渲染删除入口。后续继续收口结果页素材上传、工作台参考图上传、紧凑虚线新增入口等上传 / 动作块时,业务页只保留文件选择、预览数组、预览回调、删除回调、校验逻辑或新增回调,上传方块外观、主副文案、缩略图壳、预览按钮、标题行、横向已选条、移除按钮和禁用态统一由 Module 承接;工具栏中的小图标上传仍继续使用 `PlatformIconButton asChild="label"`。 diff --git a/src/components/common/UnifiedModal.test.tsx b/src/components/common/UnifiedModal.test.tsx index 4ec94c16..9710018d 100644 --- a/src/components/common/UnifiedModal.test.tsx +++ b/src/components/common/UnifiedModal.test.tsx @@ -39,6 +39,30 @@ test('closes through backdrop and escape', () => { expect(onClose).toHaveBeenCalledTimes(2); }); +test('supports disabling escape close while keeping the custom close button chrome', () => { + const onClose = vi.fn(); + render( + +
窗口内容
+
, + ); + + fireEvent.keyDown(window, { key: 'Escape' }); + expect(onClose).not.toHaveBeenCalled(); + + const closeButton = screen.getByRole('button', { name: '关闭' }); + expect(closeButton.className).toContain('platform-profile-icon-button'); + expect(screen.getByRole('dialog', { name: '个人中心弹窗' })).toBeTruthy(); +}); + test('respects closeDisabled for every default close path', () => { const onClose = vi.fn(); render( diff --git a/src/components/common/UnifiedModal.tsx b/src/components/common/UnifiedModal.tsx index 5e921101..9610215c 100644 --- a/src/components/common/UnifiedModal.tsx +++ b/src/components/common/UnifiedModal.tsx @@ -1,4 +1,5 @@ import { + type ComponentProps, type CSSProperties, type ReactNode, useEffect, @@ -11,6 +12,9 @@ import { PlatformModalCloseButton } from './PlatformModalCloseButton'; type UnifiedModalVariant = 'platform' | 'pixel'; type UnifiedModalSize = 'sm' | 'md' | 'lg' | 'xl' | 'fullscreen'; +type UnifiedModalCloseVariant = NonNullable< + ComponentProps['variant'] +>; type UnifiedModalProps = { open: boolean; @@ -23,13 +27,17 @@ type UnifiedModalProps = { size?: UnifiedModalSize; closeDisabled?: boolean; closeOnBackdrop?: boolean; + closeOnEscape?: boolean; showCloseButton?: boolean; closeLabel?: string; + closeVariant?: UnifiedModalCloseVariant; portal?: boolean; zIndexClassName?: string; overlayClassName?: string; panelClassName?: string; headerClassName?: string; + titleClassName?: string; + descriptionClassName?: string; bodyClassName?: string; footerClassName?: string; panelStyle?: CSSProperties; @@ -80,12 +88,16 @@ function UnifiedModalContent({ size = 'md', closeDisabled = false, closeOnBackdrop = true, + closeOnEscape = true, showCloseButton = true, closeLabel = '关闭', + closeVariant, zIndexClassName = 'z-[90]', overlayClassName, panelClassName, headerClassName, + titleClassName, + descriptionClassName, bodyClassName, footerClassName, panelStyle, @@ -94,7 +106,7 @@ function UnifiedModalContent({ const descriptionId = useId(); useEffect(() => { - if (!open || closeDisabled) { + if (!open || closeDisabled || !closeOnEscape) { return; } @@ -106,7 +118,7 @@ function UnifiedModalContent({ window.addEventListener('keydown', handleKeyDown); return () => window.removeEventListener('keydown', handleKeyDown); - }, [closeDisabled, onClose, open]); + }, [closeDisabled, closeOnEscape, onClose, open]); if (!open) { return null; @@ -169,11 +181,20 @@ function UnifiedModalContent({ >
-
+
{title}
{description ? ( -
+
{description}
) : null} @@ -183,7 +204,7 @@ function UnifiedModalContent({ label={closeLabel} onClick={onClose} disabled={closeDisabled} - variant={isPixel ? 'pixel' : 'platformIcon'} + variant={closeVariant ?? (isPixel ? 'pixel' : 'platformIcon')} /> ) : null}
diff --git a/src/components/rpg-entry/RpgEntryHomeView.tsx b/src/components/rpg-entry/RpgEntryHomeView.tsx index edb28f69..59e3104e 100644 --- a/src/components/rpg-entry/RpgEntryHomeView.tsx +++ b/src/components/rpg-entry/RpgEntryHomeView.tsx @@ -132,6 +132,7 @@ import { PlatformSubpanel } from '../common/PlatformSubpanel'; import { PlatformTextField } from '../common/PlatformTextField'; import { RUNTIME_RESOURCE_PENDING_SELECTOR } from '../common/RuntimeResourcePendingMarker'; import { SquareImageCropModal } from '../common/SquareImageCropModal'; +import { UnifiedModal } from '../common/UnifiedModal'; import { buildCenteredSquareImageCropRect, clampSquareImageCropRect, @@ -2824,6 +2825,13 @@ function ProfileReferralUserAvatar({ ); } +const PROFILE_MODAL_OVERLAY_CLASS = + 'platform-modal-backdrop !items-center !justify-center !px-4 !py-6'; +const PROFILE_MODAL_HEADER_CLASS = 'border-white/10 px-5 py-4'; +const PROFILE_MODAL_TITLE_CLASS = 'text-base font-black'; +const PROFILE_MODAL_DESCRIPTION_CLASS = + 'mt-1 text-xs font-semibold text-[var(--platform-text-soft)]'; + function ProfileNicknameModal({ value, error, @@ -2840,65 +2848,61 @@ function ProfileNicknameModal({ onSubmit: () => void; }) { return ( -
-
-
-
- 修改昵称 -
- -
-
- - {error ? ( - - {error} - - ) : null} -
- - 取消 - - - {isSaving ? '保存中' : '保存'} - -
-
+ + + {error ? ( + + {error} + + ) : null} +
+ + 取消 + + + {isSaving ? '保存中' : '保存'} +
-
+ ); } @@ -3189,125 +3193,126 @@ function ProfileRechargeModal({ ); return ( -
-
-
-
-
账户充值
-
- {center - ? `${center.walletBalance}泥点 · ${memberLabel}` - : '读取中'} -
-
- -
-
-
- - -
- - {error ? ( - -
{error}
- - 重新加载 - -
- ) : null} - - {isLoading ? ( -
- {Array.from({ length: 4 }).map((_, index) => ( -
- ))} -
- ) : products.length > 0 ? ( -
- {products.map((product) => ( - - ))} -
- ) : ( - - 暂无可购买套餐 - - )} - - {nativePayment ? ( - -
微信扫码支付
-
- {nativeQrImageUrl ? ( - 微信 Native 支付二维码 - ) : ( - - 生成中 - - )} -
- - {nativePayment.isConfirming ? '确认中' : '我已支付'} - -
- ) : null} -
+ +
+ +
-
+ + {error ? ( + +
{error}
+ + 重新加载 + +
+ ) : null} + + {isLoading ? ( +
+ {Array.from({ length: 4 }).map((_, index) => ( +
+ ))} +
+ ) : products.length > 0 ? ( +
+ {products.map((product) => ( + + ))} +
+ ) : ( + + 暂无可购买套餐 + + )} + + {nativePayment ? ( + +
微信扫码支付
+
+ {nativeQrImageUrl ? ( + 微信 Native 支付二维码 + ) : ( + + 生成中 + + )} +
+ + {nativePayment.isConfirming ? '确认中' : '我已支付'} + +
+ ) : null} + ); } @@ -3545,113 +3550,114 @@ function ProfileTaskCenterModal({ const walletBalance = center?.walletBalance ?? fallbackBalance; return ( -
-
-
-
-
每日任务
-
- {walletBalance}泥点 -
-
- + + {error ? ( + +
{error}
+ + 重新加载 + +
+ ) : null} + {success ? ( + + {success} + + ) : null} + {isLoading ? ( +
+ {Array.from({ length: 2 }).map((_, index) => ( +
+ ))}
-
- {error ? ( - -
{error}
- - 重新加载 - -
- ) : null} - {success ? ( - - {success} - - ) : null} - {isLoading ? ( -
- {Array.from({ length: 2 }).map((_, index) => ( -
- ))} -
- ) : tasks.length === 0 ? ( - - 暂无任务 - - ) : ( -
- {tasks.map((task) => { - const isClaimable = task.status === 'claimable'; - const isClaiming = claimingTaskId === task.taskId; - const progressLabel = buildProfileTaskProgressLabel(task); + ) : tasks.length === 0 ? ( + + 暂无任务 + + ) : ( +
+ {tasks.map((task) => { + const isClaimable = task.status === 'claimable'; + const isClaiming = claimingTaskId === task.taskId; + const progressLabel = buildProfileTaskProgressLabel(task); - return ( - -
-
-
- {task.title} -
-
- {progressLabel} -
-
-
-
- +{task.rewardPoints} -
-
- {getProfileTaskStatusLabel(task.status)} -
-
+ return ( + +
+
+
+ {task.title}
- onClaim(task.taskId)} - > - {getProfileTaskClaimButtonLabel(task, isClaiming)} - - - ); - })} -
- )} +
+ {progressLabel} +
+
+
+
+ +{task.rewardPoints} +
+
+ {getProfileTaskStatusLabel(task.status)} +
+
+
+ onClaim(task.taskId)} + > + {getProfileTaskClaimButtonLabel(task, isClaiming)} + +
+ ); + })}
-
-
+ )} + ); } @@ -3673,65 +3679,69 @@ function RewardCodeRedeemModal({ onClose: () => void; }) { return ( -
-
-
-
兑换码
- -
-
- onChange(event.target.value)} - onKeyDown={(event) => { - if (event.key === 'Enter') { - onSubmit(); - } - }} - size="sm" - density="roomy" - className="uppercase tracking-normal" - placeholder="输入兑换码" - aria-label="兑换码" - autoFocus - /> - - {isSubmitting ? '兑换中' : '兑换'} - - {error ? ( - - {error} - - ) : null} - {success ? ( - - {success} - - ) : null} -
-
-
+ + onChange(event.target.value)} + onKeyDown={(event) => { + if (event.key === 'Enter') { + onSubmit(); + } + }} + size="sm" + density="roomy" + className="uppercase tracking-normal" + placeholder="输入兑换码" + aria-label="兑换码" + autoFocus + /> + + {isSubmitting ? '兑换中' : '兑换'} + + {error ? ( + + {error} + + ) : null} + {success ? ( + + {success} + + ) : null} + ); }