Skip to content

Multiword search support #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
marekolszewski wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Multiword search support #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f8a4fb
Added support for multiword suggestion searches.
Sep 6, 2017
0b32a33
Fixed non-multiword searches.
Sep 6, 2017
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
12 changes: 3 additions & 9 deletions lib/current-word.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
function getCurrentWord(text, index, initialIndex) {
if (text[index] === " " || text[index] === undefined) return ""
if (index < initialIndex) {
return getCurrentWord(text, index - 1, initialIndex) + text[index]
}
if (index > initialIndex) {
return text[index] + getCurrentWord(text, index + 1, initialIndex)
}
return getCurrentWord(text, index - 1, initialIndex) + text[index] + getCurrentWord(text, index + 1, initialIndex)
function getCurrentWord(text, index, trigger) {
const startIndex = text.lastIndexOf(trigger, index + 1)
return text.substring(startIndex, index + 1)
}

export default getCurrentWord
12 changes: 6 additions & 6 deletions lib/suggestion-portal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,13 @@ class SuggestionPortal extends React.Component {
}

matchCapture = () => {
const { state, capture } = this.props
const { state, capture, trigger } = this.props

if (!state.selection.anchorKey) return ''

const { anchorText, anchorOffset } = state

const currentWord = getCurrentWord(anchorText.text, anchorOffset - 1, anchorOffset - 1)
const currentWord = getCurrentWord(anchorText.text, anchorOffset - 1, trigger)

const text = this.getMatchText(currentWord, capture)

Expand All @@ -126,21 +126,21 @@ class SuggestionPortal extends React.Component {
getMatchText = (text, trigger) => {
const matchArr = text.match(trigger)

if (matchArr) {
if (matchArr && matchArr[0].length === text.length) {
return matchArr[1].toLowerCase()
}

return undefined
}

getFilteredSuggestions = () => {
const { suggestions, state, capture, resultSize } = this.props
const { suggestions, state, capture, resultSize, trigger } = this.props

if (!state.selection.anchorKey) return []

const { anchorText, anchorOffset } = state

const currentWord = getCurrentWord(anchorText.text, anchorOffset - 1, anchorOffset - 1)
const currentWord = getCurrentWord(anchorText.text, anchorOffset - 1, trigger)

const text = this.getMatchText(currentWord, capture)

Expand All @@ -157,7 +157,7 @@ class SuggestionPortal extends React.Component {
const { menu } = this.state
if (!menu) return

const match = this.matchCapture();
const match = this.matchCapture()
if (match === undefined) {
menu.removeAttribute('style')
return
Expand Down