Inline Var and Cascading in all properties

davesnx · Jul 11, 2024 · e70349e · e70349e
1 parent 20c0b82
commit e70349e
Show file tree

Hide file tree

Showing 8 changed files with 954 additions and 884 deletions.
diff --git a/packages/ppx/test/native/Static_test.re b/packages/ppx/test/native/Static_test.re
@@ -418,11 +418,7 @@ let properties_static_css_tests = [
     [%expr [%css "background-color: color-mix(in srgb, white, red)"]],
     [%expr
       CSS.backgroundColor(
-        `colorMix((
-          `srgb,
-          (CSS.white, None),
-          (CSS.red, None),
-        )),
+        `colorMix((`srgb, (CSS.white, None), (CSS.red, None))),
       )
     ],
   ),

diff --git a/packages/runtime/melange/CSS.ml b/packages/runtime/melange/CSS.ml
@@ -1,4 +1,4 @@
-include Properties
+include Declarations
 include Colors
 include Alias
 include Rule

diff --git a/packages/runtime/melange/Emotion_bindings.ml b/packages/runtime/melange/Emotion_bindings.ml
@@ -53,11 +53,11 @@ let fontFace ~fontFamily ~src ?fontStyle ?fontWeight ?fontDisplay ?sizeAdjust ()
     =
   let fontFace =
     [|
-      Kloth.Option.map ~f:Properties.fontStyle fontStyle;
-      Kloth.Option.map ~f:Properties.fontWeight fontWeight;
-      Kloth.Option.map ~f:Properties.fontDisplay fontDisplay;
-      Kloth.Option.map ~f:Properties.sizeAdjust sizeAdjust;
-      Some (Properties.fontFamily fontFamily);
+      Kloth.Option.map ~f:Declarations.fontStyle fontStyle;
+      Kloth.Option.map ~f:Declarations.fontWeight fontWeight;
+      Kloth.Option.map ~f:Declarations.fontDisplay fontDisplay;
+      Kloth.Option.map ~f:Declarations.sizeAdjust sizeAdjust;
+      Some (Declarations.fontFamily fontFamily);
       Some
         (Rule.Declaration
            ( "src",

diff --git a/packages/runtime/native/CSS.ml b/packages/runtime/native/CSS.ml
@@ -1,4 +1,4 @@
-include Properties
+include Declarations
 include Colors
 include Alias
 include Rule
@@ -484,11 +484,11 @@ let fontFace ~fontFamily ~src ?fontStyle ?fontWeight ?fontDisplay ?sizeAdjust ()
     =
   let fontFace =
     [|
-      Kloth.Option.map ~f:Properties.fontStyle fontStyle;
-      Kloth.Option.map ~f:Properties.fontWeight fontWeight;
-      Kloth.Option.map ~f:Properties.fontDisplay fontDisplay;
-      Kloth.Option.map ~f:Properties.sizeAdjust sizeAdjust;
-      Some (Properties.fontFamily fontFamily);
+      Kloth.Option.map ~f:Declarations.fontStyle fontStyle;
+      Kloth.Option.map ~f:Declarations.fontWeight fontWeight;
+      Kloth.Option.map ~f:Declarations.fontDisplay fontDisplay;
+      Kloth.Option.map ~f:Declarations.sizeAdjust sizeAdjust;
+      Some (Declarations.fontFamily fontFamily);
       Some
         (Rule.Declaration
            ( "src",

diff --git a/packages/runtime/native/shared/Alias.ml b/packages/runtime/native/shared/Alias.ml
@@ -251,9 +251,11 @@ module Shadow = struct
 end
 
 module Animation = struct
-  let shorthand = Css_types.Animation.shorthand
+  (* backwards compatibility *)
+  let shorthand = Css_types.Animation.make
 end
 
 module Transition = struct
-  let shorthand = Css_types.Transition.shorthand
+  (* backwards compatibility *)
+  let shorthand = Css_types.Transition.make
 end