Skip to content

Settings experience optimization #341

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
quoid merged 5 commits into from
Oct 10, 2022
Merged

Settings experience optimization #341

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
647a3d7
fix: settings textarea zoom experience optimization
ACTCD Oct 5, 2022
0391f1e
feat: settings textarea add error indication
ACTCD Oct 5, 2022
f08a900
feat: settings textarea auto remove duplicates
ACTCD Oct 5, 2022
d135bbe
feat: settings blacklist add error indication
ACTCD Oct 6, 2022
3bcc08a
fix: optimize click-to-close area
ACTCD Oct 10, 2022
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
24 changes: 21 additions & 3 deletions src/page/Components/Settings.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,25 @@
let blacklist;
// indicates that a blacklist save has initiated
let blacklistSaving = false;
// indicates that a blacklist value has error
let blacklistError = false;

// the saved blacklisted domain patterns
$: blacklisted = $settings.blacklist.join(", ");

function saveBlacklist() {
// get the comma separated values from blacklist input
const val = blacklist.value.split(",").map(item => item.trim()).filter(n => n);
const val = [...new Set(blacklist.value.split(",").map(item => item.trim()).filter(n => n))];

// check if val matches `match patterns`, if not, return a warning
const re = /^(http:|https:|\*:)\/\/((?:\*\.)?(?:[a-z0-9-]+\.)+(?:[a-z0-9]+)|\*\.[a-z]+|\*|[a-z0-9]+)(\/[^\s]*)$/;
for (const v of val) {
if (re.exec(v) === null) {
blacklistError = true;
return console.warn("Global blacklist has wrong pattern:", v);
}
}
blacklistError = false;

// compare blacklist input to saved blacklist
if ([...val].sort().toString() !== [...$settings.blacklist].sort().toString()) {
Expand Down Expand Up @@ -56,7 +68,7 @@

<div
class="settings"
on:click|self={() => state.remove("settings")}
on:mousedown|self={() => state.remove("settings")}
in:fade={{duration: 150}}
out:fade={{duration: 150, delay: 75}}
>
Expand Down Expand Up @@ -147,11 +159,12 @@
/>
</div>
<div class="modal__row modal__row--wrap">
<div class="blacklist">
<div class="blacklist" class:red={blacklistError}>
<span>Global Blacklist</span>
{ #if blacklistSaving}{@html iconLoader}{/if}
</div>
<textarea
class:error={blacklistError}
placeholder="Comma separated list of @match patterns"
spellcheck="false"
bind:this={blacklist}
Expand Down Expand Up @@ -280,6 +293,11 @@
opacity: 0.75;
padding: 0.5rem;
width: 100%;
min-width: 100%;
}

textarea.error {
border: 1px solid var(--color-red);
}

textarea:focus {
Expand Down