diff options
author | Eugene Sokolov <eug-vs@keemail.me> | 2020-04-18 21:31:11 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-18 21:31:11 +0300 |
commit | dee39c8ff8e9a417ba2b338beb942f9ad443adf3 (patch) | |
tree | a6b1bfa00f5ad925d57d3ded655a8103b911fad4 /src/lib/Markdown/Markdown.tsx | |
parent | 62df0ff96fc9ab832212d223150862c7667d9ffc (diff) | |
parent | 0c061c74bfd473be17be755cd19c8952dc115a91 (diff) | |
download | react-benzin-dee39c8ff8e9a417ba2b338beb942f9ad443adf3.tar.gz |
Merge pull request #13 from eug-vs/develop
Patch 3.1.1
Diffstat (limited to 'src/lib/Markdown/Markdown.tsx')
-rw-r--r-- | src/lib/Markdown/Markdown.tsx | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/lib/Markdown/Markdown.tsx b/src/lib/Markdown/Markdown.tsx index 09ad54a..cfcf117 100644 --- a/src/lib/Markdown/Markdown.tsx +++ b/src/lib/Markdown/Markdown.tsx @@ -8,15 +8,26 @@ interface PropTypes { url?: string; } +const resolveUrls = (line: string, baseUrl: string): string => line.replace( + /src="(?!http)(.*)"[\s>]/, + (match, url) => `src="${baseUrl}/${url}?sanitize=true"`, +).replace( + /\[(.*\]?.*)\]\((?!http)(.+?)\)/, + (match, text, url) => `[${text}](${baseUrl}/${url})`, +); + const Markdown: React.FC<PropTypes> = ({ data, url }) => { const [markdown, setMarkdown] = useState<string>(data || ''); + if (url) axios.get(url).then(response => setMarkdown(response.data)); + useEffect(() => { if (!url) setMarkdown(data || ''); }, [data, url]); - if (url) axios.get(url).then(response => setMarkdown(response.data)); - return <Section rawLines={markdown.split('\n')} /> + const baseUrl = url?.slice(0, url.lastIndexOf('/')) || ''; + const lines = markdown.split(/\r?\n/).map(line => resolveUrls(line, baseUrl)); + return <Section rawLines={lines} />; }; |