feat(components): move font styling out of Style and use families

src/Font/FontFamily.re

@@ -0,0 +1,92 @@
+open FontManager;
+
+type t = (FontWeight.t, bool, bool) => string;
+
+type variantSolver =
+  (~fontWeight: FontWeight.t, ~italicized: bool, ~monospaced: bool, unit) =>
+  string;
+
+let fromFile =
+    (
+      ~variant:
+         option(
+           (
+             ~fontWeight: FontWeight.t,
+             ~italicized: bool,
+             ~monospaced: bool,
+             unit
+           ) =>
+           string,
+         )=?,
+      default: string,
+    )
+    : t =>
+  switch (variant) {
+  | None => ((_, _, _) => default)
+  | Some(solver) => (
+      (w, i, m) =>
+        switch (w, i, m) {
+        | (FontWeight.Normal, false, false) => default
+        | _ => solver(~fontWeight=w, ~italicized=i, ~monospaced=m, ())
+        }
+    )
+  };
+
+module FontFamilyHashable = {
+  type t = {
+    familyName: string,
+    weight: FontWeight.t,
+    italicized: bool,
+    monospaced: bool,
+  };
+
+  let equal = (a, b) =>
+    String.equal(a.familyName, b.familyName)
+    && a.weight == b.weight
+    && a.italicized == b.italicized
+    && a.monospaced == b.monospaced;
+
+  let hash = Hashtbl.hash;
+};
+
+module FontDescriptorWeight = {
+  type t = FontManager.FontDescriptor.t;
+  let weight = _ => 1;
+};
+
+module FontFamilyCache = Lru.M.Make(FontFamilyHashable, FontDescriptorWeight);
+
+let cache = FontFamilyCache.create(~initialSize=8, 64);
+
+let system = (familyName): t =>
+  (weight, italicized, monospaced) => {
+    let fontDescr: FontFamilyHashable.t = {
+      familyName,
+      weight,
+      italicized,
+      monospaced,
+    };
+    switch (FontFamilyCache.find(fontDescr, cache)) {
+    | Some(fd) =>
+      FontFamilyCache.promote(fontDescr, cache);
+      fd.path;
+    | None =>
+      let fd =
+        Discovery.find(
+          ~weight,
+          ~mono=monospaced,
+          ~italic=italicized,
+          familyName,
+        );
+      FontFamilyCache.add(fontDescr, fd, cache);
+      FontFamilyCache.trim(cache);
+      fd.path;
+    };
+  };
+
+let default =
+  switch (Revery_Core.Environment.os) {
+  | Linux => system("Liberation Sans")
+  | Mac => system("System Font")
+  | _ => system("Arial")
+  };

src/Font/FontFamily.rei

@@ -0,0 +1,20 @@
+open FontManager;
+
+type t;
+
+let fromFile:
+  (
+    ~variant: (
+                ~fontWeight: FontWeight.t,
+                ~italicized: bool,
+                ~monospaced: bool,
+                unit
+              ) =>
+              string
+                =?,
+    string
+  ) =>
+  t;
+let system: string => t;
+
+let default: t;

src/Font/Revery_Font.re

@@ -12,6 +12,7 @@ module FontCache = FontCache;
 module FontRenderer = FontRenderer;
 module ShapeResult = ShapeResult;
 module Smoothing = Smoothing;
+module Family = FontFamily;
 
 type t = FontCache.t;
 

src/UI/TextNode.re

@@ -15,6 +15,10 @@ class textNode (text: string) = {
   val mutable _isMeasured = false;
   val mutable _lines: list(string) = [];
   val mutable _smoothing = Smoothing.default;
+  val mutable _fontFamily = Family.default;
+  val mutable _fontWeight = Weight.Normal;
+  val mutable _italicized = false;
+  val mutable _monospaced = false;
   val _textPaint = {
     let paint = Skia.Paint.make();
     Skia.Paint.setTextEncoding(paint, GlyphId);
@@ -127,6 +131,10 @@ class textNode (text: string) = {
       _this#markLayoutDirty();
     };
   pub setSmoothing = smoothing => _smoothing = smoothing;
+  pub setFontFamily = fontFamily => _fontFamily = fontFamily;
+  pub setFontWeight = fontWeight => _fontWeight = fontWeight;
+  pub setItalicized = italicized => _italicized = italicized;
+  pub setMonospaced = monospaced => _monospaced = monospaced;
   pub measure = (width, _height) => {
     _isMeasured = true;
     /**

src/UI_Primitives/Text.re

@@ -1,4 +1,5 @@
 open Revery_UI;
+open Revery_Font;
 open Style;
 open React;
 
@@ -14,8 +15,12 @@ let%nativeComponent make =
                       ~onMouseOut=?,
                       ~ref=?,
                       ~style=emptyTextStyle,
+                      ~fontFamily=Family.default,
+                      ~fontWeight=Weight.Normal,
+                      ~italicized=false,
+                      ~monospaced=false,
                       ~text="",
-                      ~smoothing=Revery_Font.Smoothing.default,
+                      ~smoothing=Smoothing.default,
                       ~children=React.empty,
                       ~mouseBehavior=Revery_UI.Normal,
                       (),
@@ -66,6 +71,10 @@ let%nativeComponent make =
       tn#setText(text);
       tn#setSmoothing(smoothing);
       tn#setMouseBehavior(mouseBehavior);
+      tn#setFontFamily(fontFamily);
+      tn#setFontWeight(fontWeight);
+      tn#setItalicized(italicized);
+      tn#setMonospaced(monospaced);
       node;
     },
     children,