Add temporary hard fix for #45 (hard code combin for some members that are collections)

Author: kMutagene

src/Plotly.NET/ChartAPI/GenericChart.fs

@@ -212,16 +212,85 @@ module GenericChart =
     //         let l' = getLayouts gChart
     //         MultiChart (traces, Some (layouts@l'))
 
+    open Plotly.NET.LayoutObjects
     // Combines two GenericChart
+
     let combine(gCharts:seq<GenericChart>) =
+        // temporary hard fix for some props, see https://github.com/CSBiology/DynamicObj/issues/11
+        let combineOptSeqs (first:seq<'A> option) (second:seq<'A> option) =
+            match first, second with
+            | Some f, Some s -> Some (Seq.append f s)
+            | Some f, None -> Some f
+            | None, Some s -> Some s
+            | _ -> None
         let combineLayouts (first:Layout) (second:Layout) =
-            DynObj.combine first second |> unbox
+
+            let annotations = 
+                combineOptSeqs 
+                    (first.TryGetTypedValue<seq<Annotation>>("annotations"))
+                    (second.TryGetTypedValue<seq<Annotation>>("annotations"))
+
+            let shapes = 
+                combineOptSeqs
+                    (first.TryGetTypedValue<seq<Shape>>("shapes"))
+                    (second.TryGetTypedValue<seq<Shape>>("shapes"))
+
+            let images = 
+                combineOptSeqs
+                    (first.TryGetTypedValue<seq<LayoutImage>>("images"))
+                    (second.TryGetTypedValue<seq<LayoutImage>>("images"))
+
+            let sliders = 
+                combineOptSeqs
+                    (first.TryGetTypedValue<seq<Slider>>("sliders"))
+                    (second.TryGetTypedValue<seq<Slider>>("sliders"))
+
+            let hiddenLabels = 
+                combineOptSeqs
+                    (first.TryGetTypedValue<seq<string>>("hiddenlabels"))
+                    (second.TryGetTypedValue<seq<string>>("hiddenlabels"))
+
+            DynObj.combine first second 
+            |> unbox
+            |> Layout.style(
+                ?Annotations = annotations,
+                ?Shapes = shapes,
+                ?Images = images,
+                ?Sliders = sliders,
+                ?HiddenLabels = hiddenLabels
+            )
 
         let combineConfigs (first:Config) (second:Config) =
-            DynObj.combine first second |> unbox
+
+            let editableAnnotations = 
+                combineOptSeqs 
+                    (first.TryGetTypedValue<seq<StyleParam.AnnotationEditOptions>>("editable"))
+                    (second.TryGetTypedValue<seq<StyleParam.AnnotationEditOptions>>("editable"))
+
+            let modeBarButtonsToAdd = 
+                combineOptSeqs
+                    (first.TryGetTypedValue<seq<StyleParam.ModeBarButton>>("modeBarButtonsToAdd"))
+                    (second.TryGetTypedValue<seq<StyleParam.ModeBarButton>>("modeBarButtonsToAdd"))
+
+            DynObj.combine first second 
+            |> unbox
+            |> Config.style(
+                ?EditableAnnotations = editableAnnotations,
+                ?ModeBarButtonsToAdd = modeBarButtonsToAdd
+            )
 
         let combineDisplayOptions (first:DisplayOptions) (second:DisplayOptions) =
-            DynObj.combine first second |> unbox
+
+            let additionalHeadTags =
+                combineOptSeqs 
+                    (first.TryGetTypedValue<seq<string>>("AdditionalHeadTags"))
+                    (second.TryGetTypedValue<seq<string>>("AdditionalHeadTags"))
+
+            DynObj.combine first second 
+            |> unbox
+            |> DisplayOptions.style(
+                ?AdditionalHeadTags = additionalHeadTags
+            )
 
         gCharts
         |> Seq.reduce (fun acc elem ->

tests/Plotly.NET.Tests/ChartAPIs/Combine.fs

@@ -0,0 +1,76 @@
+module Tests.ChartAPIs.Combine
+
+open Expecto
+open Plotly.NET
+open Plotly.NET.LayoutObjects
+open Plotly.NET.TraceObjects
+open Plotly.NET.GenericChart
+open Newtonsoft.Json
+
+let testAnnotations1 = [Annotation.init(Text = "test")]
+let testAnnotations2 = [Annotation.init(Text = "another one")]
+
+let testShapes1 = [Shape.init(X0 = 42)]
+let testShapes2 = [Shape.init(X0 = 69)]
+
+let testImages1 = [LayoutImage.init(Name = "image1")]
+let testImages2 = [LayoutImage.init(Name = "image2")]
+
+let testSliders1 = [Slider.init(X = 1337)]
+let testSliders2 = [Slider.init(X = 5002)]
+
+let testHiddenLabels1 = ["first"]
+let testHiddenLabels2 = ["second"]
+
+let chart1 = 
+    Chart.Invisible()
+    |> Chart.withLayout(
+        Layout.init(
+            Annotations    = testAnnotations1,
+            Shapes         = testShapes1,
+            Images         = testImages1,
+            Sliders        = testSliders1,
+            HiddenLabels   = testHiddenLabels1
+        )
+    )
+
+let chart2 = 
+    Chart.Invisible()
+    |> Chart.withLayout(
+        Layout.init(
+            Annotations    = testAnnotations2,
+            Shapes         = testShapes2,
+            Images         = testImages2,
+            Sliders        = testSliders2,
+            HiddenLabels   = testHiddenLabels2
+        )
+    )
+
+let combined = Chart.combine [chart1; chart2]
+
+[<Tests>]
+let ``Chart.Combine layouts tests`` =
+    testList "ChartAPIs.Combine" [
+        testList "Combine Layouts" [
+            testCase "should combine annotations" (fun _ ->
+                let actual = combined |> GenericChart.getLayout |> fun l -> l?annotations |> unbox<seq<Annotation>>
+                Expect.sequenceEqual actual (Seq.append testAnnotations1 testAnnotations2) "combined chart layout did not contain correct annotations"
+            )          
+            testCase "should combine shapes" (fun _ ->
+                let actual = combined |> GenericChart.getLayout |> fun l -> l?shapes |> unbox<seq<Shape>>
+                Expect.sequenceEqual actual (Seq.append testShapes1 testShapes2) "combined chart layout did not contain correct shapes"
+            )         
+            testCase "should combine images" (fun _ ->
+                let actual = combined |> GenericChart.getLayout |> fun l -> l?images |> unbox<seq<LayoutImage>>
+                Expect.sequenceEqual actual (Seq.append testImages1 testImages2) "combined chart layout did not contain correct images"
+            )          
+            testCase "should combine sliders" (fun _ ->
+                let actual = combined |> GenericChart.getLayout |> fun l -> l?sliders |> unbox<seq<Slider>>
+                Expect.sequenceEqual actual (Seq.append testSliders1 testSliders2) "combined chart layout did not contain correct sliders"
+            )          
+            testCase "should combine hidden labels" (fun _ ->
+                let actual = combined |> GenericChart.getLayout |> fun l -> l?hiddenlabels |> unbox<seq<string>>
+                Expect.sequenceEqual actual (Seq.append testHiddenLabels1 testHiddenLabels2) "combined chart layout did not contain correct hidden labels"
+            )  
+        ]
+    ]

tests/Plotly.NET.Tests/Plotly.NET.Tests.fsproj

@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <Compile Include="TestUtils.fs" />
+    <Compile Include="ChartAPIs\Combine.fs" />
     <Compile Include="CommonAbstractions\Colors.fs" />
     <Compile Include="LayoutObjects\Slider.fs" />
     <Compile Include="LayoutObjects\LinearAxis.fs" />