Mastodon
/
Sengi-Windows-MacOS-Linux
mirror of https://github.com/NicolasConstant/sengi
1
0
Fork 0
Code Issues Releases Wiki Activity

fix autosuggest

This commit is contained in:
Nicolas Constant 2019-10-04 23:05:36 -04:00
parent ed1e52232d
commit e88a568a99
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/components/create-status/autosuggest/autosuggest.component.ts
View File

@ -29,6 +29,7 @@ export class AutosuggestComponent implements OnInit, OnDestroy {
this._pattern = value; this._pattern = value;
this.analysePattern(value); this.analysePattern(value);
} else { } else {
this._pattern = null;
this.accounts.length = 0; this.accounts.length = 0;
this.hashtags.length = 0; this.hashtags.length = 0;
} }

45
src/app/components/create-status/create-status.component.ts
View File

@ -223,23 +223,50 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
if (!this.statusLoaded) return; if (!this.statusLoaded) return;
const caretPosition = this.replyElement.nativeElement.selectionStart; const caretPosition = this.replyElement.nativeElement.selectionStart;
const word = this.getWordByPos(status, caretPosition);
if (word && word.length > 0 && (word.startsWith('@') || word.startsWith('#'))) { const lastChar = status.substr(caretPosition - 1, 1);
const lastCharIsSpace = lastChar === ' ';
const splitedStatus = status.split(/(\r\n|\n|\r)/);
let offset = 0;
let currentSection = '';
for(let x of splitedStatus){
const sectionLength = [...x].length;
if(offset + sectionLength >= caretPosition){
currentSection = x;
break;
} else {
offset += sectionLength;
}
};
const word = this.getWordByPos(currentSection, caretPosition - offset);
if (!lastCharIsSpace && word && word.length > 0 && (word.startsWith('@') || word.startsWith('#'))) {
this.autosuggestData = word; this.autosuggestData = word;
return; return;
} }
this.autosuggestData = null; this.autosuggestData = null;
this.hasSuggestions = false;
} }
private getWordByPos(str, pos) { private getWordByPos(str, pos) {
str = str.replace(/(\r\n|\n|\r)/gm, ""); var preText = str.substring(0, pos);
var left = str.substr(0, pos); if (preText.indexOf(" ") > 0) {
var right = str.substr(pos); var words = preText.split(" ");
return words[words.length - 1]; //return last word
}
else {
return preText;
}
left = left.replace(/^.+ /g, ""); // // str = str.replace(/(\r\n|\n|\r)/gm, "");
right = right.replace(/ .+$/g, ""); // var left = str.substr(0, pos);
// var right = str.substr(pos);
return left + right; // left = left.replace(/^.+ /g, "");
// right = right.replace(/ .+$/g, "");
// return left + right;
} }
private focus(caretPos = null) { private focus(caretPos = null) {
@ -477,7 +504,6 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
return false; return false;
} }
private sendStatus(account: AccountInfo, status: string, visibility: VisibilityEnum, title: string, previousStatus: Status, attachments: Attachment[], poll: PollParameters, scheduledAt: string): Promise<Status> { private sendStatus(account: AccountInfo, status: string, visibility: VisibilityEnum, title: string, previousStatus: Status, attachments: Attachment[], poll: PollParameters, scheduledAt: string): Promise<Status> {
let parsedStatus = this.parseStatus(status); let parsedStatus = this.parseStatus(status);
let resultPromise = Promise.resolve(previousStatus); let resultPromise = Promise.resolve(previousStatus);
@ -567,7 +593,6 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
return status.split(' ').filter(x => x.indexOf('@') === 0 && x.length > 1); return status.split(' ').filter(x => x.indexOf('@') === 0 && x.length > 1);
} }
suggestionSelected(selection: AutosuggestSelection) { suggestionSelected(selection: AutosuggestSelection) {
if (this.status.includes(selection.pattern)) { if (this.status.includes(selection.pattern)) {