Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
feat: reverted to custom editor for website
Elijah Potter887be168f863
diff --git a/packages/web/package.json b/packages/web/package.jsonindex f670a4082..c2d80ec21 100644--- a/packages/web/package.json+++ b/packages/web/package.json@@ -1,39 +1,36 @@{- "name": "harper-web",- "version": "0.0.1",- "private": true,- "scripts": {- "dev": "vite dev",- "build": "vite build",- "preview": "vite preview",- "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",- "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"- },- "devDependencies": {- "@flydotio/dockerfile": "^0.5.0",- "@sveltejs/adapter-node": "^3.0.3",- "@sveltejs/kit": "^1.20.4",- "@typescript-eslint/eslint-plugin": "^6.0.0",- "@typescript-eslint/parser": "^6.0.0",- "autoprefixer": "^10.4.16",- "flowbite": "^1.8.1",- "flowbite-svelte": "^0.44.18",- "postcss": "^8.4.31",- "svelte": "^4.0.5",- "svelte-check": "^3.4.3",- "tailwindcss": "^3.3.3",- "tslib": "^2.4.1",- "typescript": "^5.0.0",- "vite": "^4.4.2",- "vite-plugin-top-level-await": "^1.4.1",- "vite-plugin-wasm": "^3.3.0"- },- "type": "module",- "dependencies": {- "wasm": "link:../../harper-wasm/pkg",- "@codemirror/lint": "^6.5.0",- "@codemirror/state": "^6.4.1",- "codemirror": "^6.0.1",- "lodash-es": "^4.17.21"- }+ "name": "harper-web",+ "version": "0.0.1",+ "private": true,+ "scripts": {+ "dev": "vite dev",+ "build": "vite build",+ "preview": "vite preview",+ "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",+ "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"+ },+ "devDependencies": {+ "@flydotio/dockerfile": "^0.5.0",+ "@sveltejs/adapter-node": "^3.0.3",+ "@sveltejs/kit": "^1.20.4",+ "@typescript-eslint/eslint-plugin": "^6.0.0",+ "@typescript-eslint/parser": "^6.0.0",+ "autoprefixer": "^10.4.16",+ "flowbite": "^1.8.1",+ "flowbite-svelte": "^0.44.18",+ "postcss": "^8.4.31",+ "svelte": "^4.0.5",+ "svelte-check": "^3.4.3",+ "tailwindcss": "^3.3.3",+ "tslib": "^2.4.1",+ "typescript": "^5.0.0",+ "vite": "^4.4.2",+ "vite-plugin-top-level-await": "^1.4.1",+ "vite-plugin-wasm": "^3.3.0"+ },+ "type": "module",+ "dependencies": {+ "wasm": "link:../../harper-wasm/pkg",+ "lodash-es": "^4.17.21"+ }}diff --git a/packages/web/src/app.css b/packages/web/src/app.cssindex a95825fe5..b05030561 100644--- a/packages/web/src/app.css+++ b/packages/web/src/app.css@@ -12,6 +12,30 @@src: url('/fonts/outfit.ttf');}+.underlinespecial {+ position: relative;+ background-color: var(--bg-color);+}++.underlinespecial::after {+ transition-property: all;+ transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);+ transition-duration: 150ms;+ content: '';+ display: block;+ width: 100%;+ height: var(--line-width);+ border-radius: 1000px;+ background: var(--line-color);+ position: absolute;+ bottom: -3px;+ left: 0;+}++textarea {+ --tw-ring-shadow: 0 0 #000 !important;+}+.animate-bigbounce {animation: bigbounce 1s infinite;}@@ -31,31 +55,3 @@animation-timing-function: cubic-bezier(0, 0, 0.2, 1);}}--.cm-editor {-}--.cm-diagnostic-error {-}--.cm-tooltip {- border-radius: 10px;- border: 1px solid black;- margin-top: 5px;- background: white !important;-}--.cm-diagnostic {- border-left: none !important;- display: flex !important;- flex-direction: column;- padding: 10px !important;- align-items: start;-}--.cm-diagnostic-error > * {- margin: 4px 0px !important;-}--.cm-diagnosticAction {-}diff --git a/packages/web/src/lib/Editor.svelte b/packages/web/src/lib/Editor.sveltenew file mode 100644index 000000000..83dcf9b69--- /dev/null+++ b/packages/web/src/lib/Editor.svelte@@ -0,0 +1,103 @@+<script lang="ts">+ import { Card } from 'flowbite-svelte';+ import demo from '../../../../demo.md?raw';+ import Underlines from '$lib/Underlines.svelte';+ import { Button } from 'flowbite-svelte';+ import { lintText, applySuggestion, spanContent } from '$lib/analysis';+ import type { Lint } from '$lib/analysis';++ let content = demo;++ let lints: Lint[] = [];+ let lintCards: HTMLButtonElement[] = [];+ let focused: number | undefined;+ let editor: HTMLTextAreaElement | null;++ $: lintText(content).then((newLints) => (lints = newLints));+ $: boxHeight = calcHeight(content);+ $: if (focused != null && lintCards[focused])+ lintCards[focused].scrollIntoView({ behavior: 'smooth', block: 'center' });++ $: if (editor != null && focused != null) {+ let lint = lints[focused % lints.length];+ if (lint != null) {+ let p = lint.span.end;+ editor.selectionStart = p;+ editor.selectionEnd = p;+ }+ }++ function calcHeight(boxContent: string): number {+ let numberOfLineBreaks = (boxContent.match(/\n/g) || []).length;+ let newHeight = 20 + numberOfLineBreaks * 30 + 12 + 2;+ return newHeight;+ }+</script>++<div class="flex flex-row w-full h-full p-5">+ <Card+ class="flex-grow h-full p-5 grid z-10 max-w-full text-lg overflow-auto mr-5"+ on:click={() => editor && editor.focus()}+ >+ <textarea+ bind:this={editor}+ class="w-full text-nowrap m-0 rounded-none p-0 z-0 bg-transparent overflow-hidden border-none text-lg resize-none focus:border-0"+ spellcheck="false"+ style={`grid-row: 1; grid-column: 1; height: ${boxHeight}px`}+ on:keydown={() => (focused = undefined)}+ bind:value={content}+ ></textarea>+ <div class="m-0 p-0 z-10 pointer-events-none" style="grid-row: 1; grid-column: 1">+ <Underlines {content} bind:focusLintIndex={focused} />+ </div>+ </Card>+ <Card class="flex-none basis-[400px] h-full p-1">+ <h2 class="text-2xl font-bold m-2">Suggestions</h2>+ <div class="flex flex-col overflow-y-scroll overflow-x-hidden m-0 p-0">+ {#each lints as lint, i}+ <button+ class="block max-w-sm p-3 bg-white dark:bg-gray-800 border border-gray-200 rounded-lg shadow m-1 hover:translate-x-1 transition-all"+ on:click={() => (focused = i)}+ bind:this={lintCards[i]}+ >+ <div class="pl-2 border-l-[3px] border-l-primary-500">+ <div class="flex flex-row">+ <h3 class="font-bold">+ {lint.lint_kind} - “<span class="italic">+ {spanContent(lint.span, content)}+ </span> ”+ </h3>+ </div>+ <div+ class="transition-all overflow-hidden flex flex-col justify-evenly"+ style={`height: ${focused === i ? `calc(55px * ${lint.suggestions.length + 1})` : '0px'}`}+ >+ <p style="height: 50px" class="text-left">{lint.message}</p>+ {#each lint.suggestions as suggestion}+ <div class="w-full p-[4px]">+ <Button+ class="w-full"+ style="height: 40px; margin: 5px 0px;"+ on:click={() =>+ applySuggestion(content, suggestion, lint.span).then(+ (edited) => (content = edited)+ )}+ >+ {#if suggestion == 'Remove'}+ Remove "{content.substring(lint.span.start, lint.span.end)}"+ {:else}+ Replace "{content.substring(lint.span.start, lint.span.end)}" with "{suggestion.ReplaceWith.reduce(+ (p, c) => p + c,+ ''+ )}"+ {/if}+ </Button>+ </div>+ {/each}+ </div>+ </div>+ </button>+ {/each}+ </div>+ </Card>+</div>diff --git a/packages/web/src/lib/NewEditor.svelte b/packages/web/src/lib/NewEditor.sveltedeleted file mode 100644index caa88282e..000000000--- a/packages/web/src/lib/NewEditor.svelte+++ /dev/null@@ -1,68 +0,0 @@-<script lang="ts">- import { onMount } from 'svelte';- import { minimalSetup, EditorView } from 'codemirror';- import { contentToString, lintText, type Suggestion } from './analysis';- import { linter } from '@codemirror/lint';- import demoText from '../../../../demo.md?raw';- import { Card } from 'flowbite-svelte';-- let editorDiv: HTMLDivElement;-- function suggestionToLabel(sug: Suggestion) {- if (sug === 'Remove') {- return 'Remove';- } else {- return `Replace with "${contentToString(sug.ReplaceWith)}"`;- }- }-- const harperLinter = linter(- async (view) => {- let text = view.state.doc.sliceString(-1);-- let lints = await lintText(text);-- return lints.map((lint) => {- return {- from: lint.span.start,- to: lint.span.end,- severity: 'error',- message: lint.message,- actions: lint.suggestions.map((sug) => {- return {- name: suggestionToLabel(sug),- apply: (view) => {- if (sug === 'Remove') {- view.dispatch({- changes: { from: lint.span.start, to: lint.span.end, insert: '' }- });- } else {- view.dispatch({- changes: {- from: lint.span.start,- to: lint.span.end,- insert: contentToString(sug.ReplaceWith)- }- });- }- }- };- })- };- });- },- { delay: -1 }- );-- onMount(() => {- new EditorView({- doc: demoText,- extensions: [minimalSetup, harperLinter],- parent: editorDiv- });- });-</script>--<Card class="w-full max-w-full">- <div bind:this={editorDiv} class="text-lg" />-</Card>diff --git a/packages/web/src/routes/+page.svelte b/packages/web/src/routes/+page.svelteindex 5c08db37f..06825a502 100644--- a/packages/web/src/routes/+page.svelte+++ b/packages/web/src/routes/+page.svelte@@ -1,7 +1,7 @@<script>+ import Editor from '$lib/Editor.svelte';import GutterCenter from '$lib/GutterCenter.svelte';import Logo from '$lib/Logo.svelte';- import NewEditor from '$lib/NewEditor.svelte';import { DarkMode } from 'flowbite-svelte';let width = window.innerWidth;@@ -47,8 +47,8 @@</div><div class="w-full h-[600px] overflow-hidden">- {#if width > 570}- <NewEditor />+ {#if width > 1080}+ <Editor />{:else}<p class="italic text-lg w-full text-center dark:text-white">Open this page on a bigger screen to start checking your work.diff --git a/packages/web/tailwind.config.js b/packages/web/tailwind.config.jsindex 3c18fa9ca..92559e48c 100644--- a/packages/web/tailwind.config.js+++ b/packages/web/tailwind.config.js@@ -1,14 +1,13 @@export default {content: ['./src/**/*.{html,js,svelte,ts}',- './node_modules/flowbite-svelte/**/*.{html,js,svelte,ts}'+ '../node_modules/flowbite-svelte/**/*.{html,js,svelte,ts}'],plugins: [require('flowbite/plugin')],darkMode: 'class',theme: {extend: {colors: {- // flowbite-svelteprimary: {900: '#133f71',800: '#355280',diff --git a/packages/yarn.lock b/packages/yarn.lockindex 3f81bb210..8741294ea 100644--- a/packages/yarn.lock+++ b/packages/yarn.lock@@ -27,70 +27,6 @@dependencies:regenerator-runtime "^0.14.0"-"@codemirror/autocomplete@^6.0.0":- version "6.15.0"- resolved "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-6.15.0.tgz#37bc320f20cdda332d6bf4d1fc7f300f8fc5f04c"- integrity sha512-G2Zm0mXznxz97JhaaOdoEG2cVupn4JjPaS4AcNvZzhOsnnG9YVN68VzfoUw6dYTsIxT6a/cmoFEN47KAWhXaOg==- dependencies:- "@codemirror/language" "^6.0.0"- "@codemirror/state" "^6.0.0"- "@codemirror/view" "^6.17.0"- "@lezer/common" "^1.0.0"--"@codemirror/commands@^6.0.0":- version "6.3.3"- resolved "https://registry.yarnpkg.com/@codemirror/commands/-/commands-6.3.3.tgz#03face5bf5f3de0fc4e09b177b3c91eda2ceb7e9"- integrity sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A==- dependencies:- "@codemirror/language" "^6.0.0"- "@codemirror/state" "^6.4.0"- "@codemirror/view" "^6.0.0"- "@lezer/common" "^1.1.0"--"@codemirror/language@^6.0.0":- version "6.10.1"- resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.10.1.tgz#428c932a158cb75942387acfe513c1ece1090b05"- integrity sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ==- dependencies:- "@codemirror/state" "^6.0.0"- "@codemirror/view" "^6.23.0"- "@lezer/common" "^1.1.0"- "@lezer/highlight" "^1.0.0"- "@lezer/lr" "^1.0.0"- style-mod "^4.0.0"--"@codemirror/lint@^6.0.0", "@codemirror/lint@^6.5.0":- version "6.5.0"- resolved "https://registry.yarnpkg.com/@codemirror/lint/-/lint-6.5.0.tgz#ea43b6e653dcc5bcd93456b55e9fe62e63f326d9"- integrity sha512-+5YyicIaaAZKU8K43IQi8TBy6mF6giGeWAH7N96Z5LC30Wm5JMjqxOYIE9mxwMG1NbhT2mA3l9hA4uuKUM3E5g==- dependencies:- "@codemirror/state" "^6.0.0"- "@codemirror/view" "^6.0.0"- crelt "^1.0.5"--"@codemirror/search@^6.0.0":- version "6.5.6"- resolved "https://registry.yarnpkg.com/@codemirror/search/-/search-6.5.6.tgz#8f858b9e678d675869112e475f082d1e8488db93"- integrity sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==- dependencies:- "@codemirror/state" "^6.0.0"- "@codemirror/view" "^6.0.0"- crelt "^1.0.5"--"@codemirror/state@^6.0.0", "@codemirror/state@^6.4.0", "@codemirror/state@^6.4.1":- version "6.4.1"- resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.4.1.tgz#da57143695c056d9a3c38705ed34136e2b68171b"- integrity sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==--"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0":- version "6.26.0"- resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.26.0.tgz#ab5a85aa8ebfb953cb5534e07d0a3751f9a3869a"- integrity sha512-nSSmzONpqsNzshPOxiKhK203R6BvABepugAe34QfQDbNDslyjkqBuKgrK5ZBvqNXpfxz5iLrlGTmEfhbQyH46A==- dependencies:- "@codemirror/state" "^6.4.0"- style-mod "^4.1.0"- w3c-keyname "^2.2.4"-"@esbuild/[email protected]":version "0.18.20"resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622"@@ -332,25 +268,6 @@"@jridgewell/resolve-uri" "^3.1.0""@jridgewell/sourcemap-codec" "^1.4.14"-"@lezer/common@^1.0.0", "@lezer/common@^1.1.0":- version "1.2.1"- resolved "https://registry.yarnpkg.com/@lezer/common/-/common-1.2.1.tgz#198b278b7869668e1bebbe687586e12a42731049"- integrity sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ==--"@lezer/highlight@^1.0.0":- version "1.2.0"- resolved "https://registry.yarnpkg.com/@lezer/highlight/-/highlight-1.2.0.tgz#e5898c3644208b4b589084089dceeea2966f7780"- integrity sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA==- dependencies:- "@lezer/common" "^1.0.0"--"@lezer/lr@^1.0.0":- version "1.4.0"- resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-1.4.0.tgz#ed52a75dbbfbb0d1eb63710ea84c35ee647cb67e"- integrity sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg==- dependencies:- "@lezer/common" "^1.0.0"-"@nodelib/[email protected]":version "2.1.5"resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"@@ -992,19 +909,6 @@ code-red@^1.0.3:estree-walker "^3.0.3"periscopic "^3.1.0"-codemirror@^6.0.1:- version "6.0.1"- resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-6.0.1.tgz#62b91142d45904547ee3e0e0e4c1a79158035a29"- integrity sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==- dependencies:- "@codemirror/autocomplete" "^6.0.0"- "@codemirror/commands" "^6.0.0"- "@codemirror/language" "^6.0.0"- "@codemirror/lint" "^6.0.0"- "@codemirror/search" "^6.0.0"- "@codemirror/state" "^6.0.0"- "@codemirror/view" "^6.0.0"-color-convert@^2.0.1:version "2.0.1"resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"@@ -1037,11 +941,6 @@ cookie@^0.5.0:resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==-crelt@^1.0.5:- version "1.0.6"- resolved "https://registry.yarnpkg.com/crelt/-/crelt-1.0.6.tgz#7cc898ea74e190fb6ef9dae57f8f81cf7302df72"- integrity sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==-cross-spawn@^7.0.0, cross-spawn@^7.0.2:version "7.0.3"resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"@@ -2359,11 +2258,6 @@ strip-json-comments@^3.1.1:resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==-style-mod@^4.0.0, style-mod@^4.1.0:- version "4.1.2"- resolved "https://registry.yarnpkg.com/style-mod/-/style-mod-4.1.2.tgz#ca238a1ad4786520f7515a8539d5a63691d7bf67"- integrity sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==-sucrase@^3.32.0:version "3.35.0"resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263"@@ -2681,11 +2575,6 @@ vitefu@^0.2.4:resolved "https://registry.yarnpkg.com/vitefu/-/vitefu-0.2.5.tgz#c1b93c377fbdd3e5ddd69840ea3aa70b40d90969"integrity sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==-w3c-keyname@^2.2.4:- version "2.2.8"- resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.8.tgz#7b17c8c6883d4e8b86ac8aba79d39e880f8869c5"- integrity sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==-"wasm@link:../harper-wasm/pkg":version "0.0.0"uid ""diff --git a/precommit.sh b/precommit.shindex 74dda8248..8ac2c6d79 100755--- a/precommit.sh+++ b/precommit.sh@@ -16,22 +16,22 @@ cargo buildcargo build --releasecargo bench-cd $R/harper-wasm-wasm-pack build --target bundler-cd $R/packagesyarn install -fyarn prettier --check .yarn eslint .-cd $R/packages/web+cd $R/harper-wasm+wasm-pack build --target web++cd $R/packages/obsidian-pluginyarn install -f-yarn run checkyarn run buildcd $R/harper-wasm-wasm-pack build --target web+wasm-pack build --target bundler-cd $R/packages/obsidian-plugin+cd $R/packages/webyarn install -f+yarn run checkyarn run build