Ticket 4665 - Emoji Picker (#5157)
* #4665 Added EmojiPicker Work primarily by @broernr-de and @harrison on pre-release.mattermost.com * Final fixes to handle custom emojis from internal review and single merge error * ESLint fixes * CSS changes and other code to support emoji picker in reply window * Fix for file upload and emoji picker icon positions on post and comment. RHS emoji picker appearing see-through at this time. * Fix for two ESLint issues. * covered most of feedback: RHS emoji picker looks correct color-wise RHS emoji picker dynamically positions against height of thread size (post + reply messages) escape closes emoji window search box focused on open ESLint fixes against other files oversized emoji preview fixes * Adding in 'outside click' eventing to dismiss the emoji window * Changing some formatting to fix mismatch between my local eslant rules and jenkins. * adding alternative import method due to downstream testing errors * yet another attempt to retain functionality and pass tests - skipping import of browser store * fix for feedback items 5 and 7: * move search to float on top with stylistic changes * whitespace in the header (+1 squashed commit) Squashed commits: [6a26d32] changes that address items 1, 2, 6, 8, and 9 of latest feedback * Fix for attachment preview location on mobile * Fix for latest rounds of feedback * fixing eslint issue * making emojipicker sprite based, fixing alignments * Fix for emoji quality, fixing some behavior (hover background and cursor settings) undoing config changes * Preview feature for emojis * Adjustments to config file, and changing layout/design of attachment and emoji icon. * manual revert from master branch for config.json * reverting paperclip and fixing alignments. Additionally fixing inadvertent display of picker on mobile. * CSS changes to try to fix the hover behavior - currently working for emoji picker (when enabled), but hover for attachment isn't working * Made suggested changes by jwilander except for jQuery removal * Adding hover for both icons * removal of some usages of jQuery * Fix for two layout issues on IE11/Edge * UI improvements for emoji picker * Fix for many minor display issues * fix for additional appearance items * fix to two minor UI items * A little extra padding for IE11 * fix for IE11 scroll issue, and removing align attribute on img tag which was throwing js error * fixes some display issues on firefox * fix for uneven sides of emojis * fix for eslint issues that I didn't introduce * fix for missing bottom edge of RHS emojipicker. also fixing text overlapping icons on text area (including RHS) * Update "emoji selector" to "emoji picker" * changes for code review - removal of ..getDOMNode - use sprite imagery for emoji preview - remove lastBlurAt from state as it wasn't used * fixes for: - fake custom emoji preview in picker - RHS scrollbar on preview * fix for minor alignment of preview emoji
Этот коммит содержится в:
коммит произвёл
Jason Blais
родитель
d0af931e6e
Коммит
28ad645153
@@ -176,7 +176,9 @@ export const ActionTypes = keyMirror({
|
||||
SUGGESTION_SELECT_NEXT: null,
|
||||
SUGGESTION_SELECT_PREVIOUS: null,
|
||||
|
||||
BROWSER_CHANGE_FOCUS: null
|
||||
BROWSER_CHANGE_FOCUS: null,
|
||||
|
||||
EMOJI_POSTED: null
|
||||
});
|
||||
|
||||
export const WebrtcActionTypes = keyMirror({
|
||||
@@ -856,6 +858,10 @@ export const Constants = {
|
||||
WEBRTC_PREVIEW: {
|
||||
label: 'webrtc_preview',
|
||||
description: 'Enable WebRTC one on one calls'
|
||||
},
|
||||
EMOJI_PICKER_PREVIEW: {
|
||||
label: 'emojipicker',
|
||||
description: 'Enable emoji picker'
|
||||
}
|
||||
},
|
||||
OVERLAY_TIME_DELAY_SMALL: 100,
|
||||
|
||||
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
@@ -575,6 +575,8 @@ export function applyTheme(theme) {
|
||||
changeCss('body.app__body', 'scrollbar-face-color:' + theme.centerChannelBg);
|
||||
changeCss('body.app__body', 'scrollbar-track-color:' + theme.centerChannelBg);
|
||||
changeCss('.app__body .post-list__new-messages-below', 'color:' + theme.centerChannelBg);
|
||||
changeCss('.app__body .emoji-picker, .app__body .emoji-picker__search', 'background:' + theme.centerChannelBg);
|
||||
changeCss('.app__body .emoji-picker-bottom, .app__body .emoji-picker__search', 'background:' + theme.centerChannelBg);
|
||||
}
|
||||
|
||||
if (theme.centerChannelColor) {
|
||||
@@ -651,6 +653,22 @@ export function applyTheme(theme) {
|
||||
changeCss('.app__body .navbar .status .offline--icon', 'fill:' + theme.centerChannelColor);
|
||||
changeCss('.app__body .post-reaction:not(.post-reaction--current-user)', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.25));
|
||||
changeCss('.app__body .post-reaction:not(.post-reaction--current-user)', 'color:' + changeOpacity(theme.centerChannelColor, 0.7));
|
||||
changeCss('.app__body .emoji-picker', 'color:' + theme.centerChannelColor);
|
||||
changeCss('.app__body .emoji-picker-bottom', 'color:' + theme.centerChannelColor);
|
||||
changeCss('.app__body .emoji-picker, .app__body .emoji-picker__search-container .emoji-picker__search', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2));
|
||||
changeCss('.app__body .emoji-picker-bottom, .app__body .emoji-picker__search-container .emoji-picker__search', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2));
|
||||
changeCss('.app__body .emoji-picker, .app__body .emoji-picker__items .emoji-picker__search-container .emoji-picker__search', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2));
|
||||
changeCss('.app__body .emoji-picker-bottom, .app__body .emoji-picker__items .emoji-picker__search-container .emoji-picker__search', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2));
|
||||
changeCss('.app__body .emoji-picker__items', 'background-color:' + changeOpacity(theme.centerChannelColor, 0.05));
|
||||
changeCss('.app__body .emoji-picker__categories', 'border-bottom-color:' + changeOpacity(theme.centerChannelColor, 0.2));
|
||||
changeCss('.emoji-picker__category .fa:hover', 'color:' + changeOpacity(theme.centerChannelColor, 0.8));
|
||||
|
||||
changeCss('.app__body .emoji-picker__preview', 'border-top-color:' + changeOpacity(theme.centerChannelColor, 0.2));
|
||||
changeCss('.app__body .emoji-picker__category, .app__body .emoji-picker__category:focus, .app__body .emoji-picker__category:hover', 'color:' + changeOpacity(theme.centerChannelColor, 0.3));
|
||||
changeCss('.app__body .emoji-picker__category--selected, .app__body .emoji-picker__category--selected:focus, .app__body .emoji-picker__category--selected:hover', 'color:' + theme.centerChannelColor);
|
||||
changeCss('.app__body .emoji-picker__item:hover', 'background-color:' + changeOpacity(theme.centerChannelColor, 0.8));
|
||||
changeCss('.app__body .emojisprite:hover', 'background-color:' + changeOpacity(theme.centerChannelColor, 0.8));
|
||||
changeCss('.app__body .icon__postcontent_picker:hover', 'color:' + changeOpacity(theme.centerChannelColor, 0.8));
|
||||
}
|
||||
|
||||
if (theme.newMessageSeparator) {
|
||||
|
||||
Ссылка в новой задаче
Block a user