Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-07-19 00:21:18 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Change autosuggestions to include second word in web UI (#39622)

Browse Source
This commit is contained in:
Eugen Rochko 2026-06-25 17:49:27 +02:00 committed by GitHub
parent 19db9eeb81
commit e4e19ba264
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 32 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/javascript/mastodon/components/autosuggest/utils.ts Normal file
View File

@ -0,0 +1,29 @@
export const textAtCursorMatchesToken = (
str: string,
caretPosition: number,
searchTokens: string[],
) => {
let word: string;
const regex = new RegExp(`[${searchTokens.join('')}\\w]+(\\s[\\w]+)?$`);
const left = str.slice(0, caretPosition).search(regex);
const right = str.slice(caretPosition).search(/\s/);
if (right < 0) {
word = str.slice(left);
} else {
word = str.slice(left, right + caretPosition);
}
word = word.trim();
if (word.length < 3 || (word[0] && !searchTokens.includes(word[0]))) {
return [null, null];
}
if (word.length > 0) {
return [left + 1, word];
} else {
return [null, null];
}
};

26
app/javascript/mastodon/components/autosuggest_input.jsx
View File

@ -12,31 +12,7 @@ import AutosuggestAccountContainer from '../features/compose/containers/autosugg
import { AutosuggestEmoji } from './autosuggest_emoji';
import { AutosuggestHashtag } from './autosuggest_hashtag';
import { LocalCustomEmojiProvider } from './emoji/context';
const textAtCursorMatchesToken = (str, caretPosition, searchTokens) => {
let word;
let left = str.slice(0, caretPosition).search(/\S+$/);
let right = str.slice(caretPosition).search(/\s/);
if (right < 0) {
word = str.slice(left);
} else {
word = str.slice(left, right + caretPosition);
}
if (!word || word.trim().length < 3 || searchTokens.indexOf(word[0]) === -1) {
return [null, null];
}
word = word.trim();
if (word.length > 0) {
return [left + 1, word];
} else {
return [null, null];
}
};
import { textAtCursorMatchesToken } from './autosuggest/utils';
export default class AutosuggestInput extends ImmutablePureComponent {

28
app/javascript/mastodon/components/autosuggest_textarea.jsx
View File

@ -13,31 +13,7 @@ import AutosuggestAccountContainer from '../features/compose/containers/autosugg
import { AutosuggestEmoji } from './autosuggest_emoji';
import { AutosuggestHashtag } from './autosuggest_hashtag';
import { LocalCustomEmojiProvider } from './emoji/context';
const textAtCursorMatchesToken = (str, caretPosition) => {
let word;
let left = str.slice(0, caretPosition).search(/\S+$/);
let right = str.slice(caretPosition).search(/\s/);
if (right < 0) {
word = str.slice(left);
} else {
word = str.slice(left, right + caretPosition);
}
if (!word || word.trim().length < 3 || ['@', '＠', ':', '#', '＃'].indexOf(word[0]) === -1) {
return [null, null];
}
word = word.trim();
if (word.length > 0) {
return [left + 1, word];
} else {
return [null, null];
}
};
import { textAtCursorMatchesToken } from './autosuggest/utils';
const AutosuggestTextarea = forwardRef(({
value,
@ -64,7 +40,7 @@ const AutosuggestTextarea = forwardRef(({
const tokenStartRef = useRef(0);
const handleChange = useCallback((e) => {
const [ tokenStart, token ] = textAtCursorMatchesToken(e.target.value, e.target.selectionStart);
const [ tokenStart, token ] = textAtCursorMatchesToken(e.target.value, e.target.selectionStart, ['@', '＠', ':', '#', '＃']);
if (token !== null && lastTokenRef.current !== token) {
tokenStartRef.current = tokenStart;