blitzwing/cobalt-7
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

web/dialog: refactor types and logic

Browse source
This commit is contained in:
dumbmoron 2024-07-22 09:06:11 +00:00 committed by wukko
parent 4e4f7af437
commit 7c5b703e37
No known key found for this signature in database
GPG key ID: 3E30B3F26C7B4AA2
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/src/components/dialog/DialogHolder.svelte
View file

@ -19,9 +19,7 @@
bodySubText={dialog.bodySubText} bodySubText={dialog.bodySubText}
buttons={dialog.buttons} buttons={dialog.buttons}
/> />
{/if} {:else if dialog.type === "picker"}
{#if dialog.type === "picker"}
<PickerDialog <PickerDialog
id={dialog.id} id={dialog.id}
items={dialog.items} items={dialog.items}

8
web/src/components/save/buttons/DownloadButton.svelte
View file

@ -69,7 +69,7 @@
restoreDownloadButton(); restoreDownloadButton();
return createDialog({ return createDialog({
...(defaultErrorPopup as DialogInfo), ...defaultErrorPopup,
bodyText: "couldn't access the api", bodyText: "couldn't access the api",
}); });
} }
@ -79,7 +79,7 @@
restoreDownloadButton(); restoreDownloadButton();
return createDialog({ return createDialog({
...(defaultErrorPopup as DialogInfo), ...defaultErrorPopup,
bodyText: response.text, bodyText: response.text,
}); });
} }
@ -106,7 +106,7 @@
restoreDownloadButton(); restoreDownloadButton();
return createDialog({ return createDialog({
...(defaultErrorPopup as DialogInfo), ...defaultErrorPopup,
bodyText: "couldn't probe the stream", bodyText: "couldn't probe the stream",
}); });
} }
@ -146,7 +146,7 @@
restoreDownloadButton(); restoreDownloadButton();
return createDialog({ return createDialog({
...(defaultErrorPopup as DialogInfo), ...defaultErrorPopup,
bodyText: "unknown/unsupported status", bodyText: "unknown/unsupported status",
}); });
}; };

17
web/src/lib/types/dialog.ts
View file

@ -15,14 +15,23 @@ export type DialogPickerItem = {
thumb?: string, thumb?: string,
} }
export type DialogInfo = { type Dialog = {
id: string, id: string,
type: "small" | "picker", buttons?: DialogButton[],
};
export type SmallDialog = Dialog & {
type: "small",
meowbalt?: MeowbaltEmotions, meowbalt?: MeowbaltEmotions,
icon?: SmallDialogIcons, icon?: SmallDialogIcons,
title?: string, title?: string,
bodyText?: string, bodyText?: string,
bodySubText?: string, bodySubText?: string,
buttons?: DialogButton[], };
export type PickerDialog = Dialog & {
type: "picker",
items?: DialogPickerItem[], items?: DialogPickerItem[],
} };
export type DialogInfo = SmallDialog | PickerDialog;