From aeedf58c2b2f852fe7666686d459325a10fa85c5 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Wed, 16 Sep 2020 22:30:24 +0200 Subject: [PATCH] Move field contents when switching search mode in search bar --- .../webapp/src/main/elm/Page/Home/Update.elm | 36 +++++++++++++++---- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/modules/webapp/src/main/elm/Page/Home/Update.elm b/modules/webapp/src/main/elm/Page/Home/Update.elm index d9b72133..9308b35d 100644 --- a/modules/webapp/src/main/elm/Page/Home/Update.elm +++ b/modules/webapp/src/main/elm/Page/Home/Update.elm @@ -208,14 +208,36 @@ update mId key flags settings msg model = let ( sm, mv ) = Comp.FixedDropdown.update lm model.searchTypeDropdown + + m0 = + { model + | searchTypeDropdown = sm + , searchTypeForm = Maybe.withDefault model.searchTypeForm mv + } + + next = + case mv of + Just BasicSearch -> + Just + ( { m0 | contentOnlySearch = Nothing } + , Maybe.withDefault "" model.contentOnlySearch + ) + + Just ContentOnlySearch -> + Just + ( { m0 | contentOnlySearch = model.searchMenuModel.allNameModel } + , "" + ) + + _ -> + Nothing in - withSub - ( { model - | searchTypeDropdown = sm - , searchTypeForm = Maybe.withDefault model.searchTypeForm mv - } - , Cmd.none - ) + case next of + Just ( m_, nstr ) -> + update mId key flags settings (SearchMenuMsg (Comp.SearchMenu.SetAllName nstr)) m_ + + Nothing -> + withSub ( m0, Cmd.none ) KeyUpMsg (Just Enter) -> update mId key flags settings DoSearch model