Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 0 deletions .changeset/chilly-dancers-stare.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'studytimer.io': minor
---

Added new keyboard shortcuts: Space (start/stop), Alt+P (Pomodoro), Alt+S (Short Break), Alt+L (Long Break), Alt+R (Reset Timer).
74 changes: 68 additions & 6 deletions src/pages/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ export class HomePage extends LitElement {

connectedCallback() {
super.connectedCallback();
window.addEventListener('keydown', this.#onKeydown);
this._settings = { ...settingsStore.settings };
this.#reset();
settingsStore.addEventListener(
Expand All @@ -178,13 +179,14 @@ export class HomePage extends LitElement {

disconnectedCallback() {
super.disconnectedCallback();
window.removeEventListener('keydown', this.#onKeydown);
settingsStore.removeEventListener(
SETTINGS_EVENT.SETTINGS_FORM_SUBMIT,
this.#onSettingsFormSubmit
);
}

/** @returns {Element[]} */
/** @returns {HTMLButtonElement[]} */
get #pomodoroModeButtonEls() {
return Array.from(
this.renderRoot?.querySelectorAll('button[data-mode]') ?? []
Expand All @@ -202,6 +204,11 @@ export class HomePage extends LitElement {
};
}

/** @returns {boolean} */
get #timerComplete() {
return this._minutes === 0 && this._seconds === 0;
}

render() {
const {
enableExerciseDisplay,
Expand Down Expand Up @@ -288,7 +295,7 @@ export class HomePage extends LitElement {
</div>`;
}

/** @param {Event} event */
/** @param {{ target: EventTarget | null }} event */
#selectMode({ target }) {
if (target instanceof HTMLButtonElement) {
const mode = /** @type {import("../index.d.js").PomodoroModeKind} */ (
Expand Down Expand Up @@ -325,11 +332,8 @@ export class HomePage extends LitElement {
switch (action) {
case POMODORO_TIMER_ACTION.START:
{
// Check if timer is complete
const timerComplete = this._minutes === 0 && this._seconds === 0;

// Only start if not running and timer is not complete
if (!this.#isRunning && !timerComplete) {
if (!this.#isRunning && !this.#timerComplete) {
this.#start();
this.#dismissExercises();
}
Expand Down Expand Up @@ -380,6 +384,64 @@ export class HomePage extends LitElement {
this.#updatePomodoroTimer();
}

/** @param {KeyboardEvent} event */
#onKeydown = (event) => {
if (event.code === 'Space') {
event.preventDefault();
if (this.#isRunning) {
this.#pause();
} else if (!this.#timerComplete) {
this.#start();
this.#dismissExercises();
}
}

if (event.altKey) {
switch (event.code) {
case 'KeyP':
{
event.preventDefault();
this.#selectMode({
target:
this.#pomodoroModeButtonEls.find(
(buttonEl) =>
buttonEl.dataset?.mode === POMODORO_MODE.POMODORO
) ?? null,
});
}
break;
case 'KeyS':
{
event.preventDefault();
this.#selectMode({
target:
this.#pomodoroModeButtonEls.find(
(buttonEl) =>
buttonEl.dataset?.mode === POMODORO_MODE.SHORT_BREAK
) ?? null,
});
}
break;
case 'KeyL':
{
event.preventDefault();
this.#selectMode({
target:
this.#pomodoroModeButtonEls.find(
(buttonEl) =>
buttonEl.dataset?.mode === POMODORO_MODE.LONG_BREAK
) ?? null,
});
}
break;
case 'KeyR':
event.preventDefault();
this.#reset();
break;
}
}
};

#complete() {
const { enableNotifications, exercisesCount, showMotivationalQuote } =
this._settings;
Expand Down
Loading