From 2e248d710de317d37fa41ef32683661be0b43f82 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Thu, 1 Apr 2021 14:02:37 -0400 Subject: [PATCH] fix: fix mention popup not showing after a line break --- .../AppLayouts/Chat/ChatColumn/SuggestionFilter.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/app/AppLayouts/Chat/ChatColumn/SuggestionFilter.qml b/ui/app/AppLayouts/Chat/ChatColumn/SuggestionFilter.qml index 4619190a5d..2004800335 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/SuggestionFilter.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/SuggestionFilter.qml @@ -57,7 +57,7 @@ Item { let cursorAtEnd = this.cursorPosition === filter.length; let hasAtBeforeCursor = filter.charAt(this.cursorPosition - 1) === "@" - let hasWhiteSpaceBeforeAt = filter.charAt(this.cursorPosition - 2) === " " + let hasWhiteSpaceBeforeAt = filter.charAt(this.cursorPosition - 2) === " " || filter.charAt(this.cursorPosition - 2) === "\n" let hasWhiteSpaceAfterAt = filter.charAt(this.cursorPosition) === " " let hasWhiteSpaceBeforeCursor = filter.charAt(this.cursorPosition - 1) === " " @@ -66,11 +66,11 @@ Item { } if (filter === "@" || - (hasAtBeforeCursor && hasWhiteSpaceBeforeAt && hasWhiteSpaceAfterAt) || - (this.cursorPosition === 1 && hasAtBeforeCursor && hasWhiteSpaceAfterAt) || - (cursorAtEnd && filter.endsWith("@") && hasWhiteSpaceBeforeAt)) { - this.lastAtPosition = this.cursorPosition - 1; - return true + (hasAtBeforeCursor && hasWhiteSpaceBeforeAt && hasWhiteSpaceAfterAt) || + (this.cursorPosition === 1 && hasAtBeforeCursor && hasWhiteSpaceAfterAt) || + (cursorAtEnd && filter.endsWith("@") && hasWhiteSpaceBeforeAt)) { + this.lastAtPosition = this.cursorPosition - 1; + return true } let filterWithoutAt = filter.substring(lastAtPosition + 1, this.cursorPosition)