AkkomaGang/fedibird-fe
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Fix two different drop-down menus opening twice

Browse source
This commit is contained in:
noellabo 2021-09-03 08:30:56 +09:00
parent 8837025376
commit 1c5d0b8ce1
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/mastodon/components/dropdown_menu.js
View file

@ -180,7 +180,7 @@ export default class Dropdown extends React.PureComponent {
onOpen: PropTypes.func.isRequired, onOpen: PropTypes.func.isRequired,
onClose: PropTypes.func.isRequired, onClose: PropTypes.func.isRequired,
dropdownPlacement: PropTypes.string, dropdownPlacement: PropTypes.string,
openDropdownId: PropTypes.number, openDropdownId: PropTypes.string,
openedViaKeyboard: PropTypes.bool, openedViaKeyboard: PropTypes.bool,
}; };
@ -189,7 +189,7 @@ export default class Dropdown extends React.PureComponent {
}; };
state = { state = {
id: id++, id: `action:${id++}`,
}; };
handleClick = ({ target, type }) => { handleClick = ({ target, type }) => {
@ -211,9 +211,7 @@ export default class Dropdown extends React.PureComponent {
} }
handleMouseDown = () => { handleMouseDown = () => {
if (!this.state.open) { this.activeElement = document.activeElement;
this.activeElement = document.activeElement;
}
} }
handleButtonKeyDown = (e) => { handleButtonKeyDown = (e) => {

10
app/javascript/mastodon/components/reaction_picker_dropdown.js
View file

@ -30,7 +30,7 @@ const messages = defineMessages({
}); });
const listenerOptions = supportsPassiveEvents ? { passive: true } : false; const listenerOptions = supportsPassiveEvents ? { passive: true } : false;
let id = 100; let id = 0;
let EmojiPicker, Emoji; // load asynchronously let EmojiPicker, Emoji; // load asynchronously
@ -307,7 +307,7 @@ export default class ReactionPickerDropdown extends React.PureComponent {
onOpen: PropTypes.func.isRequired, onOpen: PropTypes.func.isRequired,
onClose: PropTypes.func.isRequired, onClose: PropTypes.func.isRequired,
dropdownPlacement: PropTypes.string, dropdownPlacement: PropTypes.string,
openDropdownId: PropTypes.number, openDropdownId: PropTypes.string,
openedViaKeyboard: PropTypes.bool, openedViaKeyboard: PropTypes.bool,
custom_emojis: ImmutablePropTypes.list, custom_emojis: ImmutablePropTypes.list,
onPickEmoji: PropTypes.func.isRequired, onPickEmoji: PropTypes.func.isRequired,
@ -325,7 +325,7 @@ export default class ReactionPickerDropdown extends React.PureComponent {
}; };
state = { state = {
id: id++, id: `reaction:${id++}`,
}; };
handleClick = ({ target, type }) => { handleClick = ({ target, type }) => {
@ -349,9 +349,7 @@ export default class ReactionPickerDropdown extends React.PureComponent {
} }
handleMouseDown = () => { handleMouseDown = () => {
if (!this.state.open) { this.activeElement = document.activeElement;
this.activeElement = document.activeElement;
}
} }
handleButtonKeyDown = (e) => { handleButtonKeyDown = (e) => {