Adding tests for fill-opacity.

ocsigen · Nov 30, 2023 · 5e18fc5 · 5e18fc5
1 parent 925474c
commit 5e18fc5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/syntax/attribute_value.ml b/syntax/attribute_value.ml
@@ -502,7 +502,8 @@ let fill_opacity =
           if group_matched 2 s then (n /. 100.)
           else n in
 
-        if v >= 0. && v <= 1. then Some [%expr [%e v]]
+        if v >= 0. && v <= 1. then
+          Some [%expr [%e (Common.float loc @@ v)]]
         else
           Common.error loc "Value of %s must be between 0 and 1." name
 

diff --git a/test/test_jsx.re b/test/test_jsx.re
@@ -331,6 +331,16 @@ let svg = (
           ),
         ],
       ),
+      (
+        "fill_opacity float, circle",
+        [<circle cx=1 cy=2 r=3 fill-opacity=0.5 />],
+        [circle(~a=[a_cx (1., None); a_cy (2., None); a_r (3., None); a_fill_opacity 0.5], [])],
+      ),
+      (
+        "fill_opacity percentage, rect",
+        [<rect x=1 y='2' width=3 height='4' fill-opacity='50%' />],
+        [rect(~a=[a_cx (1., None); a_cy (2., None); a_width (3., None); a_height (4., None); a_fill_opacity 0.5], [])],
+      ),
       (
         "fill_rule nonzero",
         [<path fill_rule="nonzero" />],

diff --git a/test/test_ppx.ml b/test/test_ppx.ml
@@ -416,9 +416,13 @@ let svg = "svg", SvgTests.make Svg.[
   [[%svg "<animate fill='freeze' values='1 2'/>"]],
   [animate ~a:[a_animation_fill `Freeze; a_animation_values ["1"; "2"]] []] ;
 
-  "fill_opacity, circle",
-  [[%svg "<circle cx=50 cy=50 r=50 fill-opacity=0.5 />"]],
-  [rect ~a:[a_cx (50., None); a_cy (50., None); a_r (50., None); a_fill_opacity 0.5] []] ;
+  "fill_opacity float, circle",
+  [[%svg "<circle cx=1 cy=2 r=3 fill-opacity=0.5 />"]],
+  [circle ~a:[a_cx (1., None); a_cy (2., None); a_r (3., None); a_fill_opacity 0.5] []] ;
+
+  "fill_opacity percentage, rect",
+  [[%svg "<rect x=1 y='2' width=3 height='4' fill-opacity='50%' />"]],
+  [rect ~a:[a_cx (1., None); a_cy (2., None); a_width (3., None); a_height (4., None); a_fill_opacity 0.5] []] ;
 
   "fill_rule type nonzero",
   [[%svg "<path fill-rule='nonzero'/>"]],