Merge pull request #19072 from ramonlsouza/issue-18937
fix: The shortcut for raising hand is not functioning as expected @ 2.7.1
This commit is contained in:
commit
c594be415a
@ -1,6 +1,7 @@
|
|||||||
import React, { useState } from 'react';
|
import React, { useState } from 'react';
|
||||||
import { defineMessages } from 'react-intl';
|
import { defineMessages } from 'react-intl';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
|
import withShortcutHelper from '/imports/ui/components/shortcut-help/service';
|
||||||
import BBBMenu from '/imports/ui/components/common/menu/component';
|
import BBBMenu from '/imports/ui/components/common/menu/component';
|
||||||
import UserReactionService from '/imports/ui/components/user-reaction/service';
|
import UserReactionService from '/imports/ui/components/user-reaction/service';
|
||||||
import UserListService from '/imports/ui/components/user-list/service';
|
import UserListService from '/imports/ui/components/user-list/service';
|
||||||
@ -21,6 +22,7 @@ const ReactionsButton = (props) => {
|
|||||||
isMobile,
|
isMobile,
|
||||||
currentUserReaction,
|
currentUserReaction,
|
||||||
autoCloseReactionsBar,
|
autoCloseReactionsBar,
|
||||||
|
shortcuts,
|
||||||
} = props;
|
} = props;
|
||||||
|
|
||||||
// initialize emoji-mart data, need for the new version
|
// initialize emoji-mart data, need for the new version
|
||||||
@ -101,7 +103,7 @@ const ReactionsButton = (props) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
actions.push({
|
actions.push({
|
||||||
label: <Styled.RaiseHandButtonWrapper isMobile={isMobile} data-test={raiseHand ? 'lowerHandBtn' : 'raiseHandBtn'} active={raiseHand}><em-emoji key={handReaction.id} native={handReaction.native} emoji={{ id: handReaction.id }} {...emojiProps} />{RaiseHandButtonLabel()}</Styled.RaiseHandButtonWrapper>,
|
label: <Styled.RaiseHandButtonWrapper accessKey={shortcuts.raisehand} isMobile={isMobile} data-test={raiseHand ? 'lowerHandBtn' : 'raiseHandBtn'} active={raiseHand}><em-emoji key={handReaction.id} native={handReaction.native} emoji={{ id: handReaction.id }} {...emojiProps} />{RaiseHandButtonLabel()}</Styled.RaiseHandButtonWrapper>,
|
||||||
key: 'hand',
|
key: 'hand',
|
||||||
onClick: () => handleRaiseHandButtonClick(),
|
onClick: () => handleRaiseHandButtonClick(),
|
||||||
customStyles: {...actionCustomStyles, width: 'auto'},
|
customStyles: {...actionCustomStyles, width: 'auto'},
|
||||||
@ -176,4 +178,4 @@ const propTypes = {
|
|||||||
|
|
||||||
ReactionsButton.propTypes = propTypes;
|
ReactionsButton.propTypes = propTypes;
|
||||||
|
|
||||||
export default ReactionsButton;
|
export default withShortcutHelper(ReactionsButton, ['raiseHand']);
|
||||||
|
Loading…
Reference in New Issue
Block a user