Skip to content

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

fix: behaves better with weird DOM structures and allows edits

Elijah Potter00f2d2bbf4ea
diff --git a/src/harper/Highlighter.tsx b/src/harper/Highlighter.tsx
index 1d0e54183..cab220065 100644
--- a/src/harper/Highlighter.tsx
+++ b/src/harper/Highlighter.tsx
@@ -4,6 +4,10 @@ import { useState, useEffect } from 'react';
import { LocalLinter, Lint, WorkerLinter, Suggestion, Span } from 'harper.js';
import SuggestionControl from './SuggestionControl';
import { LintBox } from './Box';
+import {
+ extractFromNodeList,
+ flattenNodeChildren as leafNodes,
+} from './domUtils';
let linter = new WorkerLinter();
@@ -21,7 +25,8 @@ async function memoizedLint( text: string ): Promise< Lint[] > {
}
function getRangeForTextSpan( target: Element, span: Span ): Range | null {
- let children = target.childNodes;
+ let children = leafNodes( target );
+
let range = document.createRange();
let traversed = 0;
@@ -31,12 +36,12 @@ function getRangeForTextSpan( target: Element, span: Span ): Range | null {
let child = children[ i ];
let childText = child.textContent;
- if ( traversed + childText?.length > span.start && ! startFound ) {
+ if ( traversed + childText.length > span.start && ! startFound ) {
range.setStart( child, span.start - traversed );
startFound = true;
}
- if ( startFound && traversed + childText?.length > span.end ) {
+ if ( startFound && traversed + childText.length > span.end ) {
range.setEnd( child, span.end - traversed );
return range;
}
@@ -80,18 +85,17 @@ async function computeLintBoxes(
height: targetRect.height,
lint,
applySuggestion: async ( sug: Suggestion ) => {
+ console.log( clientId );
+
let fixed = await linter.applySuggestion( text, sug, span );
- const { getBlocks } = select( 'core/block-editor' );
+ console.log( fixed );
+
const { selectBlock, updateBlockAttributes } =
dispatch( 'core/block-editor' );
- const updateBlocks = ( attributes ) => {
- selectBlock( clientId );
- updateBlockAttributes( clientId, attributes );
- };
-
- updateBlocks( { content: fixed } );
+ selectBlock( clientId );
+ updateBlockAttributes( clientId, { content: fixed } );
},
} );
}
@@ -99,23 +103,6 @@ async function computeLintBoxes(
return boxes;
}
-function locateBlock( clientId: string, blocks: any[] ): any {
- let block = blocks.find( ( b ) => b.clientId == clientId );
-
- if ( block ) return block;
-
- for ( let block of blocks ) {
- if ( block.innerBlocks ) {
- let found = locateBlock( clientId, block.innerBlocks );
- if ( found ) {
- return found;
- }
- }
- }
-
- return null;
-}
-
export default function Highlighter( {
container,
target,
@@ -133,8 +120,6 @@ export default function Highlighter( {
let running = true;
function onFrame( _timestep: DOMHighResTimeStamp ) {
- //let contRect = container.getBoundingClientRect();
-
computeLintBoxes( target, container ).then( setTargetBoxes );
if ( running ) {
diff --git a/src/harper/SidebarControl.tsx b/src/harper/SidebarControl.tsx
index 74188e262..f8e464f3c 100644
--- a/src/harper/SidebarControl.tsx
+++ b/src/harper/SidebarControl.tsx
@@ -1,5 +1,6 @@
import { ReactPortal, useCallback, useMemo, useRef } from 'react';
import useFrameCount from './useFrameCount';
+import { getNodesFromQuerySelector } from './domUtils';
import { createPortal } from 'react-dom';
import Highlighter from './Highlighter';
import React from 'react';
@@ -14,22 +15,6 @@ function getDocumentContainer(): Element | null {
return container;
}
-/** Turn a NodeList into a normal JavaScript array. */
-function extractFromNodeList< T extends Node >( list: NodeListOf< T > ): T[] {
- let elements: T[] = [];
-
- for ( let i = 0; i < list.length; i++ ) {
- let item = list[ i ];
- elements.push( item );
- }
-
- return elements;
-}
-
-function getNodesFromQuerySelector( element: Element, query: string ) {
- return extractFromNodeList( element.querySelectorAll( query ) );
-}
-
export default function SidebarControl() {
let frameCount = useFrameCount();
diff --git a/src/harper/SuggestionControl.tsx b/src/harper/SuggestionControl.tsx
index bb26b6fd5..99e754eb8 100644
--- a/src/harper/SuggestionControl.tsx
+++ b/src/harper/SuggestionControl.tsx
@@ -7,7 +7,6 @@ import React, {
} from 'react';
import { LintBox } from './Box';
import { SuggestionKind } from 'harper.js';
-import useElementPosition from './useElementPosition';
function suggestionText(
kind: SuggestionKind,
@@ -48,7 +47,9 @@ export default function SuggestionControl( {
useEffect( () => {
function mouseMove( e: MouseEvent ) {
- if (underlineRef.current == null){return};
+ if ( underlineRef.current == null ) {
+ return;
+ }
let rect = underlineRef.current.getBoundingClientRect();
@@ -64,6 +65,10 @@ export default function SuggestionControl( {
}
function mouseUp( e: MouseEvent ) {
+ if ( e.target != this ) {
+ return;
+ }
+
let offsetX = underlineRef.current?.offsetLeft ?? 0;
let offsetY = underlineRef.current?.offsetLeft ?? 0;
diff --git a/src/harper/domUtils.ts b/src/harper/domUtils.ts
new file mode 100644
index 000000000..f93ba4cd5
--- /dev/null
+++ b/src/harper/domUtils.ts
@@ -0,0 +1,35 @@
+/** Turn a `NodeList` into a normal JavaScript array. */
+export function extractFromNodeList< T extends Node >(
+ list: NodeListOf< T >
+): T[] {
+ let elements: T[] = [];
+
+ for ( let i = 0; i < list.length; i++ ) {
+ let item = list[ i ];
+ elements.push( item );
+ }
+
+ return elements;
+}
+
+export function getNodesFromQuerySelector( element: Element, query: string ) {
+ return extractFromNodeList( element.querySelectorAll( query ) );
+}
+
+/** Flatten a provided node, and it's children into a single array. */
+export function flattenNodeChildren( node: Node ): Node[] {
+ let out = [];
+
+ let children = extractFromNodeList( node.childNodes );
+
+ if ( children.length == 0 ) {
+ return [ node ];
+ }
+
+ for ( let child of children ) {
+ let sub = flattenNodeChildren( child );
+ sub.forEach( ( v ) => out.push( v ) );
+ }
+
+ return out;
+}