Skip to content

Viewlet setting drag and drop fix #2682

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
haiodo merged 1 commit into from
Feb 23, 2023
Merged

Viewlet setting drag and drop fix #2682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions packages/ui/src/components/ToggleButton.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,6 @@
value = !value
dispatch('change', value)
}}
on:focus
on:blur
on:mousemove
on:mouseleave
{id}
>
{#if icon}
Expand Down
20 changes: 13 additions & 7 deletions plugins/view-resources/src/components/ViewletSetting.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
(res) => {
preference = res[0]
attributes = getConfig(viewlet, preference)
enabled = attributes.filter((p) => p.enabled)
loading = false
},
{ limit: 1 }
Expand All @@ -58,6 +59,7 @@
const hierarchy = client.getHierarchy()
const dispatch = createEventDispatcher()
let attributes: AttributeConfig[] = []
let enabled: AttributeConfig[] = []
let loading = true

interface AttributeConfig {
Expand Down Expand Up @@ -210,7 +212,7 @@
}

async function save (): Promise<void> {
const config = attributes.filter((p) => p.enabled).map((p) => p.value)
const config = enabled.map((p) => p.value)
if (preference !== undefined) {
await client.update(preference, {
config
Expand All @@ -225,6 +227,7 @@

function restoreDefault (): void {
attributes = getConfig(viewlet, undefined)
enabled = attributes.filter((p) => p.enabled)
}

function setStatus (result: AttributeConfig[], preference: ViewletPreference): AttributeConfig[] {
Expand All @@ -246,8 +249,7 @@
const elements: HTMLElement[] = []
let selected: number | undefined

function dragswap (ev: MouseEvent, i: number): boolean {
const s = selected as number
function dragswap (ev: MouseEvent, i: number, s: number): boolean {
if (i < s) {
if (elements[i].offsetTop !== elements[s].offsetTop) {
return ev.offsetY < elements[i].offsetHeight / 2
Expand All @@ -266,8 +268,8 @@

function dragover (ev: MouseEvent, i: number) {
const s = selected as number
if (dragswap(ev, i)) {
;[attributes[i], attributes[s]] = [attributes[s], attributes[i]]
if (dragswap(ev, i, s)) {
;[enabled[i], enabled[s]] = [enabled[s], enabled[i]]
selected = i
}
}
Expand All @@ -293,7 +295,6 @@
return res
}

$: enabled = attributes.filter((p) => p.enabled)
$: classes = groupByClasses(attributes)

function getClassLabel (_class: Ref<Class<Doc>>): IntlString {
Expand Down Expand Up @@ -336,6 +337,10 @@
icon={attribute.icon}
label={attribute.label}
bind:value={attribute.enabled}
on:change={() => {
enabled.splice(i, 1)
enabled = enabled
}}
/>
</div>
{/each}
Expand All @@ -357,7 +362,8 @@
const value = classes.get(_class)?.find((it) => it.value === val)
if (value) {
value.enabled = true
attributes = attributes
enabled.push(value)
enabled = enabled
}
}
}
Expand Down