Skip to content

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

refactor: use global linter

Elijah Potterb14d53cf8a7b
diff --git a/src/harper/HarperContext.ts b/src/harper/HarperContext.ts
new file mode 100644
index 000000000..40db705c2
--- /dev/null
+++ b/src/harper/HarperContext.ts
@@ -0,0 +1,4 @@
+import { WorkerLinter } from 'harper.js';
+import { createContext } from 'react';
+
+export default createContext(new WorkerLinter());
diff --git a/src/harper/Highlighter.tsx b/src/harper/Highlighter.tsx
index 0ef87be1b..b20cc4783 100644
--- a/src/harper/Highlighter.tsx
+++ b/src/harper/Highlighter.tsx
@@ -1,12 +1,13 @@
-import React, { useCallback, useState, useEffect } from 'react';
-import { Lint, WorkerLinter } from 'harper.js';
+import React, { useCallback, useState, useEffect, useContext } from 'react';
+import { Lint } from 'harper.js';
import SuggestionControl from './SuggestionControl';
import { LintBox } from './Box';
import RichText from './RichText';
-
-const linter = new WorkerLinter();
+import HarperContext from './HarperContext';
export default function Highlighter({ richText }: { richText: RichText }) {
+ const linter = useContext(HarperContext);
+
const [targetBoxes, setTargetBoxes] = useState<LintBox[]>([]);
const [lints, setLints] = useState<Lint[]>([]);
diff --git a/src/harper/SidebarControl.tsx b/src/harper/SidebarControl.tsx
index 034d501ba..ecfdfb319 100644
--- a/src/harper/SidebarControl.tsx
+++ b/src/harper/SidebarControl.tsx
@@ -1,7 +1,15 @@
import DataBlock from './DataBlock';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, {
+ createContext,
+ useCallback,
+ useEffect,
+ useMemo,
+ useRef,
+ useState,
+} from 'react';
import { createPortal } from 'react-dom';
import Highlighter from './Highlighter';
+import { WorkerLinter } from 'harper.js';
export default function SidebarControl() {
const documentContainer = useMemo<Element>(
diff --git a/src/harper/index.tsx b/src/harper/index.tsx
index c26f583ff..5140b2626 100644
--- a/src/harper/index.tsx
+++ b/src/harper/index.tsx
@@ -4,17 +4,23 @@ import SidebarControl from './SidebarControl';
import Logo from './Logo';
import './index.css';
-import React from 'react';
+import React, { useRef } from 'react';
+import { WorkerLinter } from 'harper.js';
+import HarperContext from './HarperContext';
function Sidebar() {
+ const linter = useRef(new WorkerLinter());
+
return (
<>
- <PluginSidebarMoreMenuItem target="harper-sidebar" icon={Logo}>
- Harper
- </PluginSidebarMoreMenuItem>
- <PluginSidebar name="harper-sidebar" title="Harper" icon={Logo}>
- <SidebarControl />
- </PluginSidebar>
+ <HarperContext.Provider value={linter.current}>
+ <PluginSidebarMoreMenuItem target="harper-sidebar" icon={Logo}>
+ Harper
+ </PluginSidebarMoreMenuItem>
+ <PluginSidebar name="harper-sidebar" title="Harper" icon={Logo}>
+ <SidebarControl />
+ </PluginSidebar>
+ </HarperContext.Provider>
</>
);
}