Skip to content
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

Add parts support for dropdown arrow #318

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −6
Open

Add parts support for dropdown arrow #318

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0e594b
Support paths in dropdown arrow
MawiraIke Jan 24, 2022
2b94679
Merge branch 'master' into feature/editable-dropdown
MawiraIke Jan 24, 2022
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
15 changes: 9 additions & 6 deletions src/re_com/dropdown.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
[]
(let [ignore-click (atom false)]
(fn
[internal-model choices id-fn label-fn tab-index placeholder dropdown-click key-handler filter-box? drop-showing? title? disabled?]
[internal-model choices id-fn label-fn tab-index placeholder dropdown-click key-handler filter-box? drop-showing? title? disabled? parts]
(let [_ (reagent/set-state (reagent/current-component) {:filter-box? filter-box?})
text (if @internal-model
(label-fn (item-for-id @internal-model choices :id-fn id-fn))
Expand All @@ -229,7 +229,8 @@
{:title text})
text]
(when (not disabled?)
[:div [:b]])])))) ;; This odd bit of markup produces the visual arrow on the right
[:div [:b {:class (str "rc-dropdown-arrow " (get-in parts [:arrow :class])) ;; This odd bit of markup produces the visual arrow on the right
:style (get-in parts [:arrow :style])}]])]))))

(defn handle-free-text-insertion
[event ins auto-complete? capitalize? choices internal-model free-text-sel-range free-text-change]
Expand Down Expand Up @@ -260,7 +261,7 @@

(defn- free-text-dropdown-top-base
"Base function (before lifecycle metadata) to render the top part of the dropdown (free-text), with the editable area and the up/down arrow"
[free-text-input select-free-text? free-text-focused? free-text-sel-range internal-model tab-index placeholder dropdown-click key-handler filter-box? drop-showing? cancel width free-text-change auto-complete? choices capitalize? disabled?]
[free-text-input select-free-text? free-text-focused? free-text-sel-range internal-model tab-index placeholder dropdown-click key-handler filter-box? drop-showing? cancel width free-text-change auto-complete? choices capitalize? disabled? parts]
[:ul.chosen-choices
[:li.search-field
[:div.free-text
Expand Down Expand Up @@ -304,7 +305,8 @@
(when @free-text-focused?
(.preventDefault event)))} ;; Prevent free-text input from loosing focus
(when (not disabled?)
[:b])]]]])
[:b {:class (str "rc-dropdown-arrow " (get-in parts [:arrow :class]))
:style (get-in parts [:arrow :style])}])]]]])

(def ^:private free-text-dropdown-top
"Render the top part of the dropdown (free-text), with the editable area and the up/down arrow"
Expand Down Expand Up @@ -362,6 +364,7 @@
(def single-dropdown-parts-desc
(when include-args-desc?
[{:name :tooltip :level 0 :class "rc-dropdown-tooltip" :impl "[popover-tooltip]" :notes "Tooltip for the dropdown, if enabled."}
{:name :arrow :level 0 :class "rc-dropdown-arrow" :impl "[:b]"}
{:type :legacy :level 1 :class "rc-dropdown" :impl "[:div]" :notes "The container for the rest of the dropdown."}
{:name :chosen-drop :level 2 :class "rc-dropdown-chosen-drop" :impl "[:div]"}
{:name :chosen-results :level 3 :class "rc-dropdown-chosen-results" :impl "[:ul]"}
Expand Down Expand Up @@ -610,8 +613,8 @@
attr)
(cond
just-drop? nil
free-text? [free-text-dropdown-top free-text-input select-free-text? free-text-focused? free-text-sel-range internal-model tab-index placeholder dropdown-click key-handler filter-box? drop-showing? cancel width free-text-change auto-complete? choices capitalize? disabled?]
:else [dropdown-top internal-model choices id-fn label-fn tab-index placeholder dropdown-click key-handler filter-box? drop-showing? title? disabled?])
free-text? [free-text-dropdown-top free-text-input select-free-text? free-text-focused? free-text-sel-range internal-model tab-index placeholder dropdown-click key-handler filter-box? drop-showing? cancel width free-text-change auto-complete? choices capitalize? disabled? parts]
:else [dropdown-top internal-model choices id-fn label-fn tab-index placeholder dropdown-click key-handler filter-box? drop-showing? title? disabled? parts])
(when (and @drop-showing? (not disabled?))
[:div
(merge
Expand Down