Always be closing

Escape shouldn't toggle but always close the modal.
RailsEventStore · Apr 4, 2024 · ac1b713 · ac1b713
1 parent 25cc5d8
commit ac1b713
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ruby_event_store-browser/elm/src/Layout.elm b/ruby_event_store-browser/elm/src/Layout.elm
@@ -56,6 +56,9 @@ port requestSearch : (() -> msg) -> Sub msg
 port requestSearchClose : (() -> msg) -> Sub msg
 
 
+port closeSearch : String -> Cmd msg
+
+
 port toggleBookmark : String -> Cmd msg
 
 
@@ -151,7 +154,7 @@ update msg model =
             ( model, toggleDialog searchModalId )
 
         RequestSearchClose ->
-            ( model, toggleDialog searchModalId )
+            ( model, closeSearch searchModalId )
 
         ToggleBookmarksMenu ->
             ( { model | internal = Model model.internal.search (not model.internal.displayBookmarksMenu) model.internal.bookmarks }, Cmd.none )

diff --git a/ruby_event_store-browser/public/bootstrap.js b/ruby_event_store-browser/public/bootstrap.js
@@ -11,6 +11,10 @@ app.ports.toggleDialog.subscribe(function (id) {
   dialog.open ? dialog.close() : dialog.showModal();
 });
 
+app.ports.closeSearch.subscribe(function (id) {
+  document.querySelector(`#${id}`).close();
+});
+
 window.addEventListener("keydown", function (event) {
   if (event.key === "k" && (event.ctrlKey || event.metaKey)) {
     app.ports.requestSearch.send(null);