Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

refactor(web): de-slopify and centralize components (#3744)

Elijah Potterb1685a5e3760
diff --git a/packages/web/src/lib/components/Arrow.svelte b/packages/components/src/lib/Arrow.svelte
similarity index 100%
rename from packages/web/src/lib/components/Arrow.svelte
rename to packages/components/src/lib/Arrow.svelte
diff --git a/packages/components/src/lib/Button.svelte b/packages/components/src/lib/Button.svelte
index a8d5cd636..d3efde8dd 100644
--- a/packages/components/src/lib/Button.svelte
+++ b/packages/components/src/lib/Button.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { createEventDispatcher } from 'svelte';
-import type { AnchorHTMLAttributes, ButtonHTMLAttributes } from 'svelte/elements';
+import type { HTMLAnchorAttributes, HTMLButtonAttributes } from 'svelte/elements';
import Link from './Link.svelte';
type ButtonSize = 'xs' | 'sm' | 'md' | 'lg';
@@ -10,10 +10,10 @@ export let size: ButtonSize = 'md';
export let color: ButtonColor | string = 'primary';
export let textColor: string | undefined = undefined;
export let pill = false;
-export let href: AnchorHTMLAttributes['href'] = undefined;
-export let target: AnchorHTMLAttributes['target'] = undefined;
-export let rel: AnchorHTMLAttributes['rel'] = undefined;
-export let type: ButtonHTMLAttributes['type'] = 'button';
+export let href: HTMLAnchorAttributes['href'] = undefined;
+export let target: HTMLAnchorAttributes['target'] = undefined;
+export let rel: HTMLAnchorAttributes['rel'] = undefined;
+export let type: HTMLButtonAttributes['type'] = 'button';
export let disabled: boolean | undefined = undefined;
// Alias for the `class` attribute since `class` is a reserved TS keyword
export let className: string | undefined = undefined;
@@ -61,7 +61,7 @@ $: inlineStyle =
.join(' ')
: undefined;
-function handleClick(event: MouseEvent) {
+function handleClick(event: Event) {
if (disabled) {
event.preventDefault();
event.stopPropagation();
diff --git a/packages/components/src/lib/DelayedRender.svelte b/packages/components/src/lib/DelayedRender.svelte
new file mode 100644
index 000000000..49da37381
--- /dev/null
+++ b/packages/components/src/lib/DelayedRender.svelte
@@ -0,0 +1,50 @@
+<script lang="ts">
+import type { Snippet } from 'svelte';
+
+/**
+ * Renders arbitrary child content after `active` remains true for `delayMs` milliseconds.
+ * Pending renders are cancelled and visible content is hidden immediately when `active` becomes false.
+ */
+let {
+ active = false,
+ delayMs = 0,
+ children,
+}: {
+ active?: boolean;
+ delayMs?: number;
+ children?: Snippet;
+} = $props();
+
+let visible = $state(false);
+let timeout = $state<ReturnType<typeof setTimeout> | null>(null);
+
+/** Cancel the pending delayed render without changing currently rendered content. */
+function clearPendingDelay() {
+ if (timeout == null) {
+ return;
+ }
+
+ clearTimeout(timeout);
+ timeout = null;
+}
+
+$effect(() => {
+ clearPendingDelay();
+
+ if (!active) {
+ visible = false;
+ return;
+ }
+
+ timeout = setTimeout(() => {
+ visible = true;
+ timeout = null;
+ }, delayMs);
+
+ return clearPendingDelay;
+});
+</script>
+
+{#if visible}
+ {@render children?.()}
+{/if}
diff --git a/packages/web/src/lib/components/GutterCenter.svelte b/packages/components/src/lib/GutterCenter.svelte
similarity index 100%
rename from packages/web/src/lib/components/GutterCenter.svelte
rename to packages/components/src/lib/GutterCenter.svelte
diff --git a/packages/components/src/lib/Input.svelte b/packages/components/src/lib/Input.svelte
index a2af2f51d..57c6507ae 100644
--- a/packages/components/src/lib/Input.svelte
+++ b/packages/components/src/lib/Input.svelte
@@ -1,12 +1,12 @@
<script lang="ts">
import { createEventDispatcher } from 'svelte';
-import type { InputHTMLAttributes } from 'svelte/elements';
+import type { HTMLInputAttributes } from 'svelte/elements';
type InputSize = 'sm' | 'md' | 'lg';
-export let type: InputHTMLAttributes['type'] = 'text';
-export let value: InputHTMLAttributes['value'] = undefined;
-export let placeholder: InputHTMLAttributes['placeholder'] = undefined;
+export let type: HTMLInputAttributes['type'] = 'text';
+export let value: HTMLInputAttributes['value'] = undefined;
+export let placeholder: HTMLInputAttributes['placeholder'] = undefined;
export let className: string | undefined = undefined;
export let size: InputSize = 'md';
diff --git a/packages/web/src/lib/components/Isolate.svelte b/packages/components/src/lib/Isolate.svelte
similarity index 100%
rename from packages/web/src/lib/components/Isolate.svelte
rename to packages/components/src/lib/Isolate.svelte
diff --git a/packages/components/src/lib/Link.svelte b/packages/components/src/lib/Link.svelte
index ca57911cc..6f9b6ef88 100644
--- a/packages/components/src/lib/Link.svelte
+++ b/packages/components/src/lib/Link.svelte
@@ -1,10 +1,10 @@
<script lang="ts">
import { createEventDispatcher } from 'svelte';
-import type { AnchorHTMLAttributes } from 'svelte/elements';
+import type { HTMLAnchorAttributes } from 'svelte/elements';
-export let href: AnchorHTMLAttributes['href'] = undefined;
-export let target: AnchorHTMLAttributes['target'] = undefined;
-export let rel: AnchorHTMLAttributes['rel'] = undefined;
+export let href: HTMLAnchorAttributes['href'] = undefined;
+export let target: HTMLAnchorAttributes['target'] = undefined;
+export let rel: HTMLAnchorAttributes['rel'] = undefined;
// Alias for the `class` attribute since `class` is a reserved TS keyword
export let className: string | undefined = undefined;
export let underline = false;
diff --git a/packages/web/src/lib/components/Section.svelte b/packages/components/src/lib/Section.svelte
similarity index 100%
rename from packages/web/src/lib/components/Section.svelte
rename to packages/components/src/lib/Section.svelte
diff --git a/packages/components/src/lib/Select.svelte b/packages/components/src/lib/Select.svelte
index c2300d175..0fcf63d85 100644
--- a/packages/components/src/lib/Select.svelte
+++ b/packages/components/src/lib/Select.svelte
@@ -1,9 +1,9 @@
<script lang="ts">
-import type { SelectHTMLAttributes } from 'svelte/elements';
+import type { HTMLSelectAttributes } from 'svelte/elements';
type SelectSize = 'sm' | 'md' | 'lg';
type SelectItem = {
- value: SelectHTMLAttributes['value'];
+ value: HTMLSelectAttributes['value'];
name?: string;
label?: string;
disabled?: boolean;
@@ -13,7 +13,7 @@ type SelectItem = {
export let size: SelectSize = 'md';
export let items: SelectItem[] | undefined = undefined;
export let className: string | undefined = undefined;
-export let value: SelectHTMLAttributes['value'] = undefined;
+export let value: HTMLSelectAttributes['value'] = undefined;
let restClass: string | undefined;
let restProps: Record<string, unknown> = {};
diff --git a/packages/web/src/lib/components/Testimonial.svelte b/packages/components/src/lib/Testimonial.svelte
similarity index 100%
rename from packages/web/src/lib/components/Testimonial.svelte
rename to packages/components/src/lib/Testimonial.svelte
diff --git a/packages/web/src/lib/components/TestimonialCollection.svelte b/packages/components/src/lib/TestimonialCollection.svelte
similarity index 100%
rename from packages/web/src/lib/components/TestimonialCollection.svelte
rename to packages/components/src/lib/TestimonialCollection.svelte
diff --git a/packages/components/src/lib/Textarea.svelte b/packages/components/src/lib/Textarea.svelte
index c24b00b0d..76a17108d 100644
--- a/packages/components/src/lib/Textarea.svelte
+++ b/packages/components/src/lib/Textarea.svelte
@@ -1,10 +1,10 @@
<script lang="ts">
-import type { TextareaHTMLAttributes } from 'svelte/elements';
+import type { HTMLTextareaAttributes } from 'svelte/elements';
export let className: string | undefined = undefined;
-export let value: TextareaHTMLAttributes['value'] = undefined;
-export let rows: TextareaHTMLAttributes['rows'] = undefined;
-export let cols: TextareaHTMLAttributes['cols'] = undefined;
+export let value: HTMLTextareaAttributes['value'] = undefined;
+export let rows: HTMLTextareaAttributes['rows'] = undefined;
+export let cols: HTMLTextareaAttributes['cols'] = undefined;
let restClass: string | undefined;
let restProps: Record<string, unknown> = {};
diff --git a/packages/web/src/lib/components/icons/CheckIcon.svelte b/packages/components/src/lib/icons/CheckIcon.svelte
similarity index 100%
rename from packages/web/src/lib/components/icons/CheckIcon.svelte
rename to packages/components/src/lib/icons/CheckIcon.svelte
diff --git a/packages/web/src/lib/components/icons/ChevronLeftIcon.svelte b/packages/components/src/lib/icons/ChevronLeftIcon.svelte
similarity index 100%
rename from packages/web/src/lib/components/icons/ChevronLeftIcon.svelte
rename to packages/components/src/lib/icons/ChevronLeftIcon.svelte
diff --git a/packages/web/src/lib/components/icons/ChevronRightIcon.svelte b/packages/components/src/lib/icons/ChevronRightIcon.svelte
similarity index 100%
rename from packages/web/src/lib/components/icons/ChevronRightIcon.svelte
rename to packages/components/src/lib/icons/ChevronRightIcon.svelte
diff --git a/packages/web/src/lib/components/icons/CloseIcon.svelte b/packages/components/src/lib/icons/CloseIcon.svelte
similarity index 100%
rename from packages/web/src/lib/components/icons/CloseIcon.svelte
rename to packages/components/src/lib/icons/CloseIcon.svelte
diff --git a/packages/web/src/lib/components/icons/DownloadIcon.svelte b/packages/components/src/lib/icons/DownloadIcon.svelte
similarity index 100%
rename from packages/web/src/lib/components/icons/DownloadIcon.svelte
rename to packages/components/src/lib/icons/DownloadIcon.svelte
diff --git a/packages/web/src/lib/components/icons/EditIcon.svelte b/packages/components/src/lib/icons/EditIcon.svelte
similarity index 100%
rename from packages/web/src/lib/components/icons/EditIcon.svelte
rename to packages/components/src/lib/icons/EditIcon.svelte
diff --git a/packages/web/src/lib/components/icons/PlayIcon.svelte b/packages/components/src/lib/icons/PlayIcon.svelte
similarity index 100%
rename from packages/web/src/lib/components/icons/PlayIcon.svelte
rename to packages/components/src/lib/icons/PlayIcon.svelte
diff --git a/packages/web/src/lib/components/icons/PlusIcon.svelte b/packages/components/src/lib/icons/PlusIcon.svelte
similarity index 100%
rename from packages/web/src/lib/components/icons/PlusIcon.svelte
rename to packages/components/src/lib/icons/PlusIcon.svelte
diff --git a/packages/web/src/lib/components/icons/TrashIcon.svelte b/packages/components/src/lib/icons/TrashIcon.svelte
similarity index 100%
rename from packages/web/src/lib/components/icons/TrashIcon.svelte
rename to packages/components/src/lib/icons/TrashIcon.svelte
diff --git a/packages/components/src/lib/index.ts b/packages/components/src/lib/index.ts
index 3f90d0ed8..b6e9418b4 100644
--- a/packages/components/src/lib/index.ts
+++ b/packages/components/src/lib/index.ts
@@ -14,10 +14,51 @@ export {
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 Collapsible } from './Collapsible.svelte';
+export { default as DelayedRender } from './DelayedRender.svelte';
+export { default as GutterCenter } from './GutterCenter.svelte';
export { default as Input } from './Input.svelte';
+export { default as Isolate } from './Isolate.svelte';
+export { default as CheckIcon } from './icons/CheckIcon.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 PlayIcon } from './icons/PlayIcon.svelte';
+export { default as PlusIcon } from './icons/PlusIcon.svelte';
+export { default as TrashIcon } from './icons/TrashIcon.svelte';
export { default as Link } from './Link.svelte';
+export { default as AutomatticLogo } from './logos/AutomatticLogo.svelte';
+export { default as ChromeLogo } from './logos/ChromeLogo.svelte';
+export { default as CodeLogo } from './logos/CodeLogo.svelte';
+export { default as DiscordLogo } from './logos/DiscordLogo.svelte';
+export { default as EdgeLogo } from './logos/EdgeLogo.svelte';
+export { default as EmacsLogo } from './logos/EmacsLogo.svelte';
+export { default as FirefoxLogo } from './logos/FirefoxLogo.svelte';
+export { default as GitHubLogo } from './logos/GitHubLogo.svelte';
+export { default as GmailLogo } from './logos/GmailLogo.svelte';
+export { default as HelixLogo } from './logos/HelixLogo.svelte';
+export { default as IMessageLogo } from './logos/IMessageLogo.svelte';
+export { default as LinearLogo } from './logos/LinearLogo.svelte';
+export { default as Logo } from './logos/Logo.svelte';
+export { default as NeovimLogo } from './logos/NeovimLogo.svelte';
+export { default as NotionLogo } from './logos/NotionLogo.svelte';
+export { default as ObsidianLogo } from './logos/ObsidianLogo.svelte';
+export { default as RedditLogo } from './logos/RedditLogo.svelte';
+export { default as ScrivenerLogo } from './logos/ScrivenerLogo.svelte';
+export { default as SlackLogo } from './logos/SlackLogo.svelte';
+export { default as SublimeLogo } from './logos/SublimeLogo.svelte';
+export { default as TelegramLogo } from './logos/TelegramLogo.svelte';
+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 Section } from './Section.svelte';
export { default as Select } from './Select.svelte';
+export { default as Testimonial } from './Testimonial.svelte';
+export { default as TestimonialCollection } from './TestimonialCollection.svelte';
export { default as Textarea } from './Textarea.svelte';
diff --git a/packages/web/src/lib/components/AutomatticLogo.svelte b/packages/components/src/lib/logos/AutomatticLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/AutomatticLogo.svelte
rename to packages/components/src/lib/logos/AutomatticLogo.svelte
diff --git a/packages/web/src/lib/components/ChromeLogo.svelte b/packages/components/src/lib/logos/ChromeLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/ChromeLogo.svelte
rename to packages/components/src/lib/logos/ChromeLogo.svelte
diff --git a/packages/web/src/lib/components/CodeLogo.svelte b/packages/components/src/lib/logos/CodeLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/CodeLogo.svelte
rename to packages/components/src/lib/logos/CodeLogo.svelte
diff --git a/packages/web/src/lib/components/DiscordLogo.svelte b/packages/components/src/lib/logos/DiscordLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/DiscordLogo.svelte
rename to packages/components/src/lib/logos/DiscordLogo.svelte
diff --git a/packages/web/src/lib/components/EdgeLogo.svelte b/packages/components/src/lib/logos/EdgeLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/EdgeLogo.svelte
rename to packages/components/src/lib/logos/EdgeLogo.svelte
diff --git a/packages/web/src/lib/components/EmacsLogo.svelte b/packages/components/src/lib/logos/EmacsLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/EmacsLogo.svelte
rename to packages/components/src/lib/logos/EmacsLogo.svelte
diff --git a/packages/web/src/lib/components/FirefoxLogo.svelte b/packages/components/src/lib/logos/FirefoxLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/FirefoxLogo.svelte
rename to packages/components/src/lib/logos/FirefoxLogo.svelte
diff --git a/packages/web/src/lib/components/GitHubLogo.svelte b/packages/components/src/lib/logos/GitHubLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/GitHubLogo.svelte
rename to packages/components/src/lib/logos/GitHubLogo.svelte
diff --git a/packages/web/src/lib/components/GmailLogo.svelte b/packages/components/src/lib/logos/GmailLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/GmailLogo.svelte
rename to packages/components/src/lib/logos/GmailLogo.svelte
diff --git a/packages/web/src/lib/components/HelixLogo.svelte b/packages/components/src/lib/logos/HelixLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/HelixLogo.svelte
rename to packages/components/src/lib/logos/HelixLogo.svelte
diff --git a/packages/web/src/lib/components/IMessageLogo.svelte b/packages/components/src/lib/logos/IMessageLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/IMessageLogo.svelte
rename to packages/components/src/lib/logos/IMessageLogo.svelte
diff --git a/packages/web/src/lib/components/LinearLogo.svelte b/packages/components/src/lib/logos/LinearLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/LinearLogo.svelte
rename to packages/components/src/lib/logos/LinearLogo.svelte
diff --git a/packages/web/src/lib/components/Logo.svelte b/packages/components/src/lib/logos/Logo.svelte
similarity index 100%
rename from packages/web/src/lib/components/Logo.svelte
rename to packages/components/src/lib/logos/Logo.svelte
diff --git a/packages/web/src/lib/components/NeovimLogo.svelte b/packages/components/src/lib/logos/NeovimLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/NeovimLogo.svelte
rename to packages/components/src/lib/logos/NeovimLogo.svelte
diff --git a/packages/web/src/lib/components/NotionLogo.svelte b/packages/components/src/lib/logos/NotionLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/NotionLogo.svelte
rename to packages/components/src/lib/logos/NotionLogo.svelte
diff --git a/packages/web/src/lib/components/ObsidianLogo.svelte b/packages/components/src/lib/logos/ObsidianLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/ObsidianLogo.svelte
rename to packages/components/src/lib/logos/ObsidianLogo.svelte
diff --git a/packages/web/src/lib/components/RedditLogo.svelte b/packages/components/src/lib/logos/RedditLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/RedditLogo.svelte
rename to packages/components/src/lib/logos/RedditLogo.svelte
diff --git a/packages/web/src/lib/components/ScrivenerLogo.svelte b/packages/components/src/lib/logos/ScrivenerLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/ScrivenerLogo.svelte
rename to packages/components/src/lib/logos/ScrivenerLogo.svelte
diff --git a/packages/web/src/lib/components/SlackLogo.svelte b/packages/components/src/lib/logos/SlackLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/SlackLogo.svelte
rename to packages/components/src/lib/logos/SlackLogo.svelte
diff --git a/packages/web/src/lib/components/SublimeLogo.svelte b/packages/components/src/lib/logos/SublimeLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/SublimeLogo.svelte
rename to packages/components/src/lib/logos/SublimeLogo.svelte
diff --git a/packages/web/src/lib/components/TelegramLogo.svelte b/packages/components/src/lib/logos/TelegramLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/TelegramLogo.svelte
rename to packages/components/src/lib/logos/TelegramLogo.svelte
diff --git a/packages/web/src/lib/components/ThingsLogo.svelte b/packages/components/src/lib/logos/ThingsLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/ThingsLogo.svelte
rename to packages/components/src/lib/logos/ThingsLogo.svelte
diff --git a/packages/web/src/lib/components/WhatsAppLogo.svelte b/packages/components/src/lib/logos/WhatsAppLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/WhatsAppLogo.svelte
rename to packages/components/src/lib/logos/WhatsAppLogo.svelte
diff --git a/packages/web/src/lib/components/WordPressLogo.svelte b/packages/components/src/lib/logos/WordPressLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/WordPressLogo.svelte
rename to packages/components/src/lib/logos/WordPressLogo.svelte
diff --git a/packages/web/src/lib/components/ZedLogo.svelte b/packages/components/src/lib/logos/ZedLogo.svelte
similarity index 100%
rename from packages/web/src/lib/components/ZedLogo.svelte
rename to packages/components/src/lib/logos/ZedLogo.svelte
diff --git a/packages/harper-editor/src/lib/Editor.svelte b/packages/harper-editor/src/lib/Editor.svelte
index a01fb7907..bf4c13239 100644
--- a/packages/harper-editor/src/lib/Editor.svelte
+++ b/packages/harper-editor/src/lib/Editor.svelte
@@ -1,4 +1,5 @@
<script lang="ts">
+import { DelayedRender } from 'components';
import type { Lint, Linter } from 'harper.js';
import {
type IgnorableLintBox,
@@ -18,6 +19,9 @@ import {
import LintSidebar from './LintSidebar.svelte';
import StatusBar from './StatusBar.svelte';
+/** Who initiated an action on the sidebar. Automated actions can be overwritten by anyone, user actions can only be overwritten by the user. */
+type SidebarAction = 'user' | 'automated';
+
export let content = '';
export let linter: Linter;
export let onReady: () => void = () => null;
@@ -35,9 +39,8 @@ let fontFamily = normalizeFontFamily(defaultFontFamily);
let fontSize = normalizeFontSize(defaultFontSize);
let lastExternalContent = content;
let readySent = false;
-let restoreButtonTimeout: ReturnType<typeof setTimeout> | null = null;
-let restoreButtonVisible = false;
let sidebarVisible = true;
+let lastSidebarAction: SidebarAction = 'automated';
let syncTimeout: ReturnType<typeof setTimeout> | null = null;
const sidebarTransitionDuration = 250;
@@ -87,6 +90,25 @@ let lfw = new LintFramework(
},
);
+/** Exists to automatically hide the sidebar on smaller screens. */
+let resizeObserver = new ResizeObserver((entries) => {
+ for (let entry of entries) {
+ if (entry.contentBoxSize[0].inlineSize < 640) {
+ hideSidebar('automated');
+ } else {
+ showSidebar('automated');
+ }
+ }
+});
+
+let editorContainer: Element | null = null;
+
+$: {
+ if (editorContainer != null) {
+ resizeObserver.observe(editorContainer);
+ }
+}
+
$: {
const version = ++linterVersion;
const activeLinter = linter;
@@ -265,39 +287,37 @@ async function ignoreAllProblems() {
await activeLinter.ignoreLints(text, lints);
}
-async function showSidebar() {
- if (restoreButtonTimeout != null) {
- clearTimeout(restoreButtonTimeout);
- restoreButtonTimeout = null;
+async function showSidebar(reason: SidebarAction = 'automated') {
+ if (lastSidebarAction === 'user' && reason === 'automated') {
+ return;
}
- restoreButtonVisible = false;
await tick();
+ lastSidebarAction = reason;
+
sidebarVisible = true;
}
-function hideSidebar() {
- sidebarVisible = false;
- restoreButtonVisible = false;
+function hideSidebar(reason: SidebarAction = 'automated'): void {
+ if (lastSidebarAction === 'user' && reason === 'automated') {
+ return;
+ }
+ lastSidebarAction = reason;
- if (restoreButtonTimeout != null) {
- clearTimeout(restoreButtonTimeout);
+ if (sidebarVisible === false) {
+ return;
}
- restoreButtonTimeout = setTimeout(() => {
- if (!sidebarVisible) {
- restoreButtonVisible = true;
- }
- restoreButtonTimeout = null;
- }, restoreButtonDelay);
+ sidebarVisible = false;
}
</script>
<div
class="harper-editor @container flex h-full min-h-0 w-full flex-col overflow-hidden rounded-[10px] border-[0.5px] border-[rgba(28,26,22,0.14)] bg-[#fbfaf6] text-stone-950 shadow-2xl shadow-stone-950/5"
style={editorStyle}
+ bind:this={editorContainer}
>
- <div class="flex min-h-0 min-w-0 flex-1 @max-[760px]:flex-col">
+ <div class="flex min-h-0 min-w-0 flex-1">
<section class="relative min-w-0 flex-1 bg-[#fbfaf6]" aria-label="Document editor">
<div class="h-full overflow-auto p-[34px_40px_56px] @max-[760px]:p-[28px_24px_42px]">
<div class="mx-auto flex min-h-full max-w-[640px]">
@@ -305,14 +325,14 @@ function hideSidebar() {
</div>
</div>
- {#if !sidebarVisible && restoreButtonVisible}
+ <DelayedRender active={!sidebarVisible} delayMs={restoreButtonDelay}>
<button
type="button"
class="absolute top-3 right-3 z-20 inline-flex h-8 w-8 items-center justify-center rounded-md border-0 bg-transparent text-stone-600 shadow-none transition-colors duration-150 hover:text-stone-950 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-sky-500"
aria-label="Show problems sidebar"
title="Show problems sidebar"
in:fade={{ duration: 120 }}
- on:click={showSidebar}
+ on:click={() => showSidebar("user")}
>
<svg
viewBox="0 0 20 20"
@@ -323,7 +343,7 @@ function hideSidebar() {
<path d="M12.5 3v14" />
</svg>
</button>
- {/if}
+ </DelayedRender>
</section>
{#if sidebarVisible}
@@ -335,7 +355,7 @@ function hideSidebar() {
onApplied={handleProblemAction}
onIgnored={handleProblemAction}
onIgnoreAll={ignoreAllProblems}
- onHideSidebar={hideSidebar}
+ onHideSidebar={() => hideSidebar("user")}
/>
{/if}
</div>
diff --git a/packages/harper-editor/src/lib/LintSidebar.svelte b/packages/harper-editor/src/lib/LintSidebar.svelte
index 251fe00ec..ede9811b3 100644
--- a/packages/harper-editor/src/lib/LintSidebar.svelte
+++ b/packages/harper-editor/src/lib/LintSidebar.svelte
@@ -167,18 +167,18 @@ function createSnippetFor(lintBox: LintBox) {
<svelte:window on:click={handleWindowClick} on:keydown={handleWindowKeydown} />
<aside
- class="flex min-h-0 w-[320px] flex-[0_0_320px] overflow-hidden border-l-[0.5px] border-[rgba(28,26,22,0.14)] bg-[#f4f0e7] [font-family:'Inter',-apple-system,BlinkMacSystemFont,'SF_Pro_Text','Helvetica_Neue',sans-serif] @max-[760px]:w-full @max-[760px]:flex-[0_0_42%] @max-[760px]:border-t-[0.5px] @max-[760px]:border-l-0"
+ class="flex min-h-0 w-[320px] flex-[0_0_320px] overflow-hidden border-l-[0.5px] border-[rgba(28,26,22,0.14)] bg-[#f4f0e7] @max-[760px]:w-full @max-[760px]:flex-[0_0_42%] @max-[760px]:border-t-[0.5px] @max-[760px]:border-l-0"
aria-label="Problems"
transition:fly={{ x: 320, duration: 250, easing: cubicOut }}
>
<div class="flex min-h-0 flex-1 flex-col" transition:fade={{ duration: 250 }}>
<header class="flex items-center gap-1.5 px-3.5 pt-2.5 pb-2">
<h2
- class="!m-0 flex min-w-0 flex-1 items-center !p-0 !text-[15px] !leading-none !font-bold text-stone-950 ![font-family:inherit]"
+ class="m-0! flex min-w-0 flex-1 items-center p-0! text-[15px]! leading-none! font-bold! text-stone-950 font-[inherit]!"
>
<button
type="button"
- class="!m-0 inline-flex min-w-0 items-center gap-1.5 border-0 bg-transparent !p-0 text-left !text-[15px] !leading-none font-[inherit] text-inherit"
+ class="m-0! inline-flex min-w-0 items-center gap-1.5 border-0 bg-transparent p-0! text-left text-[15px]! leading-none! font-[inherit] text-inherit"
aria-expanded={showLintKindCounts}
on:click={() => (showLintKindCounts = !showLintKindCounts)}
>
diff --git a/packages/web/src/lib/components/WeirStudioFileExplorer.svelte b/packages/web/src/lib/components/WeirStudioFileExplorer.svelte
index eb015609a..4e5303e92 100644
--- a/packages/web/src/lib/components/WeirStudioFileExplorer.svelte
+++ b/packages/web/src/lib/components/WeirStudioFileExplorer.svelte
@@ -1,11 +1,14 @@
<script lang="ts">
-import { Button, Input } from 'components';
-import CheckIcon from '$lib/components/icons/CheckIcon.svelte';
-import ChevronLeftIcon from '$lib/components/icons/ChevronLeftIcon.svelte';
-import EditIcon from '$lib/components/icons/EditIcon.svelte';
-import PlusIcon from '$lib/components/icons/PlusIcon.svelte';
-import TrashIcon from '$lib/components/icons/TrashIcon.svelte';
-import ChevronRightIcon from './icons/ChevronRightIcon.svelte';
+import {
+ Button,
+ CheckIcon,
+ ChevronLeftIcon,
+ ChevronRightIcon,
+ EditIcon,
+ Input,
+ PlusIcon,
+ TrashIcon,
+} from 'components';
/** Whether to render the file explorer as a closed drawer or an open one. */
export let drawerOpen = true;
diff --git a/packages/web/src/lib/components/WeirStudioWorkspace.svelte b/packages/web/src/lib/components/WeirStudioWorkspace.svelte
index c616da5fa..44a599b55 100644
--- a/packages/web/src/lib/components/WeirStudioWorkspace.svelte
+++ b/packages/web/src/lib/components/WeirStudioWorkspace.svelte
@@ -1,9 +1,6 @@
<script lang="ts">
-import { Button, Card } from 'components';
+import { Button, Card, CloseIcon, DownloadIcon, PlayIcon } from 'components';
import type { ComponentType } from 'svelte';
-import CloseIcon from '$lib/components/icons/CloseIcon.svelte';
-import DownloadIcon from '$lib/components/icons/DownloadIcon.svelte';
-import PlayIcon from '$lib/components/icons/PlayIcon.svelte';
import WeirStudioFileExplorer from '$lib/components/WeirStudioFileExplorer.svelte';
export let drawerOpen = true;
diff --git a/packages/web/src/lib/marketing/AppLogoTile.svelte b/packages/web/src/lib/marketing/AppLogoTile.svelte
index 15e837325..ed161ff59 100644
--- a/packages/web/src/lib/marketing/AppLogoTile.svelte
+++ b/packages/web/src/lib/marketing/AppLogoTile.svelte
@@ -1,17 +1,19 @@
<script lang="ts">
-import DiscordLogo from '$lib/components/DiscordLogo.svelte';
-import GitHubLogo from '$lib/components/GitHubLogo.svelte';
-import GmailLogo from '$lib/components/GmailLogo.svelte';
-import IMessageLogo from '$lib/components/IMessageLogo.svelte';
-import LinearLogo from '$lib/components/LinearLogo.svelte';
-import NotionLogo from '$lib/components/NotionLogo.svelte';
-import ObsidianLogo from '$lib/components/ObsidianLogo.svelte';
-import RedditLogo from '$lib/components/RedditLogo.svelte';
-import ScrivenerLogo from '$lib/components/ScrivenerLogo.svelte';
-import SlackLogo from '$lib/components/SlackLogo.svelte';
-import TelegramLogo from '$lib/components/TelegramLogo.svelte';
-import ThingsLogo from '$lib/components/ThingsLogo.svelte';
-import WhatsAppLogo from '$lib/components/WhatsAppLogo.svelte';
+import {
+ DiscordLogo,
+ GitHubLogo,
+ GmailLogo,
+ IMessageLogo,
+ LinearLogo,
+ NotionLogo,
+ ObsidianLogo,
+ RedditLogo,
+ ScrivenerLogo,
+ SlackLogo,
+ TelegramLogo,
+ ThingsLogo,
+ WhatsAppLogo,
+} from 'components';
export let id: string;
export let size = 40;
diff --git a/packages/web/src/lib/marketing/FaqSection.svelte b/packages/web/src/lib/marketing/FaqSection.svelte
index afaccbd50..dfbd03753 100644
--- a/packages/web/src/lib/marketing/FaqSection.svelte
+++ b/packages/web/src/lib/marketing/FaqSection.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
-import Arrow from '$lib/components/Arrow.svelte';
+import { Arrow } from 'components';
type FaqItem = {
q: string;
diff --git a/packages/web/src/lib/marketing/IntegrationTile.svelte b/packages/web/src/lib/marketing/IntegrationTile.svelte
index 6258a6601..61d5035fa 100644
--- a/packages/web/src/lib/marketing/IntegrationTile.svelte
+++ b/packages/web/src/lib/marketing/IntegrationTile.svelte
@@ -1,14 +1,16 @@
<script lang="ts">
-import ChromeLogo from '$lib/components/ChromeLogo.svelte';
-import CodeLogo from '$lib/components/CodeLogo.svelte';
-import EmacsLogo from '$lib/components/EmacsLogo.svelte';
-import FirefoxLogo from '$lib/components/FirefoxLogo.svelte';
-import HelixLogo from '$lib/components/HelixLogo.svelte';
-import NeovimLogo from '$lib/components/NeovimLogo.svelte';
-import ObsidianLogo from '$lib/components/ObsidianLogo.svelte';
-import SublimeLogo from '$lib/components/SublimeLogo.svelte';
-import WordPressLogo from '$lib/components/WordPressLogo.svelte';
-import ZedLogo from '$lib/components/ZedLogo.svelte';
+import {
+ ChromeLogo,
+ CodeLogo,
+ EmacsLogo,
+ FirefoxLogo,
+ HelixLogo,
+ NeovimLogo,
+ ObsidianLogo,
+ SublimeLogo,
+ WordPressLogo,
+ ZedLogo,
+} from 'components';
import type { Integration } from './data';
import HarperMark from './HarperMark.svelte';
diff --git a/packages/web/src/lib/marketing/MarketingHeader.svelte b/packages/web/src/lib/marketing/MarketingHeader.svelte
index 67b2ff04f..bcfb0383a 100644
--- a/packages/web/src/lib/marketing/MarketingHeader.svelte
+++ b/packages/web/src/lib/marketing/MarketingHeader.svelte
@@ -1,8 +1,6 @@
<script lang="ts">
+import { Arrow, DiscordLogo, GitHubLogo } from 'components';
import { onMount } from 'svelte';
-import Arrow from '$lib/components/Arrow.svelte';
-import DiscordLogo from '$lib/components/DiscordLogo.svelte';
-import GitHubLogo from '$lib/components/GitHubLogo.svelte';
import { marketingLinks } from './data';
import HarperMark from './HarperMark.svelte';
import MarketingDocSearch from './MarketingDocSearch.svelte';
diff --git a/packages/web/src/routes/+layout.svelte b/packages/web/src/routes/+layout.svelte
index 54a1aead6..459d17632 100644
--- a/packages/web/src/routes/+layout.svelte
+++ b/packages/web/src/routes/+layout.svelte
@@ -1,13 +1,11 @@
<script lang="ts">
import '../app.css';
-import { Link } from 'components';
+import { AutomatticLogo, GutterCenter, Link } from 'components';
import posthog from 'posthog-js';
import { onMount } from 'svelte';
import { browser } from '$app/environment';
import { page } from '$app/stores';
-import AutomatticLogo from '$lib/components/AutomatticLogo.svelte';
-import GutterCenter from '$lib/components/GutterCenter.svelte';
onMount(() => {
if (browser) {
diff --git a/packages/web/src/routes/+page.svelte b/packages/web/src/routes/+page.svelte
index 9a3d86683..6b68dc30e 100644
--- a/packages/web/src/routes/+page.svelte
+++ b/packages/web/src/routes/+page.svelte
@@ -6,8 +6,8 @@ export const frontmatter = {
<script lang="ts">
import { browser } from '$app/environment';
-import Arrow from '$lib/components/Arrow.svelte';
-import TestimonialCollection from '$lib/components/TestimonialCollection.svelte';
+import { Arrow } from 'components';
+import { TestimonialCollection } from 'components';
import { createEditorLinter } from '$lib/createEditorLinter';
import FaqSection from '$lib/marketing/FaqSection.svelte';
import HarperMark from '$lib/marketing/HarperMark.svelte';
@@ -182,9 +182,6 @@ onMount(() => {
The <strong class="inline-block -rotate-1 bg-primary-100 p-1 text-black">Free</strong> Grammar Checker
That Respects Your Privacy
</p>
- <p class="!mt-3 !mb-0 !font-serif text-[1.12rem] leading-[1.35] text-[#807a6e] italic dark:text-white/55">
- I make you look like a grammar genius.
- </p>
<div class="mt-7 flex flex-wrap gap-[0.65rem] max-[620px]:flex-col max-[620px]:items-stretch">
<PillButton href="/get" size="lg">Get Harper</PillButton>
<PillButton href={marketingLinks.github} kind="secondary" size="lg">Star on GitHub</PillButton>
diff --git a/packages/web/src/routes/editor/+page.svelte b/packages/web/src/routes/editor/+page.svelte
index 1df6039dc..2d0646468 100644
--- a/packages/web/src/routes/editor/+page.svelte
+++ b/packages/web/src/routes/editor/+page.svelte
@@ -1,11 +1,11 @@
<script lang="ts">
/// This page exists to be embedded via an `iframe`.
+import { Isolate } from 'components';
import type { Linter } from 'harper.js';
import { Editor } from 'harper-editor';
import { onMount } from 'svelte';
import { page } from '$app/stores';
-import Isolate from '$lib/components/Isolate.svelte';
import { createEditorLinter } from '$lib/createEditorLinter';
let content = $page.url.searchParams.get('initialText') ?? '';
diff --git a/packages/web/src/routes/presentation/+page.svelte b/packages/web/src/routes/presentation/+page.svelte
index d94d63553..4ce91ac26 100644
--- a/packages/web/src/routes/presentation/+page.svelte
+++ b/packages/web/src/routes/presentation/+page.svelte
@@ -1,10 +1,9 @@
<script lang="ts">
import 'reveal.js/dist/reveal.css';
import 'reveal.js/dist/theme/serif.css';
-import { Link } from 'components';
+import { Link, Logo } from 'components';
import Reveal from 'reveal.js';
import { onMount } from 'svelte';
-import Logo from '$lib/components/Logo.svelte';
onMount(() => {
let deck = new Reveal();
diff --git a/packages/web/src/routes/report-problematic-lint/+page.svelte b/packages/web/src/routes/report-problematic-lint/+page.svelte
index 63dbb555b..10383c7eb 100644
--- a/packages/web/src/routes/report-problematic-lint/+page.svelte
+++ b/packages/web/src/routes/report-problematic-lint/+page.svelte
@@ -1,6 +1,5 @@
<script lang="ts">
-import { Button, Card, Checkbox, Input, Label, Radio } from 'components';
-import Isolate from '$lib/components/Isolate.svelte';
+import { Button, Card, Checkbox, Input, Isolate, Label, Radio } from 'components';
</script>
<Isolate>
diff --git a/packages/web/src/routes/titlecase/+page.svelte b/packages/web/src/routes/titlecase/+page.svelte
index eb608b2e8..2feb7dac0 100644
--- a/packages/web/src/routes/titlecase/+page.svelte
+++ b/packages/web/src/routes/titlecase/+page.svelte
@@ -73,7 +73,7 @@ $: if (linter) {
<article class="mb-8">
<Textarea
bind:value={text}
- rows="1"
+ rows={1}
class="heading-textarea w-full font-serif text-2xl md:text-3xl font-bold border-none focus:ring-2 focus:ring-blue-200 bg-transparent p-0 resize-none overflow-hidden"
id="titleCaseInputField"
/>
diff --git a/packages/web/src/routes/uninstall-browser-extension/+page.svelte b/packages/web/src/routes/uninstall-browser-extension/+page.svelte
index 6ef11a025..6de73be65 100644
--- a/packages/web/src/routes/uninstall-browser-extension/+page.svelte
+++ b/packages/web/src/routes/uninstall-browser-extension/+page.svelte
@@ -1,6 +1,5 @@
<script lang="ts">
-import { Button, Card, Input, Label, Radio } from 'components';
-import Isolate from '$lib/components/Isolate.svelte';
+import { Button, Card, Input, Isolate, Label, Radio } from 'components';
const reasons = {
confused: 'I was confused by how it worked',
diff --git a/packages/web/src/routes/weir/studio/+page.svelte b/packages/web/src/routes/weir/studio/+page.svelte
index dce2e7f28..a88ad6feb 100644
--- a/packages/web/src/routes/weir/studio/+page.svelte
+++ b/packages/web/src/routes/weir/studio/+page.svelte
@@ -1,9 +1,9 @@
<script lang="ts">
+import { Isolate } from 'components';
import { packWeirpackFiles, unpackWeirpackBytes } from 'harper.js';
import type { ComponentType } from 'svelte';
import { onMount } from 'svelte';
import { browser } from '$app/environment';
-import Isolate from '$lib/components/Isolate.svelte';
import type { Toast } from '$lib/components/Toasts.svelte';
import Toasts from '$lib/components/Toasts.svelte';
import WeirStudioStart from '$lib/components/WeirStudioStart.svelte';