Skip to content

fix: restore collapsed toolbar settings #286

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

Open
PathGao wants to merge 1 commit into
base: master
Choose a base branch
from
+37 −25
Open

fix: restore collapsed toolbar settings #286

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
6 changes: 3 additions & 3 deletions scripts/reloadOpenToolbar.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ test('preview-level open shortcut handles Ctrl/Cmd+O outside Monaco without doub
assert.match(markdownViewer, /cmdOrCtrl[\s\S]*key === 'o'[\s\S]*selectFile\(\)/);
});

test('editor toolbar delegates to Monaco actions and exposes expected Markdown commands', () => {
test('editor toolbar forwards Monaco actions and optional payloads', () => {
assert.match(markdownViewer, /import EditorToolbar from '\.\/components\/EditorToolbar\.svelte'/);
assert.match(markdownViewer, /<EditorToolbar[\s\S]*onaction=\{\(actionId\) => editorPane\?\.runEditorAction\(actionId\)\}/);
assert.match(editor, /export function runEditorAction\(actionId: string\)/);
assert.match(markdownViewer, /<EditorToolbar[\s\S]*onaction=\{\(actionId, payload\) => editorPane\?\.runEditorAction\(actionId, payload\)\}/);
assert.match(editor, /export function runEditorAction\(actionId: string, payload\?: any\)/);

for (const actionId of [
'fmt-bold',
Expand Down
56 changes: 34 additions & 22 deletions src/lib/components/Settings.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,9 +1172,13 @@
<h2>{t('settings.toolbarsSettings', settings.language)}</h2>
</div>

<div class="toolbar-section">
<div class="toolbar-section-header">
<h3>{t('settings.applicationToolbar', settings.language)}</h3>
<details class="toolbar-settings toolbar-settings-accordion">
<summary class="toolbar-settings-summary">
<span class="toolbar-settings-chevron" aria-hidden="true"></span>
<span>{t('settings.applicationToolbar', settings.language)}</span>
</summary>
<div class="toolbar-settings-body">
<div class="toolbar-section-header">
<button
type="button"
class="reset-text-btn"
Expand Down Expand Up @@ -1248,12 +1252,17 @@
</div>
</div>
{/each}
</div>
</div>
</div>

<div class="toolbar-section" style="margin-top: 24px;">
<div class="toolbar-section-header">
<h3>{t('settings.editorToolbar', settings.language)}</h3>
</details>

<details class="toolbar-settings toolbar-settings-accordion">
<summary class="toolbar-settings-summary">
<span class="toolbar-settings-chevron" aria-hidden="true"></span>
<span>{t('settings.editorToolbar', settings.language)}</span>
</summary>
<div class="toolbar-settings-body">
<div class="toolbar-section-header">
<button
type="button"
class="reset-text-btn"
Expand Down Expand Up @@ -1311,8 +1320,9 @@
</div>
</div>
{/each}
</div>
</div>
</div>
</details>
</div>
{:else if activeCategory === 'files'}
<div class="settings-group">
Expand Down Expand Up @@ -1712,10 +1722,21 @@
display: none;
}

.toolbar-section {
display: flex;
flex-direction: column;
gap: 8px;
.toolbar-settings-chevron {
width: 7px;
height: 7px;
border-right: 1.5px solid var(--color-fg-muted);
border-bottom: 1.5px solid var(--color-fg-muted);
transform: rotate(-45deg);
transition: transform 0.12s ease;
}

.toolbar-settings[open] .toolbar-settings-chevron {
transform: rotate(45deg);
}

.toolbar-settings-body {
padding-bottom: 12px;
}

.toolbar-section-header {
Expand All @@ -1725,15 +1746,6 @@
padding-bottom: 2px;
}

.toolbar-section-header h3 {
margin: 0;
font-size: 12px;
font-weight: 600;
color: var(--color-fg-muted);
text-transform: uppercase;
letter-spacing: 0.5px;
}

.toolbar-settings-list {
display: flex;
flex-direction: column;
Expand Down
Loading