mirror of
https://github.com/element-hq/element-web.git
synced 2024-12-11 18:33:03 +03:00
cb6f415a05
Fixes https://github.com/vector-im/riot-web/issues/6435 This is done through an on-the-fly inverter for the settings. All the settings changed are boolean values, so this should be more than safe to just let happen throughout the SettingsStore. Typically a change like this would be done in the individual handlers (similar to how setting names are remapped to different properties or even different storage locations on the fly), however doing that for this many settings would be a huge nightmare and involve changing *all* the layers. By putting a global "invert this" flag on the setting, we can get away with doing the inversion as the last possible step during a read (or write). To speed up calculations of the default values, we cache all the inverted values into a lookup table similar to how we represent the defaults already. Without this, the DefaultHandler would need to iterate the setting list and invert the values, slowing things down over time. We invert the value up front so we can keep the generic inversion logic without checking the level ahead of time. It is fully intended that a default value represents the new setting name, not the legacy name. This commit also includes a debugger for settings because it was hard to visualize what the SettingsStore was doing during development. Some added information is included as it may be helpful for when someone has a problem with their settings and we need to debug it. Typically the debugger would be run in conjunction with `mxSendRageshake`: `mxSettingsStore.debugSetting('showJoinLeaves') && mxSendRageshake('Debugging showJoinLeaves setting')`.
159 lines
5.8 KiB
JavaScript
159 lines
5.8 KiB
JavaScript
/*
|
|
Copyright 2016 Aviral Dasgupta
|
|
Copyright 2017 Vector Creations Ltd
|
|
Copyright 2017, 2018 New Vector Ltd
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
import React from 'react';
|
|
import { _t } from '../languageHandler';
|
|
import AutocompleteProvider from './AutocompleteProvider';
|
|
import {shortnameToUnicode, asciiRegexp, unicodeRegexp} from 'emojione';
|
|
import QueryMatcher from './QueryMatcher';
|
|
import sdk from '../index';
|
|
import {PillCompletion} from './Components';
|
|
import type {Completion, SelectionRange} from './Autocompleter';
|
|
import _uniq from 'lodash/uniq';
|
|
import _sortBy from 'lodash/sortBy';
|
|
import SettingsStore from "../settings/SettingsStore";
|
|
|
|
import EmojiData from '../stripped-emoji.json';
|
|
|
|
const LIMIT = 20;
|
|
const CATEGORY_ORDER = [
|
|
'people',
|
|
'food',
|
|
'objects',
|
|
'activity',
|
|
'nature',
|
|
'travel',
|
|
'flags',
|
|
'regional',
|
|
'symbols',
|
|
'modifier',
|
|
];
|
|
|
|
// Match for ":wink:" or ascii-style ";-)" provided by emojione
|
|
// (^|\s|(emojiUnicode)) to make sure we're either at the start of the string or there's a
|
|
// whitespace character or an emoji before the emoji. The reason for unicodeRegexp is
|
|
// that we need to support inputting multiple emoji with no space between them.
|
|
const EMOJI_REGEX = new RegExp('(?:^|\\s|' + unicodeRegexp + ')(' + asciiRegexp + '|:[+-\\w]*:?)$', 'g');
|
|
|
|
// We also need to match the non-zero-length prefixes to remove them from the final match,
|
|
// and update the range so that we don't replace the whitespace or the previous emoji.
|
|
const MATCH_PREFIX_REGEX = new RegExp('(\\s|' + unicodeRegexp + ')');
|
|
|
|
const EMOJI_SHORTNAMES = Object.keys(EmojiData).map((key) => EmojiData[key]).sort(
|
|
(a, b) => {
|
|
if (a.category === b.category) {
|
|
return a.emoji_order - b.emoji_order;
|
|
}
|
|
return CATEGORY_ORDER.indexOf(a.category) - CATEGORY_ORDER.indexOf(b.category);
|
|
},
|
|
).map((a, index) => {
|
|
return {
|
|
name: a.name,
|
|
shortname: a.shortname,
|
|
aliases: a.aliases ? a.aliases.join(' ') : '',
|
|
aliases_ascii: a.aliases_ascii ? a.aliases_ascii.join(' ') : '',
|
|
// Include the index so that we can preserve the original order
|
|
_orderBy: index,
|
|
};
|
|
});
|
|
|
|
function score(query, space) {
|
|
const index = space.indexOf(query);
|
|
if (index === -1) {
|
|
return Infinity;
|
|
} else {
|
|
return index;
|
|
}
|
|
}
|
|
|
|
export default class EmojiProvider extends AutocompleteProvider {
|
|
constructor() {
|
|
super(EMOJI_REGEX);
|
|
this.matcher = new QueryMatcher(EMOJI_SHORTNAMES, {
|
|
keys: ['aliases_ascii', 'shortname', 'aliases'],
|
|
// For matching against ascii equivalents
|
|
shouldMatchWordsOnly: false,
|
|
});
|
|
this.nameMatcher = new QueryMatcher(EMOJI_SHORTNAMES, {
|
|
keys: ['name'],
|
|
// For removing punctuation
|
|
shouldMatchWordsOnly: true,
|
|
});
|
|
}
|
|
|
|
async getCompletions(query: string, selection: SelectionRange, force?: boolean): Array<Completion> {
|
|
if (!SettingsStore.getValue("MessageComposerInput.suggestEmoji")) {
|
|
return []; // don't give any suggestions if the user doesn't want them
|
|
}
|
|
|
|
const EmojiText = sdk.getComponent('views.elements.EmojiText');
|
|
|
|
let completions = [];
|
|
const {command, range} = this.getCurrentCommand(query, selection);
|
|
if (command) {
|
|
let matchedString = command[0];
|
|
|
|
// Remove prefix of any length (single whitespace or unicode emoji)
|
|
const prefixMatch = MATCH_PREFIX_REGEX.exec(matchedString);
|
|
if (prefixMatch) {
|
|
matchedString = matchedString.slice(prefixMatch[0].length);
|
|
range.start += prefixMatch[0].length;
|
|
}
|
|
completions = this.matcher.match(matchedString);
|
|
|
|
// Do second match with shouldMatchWordsOnly in order to match against 'name'
|
|
completions = completions.concat(this.nameMatcher.match(matchedString));
|
|
|
|
const sorters = [];
|
|
// First, sort by score (Infinity if matchedString not in shortname)
|
|
sorters.push((c) => score(matchedString, c.shortname));
|
|
// If the matchedString is not empty, sort by length of shortname. Example:
|
|
// matchedString = ":bookmark"
|
|
// completions = [":bookmark:", ":bookmark_tabs:", ...]
|
|
if (matchedString.length > 1) {
|
|
sorters.push((c) => c.shortname.length);
|
|
}
|
|
// Finally, sort by original ordering
|
|
sorters.push((c) => c._orderBy);
|
|
completions = _sortBy(_uniq(completions), sorters);
|
|
|
|
completions = completions.map((result) => {
|
|
const {shortname} = result;
|
|
const unicode = shortnameToUnicode(shortname);
|
|
return {
|
|
completion: unicode,
|
|
component: (
|
|
<PillCompletion title={shortname} initialComponent={<EmojiText style={{maxWidth: '1em'}}>{ unicode }</EmojiText>} />
|
|
),
|
|
range,
|
|
};
|
|
}).slice(0, LIMIT);
|
|
}
|
|
return completions;
|
|
}
|
|
|
|
getName() {
|
|
return '😃 ' + _t('Emoji');
|
|
}
|
|
|
|
renderCompletions(completions: [React.Component]): ?React.Component {
|
|
return <div className="mx_Autocomplete_Completion_container_pill">
|
|
{ completions }
|
|
</div>;
|
|
}
|
|
}
|