From 5844ca84d03265d86d5da30566333d90439efd1b Mon Sep 17 00:00:00 2001
From: Dickson Law <dickson.law@utoronto.ca>
Date: Thu, 8 Jul 2021 13:43:52 -0400
Subject: [PATCH] Fix onEntering and onExit error
Replace the lines responsible for these errors:
```
Warning: Failed prop type: The prop `onEntering` of `ForwardRef(Menu)` is deprecated. Use the `TransitionProps` prop instead.
```
```
Warning: Failed prop type: The prop `onExit` of `ForwardRef(Menu)` is deprecated. Use the `TransitionProps` prop instead.
```
---
__tests__/src/components/WindowTopMenu.test.js | 12 ++++++++----
src/components/WindowList.js | 4 +++-
src/components/WindowTopMenu.js | 6 ++++--
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/__tests__/src/components/WindowTopMenu.test.js b/__tests__/src/components/WindowTopMenu.test.js
index 713cc148e..3eacc72fb 100644
--- a/__tests__/src/components/WindowTopMenu.test.js
+++ b/__tests__/src/components/WindowTopMenu.test.js
@@ -42,8 +42,10 @@ describe('WindowTopMenu', () => {
expect(wrapper.find(Menu).first().props().anchorEl).toBe(null);
expect(wrapper.find(Menu).first().props().open).toBe(false);
expect(wrapper.find(Menu).first().props().onClose).toBe(handleClose);
- expect(wrapper.find(Menu).first().props().onEntering).toBe(toggleDraggingEnabled);
- expect(wrapper.find(Menu).first().props().onExit).toBe(toggleDraggingEnabled);
+ expect(wrapper.find(Menu).first().props().TransitionProps.onEntering)
+ .toBe(toggleDraggingEnabled);
+ expect(wrapper.find(Menu).first().props().TransitionProps.onExit)
+ .toBe(toggleDraggingEnabled);
});
it('passses correct props to <Menu/> when achor element given', () => {
@@ -54,7 +56,9 @@ describe('WindowTopMenu', () => {
expect(wrapper.find(Menu).first().props().anchorEl).toBe(anchorEl);
expect(wrapper.find(Menu).first().props().open).toBe(true);
expect(wrapper.find(Menu).first().props().onClose).toBe(handleClose);
- expect(wrapper.find(Menu).first().props().onEntering).toBe(toggleDraggingEnabled);
- expect(wrapper.find(Menu).first().props().onExit).toBe(toggleDraggingEnabled);
+ expect(wrapper.find(Menu).first().props().TransitionProps.onEntering)
+ .toBe(toggleDraggingEnabled);
+ expect(wrapper.find(Menu).first().props().TransitionProps.onExit)
+ .toBe(toggleDraggingEnabled);
});
});
diff --git a/src/components/WindowList.js b/src/components/WindowList.js
index 338b93ae6..5e45ad037 100644
--- a/src/components/WindowList.js
+++ b/src/components/WindowList.js
@@ -54,7 +54,9 @@ export class WindowList extends Component {
anchorEl={anchorEl}
open={Boolean(anchorEl)}
onClose={handleClose}
- onEntering={WindowList.focus2ndListIitem}
+ TransitionProps={{
+ onEntering: WindowList.focus2ndListIitem,
+ }}
>
<ListSubheader role="presentation" selected={false} disabled tabIndex="-1">
{t('openWindows')}
diff --git a/src/components/WindowTopMenu.js b/src/components/WindowTopMenu.js
index 799875382..6148f94d2 100644
--- a/src/components/WindowTopMenu.js
+++ b/src/components/WindowTopMenu.js
@@ -47,8 +47,10 @@ export class WindowTopMenu extends Component {
getContentAnchorEl={null}
open={Boolean(anchorEl)}
onClose={handleClose}
- onEntering={toggleDraggingEnabled}
- onExit={toggleDraggingEnabled}
+ TransitionProps={{
+ onEntering: toggleDraggingEnabled,
+ onExit: toggleDraggingEnabled,
+ }}
orientation="horizontal"
>
<WindowViewSettings windowId={windowId} handleClose={handleClose} />
--
GitLab