Skip to content

[stable31] chore(SessionList): Migrate to NcButton and MDI icon #7186

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
merged 2 commits into from
May 6, 2025
Merged

[stable31] chore(SessionList): Migrate to NcButton and MDI icon #7186

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1fdb0f
chore(SessionList): Convert CRLF newlines to LF newlines
mejo- May 6, 2025
4de245b
chore(SessionList): Migrate to NcButton and MDI icon
mejo- May 6, 2025
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
387 changes: 190 additions & 197 deletions src/components/Editor/SessionList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,197 +1,190 @@
<!--
- SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
- SPDX-License-Identifier: AGPL-3.0-or-later
-->

<template>
<NcPopover class="session-list" placement="bottom">
<template #trigger="{ attrs }">
<div>
<button :title="label"
:aria-label="label"
class="avatar-list"
v-bind="attrs">
<div class="avatardiv icon-group" />
<AvatarWrapper v-for="session in sessionsVisible"
:key="session.id"
:session="session"
:size="30" />
</button>
</div>
</template>
<template #default>
<div class="session-menu">
<slot name="lastSaved" />
<ul>
<slot />
<li v-for="session in participantsPopover"
:key="session.id"
:style="avatarStyle(session)">
<AvatarWrapper :session="session" :size="36" />
<span class="session-label">
{{
session.userId ? session.displayName : (session.guestName ? session.guestName : t('text', 'Guest'))
}}
</span>
<span v-if="session.userId === null" class="guest-label">({{ t('text', 'guest') }})</span>
</li>
<li>
<NcCheckboxRadioSwitch :checked="isFullWidth" @update:checked="onWidthToggle">
{{ t('text', 'Full width editor') }}
</NcCheckboxRadioSwitch>
</li>
</ul>
</div>
</template>
</NcPopover>
</template>

<script>
import { NcCheckboxRadioSwitch, NcPopover } from '@nextcloud/vue'
import AvatarWrapper from './AvatarWrapper.vue'
import { COLLABORATOR_DISCONNECT_TIME, COLLABORATOR_IDLE_TIME } from '../../services/SyncService.js'
import { loadState } from '@nextcloud/initial-state'
import axios from '@nextcloud/axios'
import { generateUrl } from '@nextcloud/router'

export default {
name: 'SessionList',
components: {
AvatarWrapper,
NcPopover,
NcCheckboxRadioSwitch,
},
props: {
sessions: {
type: Object,
default: () => {
return {}
},
},
},
data() {
const isFullWidth = loadState('text', 'is_full_width_editor', false)
return {
myName: '',
isFullWidth,
}
},
computed: {
label() {
return t('text', 'Active people')
},
participantsPopover() {
if (this.currentSession?.guestName) {
return this.participantsWithoutCurrent
}
return this.participants
},
participantsWithoutCurrent() {
return this.participants.filter((session) => !session.isCurrent)
},
participants() {
return Object.values(this.sessions).filter((session) =>
session.lastContact > Date.now() / 1000 - COLLABORATOR_DISCONNECT_TIME
&& (session.userId !== null || session.guestName !== null),
).sort((a, b) => a.lastContact < b.lastContact)
},
currentSession() {
return Object.values(this.sessions).find((session) => session.isCurrent)
},
avatarStyle() {
return (session) => {
return {
opacity: session.lastContact > Date.now() / 1000 - COLLABORATOR_IDLE_TIME ? 1 : 0.5,
}
}
},
sessionsVisible() {
return this.participantsWithoutCurrent.slice(0, 3)
},
},
methods: {
onWidthToggle(checked) {
this.isFullWidth = checked
this.$emit('editor-width-change', checked ? '100%' : '80ch')

axios.post(generateUrl('/apps/text/settings'), {
key: 'is_full_width_editor',
value: checked ? '1' : '0',
})
},
},
}
</script>

<style scoped lang="scss">
.session-list {
height: var(--default-clickable-area);
}

.avatar-list {
border: none;
background-color: var(--color-main-background);
padding: 0;
margin: 0;
padding-left: 3px;
display: inline-flex;
flex-direction: row-reverse;

.avatar-wrapper {
margin: 0 -12px 0 0;
z-index: 1;
border-radius: 50%;
overflow: hidden;
box-sizing: content-box !important;
height: calc(var(--default-clickable-area) - 4px);
width: calc(var(--default-clickable-area) - 4px);
}

.icon-more, .icon-group, .icon-settings-dark {
width: var(--default-clickable-area);
height: var(--default-clickable-area);
margin: 0 3px 0 0;

&:hover {
background-color: var(--color-background-hover);
}
}
}

.session-menu {
max-width: 280px;
padding-top: 6px;
padding-bottom: 6px;

ul li {
align-items: center;
display: flex;
padding: 6px;

.avatar-wrapper {
height: 36px;
width: 36px;
margin-right: 6px;
}

.session-label {
padding-right: 3px;
}

.guest-label {
padding-left: 3px;
color: var(--color-text-maxcontrast);
}
}
}

label {
display: block;
margin: 8px;
}

.hint {
margin: 8px;
color: var(--color-text-maxcontrast);
}
</style>
<!--
- SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
- SPDX-License-Identifier: AGPL-3.0-or-later
-->

<template>
<NcPopover class="session-list" placement="bottom">
<template #trigger="{ attrs }">
<div>
<NcButton :title="label"
:aria-label="label"
type="tertiary"
class="avatar-list"
v-bind="attrs">
<template #icon>
<AccountMultipleIcon :size="20" />
<AvatarWrapper v-for="session in sessionsVisible"
:key="session.id"
:session="session"
:size="28" />
</template>
</NcButton>
</div>
</template>
<template #default>
<div class="session-menu">
<slot name="lastSaved" />
<ul>
<slot />
<li v-for="session in participantsPopover"
:key="session.id"
:style="avatarStyle(session)">
<AvatarWrapper :session="session" :size="36" />
<span class="session-label">
{{
session.userId ? session.displayName : (session.guestName ? session.guestName : t('text', 'Guest'))
}}
</span>
<span v-if="session.userId === null" class="guest-label">({{ t('text', 'guest') }})</span>
</li>
<li>
<NcCheckboxRadioSwitch :checked="isFullWidth" @update:checked="onWidthToggle">
{{ t('text', 'Full width editor') }}
</NcCheckboxRadioSwitch>
</li>
</ul>
</div>
</template>
</NcPopover>
</template>

<script>
import { NcButton, NcCheckboxRadioSwitch, NcPopover } from '@nextcloud/vue'
import AccountMultipleIcon from 'vue-material-design-icons/AccountMultiple.vue'
import AvatarWrapper from './AvatarWrapper.vue'
import { COLLABORATOR_DISCONNECT_TIME, COLLABORATOR_IDLE_TIME } from '../../services/SyncService.js'
import { loadState } from '@nextcloud/initial-state'
import axios from '@nextcloud/axios'
import { generateUrl } from '@nextcloud/router'

export default {
name: 'SessionList',
components: {
AccountMultipleIcon,
AvatarWrapper,
NcButton,
NcPopover,
NcCheckboxRadioSwitch,
},
props: {
sessions: {
type: Object,
default: () => {
return {}
},
},
},
data() {
const isFullWidth = loadState('text', 'is_full_width_editor', false)
return {
myName: '',
isFullWidth,
}
},
computed: {
label() {
return t('text', 'Active people')
},
participantsPopover() {
if (this.currentSession?.guestName) {
return this.participantsWithoutCurrent
}
return this.participants
},
participantsWithoutCurrent() {
return this.participants.filter((session) => !session.isCurrent)
},
participants() {
return Object.values(this.sessions).filter((session) =>
session.lastContact > Date.now() / 1000 - COLLABORATOR_DISCONNECT_TIME
&& (session.userId !== null || session.guestName !== null),
).sort((a, b) => a.lastContact < b.lastContact)
},
currentSession() {
return Object.values(this.sessions).find((session) => session.isCurrent)
},
avatarStyle() {
return (session) => {
return {
opacity: session.lastContact > Date.now() / 1000 - COLLABORATOR_IDLE_TIME ? 1 : 0.5,
}
}
},
sessionsVisible() {
return this.participantsWithoutCurrent.slice(0, 3)
},
},
methods: {
onWidthToggle(checked) {
this.isFullWidth = checked
this.$emit('editor-width-change', checked ? '100%' : '80ch')

axios.post(generateUrl('/apps/text/settings'), {
key: 'is_full_width_editor',
value: checked ? '1' : '0',
})
},
},
}
</script>

<style scoped lang="scss">
.session-list {
height: var(--default-clickable-area);
}

.avatar-list {
width: min-content !important;
padding-inline: var(--default-grid-baseline);

:deep(.button-vue__icon) {
display: inline-flex;
flex-direction: row-reverse;
width: min-content;

.avatar-wrapper {
margin: 3px -12px 3px 0;
z-index: 1;
overflow: hidden;
}
}
}

.session-menu {
max-width: 280px;
padding-top: 6px;
padding-bottom: 6px;

ul li {
align-items: center;
display: flex;
padding: 6px;

.avatar-wrapper {
height: 36px;
width: 36px;
margin-right: 6px;
}

.session-label {
padding-right: 3px;
}

.guest-label {
padding-left: 3px;
color: var(--color-text-maxcontrast);
}
}
}

label {
display: block;
margin: 8px;
}

.hint {
margin: 8px;
color: var(--color-text-maxcontrast);
}
</style>
Loading