Skip to content

feat: add delete keyboard shortcut #211

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

Open
rodcoffani wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

feat: add delete keyboard shortcut #211

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
20 changes: 17 additions & 3 deletions packages/web-pkg/src/components/FilesList/ResourceTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,10 @@ import {
useIsTopBarSticky,
embedModeFilePickMessageData,
routeToContextQuery,
useSpaceActionsRename
useSpaceActionsRename,
Key,
useKeyboardActions,
useSpacesStore
} from '../../composables'
import ResourceListItem from './ResourceListItem.vue'
import ResourceGhostElement from './ResourceGhostElement.vue'
Expand All @@ -306,7 +309,7 @@ import ContextMenuQuickAction from '../ContextActions/ContextMenuQuickAction.vue
import { useResourceRouteResolver } from '../../composables/filesList/useResourceRouteResolver'
import { ClipboardActions } from '../../helpers/clipboardActions'
import { determineResourceTableSortFields } from '../../helpers/ui/resourceTable'
import { useFileActionsRename } from '../../composables/actions'
import { useFileActionsDelete, useFileActionsRename } from '../../composables/actions'
import { createLocationCommon } from '../../router'
import get from 'lodash-es/get'
import { storeToRefs } from 'pinia'
Expand Down Expand Up @@ -560,8 +563,12 @@ export default defineComponent({
const authStore = useAuthStore()
const { userContextReady } = storeToRefs(authStore)

const spaceStore = useSpacesStore()
const { currentSpace } = storeToRefs(spaceStore)

const resourcesStore = useResourcesStore()
const { areFileExtensionsShown, latestSelectedId, deleteQueue } = storeToRefs(resourcesStore)
const { areFileExtensionsShown, latestSelectedId, selectedResources, deleteQueue } =
storeToRefs(resourcesStore)

const dragItem = ref<Resource>()
const ghostElement = ref()
Expand All @@ -572,6 +579,13 @@ export default defineComponent({
() => capabilityStore.filesTags && width.value >= TAGS_MINIMUM_SCREEN_WIDTH
)

const { actions: deleteActions } = useFileActionsDelete()
const deleteHandler = unref(deleteActions)[0].handler
const { bindKeyAction } = useKeyboardActions()
bindKeyAction({ primary: Key.Del }, () => {
deleteHandler({ space: unref(currentSpace), resources: unref(selectedResources) })
})

const { actions: renameActions } = useFileActionsRename()
const { actions: renameActionsSpace } = useSpaceActionsRename()
const renameHandler = computed(() => unref(renameActions)[0].handler)
Expand Down
1 change: 1 addition & 0 deletions packages/web-pkg/src/composables/actions/files/useFileActionsDelete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export const useFileActionsDelete = () => {
name: 'delete',
icon: 'delete-bin-5',
label: () => $gettext('Delete'),
shortcut: $gettext('Del'),
handler: ({ space, resources }) => handler({ space, resources, deletePermanent: false }),
isVisible: ({ space, resources }) => {
if (
Expand Down
3 changes: 2 additions & 1 deletion packages/web-pkg/src/composables/keyboardActions/useKeyboardActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ export enum Key {
ArrowDown = 'ArrowDown',
ArrowLeft = 'ArrowLeft',
ArrowRight = 'ArrowRight',
Esc = 'Escape'
Esc = 'Escape',
Del = 'Delete'
}

export enum Modifier {
Expand Down