From d800ddc0d9b1069f7ba9797343a590a2654a53ec Mon Sep 17 00:00:00 2001 From: Naden Date: Tue, 27 Feb 2024 21:19:42 +1100 Subject: [PATCH] Updates --- .../com/harana/search/client/search/SearchHandler.scala | 9 ++++----- .../harana/search/client/search/SearchKeyHandler.scala | 5 +---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/scala/com/harana/search/client/search/SearchHandler.scala b/src/main/scala/com/harana/search/client/search/SearchHandler.scala index dc72002..907dd22 100644 --- a/src/main/scala/com/harana/search/client/search/SearchHandler.scala +++ b/src/main/scala/com/harana/search/client/search/SearchHandler.scala @@ -130,7 +130,7 @@ class SearchHandler extends ActionHandler(zoomTo(_.searchState)) { ) ) >> action(ScrollToFirstDocument) else - action(NoChange) + action(UpdateFocusedPanel(Panel.Integration)) ) case SelectPreviousDocument => @@ -177,9 +177,8 @@ class SearchHandler extends ActionHandler(zoomTo(_.searchState)) { if (scroll) ScrollToDocument(documentId) else NoChange ) ) - } else { - action(NoChange) - } + } else + action(UpdateFocusedPanel(Panel.Document)) ) case LoadThumbnail(documentId) => @@ -239,7 +238,7 @@ class SearchHandler extends ActionHandler(zoomTo(_.searchState)) { } case UpdateSearchApplication(application) => - println("Updating search application to: " + application) + //println("Updating search application to: " + application) updated(value.copy(searchApplication = application)) case UpdateSearchResults(results) => diff --git a/src/main/scala/com/harana/search/client/search/SearchKeyHandler.scala b/src/main/scala/com/harana/search/client/search/SearchKeyHandler.scala index d753d38..c0a2fd0 100644 --- a/src/main/scala/com/harana/search/client/search/SearchKeyHandler.scala +++ b/src/main/scala/com/harana/search/client/search/SearchKeyHandler.scala @@ -28,9 +28,6 @@ class SearchKeyHandler extends ActionHandler(zoomTo(_.searchState)) { case KeyDown(key, event) => effectOnly { - - println("Focused panel = " + value.focusedPanel.toString) - value.focusedPanel match { case Panel.Search => key match { @@ -183,7 +180,7 @@ class SearchKeyHandler extends ActionHandler(zoomTo(_.searchState)) { action(SelectPreviousDocument) case Keys.Left => - action(SelectHorizontalLeftCard) + action(if (cardState.middleHorizontalIndex == 1) UpdateFocusedPanel(Panel.Document) else NoChange) + action(SelectHorizontalLeftCard) + action(if (cardState.middleHorizontalIndex == 0) UpdateFocusedPanel(Panel.Document) else NoChange) case Keys.Right => action(SelectHorizontalRightCard)