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

This commit is contained in:
AkiraFukushima 2022-08-12 21:55:38 +09:00
parent f6b05a6284
commit cd9eb9c06e
No known key found for this signature in database
GPG Key ID: B6E51BAC4DE1A957
1 changed files with 22 additions and 5 deletions

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)"
@sizeChanged="sizeChanged" @sizeChanged="sizeChanged"
@ -31,6 +29,7 @@
<script lang="ts"> <script lang="ts">
import { computed, defineComponent, onBeforeUnmount, onBeforeUpdate, onMounted, ref, toRefs, watch } from 'vue' import { computed, defineComponent, onBeforeUnmount, onBeforeUpdate, onMounted, ref, toRefs, watch } from 'vue'
import { useMagicKeys, whenever, and } from '@vueuse/core'
import moment from 'moment' import moment from 'moment'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { Entity } from 'megalodon' import { Entity } from 'megalodon'
@ -56,6 +55,7 @@ export default defineComponent({
const route = useRoute() const route = useRoute()
const i18n = useI18next() const i18n = useI18next()
const { reloadable } = useReloadable(store, route, i18n) const { reloadable } = useReloadable(store, route, i18n)
const { j, k } = useMagicKeys()
const { tag } = toRefs(props) const { tag } = toRefs(props)
const focusedId = ref<string | null>(null) const focusedId = ref<string | null>(null)
@ -71,8 +71,9 @@ export default defineComponent({
const scrolling = computed(() => store.state.TimelineSpace.Contents.Hashtag.Tag.scrolling) const scrolling = computed(() => store.state.TimelineSpace.Contents.Hashtag.Tag.scrolling)
const openSideBar = computed(() => store.state.TimelineSpace.Contents.SideBar.openSideBar) const openSideBar = computed(() => store.state.TimelineSpace.Contents.SideBar.openSideBar)
const startReload = computed(() => store.state.TimelineSpace.HeaderMenu.reload) const startReload = computed(() => store.state.TimelineSpace.HeaderMenu.reload)
const modalOpened = computed(() => store.getters[`TimelineSpace/Modals/modalOpened`]) const modalOpened = computed<boolean>(() => store.getters[`TimelineSpace/Modals/modalOpened`])
const currentFocusedIndex = computed(() => timeline.value.findIndex(toot => focusedId.value === toot.uri + toot.id)) const currentFocusedIndex = computed(() => timeline.value.findIndex(toot => focusedId.value === toot.uri + toot.id))
const shortcutEnabled = computed(() => !modalOpened.value)
onMounted(() => { onMounted(() => {
store.commit(`TimelineSpace/Contents/${CONTENTS_MUTATION.CHANGE_LOADING}`, true) store.commit(`TimelineSpace/Contents/${CONTENTS_MUTATION.CHANGE_LOADING}`, true)
@ -116,6 +117,24 @@ export default defineComponent({
}) })
} }
}) })
watch(focusedId, (newVal, _oldVal) => {
if (newVal && heading.value) {
store.commit(`${space}/${MUTATION_TYPES.CHANGE_HEADING}`, false)
} else if (newVal === null && !heading.value) {
store.commit(`${space}/${MUTATION_TYPES.CHANGE_HEADING}`, true)
}
})
whenever(and(j, shortcutEnabled), () => {
if (focusedId.value === null) {
focusedId.value = timeline.value[0].uri + timeline.value[0].id
} else {
focusNext()
}
})
whenever(and(k, shortcutEnabled), () => {
focusPrev()
})
onBeforeUnmount(() => { onBeforeUnmount(() => {
store.dispatch(`${space}/${ACTION_TYPES.STOP_STREAMING}`) store.dispatch(`${space}/${ACTION_TYPES.STOP_STREAMING}`)
reset() reset()
@ -265,8 +284,6 @@ export default defineComponent({
modalOpened, modalOpened,
updateToot, updateToot,
deleteToot, deleteToot,
focusNext,
focusPrev,
focusSidebar, focusSidebar,
focusToot, focusToot,
sizeChanged, sizeChanged,