Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
refactor(web): move web components into central library (#4264)
Elijah Potterf769a07eba2d
diff --git a/harper-desktop/package.json b/harper-desktop/package.jsonindex 1b32a17a7..53fe10c59 100644--- a/harper-desktop/package.json+++ b/harper-desktop/package.json@@ -17,6 +17,7 @@"@tauri-apps/plugin-autostart": "^2.5.1","@tauri-apps/plugin-opener": "^2","@tauri-apps/plugin-updater": "^2.10.1",+ "components": "workspace:*","harper-editor": "workspace:*","harper.js": "workspace:*"},diff --git a/harper-desktop/src/app.css b/harper-desktop/src/app.cssindex c660ee276..565420eb6 100644--- a/harper-desktop/src/app.css+++ b/harper-desktop/src/app.css@@ -1,4 +1,5 @@@import "tailwindcss";+@import "components/components.css";@layer base {html,@@ -18,68 +19,5 @@height: 16px;flex: 0 0 16px;display: inline-block;- background: currentColor;- -webkit-mask: var(--settings-icon-url) center / contain no-repeat;- mask: var(--settings-icon-url) center / contain no-repeat;- }-- .settings-icon.getting-started {- --settings-icon-url: url("/settings-icons/rocket.svg");- }-- .settings-icon.general {- --settings-icon-url: url("/settings-icons/gear.svg");- }-- .settings-icon.writing {- --settings-icon-url: url("/settings-icons/quill.svg");- }-- .settings-icon.dictionary {- --settings-icon-url: url("/settings-icons/book.svg");- }-- .settings-icon.shortcuts {- --settings-icon-url: url("/settings-icons/key.svg");- }-- .settings-icon.rules {- --settings-icon-url: url("/settings-icons/checklist.svg");- }-- .settings-icon.weirpacks {- --settings-icon-url: url("/settings-icons/package.svg");- }-- .settings-icon.integrations {- --settings-icon-url: url("/settings-icons/grid.svg");- }-- .settings-icon.about {- --settings-icon-url: url("/settings-icons/info.svg");- }-- .settings-icon.icon-check {- --settings-icon-url: url("/settings-icons/check.svg");- }-- .settings-icon.icon-package {- --settings-icon-url: url("/settings-icons/package.svg");- }-- .settings-icon.icon-search {- --settings-icon-url: url("/settings-icons/search.svg");- }-- .settings-icon.icon-trash {- --settings-icon-url: url("/settings-icons/trash.svg");- }-- .settings-icon.icon-upload {- --settings-icon-url: url("/settings-icons/upload.svg");- }-- .settings-icon.icon-x {- --settings-icon-url: url("/settings-icons/x.svg");}}diff --git a/harper-desktop/src/lib/settings/SettingsSidebar.svelte b/harper-desktop/src/lib/settings/SettingsSidebar.svelteindex 7febefedf..ad5353cfb 100644--- a/harper-desktop/src/lib/settings/SettingsSidebar.svelte+++ b/harper-desktop/src/lib/settings/SettingsSidebar.svelte@@ -1,6 +1,29 @@<script lang="ts">+import {+ BookIcon,+ ChecklistIcon,+ GearIcon,+ GridIcon,+ InfoIcon,+ KeyIcon,+ PackageIcon,+ QuillIcon,+ RocketIcon,+} from 'components';import { FOOTER_NAV_ITEMS, MAIN_NAV_ITEMS, type SectionId } from './settings-data';+const SECTION_ICONS: Record<SectionId, typeof RocketIcon> = {+ 'getting-started': RocketIcon,+ general: GearIcon,+ writing: QuillIcon,+ dictionary: BookIcon,+ shortcuts: KeyIcon,+ rules: ChecklistIcon,+ weirpacks: PackageIcon,+ integrations: GridIcon,+ about: InfoIcon,+};+export let active: SectionId;export let hasSetupAlert = false;</script>@@ -15,7 +38,7 @@ export let hasSetupAlert = false;on:click={() => (active = item.id)}><span class="tile" style={`--tile-gradient: ${item.gradient}`}>- <span class={`settings-icon ${item.id}`} aria-hidden="true"></span>+ <svelte:component this={SECTION_ICONS[item.id]} className="settings-icon" /></span><span class="label">{item.label}</span>{#if item.id === "getting-started" && hasSetupAlert}@@ -36,7 +59,7 @@ export let hasSetupAlert = false;on:click={() => (active = item.id)}><span class="tile" style={`--tile-gradient: ${item.gradient}`}>- <span class={`settings-icon ${item.id}`} aria-hidden="true"></span>+ <svelte:component this={SECTION_ICONS[item.id]} className="settings-icon" /></span><span class="label">{item.label}</span></button>diff --git a/harper-desktop/src/lib/settings/components/AppPickerModal.svelte b/harper-desktop/src/lib/settings/components/AppPickerModal.svelteindex 42acb4b0a..001b30572 100644--- a/harper-desktop/src/lib/settings/components/AppPickerModal.svelte+++ b/harper-desktop/src/lib/settings/components/AppPickerModal.svelte@@ -1,4 +1,5 @@<script lang="ts">+import { SearchIcon } from 'components';import { onMount } from 'svelte';import { type AppSearchResult, Client } from '$lib/client';import AppIcon from './AppIcon.svelte';@@ -103,7 +104,7 @@ function submit() {<span>Enter the app bundle ID Harper should watch.</span></div><div class="modal-search">- <span class="settings-icon icon-search" aria-hidden="true"></span>+ <SearchIcon className="settings-icon" /><inputtype="text"placeholder="Search for an app..."diff --git a/harper-desktop/src/lib/settings/pages/AboutPage.svelte b/harper-desktop/src/lib/settings/pages/AboutPage.svelteindex fd1800519..6b2a70774 100644--- a/harper-desktop/src/lib/settings/pages/AboutPage.svelte+++ b/harper-desktop/src/lib/settings/pages/AboutPage.svelte@@ -1,5 +1,6 @@<script lang="ts">import { openUrl } from '@tauri-apps/plugin-opener';+import { Button } from 'components';import { onMount } from 'svelte';import { DesktopUpdater } from '$lib/DesktopUpdater';@@ -30,13 +31,14 @@ async function loadCurrentVersion() {telemetry, no cloud.</p><div class="actions-row center">- <button+ <Button+ unstyledclass="button"type="button"on:click={() => void openUrl('https://github.com/Automattic/harper/releases/latest')}- >Release notes</button>- <button class="button" type="button" on:click={() => void openUrl(SOURCE_URL)}>Source on GitHub</button>- <button class="button" type="button" on:click={() => void openUrl(ISSUE_URL)}>Report an issue</button>+ >Release notes</Button>+ <Button unstyled class="button" type="button" on:click={() => void openUrl(SOURCE_URL)}>Source on GitHub</Button>+ <Button unstyled class="button" type="button" on:click={() => void openUrl(ISSUE_URL)}>Report an issue</Button></div><div class="about-footer">Harper is free software released under the Apache 2.0 license.diff --git a/harper-desktop/src/lib/settings/pages/DictionaryPage.svelte b/harper-desktop/src/lib/settings/pages/DictionaryPage.svelteindex 03fba8a4b..a2809d9c5 100644--- a/harper-desktop/src/lib/settings/pages/DictionaryPage.svelte+++ b/harper-desktop/src/lib/settings/pages/DictionaryPage.svelte@@ -1,4 +1,5 @@<script lang="ts">+import { Button, CloseIcon, IconButton, Input, Panel, SearchField, SearchIcon } from 'components';import { onMount } from 'svelte';import { Client } from '$lib/client';@@ -162,32 +163,33 @@ async function submitDictionaryWord() {{/if}<div class="add-row">- <input+ <Input+ unstyledclass="text-field"type="text"placeholder="Add a word..."disabled={isDictionaryLoading || isDictionarySaving}bind:value={newDictionaryWord}- on:keydown={(event) => event.key === "Enter" && submitDictionaryWord()}+ on:keydown={(event) => event.detail.key === "Enter" && submitDictionaryWord()}/>- <button+ <Button+ unstyledclass="button primary"type="button"disabled={isDictionaryLoading || isDictionarySaving}on:click={submitDictionaryWord}- >Add</button>+ >Add</Button></div>- <div class="list-card">- <div class="search-strip">- <span class="settings-icon icon-search" aria-hidden="true"></span>- <input- type="text"- placeholder={`Search ${dictionary.length} words`}- bind:value={dictionarySearch}- />- <span>{filteredWords.length} of {dictionary.length}</span>- </div>+ <Panel>+ <SearchField+ class="search-strip"+ placeholder={`Search ${dictionary.length} words`}+ bind:value={dictionarySearch}+ >+ <SearchIcon slot="leading" className="control-icon" />+ <span slot="trailing">{filteredWords.length} of {dictionary.length}</span>+ </SearchField><div class="dictionary-list">{#if filteredWords.length === 0}@@ -196,20 +198,19 @@ async function submitDictionaryWord() {{#each filteredWords as word}<div class="list-row"><code>{word}</code>- <button- class="icon-button danger"- type="button"+ <IconButton+ dangerdisabled={isDictionaryLoading || isDictionarySaving}aria-label={`Remove ${word}`}on:click={() => removeDictionaryWord(word)}>- <span class="settings-icon icon-x" aria-hidden="true"></span>- </button>+ <CloseIcon className="control-icon" />+ </IconButton></div>{/each}{/if}</div>- </div>+ </Panel><div class="actions-row"><input@@ -219,27 +220,30 @@ async function submitDictionaryWord() {hiddenon:change={importDictionary}/>- <button+ <Button+ unstyledclass="button"type="button"disabled={isDictionaryLoading || isDictionarySaving}on:click={() => importInput.click()}- >Import from file...</button>- <button+ >Import from file...</Button>+ <Button+ unstyledclass="button"type="button"disabled={isDictionaryLoading || isDictionarySaving || dictionary.length === 0}on:click={exportDictionary}- >Export dictionary</button>+ >Export dictionary</Button><span class="spacer"></span>- <button+ <Button+ unstyledclass="button danger"type="button"disabled={isDictionaryLoading || isDictionarySaving}on:click={clearDictionary}>Clear all- </button>+ </Button></div></div></section>diff --git a/harper-desktop/src/lib/settings/pages/GeneralPage.svelte b/harper-desktop/src/lib/settings/pages/GeneralPage.svelteindex 25f93a45b..9ec46e00c 100644--- a/harper-desktop/src/lib/settings/pages/GeneralPage.svelte+++ b/harper-desktop/src/lib/settings/pages/GeneralPage.svelte@@ -1,4 +1,5 @@<script lang="ts">+import { Button, Checkbox, CheckIcon, Input, Select, SettingRow } from 'components';import type { Dialect } from 'harper.js';import { onMount } from 'svelte';import { Client } from '$lib/client';@@ -274,41 +275,33 @@ function settingsValueToDialect(value: string): Dialect {<div class="stanza"><div class="eyebrow">General</div><div class="rows">- <div class="row top">- <div>- <strong>Keep Harper in the menu bar</strong>- <p>Shows the Harper icon so you can open settings without opening the main app.</p>- </div>- <button- class:checked={menuBar}- class="checkbox"- type="button"- role="checkbox"+ <SettingRow top>+ <strong>Keep Harper in the menu bar</strong>+ <p>Shows the Harper icon so you can open settings without opening the main app.</p>+ <Checkbox+ slot="control"+ appearance="settings"+ checked={menuBar}disabledtitle="Not wired yet"- aria-checked={menuBar}>- {#if menuBar}<span class="settings-icon icon-check" aria-hidden="true"></span>{/if}- </button>- </div>-- <div class="row">- <div>- <strong>Launch Harper at startup</strong>- <p>Harper will start silently when you log in.</p>- </div>- <button- class:checked={launchAtStartup}- class="checkbox"- type="button"- role="checkbox"+ {#if menuBar}<CheckIcon className="control-icon" />{/if}+ </Checkbox>+ </SettingRow>++ <SettingRow>+ <strong>Launch Harper at startup</strong>+ <p>Harper will start silently when you log in.</p>+ <Checkbox+ slot="control"+ appearance="settings"+ checked={launchAtStartup}disabled={isLaunchAtStartupLoading || isLaunchAtStartupSaving}- aria-checked={launchAtStartup}on:click={() => setLaunchAtStartup(!launchAtStartup)}>- {#if launchAtStartup}<span class="settings-icon icon-check" aria-hidden="true"></span>{/if}- </button>- </div>+ {#if launchAtStartup}<CheckIcon className="control-icon" />{/if}+ </Checkbox>+ </SettingRow>{#if isLaunchAtStartupLoading}<p class="result-summary">Loading startup setting...</p>{:else if launchAtStartupError}@@ -317,35 +310,32 @@ function settingsValueToDialect(value: string): Dialect {<p class="result-summary">Saving startup setting...</p>{/if}- <div class="row top">- <div>- <strong>Automatically check for updates</strong>- <p>Harper will check for new versions daily.</p>- <p class="result-summary">- Current version: {currentVersion || 'loading...'} · Latest version: {latestVersion || 'loading...'}- </p>- </div>- <button- class:checked={autoUpdate}- class="checkbox"- type="button"- role="checkbox"+ <SettingRow top>+ <strong>Automatically check for updates</strong>+ <p>Harper will check for new versions daily.</p>+ <p class="result-summary">+ Current version: {currentVersion || 'loading...'} · Latest version: {latestVersion || 'loading...'}+ </p>+ <Checkbox+ slot="control"+ appearance="settings"+ checked={autoUpdate}disabled={isAutoUpdateLoading || isAutoUpdateSaving}- aria-checked={autoUpdate}on:click={() => setAutoUpdate(!autoUpdate)}>- {#if autoUpdate}<span class="settings-icon icon-check" aria-hidden="true"></span>{/if}- </button>- </div>+ {#if autoUpdate}<CheckIcon className="control-icon" />{/if}+ </Checkbox>+ </SettingRow><div class="inline-row">- <button+ <Button+ unstyledclass="button"type="button"disabled={isCheckingForUpdates}on:click={checkForUpdates}>{isCheckingForUpdates ? 'Checking...' : 'Check for updates'}- </button>+ </Button></div>{#if isAutoUpdateLoading}<p class="result-summary">Loading update setting...</p>@@ -368,17 +358,18 @@ function settingsValueToDialect(value: string): Dialect {</p><div class="inline-row"><label for="dialect">English dialect:</label>- <select+ <Select+ unstyledid="dialect"class="select wide"disabled={isDialectLoading || isDialectSaving}bind:value={dialect}- on:change={(event) => setDialect(event.currentTarget.value)}+ on:change={(event) => setDialect((event.detail.currentTarget as HTMLSelectElement).value)}>{#each DIALECT_OPTIONS as option}<option value={option.value}>{option.label}</option>{/each}- </select>+ </Select></div>{#if isDialectLoading}<p class="result-summary">Loading dialect...</p>@@ -399,15 +390,15 @@ function settingsValueToDialect(value: string): Dialect {</p><div class="inline-row"><label for="debounce-ms">Debounce delay:</label>- <input+ <Input+ unstyledid="debounce-ms"class="select"type="number"min="0"step="50"disabled={isDebounceLoading || isDebounceSaving}- value={debounceMsInput}- on:input={(event) => (debounceMsInput = event.currentTarget.value)}+ bind:value={debounceMsInput}on:change={saveDebounceMs}/><span>ms</span>diff --git a/harper-desktop/src/lib/settings/pages/GettingStartedPage.svelte b/harper-desktop/src/lib/settings/pages/GettingStartedPage.svelteindex 71f8b45bb..07f9fa283 100644--- a/harper-desktop/src/lib/settings/pages/GettingStartedPage.svelte+++ b/harper-desktop/src/lib/settings/pages/GettingStartedPage.svelte@@ -1,4 +1,5 @@<script lang="ts">+import { Button, CheckIcon } from 'components';import { onMount } from 'svelte';import { type AccessibilityPermissionStatus, Client, type Integration } from '$lib/client';import AppIcon from '../components/AppIcon.svelte';@@ -274,7 +275,7 @@ function buildSetupSteps({#if setupAllDone}<div class="success-banner"><div class="big-mark green">- <span class="settings-icon icon-check" aria-hidden="true"></span>+ <CheckIcon className="control-icon" /></div><div class="grow"><h2>You're all set</h2>@@ -286,9 +287,9 @@ function buildSetupSteps(<p>{onboardingError}</p>{/if}</div>- <button class="button" type="button" disabled={isCompletingOnboarding} on:click={completeOnboarding}>+ <Button unstyled class="button" type="button" disabled={isCompletingOnboarding} on:click={completeOnboarding}>{isCompletingOnboarding ? "Continuing..." : "Continue"}- </button>+ </Button></div>{:else}{#if accessibilityStatus !== "Granted"}@@ -326,7 +327,7 @@ function buildSetupSteps(<div class:done={step.done} class:locked={step.locked} class="step-row"><div class="step-dot">{#if step.done}- <span class="settings-icon icon-check" aria-hidden="true"></span>+ <CheckIcon className="control-icon" />{:else}{index + 1}{/if}@@ -399,20 +400,21 @@ function buildSetupSteps(<strong>TextEdit detected</strong><p>A good starter app for trying Harper.</p></div>- <button class="button primary" type="button" disabled={isEnablingTextEdit} on:click={enableTextEditForSetup}>+ <Button unstyled class="button primary" type="button" disabled={isEnablingTextEdit} on:click={enableTextEditForSetup}>{isEnablingTextEdit ? "Enabling..." : "Enable"}- </button>+ </Button></div>{/if}</div>- <button+ <Button+ unstyledclass={`button ${step.actionVariant === "primary" ? "primary" : ""}`}type="button"disabled={step.locked || step.actionDisabled}on:click={step.action}>{step.actionLabel}- </button>+ </Button></div>{/each}</div>diff --git a/harper-desktop/src/lib/settings/pages/IntegrationsPage.svelte b/harper-desktop/src/lib/settings/pages/IntegrationsPage.svelteindex 353cd909e..81a98252b 100644--- a/harper-desktop/src/lib/settings/pages/IntegrationsPage.svelte+++ b/harper-desktop/src/lib/settings/pages/IntegrationsPage.svelte@@ -1,4 +1,5 @@<script lang="ts">+import { Button, Checkbox, IconButton, Panel, SettingRow, Toggle, TrashIcon } from 'components';import { onMount } from 'svelte';import { Client, type Integration } from '$lib/client';import AppIcon from '../components/AppIcon.svelte';@@ -140,7 +141,7 @@ function closeAppPicker() {<p class="result-summary">Saving integrations...</p>{/if}- <div class="list-card">+ <Panel>{#if !isIntegrationsLoading && integrationApps.length === 0}<div class="empty">No configured app integrations.</div>{:else}@@ -151,39 +152,34 @@ function closeAppPicker() {<strong>{app.name}</strong><p>{app.bundle_id}</p></div>- <button- class="icon-button danger"- type="button"+ <IconButton+ dangerdisabled={isIntegrationsLoading || isIntegrationsSaving}aria-label={`Remove ${app.name}`}on:click={() => removeIntegration(app.bundle_id)}>- <span class="settings-icon icon-trash" aria-hidden="true"></span>- </button>- <button- class:checked={app.enabled}- class="toggle"- type="button"- role="switch"+ <TrashIcon className="control-icon" />+ </IconButton>+ <Toggle+ appearance="settings"+ checked={app.enabled}disabled={isIntegrationsLoading || isIntegrationsSaving}- aria-checked={app.enabled}aria-label={`Toggle ${app.name}`}on:click={() => setIntegrationEnabled(app.bundle_id, !app.enabled)}- >- <span></span>- </button>+ /></div>{/each}{/if}- </div>+ </Panel><div class="actions-row">- <button+ <Button+ unstyledclass="button"type="button"disabled={isIntegrationsLoading || isIntegrationsSaving}on:click={() => (appPickerOpen = true)}- >Add application...</button>+ >Add application...</Button><span class="muted">Choose any app from your Applications folder.</span></div></div>@@ -192,20 +188,17 @@ function closeAppPicker() {<div class="stanza"><div class="eyebrow">New apps</div>- <div class="row top">- <div>- <strong>Enable new apps automatically</strong>- <p>When you launch a supported app for the first time, turn integration on by default.</p>- </div>- <button- class="checkbox"- type="button"- role="checkbox"- aria-checked="false"+ <SettingRow top>+ <strong>Enable new apps automatically</strong>+ <p>When you launch a supported app for the first time, turn integration on by default.</p>+ <Checkbox+ slot="control"+ appearance="settings"+ checked={false}disabledtitle="Not wired yet"- ></button>- </div>+ />+ </SettingRow></div></section>diff --git a/harper-desktop/src/lib/settings/pages/RulesPage.svelte b/harper-desktop/src/lib/settings/pages/RulesPage.svelteindex e50bb203d..ebedd32ed 100644--- a/harper-desktop/src/lib/settings/pages/RulesPage.svelte+++ b/harper-desktop/src/lib/settings/pages/RulesPage.svelte@@ -1,4 +1,5 @@<script lang="ts">+import { Button, CloseIcon, IconButton, SearchField, SearchIcon, Select } from 'components';import type { LintConfig, StructuredLintConfig, StructuredLintSetting } from 'harper.js';import { onMount } from 'svelte';import { Client } from '$lib/client';@@ -334,21 +335,20 @@ function toggleGroup(groupId: string) {{/if}<div class="sticky-tools">- <div class="rule-search">- <span class="settings-icon icon-search" aria-hidden="true"></span>- <input type="text" placeholder="Search rules..." bind:value={rulesSearch} />+ <SearchField class="rule-search" placeholder="Search rules..." bind:value={rulesSearch}>+ <SearchIcon slot="leading" className="control-icon" />{#if rulesSearch}- <button class="icon-button" type="button" aria-label="Clear search" on:click={() => (rulesSearch = "")}>- <span class="settings-icon icon-x" aria-hidden="true"></span>- </button>+ <IconButton slot="trailing" aria-label="Clear search" on:click={() => (rulesSearch = "")}>+ <CloseIcon className="control-icon" />+ </IconButton>{/if}- </div>- <button class="button" type="button" disabled={isLintConfigLoading || isLintConfigSaving} on:click={resetRules}>+ </SearchField>+ <Button unstyled class="button" type="button" disabled={isLintConfigLoading || isLintConfigSaving} on:click={resetRules}>Reset to defaults- </button>- <button class="button" type="button" disabled={isLintConfigLoading || isLintConfigSaving} on:click={disableRules}>+ </Button>+ <Button unstyled class="button" type="button" disabled={isLintConfigLoading || isLintConfigSaving} on:click={disableRules}>Disable all- </button>+ </Button></div>{#if rulesQuery}@@ -363,7 +363,7 @@ function toggleGroup(groupId: string) {{@const expanded = rulesQuery || expandedGroups[group.id]}{@const groupState = getGroupState(group)}<article class="rule-group">- <button class="group-head" type="button" on:click={() => toggleGroup(group.id)}>+ <Button unstyled class="group-head" type="button" on:click={() => toggleGroup(group.id)}><svg class:expanded class="chevron" viewBox="0 0 16 16" aria-hidden="true"><pathfill-rule="evenodd"@@ -379,18 +379,19 @@ function toggleGroup(groupId: string) {enabled</small></span>- <select+ <Select+ unstyledclass="select compact"disabled={isLintConfigLoading || isLintConfigSaving}value={groupState === "mixed" ? "default" : groupState}- on:click|stopPropagation={() => {}}- on:change={(event) => setGroupOverride(group, event.currentTarget.value as RuleOverride)}+ on:click={(event) => event.detail.stopPropagation()}+ on:change={(event) => setGroupOverride(group, (event.detail.currentTarget as HTMLSelectElement).value as RuleOverride)}><option value="default">{groupState === "mixed" ? "Mixed" : "Default"}</option><option value="on">Enable all</option><option value="off">Disable all</option>- </select>- </button>+ </Select>+ </Button>{#if expanded}<div class="rules-list">@@ -403,16 +404,17 @@ function toggleGroup(groupId: string) {{/if}<p>{rule.desc}</p></div>- <select+ <Select+ unstyledclass="select compact"disabled={isLintConfigLoading || isLintConfigSaving}value={getRuleValue(rule.id)}- on:change={(event) => setRuleOverride(rule.id, event.currentTarget.value as RuleOverride)}+ on:change={(event) => setRuleOverride(rule.id, (event.detail.currentTarget as HTMLSelectElement).value as RuleOverride)}>{#each defaultRuleOptions as option}<option value={option.value}>{option.label}</option>{/each}- </select>+ </Select></div>{/each}</div>diff --git a/harper-desktop/src/lib/settings/pages/ShortcutsPage.svelte b/harper-desktop/src/lib/settings/pages/ShortcutsPage.svelteindex 154d27860..d641c6d0e 100644--- a/harper-desktop/src/lib/settings/pages/ShortcutsPage.svelte+++ b/harper-desktop/src/lib/settings/pages/ShortcutsPage.svelte@@ -1,4 +1,6 @@<script lang="ts">+import { Button, Checkbox, CheckIcon, Select, SettingRow } from 'components';+const shortcutItems = [{ id: 'show-menu', label: 'Show Harper menu', keys: ['Shift', 'Cmd', 'H'] },{ id: 'quick-review', label: 'Open quick review', keys: ['Ctrl', 'Cmd', 'Space'] },@@ -22,7 +24,7 @@ let activationKey = 'off';<div class="shortcut-list">{#each shortcutItems as item}- <button class="shortcut-row" type="button" disabled title="Not wired yet">+ <Button unstyled class="shortcut-row" type="button" disabled title="Not wired yet"><span>{item.label}</span>{#if item.keys.length > 0}<span class="kbd-group">@@ -33,39 +35,35 @@ let activationKey = 'off';{:else}<em>Click to record...</em>{/if}- </button>+ </Button>{/each}</div>- <div class="row top">- <div>- <strong>Allow shortcuts while other apps are focused</strong>- <p>When off, Harper shortcuts only work while the Harper window is active.</p>- </div>- <button- class:checked={globalShortcuts}- class="checkbox"- type="button"- role="checkbox"+ <SettingRow top>+ <strong>Allow shortcuts while other apps are focused</strong>+ <p>When off, Harper shortcuts only work while the Harper window is active.</p>+ <Checkbox+ slot="control"+ appearance="settings"+ checked={globalShortcuts}disabledtitle="Not wired yet"- aria-checked={globalShortcuts}>- {#if globalShortcuts}<span class="settings-icon icon-check" aria-hidden="true"></span>{/if}- </button>- </div>+ {#if globalShortcuts}<CheckIcon className="control-icon" />{/if}+ </Checkbox>+ </SettingRow></div><div class="divider"></div><div class="stanza"><div class="eyebrow">Activation</div>- <div class="row top">- <div>- <strong>Activation key</strong>- <p>Require a modifier key to enable Harper checking in a window.</p>- </div>- <select+ <SettingRow top>+ <strong>Activation key</strong>+ <p>Require a modifier key to enable Harper checking in a window.</p>+ <Select+ slot="control"+ unstyledclass="select"disabledtitle="Not wired yet"@@ -75,7 +73,7 @@ let activationKey = 'off';<option value="option">Option</option><option value="control">Control</option><option value="shift">Shift</option>- </select>- </div>+ </Select>+ </SettingRow></div></section>diff --git a/harper-desktop/src/lib/settings/pages/WeirpacksPage.svelte b/harper-desktop/src/lib/settings/pages/WeirpacksPage.svelteindex 2cc2e940d..20ccfa4fd 100644--- a/harper-desktop/src/lib/settings/pages/WeirpacksPage.svelte+++ b/harper-desktop/src/lib/settings/pages/WeirpacksPage.svelte@@ -1,4 +1,14 @@<script lang="ts">+import {+ Button,+ IconButton,+ Input,+ PackageIcon,+ Panel,+ Toggle,+ TrashIcon,+ UploadIcon,+} from 'components';import { createInitialSettingsState, type Weirpack } from '../settings-data';let weirpacks = createInitialSettingsState().weirpacks;@@ -74,7 +84,7 @@ function commitRenamePack() {}}><span class="big-mark purple">- <span class="settings-icon icon-upload" aria-hidden="true"></span>+ <UploadIcon className="control-icon" /></span><span class="grow"><strong>{packDragState === "dragging" ? "Drop to install" : "Install a Weirpack"}</strong>@@ -97,31 +107,32 @@ function commitRenamePack() {<div class="stanza"><div class="eyebrow">Installed packs</div>- <div class="list-card">+ <Panel>{#each weirpacks as pack}<div class:disabled={!pack.enabled} class="pack-row"><div class="pack-icon">- <span class="settings-icon icon-package" aria-hidden="true"></span>+ <PackageIcon className="settings-icon" /></div><div class="grow">{#if editingPackId === pack.id}- <input+ <Input+ unstyledclass="inline-edit"type="text"bind:value={editingPackName}on:blur={commitRenamePack}on:keydown={(event) => {- if (event.key === "Enter") commitRenamePack();- if (event.key === "Escape") {+ if (event.detail.key === "Enter") commitRenamePack();+ if (event.detail.key === "Escape") {editingPackId = null;editingPackName = "";}}}/>{:else}- <button class="pack-title" type="button" disabled title="Not wired yet" on:dblclick={() => startRenamePack(pack)}>+ <Button unstyled class="pack-title" type="button" disabled title="Not wired yet" on:dblclick={() => startRenamePack(pack)}>{pack.name}- </button>+ </Button>{/if}<p><code>{pack.filename}</code>@@ -131,31 +142,25 @@ function commitRenamePack() {<span class={`status ${pack.installState}`}>{pack.installState}</span>{/if}</div>- <button- class="icon-button danger"- type="button"+ <IconButton+ dangerdisabledtitle="Not wired yet"aria-label={`Remove ${pack.name}`}on:click={() => removePack(pack.id)}>- <span class="settings-icon icon-trash" aria-hidden="true"></span>- </button>- <button- class:checked={pack.enabled}- class="toggle"- type="button"- role="switch"+ <TrashIcon className="control-icon" />+ </IconButton>+ <Toggle+ appearance="settings"+ checked={pack.enabled}disabledtitle="Not wired yet"- aria-checked={pack.enabled}aria-label={`Toggle ${pack.name}`}on:click={() => updatePack(pack.id, { enabled: !pack.enabled })}- >- <span></span>- </button>+ /></div>{/each}- </div>+ </Panel></div></section>diff --git a/harper-desktop/src/lib/settings/settings.css b/harper-desktop/src/lib/settings/settings.cssindex ab1988a9b..821688cea 100644--- a/harper-desktop/src/lib/settings/settings.css+++ b/harper-desktop/src/lib/settings/settings.css@@ -190,7 +190,6 @@ button {}.step-list,-.list-card,.rule-group {overflow: hidden;border: 0.5px solid var(--settings-line-strong);@@ -276,22 +275,12 @@ button {gap: 22px;}-.row,.inline-row {display: flex;align-items: center;gap: 24px;}-.row.top {- align-items: flex-start;-}--.row > div:first-child {- flex: 1;- min-width: 0;-}-.row strong,.inline-row label {display: inline-block;@@ -377,59 +366,22 @@ button {padding: 0 10px;}-.checkbox {- width: 16px;- height: 16px;- flex: 0 0 16px;- display: grid;- place-items: center;- border-radius: 4px;- border: 1px solid rgba(0, 0, 0, 0.25);- background: #fff;- color: #fff;- padding: 0;-}--.checkbox.checked {- border-color: rgba(0, 0, 0, 0.15);- background: var(--settings-accent);-}--.checkbox .settings-icon {- width: 11px;- height: 11px;- flex-basis: 11px;+.control-icon {+ width: 13px;+ height: 13px;+ flex: 0 0 13px;}-.toggle {- width: 34px;+.big-mark .control-icon {+ width: 20px;height: 20px;- flex: 0 0 34px;- border: 0;- border-radius: 999px;- background: #d4cfc4;- padding: 2px;- box-shadow: inset 0 0.5px 1px rgba(0, 0, 0, 0.1);-}--.toggle span {- display: block;- width: 16px;- height: 16px;- border-radius: 999px;- background: #fff;- box-shadow:- 0 1px 2px rgba(0, 0, 0, 0.2),- 0 0.5px 0 rgba(0, 0, 0, 0.1);- transition: transform 150ms ease;-}--.toggle.checked {- background: var(--settings-accent);+ flex-basis: 20px;}-.toggle.checked span {- transform: translateX(14px);+.success-banner .big-mark .control-icon {+ width: 22px;+ height: 22px;+ flex-basis: 22px;}.add-row {@@ -494,30 +446,10 @@ code {font-size: 12px;}-.icon-button {- width: 26px;- height: 26px;- flex: 0 0 26px;- display: grid;- place-items: center;- border: 0;- border-radius: 6px;- background: transparent;- color: var(--settings-ink-3);-}--.icon-button:hover {- background: rgba(0, 0, 0, 0.06);- color: var(--settings-ink);-}--.icon-button.danger:hover {- background: rgba(180, 35, 24, 0.08);- color: #b42318;-}-.list-row .icon-button .settings-icon,-.rule-search .icon-button .settings-icon {+.list-row .icon-button .control-icon,+.rule-search .icon-button .settings-icon,+.rule-search .icon-button .control-icon {width: 10px;height: 10px;flex-basis: 10px;diff --git a/harper-desktop/static/settings-icons/book.svg b/harper-desktop/static/settings-icons/book.svgdeleted file mode 100644index a388f4d2f..000000000--- a/harper-desktop/static/settings-icons/book.svg+++ /dev/null@@ -1,4 +0,0 @@-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="#000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">- <path d="M3 3h6a2 2 0 0 1 2 2v9H5a2 2 0 0 1-2-2V3z"/>- <path d="M13 3h-2a2 2 0 0 0-2 2v9h4V3z"/>-</svg>diff --git a/harper-desktop/static/settings-icons/check.svg b/harper-desktop/static/settings-icons/check.svgdeleted file mode 100644index 8da45c38c..000000000--- a/harper-desktop/static/settings-icons/check.svg+++ /dev/null@@ -1,3 +0,0 @@-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="#000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">- <path d="m3.5 8.5 3 3 6-6.5"/>-</svg>diff --git a/harper-desktop/static/settings-icons/checklist.svg b/harper-desktop/static/settings-icons/checklist.svgdeleted file mode 100644index 3f10de60c..000000000--- a/harper-desktop/static/settings-icons/checklist.svg+++ /dev/null@@ -1,6 +0,0 @@-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="#000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">- <path d="M3 4l1.5 1.5L7 3"/>- <path d="M3 8.5l1.5 1.5L7 7"/>- <path d="M3 13l1.5 1.5L7 11.5"/>- <path d="M9.5 4.5h4M9.5 9h4M9.5 13.5h4"/>-</svg>diff --git a/harper-desktop/static/settings-icons/gear.svg b/harper-desktop/static/settings-icons/gear.svgdeleted file mode 100644index 0f28b83e8..000000000--- a/harper-desktop/static/settings-icons/gear.svg+++ /dev/null@@ -1,4 +0,0 @@-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="#000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">- <circle cx="8" cy="8" r="2.2"/>- <path d="M8 1.5v1.8M8 12.7v1.8M14.5 8h-1.8M3.3 8H1.5M12.6 3.4l-1.3 1.3M4.7 11.3l-1.3 1.3M12.6 12.6l-1.3-1.3M4.7 4.7L3.4 3.4"/>-</svg>diff --git a/harper-desktop/static/settings-icons/grid.svg b/harper-desktop/static/settings-icons/grid.svgdeleted file mode 100644index 7a122d512..000000000--- a/harper-desktop/static/settings-icons/grid.svg+++ /dev/null@@ -1,6 +0,0 @@-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="#000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">- <rect x="2" y="2" width="5" height="5" rx="1"/>- <rect x="9" y="2" width="5" height="5" rx="1"/>- <rect x="2" y="9" width="5" height="5" rx="1"/>- <rect x="9" y="9" width="5" height="5" rx="1"/>-</svg>diff --git a/harper-desktop/static/settings-icons/info.svg b/harper-desktop/static/settings-icons/info.svgdeleted file mode 100644index 95a1dcff5..000000000--- a/harper-desktop/static/settings-icons/info.svg+++ /dev/null@@ -1,4 +0,0 @@-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="#000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">- <circle cx="8" cy="8" r="6"/>- <path d="M8 7.5V11M8 5.5v.01"/>-</svg>diff --git a/harper-desktop/static/settings-icons/key.svg b/harper-desktop/static/settings-icons/key.svgdeleted file mode 100644index 608bc6f57..000000000--- a/harper-desktop/static/settings-icons/key.svg+++ /dev/null@@ -1,4 +0,0 @@-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="#000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">- <rect x="2" y="7" width="6" height="4" rx="1"/>- <path d="M8 9h6M12 9v2M14 9v2.5"/>-</svg>diff --git a/harper-desktop/static/settings-icons/package.svg b/harper-desktop/static/settings-icons/package.svgdeleted file mode 100644index 7418a2e7a..000000000--- a/harper-desktop/static/settings-icons/package.svg+++ /dev/null@@ -1,5 +0,0 @@-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="#000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">- <path d="M2.5 4.5 8 2l5.5 2.5v7L8 14l-5.5-2.5z"/>- <path d="M2.5 4.5 8 7l5.5-2.5"/>- <path d="M8 7v7"/>-</svg>diff --git a/harper-desktop/static/settings-icons/quill.svg b/harper-desktop/static/settings-icons/quill.svgdeleted file mode 100644index db200055e..000000000--- a/harper-desktop/static/settings-icons/quill.svg+++ /dev/null@@ -1,4 +0,0 @@-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="#000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">- <path d="M3 13l7-7 3-3v4l-7 7z"/>- <path d="M3 13l2-2"/>-</svg>diff --git a/harper-desktop/static/settings-icons/rocket.svg b/harper-desktop/static/settings-icons/rocket.svgdeleted file mode 100644index 6a79d8567..000000000--- a/harper-desktop/static/settings-icons/rocket.svg+++ /dev/null@@ -1,5 +0,0 @@-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="#000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">- <path d="M11 3c1.5 0 2 .5 2 2 0 3-3.5 6.5-6 8l-2-2c1.5-2.5 5-6 8-8z"/>- <path d="M8.5 7.5 10 9"/>- <path d="m5 11-2 2 1.5.5L4 15l1.5-.5.5 1.5 1.5-2"/>-</svg>diff --git a/harper-desktop/static/settings-icons/search.svg b/harper-desktop/static/settings-icons/search.svgdeleted file mode 100644index 4ca5edbd3..000000000--- a/harper-desktop/static/settings-icons/search.svg+++ /dev/null@@ -1,4 +0,0 @@-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="#000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">- <circle cx="7" cy="7" r="4.2"/>- <path d="m10 10 3 3"/>-</svg>diff --git a/harper-desktop/static/settings-icons/trash.svg b/harper-desktop/static/settings-icons/trash.svgdeleted file mode 100644index 82654adc8..000000000--- a/harper-desktop/static/settings-icons/trash.svg+++ /dev/null@@ -1,6 +0,0 @@-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="#000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">- <path d="M3 4.5h10"/>- <path d="M5.5 4.5v-1a1 1 0 0 1 1-1h3a1 1 0 0 1 1 1v1"/>- <path d="M4.5 4.5V13a1 1 0 0 0 1 1h5a1 1 0 0 0 1-1V4.5"/>- <path d="M7 7v4.5M9 7v4.5"/>-</svg>diff --git a/harper-desktop/static/settings-icons/upload.svg b/harper-desktop/static/settings-icons/upload.svgdeleted file mode 100644index bf7e56385..000000000--- a/harper-desktop/static/settings-icons/upload.svg+++ /dev/null@@ -1,5 +0,0 @@-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="#000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">- <path d="M8 11V3"/>- <path d="M5 6l3-3 3 3"/>- <path d="M3 11v2h10v-2"/>-</svg>diff --git a/harper-desktop/static/settings-icons/x.svg b/harper-desktop/static/settings-icons/x.svgdeleted file mode 100644index a8d9ce8ce..000000000--- a/harper-desktop/static/settings-icons/x.svg+++ /dev/null@@ -1,3 +0,0 @@-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="#000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">- <path d="m4 4 8 8M12 4l-8 8"/>-</svg>diff --git a/packages/components/src/lib/Button.svelte b/packages/components/src/lib/Button.svelteindex d3efde8dd..1e8c0a126 100644--- a/packages/components/src/lib/Button.svelte+++ b/packages/components/src/lib/Button.svelte@@ -15,12 +15,13 @@ export let target: HTMLAnchorAttributes['target'] = undefined;export let rel: HTMLAnchorAttributes['rel'] = undefined;export let type: HTMLButtonAttributes['type'] = 'button';export let disabled: boolean | undefined = undefined;+export let unstyled = false;// Alias for the `class` attribute since `class` is a reserved TS keywordexport let className: string | undefined = undefined;let restClass: string | undefined;let restProps: Record<string, unknown> = {};-const dispatch = createEventDispatcher();+const dispatch = createEventDispatcher<{ click: Event; dblclick: Event }>();const sizeClasses: Record<ButtonSize, string> = {xs: 'px-3 py-2 text-xs',@@ -46,11 +47,18 @@ $: toneClass = colorClasses[color as ButtonColor] ?? colorClasses.primary;$: shapeClass = pill ? 'rounded-full' : 'rounded-lg';$: sizeClass = sizeClasses[size] ?? sizeClasses.md;$: ({ class: restClass, ...restProps } = $$restProps);-$: classes = [baseClasses, shapeClass, sizeClass, toneClass, restClass, className]+$: classes = [+ !unstyled && baseClasses,+ !unstyled && shapeClass,+ !unstyled && sizeClass,+ !unstyled && toneClass,+ restClass,+ className,+].filter(Boolean).join(' ');-$: colorOverride = colorClasses[color as ButtonColor] == null ? color : undefined;+$: colorOverride = !unstyled && colorClasses[color as ButtonColor] == null ? color : undefined;$: inlineStyle =colorOverride || textColor? [@@ -83,6 +91,7 @@ function handleClick(event: Event) {rel={rel}target={target}on:click={handleClick}+ on:dblclick={(event) => dispatch('dblclick', event)}{...restProps}><slot />@@ -95,6 +104,7 @@ function handleClick(event: Event) {{...restProps}style={inlineStyle}on:click={handleClick}+ on:dblclick={(event) => dispatch('dblclick', event)}><slot /></button>diff --git a/packages/components/src/lib/Checkbox.svelte b/packages/components/src/lib/Checkbox.sveltenew file mode 100644index 000000000..5cd87a721--- /dev/null+++ b/packages/components/src/lib/Checkbox.svelte@@ -0,0 +1,49 @@+<script lang="ts">+import { Checkbox as FlowbiteCheckbox } from 'flowbite-svelte';+import { createEventDispatcher } from 'svelte';+import type { HTMLButtonAttributes } from 'svelte/elements';++export let checked = false;+export let disabled: HTMLButtonAttributes['disabled'] = undefined;+export let appearance: 'default' | 'settings' = 'default';+export let className = '';++let restClass: string | undefined;+let restProps: Record<string, unknown> = {};+const dispatch = createEventDispatcher<{ click: MouseEvent }>();++$: ({ class: restClass, ...restProps } = $$restProps);+const baseClasses =+ 'size-4 flex-none grid place-items-center rounded border p-0 text-white [&>svg]:size-[11px] [&>svg]:flex-none';+const uncheckedClasses = 'border-black/25 bg-[#fff]';+const checkedClasses = 'border-black/15 bg-[var(--settings-accent,#2a6bd8)]';++$: classes = [+ 'checkbox',+ baseClasses,+ checked && 'checked',+ checked ? checkedClasses : uncheckedClasses,+ restClass,+ className,+]+ .filter(Boolean)+ .join(' ');+</script>++{#if appearance === 'settings'}+ <button+ class={classes}+ type="button"+ role="checkbox"+ aria-checked={checked}+ {disabled}+ {...restProps}+ on:click={(event) => dispatch('click', event)}+ >+ <slot />+ </button>+{:else}+ <FlowbiteCheckbox bind:checked {disabled} class={restClass} {...restProps}>+ <slot />+ </FlowbiteCheckbox>+{/if}diff --git a/packages/components/src/lib/IconButton.svelte b/packages/components/src/lib/IconButton.sveltenew file mode 100644index 000000000..ecdb60007--- /dev/null+++ b/packages/components/src/lib/IconButton.svelte@@ -0,0 +1,40 @@+<script lang="ts">+import { createEventDispatcher } from 'svelte';+import type { HTMLButtonAttributes } from 'svelte/elements';++export let type: HTMLButtonAttributes['type'] = 'button';+export let disabled: HTMLButtonAttributes['disabled'] = undefined;+export let danger = false;+export let className = '';++let restClass: string | undefined;+let restProps: Record<string, unknown> = {};+const dispatch = createEventDispatcher<{ click: MouseEvent }>();++$: ({ class: restClass, ...restProps } = $$restProps);+const baseClasses =+ 'size-[26px] flex-none grid place-items-center rounded-[6px] border-0 bg-transparent text-[var(--settings-ink-3,#807a6e)] [&>svg]:size-[13px] [&>svg]:flex-none';+const hoverClasses = 'hover:bg-black/[0.06] hover:text-[var(--settings-ink,#1c1a16)]';+const dangerHoverClasses = 'hover:bg-[#b42318]/[0.08] hover:text-[#b42318]';++$: classes = [+ 'icon-button',+ baseClasses,+ danger && 'danger',+ danger ? dangerHoverClasses : hoverClasses,+ restClass,+ className,+]+ .filter(Boolean)+ .join(' ');+</script>++<button+ class={classes}+ {type}+ {disabled}+ {...restProps}+ on:click={(event) => dispatch('click', event)}+>+ <slot />+</button>diff --git a/packages/components/src/lib/Input.svelte b/packages/components/src/lib/Input.svelteindex 57c6507ae..252980f8d 100644--- a/packages/components/src/lib/Input.svelte+++ b/packages/components/src/lib/Input.svelte@@ -9,10 +9,16 @@ export let value: HTMLInputAttributes['value'] = undefined;export let placeholder: HTMLInputAttributes['placeholder'] = undefined;export let className: string | undefined = undefined;export let size: InputSize = 'md';+export let unstyled = false;let restClass: string | undefined;let restProps: Record<string, unknown> = {};-const dispatch = createEventDispatcher<{ keydown: KeyboardEvent; blur: FocusEvent }>();+const dispatch = createEventDispatcher<{+ input: Event;+ change: Event;+ keydown: KeyboardEvent;+ blur: FocusEvent;+}>();const baseClasses ='rounded-lg border border-cream-200 bg-white text-gray-900 placeholder-gray-500 shadow-sm outline-none transition focus:ring-2 focus:ring-primary-300 focus:border-cream-300 dark:border-cream-700 dark:bg-cream-900 dark:text-white dark:placeholder-cream-200 dark:focus:border-cream-600 dark:focus:ring-primary-600';@@ -23,7 +29,12 @@ const sizeClasses: Record<InputSize, string> = {};$: ({ class: restClass, ...restProps } = $$restProps);-$: classes = [baseClasses, sizeClasses[size] ?? sizeClasses.md, restClass, className]+$: classes = [+ !unstyled && baseClasses,+ !unstyled && (sizeClasses[size] ?? sizeClasses.md),+ restClass,+ className,+].filter(Boolean).join(' ');</script>@@ -33,6 +44,8 @@ $: classes = [baseClasses, sizeClasses[size] ?? sizeClasses.md, restClass, classtype={type}placeholder={placeholder}bind:value+ on:input={(event) => dispatch('input', event)}+ on:change={(event) => dispatch('change', event)}on:keydown={(event) => dispatch('keydown', event)}on:blur={(event) => dispatch('blur', event)}{...restProps}diff --git a/packages/components/src/lib/Panel.svelte b/packages/components/src/lib/Panel.sveltenew file mode 100644index 000000000..baa27caa1--- /dev/null+++ b/packages/components/src/lib/Panel.svelte@@ -0,0 +1,16 @@+<script lang="ts">+export let className = '';++let restClass: string | undefined;+let restProps: Record<string, unknown> = {};++$: ({ class: restClass, ...restProps } = $$restProps);+const baseClasses =+ 'overflow-hidden rounded-[10px] border-[0.5px] border-[var(--settings-line-strong,rgb(28_26_22_/_14%))] bg-[#fff]';++$: classes = ['list-card', baseClasses, restClass, className].filter(Boolean).join(' ');+</script>++<div class={classes} {...restProps}>+ <slot />+</div>diff --git a/packages/components/src/lib/SearchField.svelte b/packages/components/src/lib/SearchField.sveltenew file mode 100644index 000000000..88d90d9df--- /dev/null+++ b/packages/components/src/lib/SearchField.svelte@@ -0,0 +1,35 @@+<script lang="ts">+import { createEventDispatcher } from 'svelte';+import type { HTMLInputAttributes } from 'svelte/elements';++interface $$Slots {+ leading: Record<string, never>;+ trailing: Record<string, never>;+}++export let value: HTMLInputAttributes['value'] = undefined;+export let placeholder: HTMLInputAttributes['placeholder'] = undefined;+export let disabled: HTMLInputAttributes['disabled'] = undefined;+export let className = '';++let restClass: string | undefined;+let restProps: Record<string, unknown> = {};+const dispatch = createEventDispatcher<{ input: Event; keydown: KeyboardEvent }>();++$: ({ class: restClass, ...restProps } = $$restProps);+$: classes = ['search-field', restClass, className].filter(Boolean).join(' ');+</script>++<div class={classes}>+ <slot name="leading" />+ <input+ type="text"+ bind:value+ {placeholder}+ {disabled}+ {...restProps}+ on:input={(event) => dispatch('input', event)}+ on:keydown={(event) => dispatch('keydown', event)}+ />+ <slot name="trailing" />+</div>diff --git a/packages/components/src/lib/Select.svelte b/packages/components/src/lib/Select.svelteindex 0fcf63d85..9e81792e2 100644--- a/packages/components/src/lib/Select.svelte+++ b/packages/components/src/lib/Select.svelte@@ -1,4 +1,5 @@<script lang="ts">+import { createEventDispatcher } from 'svelte';import type { HTMLSelectAttributes } from 'svelte/elements';type SelectSize = 'sm' | 'md' | 'lg';@@ -14,9 +15,11 @@ export let size: SelectSize = 'md';export let items: SelectItem[] | undefined = undefined;export let className: string | undefined = undefined;export let value: HTMLSelectAttributes['value'] = undefined;+export let unstyled = false;let restClass: string | undefined;let restProps: Record<string, unknown> = {};+const dispatch = createEventDispatcher<{ change: Event; click: MouseEvent }>();const baseClasses ='rounded-lg border border-cream-200 bg-white shadow-sm outline-none transition focus:ring-2 focus:ring-primary-300 focus:border-cream-300 dark:border-cream-700 dark:bg-cream-900 dark:text-white dark:focus:border-cream-600 dark:focus:ring-primary-600 text-left';@@ -27,12 +30,23 @@ const sizeClasses: Record<SelectSize, string> = {};$: ({ class: restClass, ...restProps } = $$restProps);-$: classes = [baseClasses, sizeClasses[size] ?? sizeClasses.md, restClass, className]+$: classes = [+ !unstyled && baseClasses,+ !unstyled && (sizeClasses[size] ?? sizeClasses.md),+ restClass,+ className,+].filter(Boolean).join(' ');</script>-<select class={classes} bind:value {...restProps}>+<select+ class={classes}+ bind:value+ {...restProps}+ on:change={(event) => dispatch('change', event)}+ on:click={(event) => dispatch('click', event)}+>{#if items?.length}{#each items as item (item.value)}<option value={item.value} disabled={item.disabled} selected={item.selected}>diff --git a/packages/components/src/lib/SettingRow.svelte b/packages/components/src/lib/SettingRow.sveltenew file mode 100644index 000000000..625324f9d--- /dev/null+++ b/packages/components/src/lib/SettingRow.svelte@@ -0,0 +1,28 @@+<script lang="ts">+export let top = false;+export let className = '';++let restClass: string | undefined;+let restProps: Record<string, unknown> = {};++$: ({ class: restClass, ...restProps } = $$restProps);+const baseClasses = 'flex gap-6 [&>div:first-child]:min-w-0 [&>div:first-child]:flex-1';++$: classes = [+ 'row',+ baseClasses,+ top && 'top',+ top ? 'items-start' : 'items-center',+ restClass,+ className,+]+ .filter(Boolean)+ .join(' ');+</script>++<div class={classes} {...restProps}>+ <div>+ <slot />+ </div>+ <slot name="control" />+</div>diff --git a/packages/components/src/lib/Toggle.svelte b/packages/components/src/lib/Toggle.sveltenew file mode 100644index 000000000..fe505021b--- /dev/null+++ b/packages/components/src/lib/Toggle.svelte@@ -0,0 +1,51 @@+<script lang="ts">+import { Toggle as FlowbiteToggle } from 'flowbite-svelte';+import { createEventDispatcher } from 'svelte';+import type { HTMLButtonAttributes } from 'svelte/elements';++export let checked = false;+export let disabled: HTMLButtonAttributes['disabled'] = undefined;+export let appearance: 'default' | 'settings' = 'default';+export let className = '';++let restClass: string | undefined;+let restProps: Record<string, unknown> = {};+const dispatch = createEventDispatcher<{ click: MouseEvent }>();++$: ({ class: restClass, ...restProps } = $$restProps);+const baseClasses =+ 'h-5 w-[34px] flex-none rounded-full border-0 p-0.5 shadow-[inset_0_0.5px_1px_rgb(0_0_0_/_10%)]';+const uncheckedClasses = 'bg-[#d4cfc4]';+const checkedClasses = 'bg-[var(--settings-accent,#2a6bd8)]';+const thumbClasses =+ 'block size-4 rounded-full bg-[#fff] shadow-[0_1px_2px_rgb(0_0_0_/_20%),0_0.5px_0_rgb(0_0_0_/_10%)] transition-transform duration-150 ease-[ease]';++$: classes = [+ 'toggle',+ baseClasses,+ checked && 'checked',+ checked ? checkedClasses : uncheckedClasses,+ restClass,+ className,+]+ .filter(Boolean)+ .join(' ');+</script>++{#if appearance === 'settings'}+ <button+ class={classes}+ type="button"+ role="switch"+ aria-checked={checked}+ {disabled}+ {...restProps}+ on:click={(event) => dispatch('click', event)}+ >+ <span class={`${thumbClasses} ${checked ? 'translate-x-3.5' : 'translate-x-0'}`}></span>+ </button>+{:else}+ <FlowbiteToggle bind:checked {disabled} class={restClass} {...restProps}>+ <slot />+ </FlowbiteToggle>+{/if}diff --git a/packages/components/src/lib/icons/BookIcon.svelte b/packages/components/src/lib/icons/BookIcon.sveltenew file mode 100644index 000000000..534701566--- /dev/null+++ b/packages/components/src/lib/icons/BookIcon.svelte@@ -0,0 +1,17 @@+<script lang="ts">+export let className: string | undefined = undefined;+</script>++<svg+ viewBox="0 0 16 16"+ class={className}+ fill="none"+ stroke="currentColor"+ stroke-width="1.5"+ stroke-linecap="round"+ stroke-linejoin="round"+ aria-hidden="true"+>+ <path d="M3 3h6a2 2 0 0 1 2 2v9H5a2 2 0 0 1-2-2V3z" />+ <path d="M13 3h-2a2 2 0 0 0-2 2v9h4V3z" />+</svg>diff --git a/packages/components/src/lib/icons/ChecklistIcon.svelte b/packages/components/src/lib/icons/ChecklistIcon.sveltenew file mode 100644index 000000000..aa72506c6--- /dev/null+++ b/packages/components/src/lib/icons/ChecklistIcon.svelte@@ -0,0 +1,19 @@+<script lang="ts">+export let className: string | undefined = undefined;+</script>++<svg+ viewBox="0 0 16 16"+ class={className}+ fill="none"+ stroke="currentColor"+ stroke-width="1.5"+ stroke-linecap="round"+ stroke-linejoin="round"+ aria-hidden="true"+>+ <path d="M3 4l1.5 1.5L7 3" />+ <path d="M3 8.5l1.5 1.5L7 7" />+ <path d="M3 13l1.5 1.5L7 11.5" />+ <path d="M9.5 4.5h4M9.5 9h4M9.5 13.5h4" />+</svg>diff --git a/packages/components/src/lib/icons/GearIcon.svelte b/packages/components/src/lib/icons/GearIcon.sveltenew file mode 100644index 000000000..b406f7ab7--- /dev/null+++ b/packages/components/src/lib/icons/GearIcon.svelte@@ -0,0 +1,17 @@+<script lang="ts">+export let className: string | undefined = undefined;+</script>++<svg+ viewBox="0 0 16 16"+ class={className}+ fill="none"+ stroke="currentColor"+ stroke-width="1.5"+ stroke-linecap="round"+ stroke-linejoin="round"+ aria-hidden="true"+>+ <circle cx="8" cy="8" r="2.2" />+ <path d="M8 1.5v1.8M8 12.7v1.8M14.5 8h-1.8M3.3 8H1.5M12.6 3.4l-1.3 1.3M4.7 11.3l-1.3 1.3M12.6 12.6l-1.3-1.3M4.7 4.7L3.4 3.4" />+</svg>diff --git a/packages/components/src/lib/icons/GridIcon.svelte b/packages/components/src/lib/icons/GridIcon.sveltenew file mode 100644index 000000000..21e2da070--- /dev/null+++ b/packages/components/src/lib/icons/GridIcon.svelte@@ -0,0 +1,19 @@+<script lang="ts">+export let className: string | undefined = undefined;+</script>++<svg+ viewBox="0 0 16 16"+ class={className}+ fill="none"+ stroke="currentColor"+ stroke-width="1.5"+ stroke-linecap="round"+ stroke-linejoin="round"+ aria-hidden="true"+>+ <rect x="2" y="2" width="5" height="5" rx="1" />+ <rect x="9" y="2" width="5" height="5" rx="1" />+ <rect x="2" y="9" width="5" height="5" rx="1" />+ <rect x="9" y="9" width="5" height="5" rx="1" />+</svg>diff --git a/packages/components/src/lib/icons/InfoIcon.svelte b/packages/components/src/lib/icons/InfoIcon.sveltenew file mode 100644index 000000000..46be928f1--- /dev/null+++ b/packages/components/src/lib/icons/InfoIcon.svelte@@ -0,0 +1,17 @@+<script lang="ts">+export let className: string | undefined = undefined;+</script>++<svg+ viewBox="0 0 16 16"+ class={className}+ fill="none"+ stroke="currentColor"+ stroke-width="1.5"+ stroke-linecap="round"+ stroke-linejoin="round"+ aria-hidden="true"+>+ <circle cx="8" cy="8" r="6" />+ <path d="M8 7.5V11M8 5.5v.01" />+</svg>diff --git a/packages/components/src/lib/icons/KeyIcon.svelte b/packages/components/src/lib/icons/KeyIcon.sveltenew file mode 100644index 000000000..f4243dc95--- /dev/null+++ b/packages/components/src/lib/icons/KeyIcon.svelte@@ -0,0 +1,17 @@+<script lang="ts">+export let className: string | undefined = undefined;+</script>++<svg+ viewBox="0 0 16 16"+ class={className}+ fill="none"+ stroke="currentColor"+ stroke-width="1.5"+ stroke-linecap="round"+ stroke-linejoin="round"+ aria-hidden="true"+>+ <rect x="2" y="7" width="6" height="4" rx="1" />+ <path d="M8 9h6M12 9v2M14 9v2.5" />+</svg>diff --git a/packages/components/src/lib/icons/PackageIcon.svelte b/packages/components/src/lib/icons/PackageIcon.sveltenew file mode 100644index 000000000..f981b0de9--- /dev/null+++ b/packages/components/src/lib/icons/PackageIcon.svelte@@ -0,0 +1,18 @@+<script lang="ts">+export let className: string | undefined = undefined;+</script>++<svg+ viewBox="0 0 16 16"+ class={className}+ fill="none"+ stroke="currentColor"+ stroke-width="1.5"+ stroke-linecap="round"+ stroke-linejoin="round"+ aria-hidden="true"+>+ <path d="M2.5 4.5 8 2l5.5 2.5v7L8 14l-5.5-2.5z" />+ <path d="M2.5 4.5 8 7l5.5-2.5" />+ <path d="M8 7v7" />+</svg>diff --git a/packages/components/src/lib/icons/QuillIcon.svelte b/packages/components/src/lib/icons/QuillIcon.sveltenew file mode 100644index 000000000..528410e0f--- /dev/null+++ b/packages/components/src/lib/icons/QuillIcon.svelte@@ -0,0 +1,17 @@+<script lang="ts">+export let className: string | undefined = undefined;+</script>++<svg+ viewBox="0 0 16 16"+ class={className}+ fill="none"+ stroke="currentColor"+ stroke-width="1.5"+ stroke-linecap="round"+ stroke-linejoin="round"+ aria-hidden="true"+>+ <path d="M3 13l7-7 3-3v4l-7 7z" />+ <path d="M3 13l2-2" />+</svg>diff --git a/packages/components/src/lib/icons/RocketIcon.svelte b/packages/components/src/lib/icons/RocketIcon.sveltenew file mode 100644index 000000000..b6a5c819a--- /dev/null+++ b/packages/components/src/lib/icons/RocketIcon.svelte@@ -0,0 +1,18 @@+<script lang="ts">+export let className: string | undefined = undefined;+</script>++<svg+ viewBox="0 0 16 16"+ class={className}+ fill="none"+ stroke="currentColor"+ stroke-width="1.5"+ stroke-linecap="round"+ stroke-linejoin="round"+ aria-hidden="true"+>+ <path d="M11 3c1.5 0 2 .5 2 2 0 3-3.5 6.5-6 8l-2-2c1.5-2.5 5-6 8-8z" />+ <path d="M8.5 7.5 10 9" />+ <path d="m5 11-2 2 1.5.5L4 15l1.5-.5.5 1.5 1.5-2" />+</svg>diff --git a/packages/components/src/lib/icons/SearchIcon.svelte b/packages/components/src/lib/icons/SearchIcon.sveltenew file mode 100644index 000000000..a73e6998d--- /dev/null+++ b/packages/components/src/lib/icons/SearchIcon.svelte@@ -0,0 +1,15 @@+<script lang="ts">+export let className: string | undefined = undefined;+</script>++<svg+ viewBox="0 0 24 24"+ class={className}+ fill="none"+ stroke="currentColor"+ stroke-width="2"+ aria-hidden="true"+>+ <circle cx="11" cy="11" r="7" />+ <path d="m20 20-4-4" />+</svg>diff --git a/packages/components/src/lib/icons/UploadIcon.svelte b/packages/components/src/lib/icons/UploadIcon.sveltenew file mode 100644index 000000000..e44e7c8b9--- /dev/null+++ b/packages/components/src/lib/icons/UploadIcon.svelte@@ -0,0 +1,16 @@+<script lang="ts">+export let className: string | undefined = undefined;+</script>++<svg+ viewBox="0 0 24 24"+ class={className}+ fill="none"+ stroke="currentColor"+ stroke-width="2"+ aria-hidden="true"+>+ <path d="M12 16V4" />+ <path d="m7 9 5-5 5 5" />+ <path d="M5 20h14" />+</svg>diff --git a/packages/components/src/lib/index.ts b/packages/components/src/lib/index.tsindex b6e9418b4..eb12fcc3a 100644--- a/packages/components/src/lib/index.ts+++ b/packages/components/src/lib/index.ts@@ -1,6 +1,5 @@export {Badge,- Checkbox,Fileupload,Label,Radio,@@ -11,26 +10,38 @@ export {TableBodyRow,TableHead,TableHeadCell,- Toggle,} from 'flowbite-svelte';export { default as Arrow } from './Arrow.svelte';export { default as Button } from './Button.svelte';export { default as Card } from './Card.svelte';+export { default as Checkbox } from './Checkbox.svelte';export { default as Collapsible } from './Collapsible.svelte';export { default as DelayedRender } from './DelayedRender.svelte';export { default as GutterCenter } from './GutterCenter.svelte';+export { default as IconButton } from './IconButton.svelte';export { default as Input } from './Input.svelte';export { default as Isolate } from './Isolate.svelte';+export { default as BookIcon } from './icons/BookIcon.svelte';export { default as CheckIcon } from './icons/CheckIcon.svelte';+export { default as ChecklistIcon } from './icons/ChecklistIcon.svelte';export { default as ChevronLeftIcon } from './icons/ChevronLeftIcon.svelte';export { default as ChevronRightIcon } from './icons/ChevronRightIcon.svelte';export { default as CloseIcon } from './icons/CloseIcon.svelte';export { default as DownloadIcon } from './icons/DownloadIcon.svelte';export { default as EditIcon } from './icons/EditIcon.svelte';+export { default as GearIcon } from './icons/GearIcon.svelte';+export { default as GridIcon } from './icons/GridIcon.svelte';+export { default as InfoIcon } from './icons/InfoIcon.svelte';+export { default as KeyIcon } from './icons/KeyIcon.svelte';+export { default as PackageIcon } from './icons/PackageIcon.svelte';export { default as PlayIcon } from './icons/PlayIcon.svelte';export { default as PlusIcon } from './icons/PlusIcon.svelte';+export { default as QuillIcon } from './icons/QuillIcon.svelte';+export { default as RocketIcon } from './icons/RocketIcon.svelte';+export { default as SearchIcon } from './icons/SearchIcon.svelte';export { default as TrashIcon } from './icons/TrashIcon.svelte';+export { default as UploadIcon } from './icons/UploadIcon.svelte';export { default as Link } from './Link.svelte';export { default as AutomatticLogo } from './logos/AutomatticLogo.svelte';export { default as ChromeLogo } from './logos/ChromeLogo.svelte';@@ -57,8 +68,12 @@ export { default as ThingsLogo } from './logos/ThingsLogo.svelte';export { default as WhatsAppLogo } from './logos/WhatsAppLogo.svelte';export { default as WordPressLogo } from './logos/WordPressLogo.svelte';export { default as ZedLogo } from './logos/ZedLogo.svelte';+export { default as Panel } from './Panel.svelte';+export { default as SearchField } from './SearchField.svelte';export { default as Section } from './Section.svelte';export { default as Select } from './Select.svelte';+export { default as SettingRow } from './SettingRow.svelte';export { default as Testimonial } from './Testimonial.svelte';export { default as TestimonialCollection } from './TestimonialCollection.svelte';export { default as Textarea } from './Textarea.svelte';+export { default as Toggle } from './Toggle.svelte';diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex fc765977a..c1c05321e 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -50,6 +50,9 @@ importers:'@tauri-apps/plugin-updater':specifier: ^2.10.1version: 2.10.1+ components:+ specifier: workspace:*+ version: link:../packages/componentsharper-editor:specifier: workspace:*version: link:../packages/harper-editor