PLT-6127/PLT-6135/PLT-6137 Added EmojiPickerOverlay component to better position emoji picker (#6352)

* Cleaned up emoji picker CSS

* Fixed border of emoji picker when reacting to comments in the RHS

* PLT-6135 Made EmojiPicker automatically position itself above/below the [...] menu

* PLT-6135 Changed post textbox emoji picker to use a RootCloseWrapper

* PLT-6135 Changed comment textbox emoji picker to use a RootCloseWrapper

* PLT-6135 Changed RHS post components to use EmojiPickerOverlay

* Removed react-outside-event package

* Fixed merge conflict

* Fixed emoji picker position on posts in RHS

* Removed unused CSS classes

* Fixed not being able to react to posts with emoji picker
Этот коммит содержится в:
Harrison Healey
2017-06-13 14:35:45 -04:00
коммит произвёл Christopher Speller
родитель 56883d6f95
Коммит 40efd8367a
16 изменённых файлов: 265 добавлений и 352 удалений

Просмотреть файл

@@ -20,12 +20,10 @@ import * as PostUtils from 'utils/post_utils.jsx';
import Constants from 'utils/constants.jsx';
import DelayedAction from 'utils/delayed_action.jsx';
import {Overlay} from 'react-bootstrap';
import {FormattedMessage} from 'react-intl';
import EmojiPicker from 'components/emoji_picker/emoji_picker.jsx';
import ReactDOM from 'react-dom';
import EmojiPickerOverlay from 'components/emoji_picker/emoji_picker_overlay.jsx';
import loadingGif from 'images/load.gif';
@@ -45,7 +43,6 @@ export default class RhsComment extends React.Component {
this.pinPost = this.pinPost.bind(this);
this.unpinPost = this.unpinPost.bind(this);
this.reactEmojiClick = this.reactEmojiClick.bind(this);
this.emojiPickerClick = this.emojiPickerClick.bind(this);
this.handleDropdownOpened = this.handleDropdownOpened.bind(this);
this.canEdit = false;
@@ -56,8 +53,7 @@ export default class RhsComment extends React.Component {
currentTeamDisplayName: TeamStore.getCurrent().name,
width: '',
height: '',
showReactEmojiPicker: false,
reactPickerOffset: 15,
showEmojiPicker: false,
dropdownOpened: false
};
}
@@ -129,7 +125,7 @@ export default class RhsComment extends React.Component {
return true;
}
if (this.state.showReactEmojiPicker !== nextState.showReactEmojiPicker) {
if (this.state.showEmojiPicker !== nextState.showEmojiPicker) {
return true;
}
@@ -356,22 +352,17 @@ export default class RhsComment extends React.Component {
);
}
emojiPickerClick() {
// set default offset
let reactOffset = 15;
const reactSelectorHeight = 360;
const reactionIconY = ReactDOM.findDOMNode(this).getBoundingClientRect().top;
const rhsMinHeight = 700;
toggleEmojiPicker = () => {
const showEmojiPicker = !this.state.showEmojiPicker;
const spaceAvail = rhsMinHeight - reactionIconY;
if (spaceAvail < reactSelectorHeight) {
reactOffset = (spaceAvail - reactSelectorHeight);
}
this.setState({showReactEmojiPicker: !this.state.showReactEmojiPicker, reactPickerOffset: reactOffset});
this.setState({
showEmojiPicker,
dropdownOpened: showEmojiPicker
});
}
reactEmojiClick(emoji) {
this.setState({showReactEmojiPicker: false});
this.setState({showEmojiPicker: false});
const emojiName = emoji.name || emoji.aliases[0];
addReaction(this.props.post.channel_id, this.props.post.id, emojiName);
}
@@ -554,39 +545,26 @@ export default class RhsComment extends React.Component {
}
let react;
let reactOverlay;
if (!isEphemeral && !isPending && !isSystemMessage && Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW)) {
react = (
<span>
<EmojiPickerOverlay
show={this.state.showEmojiPicker}
onHide={this.toggleEmojiPicker}
target={() => this.refs.dotMenu}
container={this.props.getPostList}
onEmojiClick={this.reactEmojiClick}
/>
<a
href='#'
className='reacticon__container reaction'
onClick={this.emojiPickerClick}
onClick={this.toggleEmojiPicker}
ref={'rhs_reacticon_' + post.id}
><i className='fa fa-smile-o'/>
</a>
</span>
);
reactOverlay = (
<Overlay
id={'rhs_react_overlay_' + post.id}
show={this.state.showReactEmojiPicker}
placement='top'
rootClose={true}
container={this.refs['post_body_' + post.id]}
onHide={() => this.setState({showReactEmojiPicker: false})}
target={() => ReactDOM.findDOMNode(this.refs['rhs_reacticon_' + post.id])}
animation={false}
>
<EmojiPicker
onEmojiClick={this.reactEmojiClick}
pickerLocation='react-rhs-comment'
emojiOffset={this.state.reactPickerOffset}
/>
</Overlay>
);
}
let options;
@@ -598,8 +576,10 @@ export default class RhsComment extends React.Component {
);
} else if (!isSystemMessage) {
options = (
<div className='col col__reply'>
{reactOverlay}
<div
ref='dotMenu'
className='col col__reply'
>
{this.createDropdown(isSystemMessage)}
{react}
</div>
@@ -674,5 +654,6 @@ RhsComment.propTypes = {
useMilitaryTime: PropTypes.bool.isRequired,
isFlagged: PropTypes.bool,
status: PropTypes.string,
isBusy: PropTypes.bool
isBusy: PropTypes.bool,
getPostList: PropTypes.func.isRequired
};