mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-08-08 19:59:20 +00:00
Refactor modal system: BaseModal renders shell, unified open(args) API (#3923)
## Description
Refactors the modal system so that `BaseModal` owns the `<o-modal>`
shell rendering, tab state, and lifecycle. Modal subclasses now provide
content via small hook methods (`renderHeaderSlot()`, `renderBody(tab)`,
`modalConfig()`) instead of each rebuilding the `<o-modal>` template and
inline-mode branching.
This sets up the foundation for a future modal URL router (e.g.
`#modal=store&tab=flags`), which will be a follow-up PR.
### What changed
**`BaseModal`** — `src/client/components/BaseModal.ts`
- Now renders the `<o-modal>` shell itself; subclasses no longer
duplicate it
- Owns `activeTab` state and dispatches per-tab rendering via
`renderBody(tab)`
- Single `modalConfig()` method returns `{ title?, tabs?, hideHeader?,
hideCloseButton?, alwaysMaximized?, maxWidth? }`
- Uniform `open(args?)` / `close(args?)` interface; subclasses interpret
args in `onOpen(args)` / `onClose(args)`
- Tabbed modals can lazy-load via `onTabEnter(tab)` lifecycle hook
- Re-entrancy guard on `open()` so `showPage()` re-invocations don't
clobber state set by the outer call
- Initial tab defaults to first entry in `modalConfig().tabs` so the
active tab is highlighted on first open
**17 modals migrated** to the new shape:
- Tabbed: Store, UserSetting, Leaderboard, Clan
- Non-tabbed: FlagInput, Account, TokenLogin, News, TerritoryPatterns,
Troubleshooting, SinglePlayer, Matchmaking, RankedModal, Help, Language
- Lobby: JoinLobbyModal, HostLobbyModal (kept their `confirmBeforeClose`
/ `closeAndLeave` / `closeWithoutLeaving` methods)
Per-modal diffs are mostly mechanical:
- Drop the `<o-modal>` wrapper template and the `if (this.inline) return
content` branch
- Drop the inner `<div class="${this.modalContainerClass}">` wrapper
(shell styling now lives on `<o-modal>`)
- Move header content into `renderHeaderSlot()` so it lives in the
sticky header area
- Convert `super.open()`/`super.close()` overrides into
`onOpen(args)`/`onClose(args)` hooks
- For tabbed modals: drop subclass `@state activeTab`, manual
`handleTabChange`, and the `render()` switch — all owned by BaseModal
now
**Other changes:**
- `Store`: in affiliate mode (`#affiliate=X`), tabs are hidden and a
single combined grid of purchasable affiliate items is shown
- `Main.ts`: `joinModal.open(lobbyId, lobbyInfo)` callsites converted to
the new `open({ lobbyId, lobbyInfo })` shape
### Follow-up
Modal URL router (`#modal=X&tab=Y&...`) is a separate PR on top of this
foundation.
## Please complete the following:
- [x] I have added screenshots for all UI updates _(no visual changes;
smoke-tested in dev)_
- [x] I process any text displayed to the user through translateText()
and I've added it to the en.json file _(no new user-visible strings)_
- [ ] I have added relevant tests to the test directory _(no test
coverage; tested in browser)_
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
## Please put your Discord username so you can be contacted if a bug or
regression is found:
evan
This commit is contained in:
+32
-60
@@ -64,71 +64,43 @@ export class AccountModal extends BaseModal {
|
||||
);
|
||||
}
|
||||
|
||||
render() {
|
||||
const content = this.isLoadingUser
|
||||
? this.renderLoadingSpinner(
|
||||
translateText("account_modal.fetching_account"),
|
||||
)
|
||||
: this.renderInner();
|
||||
|
||||
if (this.inline) {
|
||||
return this.isLoadingUser
|
||||
? html`<div class="${this.modalContainerClass}">
|
||||
${modalHeader({
|
||||
title: translateText("account_modal.title"),
|
||||
onBack: () => this.close(),
|
||||
ariaLabel: translateText("common.back"),
|
||||
})}
|
||||
${content}
|
||||
</div>`
|
||||
: content;
|
||||
}
|
||||
|
||||
return html`
|
||||
<o-modal
|
||||
id="account-modal"
|
||||
title=""
|
||||
?hideCloseButton=${true}
|
||||
?inline=${this.inline}
|
||||
hideHeader
|
||||
>
|
||||
${content}
|
||||
</o-modal>
|
||||
`;
|
||||
}
|
||||
|
||||
private renderInner() {
|
||||
protected renderHeaderSlot() {
|
||||
const isLoggedIn = !!this.userMeResponse?.user;
|
||||
const title = translateText("account_modal.title");
|
||||
const publicId = this.userMeResponse?.player?.publicId ?? "";
|
||||
const displayId = publicId || translateText("account_modal.not_found");
|
||||
return modalHeader({
|
||||
title: translateText("account_modal.title"),
|
||||
onBack: () => this.close(),
|
||||
ariaLabel: translateText("common.back"),
|
||||
rightContent:
|
||||
isLoggedIn && !this.isLoadingUser
|
||||
? html`
|
||||
<div class="flex items-center gap-2">
|
||||
<span
|
||||
class="text-xs text-blue-400 font-bold uppercase tracking-wider"
|
||||
>${translateText("account_modal.public_player_id")}</span
|
||||
>
|
||||
<copy-button
|
||||
.lobbyId=${publicId}
|
||||
.copyText=${publicId}
|
||||
.displayText=${displayId}
|
||||
></copy-button>
|
||||
</div>
|
||||
`
|
||||
: undefined,
|
||||
});
|
||||
}
|
||||
|
||||
protected renderBody() {
|
||||
if (this.isLoadingUser) {
|
||||
return this.renderLoadingSpinner(
|
||||
translateText("account_modal.fetching_account"),
|
||||
);
|
||||
}
|
||||
const isLoggedIn = !!this.userMeResponse?.user;
|
||||
return html`
|
||||
<div class="${this.modalContainerClass}">
|
||||
${modalHeader({
|
||||
title,
|
||||
onBack: () => this.close(),
|
||||
ariaLabel: translateText("common.back"),
|
||||
rightContent: isLoggedIn
|
||||
? html`
|
||||
<div class="flex items-center gap-2">
|
||||
<span
|
||||
class="text-xs text-blue-400 font-bold uppercase tracking-wider"
|
||||
>${translateText("account_modal.public_player_id")}</span
|
||||
>
|
||||
<copy-button
|
||||
.lobbyId=${publicId}
|
||||
.copyText=${publicId}
|
||||
.displayText=${displayId}
|
||||
></copy-button>
|
||||
</div>
|
||||
`
|
||||
: undefined,
|
||||
})}
|
||||
|
||||
<div class="flex-1 overflow-y-auto custom-scrollbar mr-1">
|
||||
${isLoggedIn ? this.renderAccountInfo() : this.renderLoginOptions()}
|
||||
</div>
|
||||
<div class="custom-scrollbar mr-1">
|
||||
${isLoggedIn ? this.renderAccountInfo() : this.renderLoginOptions()}
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user