Skip to content
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.

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

Optional front-matter for markdown export #398

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 39 additions & 0 deletions src/components/PreferencesModal/ExportTab.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import React, { useCallback } from 'react'
import { usePreferences } from '../../lib/preferences'
import { useTranslation } from 'react-i18next'
import { Section, SectionHeader, SectionControl } from './styled'
import { FormCheckItem } from '../atoms/form'

export default () => {
const { t } = useTranslation()
const { preferences, setPreferences } = usePreferences()

const toggleFrontMatterExport: React.ChangeEventHandler<
HTMLInputElement
> = useCallback(
event => {
setPreferences({
'export.markdown.includeFrontMatter': event.target.checked
})
},
[setPreferences]
)

return (
<div>
<Section>
<SectionHeader>{t('preferences.exportFrontMatter')}</SectionHeader>
<SectionControl>
<FormCheckItem
id='checkbox-include-front-matters'
type='checkbox'
checked={preferences['export.markdown.includeFrontMatter']}
onChange={toggleFrontMatterExport}
>
{t('preferences.exportFrontMatter')}
</FormCheckItem>
</SectionControl>
</Section>
</div>
)
}
11 changes: 10 additions & 1 deletion src/components/PreferencesModal/PreferencesModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import MarkdownTab from './MarkdownTab'
import AboutTab from './AboutTab'
import BillingTab from './BillingTab'
import ImportTab from './ImportTab'
import ExportTab from './ExportTab'
import {
backgroundColor,
closeIconColor,
closeIconColor
} from '../../lib/styled/styleFunctions'
import { IconClose } from '../icons'
import { useTranslation } from 'react-i18next'
Expand Down Expand Up @@ -84,6 +85,8 @@ const PreferencesModal = () => {
return <BillingTab />
case 'import':
return <ImportTab />
case 'export':
return <ExportTab />
case 'general':
default:
return <GeneralTab />
Expand Down Expand Up @@ -140,6 +143,12 @@ const PreferencesModal = () => {
active={tab === 'import'}
setTab={setTab}
/>
<TabButton
label='Export'
tab='export'
active={tab === 'export'}
setTab={setTab}
/>
</TabNav>
<TabContent>{content}</TabContent>
<CloseButton onClick={toggleClosed}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/PreferencesModal/styled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
inputStyle,
tableStyle,
disabledUiTextColor,
PrimaryTextColor,
PrimaryTextColor
} from '../../lib/styled/styleFunctions'

export const Section = styled.section`
Expand Down
7 changes: 4 additions & 3 deletions src/components/atoms/ToolbarExportButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { NoteDoc } from '../../lib/db/types'
import {
exportNoteAsHtmlFile,
exportNoteAsMarkdownFile,
MarkdownExportOptions
} from '../../lib/exports'
import { usePreferences } from '../../lib/preferences'
import { usePreviewStyle } from '../../lib/preview'
Expand Down Expand Up @@ -45,13 +46,13 @@ const ToolbarExportButton = ({ className, note }: ToolbarExportButtonProps) => {
type: MenuTypes.Normal,
label: 'HTML export',
onClick: async () =>
await exportNoteAsHtmlFile(note, preferences, previewStyle),
await exportNoteAsHtmlFile(note, preferences, previewStyle)
},
{
type: MenuTypes.Normal,
label: 'Markdown export',
onClick: async () => await exportNoteAsMarkdownFile(note),
},
onClick: async () => await exportNoteAsMarkdownFile(note, preferences)
}
])
},
[popup, note, preferences, previewStyle]
Expand Down
22 changes: 13 additions & 9 deletions src/lib/exports.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { NoteDoc } from './db/types'
import { Preferences } from './preferences'

const sanitizeSchema = mergeDeepRight(gh, {
attributes: { '*': ['className'] },
attributes: { '*': ['className'] }
})

export const exportNoteAsHtmlFile = async (
Expand All @@ -30,15 +30,15 @@ export const exportNoteAsHtmlFile = async (
.use(remarkRehype, { allowDangerousHTML: false })
.use(rehypeCodeMirror, {
ignoreMissing: true,
theme: preferences['markdown.codeBlockTheme'],
theme: preferences['markdown.codeBlockTheme']
})
.use(rehypeRaw)
.use(rehypeSanitize, sanitizeSchema)
.use(rehypeDocument, {
title: note.title,
style: previewStyle,
css: 'https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.css',
meta: { keywords: note.tags.join() },
meta: { keywords: note.tags.join() }
})
.use(rehypeStringify)
.use(rehypeKatex)
Expand All @@ -59,7 +59,8 @@ export const exportNoteAsHtmlFile = async (
}

export const exportNoteAsMarkdownFile = async (
note: NoteDoc
note: NoteDoc,
preferences: Preferences
): Promise<void> => {
await unified()
.use(remarkParse)
Expand All @@ -70,14 +71,17 @@ export const exportNoteAsMarkdownFile = async (
console.error(err)
return
}
downloadString(
[
let exportContent = [file.toString()]
if (preferences['export.markdown.includeFrontMatter']) {
exportContent = [
'---',
`title: "${note.title}"`,
`tags: "${note.tags.join()}"`,
'---',
file.toString(),
].join('\n'),
'---'
].concat(exportContent)
}
downloadString(
exportContent.join('\n'),
`${note.title.toLowerCase().replace(/\s+/g, '-')}.md`,
'text/markdown'
)
Expand Down
10 changes: 7 additions & 3 deletions src/lib/preferences.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ export interface Preferences {
// Markdown
'markdown.previewStyle': string
'markdown.codeBlockTheme': string

// Export
'export.markdown.includeFrontMatter': boolean
}

function loadPreferences() {
Expand Down Expand Up @@ -98,6 +101,7 @@ const basePreferences: Preferences = {
// Markdown
'markdown.previewStyle': 'default',
'markdown.codeBlockTheme': 'default',
'export.markdown.includeFrontMatter': true
}

function usePreferencesStore() {
Expand All @@ -111,7 +115,7 @@ function usePreferencesStore() {
const mergedPreferences = useMemo(() => {
return {
...basePreferences,
...preferences,
...preferences
}
}, [preferences])

Expand All @@ -135,13 +139,13 @@ function usePreferencesStore() {
setClosed,
toggleClosed,
preferences: mergedPreferences,
setPreferences,
setPreferences
}
}

export const {
StoreProvider: PreferencesProvider,
useStore: usePreferences,
useStore: usePreferences
} = createStoreContext(usePreferencesStore, 'preferences')

export function useFirstUser() {
Expand Down
6 changes: 5 additions & 1 deletion src/locales/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -159,5 +159,9 @@ export default {
'preferences.importFlow4': '4. Upload!',
'preferences.importRemove': 'entfernen',
'preferences.importUpload': 'Upload',
},

// Preferences ExportTab
'preferences.exportFrontMatter':
'Front-Materie in den Markdown-Export einbeziehen'
}
}
5 changes: 4 additions & 1 deletion src/locales/enUS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,5 +157,8 @@ export default {
'preferences.importFlow4': '4. Upload!',
'preferences.importRemove': 'remove',
'preferences.importUpload': 'Upload',
},

// Preferences ExportTab
'preferences.exportFrontMatter': 'Include front-matters in Markdown export'
}
}
6 changes: 5 additions & 1 deletion src/locales/esES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,5 +163,9 @@ export default {
'preferences.importFlow4': '4. Cargar!',
'preferences.importRemove': 'Eliminar',
'preferences.importUpload': 'Subir',
},

// Preferences ExportTab
'preferences.exportFrontMatter':
'Incluir front-matter en la exportación Markdown'
}
}
6 changes: 5 additions & 1 deletion src/locales/frFR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,5 +164,9 @@ export default {
'preferences.importFlow4': '4. Télécharger!',
'preferences.importRemove': 'supprimer',
'preferences.importUpload': 'Télécharger',
},

// Preferences ExportTab
'preferences.exportFrontMatter':
"Inclure l'avant-propos dans l'exportation Markdown"
}
}
6 changes: 5 additions & 1 deletion src/locales/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -159,5 +159,9 @@ export default {
'preferences.importFlow4': '4. アップロード',
'preferences.importRemove': '削除',
'preferences.importUpload': 'アップロード',
},

// Preferences ExportTab
'preferences.exportFrontMatter':
'Markdownエクスポートにフロントマターを含める'
}
}
5 changes: 4 additions & 1 deletion src/locales/ko.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,5 +155,8 @@ export default {
'preferences.importFlow4': '4. 업로드!',
'preferences.importRemove': '삭제',
'preferences.importUpload': '업로드',
},

// Preferences ExportTab
'preferences.exportFrontMatter': 'Markdown 내보내기에 선행 사항 포함'
}
}
6 changes: 5 additions & 1 deletion src/locales/ukUA.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,5 +157,9 @@ export default {
'preferences.importFlow4': '4. Upload!',
'preferences.importRemove': 'Видалити',
'preferences.importUpload': 'Завантажити',
},

// Preferences ExportTab
'preferences.exportFrontMatter':
'Включіть експортну інформацію в експорті Markdown'
}
}
5 changes: 4 additions & 1 deletion src/locales/zhCN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,5 +152,8 @@ export default {
'preferences.importFlow4': '4. 上传!',
'preferences.importRemove': '移除',
'preferences.importUpload': '上传',
},

// Preferences ExportTab
'preferences.exportFrontMatter': '在Markdown导出中包括前题'
}
}
5 changes: 4 additions & 1 deletion src/locales/zhHK.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,5 +153,8 @@ export default {
'preferences.importFlow4': '4. 上傳!',
'preferences.importRemove': '移除',
'preferences.importUpload': '上傳',
},

// Preferences ExportTab
'preferences.exportFrontMatter': '在標記導出中包括前物質'
}
}
5 changes: 4 additions & 1 deletion src/locales/zhTW.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,5 +152,8 @@ export default {
'preferences.importFlow4': '4. 上傳!',
'preferences.importRemove': '移除',
'preferences.importUpload': '上傳',
},

// Preferences ExportTab
'preferences.exportFrontMatter': '在Markdown导出中包括前题'
}
}