bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Suggestion --> AutoSuggestion

Browse source
This commit is contained in:
Alex Gleason 2022-06-04 18:36:34 -05:00
parent 318b9f0d3b
commit 328d3b9b59
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/soapbox/components/autosuggest_account_input.tsx
View file

@ -3,7 +3,7 @@ import { throttle } from 'lodash';
import React, { useState, useRef, useCallback, useEffect } from 'react'; import React, { useState, useRef, useCallback, useEffect } from 'react';
import { accountSearch } from 'soapbox/actions/accounts'; import { accountSearch } from 'soapbox/actions/accounts';
import AutosuggestInput, { Suggestion } from 'soapbox/components/autosuggest_input'; import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest_input';
import { useAppDispatch } from 'soapbox/hooks'; import { useAppDispatch } from 'soapbox/hooks';
import type { Menu } from 'soapbox/components/dropdown_menu'; import type { Menu } from 'soapbox/components/dropdown_menu';
@ -59,7 +59,7 @@ const AutosuggestAccountInput: React.FC<IAutosuggestAccountInput> = ({
onChange(e); onChange(e);
}; };
const handleSelected = (_tokenStart: number, _lastToken: string | null, suggestion: Suggestion) => { const handleSelected = (_tokenStart: number, _lastToken: string | null, suggestion: AutoSuggestion) => {
if (typeof suggestion === 'string' && suggestion[0] !== '#') { if (typeof suggestion === 'string' && suggestion[0] !== '#') {
onSelected(suggestion); onSelected(suggestion);
} }

6
app/soapbox/components/autosuggest_input.tsx
View file

@ -15,7 +15,7 @@ type CursorMatch = [
token: string | null, token: string | null,
]; ];
export type Suggestion = string | Emoji; export type AutoSuggestion = string | Emoji;
const textAtCursorMatchesToken = (str: string, caretPosition: number, searchTokens: string[]): CursorMatch => { const textAtCursorMatchesToken = (str: string, caretPosition: number, searchTokens: string[]): CursorMatch => {
let word: string; let word: string;
@ -47,7 +47,7 @@ interface IAutosuggestInput extends Pick<React.HTMLAttributes<HTMLInputElement>,
suggestions: ImmutableList<any>, suggestions: ImmutableList<any>,
disabled?: boolean, disabled?: boolean,
placeholder?: string, placeholder?: string,
onSuggestionSelected: (tokenStart: number, lastToken: string | null, suggestion: Suggestion) => void, onSuggestionSelected: (tokenStart: number, lastToken: string | null, suggestion: AutoSuggestion) => void,
onSuggestionsClearRequested: () => void, onSuggestionsClearRequested: () => void,
onSuggestionsFetchRequested: (token: string) => void, onSuggestionsFetchRequested: (token: string) => void,
autoFocus: boolean, autoFocus: boolean,
@ -195,7 +195,7 @@ export default class AutosuggestInput extends ImmutablePureComponent<IAutosugges
this.input = c; this.input = c;
} }
renderSuggestion = (suggestion: Suggestion, i: number) => { renderSuggestion = (suggestion: AutoSuggestion, i: number) => {
const { selectedSuggestion } = this.state; const { selectedSuggestion } = this.state;
let inner, key; let inner, key;