Skip to content

fix(Tasks): implement hotkeysEnabled state to control keyboard shortcuts#426

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
ShivaGupta-14 wants to merge 1 commit into
base:main
Choose a base branch
from
Open

fix(Tasks): implement hotkeysEnabled state to control keyboard shortcuts #426

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
5 changes: 4 additions & 1 deletion frontend/jest.config.cjs
View file
Open in desktop
Comment thread
its-me-abhishek marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,10 @@ module.exports = {
transformIgnorePatterns: ['/node_modules/(?!react-toastify)'],
setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
collectCoverageFrom: ['src/**/*.{ts,tsx}', '!src/**/*.d.ts'],
testMatch: ['**/__tests__/**/*.{ts,tsx}', '**/?(*.)+(spec|test).{ts,tsx}'],
testMatch: [
'**/__tests__/**/*.+(test|spec).{ts,tsx}',
'**/?(*.)+(spec|test).{ts,tsx}',
],
transform: {
'^.+\\.tsx?$': [
'ts-jest',
Expand Down
201 changes: 128 additions & 73 deletions frontend/src/components/HomeComponents/Tasks/Tasks.tsx
View file
Open in desktop
Comment thread
its-me-abhishek marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,9 @@ export const Tasks = (
);
const [autoSyncOnEdit, setAutoSyncOnEdit] = useState(true);
const tableRef = useRef<HTMLDivElement>(null);
const [hotkeysEnabled, setHotkeysEnabled] = useState(false);
const [isMouseOver, setIsMouseOver] = useState(false);
const [activeContext, setActiveContext] = useState<string | null>(null);
const hotkeysEnabled = activeContext === 'TASKS' || isMouseOver;
const [selectedIndex, setSelectedIndex] = useState(0);
const {
state: editState,
Expand DownExpand Up@@ -151,8 +153,27 @@ export const Tasks = (
const paginate = (pageNumber: number) => setCurrentPage(pageNumber);
const totalPages = Math.ceil(tempTasks.length / tasksPerPage) || 1;

useEffect(() => {
const handleGlobalPointerDown = (e: PointerEvent) => {
if (tableRef.current && !tableRef.current.contains(e.target as Node)) {
setActiveContext(null);
}
};

document.addEventListener('pointerdown', handleGlobalPointerDown, true);
return () => {
document.removeEventListener(
'pointerdown',
handleGlobalPointerDown,
true
);
};
}, []);

useEffect(() => {
const handler = (e: KeyboardEvent) => {
if (!hotkeysEnabled) return;

const target = e.target as HTMLElement;
if (
target instanceof HTMLInputElement ||
Expand DownExpand Up@@ -1022,83 +1043,115 @@ export const Tasks = (
}
};

useHotkeys(['f'], () => {
if (!showReports) {
document.getElementById('search')?.focus();
}
});
useHotkeys(['a'], () => {
if (!showReports) {
document.getElementById('add-new-task')?.click();
}
});
useHotkeys(['r'], () => {
if (!showReports) {
document.getElementById('sync-task')?.click();
}
});
useHotkeys(['p'], () => {
if (!showReports) {
document.getElementById('projects')?.click();
}
});
useHotkeys(['s'], () => {
if (!showReports) {
document.getElementById('status')?.click();
}
});
useHotkeys(['t'], () => {
if (!showReports) {
document.getElementById('tags')?.click();
}
});
useHotkeys(['c'], () => {
if (!showReports && !_isDialogOpen) {
const task = currentTasks[selectedIndex];
if (!task) return;
const openBtn = document.getElementById(`task-row-${task.id}`);
openBtn?.click();
setTimeout(() => {
const confirmBtn = document.getElementById(
`mark-task-complete-${task.id}`
);
confirmBtn?.click();
}, 200);
} else {
if (_isDialogOpen) {
useHotkeys(
['f'],
() => {
if (!showReports) {
document.getElementById('search')?.focus();
}
},
hotkeysEnabled
);
useHotkeys(
['a'],
() => {
if (!showReports) {
document.getElementById('add-new-task')?.click();
}
},
hotkeysEnabled
);
useHotkeys(
['r'],
() => {
if (!showReports) {
document.getElementById('sync-task')?.click();
}
},
hotkeysEnabled
);
useHotkeys(
['p'],
() => {
if (!showReports) {
document.getElementById('projects')?.click();
}
},
hotkeysEnabled
);
useHotkeys(
['s'],
() => {
if (!showReports) {
document.getElementById('status')?.click();
}
},
hotkeysEnabled
);
useHotkeys(
['t'],
() => {
if (!showReports) {
document.getElementById('tags')?.click();
}
},
hotkeysEnabled
);
useHotkeys(
['c'],
() => {
if (!showReports && !_isDialogOpen) {
const task = currentTasks[selectedIndex];
if (!task) return;
const confirmBtn = document.getElementById(
`mark-task-complete-${task.id}`
);
confirmBtn?.click();
const openBtn = document.getElementById(`task-row-${task.id}`);
openBtn?.click();
setTimeout(() => {
const confirmBtn = document.getElementById(
`mark-task-complete-${task.id}`
);
confirmBtn?.click();
}, 200);
} else {
if (_isDialogOpen) {
const task = currentTasks[selectedIndex];
if (!task) return;
const confirmBtn = document.getElementById(
`mark-task-complete-${task.id}`
);
confirmBtn?.click();
}
}
}
});
},
hotkeysEnabled
);

useHotkeys(['d'], () => {
if (!showReports && !_isDialogOpen) {
const task = currentTasks[selectedIndex];
if (!task) return;
const openBtn = document.getElementById(`task-row-${task.id}`);
openBtn?.click();
setTimeout(() => {
const confirmBtn = document.getElementById(
`mark-task-as-deleted-${task.id}`
);
confirmBtn?.click();
}, 200);
} else {
if (_isDialogOpen) {
useHotkeys(
['d'],
() => {
if (!showReports && !_isDialogOpen) {
const task = currentTasks[selectedIndex];
if (!task) return;
const confirmBtn = document.getElementById(
`mark-task-as-deleted-${task.id}`
);
confirmBtn?.click();
const openBtn = document.getElementById(`task-row-${task.id}`);
openBtn?.click();
setTimeout(() => {
const confirmBtn = document.getElementById(
`mark-task-as-deleted-${task.id}`
);
confirmBtn?.click();
}, 200);
} else {
if (_isDialogOpen) {
const task = currentTasks[selectedIndex];
if (!task) return;
const confirmBtn = document.getElementById(
`mark-task-as-deleted-${task.id}`
);
confirmBtn?.click();
}
}
}
});
},
hotkeysEnabled
);

return (
<section
Expand DownExpand Up@@ -1159,8 +1212,10 @@ export const Tasks = (
) : (
<div
ref={tableRef}
onMouseEnter={() => setHotkeysEnabled(true)}
onMouseLeave={() => setHotkeysEnabled(false)}
data-testid="tasks-table-container"
Comment thread
its-me-abhishek marked this conversation as resolved.
onPointerDown={() => setActiveContext('TASKS')}
onMouseEnter={() => setIsMouseOver(true)}
onMouseLeave={() => setIsMouseOver(false)}
>
{tasks.length != 0 ? (
<>
Expand Down
Loading
Loading