From defef6917a83553356df702e3b6c72ec30dbec9f Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Mon, 19 Jun 2023 22:08:13 +0800 Subject: [PATCH] Handle escape on labels modal --- packages/web/pages/[username]/[slug]/index.tsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/web/pages/[username]/[slug]/index.tsx b/packages/web/pages/[username]/[slug]/index.tsx index b60b5918b..f76a80e48 100644 --- a/packages/web/pages/[username]/[slug]/index.tsx +++ b/packages/web/pages/[username]/[slug]/index.tsx @@ -251,6 +251,14 @@ export default function Home(): JSX.Element { name: 'Back to library', shortcut: ['escape'], perform: () => { + if ( + readerSettings.showSetLabelsModal || + readerSettings.showDeleteConfirmation || + readerSettings.showDeleteConfirmation || + readerSettings.showEditDisplaySettingsModal + ) { + return + } const query = window.sessionStorage.getItem('q') if (query) { router.push(`/home?${query}`) @@ -353,7 +361,7 @@ export default function Home(): JSX.Element { perform: () => setShowEditModal(true), }, ], - [] + [readerSettings] ) if (articleFetchError && articleFetchError.indexOf('NOT_FOUND') > -1) {