Csharp -- Some bugfixes and improvements to the interop layer (mainly related to callbacks)

Dash.NET.CSharp/Callback.fs

@@ -1,6 +1,7 @@
 namespace Dash.NET.CSharp
 
 open System.Runtime.InteropServices
+open Dash.NET.CSharp.DCC
 
 
 type Dependency = System.ValueTuple<string, ComponentProperty>
@@ -9,6 +10,30 @@ type internal Helpers =
     static member internal ConvertDependency ((id, prop) : System.ValueTuple<string, ComponentProperty>) = Dash.NET.Dependency.create (id, prop |> ComponentProperty.Unwrap)
 
 type CallbackResult = internal WrappedCallbackResult of Dash.NET.CallbackResultBinding with
+    //static member Create(target : Dependency, results : obj array) =
+    //    {
+    //        Dash.NET.CallbackResultBinding.Target = target |> Helpers.ConvertDependency
+    //        Dash.NET.CallbackResultBinding.BoxedResult =
+    //            [
+    //                for result in results do
+    //                    match result with
+    //                    | :? IUnwrap as result -> result.Unwrap()
+    //                    | _ -> result
+    //            ]
+    //            |> box
+    //    }
+    //    |> WrappedCallbackResult
+
+    //static member Create(target : Dependency, result : obj) =
+    //    {
+    //        Dash.NET.CallbackResultBinding.Target = target |> Helpers.ConvertDependency
+    //        Dash.NET.CallbackResultBinding.BoxedResult =
+    //            match result with
+    //            | :? IUnwrap as result -> result.Unwrap() |> box
+    //            | _ -> result |> box
+    //    }
+    //    |> WrappedCallbackResult
+
     static member Create<'a>(target : Dependency, result : 'a) =
         {
             Dash.NET.CallbackResultBinding.Target = target |> Helpers.ConvertDependency

Dash.NET.CSharp/ComponentPropTypes.fs

@@ -4,6 +4,9 @@ open System
 open System.Runtime.InteropServices
 
 
+type IUnwrap =
+    abstract Unwrap: unit -> obj
+
 //module ComponentPropTypes =
 
 type InputType = private WrappedInputType of Dash.NET.ComponentPropTypes.InputType with
@@ -38,11 +41,25 @@ type InputMode = private WrappedInputMode of Dash.NET.ComponentPropTypes.InputMo
 
 // SpellCheckOptions can be exposed as a bool
 
-type LoadingState = private WrappedLoadingState of Dash.NET.ComponentPropTypes.LoadingState with
-    static member internal Convert (v : LoadingState) : Dash.NET.ComponentPropTypes.LoadingState = match v with WrappedLoadingState v -> v
-    static member Init (isLoading : bool, [<Optional>] propName : string, [<Optional>] componentName : string) =
+//type LoadingState = private WrappedLoadingState of Dash.NET.ComponentPropTypes.LoadingState with
+//    static member internal Unwrap (v : LoadingState) : Dash.NET.ComponentPropTypes.LoadingState = match v with WrappedLoadingState v -> v
+//    static member Init (isLoading : bool, [<Optional>] propName : string, [<Optional>] componentName : string) =
+//        guardAgainstNull "isLoading" isLoading
+//        Dash.NET.ComponentPropTypes.LoadingState.init (isLoading, ?propName = Option.ofObj propName, ?componentName = Option.ofObj componentName) |> WrappedLoadingState
+
+[<CLIMutable>] 
+type LoadingState =
+    {
+        isLoading: bool
+        propName: string
+        componentName: string
+    }
+    static member Unwrap  (v : LoadingState) : Dash.NET.ComponentPropTypes.LoadingState = Dash.NET.ComponentPropTypes.LoadingState.init (v.isLoading, ?propName = Option.ofObj v.propName, ?componentName = Option.ofObj v.componentName)
+
+module LoadingState =
+    let Init (isLoading: bool, [<Optional>] propName: string, [<Optional>] componentName: string) : LoadingState =
         guardAgainstNull "isLoading" isLoading
-        Dash.NET.ComponentPropTypes.LoadingState.init (isLoading, ?propName = Option.ofObj propName, ?componentName = Option.ofObj componentName) |> WrappedLoadingState
+        { isLoading = isLoading; propName = propName; componentName = componentName }
 
 
 type PersistenceTypeOptions = private WrappedPersistenceTypeOptions of Dash.NET.ComponentPropTypes.PersistenceTypeOptions with
@@ -53,28 +70,96 @@ type PersistenceTypeOptions = private WrappedPersistenceTypeOptions of Dash.NET.
     static member Session () = Dash.NET.ComponentPropTypes.PersistenceTypeOptions.Session |> PersistenceTypeOptions.Wrap
     static member Memory () = Dash.NET.ComponentPropTypes.PersistenceTypeOptions.Memory |> PersistenceTypeOptions.Wrap
 
-type DropdownOption = private WrappedDropdownOption of Dash.NET.ComponentPropTypes.DropdownOption with
-    static member internal Convert (v : DropdownOption) = match v with WrappedDropdownOption v -> v
-    static member Init (label : IConvertible, value : IConvertible, [<Optional>] disabled : Nullable<bool>, [<Optional>] title : string) =
+//type DropdownOption = private WrappedDropdownOption of Dash.NET.ComponentPropTypes.DropdownOption with
+//    static member internal Unwrap (v : DropdownOption) = match v with WrappedDropdownOption v -> v
+//    static member Init (label : IConvertible, value : IConvertible, [<Optional>] disabled : Nullable<bool>, [<Optional>] title : string) =
+//        guardAgainstNull "label" label
+//        guardAgainstNull "value" value
+//        Dash.NET.ComponentPropTypes.DropdownOption.init (label, value, ?disabled = Option.ofNullable disabled, ?title = Option.ofObj title) |> WrappedDropdownOption
+
+[<CLIMutable>] 
+type DropdownOption<'a, 'b when 'a :> IConvertible and 'b :> IConvertible> =
+    {
+        label: 'a
+        value: 'b
+        disabled: Nullable<bool>
+        title: string
+    }
+    static member Unwrap  (v : DropdownOption<'a, 'b>) : Dash.NET.ComponentPropTypes.DropdownOption = Dash.NET.ComponentPropTypes.DropdownOption.init (v.label, v.value, ?disabled = Option.ofNullable v.disabled, ?title = Option.ofObj v.title)
+
+module DropdownOption =
+    let Init<'a, 'b when 'a :> IConvertible and 'b :> IConvertible> (label:'a, value:'b, [<Optional>] disabled: Nullable<bool>, [<Optional>] title: string) : DropdownOption<'a, 'b> =
         guardAgainstNull "label" label
         guardAgainstNull "value" value
-        Dash.NET.ComponentPropTypes.DropdownOption.init (label, value, ?disabled = Option.ofNullable disabled, ?title = Option.ofObj title) |> WrappedDropdownOption
+        { label = label; value = value; disabled = disabled; title = title }
+
+//type RadioItemsOption = private WrappedRadioItemsOption of Dash.NET.ComponentPropTypes.RadioItemsOption with
+//    static member Unwrap (v : RadioItemsOption) : Dash.NET.ComponentPropTypes.RadioItemsOption = match v with WrappedRadioItemsOption v -> v
+//    static member Init (label : IConvertible, value : IConvertible, [<Optional>] disabled : Nullable<bool>) =
+//        guardAgainstNull "label" label
+//        guardAgainstNull "value" value
+//        Dash.NET.ComponentPropTypes.RadioItemsOption.init (label, value, ?disabled = Option.ofNullable disabled) |> WrappedRadioItemsOption
+//    interface IUnwrap with
+//        member x.Unwrap () = RadioItemsOption.Unwrap x |> box
+
+open DynamicObj
+
+[<CLIMutable>] 
+type RadioItemsOption<'a, 'b when 'a :> IConvertible and 'b :> IConvertible> =
+    {
+        label : 'a
+        value : 'b
+        disabled : Nullable<bool>
+    }
+    with
+    //static member Init(label:'a, value:'b, [<Optional>]disabled:Nullable<bool>) = { label = label; value = value; disabled = disabled}
+    static member Unwrap  (v : RadioItemsOption<'a, 'b>) : Dash.NET.ComponentPropTypes.RadioItemsOption = Dash.NET.ComponentPropTypes.RadioItemsOption.init (v.label, v.value, ?disabled = Option.ofNullable v.disabled)
 
-type RadioItemsOption = private WrappedRadioItemsOption of Dash.NET.ComponentPropTypes.RadioItemsOption with
-    static member internal Convert (v : RadioItemsOption) : Dash.NET.ComponentPropTypes.RadioItemsOption = match v with WrappedRadioItemsOption v -> v
-    static member Init (label : IConvertible, value : IConvertible, [<Optional>] disabled : Nullable<bool>) =
+module RadioItemsOption =
+    let Init<'a, 'b when 'a :> IConvertible and 'b :> IConvertible> (label: 'a, value: 'b, [<Optional>] disabled: Nullable<bool>) : RadioItemsOption<'a, 'b> =
         guardAgainstNull "label" label
         guardAgainstNull "value" value
-        Dash.NET.ComponentPropTypes.RadioItemsOption.init (label, value, ?disabled = Option.ofNullable disabled) |> WrappedRadioItemsOption
+        { label = label; value = value; disabled = disabled }
+
 
-type TabColors = private WrappedTabColors of Dash.NET.ComponentPropTypes.TabColors with
-    static member internal Convert (v : TabColors) : Dash.NET.ComponentPropTypes.TabColors = match v with WrappedTabColors v -> v
-    static member Init ([<Optional>] border : string, [<Optional>] primary : string, [<Optional>] background : string) =
-        Dash.NET.ComponentPropTypes.TabColors.init (?border = Option.ofObj border, ?primary = Option.ofObj primary, ?background = Option.ofObj background) |> WrappedTabColors
-
-type ChecklistOption = private WrappedChecklistOption of Dash.NET.ComponentPropTypes.ChecklistOption with
-    static member internal Convert (v : ChecklistOption) : Dash.NET.ComponentPropTypes.ChecklistOption = match v with WrappedChecklistOption v -> v
-    static member Init (label : IConvertible, value : IConvertible, [<Optional>] disabled : Nullable<bool>) =
+//type TabColors = private WrappedTabColors of Dash.NET.ComponentPropTypes.TabColors with
+//    static member internal Unwrap (v : TabColors) : Dash.NET.ComponentPropTypes.TabColors = match v with WrappedTabColors v -> v
+//    static member Init ([<Optional>] border : string, [<Optional>] primary : string, [<Optional>] background : string) =
+//        Dash.NET.ComponentPropTypes.TabColors.init (?border = Option.ofObj border, ?primary = Option.ofObj primary, ?background = Option.ofObj background) |> WrappedTabColors
+
+[<CLIMutable>] 
+type TabColors =
+    {
+        border: string
+        primary: string
+        background: string
+    }
+    static member Unwrap  (v : TabColors) : Dash.NET.ComponentPropTypes.TabColors = Dash.NET.ComponentPropTypes.TabColors.init (?border = Option.ofObj v.border, ?primary = Option.ofObj v.primary, ?background = Option.ofObj v.background)
+
+module TabColors =
+    let Init ([<Optional>] border: string, [<Optional>] primary: string, [<Optional>] background: string) : TabColors =
+        { border = border; primary = primary; background = background }
+
+
+//type ChecklistOption = private WrappedChecklistOption of Dash.NET.ComponentPropTypes.ChecklistOption with
+//    static member internal Unwrap (v : ChecklistOption) : Dash.NET.ComponentPropTypes.ChecklistOption = match v with WrappedChecklistOption v -> v
+//    static member Init (label : IConvertible, value : IConvertible, [<Optional>] disabled : Nullable<bool>) =
+//        guardAgainstNull "label" label
+//        guardAgainstNull "value" value
+//        Dash.NET.ComponentPropTypes.ChecklistOption.init (label, value, ?disabled = Option.ofNullable disabled) |> WrappedChecklistOption
+
+[<CLIMutable>] 
+type ChecklistOption<'a, 'b when 'a :> IConvertible and 'b :> IConvertible> =
+    {
+        label: 'a
+        value: 'b
+        disabled: Nullable<bool>
+        title: string
+    }
+    static member Unwrap  (v : ChecklistOption<'a, 'b>) : Dash.NET.ComponentPropTypes.ChecklistOption = Dash.NET.ComponentPropTypes.ChecklistOption.init (v.label, v.value, ?disabled = Option.ofNullable v.disabled)
+
+module ChecklistOption =
+    let Init<'a, 'b when 'a :> IConvertible and 'b :> IConvertible> (label:'a, value:'b, [<Optional>] disabled: Nullable<bool>, [<Optional>] title: string) : ChecklistOption<'a, 'b> =
         guardAgainstNull "label" label
         guardAgainstNull "value" value
-        Dash.NET.ComponentPropTypes.ChecklistOption.init (label, value, ?disabled = Option.ofNullable disabled) |> WrappedChecklistOption
+        { label = label; value = value; disabled = disabled; title = title }

Dash.NET.CSharp/CoreComponents/Checklist.fs

@@ -21,10 +21,10 @@ module Checklist =
         ///<summary>
         ///An array of options
         ///</summary>
-        static member options([<ParamArray>] p : ChecklistOption array) = 
+        static member options([<ParamArray>] p : ChecklistOption<'a,'b> array) = 
             guardAgainstNull "p" p
             p |> Array.iter (guardAgainstNull "p")
-            OAttr.options (p |> Array.map ChecklistOption.Convert) |> Attr.Wrap
+            OAttr.options (p |> Array.map ChecklistOption.Unwrap) |> Attr.Wrap
         ///<summary>
         ///The currently selected value
         ///</summary>
@@ -76,7 +76,7 @@ module Checklist =
         ///</summary>
         static member loadingState(p: LoadingState) = 
             guardAgainstNull "p" p
-            OAttr.loadingState (p |> LoadingState.Convert) |> Attr.Wrap
+            OAttr.loadingState (p |> LoadingState.Unwrap) |> Attr.Wrap
         ///<summary>
         ///Used to allow user interactions in this component to be persisted when
         ///the component - or the page - is refreshed. If &#96;persisted&#96; is truthy and
@@ -156,44 +156,44 @@ module Checklist =
     ///The values and labels of the checklist are specified in the &#96;options&#96;
     ///property and the checked items are specified with the &#96;value&#96; property.
     ///Each checkbox is rendered as an input with a surrounding label.
-    ///&#10;
+    ///<para>&#160;</para>
     ///Properties:
-    ///&#10;
+    ///<para>&#160;</para>
     ///• id (string) - The ID of this component, used to identify dash components
     ///in callbacks. The ID needs to be unique across all of the
     ///components in an app.
-    ///&#10;
+    ///<para>&#160;</para>
     ///• options (list with values of type: record with the fields: 'label: string | number (required)', 'value: string | number (required)', 'disabled: boolean (optional)'; default []) - An array of options
-    ///&#10;
+    ///<para>&#160;</para>
     ///• value (list with values of type: string | number; default []) - The currently selected value
-    ///&#10;
+    ///<para>&#160;</para>
     ///• className (string) - The class of the container (div)
-    ///&#10;
+    ///<para>&#160;</para>
     ///• style (record) - The style of the container (div)
-    ///&#10;
+    ///<para>&#160;</para>
     ///• inputStyle (record; default {}) - The style of the &lt;input&gt; checkbox element
-    ///&#10;
+    ///<para>&#160;</para>
     ///• inputClassName (string; default ) - The class of the &lt;input&gt; checkbox element
-    ///&#10;
+    ///<para>&#160;</para>
     ///• labelStyle (record; default {}) - The style of the &lt;label&gt; that wraps the checkbox input
     /// and the option's label
-    ///&#10;
+    ///<para>&#160;</para>
     ///• labelClassName (string; default ) - The class of the &lt;label&gt; that wraps the checkbox input
     /// and the option's label
-    ///&#10;
+    ///<para>&#160;</para>
     ///• loading_state (record with the fields: 'is_loading: boolean (optional)', 'prop_name: string (optional)', 'component_name: string (optional)') - Object that holds the loading state object coming from dash-renderer
-    ///&#10;
+    ///<para>&#160;</para>
     ///• persistence (boolean | string | number) - Used to allow user interactions in this component to be persisted when
     ///the component - or the page - is refreshed. If &#96;persisted&#96; is truthy and
     ///hasn't changed from its previous value, a &#96;value&#96; that the user has
     ///changed while using the app will keep that change, as long as
     ///the new &#96;value&#96; also matches what was given originally.
     ///Used in conjunction with &#96;persistence_type&#96;.
-    ///&#10;
+    ///<para>&#160;</para>
     ///• persisted_props (list with values of type: value equal to: 'value'; default ['value']) - Properties whose user interactions will persist after refreshing the
     ///component or the page. Since only &#96;value&#96; is allowed this prop can
     ///normally be ignored.
-    ///&#10;
+    ///<para>&#160;</para>
     ///• persistence_type (value equal to: 'local', 'session', 'memory'; default local) - Where persisted user changes will be stored:
     ///memory: only kept in memory, reset on page refresh.
     ///local: window.localStorage, data is kept after the browser quit.