@nectary/components 4.7.4 → 4.7.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nectary/components",
-  "version": "4.7.4",
+  "version": "4.7.5",
   "files": [
     "**/*/*.css",
     "**/*/*.json",

package/rich-text/utils.js

@@ -12,6 +12,15 @@ export const createParseVisitor = doc => {
       let $li = null;
       const $lists = [];
       return {
+        escaped(char) {
+          const $text = doc.createTextNode(char);
+          if ($p != null) {
+            $p.appendChild($text);
+          } else {
+            this.paragraph();
+            $p.appendChild($text);
+          }
+        },
         emoji(emojiChar) {
           const $emoji = doc.createElement('sinch-emoji');
           setEmojiBaseUrl($emoji, emojiBaseUrl);

package/rich-textarea/utils.js

@@ -1636,6 +1636,15 @@ export const createParseVisitor = doc => {
       const listsStack = [];
       let isFirstListItem = false;
       return {
+        escaped(char) {
+          const $text = doc.createTextNode(char);
+          if ($currentBlock != null) {
+            $currentBlock.appendChild($text);
+          } else {
+            this.paragraph();
+            $currentBlock.appendChild($text);
+          }
+        },
         emoji(emojiChar) {
           const $emoji = createEmoji(emojiChar, emojiBaseUrl, doc);
           $currentBlock.appendChild($emoji);

package/utils/markdown.d.ts

@@ -4,6 +4,7 @@ export type TMarkdownInlineParams = {
     isStrikethrough?: boolean;
 };
 export type TMarkdownParseVisitor = {
+    escaped(char: string): void;
     link(text: string, href: string, attributes?: string[]): void;
     emoji(emojiChar: string): void;
     codetag(text: string): void;

package/utils/markdown.js

@@ -1,18 +1,19 @@
 const regLinebreak = /(?:<br>\n|<br>|\n)/;
 const regParagraph = /\n{2,}/;
-const regEm3Star = /\*\*\*(?<em3>.+?)\*\*\*/;
-const regEm2Star = /\*\*(?<em2>.+?)\*\*/;
-const regEm1Star = /\*(?<em1>.+?)\*/;
-const regEm3Underscore = /___(?<em3>.+?)___/;
-const regEm2Underscore = /__(?<em2>.+?)__/;
-const regEm1Underscore = /_(?<em1>.+?)_/;
-const regCodeTag = /`(?<code>.+?)`/;
-const regStrikethrough = /~~(?<strike>.+?)~~/;
-const regLink = /!?\[(?<linktext>[^\]]*?)\]\((?<linkhref>[^)]+?)\)(\{(?<linkattrs>[^)]+?)\})?/;
+const regEm3Star = /(?<!\\)\*\*\*(?<em3>.+?)(?<!\\)\*\*\*/;
+const regEm2Star = /(?<!\\)\*\*(?<em2>.+?)(?<!\\)\*\*/;
+const regEm1Star = /(?<!\\)\*(?<em1>.+?)(?<!\\)\*/;
+const regEm3Underscore = /(?<!\\)___(?<em3>.+?)(?<!\\)___/;
+const regEm2Underscore = /(?<!\\)__(?<em2>.+?)(?<!\\)__/;
+const regEm1Underscore = /(?<!\\)_(?<em1>.+?)(?<!\\)_/;
+const regCodeTag = /(?<!\\)`(?<code>.+?)(?<!\\)`/;
+const regStrikethrough = /(?<!\\)~~(?<strike>.+?)(?<!\\)~~/;
+const regLink = /(?<!\\)!?\[(?<linktext>[^\]]*?)\]\((?<linkhref>[^)]+?)\)(\{(?<linkattrs>[^)]+?)\})?/;
 const regEmoji = /(?<emoji>(?![0-9*#])\p{Emoji})/u;
 const regUList = /^(?<indent>[\t ]*?)[*+-][\t ]+(?<ultext>.*?)[\t ]*?$/;
 const regOList = /^(?<indent>[\t ]*?)\d+\.[\t ]+(?<oltext>.*?)[\t ]*?$/;
-const allRegs = [regCodeTag, regLink, regEm3Star, regEm2Star, regEm1Star, regEm3Underscore, regEm2Underscore, regEm1Underscore, regStrikethrough, regEmoji];
+const regEscapedChars = /\\(?<escaped>[\\\*_\[\]`~])/;
+const allRegs = [regEscapedChars, regCodeTag, regLink, regEm3Star, regEm2Star, regEm1Star, regEm3Underscore, regEm2Underscore, regEm1Underscore, regStrikethrough, regEmoji];
 export const isEmojiString = data => regEmoji.test(data);
 const excludeRegs = function (regs) {
   for (var _len = arguments.length, excluding = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -47,6 +48,10 @@ const createLineParser = visitor => function parseLine(regs, md) {
       visitor.inline(line.substring(0, match.index), context);
     }
     line = line.substring(match.index + matchedStr.length);
+    if (groups?.escaped != null) {
+      visitor.escaped(groups.escaped);
+      continue;
+    }
     if (groups?.linkhref != null) {
       visitor.link(groups.linktext, groups.linkhref, groups.linkattrs?.split(' '));
     }