Fix global injection in legacy mode (#238)

giraud · Jul 1, 2021 · b632415 · b632415
1 parent 003c861
commit b632415
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/bs-css-emotion/src/Css.res b/bs-css-emotion/src/Css.res
@@ -12,8 +12,10 @@ include Css_Legacy_Core.Make({
   @module("@emotion/css")
   external injectRawRules: (. Js.Json.t) => unit = "injectGlobal"
 
-  let injectRules = (. _: string, rules) => injectRawRules(. rules)
-  let renderRules = (. _, _: string, rules) => injectRawRules(. rules)
+  let injectRules = (. selector: string, rules) =>
+    injectRawRules(. Js.Dict.fromArray([(selector, rules)])->Js.Json.object_)
+  let renderRules = (. _, selector, rules) =>
+    injectRawRules(. Js.Dict.fromArray([(selector, rules)])->Js.Json.object_)
 
   @module("@emotion/css")
   external mergeStyles: (. array<styleEncoding>) => styleEncoding = "cx"

diff --git a/bs-css/src/Css_Legacy_Core.re b/bs-css/src/Css_Legacy_Core.re
@@ -69,7 +69,7 @@ module Make =
   let renderRule = (renderer, css) => CssImpl.renderRaw(. renderer, css);
 
   let global = (selector, rules) =>
-    CssImpl.injectRaw(. selector ++ " " ++ toJson(rules)->Js.Json.stringify);
+    CssImpl.injectRules(. selector, toJson(rules));
   let renderGlobal =
     (. renderer, selector, rules) =>
       CssImpl.renderRules(. renderer, selector, toJson(rules));
@@ -148,7 +148,7 @@ module Converter = {
     | #Length.t as l => Length.toString(l)
     | #Var.t as va => Var.toString(va)
     | #Cascading.t as c => Cascading.toString(c);
-    
+
   let string_of_row_gap =
     fun
     | #RowGap.t as rg => RowGap.toString(rg)