Skip to content

Attachment list and MD previewer Lint fixes #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Davy-c merged 1 commit into from
Dec 12, 2019
Merged

Attachment list and MD previewer Lint fixes #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/AttachmentsPage/AttachmentList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const AttachmentList = ({ storage }: AttachmentListProps) => {
)
}
)
}, [attachmentMap])}
}, [attachmentMap, messageBox, popup, removeAttachment, storage])}
</ListContainer>
)
}
Expand Down
67 changes: 30 additions & 37 deletions src/components/atoms/MarkdownPreviewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,6 @@ export const rehypeCodeMirror = rehypeCodeMirrorAttacher as Plugin<
[Partial<RehypeCodeMirrorOptions>?]
>

interface MarkdownProcessorOptions {
codeBlockTheme?: string
storageId?: string
}

const BlobImage = ({ blob, ...props }: any) => {
const url = useMemo(() => {
return URL.createObjectURL(blob)
Expand All @@ -147,39 +142,10 @@ const BlobImage = ({ blob, ...props }: any) => {
return () => {
URL.revokeObjectURL(url)
}
}, [blob])
}, [blob, url])
return <img src={url} {...props} />
}

function createMarkdownProcessor(options: MarkdownProcessorOptions = {}) {
return unified()
.use(remarkParse)
.use(remarkRehype, { allowDangerousHTML: false })
.use(rehypeCodeMirror, {
ignoreMissing: true,
theme: options.codeBlockTheme
})
.use(rehypeRaw)
.use(rehypeSanitize, schema)
.use(rehypeReact, {
createElement: React.createElement,
components: {
img: ({ src, ...props }: any) => {
const { storageMap } = useDb()
const storage = storageMap[options.storageId!]
if (storage != null && !src.match('/')) {
const attachment = storage.attachmentMap[src]
if (attachment != null) {
return <BlobImage blob={attachment.blob} />
}
}

return <img {...props} src={src} />
}
}
})
}

interface MarkdownPreviewerProps {
content: string
codeBlockTheme?: string
Expand All @@ -200,10 +166,37 @@ const MarkdownPreviewer = ({
const previousContentRef = useRef('')
const previousThemeRef = useRef<string | undefined>('')
const [renderedContent, setRenderedContent] = useState<React.ReactNode>([])
const { storageMap } = useDb()

const markdownProcessor = useMemo(() => {
return createMarkdownProcessor({ codeBlockTheme, storageId })
}, [codeBlockTheme])
const options = { codeBlockTheme, storageId }

return unified()
.use(remarkParse)
.use(remarkRehype, { allowDangerousHTML: false })
.use(rehypeCodeMirror, {
ignoreMissing: true,
theme: options.codeBlockTheme
})
.use(rehypeRaw)
.use(rehypeSanitize, schema)
.use(rehypeReact, {
createElement: React.createElement,
components: {
img: ({ src, ...props }: any) => {
const storage = storageMap[options.storageId!]
if (storage != null && !src.match('/')) {
const attachment = storage.attachmentMap[src]
if (attachment != null) {
return <BlobImage blob={attachment.blob} />
}
}

return <img {...props} src={src} />
}
}
})
}, [codeBlockTheme, storageId, storageMap])

const renderContent = useCallback(
async (content: string) => {
Expand Down