Merge branch 'dev' into #266-title-alignment

Author: bvenn

src/Plotly.NET.ImageExport/Plotly.NET.ImageExport.fsproj

@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DynamicObj" Version="0.2.0" />
+    <PackageReference Include="DynamicObj" Version="1.0.1" />
     <PackageReference Include="PuppeteerSharp" Version="6.0.0" />
   </ItemGroup>
 

src/Plotly.NET/CSharpLayer/GenericChartExtensions.fs

@@ -606,7 +606,7 @@ module GenericChartExtensions =
         [<Extension>]
         member this.WithLayoutGrid(layoutGrid: LayoutGrid) =
             let layout =
-                GenericChart.getLayout this |> Layout.SetLayoutGrid layoutGrid
+                GenericChart.getLayout this |> Layout.setLayoutGrid layoutGrid
 
             GenericChart.setLayout layout this
 
@@ -831,7 +831,7 @@ module GenericChartExtensions =
                 ) in
 
             let updatedLayout =
-                layout |> Layout.SetLayoutGrid updatedGrid in
+                layout |> Layout.setLayoutGrid updatedGrid in
 
             GenericChart.setLayout updatedLayout this
 

src/Plotly.NET/ChartAPI/Chart.fs

@@ -1,6 +1,6 @@
 namespace Plotly.NET
 
-
+open System
 // https://plot.ly/javascript/reference/
 // https://plot.ly/javascript-graphing-library/reference/
 
@@ -166,6 +166,7 @@ module StyleParam =
     type SubPlotId =
         | XAxis of int
         | YAxis of int
+        | ZAxis
         | ColorAxis of int
         | Geo of int
         | Mapbox of int
@@ -186,6 +187,7 @@ module StyleParam =
                     "yaxis"
                 else
                     sprintf "yaxis%i" id
+            | ZAxis -> "zaxis"
             | ColorAxis id ->
                 if id < 2 then
                     "coloraxis"
@@ -2258,8 +2260,14 @@ module StyleParam =
     /// Defines a Range between min and max value
     [<RequireQualifiedAccess>]
     type Range =
-        | MinMax of float * float
-        | Values of array<float>
+        | MinMax of IConvertible * IConvertible
+        | Values of array<IConvertible>
+
+        static member ofMinMax(min: #IConvertible, max: #IConvertible) =
+            MinMax(min :> IConvertible, max :> IConvertible)
+
+        static member ofValues(values: seq<#IConvertible>) =
+            Values(values |> Array.ofSeq |> Array.map (fun x -> x :> IConvertible))
 
         static member convert =
             function
@@ -3132,6 +3140,20 @@ module StyleParam =
         override this.ToString() = this |> TraceItemClickOptions.toString
         member this.Convert() = this |> TraceItemClickOptions.convert
 
+    [<RequireQualifiedAccess>]
+    type TraceGroupClickOptions =
+        | ToggleItem
+        | ToggleGroup
+
+        static member toString =
+            function
+            | Toggle -> "toggleitem"
+            | ToggleGroup -> "togglegroup"
+
+        static member convert = TraceGroupClickOptions.toString >> box
+        override this.ToString() = this |> TraceGroupClickOptions.toString
+        member this.Convert() = this |> TraceGroupClickOptions.convert
+
     [<RequireQualifiedAccess>]
     type TickLabelMode =
         | Instant

src/Plotly.NET/CommonAbstractions/StyleParams.fs

@@ -102,3 +102,64 @@ type Scene() =
             ZAxis |> DynObj.setValueOpt scene "zaxis"
 
             scene)
+
+    /// <summary>
+    /// Returns Some(dynamic member value) of the trace object's underlying DynamicObj when a dynamic member eith the given name exists, and None otherwise.
+    /// </summary>
+    /// <param name="propName">The name of the dynamic member to get the value of</param>
+    /// <param name="scene">The trace to get the dynamic member value from</param>
+    static member tryGetTypedMember<'T> (propName: string) (scene: Scene) = scene.TryGetTypedValue<'T>(propName)
+
+    /// <summary>
+    /// Returns the x axis object of the given trace.
+    ///
+    /// If there is no x axis set, returns an empty LinearAxis object.
+    /// </summary>
+    /// <param name="scene">The scene to get the marker from</param>
+    static member getXAxis(scene: Scene) =
+        scene |> Scene.tryGetTypedMember<LinearAxis> "xaxis" |> Option.defaultValue (LinearAxis.init ())
+
+    /// <summary>
+    /// Returns a function that sets the x axis object of the given trace.
+    /// </summary>
+    /// <param name="xAxis">The new x axis object</param>
+    static member setXAxis(xAxis: LinearAxis) =
+        (fun (scene: Scene) ->
+            scene.SetValue("xaxis", xAxis)
+            scene)
+
+    /// <summary>
+    /// Returns the y axis object of the given trace.
+    ///
+    /// If there is no y axis set, returns an empty LinearAxis object.
+    /// </summary>
+    /// <param name="scene">The scene to get the marker from</param>
+    static member getYAxis(scene: Scene) =
+        scene |> Scene.tryGetTypedMember<LinearAxis> "yaxis" |> Option.defaultValue (LinearAxis.init ())
+
+    /// <summary>
+    /// Returns a function that sets the y axis object of the given trace.
+    /// </summary>
+    /// <param name="yAxis">The new y axis object</param>
+    static member setYAxis(yAxis: LinearAxis) =
+        (fun (scene: Scene) ->
+            scene.SetValue("yaxis", yAxis)
+            scene)
+
+    /// <summary>
+    /// Returns the z axis object of the given trace.
+    ///
+    /// If there is no z axis set, returns an empty LinearAxis object.
+    /// </summary>
+    /// <param name="scene">The scene to get the marker from</param>
+    static member getZAxis(scene: Scene) =
+        scene |> Scene.tryGetTypedMember<LinearAxis> "zaxis" |> Option.defaultValue (LinearAxis.init ())
+
+    /// <summary>
+    /// Returns a function that sets the z axis object of the given trace.
+    /// </summary>
+    /// <param name="zAxis">The new z axis object</param>
+    static member setZAxis(zAxis: LinearAxis) =
+        (fun (scene: Scene) ->
+            scene.SetValue("zaxis", zAxis)
+            scene)