Skip to content

Commit 678ad30

Browse files
authored
Merge pull request #181 from corentinjuvigny/master
Rework(ot_color_picker) Add attribute to Ot_color_picker.make
2 parents 207374b + f192cd0 commit 678ad30

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

src/widgets/ot_color_picker.eliom

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,22 +142,20 @@ let display_sl_grid ~setter ((sel_hue, sel_sat, sel_ltn) as sel) =
142142
(Array.to_list rows)
143143
)
144144

145-
let display_aux ~setter ((sel_hue, sel_sat, sel_ltn) as sel) =
145+
let display_aux ?(a=[]) ~setter ((sel_hue, sel_sat, sel_ltn) as sel) =
146146
let open Eliom_content.Html in
147-
D.(
148-
div ~a:[a_class ["ot-color-picker"]]
147+
D.div ~a:(D.a_class ["ot-color-picker"]::a)
149148
[ display_hue_selector ~setter sel
150149
; display_sl_grid ~setter sel
151150
]
152-
)
153151

154-
let display cp_sig =
152+
let display ?a cp_sig =
155153
let setter = snd cp_sig in
156-
fst cp_sig >|= [%shared display_aux ~setter:~%setter] |> Eliom_content.Html.R.node
154+
fst cp_sig >|= [%shared display_aux ?a:~%a ~setter:~%setter] |> Eliom_content.Html.R.node
157155

158-
let make () =
156+
let make ?a =
159157
let cp_sig = Eliom_shared.React.S.create (255, 1.0, 0.0) in
160-
( display
158+
( display ?a
161159
cp_sig
162160
, fst cp_sig
163161
)

src/widgets/ot_color_picker.eliomi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@
2626
val hsv_to_rgb : int -> float -> float -> (float * float * float)
2727
(** [hsv_to_rgb h s v] converts HS(V/L) colors to RGB. *)
2828

29-
val make : unit -> [> `Div ] Eliom_content.Html.D.elt * (int * float * float) Eliom_shared.React.S.t
29+
val make : ?a: [< Html_types.div_attrib > `Class ] Eliom_content.Html.attrib list ->
30+
[> `Div ] Eliom_content.Html.D.elt * (int * float * float) Eliom_shared.React.S.t
3031
(** [make ()] produces a color picker. *)

0 commit comments

Comments
 (0)