feat(editor): add scroll navigation and update theme Markdown behavior
This commit is contained in:
@@ -3,12 +3,14 @@ import { defineAsyncComponent, ref, watch } from 'vue'
|
||||
import { useEditorStore } from '@/stores/editor'
|
||||
import { useSettingsStore } from '@/stores/settings'
|
||||
import { useThemeStore } from '@/stores/theme'
|
||||
import EditorScrollButtons from './EditorScrollButtons.vue'
|
||||
const VisualMarkdownEditor = defineAsyncComponent(() => import('./VisualMarkdownEditor.vue'))
|
||||
|
||||
const editorStore = useEditorStore()
|
||||
const settingsStore = useSettingsStore()
|
||||
const themeStore = useThemeStore()
|
||||
const sourceEditor = ref<HTMLTextAreaElement | null>(null)
|
||||
const container = ref<HTMLElement | null>(null)
|
||||
watch(() => editorStore.headingRequest, request => {
|
||||
const input = sourceEditor.value
|
||||
if (!request || !input || request.path !== editorStore.currentFilePath) return
|
||||
@@ -24,13 +26,17 @@ function updateContent(event: Event) {
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div ref="container" class="editor-scroll-pane">
|
||||
<VisualMarkdownEditor v-if="editorStore.mode === 'wysiwyg'" :key="`${editorStore.currentFilePath ?? 'empty'}:${editorStore.contentRevision}:${themeStore.resolvedCodeBlockTheme}:${settingsStore.language}`"
|
||||
:initial-content="editorStore.content" />
|
||||
<textarea v-else ref="sourceEditor" class="editor-pane source" :value="editorStore.content" :spellcheck="settingsStore.spellCheck"
|
||||
:lang="settingsStore.language" :aria-label="settingsStore.language === 'en' ? 'Markdown source editor' : 'Markdown 源码编辑器'" @input="updateContent" />
|
||||
<EditorScrollButtons :container="container" :content="editorStore.content" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.editor-scroll-pane { position: relative; display: flex; flex-direction: column; flex: 1; min-height: 0; min-width: 0; overflow: hidden; }
|
||||
.editor-pane {
|
||||
box-sizing: border-box;
|
||||
flex: 1;
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
// @vitest-environment happy-dom
|
||||
import { afterEach, expect, it, vi } from 'vitest'
|
||||
import { mount } from '@vue/test-utils'
|
||||
import EditorScrollButtons from './EditorScrollButtons.vue'
|
||||
|
||||
afterEach(() => { vi.useRealTimers(); vi.unstubAllGlobals(); document.body.innerHTML = '' })
|
||||
|
||||
it('shows only useful directions, scrolls the editor, and hides empty or short documents', async () => {
|
||||
vi.useFakeTimers()
|
||||
vi.stubGlobal('matchMedia', () => ({ matches: false }))
|
||||
const container = document.createElement('div')
|
||||
const viewport = document.createElement('textarea')
|
||||
viewport.className = 'source'
|
||||
container.append(viewport)
|
||||
document.body.append(container)
|
||||
Object.defineProperty(viewport, 'scrollHeight', { configurable: true, value: 1000 })
|
||||
Object.defineProperty(viewport, 'clientHeight', { configurable: true, value: 200 })
|
||||
const scroll = vi.fn()
|
||||
viewport.scrollTo = scroll
|
||||
const wrapper = mount(EditorScrollButtons, { props: { container, content: 'A long note' } })
|
||||
const update = async (top: number) => {
|
||||
viewport.scrollTop = top
|
||||
viewport.dispatchEvent(new Event('scroll'))
|
||||
await vi.advanceTimersByTimeAsync(40)
|
||||
}
|
||||
try {
|
||||
await update(0)
|
||||
expect(wrapper.findAll('button')).toHaveLength(1)
|
||||
expect(wrapper.find('button').attributes('aria-label')).toBe('滑动到底部')
|
||||
await wrapper.find('button').trigger('click')
|
||||
expect(scroll).toHaveBeenLastCalledWith({ top: 1000, behavior: 'smooth' })
|
||||
await update(400)
|
||||
expect(wrapper.findAll('button')).toHaveLength(2)
|
||||
await update(800)
|
||||
expect(wrapper.findAll('button')).toHaveLength(1)
|
||||
expect(wrapper.find('button').attributes('aria-label')).toBe('滑动到顶部')
|
||||
await wrapper.find('button').trigger('click')
|
||||
expect(scroll).toHaveBeenLastCalledWith({ top: 0, behavior: 'smooth' })
|
||||
await wrapper.setProps({ content: ' \n' })
|
||||
await update(400)
|
||||
expect(wrapper.findAll('button')).toHaveLength(0)
|
||||
Object.defineProperty(viewport, 'scrollHeight', { value: 200 })
|
||||
await wrapper.setProps({ content: 'Short note' })
|
||||
await update(0)
|
||||
expect(wrapper.findAll('button')).toHaveLength(0)
|
||||
} finally { wrapper.unmount() }
|
||||
})
|
||||
@@ -0,0 +1,62 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onBeforeUnmount, ref, watch } from 'vue'
|
||||
import { Top, Bottom } from '@element-plus/icons-vue'
|
||||
import AppIcon from '@/components/common/AppIcon.vue'
|
||||
import { t } from '@/i18n'
|
||||
|
||||
const props = defineProps<{ container: HTMLElement | null; content: string }>()
|
||||
const hasContent = computed(() => !!props.content.trim())
|
||||
const canUp = ref(false), canDown = ref(false)
|
||||
let viewport: HTMLElement | null = null
|
||||
let frame = 0
|
||||
let mutation: MutationObserver | undefined
|
||||
let resize: ResizeObserver | undefined
|
||||
function update() {
|
||||
frame = 0
|
||||
const next = props.container?.querySelector<HTMLElement>('.milkdown-host, textarea.source') ?? null
|
||||
if (next !== viewport) {
|
||||
viewport?.removeEventListener('scroll', schedule)
|
||||
resize?.disconnect()
|
||||
viewport = next
|
||||
viewport?.addEventListener('scroll', schedule, { passive: true })
|
||||
}
|
||||
if (viewport) {
|
||||
resize?.observe(viewport)
|
||||
for (const child of viewport.children) resize?.observe(child)
|
||||
const document = viewport.querySelector('.ProseMirror')
|
||||
if (document) resize?.observe(document)
|
||||
}
|
||||
const max = viewport ? viewport.scrollHeight - viewport.clientHeight : 0
|
||||
const visible = hasContent.value && max > 2
|
||||
canUp.value = visible && viewport!.scrollTop > 2
|
||||
canDown.value = visible && viewport!.scrollTop < max - 2
|
||||
}
|
||||
function schedule() { if (!frame) frame = requestAnimationFrame(update) }
|
||||
function scroll(to: 'top' | 'bottom') {
|
||||
viewport?.scrollTo({ top: to === 'top' ? 0 : viewport.scrollHeight,
|
||||
behavior: window.matchMedia('(prefers-reduced-motion: reduce)').matches ? 'auto' : 'smooth' })
|
||||
}
|
||||
watch(() => props.container, container => {
|
||||
mutation?.disconnect()
|
||||
resize?.disconnect()
|
||||
mutation = new MutationObserver(schedule)
|
||||
resize = new ResizeObserver(schedule)
|
||||
if (container) mutation.observe(container, { childList: true, subtree: true, characterData: true, attributes: true })
|
||||
schedule()
|
||||
}, { immediate: true, flush: 'post' })
|
||||
watch(() => props.content, schedule)
|
||||
onBeforeUnmount(() => {
|
||||
cancelAnimationFrame(frame)
|
||||
mutation?.disconnect()
|
||||
resize?.disconnect()
|
||||
viewport?.removeEventListener('scroll', schedule)
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div v-if="canUp || canDown" class="editor-scroll-buttons" :aria-label="t('文档滚动', 'Document scrolling')">
|
||||
<button v-if="canUp" type="button" class="button-secondary" :title="t('滑动到顶部', 'Scroll to top')" :aria-label="t('滑动到顶部', 'Scroll to top')" @click="scroll('top')"><AppIcon :icon="Top" :size="20" /></button>
|
||||
<button v-if="canDown" type="button" class="button-secondary" :title="t('滑动到底部', 'Scroll to bottom')" :aria-label="t('滑动到底部', 'Scroll to bottom')" @click="scroll('bottom')"><AppIcon :icon="Bottom" :size="20" /></button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -6,6 +6,7 @@ vi.mock('@/styles/features.css?raw', async () => ({ default: (await import('node
|
||||
vi.mock('@/styles/tokens.css?raw', async () => ({ default: (await import('node:fs')).readFileSync(process.cwd() + '/src/styles/tokens.css', 'utf8') }))
|
||||
vi.mock('@/styles/callouts.css?raw', async () => ({ default: (await import('node:fs')).readFileSync(process.cwd() + '/src/styles/callouts.css', 'utf8') }))
|
||||
import CommunityThemePreview from './CommunityThemePreview.vue'
|
||||
vi.mock('@/styles/markdown-behavior.css?raw', async () => ({ default: (await import('node:fs')).readFileSync(process.cwd() + '/src/styles/markdown-behavior.css', 'utf8') }))
|
||||
import { mockCommunityThemes } from '@/services/themePackageService'
|
||||
const themes = [...['light','dark','sepia'].map(theme_id => ({theme_id,name:theme_id,builtin:true})), ...mockCommunityThemes.map(t => ({...t,builtin:false}))]
|
||||
it.each(themes)('previews shared component states safely for $theme_id', theme => {
|
||||
@@ -16,6 +17,9 @@ it.each(themes)('previews shared component states safely for $theme_id', theme =
|
||||
const doc = new DOMParser().parseFromString(iframe.attributes('srcdoc')!, 'text/html')
|
||||
expect(doc.documentElement.dataset.theme).toBe(theme.theme_id)
|
||||
expect(doc.querySelector('script')).toBeNull()
|
||||
for (const selector of ['.editor-scroll-buttons button', '.markdown-content h6', '.task-list-item input:checked', '.markdown-content[data-code-wrap="true"][data-line-numbers="true"] .line', '.heading-fold-toggle']) expect(doc.querySelector(selector), selector).not.toBeNull()
|
||||
expect(doc.querySelector('style')!.textContent).toContain('.editor-scroll-buttons button:focus-visible')
|
||||
expect(doc.querySelector('style')!.textContent).toContain(".markdown-content[data-code-wrap='true'] .shiki code")
|
||||
expect(doc.querySelectorAll('.specimen-callouts > aside.markdown-callout')).toHaveLength(14)
|
||||
expect(doc.querySelector('.specimen-callouts > details[open]')).not.toBeNull()
|
||||
expect(doc.querySelector('.specimen-callouts > details:not([open])')).not.toBeNull()
|
||||
|
||||
@@ -6,6 +6,7 @@ import { getCommunityThemePreviewCss, mockCommunityThemes } from '@/services/the
|
||||
import tokensCss from '@/styles/tokens.css?raw'
|
||||
import featuresCss from '@/styles/features.css?raw'
|
||||
import headingsCss from '@/styles/headings.css?raw'
|
||||
import markdownBehaviorCss from '@/styles/markdown-behavior.css?raw'
|
||||
import calloutsCss from '@/styles/callouts.css?raw'
|
||||
import { calloutTypes } from '@/utils/callouts'
|
||||
import specimenHtml from './themeSpecimen.html?raw'
|
||||
@@ -25,6 +26,7 @@ const previewDocument = computed(() => {
|
||||
const style = doc.createElement('style')
|
||||
style.textContent = `${tokensCss}\n${featuresCss}\n${calloutsCss}\n${headingsCss}\n${props.css ?? getCommunityThemePreviewCss(props.themeId)}\nhtml { height:100% !important; overflow-y:auto !important; overflow-x:hidden !important; overscroll-behavior:contain; } body { height:auto !important; min-height:100%; overflow:visible !important; margin:0; padding:24px; background:var(--color-background-primary); color:var(--color-text-primary); font:16px/1.6 system-ui; } article { min-width:0; } .theme-specimen { display:grid; gap:16px; margin-top:20px; } .surface-nested { padding:12px; border:1px solid var(--color-border-default); border-radius:var(--radius-md); } .specimen-markdown { overflow:auto; } .specimen-markdown code { background:var(--color-code-background, var(--color-background-secondary)); color:var(--color-code-text, var(--color-text-primary)); padding:3px 6px; border-radius:4px; } .specimen-markdown pre { padding:12px; background:var(--color-background-secondary); } .specimen-markdown blockquote { border-left:3px solid var(--color-accent-primary); padding-left:12px; } .specimen-markdown table { width:100%; border-collapse:collapse; } .specimen-markdown td,.specimen-markdown th { padding:8px; border:1px solid var(--color-border-default); } .specimen-markdown th { background:var(--color-markdown-table-header); } .specimen-chart > div { display:flex; align-items:flex-end; gap:12px; height:100px; border-bottom:1px solid var(--color-border-default); } .specimen-chart span { width:36px; } .specimen-long { overflow-wrap:anywhere; } @media(max-width:480px) { body { padding:12px; } .form-grid { grid-template-columns:minmax(0,1fr); } }`
|
||||
|
||||
style.textContent += `\n${markdownBehaviorCss}\n.specimen-scroll { position:relative; min-height:110px; }`
|
||||
doc.head.append(style)
|
||||
const article = doc.createElement('article')
|
||||
article.className = 'panel'
|
||||
|
||||
@@ -105,6 +105,6 @@ it('offers and applies the paper theme update without discarding the active them
|
||||
const card = wrapper.findAll('article.theme-card').find(item => item.text().includes('Paper Moments'))!
|
||||
await card.findAll('button').find(button => button.text() === '更新')!.trigger('click')
|
||||
await flushPromises()
|
||||
expect(store.allThemes.find(theme => theme.theme_id === 'paper-moments')?.version).toBe('1.8.1')
|
||||
expect(store.allThemes.find(theme => theme.theme_id === 'paper-moments')?.version).toBe('1.9.0')
|
||||
expect(document.getElementById('theme-style-paper-moments')!.textContent).toContain('.surface-nested')
|
||||
})
|
||||
|
||||
@@ -20,3 +20,20 @@ console.log(note);</code></pre><table><thead><tr><th>名称</th><th>状态</th><
|
||||
|
||||
<section class="surface-nested markdown-preferences"><h2>Markdown 语法预设</h2><label>标题样式 <select class="select"><option>ATX (#)</option><option>Setext</option></select></label><label><input type="checkbox" checked> 警告框与提示框</label><button class="button-secondary">保存为预设</button></section>
|
||||
<section class="milkdown"><div class="ProseMirror"><h2><button class="heading-fold-toggle" aria-expanded="true" aria-label="折叠示例标题"></button>悬停查看折叠箭头</h2><p>折叠按钮跟随主题,键盘聚焦时也可见。</p></div></section>
|
||||
<section class="markdown-content specimen-markdown">
|
||||
<h2>Markdown 行为与状态</h2>
|
||||
<h4>四级标题</h4><h5>五级标题</h5><h6>六级标题</h6>
|
||||
<p><a href="#markdown-preview-target">链接:检查悬停与键盘焦点</a>,<code>行内代码</code>与<strong>强调</strong>、<em>斜体</em>、<del>删除线</del>。选中这段文字检查主题选区颜色。</p>
|
||||
<ul><li>无序列表<ul><li>嵌套列表</li></ul></li></ul><ol><li>有序列表</li><li>第二项</li></ol>
|
||||
<ul><li class="task-list-item"><input type="checkbox" disabled> 未完成任务</li><li class="task-list-item"><input type="checkbox" checked disabled> 已完成任务</li></ul>
|
||||
<blockquote><p>普通引用</p><blockquote>嵌套引用</blockquote></blockquote><hr>
|
||||
<details class="markdown-callout" data-callout="tip"><summary class="callout-title">点击展开提示</summary><div class="callout-body"><p>提示内的 <code>代码</code> 与列表也继承主题。</p></div></details>
|
||||
<p id="markdown-preview-target">ATX 和 Setext 解析后使用相同标题样式;关闭扩展语法时保留源码展示。</p>
|
||||
<pre><code>> [!NOTE]
|
||||
关闭警告框扩展时显示原始内容
|
||||
```mermaid
|
||||
graph LR; A-->B
|
||||
```</code></pre>
|
||||
</section>
|
||||
<section class="surface-nested specimen-scroll"><p>工作区滚动按钮:悬停、按下或 Tab 聚焦检查配色。</p><div class="editor-scroll-buttons"><button class="button-secondary" aria-label="滑动到顶部" title="滑动到顶部">↑</button><button class="button-secondary" aria-label="滑动到底部" title="滑动到底部">↓</button></div></section>
|
||||
<section class="markdown-content specimen-markdown" data-code-wrap="true" data-line-numbers="true"><h3>代码换行与行号</h3><pre class="shiki"><code><span class="line">const description = "这是一段用于检查代码自动换行、行号与主题配色的较长说明,较窄视口下也应该保留可读内容。";</span><span class="line">console.log(description);</span></code></pre></section>
|
||||
|
||||
Reference in New Issue
Block a user