Skip to content
Open
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
16 changes: 16 additions & 0 deletions scripts/macosPdfExport.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import assert from 'node:assert/strict';
import { readFileSync } from 'node:fs';
import test from 'node:test';

test('all Markpad webviews may invoke Tauri native printing', () => {
const capability = JSON.parse(readFileSync('src-tauri/capabilities/default.json', 'utf8')) as {
windows: string[];
permissions: string[];
};

assert.deepEqual(capability.windows, ['main', 'installer', 'window-*']);
assert.ok(
capability.permissions.includes('core:webview:allow-print'),
'macOS replaces window.print() with Tauri native printing, which requires this permission',
);
});
6 changes: 3 additions & 3 deletions scripts/reloadOpenToolbar.test.ts
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
14 changes: 14 additions & 0 deletions scripts/windowTitleCapability.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import assert from 'node:assert/strict';
import { readFileSync } from 'node:fs';
import test from 'node:test';

test('all Markpad windows may update their native title', () => {
const capability = JSON.parse(readFileSync('src-tauri/capabilities/default.json', 'utf8')) as {
permissions: string[];
};

assert.ok(
capability.permissions.includes('core:window:allow-set-title'),
'window tags and active document names call appWindow.setTitle(), which requires this permission',
);
});
4 changes: 3 additions & 1 deletion src-tauri/capabilities/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
"opener:allow-open-url",
"opener:allow-open-path",
"dialog:default",
"core:webview:allow-print",
"core:window:allow-start-dragging",
"core:window:allow-set-title",
"core:window:allow-minimize",
"core:window:allow-toggle-maximize",
"core:window:allow-close",
Expand All @@ -25,4 +27,4 @@
"updater:default",
"process:default"
]
}
}
56 changes: 34 additions & 22 deletions src/lib/components/Settings.svelte
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