matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-13 23:41:50 +03:00
Code Activity

Upgrade cheerio and resolve type errors

Browse Source 
This helps resolve some type errors with `domhandler`. In addition, we convert
to the new way of using `htmlparser2` with `cheerio`.
This commit is contained in:
J. Ryan Stinnett
2021-05-10 16:09:12 +01:00
parent 1b372b17e0
commit f41fc7e46c
4 changed files with 92 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/editor/serialize.ts
View File

@ -22,6 +22,7 @@ import { AllHtmlEntities } from 'html-entities';
import SettingsStore from '../settings/SettingsStore';
import SdkConfig from '../SdkConfig';
import cheerio from 'cheerio';
import htmlparser2 from 'htmlparser2';
export function mdSerialize(model: EditorModel) {
return model.parts.reduce((html, part) => {
@ -116,14 +117,16 @@ export function htmlSerializeIfNeeded(model: EditorModel, {forceHTML = false} =
const parser = new Markdown(md);
if (!parser.isPlainText() || forceHTML) {
// feed Markdown output to HTML parser
const phtml = cheerio.load(parser.toHTML(),
{ _useHtmlParser2: true, decodeEntities: false });
const phtml = cheerio.load(htmlparser2.parseDocument(parser.toHTML(), {
decodeEntities: false,
}));
if (SettingsStore.getValue("feature_latex_maths")) {
// original Markdown without LaTeX replacements
const parserOrig = new Markdown(orig);
const phtmlOrig = cheerio.load(parserOrig.toHTML(),
{ _useHtmlParser2: true, decodeEntities: false });
const phtmlOrig = cheerio.load(htmlparser2.parseDocument(parserOrig.toHTML(), {
decodeEntities: false,
}));
// since maths delimiters are handled before Markdown,
// code blocks could contain mangled content.