0
0
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00

fix: shift keyboard navigation

This commit is contained in:
Aaryan Khandelwal 2024-05-24 15:59:52 +05:30
parent cd038c5400
commit 07e482833c
5 changed files with 6 additions and 9 deletions
web
components
core/multiple-select
issues/issue-layouts
bulk-operations
list
hooks
store

View File

@ -1,6 +1,6 @@
import { observer } from "mobx-react"; import { observer } from "mobx-react";
// hooks // hooks
import { TSelectionHelper, TSelectionSnapshot, useMultipleSelect } from "@/hooks/use-multiple-select"; import { TSelectionHelper, useMultipleSelect } from "@/hooks/use-multiple-select";
type Props = { type Props = {
children: (helpers: TSelectionHelper) => React.ReactNode; children: (helpers: TSelectionHelper) => React.ReactNode;

View File

@ -13,8 +13,8 @@ import {
// helpers // helpers
import { cn } from "@/helpers/common.helper"; import { cn } from "@/helpers/common.helper";
// hooks // hooks
import { TSelectionHelper, TSelectionSnapshot } from "@/hooks/use-multiple-select";
import { useMultipleSelectStore } from "@/hooks/store"; import { useMultipleSelectStore } from "@/hooks/store";
import { TSelectionHelper } from "@/hooks/use-multiple-select";
type Props = { type Props = {
className?: string; className?: string;

View File

@ -106,9 +106,6 @@ export const IssueBlock = observer((props: IssueBlockProps) => {
const isIssueActive = selectionHelpers.isEntityActive(issue.id); const isIssueActive = selectionHelpers.isEntityActive(issue.id);
const isSubIssue = nestingLevel !== 0; const isSubIssue = nestingLevel !== 0;
console.log("isIssueSelected", issue.id, isIssueSelected);
console.log("isIssueActive", issue.id, isIssueActive);
// if sub issues have been fetched for the issue, use that for count or use issue's sub_issues_count // if sub issues have been fetched for the issue, use that for count or use issue's sub_issues_count
// const subIssuesCount = subIssues ? subIssues.length : issue.sub_issues_count; // const subIssuesCount = subIssues ? subIssues.length : issue.sub_issues_count;

View File

@ -265,14 +265,13 @@ export const useMultipleSelect = (props: Props) => {
const activeEntityDetails = getActiveEntityDetails(); const activeEntityDetails = getActiveEntityDetails();
const nextActiveEntity = getNextActiveEntity(); const nextActiveEntity = getNextActiveEntity();
const previousActiveEntity = getPreviousActiveEntity(); const previousActiveEntity = getPreviousActiveEntity();
if (e.key === "ArrowDown" && activeEntityDetails) { if (e.key === "ArrowDown" && activeEntityDetails) {
if (!nextActiveEntity) return; if (!nextActiveEntity) return;
// console.log("selected by down", elementDetails.entityID);
handleEntitySelection(nextActiveEntity); handleEntitySelection(nextActiveEntity);
} }
if (e.key === "ArrowUp" && activeEntityDetails) { if (e.key === "ArrowUp" && activeEntityDetails) {
if (!previousActiveEntity) return; if (!previousActiveEntity) return;
// console.log("selected by up", elementDetails.entityID);
handleEntitySelection(previousActiveEntity); handleEntitySelection(previousActiveEntity);
} }
}; };
@ -291,6 +290,7 @@ export const useMultipleSelect = (props: Props) => {
useEffect(() => { useEffect(() => {
const handleKeyDown = (e: KeyboardEvent) => { const handleKeyDown = (e: KeyboardEvent) => {
if (e.shiftKey) return;
const activeEntityDetails = getActiveEntityDetails(); const activeEntityDetails = getActiveEntityDetails();
// set active entity id to the first entity // set active entity id to the first entity
if (["ArrowUp", "ArrowDown"].includes(e.key) && !activeEntityDetails) { if (["ArrowUp", "ArrowDown"].includes(e.key) && !activeEntityDetails) {
@ -346,7 +346,7 @@ export const useMultipleSelect = (props: Props) => {
handleGroupClick, handleGroupClick,
isGroupSelected, isGroupSelected,
}), }),
[handleEntityClick, handleGroupClick, isEntityActive, isEntitySelected, isGroupSelected] [clearSelection, handleEntityClick, handleGroupClick, isEntityActive, isEntitySelected, isGroupSelected]
); );
return helpers; return helpers;

View File

@ -1,9 +1,9 @@
import { action, computed, makeObservable, observable, runInAction } from "mobx"; import { action, computed, makeObservable, observable, runInAction } from "mobx";
import { computedFn } from "mobx-utils";
// hooks // hooks
import { TEntityDetails } from "@/hooks/use-multiple-select"; import { TEntityDetails } from "@/hooks/use-multiple-select";
// services // services
import { IssueService } from "@/services/issue"; import { IssueService } from "@/services/issue";
import { computedFn } from "mobx-utils";
export type IMultipleSelectStore = { export type IMultipleSelectStore = {
// observables // observables