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

feat: support for indent options #430

Merged
merged 1 commit into from
Sep 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions src/components/CodemirrorEditor/EditorHeader/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,31 @@ function customStyle() {
</Button>
</div>
</div>
<div class="space-y-2">
<h2>段落首行缩进</h2>
<div class="grid grid-cols-5 justify-items-center gap-2">
<Button
class="w-full"
variant="outline"
:class="{
'border-black dark:border-white': store.isUseIndent,
}"
@click="!store.isUseIndent && store.useIndentChanged()"
>
开启
</Button>
<Button
class="w-full"
variant="outline"
:class="{
'border-black dark:border-white': !store.isUseIndent,
}"
@click="store.isUseIndent && store.useIndentChanged()"
>
关闭
</Button>
</div>
</div>
<div class="space-y-2">
<h2>自定义 CSS 面板</h2>
<div class="grid grid-cols-5 justify-items-center gap-2">
Expand Down
13 changes: 12 additions & 1 deletion src/stores/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ export const useStore = defineStore(`store`, () => {
const isCiteStatus = useStorage(`isCiteStatus`, false)
const toggleCiteStatus = useToggle(isCiteStatus)

// 是否开启段落首行缩进
const isUseIndent = useStorage(addPrefix(`use_indent`), true)
const toggleUseIndent = useToggle(isUseIndent)

const output = ref(``)

// 文本字体
Expand Down Expand Up @@ -133,12 +137,13 @@ export const useStore = defineStore(`store`, () => {
theme: customCssWithTemplate(css2json(getCurrentTab().content), primaryColor.value, customizeTheme(themeMap[theme.value], { fontSize: fontSizeNumber.value, color: primaryColor.value })),
fonts: fontFamily.value,
size: fontSize.value,
isUseIndent: isUseIndent.value,
})

// 更新编辑器
const editorRefresh = () => {
codeThemeChange()
renderer.reset({ status: isCiteStatus.value, legend: legend.value })
renderer.reset({ status: isCiteStatus.value, legend: legend.value, isUseIndent: isUseIndent.value })
let outputTemp = marked.parse(editor.value!.getValue()) as string

// 去除第一行的 margin-top
Expand Down Expand Up @@ -318,6 +323,10 @@ export const useStore = defineStore(`store`, () => {
toggleCiteStatus()
})

const useIndentChanged = withAfterRefresh(() => {
toggleUseIndent()
})

// 导出编辑器内容为 HTML,并且下载到本地
const exportEditorContent2HTML = () => {
exportHTML()
Expand Down Expand Up @@ -389,6 +398,8 @@ export const useStore = defineStore(`store`, () => {
isMacCodeBlock,
isCiteStatus,
citeStatusChanged,
isUseIndent,
useIndentChanged,

output,
editor,
Expand Down
1 change: 1 addition & 0 deletions src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export interface IOpts {
theme: Theme
fonts: string
size: string
isUseIndent: boolean
legend?: string
status?: boolean
}
Expand Down
12 changes: 10 additions & 2 deletions src/utils/renderer.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { ExtendedProperties, IOpts, ThemeStyles } from '@/types'
import type { PropertiesHyphen } from 'csstype'
import type { Renderer, RendererObject, Tokens } from 'marked'
import { toMerged } from 'es-toolkit'
import { cloneDeep, toMerged } from 'es-toolkit'
import hljs from 'highlight.js'

import { marked } from 'marked'
Expand All @@ -10,12 +10,20 @@ import { MDKatex } from './MDKatex'

marked.use(MDKatex({ nonStandard: true }))

function buildTheme({ theme, fonts, size }: IOpts): ThemeStyles {
function buildTheme({ theme: _theme, fonts, size, isUseIndent }: IOpts): ThemeStyles {
const theme = cloneDeep(_theme)
const base = toMerged(theme.base, {
'font-family': fonts,
'font-size': size,
})

if (isUseIndent) {
theme.block.p = {
'text-indent': `2em`,
...theme.block.p,
}
}

const mergeStyles = (styles: Record<string, PropertiesHyphen>): Record<string, ExtendedProperties> =>
Object.fromEntries(
Object.entries(styles).map(([ele, style]) => [ele, toMerged(base, style)]),
Expand Down
Loading