toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MM-52173 Add setting to delay channel autocomplete (#7297)

Browse source 
* MM-52173 Add setting to delay channel autocomplete

* Remove extra enhancer

* Address feedback
This commit is contained in:
Harrison Healey 2023-04-28 20:55:07 -04:00 committed by GitHub
parent 35023ea389
commit 3c790d2561
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
app/components/autocomplete/channel_mention/index.ts
View file

@ -4,26 +4,28 @@
import {withDatabase} from '@nozbe/watermelondb/DatabaseProvider';
import withObservables from '@nozbe/with-observables';
import {of as of$} from 'rxjs';
import {switchMap} from 'rxjs/operators';
import {map, switchMap} from 'rxjs/operators';
import {CHANNEL_MENTION_REGEX, CHANNEL_MENTION_SEARCH_REGEX} from '@constants/autocomplete';
import {CHANNEL_MENTION_REGEX, CHANNEL_MENTION_REGEX_DELAYED, CHANNEL_MENTION_SEARCH_REGEX} from '@constants/autocomplete';
import {observeChannel, queryAllMyChannel, queryChannelsForAutocomplete} from '@queries/servers/channel';
import {observeCurrentTeamId, observeCurrentUserId} from '@queries/servers/system';
import {observeConfigBooleanValue, observeCurrentTeamId, observeCurrentUserId} from '@queries/servers/system';
import ChannelMention from './channel_mention';
import type {Database} from '@nozbe/watermelondb';
import type {WithDatabaseArgs} from '@typings/database/database';
import type ChannelModel from '@typings/database/models/servers/channel';
const getMatchTermForChannelMention = (() => {
let lastMatchTerm: string | null = null;
let lastValue: string;
let lastMatchPattern: RegExp;
let lastIsSearch: boolean;
return (value: string, isSearch: boolean) => {
if (value !== lastValue || isSearch !== lastIsSearch) {
const regex = isSearch ? CHANNEL_MENTION_SEARCH_REGEX : CHANNEL_MENTION_REGEX;
const match = value.match(regex);
return (value: string, matchPattern: RegExp, isSearch: boolean) => {
if (value !== lastValue || matchPattern !== lastMatchPattern || isSearch !== lastIsSearch) {
const match = value.match(matchPattern);
lastValue = value;
lastMatchPattern = matchPattern;
lastIsSearch = isSearch;
if (match) {
if (isSearch) {
@ -79,13 +81,31 @@ const withTeamId = withObservables(['teamId', 'channelId'], ({teamId, channelId,
};
});
const enhanced = withObservables(['value', 'isSearch', 'teamId', 'cursorPosition'], ({value, isSearch, teamId, cursorPosition, database}: OwnProps) => {
const matchTerm = getMatchTermForChannelMention(value.substring(0, cursorPosition), isSearch);
function observeMatchPattern(isSearch: boolean, database: Database) {
let matchPattern;
const localChannels = matchTerm === null ? of$(emptyChannelList) : queryChannelsForAutocomplete(database, matchTerm, isSearch, teamId).observe();
if (isSearch) {
matchPattern = of$(CHANNEL_MENTION_SEARCH_REGEX);
} else {
matchPattern = observeConfigBooleanValue(database, 'DelayChannelAutocomplete').pipe(map((c) => {
return c ? CHANNEL_MENTION_REGEX_DELAYED : CHANNEL_MENTION_REGEX;
}));
}
return matchPattern;
}
const enhanced = withObservables(['value', 'isSearch', 'teamId', 'cursorPosition'], ({value, isSearch, teamId, cursorPosition, database}: OwnProps) => {
const matchTerm = observeMatchPattern(isSearch, database).pipe(map((regexp) => {
return getMatchTermForChannelMention(value.substring(0, cursorPosition), regexp, isSearch);
}));
const localChannels = matchTerm.pipe(switchMap((term) => {
return term === null ? of$(emptyChannelList) : queryChannelsForAutocomplete(database, term, isSearch, teamId).observe();
}));
return {
matchTerm: of$(matchTerm),
matchTerm,
localChannels,
};
});

3
app/constants/autocomplete.ts
View file

@ -9,6 +9,8 @@ export const AT_MENTION_SEARCH_REGEX = /\bfrom:\s*(\S*)$/i;
export const CHANNEL_MENTION_REGEX = /\B(~([^~\r\n]*))$/i;
export const CHANNEL_MENTION_REGEX_DELAYED = /\B(~([^~\r\n]{2,}))$/i;
export const CHANNEL_MENTION_SEARCH_REGEX = /\b(?:in|channel):\s*(\S*)$/i;
export const DATE_MENTION_SEARCH_REGEX = /\b(?:on|before|after):\s*(\S*)$/i;
@ -30,6 +32,7 @@ export default {
AT_MENTION_REGEX_GLOBAL,
AT_MENTION_SEARCH_REGEX,
CHANNEL_MENTION_REGEX,
CHANNEL_MENTION_REGEX_DELAYED,
CHANNEL_MENTION_SEARCH_REGEX,
CODE_REGEX,
DATE_MENTION_SEARCH_REGEX,

1
types/api/config.d.ts vendored
View file

@ -34,6 +34,7 @@ interface ClientConfig {
DataRetentionMessageRetentionDays: string;
DefaultClientLocale: string;
DefaultTheme: string;
DelayChannelAutocomplete: 'true' | 'false';
DesktopLatestVersion: string;
DesktopMinVersion: string;
DiagnosticId: string;