Skip to content

refactor(dialogs): Improved dialog system in the launcher #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Purdze merged 4 commits into from
Mar 27, 2026
Merged

refactor(dialogs): Improved dialog system in the launcher #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
efb560a
refactor(dialogs): Moved and improved logic for dialogs
arse09 Mar 26, 2026
efed6c1
Merge branch 'Purdze:master' into refactor/dialogs
arse09 Mar 26, 2026
ae159b8
fix(dialogs): Fix mentioned issues (#88)
arse09 Mar 27, 2026
3c824f3
refactor(dialogs): lastPlayed is no longer hardcoded
arse09 Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
186 changes: 8 additions & 178 deletions launcher/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import { useCallback, useEffect } from "react";
import { invoke } from "@tauri-apps/api/core";
import { listen } from "@tauri-apps/api/event";
import { getCurrentWindow } from "@tauri-apps/api/window";
import { open as openDialog } from "@tauri-apps/plugin-dialog";
import { HiChevronDown, HiFolder } from "react-icons/hi2";
import { AuthAccount, DownloadProgress, GameVersion, PatchNote } from "./lib/types";
import Homepage from "./pages/Home";
import InstallationsPage from "./pages/Installations";
Expand All @@ -15,6 +13,8 @@ import FriendsPage from "./pages/Friends";
import NewsPage from "./pages/News";
import SettingsPage from "./pages/Settings";
import Titlebar from "./components/Titlebar";
import { InstallationDialog } from "./components/dialogs/InstallationDialog.tsx";
import { ConfirmDialog } from "./components/dialogs/ConfirmDialog.tsx";

function App() {
const {
Expand All @@ -27,22 +27,17 @@ function App() {
setAccountDropdownOpen,
server,
setInstallations,
editingInstall,
setEditingInstall,
dialogVersionOpen,
setDialogVersionOpen,
selectedVersion,
versions,
setVersions,
showSnapshots,
setShowSnapshots,
setLaunching,
setAuthLoading,
setStatus,
setNews,
setSkinUrl,
setSelectedNote,
setDownloadProgress,
openedDialog,
setOpenedDialog,
launcherSettings,
} = useAppStateContext();

Expand Down Expand Up @@ -220,180 +215,15 @@ function App() {
</main>
</div>

{editingInstall && (
{openedDialog !== null && (
<div
className="dialog-overlay"
onClick={() => {
setEditingInstall(null);
setDialogVersionOpen(false);
setOpenedDialog(null);
}}
>
<div
className="dialog"
onClick={(e) => {
e.stopPropagation();
if (dialogVersionOpen) setDialogVersionOpen(false);
}}
>
<h2 className="dialog-title">
{editingInstall.id ? "Edit Installation" : "New Installation"}
</h2>

<div className="dialog-fields">
<div className="dialog-field">
<label>NAME</label>
<input
value={editingInstall.name}
onChange={(e) => setEditingInstall({ ...editingInstall, name: e.target.value })}
placeholder="My Installation"
autoFocus
/>
</div>
<div className="dialog-field">
<label>VERSION</label>
<div className="custom-select-wrapper">
<button
className="custom-select"
onClick={() => setDialogVersionOpen(!dialogVersionOpen)}
type="button"
>
<span>{editingInstall.version}</span>
<HiChevronDown
className={`custom-select-arrow ${dialogVersionOpen ? "open" : ""}`}
/>
</button>
{dialogVersionOpen && (
<div className="custom-select-dropdown" onClick={(e) => e.stopPropagation()}>
<label className="custom-select-toggle">
<input
type="checkbox"
checked={showSnapshots}
onChange={(e) => {
setShowSnapshots(e.target.checked);
invoke<GameVersion[]>("get_versions", {
showSnapshots: e.target.checked,
}).then(setVersions);
}}
/>
<span>Show snapshots</span>
</label>
<div className="custom-select-list">
{versions.map((v) => (
<button
key={v.id}
className={`custom-select-item ${v.id === editingInstall.version ? "active" : ""}`}
onClick={() => {
setEditingInstall({
...editingInstall,
version: v.id,
});
setDialogVersionOpen(false);
}}
>
<span>{v.id}</span>
{v.version_type !== "release" && (
<span className="custom-select-tag">{v.version_type}</span>
)}
</button>
))}
</div>
</div>
)}
</div>
</div>
<div className="dialog-field">
<label>GAME DIRECTORY</label>
<div className="dialog-browse">
<input
value={editingInstall.directory}
onChange={(e) =>
setEditingInstall({ ...editingInstall, directory: e.target.value })
}
placeholder="default"
/>
<button
className="dialog-browse-btn"
onClick={async () => {
const path = await openDialog({ directory: true });
if (path) {
setEditingInstall({
...editingInstall,
directory: path as string,
});
}
}}
>
<HiFolder />
</button>
</div>
</div>
<div className="dialog-field">
<label>RESOLUTION</label>
<div className="dialog-resolution">
<input
type="number"
value={editingInstall.width}
onChange={(e) =>
setEditingInstall({
...editingInstall,
width: parseInt(e.target.value) || 854,
})
}
placeholder="854"
/>
<span className="dialog-resolution-x">×</span>
<input
type="number"
value={editingInstall.height}
onChange={(e) =>
setEditingInstall({
...editingInstall,
height: parseInt(e.target.value) || 480,
})
}
placeholder="480"
/>
</div>
</div>
</div>

<div className="dialog-actions">
<button className="dialog-cancel" onClick={() => setEditingInstall(null)}>
Cancel
</button>
<button
className="dialog-save"
onClick={async () => {
const isNew = !editingInstall.id;
const install = {
...editingInstall,
id: editingInstall.id || Date.now().toString(36),
name: editingInstall.name || "Installation",
directory: editingInstall.directory || "default",
};
setInstallations((prev) => {
const filtered = prev.filter((i) => i.id !== install.id);
return [...filtered, install];
});
setEditingInstall(null);
if (isNew) {
setPage("home");
setDownloadProgress({ downloaded: 0, total: 1, status: "Starting install..." });
try {
await invoke("ensure_assets", { version: install.version });
setStatus(`${install.name} ready`);
} catch (e) {
setStatus(`Install failed: ${e}`);
}
setDownloadProgress(null);
setTimeout(() => setStatus(""), 3000);
}
}}
>
{editingInstall.id ? "Save" : "Install"}
</button>
</div>
</div>
{openedDialog.name === "installation" && <InstallationDialog {...openedDialog.props} />}
{openedDialog.name === "confirm_dialog" && <ConfirmDialog {...openedDialog.props} />}
</div>
)}
</div>
Expand Down
61 changes: 61 additions & 0 deletions launcher/src/components/dialogs/ConfirmDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import { useAppStateContext } from "../../lib/state.ts";
import { useState } from "react";

export type ConfirmDialogProps = {
title: string;
message: string;
onCancel?: () => void | Promise<void>;
onConfirm?: () => void | Promise<void>;
};

export function ConfirmDialog(dialogProps: ConfirmDialogProps) {
const { setOpenedDialog } = useAppStateContext();
const [loading, setLoading] = useState(false);

return (
<div className="dialog" onClick={(e) => e.stopPropagation()}>
<h2 className="dialog-title">{dialogProps.title}</h2>

<div className="dialog-fields">
<p className="dialog-text">{dialogProps.message}</p>
</div>

<div className="dialog-actions">
<button
className="dialog-cancel"
disabled={loading}
onClick={async () => {
if (loading) return;
setOpenedDialog(null);
try {
await dialogProps.onCancel?.();
} catch (e) {
console.error(e);
}
}}
>
Cancel
</button>

<button
className="dialog-confirm"
disabled={loading}
onClick={async () => {
if (loading) return;
setLoading(true);
try {
await dialogProps.onConfirm?.();
setOpenedDialog(null);
} catch (e) {
console.error(e);
} finally {
setLoading(false);
}
}}
>
{loading ? "..." : "Confirm"}
</button>
</div>
</div>
);
}
Loading
Loading