Skip to content

Commit c5d4989

Browse files
Gregg8Gregg8
committed
Popover was missing code to apply quite a number of :parts overrides, for both :style and :attr
1 parent 85692f8 commit c5d4989

File tree

1 file changed

+25
-19
lines changed

1 file changed

+25
-19
lines changed

‎src/re_com/popover.cljs

+25-19
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
:below (str (point 0 arrow-length) (point half-arrow-width 0) (point arrow-width arrow-length))}]
9292
[:svg
9393
(merge
94-
{:class (str "popover-arrow rc-popover-arrow " (get-in parts [:arrow :class]))
94+
{:class (str "popover-arrow rc-popover-arrow " (get-in parts [:arrow :class] ""))
9595
:style (merge {:position "absolute"
9696
(case orientation ;; Connect arrow to edge of popover
9797
:left :right
@@ -205,6 +205,7 @@
205205
:src (at)
206206
:class (get-in parts [:container :class] "")
207207
:style (get-in parts [:container :style])
208+
:attr (get-in parts [:container :attr])
208209
:justify :between
209210
:align :center
210211
:children [title
@@ -380,7 +381,7 @@
380381
(when title title)
381382
(into [:div
382383
(merge
383-
{:class (str "popover-content rc-popover-content " (get-in parts [:content :class]))
384+
{:class (str "popover-content rc-popover-content " (get-in parts [:content :class] ""))
384385
:style (merge {:padding padding} (get-in parts [:content :style]))}
385386
(get-in parts [:content :attr]))]
386387
children)])))}))))
@@ -568,17 +569,21 @@
568569
(->attr args)
569570
attr)
570571
[:div ;; Wrapper around the anchor and the "point"
571-
{:class (str "display-inline-flex rc-point-wrapper " (get-in parts [:point-wrapper :class]))
572+
{:class (str "display-inline-flex rc-point-wrapper " (get-in parts [:point-wrapper :class] ""))
572573
:style (merge (flex-child-style "auto")
573574
(flex-flow-style flex-flow)
574-
(align-style :align-items :center))}
575+
(align-style :align-items :center)
576+
(get-in parts [:point-wrapper :style]))
577+
:attr (get-in parts [:point-wrapper :attr])}
575578
(when place-anchor-before? anchor)
576579
(when (deref-or-value showing?)
577580
[:div ;; The "point" that connects the anchor to the popover
578-
{:class (str "display-inline-flex rc-popover-point " (get-in parts [:point :class]))
581+
{:class (str "display-inline-flex rc-popover-point " (get-in parts [:point :class] ""))
579582
:style (merge (flex-child-style "auto")
580583
{:position "relative"
581-
:z-index 4})}
584+
:z-index 4}
585+
(get-in parts [:point :style]))
586+
:attr (get-in parts [:point :attr])}
582587
(into popover [:showing-injected? showing? :position-injected internal-position])]) ;; NOTE: Inject showing? and position to the popover
583588
(when-not place-anchor-before? anchor)]]))))}))))
584589

@@ -588,23 +593,23 @@
588593

589594
(def popover-tooltip-parts-desc
590595
(when include-args-desc?
591-
[{:type :legacy :level 0 :class "rc-popover-anchor-wrapper" :impl "[popover-anchor-wrapper]" :notes "Outer wrapper of the popover tooltip."}
592-
{:name :content-wrapper :level 1 :class "" :impl "[popover-content-wrapper]" :notes ""}
593-
{:name :v-box :level 2 :class "" :impl "[v-box]" :notes ""}
594-
{:name :close-button-container :level 3 :class "rc-popover-tooltip-close-button-container" :impl "[box]" :notes ""}
595-
{:name :close-button :level 4 :class "rc-popover-tooltip-close-button" :impl "[close-button]" :notes ""}]))
596+
[{:type :legacy :level 0 :class "rc-popover-anchor-wrapper" :impl "[popover-anchor-wrapper]" :notes "Outer wrapper of the popover tooltip."}
597+
{:name :content-wrapper :level 1 :class "" :impl "[popover-content-wrapper]" :notes ""}
598+
{:name :v-box :level 2 :class "" :impl "[v-box]" :notes ""}
599+
{:name :close-button-container :level 3 :class "rc-popover-tooltip-close-button-container" :impl "[box]" :notes ""}
600+
{:name :close-button :level 4 :class "rc-popover-tooltip-close-button" :impl "[close-button]" :notes ""}]))
596601

597602
(def popover-tooltip-parts
598603
(when include-args-desc?
599604
(-> (map :name popover-tooltip-parts-desc) set)))
600605

601606
(def popover-tooltip-args-desc
602607
(when include-args-desc?
603-
[{:name :label :required true :type "string | hiccup | r/atom" :validate-fn string-or-hiccup? :description "the text (or component) for the tooltip"}
604-
{:name :showing? :required true :type "boolean r/atom" :description "an atom. When the value is true, the tooltip shows"}
605-
{:name :on-cancel :required false :type "-> nil" :validate-fn fn? :description "a function which takes no params and returns nothing. Called when the popover is cancelled (e.g. user clicks away)"}
606-
{:name :close-button? :required false :default false :type "boolean" :description "when true, displays the close button"}
607-
{:name :status :required false :type "keyword" :validate-fn popover-status-type? :description [:span "controls background color of the tooltip. " [:code "nil/omitted"] " for black or one of " popover-status-types-list " (although " [:code ":validating"] " is only used by the input-text component)"]}
608+
[{:name :label :required true :type "string | hiccup | r/atom" :validate-fn string-or-hiccup? :description "the text (or component) for the tooltip"}
609+
{:name :showing? :required true :type "boolean r/atom" :description "an atom. When the value is true, the tooltip shows"}
610+
{:name :on-cancel :required false :type "-> nil" :validate-fn fn? :description "a function which takes no params and returns nothing. Called when the popover is cancelled (e.g. user clicks away)"}
611+
{:name :close-button? :required false :default false :type "boolean" :description "when true, displays the close button"}
612+
{:name :status :required false :type "keyword" :validate-fn popover-status-type? :description [:span "controls background color of the tooltip. " [:code "nil/omitted"] " for black or one of " popover-status-types-list " (although " [:code ":validating"] " is only used by the input-text component)"]}
608613
{:name :anchor :required true :type "hiccup" :validate-fn string-or-hiccup? :description "the component the tooltip is attached to"}
609614
{:name :position :required false :default :below-center :type "keyword" :validate-fn position? :description [:span "relative to this anchor. One of " position-options-list]}
610615
{:name :no-clip? :required false :default true :type "boolean" :description "when an anchor is in a scrolling region (e.g. scroller component), the popover can sometimes be clipped. When this parameter is true (which is the default), re-com will use a different CSS method to show the popover. This method is slightly inferior because the popover can't track the anchor if it is repositioned"}
@@ -667,7 +672,7 @@
667672
:arrow-gap 4
668673
:body [v-box
669674
:src (at)
670-
:class (get-in parts [:v-box :class])
675+
:class (get-in parts [:v-box :class] "")
671676
:style (merge
672677
(if (= status :info)
673678
{:color "white"
@@ -678,16 +683,17 @@
678683
:font-weight "bold"
679684
:text-align "center"})
680685
(get-in parts [:v-box :style]))
686+
:attr (get-in parts [:v-box :attr])
681687
:children [(when close-button?
682688
[box
683689
:src (at)
684-
:class (str "rc-popover-tooltip-close-button-container " (get-in parts [:close-button-container :class]))
690+
:class (str "rc-popover-tooltip-close-button-container " (get-in parts [:close-button-container :class] ""))
685691
:style (get-in parts [:close-button-container :style])
686692
:attr (get-in parts [:close-button-container :attr])
687693
:align-self :end
688694
:child [close-button
689695
:src (at)
690-
:class (str "rc-popover-tooltip-close-button " (get-in parts [:close-button :class]))
696+
:class (str "rc-popover-tooltip-close-button " (get-in parts [:close-button :class] ""))
691697
:style (get-in parts [:close-button :style])
692698
:attr (get-in parts [:close-button :attr])
693699
:on-click #(if on-cancel

0 commit comments

Comments
 (0)