From 5c259810433be8cdbe6fcac8776cdbf4a0c244b0 Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Tue, 7 Apr 2020 15:31:00 +0300
Subject: fix: account for \r line endings, remove consoles

---
 src/lib/Markdown/SyntacticSpan.tsx | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/lib/Markdown/SyntacticSpan.tsx')

diff --git a/src/lib/Markdown/SyntacticSpan.tsx b/src/lib/Markdown/SyntacticSpan.tsx
index 299bf87..7fd9bc5 100644
--- a/src/lib/Markdown/SyntacticSpan.tsx
+++ b/src/lib/Markdown/SyntacticSpan.tsx
@@ -42,7 +42,6 @@ const splitter = new RegExp(Object.values(regex).map(pair => pair.global.source)
 
 const emojiList: Emoji[] = [];
 Object.keys(emojiLib).forEach(name => emojiList.push({ name, char: emojiLib[name].char }));
-console.log({emojiList})
 
 const useStyles = makeStyles(theme => ({
   code: {
-- 
cgit v1.2.3


From 8b737b42fff0c0e21f9173e047cae9ed488493f4 Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Tue, 7 Apr 2020 19:33:28 +0300
Subject: feat: support images nested into links

---
 src/lib/Markdown/SyntacticSpan.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/Markdown/SyntacticSpan.tsx')

diff --git a/src/lib/Markdown/SyntacticSpan.tsx b/src/lib/Markdown/SyntacticSpan.tsx
index 7fd9bc5..f3c2125 100644
--- a/src/lib/Markdown/SyntacticSpan.tsx
+++ b/src/lib/Markdown/SyntacticSpan.tsx
@@ -24,8 +24,8 @@ const enclosureRegex = (e: string): RegexPair => ({
 
 const regex: Record<string, RegexPair> = {
   conceal: {
-    global: /(!?\[.+?\]\(.+?\))/g,
-    local: /!?\[(.+?)\]\((.+?)\)/
+    global: /(!?\[.+?\]\(.+?\))(?!])/g,
+    local: /!?\[(.*\]?.*)\]\((.+?)\)/
   },
   rawLink: {
     global: /((?:(?:[A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=+$,\w]+@)?[A-Za-z0-9.-]+|(?:www\.|[-;:&=+$,\w]+@)[A-Za-z0-9.-]+)(?:(?:\/[+~%/.\w-_]*)?\??(?:[-+=&;%@.\w_]*)#?(?:[.!/\\\w]*))?)/,
@@ -63,7 +63,7 @@ const SyntacticSpan: React.FC<PropTypes> = ({ span }) => {
   const matchConceal = regex.conceal.local.exec(span);
   if (matchConceal) {
     if (span[0] === '!') return <img src={matchConceal[2]} alt={matchConceal[1]} className={classes.image} />;
-    return <Link href={matchConceal[2]}>{matchConceal[1]}</Link>;
+    return <Link href={matchConceal[2]}><SyntacticSpan span={matchConceal[1]} /></Link>;
   }
 
   const matchEmoji = span.match(regex.emoji.local);
-- 
cgit v1.2.3

