Skip to content

Use :on-key-pressed event to fix search filter clearing on macOS #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
inmost-light wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −8
Open

Use :on-key-pressed event to fix search filter clearing on macOS #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/cljfx/dev/ui.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
(update state key assoc :selection event))

(defn- set-help-ui-filter-term [state {:keys [key ^KeyEvent fx/event]}]
(let [ch (.getCharacter event)]
(let [code (.getCode event)]
(cond
(and (= 1 (count ch)) (#{127 27} (int (first ch))))
(#{KeyCode/ESCAPE KeyCode/DELETE} code)
(update state key assoc :filter-term "")

(= ch "\b")
(= code KeyCode/BACK_SPACE)
(update-in state [key :filter-term] #(cond-> % (pos? (count %)) (subs 0 (dec (count %)))))

(= ch "\t")
(= code KeyCode/TAB)
state

(re-matches #"^[a-zA-Z0-9:/\-.+!@#$%^&*()-={}\[\]<>?,/\\'\"]$" ch)
(update-in state [key :filter-term] str (.getCharacter event))
(re-matches #"^[a-zA-Z0-9:/\-.+!@#$%^&*()-={}\[\]<>?,/\\'\"]$" (.getText event))
(update-in state [key :filter-term] str (.getText event))

:else
state)))
Expand All @@ -31,7 +31,7 @@
:props {:selected-item selection
:on-selected-item-changed {:fn #'set-help-ui-selection :key key}}
:desc {:fx/type :list-view
:on-key-typed {:fn #'set-help-ui-filter-term :key key}
:on-key-pressed {:fn #'set-help-ui-filter-term :key key}
:items items}}
{:fx/type :label
:visible (boolean (seq filter-term))
Expand Down
2 changes: 1 addition & 1 deletion src/cljfx/dev/validation.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'[javafx.event EventDispatcher]
'[javafx.stage Popup]
'[javafx.scene.text Text]
'[javafx.scene.input KeyEvent Clipboard ClipboardContent]
'[javafx.scene.input KeyCode KeyEvent Clipboard ClipboardContent]
'[javafx.scene.control Label TreeItem TableView TablePosition])

(def ^:private help-ui-css
Expand Down