From cfd6cf5932dd924947c2b1c6bb824a1f04ef24a3 Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Wed, 28 Dec 2022 01:20:08 +0530 Subject: [PATCH] refactor(dev-only): disable note list keyboard nav when showing files table view --- .../Components/ContentListView/ContentListView.tsx | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx b/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx index 1b337114e..f9412c77a 100644 --- a/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx +++ b/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx @@ -182,6 +182,9 @@ const ContentListView = forwardRef( } }, [isFilesSmartView, filesController, createNewNote, toggleAppPane, application]) + const isFilesTableViewEnabled = featureTrunkEnabled(FeatureTrunkName.FilesTableView) + const shouldShowFilesTableView = isFilesTableViewEnabled && selectedTag?.uuid === SystemViewId.Files + useEffect(() => { const searchBarElement = document.getElementById(ElementIds.SearchBar) /** @@ -204,6 +207,9 @@ const ContentListView = forwardRef( if (searchBarElement === document.activeElement) { searchBarElement?.blur() } + if (shouldShowFilesTableView) { + return + } selectNextItem() }, }, @@ -211,6 +217,9 @@ const ContentListView = forwardRef( command: PREVIOUS_LIST_ITEM_KEYBOARD_COMMAND, element: document.body, onKeyDown: () => { + if (shouldShowFilesTableView) { + return + } selectPreviousItem() }, }, @@ -252,6 +261,7 @@ const ContentListView = forwardRef( selectNextItem, selectPreviousItem, selectionController, + shouldShowFilesTableView, ]) const shortcutForCreate = useMemo( @@ -285,9 +295,6 @@ const ContentListView = forwardRef( } }, [selectedUuids, innerRef, isCurrentNoteTemplate, renderedItems, panes]) - const isFilesTableViewEnabled = featureTrunkEnabled(FeatureTrunkName.FilesTableView) - const shouldShowFilesTableView = isFilesTableViewEnabled && selectedTag?.uuid === SystemViewId.Files - return (