Switched the Custom to use tuple parames. Merged remote-tracking bran…

…ch 'upstream/master' @ Conflicts: @ src/Fable.React/Fable.Helpers.React.fs
EdouardM · Feb 6, 2018 · cc94bb3 · cc94bb3
2 parents 18f97e8 + 084ec4c
commit cc94bb3
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/src/Fable.React/Fable.Helpers.React.fs b/src/Fable.React/Fable.Helpers.React.fs
@@ -5,9 +5,6 @@ open Fable.Core.JsInterop
 open Fable.Import
 
 module Props =
-    type ICSSProp =
-        interface end
-
     type IProp =
         interface end
 
@@ -245,12 +242,6 @@ module Props =
         | Unselectable of bool
         interface IHTMLProp
 
-    let inline Style (css: ICSSProp list): HTMLAttr =
-        !!("style", keyValueList CaseRules.LowerFirst css)
-
-    let inline Data(key: string, value: obj): IHTMLProp =
-        !!("data-" + key, value)
-
     type SVGAttr =
         | ClipPath of string
         | Cx of obj
@@ -717,9 +708,14 @@ module Props =
         | WritingMode of obj
         | ZIndex of obj
         | Zoom of obj
-        interface ICSSProp
-        /// If you are searching for a way to provide a value not supported by this DSL then use something like: CSSProp.Custom "align-content" "center"
-        static member inline Custom (key: string) (value: obj) : ICSSProp = !!(key, value)
+        /// If you are searching for a way to provide a value not supported by this DSL then use something like: CSSProp.Custom ("align-content", "center")
+        static member inline Custom (key: string, value: obj) : CSSProp = !!(key, value)
+
+    let inline Style (css: CSSProp list): HTMLAttr =
+        !!("style", keyValueList CaseRules.LowerFirst css)
+
+    let inline Data(key: string, value: obj): IHTMLProp =
+        !!("data-" + key, value)
 
 open Props
 open Fable.Import.React