From 2f4bfd9e3ca1e6a4766dc891cdbc3638f0e21a6f Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Tue, 28 Jun 2022 15:55:27 +0200
Subject: [PATCH] fix: Remove deprecated modal parameters from material ui
---
.../Analysis/AnalysisErrorModal.tsx | 5 +-
.../ElecHalfHourMonthlyAnalysis.spec.tsx.snap | 156 +++----
.../__snapshots__/ElecInfoModal.spec.tsx.snap | 70 +--
.../Challenge/ChallengeNoFluidModal.tsx | 5 +-
.../ChallengeNoFluidModal.spec.tsx.snap | 3 +-
.../__snapshots__/ChallengeView.spec.tsx.snap | 104 ++---
.../__snapshots__/ErrorPage.spec.tsx.snap | 52 +--
.../DeleteGRDFAccountModal.spec.tsx.snap | 174 ++++---
.../ExpiredConsentModal.spec.tsx.snap | 174 ++++---
.../EcogestureCard.spec.tsx.snap | 52 +--
.../EcogestureEmptyList.spec.tsx.snap | 104 ++---
.../EcogestureInitModal.spec.tsx.snap | 174 ++++---
.../EcogestureList.spec.tsx.snap | 432 +++++++++---------
.../EcogestureReinitModal.spec.tsx.snap | 174 ++++---
.../EcogestureView.spec.tsx.snap | 383 ++++++++--------
.../SingleEcogesture.spec.tsx.snap | 104 ++---
.../EcogestureFormEquipment.spec.tsx.snap | 52 +--
.../EcogestureLaunchFormModal.spec.tsx.snap | 122 ++---
.../EcogestureSelectionDetail.spec.tsx.snap | 156 +++----
.../EcogestureSelectionEnd.spec.tsx.snap | 52 +--
.../EcogestureSelectionModal.spec.tsx.snap | 122 ++---
.../EcogestureSelectionRestart.spec.tsx.snap | 104 ++---
.../__snapshots__/FAQContent.spec.tsx.snap | 168 ++++---
src/components/Feedback/FeedbackModal.tsx | 5 +-
src/components/Home/releaseNotesModal.tsx | 5 +-
src/components/Konnector/KonnectorModal.tsx | 7 +-
.../__snapshots__/WelcomeModal.spec.tsx.snap | 134 +++---
.../__snapshots__/UnSubscribe.spec.tsx.snap | 52 +--
.../PartnerConnectionStepsModal.spec.tsx.snap | 122 ++---
.../PartnersIssue/PartnersIssueModal.tsx | 5 +-
.../PartnersIssueModal.spec.tsx.snap | 130 +++---
.../SplashScreenError.spec.tsx.snap | 52 +--
.../__snapshots__/CGUModal.spec.tsx.snap | 122 ++---
.../LegalNoticeModal.spec.tsx.snap | 122 ++---
.../__snapshots__/TermsView.spec.tsx.snap | 24 +-
35 files changed, 1839 insertions(+), 1883 deletions(-)
diff --git a/src/components/Analysis/AnalysisErrorModal.tsx b/src/components/Analysis/AnalysisErrorModal.tsx
index 61c5a1a6e..b83f392cc 100644
--- a/src/components/Analysis/AnalysisErrorModal.tsx
+++ b/src/components/Analysis/AnalysisErrorModal.tsx
@@ -19,9 +19,10 @@ const AnalysisErrorModal: React.FC = () => {
return (
<Dialog
open={true}
- disableBackdropClick
+ onClose={(event, reason): void => {
+ event && reason !== 'backdropClick' && goBack()
+ }}
disableEscapeKeyDown
- onClose={goBack}
aria-labelledby={'accessibility-title'}
classes={{
root: 'modal-root',
diff --git a/src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap b/src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap
index 3e66e5b70..0fcd2e408 100644
--- a/src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap
+++ b/src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap
@@ -192,36 +192,34 @@ exports[`ElecHalfHourMonthlyAnalysis component should be rendered correctly when
</div>
</div>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -374,36 +372,34 @@ exports[`ElecHalfHourMonthlyAnalysis component should be rendered correctly when
</Component>
</Icon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -521,36 +517,34 @@ exports[`ElecHalfHourMonthlyAnalysis component should be rendered correctly when
</Component>
</Icon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
diff --git a/src/components/Analysis/__snapshots__/ElecInfoModal.spec.tsx.snap b/src/components/Analysis/__snapshots__/ElecInfoModal.spec.tsx.snap
index de76327d5..d77706c08 100644
--- a/src/components/Analysis/__snapshots__/ElecInfoModal.spec.tsx.snap
+++ b/src/components/Analysis/__snapshots__/ElecInfoModal.spec.tsx.snap
@@ -96,12 +96,17 @@ exports[`ElecInfoModal component should be rendered correctly 1`] = `
"overrides": Object {},
"palette": Object {
"action": Object {
+ "activatedOpacity": 0.12,
"active": "rgba(0, 0, 0, 0.54)",
"disabled": "rgba(0, 0, 0, 0.26)",
"disabledBackground": "rgba(0, 0, 0, 0.12)",
- "hover": "rgba(0, 0, 0, 0.08)",
- "hoverOpacity": 0.08,
- "selected": "rgba(0, 0, 0, 0.14)",
+ "disabledOpacity": 0.38,
+ "focus": "rgba(0, 0, 0, 0.12)",
+ "focusOpacity": 0.12,
+ "hover": "rgba(0, 0, 0, 0.04)",
+ "hoverOpacity": 0.04,
+ "selected": "rgba(0, 0, 0, 0.08)",
+ "selectedOpacity": 0.08,
},
"augmentColor": [Function],
"background": Object {
@@ -361,7 +366,6 @@ exports[`ElecInfoModal component should be rendered correctly 1`] = `
}
className="MuiDialog-root modal-root"
closeAfterTransition={true}
- disableBackdropClick={false}
disableEscapeKeyDown={false}
onClose={[MockFunction]}
open={true}
@@ -554,7 +558,7 @@ exports[`ElecInfoModal component should be rendered correctly 1`] = `
</ForwardRef(Fade)>
</ForwardRef(Backdrop)>
</WithStyles(ForwardRef(Backdrop))>
- <TrapFocus
+ <Unstable_TrapFocus
disableAutoFocus={false}
disableEnforceFocus={false}
disableRestoreFocus={false}
@@ -604,8 +608,8 @@ exports[`ElecInfoModal component should be rendered correctly 1`] = `
>
<div
className="MuiDialog-container MuiDialog-scrollPaper"
- onClick={[Function]}
onMouseDown={[Function]}
+ onMouseUp={[Function]}
role="none presentation"
style={
Object {
@@ -761,36 +765,34 @@ exports[`ElecInfoModal component should be rendered correctly 1`] = `
</Component>
</Icon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -836,7 +838,7 @@ exports[`ElecInfoModal component should be rendered correctly 1`] = `
data-test="sentinelEnd"
tabIndex={0}
/>
- </TrapFocus>
+ </Unstable_TrapFocus>
</div>
</Portal>
</ForwardRef(Portal)>
diff --git a/src/components/Challenge/ChallengeNoFluidModal.tsx b/src/components/Challenge/ChallengeNoFluidModal.tsx
index 614a3ccf5..b9d5ff8cc 100644
--- a/src/components/Challenge/ChallengeNoFluidModal.tsx
+++ b/src/components/Challenge/ChallengeNoFluidModal.tsx
@@ -18,9 +18,10 @@ const ChallengeNoFluidModal: React.FC<ChallengeNoFluidModalProps> = ({
return (
<Dialog
open={open}
- disableBackdropClick
disableEscapeKeyDown
- onClose={handleCloseClick}
+ onClose={(event, reason): void => {
+ event && reason !== 'backdropClick' && handleCloseClick()
+ }}
aria-labelledby={'accessibility-title'}
classes={{
root: 'modal-root',
diff --git a/src/components/Challenge/__snapshots__/ChallengeNoFluidModal.spec.tsx.snap b/src/components/Challenge/__snapshots__/ChallengeNoFluidModal.spec.tsx.snap
index 7ab0df69c..924173886 100644
--- a/src/components/Challenge/__snapshots__/ChallengeNoFluidModal.spec.tsx.snap
+++ b/src/components/Challenge/__snapshots__/ChallengeNoFluidModal.spec.tsx.snap
@@ -9,9 +9,8 @@ exports[`ChallengeNoFluidModal component should be rendered correctly opened 1`]
"root": "modal-root",
}
}
- disableBackdropClick={true}
disableEscapeKeyDown={true}
- onClose={[MockFunction]}
+ onClose={[Function]}
open={true}
>
<div
diff --git a/src/components/Challenge/__snapshots__/ChallengeView.spec.tsx.snap b/src/components/Challenge/__snapshots__/ChallengeView.spec.tsx.snap
index 3d17797f4..2aeb64067 100644
--- a/src/components/Challenge/__snapshots__/ChallengeView.spec.tsx.snap
+++ b/src/components/Challenge/__snapshots__/ChallengeView.spec.tsx.snap
@@ -1066,36 +1066,34 @@ exports[`ChallengeView component should be rendered correctly 1`] = `
</Icon>
</StyledIcon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1216,36 +1214,34 @@ exports[`ChallengeView component should be rendered correctly 1`] = `
</Icon>
</StyledIcon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
diff --git a/src/components/CommonKit/ErrorPage/__snapshots__/ErrorPage.spec.tsx.snap b/src/components/CommonKit/ErrorPage/__snapshots__/ErrorPage.spec.tsx.snap
index bf887521e..c64f4b6b0 100644
--- a/src/components/CommonKit/ErrorPage/__snapshots__/ErrorPage.spec.tsx.snap
+++ b/src/components/CommonKit/ErrorPage/__snapshots__/ErrorPage.spec.tsx.snap
@@ -181,36 +181,34 @@ exports[`ErrorPage component should be rendered correctly 1`] = `
>
error_page.back
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
diff --git a/src/components/Connection/__snapshots__/DeleteGRDFAccountModal.spec.tsx.snap b/src/components/Connection/__snapshots__/DeleteGRDFAccountModal.spec.tsx.snap
index 9836a6dbd..a4e7f3907 100644
--- a/src/components/Connection/__snapshots__/DeleteGRDFAccountModal.spec.tsx.snap
+++ b/src/components/Connection/__snapshots__/DeleteGRDFAccountModal.spec.tsx.snap
@@ -97,12 +97,17 @@ exports[`DeleteGRDFAccountModal component should be rendered correctly 1`] = `
"overrides": Object {},
"palette": Object {
"action": Object {
+ "activatedOpacity": 0.12,
"active": "rgba(0, 0, 0, 0.54)",
"disabled": "rgba(0, 0, 0, 0.26)",
"disabledBackground": "rgba(0, 0, 0, 0.12)",
- "hover": "rgba(0, 0, 0, 0.08)",
- "hoverOpacity": 0.08,
- "selected": "rgba(0, 0, 0, 0.14)",
+ "disabledOpacity": 0.38,
+ "focus": "rgba(0, 0, 0, 0.12)",
+ "focusOpacity": 0.12,
+ "hover": "rgba(0, 0, 0, 0.04)",
+ "hoverOpacity": 0.04,
+ "selected": "rgba(0, 0, 0, 0.08)",
+ "selectedOpacity": 0.08,
},
"augmentColor": [Function],
"background": Object {
@@ -362,7 +367,6 @@ exports[`DeleteGRDFAccountModal component should be rendered correctly 1`] = `
}
className="MuiDialog-root modal-root"
closeAfterTransition={true}
- disableBackdropClick={false}
disableEscapeKeyDown={false}
onClose={[MockFunction]}
open={true}
@@ -591,7 +595,7 @@ exports[`DeleteGRDFAccountModal component should be rendered correctly 1`] = `
</ForwardRef(Fade)>
</ForwardRef(Backdrop)>
</WithStyles(ForwardRef(Backdrop))>
- <TrapFocus
+ <Unstable_TrapFocus
disableAutoFocus={false}
disableEnforceFocus={false}
disableRestoreFocus={false}
@@ -641,8 +645,8 @@ exports[`DeleteGRDFAccountModal component should be rendered correctly 1`] = `
>
<div
className="MuiDialog-container MuiDialog-scrollPaper"
- onClick={[Function]}
onMouseDown={[Function]}
+ onMouseUp={[Function]}
role="none presentation"
style={
Object {
@@ -798,36 +802,34 @@ exports[`DeleteGRDFAccountModal component should be rendered correctly 1`] = `
</Component>
</Icon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -979,36 +981,34 @@ exports[`DeleteGRDFAccountModal component should be rendered correctly 1`] = `
>
delete_grdf_modal.cancel
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1112,36 +1112,34 @@ exports[`DeleteGRDFAccountModal component should be rendered correctly 1`] = `
>
delete_grdf_modal.go
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1159,7 +1157,7 @@ exports[`DeleteGRDFAccountModal component should be rendered correctly 1`] = `
data-test="sentinelEnd"
tabIndex={0}
/>
- </TrapFocus>
+ </Unstable_TrapFocus>
</div>
</Portal>
</ForwardRef(Portal)>
diff --git a/src/components/Connection/__snapshots__/ExpiredConsentModal.spec.tsx.snap b/src/components/Connection/__snapshots__/ExpiredConsentModal.spec.tsx.snap
index 1e18710ba..1ee47a975 100644
--- a/src/components/Connection/__snapshots__/ExpiredConsentModal.spec.tsx.snap
+++ b/src/components/Connection/__snapshots__/ExpiredConsentModal.spec.tsx.snap
@@ -109,12 +109,17 @@ exports[`ExpiredConsentModal component should be rendered correctly 1`] = `
"overrides": Object {},
"palette": Object {
"action": Object {
+ "activatedOpacity": 0.12,
"active": "rgba(0, 0, 0, 0.54)",
"disabled": "rgba(0, 0, 0, 0.26)",
"disabledBackground": "rgba(0, 0, 0, 0.12)",
- "hover": "rgba(0, 0, 0, 0.08)",
- "hoverOpacity": 0.08,
- "selected": "rgba(0, 0, 0, 0.14)",
+ "disabledOpacity": 0.38,
+ "focus": "rgba(0, 0, 0, 0.12)",
+ "focusOpacity": 0.12,
+ "hover": "rgba(0, 0, 0, 0.04)",
+ "hoverOpacity": 0.04,
+ "selected": "rgba(0, 0, 0, 0.08)",
+ "selectedOpacity": 0.08,
},
"augmentColor": [Function],
"background": Object {
@@ -374,7 +379,6 @@ exports[`ExpiredConsentModal component should be rendered correctly 1`] = `
}
className="MuiDialog-root modal-root"
closeAfterTransition={true}
- disableBackdropClick={false}
disableEscapeKeyDown={false}
onClose={[MockFunction]}
open={true}
@@ -603,7 +607,7 @@ exports[`ExpiredConsentModal component should be rendered correctly 1`] = `
</ForwardRef(Fade)>
</ForwardRef(Backdrop)>
</WithStyles(ForwardRef(Backdrop))>
- <TrapFocus
+ <Unstable_TrapFocus
disableAutoFocus={false}
disableEnforceFocus={false}
disableRestoreFocus={false}
@@ -653,8 +657,8 @@ exports[`ExpiredConsentModal component should be rendered correctly 1`] = `
>
<div
className="MuiDialog-container MuiDialog-scrollPaper"
- onClick={[Function]}
onMouseDown={[Function]}
+ onMouseUp={[Function]}
role="none presentation"
style={
Object {
@@ -810,36 +814,34 @@ exports[`ExpiredConsentModal component should be rendered correctly 1`] = `
</Component>
</Icon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -991,36 +993,34 @@ exports[`ExpiredConsentModal component should be rendered correctly 1`] = `
>
consent_outdated.later
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1124,36 +1124,34 @@ exports[`ExpiredConsentModal component should be rendered correctly 1`] = `
>
consent_outdated.go
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1171,7 +1169,7 @@ exports[`ExpiredConsentModal component should be rendered correctly 1`] = `
data-test="sentinelEnd"
tabIndex={0}
/>
- </TrapFocus>
+ </Unstable_TrapFocus>
</div>
</Portal>
</ForwardRef(Portal)>
diff --git a/src/components/Ecogesture/__snapshots__/EcogestureCard.spec.tsx.snap b/src/components/Ecogesture/__snapshots__/EcogestureCard.spec.tsx.snap
index 5101707fd..2048000ad 100644
--- a/src/components/Ecogesture/__snapshots__/EcogestureCard.spec.tsx.snap
+++ b/src/components/Ecogesture/__snapshots__/EcogestureCard.spec.tsx.snap
@@ -413,36 +413,34 @@ exports[`EcogestureCard component should be rendered correctly 1`] = `
<span
className="MuiCardActionArea-focusHighlight"
/>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
diff --git a/src/components/Ecogesture/__snapshots__/EcogestureEmptyList.spec.tsx.snap b/src/components/Ecogesture/__snapshots__/EcogestureEmptyList.spec.tsx.snap
index db551a11f..328305ab2 100644
--- a/src/components/Ecogesture/__snapshots__/EcogestureEmptyList.spec.tsx.snap
+++ b/src/components/Ecogesture/__snapshots__/EcogestureEmptyList.spec.tsx.snap
@@ -168,36 +168,34 @@ exports[`EcogestureEmptyList component should be rendered correctly 1`] = `
>
ecogesture.emptyList.btn1
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -301,36 +299,34 @@ exports[`EcogestureEmptyList component should be rendered correctly 1`] = `
>
ecogesture.emptyList.btn2
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
diff --git a/src/components/Ecogesture/__snapshots__/EcogestureInitModal.spec.tsx.snap b/src/components/Ecogesture/__snapshots__/EcogestureInitModal.spec.tsx.snap
index 84d7f0843..ab830dd06 100644
--- a/src/components/Ecogesture/__snapshots__/EcogestureInitModal.spec.tsx.snap
+++ b/src/components/Ecogesture/__snapshots__/EcogestureInitModal.spec.tsx.snap
@@ -109,12 +109,17 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
"overrides": Object {},
"palette": Object {
"action": Object {
+ "activatedOpacity": 0.12,
"active": "rgba(0, 0, 0, 0.54)",
"disabled": "rgba(0, 0, 0, 0.26)",
"disabledBackground": "rgba(0, 0, 0, 0.12)",
- "hover": "rgba(0, 0, 0, 0.08)",
- "hoverOpacity": 0.08,
- "selected": "rgba(0, 0, 0, 0.14)",
+ "disabledOpacity": 0.38,
+ "focus": "rgba(0, 0, 0, 0.12)",
+ "focusOpacity": 0.12,
+ "hover": "rgba(0, 0, 0, 0.04)",
+ "hoverOpacity": 0.04,
+ "selected": "rgba(0, 0, 0, 0.08)",
+ "selectedOpacity": 0.08,
},
"augmentColor": [Function],
"background": Object {
@@ -374,7 +379,6 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
}
className="MuiDialog-root modal-root"
closeAfterTransition={true}
- disableBackdropClick={false}
disableEscapeKeyDown={false}
onClose={[MockFunction]}
open={true}
@@ -590,7 +594,7 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
</ForwardRef(Fade)>
</ForwardRef(Backdrop)>
</WithStyles(ForwardRef(Backdrop))>
- <TrapFocus
+ <Unstable_TrapFocus
disableAutoFocus={false}
disableEnforceFocus={false}
disableRestoreFocus={false}
@@ -640,8 +644,8 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
>
<div
className="MuiDialog-container MuiDialog-scrollPaper"
- onClick={[Function]}
onMouseDown={[Function]}
+ onMouseUp={[Function]}
role="none presentation"
style={
Object {
@@ -797,36 +801,34 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
</Component>
</Icon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -953,36 +955,34 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
>
ecogesture.initModal.btn1
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1086,36 +1086,34 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
>
ecogesture.initModal.btn2
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1133,7 +1131,7 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
data-test="sentinelEnd"
tabIndex={0}
/>
- </TrapFocus>
+ </Unstable_TrapFocus>
</div>
</Portal>
</ForwardRef(Portal)>
diff --git a/src/components/Ecogesture/__snapshots__/EcogestureList.spec.tsx.snap b/src/components/Ecogesture/__snapshots__/EcogestureList.spec.tsx.snap
index 2b952c562..d8031cfef 100644
--- a/src/components/Ecogesture/__snapshots__/EcogestureList.spec.tsx.snap
+++ b/src/components/Ecogesture/__snapshots__/EcogestureList.spec.tsx.snap
@@ -303,36 +303,34 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
ecogesture.MENU_TITLE
</span>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -386,6 +384,11 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
},
}
}
+ TransitionProps={
+ Object {
+ "onEntering": [Function],
+ }
+ }
anchorEl={null}
anchorOrigin={
Object {
@@ -401,7 +404,6 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
getContentAnchorEl={[Function]}
keepMounted={true}
onClose={[Function]}
- onEntering={[Function]}
open={false}
transformOrigin={
Object {
@@ -419,6 +421,11 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
},
}
}
+ TransitionProps={
+ Object {
+ "onEntering": [Function],
+ }
+ }
anchorEl={null}
anchorOrigin={
Object {
@@ -435,7 +442,6 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
getContentAnchorEl={[Function]}
keepMounted={true}
onClose={[Function]}
- onEntering={[Function]}
open={false}
transformOrigin={
Object {
@@ -604,7 +610,7 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
onClick={[Function]}
open={false}
/>
- <TrapFocus
+ <Unstable_TrapFocus
disableAutoFocus={false}
disableEnforceFocus={false}
disableRestoreFocus={false}
@@ -913,36 +919,34 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
</div>
</ForwardRef(ListItemIcon)>
</WithStyles(ForwardRef(ListItemIcon))>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</li>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1056,36 +1060,34 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
tabIndex={-1}
>
ecogesture.HEATING
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</li>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1199,36 +1201,34 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
tabIndex={-1}
>
ecogesture.AIR_CONDITIONING
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</li>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1342,36 +1342,34 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
tabIndex={-1}
>
ecogesture.ECS
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</li>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1485,36 +1483,34 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
tabIndex={-1}
>
ecogesture.COLD_WATER
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</li>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1628,36 +1624,34 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
tabIndex={-1}
>
ecogesture.ELECTRICITY_SPECIFIC
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</li>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1771,36 +1765,34 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
tabIndex={-1}
>
ecogesture.COOKING
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</li>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1821,7 +1813,7 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
data-test="sentinelEnd"
tabIndex={0}
/>
- </TrapFocus>
+ </Unstable_TrapFocus>
</div>
</Portal>
</ForwardRef(Portal)>
diff --git a/src/components/Ecogesture/__snapshots__/EcogestureReinitModal.spec.tsx.snap b/src/components/Ecogesture/__snapshots__/EcogestureReinitModal.spec.tsx.snap
index 49f0e57d3..9539b4290 100644
--- a/src/components/Ecogesture/__snapshots__/EcogestureReinitModal.spec.tsx.snap
+++ b/src/components/Ecogesture/__snapshots__/EcogestureReinitModal.spec.tsx.snap
@@ -109,12 +109,17 @@ exports[`EcogestureReinitModal component should be rendered correctly 1`] = `
"overrides": Object {},
"palette": Object {
"action": Object {
+ "activatedOpacity": 0.12,
"active": "rgba(0, 0, 0, 0.54)",
"disabled": "rgba(0, 0, 0, 0.26)",
"disabledBackground": "rgba(0, 0, 0, 0.12)",
- "hover": "rgba(0, 0, 0, 0.08)",
- "hoverOpacity": 0.08,
- "selected": "rgba(0, 0, 0, 0.14)",
+ "disabledOpacity": 0.38,
+ "focus": "rgba(0, 0, 0, 0.12)",
+ "focusOpacity": 0.12,
+ "hover": "rgba(0, 0, 0, 0.04)",
+ "hoverOpacity": 0.04,
+ "selected": "rgba(0, 0, 0, 0.08)",
+ "selectedOpacity": 0.08,
},
"augmentColor": [Function],
"background": Object {
@@ -374,7 +379,6 @@ exports[`EcogestureReinitModal component should be rendered correctly 1`] = `
}
className="MuiDialog-root modal-root"
closeAfterTransition={true}
- disableBackdropClick={false}
disableEscapeKeyDown={false}
onClose={[MockFunction]}
open={true}
@@ -616,7 +620,7 @@ exports[`EcogestureReinitModal component should be rendered correctly 1`] = `
</ForwardRef(Fade)>
</ForwardRef(Backdrop)>
</WithStyles(ForwardRef(Backdrop))>
- <TrapFocus
+ <Unstable_TrapFocus
disableAutoFocus={false}
disableEnforceFocus={false}
disableRestoreFocus={false}
@@ -666,8 +670,8 @@ exports[`EcogestureReinitModal component should be rendered correctly 1`] = `
>
<div
className="MuiDialog-container MuiDialog-scrollPaper"
- onClick={[Function]}
onMouseDown={[Function]}
+ onMouseUp={[Function]}
role="none presentation"
style={
Object {
@@ -823,36 +827,34 @@ exports[`EcogestureReinitModal component should be rendered correctly 1`] = `
</Component>
</Icon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1019,36 +1021,34 @@ exports[`EcogestureReinitModal component should be rendered correctly 1`] = `
>
ecogesture.reinitModal.btn1
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1152,36 +1152,34 @@ exports[`EcogestureReinitModal component should be rendered correctly 1`] = `
>
ecogesture.reinitModal.btn2
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1199,7 +1197,7 @@ exports[`EcogestureReinitModal component should be rendered correctly 1`] = `
data-test="sentinelEnd"
tabIndex={0}
/>
- </TrapFocus>
+ </Unstable_TrapFocus>
</div>
</Portal>
</ForwardRef(Portal)>
diff --git a/src/components/Ecogesture/__snapshots__/EcogestureView.spec.tsx.snap b/src/components/Ecogesture/__snapshots__/EcogestureView.spec.tsx.snap
index 32c9365cd..ad6c92b1e 100644
--- a/src/components/Ecogesture/__snapshots__/EcogestureView.spec.tsx.snap
+++ b/src/components/Ecogesture/__snapshots__/EcogestureView.spec.tsx.snap
@@ -61,7 +61,6 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
value={2}
>
<div
- aria-label="ecogestures-tabs"
className="MuiTabs-root ecogestures-tabs"
>
<div
@@ -75,7 +74,9 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
}
>
<div
+ aria-label="ecogestures-tabs"
className="MuiTabs-flexContainer MuiTabs-centered"
+ onKeyDown={[Function]}
role="tablist"
>
<WithStyles(ForwardRef(Tab))
@@ -137,7 +138,9 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
focusRipple={true}
id="simple-tab-0"
onClick={[Function]}
+ onFocus={[Function]}
role="tab"
+ tabIndex={-1}
>
<ForwardRef(ButtonBase)
aria-controls="simple-tabpanel-0"
@@ -154,7 +157,9 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
focusRipple={true}
id="simple-tab-0"
onClick={[Function]}
+ onFocus={[Function]}
role="tab"
+ tabIndex={-1}
>
<button
aria-controls="simple-tabpanel-0"
@@ -175,7 +180,7 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
onTouchMove={[Function]}
onTouchStart={[Function]}
role="tab"
- tabIndex={0}
+ tabIndex={-1}
type="button"
>
<span
@@ -185,36 +190,34 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
<br />
(0)
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -279,7 +282,9 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
focusRipple={true}
id="simple-tab-1"
onClick={[Function]}
+ onFocus={[Function]}
role="tab"
+ tabIndex={-1}
>
<ForwardRef(ButtonBase)
aria-controls="simple-tabpanel-1"
@@ -296,7 +301,9 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
focusRipple={true}
id="simple-tab-1"
onClick={[Function]}
+ onFocus={[Function]}
role="tab"
+ tabIndex={-1}
>
<button
aria-controls="simple-tabpanel-1"
@@ -317,7 +324,7 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
onTouchMove={[Function]}
onTouchStart={[Function]}
role="tab"
- tabIndex={0}
+ tabIndex={-1}
type="button"
>
<span
@@ -327,36 +334,34 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
<br />
(0)
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -421,7 +426,9 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
focusRipple={true}
id="simple-tab-2"
onClick={[Function]}
+ onFocus={[Function]}
role="tab"
+ tabIndex={0}
>
<ForwardRef(ButtonBase)
aria-controls="simple-tabpanel-2"
@@ -438,7 +445,9 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
focusRipple={true}
id="simple-tab-2"
onClick={[Function]}
+ onFocus={[Function]}
role="tab"
+ tabIndex={0}
>
<button
aria-controls="simple-tabpanel-2"
@@ -469,36 +478,34 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
<br />
(3)
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -720,36 +727,34 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
>
ecogesture.emptyList.btn1
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -853,36 +858,34 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
>
ecogesture.emptyList.btn2
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1060,36 +1063,34 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
>
ecogesture.emptyList.btn1
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1193,36 +1194,34 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
>
ecogesture.emptyList.btn2
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
diff --git a/src/components/Ecogesture/__snapshots__/SingleEcogesture.spec.tsx.snap b/src/components/Ecogesture/__snapshots__/SingleEcogesture.spec.tsx.snap
index 52ff63831..163c4e352 100644
--- a/src/components/Ecogesture/__snapshots__/SingleEcogesture.spec.tsx.snap
+++ b/src/components/Ecogesture/__snapshots__/SingleEcogesture.spec.tsx.snap
@@ -196,36 +196,34 @@ exports[`SingleEcogesture component should be rendered correctly 1`] = `
ecogesture.objective
</span>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -331,36 +329,34 @@ exports[`SingleEcogesture component should be rendered correctly 1`] = `
ecogesture.doing
</span>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
diff --git a/src/components/EcogestureForm/__snapshots__/EcogestureFormEquipment.spec.tsx.snap b/src/components/EcogestureForm/__snapshots__/EcogestureFormEquipment.spec.tsx.snap
index 8d8812b8b..e4159159d 100644
--- a/src/components/EcogestureForm/__snapshots__/EcogestureFormEquipment.spec.tsx.snap
+++ b/src/components/EcogestureForm/__snapshots__/EcogestureFormEquipment.spec.tsx.snap
@@ -521,36 +521,34 @@ exports[`EcogestureFormEquipment component should be rendered correctly 1`] = `
>
profile_type.form.button_next >
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
diff --git a/src/components/EcogestureForm/__snapshots__/EcogestureLaunchFormModal.spec.tsx.snap b/src/components/EcogestureForm/__snapshots__/EcogestureLaunchFormModal.spec.tsx.snap
index df7346335..11bbbe72d 100644
--- a/src/components/EcogestureForm/__snapshots__/EcogestureLaunchFormModal.spec.tsx.snap
+++ b/src/components/EcogestureForm/__snapshots__/EcogestureLaunchFormModal.spec.tsx.snap
@@ -96,12 +96,17 @@ exports[`EcogestureLaunchFormModal component should be rendered correctly 1`] =
"overrides": Object {},
"palette": Object {
"action": Object {
+ "activatedOpacity": 0.12,
"active": "rgba(0, 0, 0, 0.54)",
"disabled": "rgba(0, 0, 0, 0.26)",
"disabledBackground": "rgba(0, 0, 0, 0.12)",
- "hover": "rgba(0, 0, 0, 0.08)",
- "hoverOpacity": 0.08,
- "selected": "rgba(0, 0, 0, 0.14)",
+ "disabledOpacity": 0.38,
+ "focus": "rgba(0, 0, 0, 0.12)",
+ "focusOpacity": 0.12,
+ "hover": "rgba(0, 0, 0, 0.04)",
+ "hoverOpacity": 0.04,
+ "selected": "rgba(0, 0, 0, 0.08)",
+ "selectedOpacity": 0.08,
},
"augmentColor": [Function],
"background": Object {
@@ -361,7 +366,6 @@ exports[`EcogestureLaunchFormModal component should be rendered correctly 1`] =
}
className="MuiDialog-root modal-root"
closeAfterTransition={true}
- disableBackdropClick={false}
disableEscapeKeyDown={false}
onClose={[MockFunction]}
open={true}
@@ -553,7 +557,7 @@ exports[`EcogestureLaunchFormModal component should be rendered correctly 1`] =
</ForwardRef(Fade)>
</ForwardRef(Backdrop)>
</WithStyles(ForwardRef(Backdrop))>
- <TrapFocus
+ <Unstable_TrapFocus
disableAutoFocus={false}
disableEnforceFocus={false}
disableRestoreFocus={false}
@@ -603,8 +607,8 @@ exports[`EcogestureLaunchFormModal component should be rendered correctly 1`] =
>
<div
className="MuiDialog-container MuiDialog-scrollPaper"
- onClick={[Function]}
onMouseDown={[Function]}
+ onMouseUp={[Function]}
role="none presentation"
style={
Object {
@@ -760,36 +764,34 @@ exports[`EcogestureLaunchFormModal component should be rendered correctly 1`] =
</Component>
</Icon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -906,36 +908,34 @@ exports[`EcogestureLaunchFormModal component should be rendered correctly 1`] =
>
ecogesture.initModal.btn2
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -952,7 +952,7 @@ exports[`EcogestureLaunchFormModal component should be rendered correctly 1`] =
data-test="sentinelEnd"
tabIndex={0}
/>
- </TrapFocus>
+ </Unstable_TrapFocus>
</div>
</Portal>
</ForwardRef(Portal)>
diff --git a/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap
index 2eaf1e7ab..e019aee7c 100644
--- a/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap
+++ b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap
@@ -215,36 +215,34 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
</StyledIcon>
ecogesture_selection.button_objective
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -380,36 +378,34 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
</StyledIcon>
ecogesture_selection.button_doing
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -545,36 +541,34 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
</StyledIcon>
ecogesture_selection.button_skip
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
diff --git a/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionEnd.spec.tsx.snap b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionEnd.spec.tsx.snap
index 1b1ea7fd1..82c3300b0 100644
--- a/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionEnd.spec.tsx.snap
+++ b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionEnd.spec.tsx.snap
@@ -156,36 +156,34 @@ exports[`EcogestureSelectionEnd component should be rendered correctly 1`] = `
>
ecogesture_selection.button_ok
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
diff --git a/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionModal.spec.tsx.snap b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionModal.spec.tsx.snap
index 233978637..aeaea3ddb 100644
--- a/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionModal.spec.tsx.snap
+++ b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionModal.spec.tsx.snap
@@ -96,12 +96,17 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
"overrides": Object {},
"palette": Object {
"action": Object {
+ "activatedOpacity": 0.12,
"active": "rgba(0, 0, 0, 0.54)",
"disabled": "rgba(0, 0, 0, 0.26)",
"disabledBackground": "rgba(0, 0, 0, 0.12)",
- "hover": "rgba(0, 0, 0, 0.08)",
- "hoverOpacity": 0.08,
- "selected": "rgba(0, 0, 0, 0.14)",
+ "disabledOpacity": 0.38,
+ "focus": "rgba(0, 0, 0, 0.12)",
+ "focusOpacity": 0.12,
+ "hover": "rgba(0, 0, 0, 0.04)",
+ "hoverOpacity": 0.04,
+ "selected": "rgba(0, 0, 0, 0.08)",
+ "selectedOpacity": 0.08,
},
"augmentColor": [Function],
"background": Object {
@@ -361,7 +366,6 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
}
className="MuiDialog-root modal-root"
closeAfterTransition={true}
- disableBackdropClick={false}
disableEscapeKeyDown={false}
onClose={[MockFunction]}
open={true}
@@ -553,7 +557,7 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
</ForwardRef(Fade)>
</ForwardRef(Backdrop)>
</WithStyles(ForwardRef(Backdrop))>
- <TrapFocus
+ <Unstable_TrapFocus
disableAutoFocus={false}
disableEnforceFocus={false}
disableRestoreFocus={false}
@@ -603,8 +607,8 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
>
<div
className="MuiDialog-container MuiDialog-scrollPaper"
- onClick={[Function]}
onMouseDown={[Function]}
+ onMouseUp={[Function]}
role="none presentation"
style={
Object {
@@ -760,36 +764,34 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
</Component>
</Icon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -906,36 +908,34 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
>
ecogesture_selection.selectionModal.button_close
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -952,7 +952,7 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
data-test="sentinelEnd"
tabIndex={0}
/>
- </TrapFocus>
+ </Unstable_TrapFocus>
</div>
</Portal>
</ForwardRef(Portal)>
diff --git a/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionRestart.spec.tsx.snap b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionRestart.spec.tsx.snap
index 0dc2cff5a..4d8563d6d 100644
--- a/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionRestart.spec.tsx.snap
+++ b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionRestart.spec.tsx.snap
@@ -154,36 +154,34 @@ exports[`EcogestureSelectionRestart component should be rendered correctly 1`] =
>
ecogesture_selection.button_go_to_ecogesture
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -287,36 +285,34 @@ exports[`EcogestureSelectionRestart component should be rendered correctly 1`] =
>
ecogesture_selection.button_continue
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
diff --git a/src/components/FAQ/__snapshots__/FAQContent.spec.tsx.snap b/src/components/FAQ/__snapshots__/FAQContent.spec.tsx.snap
index dde06eb7b..d7dd81b6b 100644
--- a/src/components/FAQ/__snapshots__/FAQContent.spec.tsx.snap
+++ b/src/components/FAQ/__snapshots__/FAQContent.spec.tsx.snap
@@ -279,36 +279,34 @@ exports[`FAQContent should render the full FAQ 1`] = `
</Icon>
</StyledIcon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</div>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -326,9 +324,9 @@ exports[`FAQContent should render the full FAQ 1`] = `
<ForwardRef(Collapse)
classes={
Object {
- "container": "MuiCollapse-container",
"entered": "MuiCollapse-entered",
"hidden": "MuiCollapse-hidden",
+ "root": "MuiCollapse-root",
"wrapper": "MuiCollapse-wrapper",
"wrapperInner": "MuiCollapse-wrapperInner",
}
@@ -353,7 +351,7 @@ exports[`FAQContent should render the full FAQ 1`] = `
unmountOnExit={false}
>
<div
- className="MuiCollapse-container MuiCollapse-hidden"
+ className="MuiCollapse-root MuiCollapse-hidden"
style={
Object {
"minHeight": "0px",
@@ -667,36 +665,34 @@ exports[`FAQContent should render the full FAQ 1`] = `
</Icon>
</StyledIcon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</div>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -714,9 +710,9 @@ exports[`FAQContent should render the full FAQ 1`] = `
<ForwardRef(Collapse)
classes={
Object {
- "container": "MuiCollapse-container",
"entered": "MuiCollapse-entered",
"hidden": "MuiCollapse-hidden",
+ "root": "MuiCollapse-root",
"wrapper": "MuiCollapse-wrapper",
"wrapperInner": "MuiCollapse-wrapperInner",
}
@@ -741,7 +737,7 @@ exports[`FAQContent should render the full FAQ 1`] = `
unmountOnExit={false}
>
<div
- className="MuiCollapse-container MuiCollapse-hidden"
+ className="MuiCollapse-root MuiCollapse-hidden"
style={
Object {
"minHeight": "0px",
@@ -1065,36 +1061,34 @@ exports[`FAQContent should render the full FAQ 1`] = `
</Icon>
</StyledIcon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</div>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1112,9 +1106,9 @@ exports[`FAQContent should render the full FAQ 1`] = `
<ForwardRef(Collapse)
classes={
Object {
- "container": "MuiCollapse-container",
"entered": "MuiCollapse-entered",
"hidden": "MuiCollapse-hidden",
+ "root": "MuiCollapse-root",
"wrapper": "MuiCollapse-wrapper",
"wrapperInner": "MuiCollapse-wrapperInner",
}
@@ -1139,7 +1133,7 @@ exports[`FAQContent should render the full FAQ 1`] = `
unmountOnExit={false}
>
<div
- className="MuiCollapse-container MuiCollapse-hidden"
+ className="MuiCollapse-root MuiCollapse-hidden"
style={
Object {
"minHeight": "0px",
diff --git a/src/components/Feedback/FeedbackModal.tsx b/src/components/Feedback/FeedbackModal.tsx
index d387c86b8..9dabd1b14 100644
--- a/src/components/Feedback/FeedbackModal.tsx
+++ b/src/components/Feedback/FeedbackModal.tsx
@@ -201,9 +201,10 @@ const FeedbackModal: React.FC<FeedbackModalProps> = ({
return (
<Dialog
open={open}
- disableBackdropClick
+ onClose={(event, reason): void => {
+ event && reason !== 'backdropClick' && closeModal()
+ }}
disableEscapeKeyDown
- onClose={closeModal}
aria-labelledby={'accessibility-title'}
classes={{
root: 'modal-root',
diff --git a/src/components/Home/releaseNotesModal.tsx b/src/components/Home/releaseNotesModal.tsx
index 981bc4fd5..e46be103f 100644
--- a/src/components/Home/releaseNotesModal.tsx
+++ b/src/components/Home/releaseNotesModal.tsx
@@ -21,9 +21,10 @@ const ReleaseNotesModal: React.FC<ReleaseNotesModalProps> = ({
return (
<Dialog
open={open}
- disableBackdropClick
disableEscapeKeyDown
- onClose={handleCloseClick}
+ onClose={(event, reason): void => {
+ event && reason !== 'backdropClick' && handleCloseClick()
+ }}
aria-labelledby={'accessibility-title'}
classes={{
root: 'modal-root',
diff --git a/src/components/Konnector/KonnectorModal.tsx b/src/components/Konnector/KonnectorModal.tsx
index 457ebb041..d2c16a07e 100644
--- a/src/components/Konnector/KonnectorModal.tsx
+++ b/src/components/Konnector/KonnectorModal.tsx
@@ -75,9 +75,12 @@ const KonnectorModal: React.FC<KonnectorModalProps> = ({
return (
<Dialog
open={open}
- disableBackdropClick
disableEscapeKeyDown
- onClose={() => handleCloseClick(state === SUCCESS_EVENT)}
+ onClose={(event, reason): void => {
+ event &&
+ reason !== 'backdropClick' &&
+ handleCloseClick(state === SUCCESS_EVENT)
+ }}
aria-labelledby={'accessibility-title'}
classes={{
root: 'modal-root',
diff --git a/src/components/Onboarding/__snapshots__/WelcomeModal.spec.tsx.snap b/src/components/Onboarding/__snapshots__/WelcomeModal.spec.tsx.snap
index aa3ec9957..ed873b954 100644
--- a/src/components/Onboarding/__snapshots__/WelcomeModal.spec.tsx.snap
+++ b/src/components/Onboarding/__snapshots__/WelcomeModal.spec.tsx.snap
@@ -107,12 +107,17 @@ exports[`WelcomeModal component should be rendered correctly 1`] = `
"overrides": Object {},
"palette": Object {
"action": Object {
+ "activatedOpacity": 0.12,
"active": "rgba(0, 0, 0, 0.54)",
"disabled": "rgba(0, 0, 0, 0.26)",
"disabledBackground": "rgba(0, 0, 0, 0.12)",
- "hover": "rgba(0, 0, 0, 0.08)",
- "hoverOpacity": 0.08,
- "selected": "rgba(0, 0, 0, 0.14)",
+ "disabledOpacity": 0.38,
+ "focus": "rgba(0, 0, 0, 0.12)",
+ "focusOpacity": 0.12,
+ "hover": "rgba(0, 0, 0, 0.04)",
+ "hoverOpacity": 0.04,
+ "selected": "rgba(0, 0, 0, 0.08)",
+ "selectedOpacity": 0.08,
},
"augmentColor": [Function],
"background": Object {
@@ -372,7 +377,6 @@ exports[`WelcomeModal component should be rendered correctly 1`] = `
}
className="MuiDialog-root modal-root"
closeAfterTransition={true}
- disableBackdropClick={false}
disableEscapeKeyDown={false}
onClose={[Function]}
open={true}
@@ -586,7 +590,7 @@ exports[`WelcomeModal component should be rendered correctly 1`] = `
</ForwardRef(Fade)>
</ForwardRef(Backdrop)>
</WithStyles(ForwardRef(Backdrop))>
- <TrapFocus
+ <Unstable_TrapFocus
disableAutoFocus={false}
disableEnforceFocus={false}
disableRestoreFocus={false}
@@ -636,8 +640,8 @@ exports[`WelcomeModal component should be rendered correctly 1`] = `
>
<div
className="MuiDialog-container MuiDialog-scrollPaper"
- onClick={[Function]}
onMouseDown={[Function]}
+ onMouseUp={[Function]}
role="none presentation"
style={
Object {
@@ -795,36 +799,34 @@ exports[`WelcomeModal component should be rendered correctly 1`] = `
</Component>
</Icon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -974,36 +976,34 @@ exports[`WelcomeModal component should be rendered correctly 1`] = `
>
onboarding.welcomeModal.button_valid
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1021,7 +1021,7 @@ exports[`WelcomeModal component should be rendered correctly 1`] = `
data-test="sentinelEnd"
tabIndex={0}
/>
- </TrapFocus>
+ </Unstable_TrapFocus>
</div>
</Portal>
</ForwardRef(Portal)>
@@ -1139,12 +1139,17 @@ exports[`WelcomeModal component should not be rendered 1`] = `
"overrides": Object {},
"palette": Object {
"action": Object {
+ "activatedOpacity": 0.12,
"active": "rgba(0, 0, 0, 0.54)",
"disabled": "rgba(0, 0, 0, 0.26)",
"disabledBackground": "rgba(0, 0, 0, 0.12)",
- "hover": "rgba(0, 0, 0, 0.08)",
- "hoverOpacity": 0.08,
- "selected": "rgba(0, 0, 0, 0.14)",
+ "disabledOpacity": 0.38,
+ "focus": "rgba(0, 0, 0, 0.12)",
+ "focusOpacity": 0.12,
+ "hover": "rgba(0, 0, 0, 0.04)",
+ "hoverOpacity": 0.04,
+ "selected": "rgba(0, 0, 0, 0.08)",
+ "selectedOpacity": 0.08,
},
"augmentColor": [Function],
"background": Object {
@@ -1404,7 +1409,6 @@ exports[`WelcomeModal component should not be rendered 1`] = `
}
className="MuiDialog-root modal-root"
closeAfterTransition={true}
- disableBackdropClick={false}
disableEscapeKeyDown={false}
onClose={[Function]}
open={false}
diff --git a/src/components/Options/__snapshots__/UnSubscribe.spec.tsx.snap b/src/components/Options/__snapshots__/UnSubscribe.spec.tsx.snap
index 850bd8297..d06e84f78 100644
--- a/src/components/Options/__snapshots__/UnSubscribe.spec.tsx.snap
+++ b/src/components/Options/__snapshots__/UnSubscribe.spec.tsx.snap
@@ -172,36 +172,34 @@ exports[`UnSubscribe component should be rendered correctly 1`] = `
>
unsubscribe.button_text
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
diff --git a/src/components/PartnerConnectionStepsModal/__snapshots__/PartnerConnectionStepsModal.spec.tsx.snap b/src/components/PartnerConnectionStepsModal/__snapshots__/PartnerConnectionStepsModal.spec.tsx.snap
index 24aae2ac9..8349a835e 100644
--- a/src/components/PartnerConnectionStepsModal/__snapshots__/PartnerConnectionStepsModal.spec.tsx.snap
+++ b/src/components/PartnerConnectionStepsModal/__snapshots__/PartnerConnectionStepsModal.spec.tsx.snap
@@ -98,12 +98,17 @@ exports[`PartnerConnectionStepsModal component should be rendered correctly 1`]
"overrides": Object {},
"palette": Object {
"action": Object {
+ "activatedOpacity": 0.12,
"active": "rgba(0, 0, 0, 0.54)",
"disabled": "rgba(0, 0, 0, 0.26)",
"disabledBackground": "rgba(0, 0, 0, 0.12)",
- "hover": "rgba(0, 0, 0, 0.08)",
- "hoverOpacity": 0.08,
- "selected": "rgba(0, 0, 0, 0.14)",
+ "disabledOpacity": 0.38,
+ "focus": "rgba(0, 0, 0, 0.12)",
+ "focusOpacity": 0.12,
+ "hover": "rgba(0, 0, 0, 0.04)",
+ "hoverOpacity": 0.04,
+ "selected": "rgba(0, 0, 0, 0.08)",
+ "selectedOpacity": 0.08,
},
"augmentColor": [Function],
"background": Object {
@@ -363,7 +368,6 @@ exports[`PartnerConnectionStepsModal component should be rendered correctly 1`]
}
className="MuiDialog-root modal-root"
closeAfterTransition={true}
- disableBackdropClick={false}
disableEscapeKeyDown={false}
onClose={[MockFunction]}
open={true}
@@ -594,7 +598,7 @@ exports[`PartnerConnectionStepsModal component should be rendered correctly 1`]
</ForwardRef(Fade)>
</ForwardRef(Backdrop)>
</WithStyles(ForwardRef(Backdrop))>
- <TrapFocus
+ <Unstable_TrapFocus
disableAutoFocus={false}
disableEnforceFocus={false}
disableRestoreFocus={false}
@@ -644,8 +648,8 @@ exports[`PartnerConnectionStepsModal component should be rendered correctly 1`]
>
<div
className="MuiDialog-container MuiDialog-scrollPaper"
- onClick={[Function]}
onMouseDown={[Function]}
+ onMouseUp={[Function]}
role="none presentation"
style={
Object {
@@ -801,36 +805,34 @@ exports[`PartnerConnectionStepsModal component should be rendered correctly 1`]
</Component>
</Icon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1107,36 +1109,34 @@ exports[`PartnerConnectionStepsModal component should be rendered correctly 1`]
>
partner_connection_steps.button_next >
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1153,7 +1153,7 @@ exports[`PartnerConnectionStepsModal component should be rendered correctly 1`]
data-test="sentinelEnd"
tabIndex={0}
/>
- </TrapFocus>
+ </Unstable_TrapFocus>
</div>
</Portal>
</ForwardRef(Portal)>
diff --git a/src/components/PartnersIssue/PartnersIssueModal.tsx b/src/components/PartnersIssue/PartnersIssueModal.tsx
index 84a49f61d..e29c89b23 100644
--- a/src/components/PartnersIssue/PartnersIssueModal.tsx
+++ b/src/components/PartnersIssue/PartnersIssueModal.tsx
@@ -34,9 +34,10 @@ const PartnersIssueModal: React.FC<PartnersIssueModalProps> = ({
return (
<Dialog
open={open}
- disableBackdropClick
disableEscapeKeyDown
- onClose={handleCloseClick}
+ onClose={(event, reason): void => {
+ event && reason !== 'backdropClick' && handleCloseClick()
+ }}
aria-labelledby={'accessibility-title'}
classes={{
root: 'modal-root',
diff --git a/src/components/PartnersIssue/__snapshots__/PartnersIssueModal.spec.tsx.snap b/src/components/PartnersIssue/__snapshots__/PartnersIssueModal.spec.tsx.snap
index f3a773803..6c4bfa3e7 100644
--- a/src/components/PartnersIssue/__snapshots__/PartnersIssueModal.spec.tsx.snap
+++ b/src/components/PartnersIssue/__snapshots__/PartnersIssueModal.spec.tsx.snap
@@ -92,9 +92,8 @@ exports[`PartnersIssueModal component should render correctly 1`] = `
"root": "modal-root",
}
}
- disableBackdropClick={true}
disableEscapeKeyDown={true}
- onClose={[MockFunction]}
+ onClose={[Function]}
open={true}
>
<ForwardRef(Dialog)
@@ -118,9 +117,8 @@ exports[`PartnersIssueModal component should render correctly 1`] = `
"scrollPaper": "MuiDialog-scrollPaper",
}
}
- disableBackdropClick={true}
disableEscapeKeyDown={true}
- onClose={[MockFunction]}
+ onClose={[Function]}
open={true}
>
<ForwardRef(Modal)
@@ -179,12 +177,17 @@ exports[`PartnersIssueModal component should render correctly 1`] = `
"overrides": Object {},
"palette": Object {
"action": Object {
+ "activatedOpacity": 0.12,
"active": "rgba(0, 0, 0, 0.54)",
"disabled": "rgba(0, 0, 0, 0.26)",
"disabledBackground": "rgba(0, 0, 0, 0.12)",
- "hover": "rgba(0, 0, 0, 0.08)",
- "hoverOpacity": 0.08,
- "selected": "rgba(0, 0, 0, 0.14)",
+ "disabledOpacity": 0.38,
+ "focus": "rgba(0, 0, 0, 0.12)",
+ "focusOpacity": 0.12,
+ "hover": "rgba(0, 0, 0, 0.04)",
+ "hoverOpacity": 0.04,
+ "selected": "rgba(0, 0, 0, 0.08)",
+ "selectedOpacity": 0.08,
},
"augmentColor": [Function],
"background": Object {
@@ -444,9 +447,8 @@ exports[`PartnersIssueModal component should render correctly 1`] = `
}
className="MuiDialog-root modal-root"
closeAfterTransition={true}
- disableBackdropClick={true}
disableEscapeKeyDown={true}
- onClose={[MockFunction]}
+ onClose={[Function]}
open={true}
>
<ForwardRef(Portal)
@@ -651,7 +653,7 @@ exports[`PartnersIssueModal component should render correctly 1`] = `
</ForwardRef(Fade)>
</ForwardRef(Backdrop)>
</WithStyles(ForwardRef(Backdrop))>
- <TrapFocus
+ <Unstable_TrapFocus
disableAutoFocus={false}
disableEnforceFocus={false}
disableRestoreFocus={false}
@@ -701,8 +703,8 @@ exports[`PartnersIssueModal component should render correctly 1`] = `
>
<div
className="MuiDialog-container MuiDialog-scrollPaper"
- onClick={[Function]}
onMouseDown={[Function]}
+ onMouseUp={[Function]}
role="none presentation"
style={
Object {
@@ -858,36 +860,34 @@ exports[`PartnersIssueModal component should render correctly 1`] = `
</Component>
</Icon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1038,36 +1038,34 @@ exports[`PartnersIssueModal component should render correctly 1`] = `
>
consumption.partners_issue_modal.button_validate
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1084,7 +1082,7 @@ exports[`PartnersIssueModal component should render correctly 1`] = `
data-test="sentinelEnd"
tabIndex={0}
/>
- </TrapFocus>
+ </Unstable_TrapFocus>
</div>
</Portal>
</ForwardRef(Portal)>
diff --git a/src/components/Splash/__snapshots__/SplashScreenError.spec.tsx.snap b/src/components/Splash/__snapshots__/SplashScreenError.spec.tsx.snap
index f3bb2e47e..82c98c1a2 100644
--- a/src/components/Splash/__snapshots__/SplashScreenError.spec.tsx.snap
+++ b/src/components/Splash/__snapshots__/SplashScreenError.spec.tsx.snap
@@ -4948,36 +4948,34 @@ exports[`SplashScreenError component should be rendered correctly 1`] = `
>
splashscreen.button_reload
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
diff --git a/src/components/Terms/__snapshots__/CGUModal.spec.tsx.snap b/src/components/Terms/__snapshots__/CGUModal.spec.tsx.snap
index 2658db800..984a939bc 100644
--- a/src/components/Terms/__snapshots__/CGUModal.spec.tsx.snap
+++ b/src/components/Terms/__snapshots__/CGUModal.spec.tsx.snap
@@ -96,12 +96,17 @@ exports[`CGUModal component should be rendered correctly 1`] = `
"overrides": Object {},
"palette": Object {
"action": Object {
+ "activatedOpacity": 0.12,
"active": "rgba(0, 0, 0, 0.54)",
"disabled": "rgba(0, 0, 0, 0.26)",
"disabledBackground": "rgba(0, 0, 0, 0.12)",
- "hover": "rgba(0, 0, 0, 0.08)",
- "hoverOpacity": 0.08,
- "selected": "rgba(0, 0, 0, 0.14)",
+ "disabledOpacity": 0.38,
+ "focus": "rgba(0, 0, 0, 0.12)",
+ "focusOpacity": 0.12,
+ "hover": "rgba(0, 0, 0, 0.04)",
+ "hoverOpacity": 0.04,
+ "selected": "rgba(0, 0, 0, 0.08)",
+ "selectedOpacity": 0.08,
},
"augmentColor": [Function],
"background": Object {
@@ -361,7 +366,6 @@ exports[`CGUModal component should be rendered correctly 1`] = `
}
className="MuiDialog-root modal-root"
closeAfterTransition={true}
- disableBackdropClick={false}
disableEscapeKeyDown={false}
onClose={[MockFunction]}
open={true}
@@ -816,7 +820,7 @@ exports[`CGUModal component should be rendered correctly 1`] = `
</ForwardRef(Fade)>
</ForwardRef(Backdrop)>
</WithStyles(ForwardRef(Backdrop))>
- <TrapFocus
+ <Unstable_TrapFocus
disableAutoFocus={false}
disableEnforceFocus={false}
disableRestoreFocus={false}
@@ -866,8 +870,8 @@ exports[`CGUModal component should be rendered correctly 1`] = `
>
<div
className="MuiDialog-container MuiDialog-scrollPaper"
- onClick={[Function]}
onMouseDown={[Function]}
+ onMouseUp={[Function]}
role="none presentation"
style={
Object {
@@ -1023,36 +1027,34 @@ exports[`CGUModal component should be rendered correctly 1`] = `
</Component>
</Icon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1437,36 +1439,34 @@ exports[`CGUModal component should be rendered correctly 1`] = `
>
legal.accessibility.button_close
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1482,7 +1482,7 @@ exports[`CGUModal component should be rendered correctly 1`] = `
data-test="sentinelEnd"
tabIndex={0}
/>
- </TrapFocus>
+ </Unstable_TrapFocus>
</div>
</Portal>
</ForwardRef(Portal)>
diff --git a/src/components/Terms/__snapshots__/LegalNoticeModal.spec.tsx.snap b/src/components/Terms/__snapshots__/LegalNoticeModal.spec.tsx.snap
index 71a3d1250..90d1f60bd 100644
--- a/src/components/Terms/__snapshots__/LegalNoticeModal.spec.tsx.snap
+++ b/src/components/Terms/__snapshots__/LegalNoticeModal.spec.tsx.snap
@@ -96,12 +96,17 @@ exports[`LegalNoticeModal component should be rendered correctly 1`] = `
"overrides": Object {},
"palette": Object {
"action": Object {
+ "activatedOpacity": 0.12,
"active": "rgba(0, 0, 0, 0.54)",
"disabled": "rgba(0, 0, 0, 0.26)",
"disabledBackground": "rgba(0, 0, 0, 0.12)",
- "hover": "rgba(0, 0, 0, 0.08)",
- "hoverOpacity": 0.08,
- "selected": "rgba(0, 0, 0, 0.14)",
+ "disabledOpacity": 0.38,
+ "focus": "rgba(0, 0, 0, 0.12)",
+ "focusOpacity": 0.12,
+ "hover": "rgba(0, 0, 0, 0.04)",
+ "hoverOpacity": 0.04,
+ "selected": "rgba(0, 0, 0, 0.08)",
+ "selectedOpacity": 0.08,
},
"augmentColor": [Function],
"background": Object {
@@ -361,7 +366,6 @@ exports[`LegalNoticeModal component should be rendered correctly 1`] = `
}
className="MuiDialog-root modal-root"
closeAfterTransition={true}
- disableBackdropClick={false}
disableEscapeKeyDown={false}
onClose={[MockFunction]}
open={true}
@@ -796,7 +800,7 @@ exports[`LegalNoticeModal component should be rendered correctly 1`] = `
</ForwardRef(Fade)>
</ForwardRef(Backdrop)>
</WithStyles(ForwardRef(Backdrop))>
- <TrapFocus
+ <Unstable_TrapFocus
disableAutoFocus={false}
disableEnforceFocus={false}
disableRestoreFocus={false}
@@ -846,8 +850,8 @@ exports[`LegalNoticeModal component should be rendered correctly 1`] = `
>
<div
className="MuiDialog-container MuiDialog-scrollPaper"
- onClick={[Function]}
onMouseDown={[Function]}
+ onMouseUp={[Function]}
role="none presentation"
style={
Object {
@@ -1003,36 +1007,34 @@ exports[`LegalNoticeModal component should be rendered correctly 1`] = `
</Component>
</Icon>
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
center={true}
- >
- <ForwardRef(TouchRipple)
- center={true}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1397,36 +1399,34 @@ exports[`LegalNoticeModal component should be rendered correctly 1`] = `
>
legal.accessibility.button_close
</span>
- <NoSsr>
- <WithStyles(memo)
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
center={false}
- >
- <ForwardRef(TouchRipple)
- center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
}
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
>
- <span
- className="MuiTouchRipple-root"
- >
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
</button>
</ForwardRef(ButtonBase)>
</WithStyles(ForwardRef(ButtonBase))>
@@ -1442,7 +1442,7 @@ exports[`LegalNoticeModal component should be rendered correctly 1`] = `
data-test="sentinelEnd"
tabIndex={0}
/>
- </TrapFocus>
+ </Unstable_TrapFocus>
</div>
</Portal>
</ForwardRef(Portal)>
diff --git a/src/components/Terms/__snapshots__/TermsView.spec.tsx.snap b/src/components/Terms/__snapshots__/TermsView.spec.tsx.snap
index 4a2393ce3..ac40276bd 100644
--- a/src/components/Terms/__snapshots__/TermsView.spec.tsx.snap
+++ b/src/components/Terms/__snapshots__/TermsView.spec.tsx.snap
@@ -341,12 +341,17 @@ exports[`TermsView component should be rendered correctly 1`] = `
"overrides": Object {},
"palette": Object {
"action": Object {
+ "activatedOpacity": 0.12,
"active": "rgba(0, 0, 0, 0.54)",
"disabled": "rgba(0, 0, 0, 0.26)",
"disabledBackground": "rgba(0, 0, 0, 0.12)",
- "hover": "rgba(0, 0, 0, 0.08)",
- "hoverOpacity": 0.08,
- "selected": "rgba(0, 0, 0, 0.14)",
+ "disabledOpacity": 0.38,
+ "focus": "rgba(0, 0, 0, 0.12)",
+ "focusOpacity": 0.12,
+ "hover": "rgba(0, 0, 0, 0.04)",
+ "hoverOpacity": 0.04,
+ "selected": "rgba(0, 0, 0, 0.08)",
+ "selectedOpacity": 0.08,
},
"augmentColor": [Function],
"background": Object {
@@ -606,7 +611,6 @@ exports[`TermsView component should be rendered correctly 1`] = `
}
className="MuiDialog-root modal-root"
closeAfterTransition={true}
- disableBackdropClick={false}
disableEscapeKeyDown={false}
onClose={[Function]}
open={false}
@@ -709,12 +713,17 @@ exports[`TermsView component should be rendered correctly 1`] = `
"overrides": Object {},
"palette": Object {
"action": Object {
+ "activatedOpacity": 0.12,
"active": "rgba(0, 0, 0, 0.54)",
"disabled": "rgba(0, 0, 0, 0.26)",
"disabledBackground": "rgba(0, 0, 0, 0.12)",
- "hover": "rgba(0, 0, 0, 0.08)",
- "hoverOpacity": 0.08,
- "selected": "rgba(0, 0, 0, 0.14)",
+ "disabledOpacity": 0.38,
+ "focus": "rgba(0, 0, 0, 0.12)",
+ "focusOpacity": 0.12,
+ "hover": "rgba(0, 0, 0, 0.04)",
+ "hoverOpacity": 0.04,
+ "selected": "rgba(0, 0, 0, 0.08)",
+ "selectedOpacity": 0.08,
},
"augmentColor": [Function],
"background": Object {
@@ -974,7 +983,6 @@ exports[`TermsView component should be rendered correctly 1`] = `
}
className="MuiDialog-root modal-root"
closeAfterTransition={true}
- disableBackdropClick={false}
disableEscapeKeyDown={false}
onClose={[Function]}
open={false}
--
GitLab