Skip to content

Commit c1789c2

Browse files
committed
Fix Range slider props
1 parent cc7fd4e commit c1789c2

File tree

2 files changed

+26
-13
lines changed

2 files changed

+26
-13
lines changed

src/Plotly.NET/CommonAbstractions/StyleParams.fs

+13
Original file line numberDiff line numberDiff line change
@@ -1800,6 +1800,19 @@ module StyleParam =
18001800
// #R#
18011801
//--------------------------
18021802

1803+
[<RequireQualifiedAccess>]
1804+
type RangesliderRangeMode =
1805+
| Auto | Fixed | Match
1806+
1807+
static member toString = function
1808+
| Auto -> "auto"
1809+
| Fixed -> "fixed"
1810+
| Match -> "match"
1811+
1812+
static member convert = RangesliderRangeMode.toString >> box
1813+
override this.ToString() = this |> RangesliderRangeMode.toString
1814+
member this.Convert() = this |> RangesliderRangeMode.convert
1815+
18031816
/// If "normal", the range is computed in relation to the extrema of the input data. If "tozero"`, the range extends to 0, regardless of the input data If "nonnegative", the range is non-negative, regardless of the input data.
18041817
[<RequireQualifiedAccess>]
18051818
type RangeMode =

src/Plotly.NET/Layout/ObjectAbstractions/Common/RangeSlider.fs

+13-13
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ type RangeSlider () =
2424
[<Optional;DefaultParameterValue(null)>] ?BgColor: Color,
2525
[<Optional;DefaultParameterValue(null)>] ?BorderColor: Color,
2626
[<Optional;DefaultParameterValue(null)>] ?BorderWidth: float,
27-
[<Optional;DefaultParameterValue(null)>] ?AutoRange : bool ,
28-
[<Optional;DefaultParameterValue(null)>] ?Range: seq<#IConvertible> ,
27+
[<Optional;DefaultParameterValue(null)>] ?AutoRange : bool,
28+
[<Optional;DefaultParameterValue(null)>] ?Range: StyleParam.Range,
2929
[<Optional;DefaultParameterValue(null)>] ?Thickness: float,
3030
[<Optional;DefaultParameterValue(null)>] ?Visible: bool,
31-
[<Optional;DefaultParameterValue(null)>] ?YAxisRangeMode: StyleParam.RangeMode,
32-
[<Optional;DefaultParameterValue(null)>] ?YAxisRange: seq<#IConvertible>
31+
[<Optional;DefaultParameterValue(null)>] ?YAxisRangeMode: StyleParam.RangesliderRangeMode,
32+
[<Optional;DefaultParameterValue(null)>] ?YAxisRange: StyleParam.Range
3333
) =
3434
RangeSlider ()
3535
|> RangeSlider.style (
@@ -59,25 +59,25 @@ type RangeSlider () =
5959
[<Optional;DefaultParameterValue(null)>] ?BorderColor: Color,
6060
[<Optional;DefaultParameterValue(null)>] ?BorderWidth: float,
6161
[<Optional;DefaultParameterValue(null)>] ?AutoRange : bool,
62-
[<Optional;DefaultParameterValue(null)>] ?Range: seq<#IConvertible>,
62+
[<Optional;DefaultParameterValue(null)>] ?Range: StyleParam.Range,
6363
[<Optional;DefaultParameterValue(null)>] ?Thickness: float,
6464
[<Optional;DefaultParameterValue(null)>] ?Visible: bool,
65-
[<Optional;DefaultParameterValue(null)>] ?YAxisRangeMode: StyleParam.RangeMode,
66-
[<Optional;DefaultParameterValue(null)>] ?YAxisRange: seq<#IConvertible>
65+
[<Optional;DefaultParameterValue(null)>] ?YAxisRangeMode: StyleParam.RangesliderRangeMode,
66+
[<Optional;DefaultParameterValue(null)>] ?YAxisRange: StyleParam.Range
6767
) =
6868
fun (rangeslider : RangeSlider) ->
6969
BgColor |> DynObj.setValueOpt rangeslider "bgcolor"
70-
BorderColor |> DynObj.setValueOpt rangeslider "BorderColor"
71-
BorderWidth |> DynObj.setValueOpt rangeslider "BorderWidth"
72-
AutoRange |> DynObj.setValueOpt rangeslider "AutoRange"
73-
Range |> DynObj.setValueOpt rangeslider "range"
70+
BorderColor |> DynObj.setValueOpt rangeslider "bordercolor"
71+
BorderWidth |> DynObj.setValueOpt rangeslider "borderwidth"
72+
AutoRange |> DynObj.setValueOpt rangeslider "autorange"
73+
Range |> DynObj.setValueOptBy rangeslider "range" StyleParam.Range.convert
7474
Thickness |> DynObj.setValueOpt rangeslider "thickness"
7575
Visible |> DynObj.setValueOpt rangeslider "visible"
7676

7777
let yAxis =
7878
let tmp = DynamicObj()
79-
YAxisRangeMode |> DynObj.setValueOpt tmp "rangemode"
80-
YAxisRange |> DynObj.setValueOpt tmp "range"
79+
YAxisRangeMode |> DynObj.setValueOptBy tmp "rangemode" StyleParam.RangesliderRangeMode.convert
80+
YAxisRange |> DynObj.setValueOptBy tmp "range" StyleParam.Range.convert
8181
tmp
8282

8383
yAxis |> DynObj.setValue rangeslider "yaxis"

0 commit comments

Comments
 (0)