Add micromark-extension-math

microsoft · Oct 25, 2024 · 645a8de · 645a8de
1 parent 8356902
commit 645a8de
Show file tree

Hide file tree

Showing 5 changed files with 166 additions and 4 deletions.
diff --git a/__tests__/html2/markdown/math.html b/__tests__/html2/markdown/math.html
@@ -0,0 +1,68 @@
+<!doctype html>
+<html lang="en-US">
+  <head>
+    <link href="/assets/index.css" rel="stylesheet" type="text/css" />
+    <script crossorigin="anonymous" src="/test-harness.js"></script>
+    <script crossorigin="anonymous" src="/test-page-object.js"></script>
+    <script crossorigin="anonymous" src="/__dist__/webchat-es5.js"></script>
+  </head>
+
+  <body>
+    <main id="webchat"></main>
+    <script>
+      run(async function () {
+        await host.windowSize(640, 720, document.getElementById('webchat'));
+
+        const {
+          WebChat: { renderWebChat }
+        } = window; // Imports in UMD fashion.
+
+        const { directLine, store } = testHelpers.createDirectLineEmulator();
+
+        renderWebChat({ directLine, store }, document.getElementById('webchat'));
+
+        await pageConditions.uiConnected();
+
+        await directLine.emulateIncomingActivity({
+          text: `On January 1, 2018, the closing stock price of Microsoft was **$85.95**. On December 1, 2021, the closing stock price was **$330.08**.
+
+Using these prices, here's how you can calculate the value of your investment:
+
+1. Determine the number of shares you could buy on 1/1/2018:
+
+$$
+\\text{Number of shares} = \\frac{\\text{Investment amount}}{\\text{Stock price purchase date}} = \\frac{1000}{85.95}
+$$
+
+2. Calculate the total value when selling the shares on 12/1/2021:
+
+$$
+\\text{Total value} = \\text{Number of shares} \\times \\text{Stock price on sale date}
+$$
+
+Let's do the math:
+
+1. Number of shares you could buy on 1/1/2018:
+
+$$
+\\text{Number of shares} = \\frac{1000}{85.95} \\simeq 11.63\\text{ shares}
+$$
+
+2. Total value when selling the shares on 12/1/2021:
+
+$$
+\\text{Total value} = 11.63 \\times 330.08 \\simeq \\$3839.63
+$$
+
+So, if you invested $1000 in Microsoft on January 1, 2018, and sold the shares on December 1, 2021, your investment would be worth approximately **$3839.63**. Please note that this calculation does not account for dividends, taxes, or transaction fees, which could affect the final amount. If you need a more precise calculation including these factors, I recommend consulting a financial advisor or using a detailed investment calculator.
+`,
+          type: 'message'
+        });
+
+        await pageConditions.numActivitiesShown(1);
+
+        await host.snapshot('local');
+      });
+    </script>
+  </body>
+</html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/bundle/package.json b/packages/bundle/package.json
@@ -134,6 +134,7 @@
     "memoize-one": "6.0.0",
     "micromark": "^4.0.0",
     "micromark-extension-gfm": "^3.0.0",
+    "micromark-extension-math": "^3.1.0",
     "microsoft-cognitiveservices-speech-sdk": "1.17.0",
     "prop-types": "15.8.1",
     "punycode": "2.3.1",

diff --git a/packages/bundle/src/markdown/renderMarkdown.ts b/packages/bundle/src/markdown/renderMarkdown.ts
@@ -7,9 +7,10 @@ import {
 } from 'botframework-webchat-component/internal';
 import { micromark } from 'micromark';
 import { gfm, gfmHtml } from 'micromark-extension-gfm';
-import { pre as respectCRLFPre } from './private/respectCRLF';
+import { math, mathHtml } from 'micromark-extension-math';
 import betterLinkDocumentMod, { BetterLinkDocumentModDecoration } from './private/betterLinkDocumentMod';
 import iterateLinkDefinitions from './private/iterateLinkDefinitions';
+import { pre as respectCRLFPre } from './private/respectCRLF';
 
 const SANITIZE_HTML_OPTIONS = Object.freeze({
   allowedAttributes: {
@@ -56,7 +57,38 @@ const SANITIZE_HTML_OPTIONS = Object.freeze({
     'th',
     'thead',
     'tr',
-    'ul'
+    'ul',
+
+    // Followings are for MathML elements, from https://developer.mozilla.org/en-US/docs/Web/MathML.
+    'annotation-xml',
+    'annotation',
+    'math',
+    'merror',
+    'mfrac',
+    'mi',
+    'mmultiscripts',
+    'mn',
+    'mo',
+    'mover',
+    'mpadded',
+    'mphantom',
+    'mprescripts',
+    'mroot',
+    'mrow',
+    'ms',
+    'mspace',
+    'msqrt',
+    'mstyle',
+    'msub',
+    'msubsup',
+    'msup',
+    'mtable',
+    'mtd',
+    'mtext',
+    'mtr',
+    'munder',
+    'munderover',
+    'semantics'
   ],
   // Bug of https://github.com/apostrophecms/sanitize-html/issues/633.
   // They should not remove `alt=""` even though it is empty.
@@ -145,8 +177,12 @@ export default function render(
     // We need to handle links like cite:1 or other URL handlers.
     // And we will remove dangerous protocol during sanitization.
     allowDangerousProtocol: true,
-    extensions: [gfm()],
-    htmlExtensions: [gfmHtml()]
+    extensions: [
+      gfm(),
+      // Disabling single dollar inline math block to prevent easy collision.
+      math({ singleDollarTextMath: false })
+    ],
+    htmlExtensions: [gfmHtml(), mathHtml({ output: 'mathml' })]
   });
 
   // TODO: [P1] In some future, we should apply "better link" and "sanitization" outside of the Markdown engine.

diff --git a/packages/component/src/Styles/StyleSet/RenderMarkdown.ts b/packages/component/src/Styles/StyleSet/RenderMarkdown.ts
@@ -65,6 +65,12 @@ export default function createMarkdownStyle() {
 
       '& .webchat__render-markdown__pure-identifier::before': {
         content: "'['"
+      },
+
+      '& math': {
+        alignItems: 'center',
+        display: 'flex',
+        flexDirection: 'column'
       }
     }
   };