Skip to content
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 27 additions & 7 deletions src/lib/MarkdownViewer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { emitTo } from '@tauri-apps/api/event';
import { getCurrentWindow } from '@tauri-apps/api/window';
import { onMount, tick, untrack } from 'svelte';
import { fade, fly } from 'svelte/transition';
import { fade, fly, slide } from 'svelte/transition';
import { cubicOut } from 'svelte/easing';
import { openPath, openUrl } from '@tauri-apps/plugin-opener';
import { open, save, ask } from '@tauri-apps/plugin-dialog';
Expand Down Expand Up @@ -107,7 +107,7 @@ import { createDocumentSession, type LoadMarkdownOptions } from './sessions/docu
handleDroppedFile: (path: string, x: number, y: number) => Promise<void>;
updateDragCaret: (x: number, y: number) => void;
hideDragCaret: () => void;
runEditorAction: (actionId: string) => void;
runEditorAction: (actionId: string, payload?: any) => void;
undo: () => void;
redo: () => void;
revealHeader: (text: string) => void;
Expand Down Expand Up @@ -3038,6 +3038,7 @@ import { createDocumentSession, type LoadMarkdownOptions } from './sessions/docu
ononpenFileLocation={openFileLocation}
ontoggleLiveMode={toggleLiveMode}
ontoggleEdit={() => toggleEdit()}
ontoggleEditorToolbar={() => settings.toggleEditorToolbar()}
ontoggleSplit={() => tabManager.activeTabId && toggleSplitView(tabManager.activeTabId)}
{isEditing}
ondetach={handleDetach}
Expand Down Expand Up @@ -3076,11 +3077,30 @@ import { createDocumentSession, type LoadMarkdownOptions } from './sessions/docu
<!-- Editor Pane -->
<div bind:this={editorPaneEl} class="pane editor-pane" class:active={isEditing || isSplit} style="flex: {isSplit ? tabManager.activeTab.splitRatio : isEditing ? 1 : 0}">
{#if isEditing || isSplit}
<EditorToolbar
modifier={settings.osType === 'macos' ? 'Cmd' : 'Ctrl'}
toolbarOrder={settings.editorToolbarOrder}
toolbarHidden={settings.editorToolbarHidden}
onaction={(actionId) => editorPane?.runEditorAction(actionId)} />
{#if settings.showEditorToolbar}
<div transition:slide={{ duration: 150 }}>
<EditorToolbar
modifier={settings.osType === 'macos' ? 'Cmd' : 'Ctrl'}
toolbarOrder={settings.editorToolbarOrder}
toolbarHidden={settings.editorToolbarHidden}
onaction={(actionId, payload) => editorPane?.runEditorAction(actionId, payload)}
ontoggleHide={() => settings.toggleEditorToolbar()}
onshowTooltip={(e, text, shortcut, align) => {
const rect = (e.currentTarget as HTMLElement).getBoundingClientRect();
tooltip = {
show: true,
text,
shortcut: shortcut || '',
html: '',
isFootnote: false,
x: align === 'right' ? rect.right + 8 : (align === 'left' ? rect.left - 8 : rect.left + rect.width / 2),
y: align === 'below' ? rect.bottom + 8 : rect.top - 8,
align: (align as any) || 'below'
};
}}
onhideTooltip={() => (tooltip.show = false)} />
</div>
{/if}
<Editor
bind:this={editorPane}
bind:value={tabManager.activeTab.rawContent}
Expand Down
38 changes: 37 additions & 1 deletion src/lib/components/Editor.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -1375,9 +1375,45 @@
editor.getAction("actions.find")?.run();
}

export function runEditorAction(actionId: string) {
export function insertTableCustom(rows: number, cols: number) {
if (!editor) return;
editor.focus();
const selection = editor.getSelection();
if (!selection) return;

const c = Math.max(1, cols);
const r = Math.max(1, rows);

let table = "\n";
const headers = Array.from({ length: c }, (_, i) => `Header ${i + 1}`);
table += "| " + headers.join(" | ") + " |\n";

const dividers = Array(c).fill("---");
table += "| " + dividers.join(" | ") + " |\n";

const dataRowCount = Math.max(1, r - 1);
for (let row = 0; row < dataRowCount; row++) {
const cells = Array.from({ length: c }, (_, col) => `Cell ${row + 1}.${col + 1}`);
table += "| " + cells.join(" | ") + " |\n";
}
table += "\n";

editor.executeEdits("insert-table", [
{
range: selection,
text: table,
forceMoveMarkers: true,
},
]);
}

export function runEditorAction(actionId: string, payload?: any) {
if (!editor) return;
editor.focus();
if (actionId === 'insert-table-grid' && payload && typeof payload === 'object') {
insertTableCustom(payload.rows ?? 2, payload.cols ?? 3);
return;
}
editor.getAction(actionId)?.run();
}

Expand Down
Loading
Loading