mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Merge signalapp/Signal-Desktop#5610

Browse source
This commit is contained in:
Josh Perez 2022-04-14 14:49:05 -04:00
commit 908ecda64f
2 changed files with 94 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
patches/react-contextmenu+2.11.0.patch
View file

@ -1,15 +1,15 @@
diff --git a/node_modules/react-contextmenu/modules/ContextMenu.js b/node_modules/react-contextmenu/modules/ContextMenu.js
index 622a1f9..9fc87ea 100644
index 622a1f9..fa5f3b6 100644
--- a/node_modules/react-contextmenu/modules/ContextMenu.js
+++ b/node_modules/react-contextmenu/modules/ContextMenu.js
@@ -226,6 +226,9 @@ var ContextMenu = function (_AbstractMenu) {
if (this.state.isVisible) {
var wrapper = window.requestAnimationFrame || setTimeout;
+ if (!this.previousFocus) {
+ this.previousFocus = document.activeElement;
+ }
wrapper(function () {
var _state = _this2.state,
@@ -241,13 +244,21 @@ var ContextMenu = function (_AbstractMenu) {
@ -34,3 +34,92 @@ index 622a1f9..9fc87ea 100644
}
}
}, {
diff --git a/node_modules/react-contextmenu/modules/SubMenu.js b/node_modules/react-contextmenu/modules/SubMenu.js
index 3eb1d4e..0734b63 100644
--- a/node_modules/react-contextmenu/modules/SubMenu.js
+++ b/node_modules/react-contextmenu/modules/SubMenu.js
@@ -123,6 +123,7 @@ var SubMenu = function (_AbstractMenu) {
if (_this.props.disabled || _this.state.visible) return;
+ if (_this.opentimer) clearTimeout(_this.opentimer);
_this.opentimer = setTimeout(function () {
return _this.setState({
visible: true,
@@ -136,6 +137,7 @@ var SubMenu = function (_AbstractMenu) {
if (!_this.state.visible) return;
+ if (_this.closetimer) clearTimeout(_this.closetimer);
_this.closetimer = setTimeout(function () {
return _this.setState({
visible: false,
@@ -164,6 +166,15 @@ var SubMenu = function (_AbstractMenu) {
}
};
+ _this.cleanup = function () {
+ _this.subMenu.removeEventListener('transitionend', _this.cleanup);
+ _this.subMenu.style.removeProperty('bottom');
+ _this.subMenu.style.removeProperty('right');
+ _this.subMenu.style.top = 0;
+ _this.subMenu.style.left = '100%';
+ _this.unregisterHandlers();
+ };
+
_this.state = (0, _objectAssign2.default)({}, _this.state, {
visible: false
});
@@ -196,32 +207,28 @@ var SubMenu = function (_AbstractMenu) {
if (this.props.forceOpen || this.state.visible) {
var wrapper = window.requestAnimationFrame || setTimeout;
wrapper(function () {
- var styles = _this2.props.rtl ? _this2.getRTLMenuPosition() : _this2.getMenuPosition();
-
- _this2.subMenu.style.removeProperty('top');
- _this2.subMenu.style.removeProperty('bottom');
- _this2.subMenu.style.removeProperty('left');
- _this2.subMenu.style.removeProperty('right');
-
- if ((0, _helpers.hasOwnProp)(styles, 'top')) _this2.subMenu.style.top = styles.top;
- if ((0, _helpers.hasOwnProp)(styles, 'left')) _this2.subMenu.style.left = styles.left;
- if ((0, _helpers.hasOwnProp)(styles, 'bottom')) _this2.subMenu.style.bottom = styles.bottom;
- if ((0, _helpers.hasOwnProp)(styles, 'right')) _this2.subMenu.style.right = styles.right;
- _this2.subMenu.classList.add(_helpers.cssClasses.menuVisible);
-
- _this2.registerHandlers();
- _this2.setState({ selectedItem: null });
+ if (_this2.props.forceOpen || _this2.state.visible) {
+ _this2.subMenu.removeEventListener('transitionend', _this2.cleanup);
+ var styles = _this2.props.rtl ? _this2.getRTLMenuPosition() : _this2.getMenuPosition();
+
+ _this2.subMenu.style.removeProperty('top');
+ _this2.subMenu.style.removeProperty('bottom');
+ _this2.subMenu.style.removeProperty('left');
+ _this2.subMenu.style.removeProperty('right');
+
+ if ((0, _helpers.hasOwnProp)(styles, 'top')) _this2.subMenu.style.top = styles.top;
+ if ((0, _helpers.hasOwnProp)(styles, 'left')) _this2.subMenu.style.left = styles.left;
+ if ((0, _helpers.hasOwnProp)(styles, 'bottom')) _this2.subMenu.style.bottom = styles.bottom;
+ if ((0, _helpers.hasOwnProp)(styles, 'right')) _this2.subMenu.style.right = styles.right;
+ _this2.subMenu.classList.add(_helpers.cssClasses.menuVisible);
+
+ _this2.registerHandlers();
+ _this2.setState({ selectedItem: null });
+ }
});
} else {
- var cleanup = function cleanup() {
- _this2.subMenu.removeEventListener('transitionend', cleanup);
- _this2.subMenu.style.removeProperty('bottom');
- _this2.subMenu.style.removeProperty('right');
- _this2.subMenu.style.top = 0;
- _this2.subMenu.style.left = '100%';
- _this2.unregisterHandlers();
- };
- this.subMenu.addEventListener('transitionend', cleanup);
+ this.subMenu.removeEventListener('transitionend', this.cleanup);
+ this.subMenu.addEventListener('transitionend', this.cleanup);
this.subMenu.classList.remove(_helpers.cssClasses.menuVisible);
}
}

4
ts/components/conversation/ConversationHeader.tsx
View file

@ -467,11 +467,11 @@ export class ConversationHeader extends React.Component<PropsType, StateType> {
return (
<ContextMenu id={triggerId}>
{disableTimerChanges ? null : (
<SubMenu hoverDelay={1} title={disappearingTitle}>
<SubMenu hoverDelay={1} title={disappearingTitle} rtl>
{expireDurations}
</SubMenu>
)}
<SubMenu hoverDelay={1} title={muteTitle}>
<SubMenu hoverDelay={1} title={muteTitle} rtl>
{muteOptions.map(item => (
<MenuItem
key={item.name}