From f3f2e9b556d7ebf4b88a92ef7cdb9113ede46397 Mon Sep 17 00:00:00 2001
From: Zach Baylin <zbaylin@outrunlabs.com>
Date: Mon, 22 Jun 2020 19:45:21 +0200
Subject: [PATCH] Markdown: add code block font size parameter (#916)

---
 src/UI_Components/Markdown.re  | 9 +++++----
 src/UI_Components/Markdown.rei | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/UI_Components/Markdown.re b/src/UI_Components/Markdown.re
index 1356be69a..f9cb4290c 100644
--- a/src/UI_Components/Markdown.re
+++ b/src/UI_Components/Markdown.re
@@ -44,6 +44,7 @@ type style = {
   h6: list(Style.textStyleProps),
   fontFamily: Family.t,
   codeFontFamily: Family.t,
+  codeBlockFontSize: float,
   baseFontSize: float,
   codeBlock: list(Style.viewStyleProps),
 };
@@ -405,8 +406,6 @@ and generateCodeBlock =
     m("Code block has label : %s", Option.value(label, ~default="(none)"))
   );
 
-  let fontSize = fontSizeFromKind(`InlineCode, styles);
-
   <View style={styles.codeBlock}>
     {switch (label, codeBlock.code) {
      | (None, Some(code)) =>
@@ -414,7 +413,7 @@ and generateCodeBlock =
          text=code
          fontFamily={styles.codeFontFamily}
          monospaced=true
-         fontSize
+         fontSize={styles.codeBlockFontSize}
          style=Style.[
            textWrap(TextWrapping.WrapIgnoreWhitespace),
            ...{styles.paragraph},
@@ -448,7 +447,7 @@ and generateCodeBlock =
                     fontFamily={styles.codeFontFamily}
                     fontWeight={block.bold ? Weight.Bold : Weight.Normal}
                     monospaced=true
-                    fontSize
+                    fontSize={styles.codeBlockFontSize}
                   />;
                 },
                 highlight,
@@ -482,6 +481,7 @@ let%component make =
                 ~fontFamily=Family.default,
                 ~codeFontFamily=Family.default,
                 ~baseFontSize=14.0,
+                ~codeBlockFontSize=baseFontSize,
                 ~paragraphStyle=Style.emptyTextStyle,
                 ~activeLinkStyle=Style.emptyTextStyle,
                 ~inactiveLinkStyle=Style.emptyTextStyle,
@@ -517,6 +517,7 @@ let%component make =
          fontFamily,
          codeFontFamily,
          baseFontSize,
+         codeBlockFontSize,
          codeBlock: codeBlockStyle,
        },
        syntaxHighlighter,
diff --git a/src/UI_Components/Markdown.rei b/src/UI_Components/Markdown.rei
index 44d9cf5c1..4a77b0151 100644
--- a/src/UI_Components/Markdown.rei
+++ b/src/UI_Components/Markdown.rei
@@ -21,6 +21,7 @@ let make:
     ~fontFamily: Revery_Font.Family.t=?,
     ~codeFontFamily: Revery_Font.Family.t=?,
     ~baseFontSize: float=?,
+    ~codeBlockFontSize: float=?,
     ~paragraphStyle: list(Revery_UI.Style.textStyleProps)=?,
     ~activeLinkStyle: list(Revery_UI.Style.textStyleProps)=?,
     ~inactiveLinkStyle: list(Revery_UI.Style.textStyleProps)=?,