johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-12 06:24:17 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

🐛 Fix onboarding select keyboard interaction (#7295)

Browse Source
This commit is contained in:
Aitor Moreno
2025-09-16 13:59:15 +02:00
committed by GitHub
parent e5e11b6383
commit b883882a32
1 changed files with 99 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
frontend/src/app/main/ui/components/select.cljs
View File

@@ -13,34 +13,99 @@
[app.main.ui.components.dropdown :refer [dropdown]]
[app.main.ui.icons :as deprecated-icon]
[app.util.dom :as dom]
[app.util.keyboard :as kbd]
[rumext.v2 :as mf]))
(defn- as-key-value
[item]
(if (map? item)
[(:value item) (:label item) (:icon item)]
[item item item]))
(defn- rotate-index-forward
[index length]
(let [last-index (dec length)
index (if (< index 0) 0 index)
index (inc index)
index (if (> index last-index) 0 index)]
index))
(defn- rotate-index-backward
[index length]
(let [last-index (dec length)
index (if (< index 0) 0 index)
index (dec index)
index (if (< index 0) last-index index)]
index))
(defn- rotate-option-forward
[options index]
(:value (nth options (rotate-index-forward index (count options)))))
(defn- rotate-option-backward
[options index length]
(:value (nth options (rotate-index-backward index length))))
(mf/defc select
[{:keys [default-value options class dropdown-class is-open? on-change on-pointer-enter-option on-pointer-leave-option disabled data-direction]}]
(let [label-index (mf/with-memo [options]
(into {} (map as-key-value) options))
state* (mf/use-state
{:id (uuid/next)
#(-> {:id (uuid/next)
:is-open? (or is-open? false)
:current-value default-value})
:current-value default-value}))
state (deref state*)
current-id (get state :id)
current-value (get state :current-value)
current-label (get label-index current-value)
is-open? (:is-open? state)
is-open? (get state :is-open?)
dropdown-element* (mf/use-ref nil)
dropdown-direction* (mf/use-state "down")
dropdown-direction-change* (mf/use-ref 0)
node-ref (mf/use-ref nil)
dropdown-direction*
(mf/use-state "down")
dropdown-direction
(deref dropdown-direction*)
dropdown-direction-change*
(mf/use-ref 0)
handle-key-up
(mf/use-fn
(mf/deps disabled options current-value)
(fn [e]
(when-not disabled
(let [options (into [] (remove :disabled) options)
length (count options)
index (d/index-of-pred options #(= (:value %) current-value))
index (d/nilv index 0)]
(cond
(or (kbd/left-arrow? e)
(kbd/up-arrow? e))
(let [value (rotate-option-backward options index length)]
(swap! state* assoc :current-value value)
(when (fn? on-change)
(on-change (dm/str value))))
(or (kbd/right-arrow? e)
(kbd/down-arrow? e))
(let [value (rotate-option-forward options index)]
(swap! state* assoc :current-value value)
(when (fn? on-change)
(on-change (dm/str value))))
(or (kbd/enter? e)
(kbd/space? e))
(swap! state* assoc :is-open? false)
(kbd/tab? e)
(swap! state* assoc
:is-open? true
:current-value (-> options first :value)))))))
open-dropdown
(mf/use-fn
@@ -49,7 +114,8 @@
(when-not disabled
(swap! state* assoc :is-open? true))))
close-dropdown (mf/use-fn #(swap! state* assoc :is-open? false))
close-dropdown
(mf/use-fn #(swap! state* assoc :is-open? false))
select-item
(mf/use-fn
@@ -91,8 +157,8 @@
(reset! dropdown-direction* "down")
(mf/set-ref-val! dropdown-direction-change* 0)))
(mf/with-effect [is-open? dropdown-element*]
(let [dropdown-element (mf/ref-val dropdown-element*)]
(mf/with-effect [is-open?]
(let [dropdown-element (mf/ref-val node-ref)]
(when (and (= 0 (mf/ref-val dropdown-direction-change*)) dropdown-element)
(let [is-outside? (dom/is-element-outside? dropdown-element)]
(reset! dropdown-direction* (if is-outside? "up" "down"))
@@ -101,7 +167,10 @@
(let [selected-option (first (filter #(= (:value %) default-value) options))
current-icon (:icon selected-option)
current-icon-ref (deprecated-icon/key->icon current-icon)]
[:div {:on-click open-dropdown
[:div {:id (dm/str current-id)
:on-click open-dropdown
:on-key-up handle-key-up
:tab-index "0"
:role "combobox"
:class (dm/str (stl/css-case :custom-select true
:disabled disabled
@@ -112,23 +181,29 @@
[:span {:class (stl/css :current-label)} current-label]
[:span {:class (stl/css :dropdown-button)} deprecated-icon/arrow]
[:& dropdown {:show is-open? :on-close close-dropdown}
[:ul {:ref dropdown-element* :data-direction (or data-direction @dropdown-direction*)
[:ul {:ref node-ref
:data-direction (d/nilv data-direction dropdown-direction)
:class (dm/str dropdown-class " " (stl/css :custom-select-dropdown))}
(for [[index item] (d/enumerate options)]
(if (= :separator item)
[:li {:class (dom/classnames (stl/css :separator) true)
:role "option"
:key (dm/str current-id "-" index)}]
[:li {:id (dm/str current-id "-" index)
:key (dm/str current-id "-" index)
:class (stl/css :separator)
:tab-index "-1"
:role "option"}]
(let [[value label icon] (as-key-value item)
icon-ref (deprecated-icon/key->icon icon)]
[:li
{:key (dm/str current-id "-" index)
{:id (dm/str current-id "-" index)
:key (dm/str current-id "-" index)
:tab-index "-1"
:role "option"
:class (stl/css-case
:checked-element true
:disabled (:disabled item)
:is-selected (= value current-value))
:data-value (pr-str value)
:on-key-up select-item
:on-pointer-enter highlight-item
:on-pointer-leave unhighlight-item
:on-click select-item}