Mastodon/Whalebird-desktop-client-mac-linux-windows
1
0
Fork 0
mirror of https://github.com/h3poteto/whalebird-desktop synced 2025-02-03 02:37:55 +01:00
Code Issues Releases Wiki Activity

refs #3300 Enable shortcut to move focus on statuses in Bookmarks

Browse Source
This commit is contained in:
AkiraFukushima 2022-08-12 21:41:14 +09:00
parent 1d4a12acd7
commit 0ec27b4793
No known key found for this signature in database
GPG Key ID: B6E51BAC4DE1A957
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/renderer/components/TimelineSpace/Contents/Bookmarks.vue
View File

@ -11,8 +11,6 @@
:filters="[]" :filters="[]"
v-on:update="updateToot" v-on:update="updateToot"
v-on:delete="deleteToot" v-on:delete="deleteToot"
@focusNext="focusNext"
@focusPrev="focusPrev"
@focusRight="focusSidebar" @focusRight="focusSidebar"
@selectToot="focusToot(item)" @selectToot="focusToot(item)"
></toot> ></toot>
@ -29,6 +27,7 @@
<script lang="ts"> <script lang="ts">
import { computed, defineComponent, onMounted, ref, watch } from 'vue' import { computed, defineComponent, onMounted, ref, watch } from 'vue'
import { useMagicKeys, whenever, and } from '@vueuse/core'
import { useStore } from '@/store' import { useStore } from '@/store'
import { useI18next } from 'vue3-i18next' import { useI18next } from 'vue3-i18next'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
@ -54,14 +53,16 @@ export default defineComponent({
const focusedId = ref<string | null>(null) const focusedId = ref<string | null>(null)
const heading = ref<boolean>(true) const heading = ref<boolean>(true)
const scroller = ref<any>() const scroller = ref<any>()
const { j, k } = useMagicKeys()
const bookmarks = computed(() => store.state.TimelineSpace.Contents.Bookmarks.bookmarks) const bookmarks = computed(() => store.state.TimelineSpace.Contents.Bookmarks.bookmarks)
const lazyLoading = computed(() => store.state.TimelineSpace.Contents.Bookmarks.lazyLoading) const lazyLoading = computed(() => store.state.TimelineSpace.Contents.Bookmarks.lazyLoading)
const account = computed(() => store.state.TimelineSpace.account) const account = computed(() => store.state.TimelineSpace.account)
const startReload = computed(() => store.state.TimelineSpace.HeaderMenu.reload) const startReload = computed(() => store.state.TimelineSpace.HeaderMenu.reload)
const openSideBar = computed(() => store.state.TimelineSpace.Contents.SideBar.openSideBar) const openSideBar = computed(() => store.state.TimelineSpace.Contents.SideBar.openSideBar)
const modalOpened = computed(() => store.getters[`TimelineSpace/Modals/modalOpened`]) const modalOpened = computed<boolean>(() => store.getters[`TimelineSpace/Modals/modalOpened`])
const currentFocusedIndex = computed(() => bookmarks.value.findIndex(toot => focusedId.value === toot.uri)) const currentFocusedIndex = computed(() => bookmarks.value.findIndex(toot => focusedId.value === toot.uri))
const shortcutEnabled = computed(() => !modalOpened.value)
onMounted(() => { onMounted(() => {
document.getElementById('scroller')?.addEventListener('scroll', onScroll) document.getElementById('scroller')?.addEventListener('scroll', onScroll)
@ -86,6 +87,17 @@ export default defineComponent({
} }
}) })
whenever(and(j, shortcutEnabled), () => {
if (focusedId.value === null) {
focusedId.value = bookmarks.value[0].uri
} else {
focusNext()
}
})
whenever(and(k, shortcutEnabled), () => {
focusPrev()
})
const onScroll = (event: Event) => { const onScroll = (event: Event) => {
if ( if (
(event.target as HTMLElement)!.clientHeight + (event.target as HTMLElement)!.scrollTop >= (event.target as HTMLElement)!.clientHeight + (event.target as HTMLElement)!.scrollTop >=
@ -158,8 +170,6 @@ export default defineComponent({
modalOpened, modalOpened,
updateToot, updateToot,
deleteToot, deleteToot,
focusNext,
focusPrev,
focusSidebar, focusSidebar,
focusToot, focusToot,
openSideBar, openSideBar,