Skip to content

web: an active saving dialog highlights the selected item from the picker dialog #1339

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion web/src/components/dialog/DialogContainer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

export let id: string;
export let dismissable = true;
export let onclose: (e: Event) => void = () => {}

let dialogParent: HTMLDialogElement;

Expand Down Expand Up @@ -36,7 +37,7 @@
}
</script>

<dialog id="dialog-{id}" bind:this={dialogParent} class:closing class:open>
<dialog id="dialog-{id}" bind:this={dialogParent} class:closing class:open {onclose}>
<slot></slot>
<DialogBackdropClose closeFunc={dismissable ? close : () => {}} />
</dialog>
5 changes: 5 additions & 0 deletions web/src/components/dialog/PickerItem.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
downloadFile({
url: item.url,
urlType: isTunnel ? "tunnel" : "redirect",
id: number
});
}
}}
Expand Down Expand Up @@ -91,6 +92,10 @@
border-radius: inherit;
}

:global(.picker-item-active) {
opacity: 0.5;
}

:global(.picker-image) {
width: 100%;
height: 100%;
Expand Down
4 changes: 3 additions & 1 deletion web/src/components/dialog/SavingDialog.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,11 @@
copied = false;
}, 1500);
}

if (!id.endsWith('0')) document.querySelector(`.picker-item:has(img[alt$="${id.slice(7)}"])`)?.classList.add('picker-item-active')
</script>

<DialogContainer {id} {dismissable} bind:close>
<DialogContainer {id} {dismissable} bind:close onclose={() => { if (!id.endsWith('0')) document.querySelector(`.picker-item:has(img[alt$="${id.slice(7)}"])`)?.classList.remove('picker-item-active') }}>
<div class="dialog-body popup-body">
<div class="meowbalt-container">
<Meowbalt emotion="question" />
Expand Down
18 changes: 11 additions & 7 deletions web/src/lib/download.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,21 @@ type DownloadFileParams = {
url?: string,
file?: File,
urlType?: CobaltFileUrlType,
id: number
}

type SavingDialogParams = {
url?: string,
file?: File,
body?: string,
urlType?: CobaltFileUrlType,
fileId: number
}

const openSavingDialog = ({ url, file, body, urlType }: SavingDialogParams) => {
const openSavingDialog = ({ url, file, body, urlType, fileId }: SavingDialogParams) => {
const dialogData: DialogInfo = {
type: "saving",
id: "saving",
id: `saving-${fileId}`,
file,
url,
urlType,
Expand Down Expand Up @@ -62,7 +64,8 @@ export const openURL = (url: string) => {
if (!open) {
return openSavingDialog({
url,
body: get(t)("dialog.saving.blocked")
body: get(t)("dialog.saving.blocked"),
fileId: 0
});
}
}
Expand All @@ -75,13 +78,13 @@ export const copyURL = async (url: string) => {
return await navigator?.clipboard?.writeText(url);
}

export const downloadFile = ({ url, file, urlType }: DownloadFileParams) => {
export const downloadFile = ({ url, file, urlType, id }: DownloadFileParams) => {
if (!url && !file) throw new Error("attempted to download void");

const pref = get(settings).save.savingMethod;

if (pref === "ask") {
return openSavingDialog({ url, file, urlType });
return openSavingDialog({ url, file, urlType, fileId: id });
}

/*
Expand All @@ -100,7 +103,8 @@ export const downloadFile = ({ url, file, urlType }: DownloadFileParams) => {
url,
file,
body: get(t)("dialog.saving.timeout"),
urlType
urlType,
fileId: id
});
}

Expand Down Expand Up @@ -139,5 +143,5 @@ export const downloadFile = ({ url, file, urlType }: DownloadFileParams) => {
}
} catch { /* catch & ignore */ }

return openSavingDialog({ url, file, urlType });
return openSavingDialog({ url, file, urlType, fileId: id });
}