Skip to content

Prevent intersection in highlighted text #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prevent intersection in highlighted text #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/TextAnnotator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ type TextBaseProps<T> = {
value: T[]
onChange: (value: T[]) => any
getSpan?: (span: TextSpan) => T
// TODO: determine whether to overwrite or leave intersecting ranges.
isIntersectToHighlightedText?: boolean
}

type TextAnnotatorProps<T> = React.HTMLAttributes<HTMLDivElement> & TextBaseProps<T>
Expand Down Expand Up @@ -57,6 +57,13 @@ const TextAnnotator = <T extends Span>(props: TextAnnotatorProps<T>) => {
;[start, end] = [end, start]
}

if (props.isIntersectToHighlightedText) {
const splitIndex = props.value.findIndex(s => s.start === start && s.end === end)
if (splitIndex >= 0) {
return
}
}

props.onChange([...props.value, getSpan({start, end, text: content.slice(start, end)})])

window.getSelection().empty()
Expand Down
9 changes: 8 additions & 1 deletion src/TokenAnnotator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export interface TokenAnnotatorProps<T>
onChange: (value: T[]) => any
getSpan?: (span: TokenSpan) => T
renderMark?: (props: MarkProps) => JSX.Element
// TODO: determine whether to overwrite or leave intersecting ranges.
isIntersectToHighlightedText?: boolean
}

const TokenAnnotator = <T extends Span>(props: TokenAnnotatorProps<T>) => {
Expand Down Expand Up @@ -59,6 +59,13 @@ const TokenAnnotator = <T extends Span>(props: TokenAnnotatorProps<T>) => {
;[start, end] = [end, start]
}

if (props.isIntersectToHighlightedText) {
const splitIndex = props.value.findIndex(s => s.start >= start && s.end <= end)
if (splitIndex >= 0) {
return
}
}

end += 1

props.onChange([...props.value, getSpan({start, end, tokens: props.tokens.slice(start, end)})])
Expand Down