Skip to content
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

fix(ui): fix jankiness from re-rendering everything in contacts #68

Merged
merged 1 commit into from
Apr 6, 2024
Merged

fix(ui): fix jankiness from re-rendering everything in contacts #68

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
129 changes: 74 additions & 55 deletions src/components/contacts-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,30 +57,29 @@ const initialState = {
</button>
</header>
`,
list: async state => {
if (state.contacts?.length === 0) {
return html`<span class="flex flex-fill center">No Contacts found</span>`
}

return (
await Promise.all(
state.contacts
.filter(
state.showUnpaired
? filterUnpairedContacts
: filterPairedContacts
)
.sort(sortContactsByAlias)
.map(async c => await state.item(c)),
)
).join('')
},
content: async state => html`
${state.header(state)}

<div>
${
state.contacts?.length > 0
? (
await Promise.all(
state.contacts
.filter(
state.showUnpaired
? filterUnpairedContacts
: filterPairedContacts
)
.sort(sortContactsByAlias)
.map(async c => await state.item(c)),
)
).join('')
: ''
}
${
state.contacts.length === 0 ?
html`<span class="flex flex-fill center">No Contacts found</span>` : ''
}
${await state.list(state)}
</div>

${await state.footer(state)}
Expand Down Expand Up @@ -158,47 +157,36 @@ const initialState = {
</a>
`
},
datalist: async (state, direction = 'outgoing') => {
if (state.contacts?.length === 0) {
return ''
}

return (
await Promise.all(
state.contacts
.filter(
c => c.alias &&
Object.keys(c[direction] || {}).length > 0
).map(contact => {
return html`<option value="@${
contact.alias
}">${
contact.info?.name || contact.alias
}</option>`
})
)
).join('')
},
footer: async state => html`
<datalist id="contactSendAliases">
${
state.contacts.length > 0
? (
await Promise.all(
state.contacts
.filter(
c => c.alias &&
Object.keys(c.outgoing || {}).length > 0
).map(contact => {
return html`<option value="@${
contact.alias
}">${
contact.info?.name || contact.alias
}</option>`
})
)
).join('')
: ''
await state.datalist(state, 'outgoing')
}
</datalist>
<datalist id="contactReceiveAliases">
${
state.contacts.length > 0
? (
await Promise.all(
state.contacts
.filter(
c => c.alias &&
Object.keys(c.incoming || {}).length > 0
).map(contact => {
return html`<option value="@${
contact.alias
}">${
contact.info?.name || contact.alias
}</option>`
})
)
).join('')
: ''
await state.datalist(state, 'incoming')
}
</datalist>
`,
Expand Down Expand Up @@ -247,6 +235,22 @@ export async function setupContactsList(

state.elements.section = section

const list = section.querySelector('& > div')
const sendDataList = section.querySelector('#contactSendAliases')
const receiveDataList = section.querySelector('#contactReceiveAliases')
const hdrPaired = section.querySelector('#paired_contacts')
const hdrUnpaired = section.querySelector('#unpaired_contacts')
const hdrPairedIndicator = hdrPaired.querySelector('.indicator')
const hdrUnpairedIndicator = hdrUnpaired.querySelector('.indicator')

state.elements.list = list
state.elements.sendDataList = sendDataList
state.elements.receiveDataList = receiveDataList
state.elements.hdrPaired = hdrPaired
state.elements.hdrUnpaired = hdrUnpaired
state.elements.hdrPairedIndicator = hdrPairedIndicator
state.elements.hdrUnpairedIndicator = hdrUnpairedIndicator

function addListener(
node,
event,
Expand Down Expand Up @@ -288,7 +292,22 @@ export async function setupContactsList(
await restate(state, renderState)

state.elements.section.id = state.slugs.section
state.elements.section.innerHTML = await state.content(state)
// state.elements.section.innerHTML = await state.content(state)

state.elements.list.innerHTML = await state.list(state)
state.elements.sendDataList.innerHTML = await state.datalist(state, 'outgoing')
state.elements.receiveDataList.innerHTML = await state.datalist(state, 'incoming')

if (state.showUnpaired) {
state.elements.hdrPaired.classList.remove('active')
state.elements.hdrUnpaired.classList.add('active')
} else {
state.elements.hdrPaired.classList.add('active')
state.elements.hdrUnpaired.classList.remove('active')
}

state.elements.hdrPairedIndicator.innerText = state.contacts.filter(filterPairedContacts).length
state.elements.hdrUnpairedIndicator.innerText = state.contacts.filter(filterUnpairedContacts).length

state.removeAllListeners()
state.addListeners()
Expand Down
16 changes: 6 additions & 10 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,6 @@ let contactsList = await setupContactsList(
event.preventDefault()
event.stopPropagation()

// console.log(
// 'paired_contacts',
// event
// )

await contactsList.render({
userInfo,
contacts: appState.contacts,
Expand All @@ -240,11 +235,6 @@ let contactsList = await setupContactsList(
event.preventDefault()
event.stopPropagation()

// console.log(
// 'unpaired_contacts',
// event
// )

await contactsList.render({
userInfo,
contacts: appState.contacts,
Expand Down Expand Up @@ -442,6 +432,8 @@ function getTarget(event, selector) {
id,
// @ts-ignore
parentElement,
// @ts-ignore
parentNode,
} = event?.target

let target
Expand All @@ -454,6 +446,10 @@ function getTarget(event, selector) {
target = parentElement
}

if (parentNode?.id === selector) {
target = parentNode
}

return target
}

Expand Down
Loading