diff --git a/package.json b/package.json index 8d5f6d1a151dc6e9549c12a2ded4d1d66ddbdf66..61f4c45343f599aca36f9d3483b6c2096b22da83 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "@babel/plugin-transform-modules-commonjs": "^7.7.5", "@babel/plugin-transform-runtime": "^7.8.3", "@cozy/minilog": "^1.0.0", - "@material-ui/core": "~4.8.3", + "@material-ui/core": "~4.12.0", "@material-ui/styles": "^4.11.3", "@simbathesailor/use-what-changed": "^2.0.0", "axios": "^0.27.0", @@ -111,7 +111,7 @@ "cozy-logger": ">1.7.0", "cozy-realtime": "4.2.1", "cozy-scripts": "5.13.0", - "cozy-ui": "60.6.0", + "cozy-ui": "68.8.0", "d3": "^5.15.0", "detect-browser": "^5.1.1", "eslint-config-cozy-app": "1.6.0", diff --git a/src/components/Analysis/AnalysisErrorModal.tsx b/src/components/Analysis/AnalysisErrorModal.tsx index 61c5a1a6e96f842ae6288d3ffab64ed1e1ae99b7..b83f392cc47e95dddae6ad5b8769952397c32d69 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 3e66e5b70ea8e852ea46c8d5b18f7bdf2b35e28b..0fcd2e408c9f17da7418cb6c621a850d3d412e2c 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 de76327d5dce258bb938a4feb475ed28aae917d7..d77706c0830547b97016cdb499cc9751fc49dbf1 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 614a3ccf5a85666c4c275f9bd406211a4ef8ccd6..b9d5ff8cc8b6c48189cb9a1f2f6cbb305bc9cbed 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 7ab0df69c4e941122c4543485d603fe762e03181..924173886a3f52fcf8ccf580a5407f05b7494f8d 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 3d17797f4a917add013390c953b6c91c01ebb75e..2aeb640677d106bb91968134175d82dc6be9b02b 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 bf887521e977eb7e5d8226e3ad4713e0388ba034..c64f4b6b02e307fe810c4422e6e978a7efce4eae 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 9836a6dbdffcac33733a3a4802584bb3bcc2ea8e..a4e7f3907e8a2eb069fa1ead7e820147dc35f397 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 1e18710ba52c158356a14fcf9c967ff362f63084..1ee47a975ce6cb8a834d5af119c0ba4d7379f568 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 5101707fde8e729be87ba46df5f4ed6d8eb7abf9..2048000ad326de83daed64f01f35e5f163905be2 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 db551a11f78ecb9ab71eb9e9a261063f0a689022..328305ab2f0a815cf71602e0cc0079e6e057a5c9 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 84d7f084314a1ebadc63c942ff82061649576dea..ab830dd0628564a7762dc2ba9277159e7ddf21a1 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 2b952c562e3f62fd514c329cf197985559249d2c..d8031cfefc297d58b2611c7629fb2223d84568c1 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 49f0e57d37977177e6f46d84c0f160ae16bbab66..9539b429090cbf3829daebb4201acf11754c729b 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 32c9365cd3446fe235df5db765ea157aaba4e915..ad6c92b1efe5377c455bb714d02db5bfcb985c76 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 52ff638316feb318e17e07f0229cb3a3c06cb696..163c4e352ae586114f1d2f8aec0842b572e4ecdf 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 8d8812b8b13da3ff901bfff8ed673c388ac52ad4..e4159159d59f8551d5711d9a52186e5022644fa8 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 df73463356a5f652304dfc46ed47b4b8a4108040..11bbbe72d35769a15252dc8cee1606a0a411877d 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 2eaf1e7ab2f2ffca19057a87b6a1c90cef18aa60..e019aee7c2e0f43f5ccaf3c56c66c85341b92c00 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 1b1ea7fd1956ac4587e955680a8176b9071a0480..82c3300b01227f80f3275354e41b5bb8886c52b0 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 233978637306bec8261505551c00c96c4fb22916..aeaea3ddbcfd3f8f52b21262f05266c9d5fc18a4 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 0dc2cff5a3fb8d1819f7d58b0d4b6f43d61a4d92..4d8563d6d8af7c5aba8d3260662d5ba318404c94 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/FAQContent.tsx b/src/components/FAQ/FAQContent.tsx index 996c0ac54c5dd46e83a7641bd8bf5b56dba1b7d2..2574e4d7dd61161629e2bd1ec0adf64e2326707e 100644 --- a/src/components/FAQ/FAQContent.tsx +++ b/src/components/FAQ/FAQContent.tsx @@ -3,9 +3,11 @@ import './faqContent.scss' import { useClient } from 'cozy-client' import { useI18n } from 'cozy-ui/transpiled/react/I18n' import FaqData from 'components/FAQ/FAQData' -import ExpansionPanel from '@material-ui/core/ExpansionPanel' -import ExpansionPanelSummary from '@material-ui/core/ExpansionPanelSummary' -import ExpansionPanelDetails from '@material-ui/core/ExpansionPanelDetails' +import { + Accordion, + AccordionSummary, + AccordionDetails, +} from '@material-ui/core' import ChevronOffIcon from 'assets/icons/ico/chevron-off.svg' import StyledIcon from 'components/CommonKit/Icon/StyledIcon' import { FAQSection } from 'models' @@ -57,7 +59,7 @@ const FAQContent: React.FC = () => { <div className="text-16-normal-uppercase">{faq.section}</div> {faq.questions.map((question, index2) => { return ( - <ExpansionPanel + <Accordion key={index2} expanded={expanded === `panel${index}_${index2}`} onChange={handleChange(`panel${index}_${index2}`)} @@ -65,7 +67,7 @@ const FAQContent: React.FC = () => { root: 'expansion-panel-root', }} > - <ExpansionPanelSummary + <AccordionSummary aria-label={t('faq.accessibility.button_toggle_detail')} expandIcon={<StyledIcon icon={ChevronOffIcon} />} classes={{ @@ -74,15 +76,15 @@ const FAQContent: React.FC = () => { }} > {question.summary} - </ExpansionPanelSummary> - <ExpansionPanelDetails + </AccordionSummary> + <AccordionDetails classes={{ root: 'expansion-panel-details', }} > {question.details} - </ExpansionPanelDetails> - </ExpansionPanel> + </AccordionDetails> + </Accordion> ) })} </div> diff --git a/src/components/FAQ/__snapshots__/FAQContent.spec.tsx.snap b/src/components/FAQ/__snapshots__/FAQContent.spec.tsx.snap index dde06eb7baaa31fbfde109a57e24cb40bec7ede7..2a395d05dd96bb4ad578c010d150c736f31edc47 100644 --- a/src/components/FAQ/__snapshots__/FAQContent.spec.tsx.snap +++ b/src/components/FAQ/__snapshots__/FAQContent.spec.tsx.snap @@ -17,7 +17,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` > Mes données </div> - <WithStyles(ForwardRef(ExpansionPanel)) + <WithStyles(ForwardRef(Accordion)) classes={ Object { "root": "expansion-panel-root", @@ -27,24 +27,24 @@ exports[`FAQContent should render the full FAQ 1`] = ` key="0" onChange={[Function]} > - <ForwardRef(ExpansionPanel) + <ForwardRef(Accordion) classes={ Object { "disabled": "Mui-disabled", "expanded": "Mui-expanded", - "root": "MuiExpansionPanel-root expansion-panel-root", - "rounded": "MuiExpansionPanel-rounded", + "root": "MuiAccordion-root expansion-panel-root", + "rounded": "MuiAccordion-rounded", } } expanded={false} onChange={[Function]} > <WithStyles(ForwardRef(Paper)) - className="MuiExpansionPanel-root expansion-panel-root MuiExpansionPanel-rounded" + className="MuiAccordion-root expansion-panel-root MuiAccordion-rounded" square={false} > <ForwardRef(Paper) - className="MuiExpansionPanel-root expansion-panel-root MuiExpansionPanel-rounded" + className="MuiAccordion-root expansion-panel-root MuiAccordion-rounded" classes={ Object { "elevation0": "MuiPaper-elevation0", @@ -80,9 +80,9 @@ exports[`FAQContent should render the full FAQ 1`] = ` square={false} > <div - className="MuiPaper-root MuiExpansionPanel-root expansion-panel-root MuiExpansionPanel-rounded MuiPaper-elevation1 MuiPaper-rounded" + className="MuiPaper-root MuiAccordion-root expansion-panel-root MuiAccordion-rounded MuiPaper-elevation1 MuiPaper-rounded" > - <WithStyles(ForwardRef(ExpansionPanelSummary)) + <WithStyles(ForwardRef(AccordionSummary)) aria-label="faq.accessibility.button_toggle_detail" classes={ Object { @@ -97,16 +97,17 @@ exports[`FAQContent should render the full FAQ 1`] = ` } key=".0" > - <ForwardRef(ExpansionPanelSummary) + <ForwardRef(AccordionSummary) aria-label="faq.accessibility.button_toggle_detail" classes={ Object { - "content": "MuiExpansionPanelSummary-content expansion-panel-content", + "content": "MuiAccordionSummary-content expansion-panel-content", "disabled": "Mui-disabled", - "expandIcon": "MuiExpansionPanelSummary-expandIcon", + "expandIcon": "MuiAccordionSummary-expandIcon", "expanded": "Mui-expanded", + "focusVisible": "Mui-focusVisible", "focused": "Mui-focused", - "root": "MuiExpansionPanelSummary-root expansion-panel-summary small bold-text", + "root": "MuiAccordionSummary-root expansion-panel-summary small bold-text", } } expandIcon={ @@ -118,19 +119,18 @@ exports[`FAQContent should render the full FAQ 1`] = ` <WithStyles(ForwardRef(ButtonBase)) aria-expanded={false} aria-label="faq.accessibility.button_toggle_detail" - className="MuiExpansionPanelSummary-root expansion-panel-summary small bold-text" + className="MuiAccordionSummary-root expansion-panel-summary small bold-text" component="div" disableRipple={true} disabled={false} focusRipple={false} - onBlur={[Function]} + focusVisibleClassName="Mui-focusVisible Mui-focused" onClick={[Function]} - onFocusVisible={[Function]} > <ForwardRef(ButtonBase) aria-expanded={false} aria-label="faq.accessibility.button_toggle_detail" - className="MuiExpansionPanelSummary-root expansion-panel-summary small bold-text" + className="MuiAccordionSummary-root expansion-panel-summary small bold-text" classes={ Object { "disabled": "Mui-disabled", @@ -142,15 +142,14 @@ exports[`FAQContent should render the full FAQ 1`] = ` disableRipple={true} disabled={false} focusRipple={false} - onBlur={[Function]} + focusVisibleClassName="Mui-focusVisible Mui-focused" onClick={[Function]} - onFocusVisible={[Function]} > <div aria-disabled={false} aria-expanded={false} aria-label="faq.accessibility.button_toggle_detail" - className="MuiButtonBase-root MuiExpansionPanelSummary-root expansion-panel-summary small bold-text" + className="MuiButtonBase-root MuiAccordionSummary-root expansion-panel-summary small bold-text" onBlur={[Function]} onClick={[Function]} onDragLeave={[Function]} @@ -167,13 +166,13 @@ exports[`FAQContent should render the full FAQ 1`] = ` tabIndex={0} > <div - className="MuiExpansionPanelSummary-content expansion-panel-content" + className="MuiAccordionSummary-content expansion-panel-content" > Comment accéder à mes données électricité ? </div> <WithStyles(ForwardRef(IconButton)) aria-hidden={true} - className="MuiExpansionPanelSummary-expandIcon" + className="MuiAccordionSummary-expandIcon" component="div" edge="end" role={null} @@ -181,7 +180,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` > <ForwardRef(IconButton) aria-hidden={true} - className="MuiExpansionPanelSummary-expandIcon" + className="MuiAccordionSummary-expandIcon" classes={ Object { "colorInherit": "MuiIconButton-colorInherit", @@ -203,7 +202,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` <WithStyles(ForwardRef(ButtonBase)) aria-hidden={true} centerRipple={true} - className="MuiIconButton-root MuiExpansionPanelSummary-expandIcon MuiIconButton-edgeEnd" + className="MuiIconButton-root MuiAccordionSummary-expandIcon MuiIconButton-edgeEnd" component="div" disabled={false} focusRipple={true} @@ -213,7 +212,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` <ForwardRef(ButtonBase) aria-hidden={true} centerRipple={true} - className="MuiIconButton-root MuiExpansionPanelSummary-expandIcon MuiIconButton-edgeEnd" + className="MuiIconButton-root MuiAccordionSummary-expandIcon MuiIconButton-edgeEnd" classes={ Object { "disabled": "Mui-disabled", @@ -230,7 +229,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` <div aria-disabled={false} aria-hidden={true} - className="MuiButtonBase-root MuiIconButton-root MuiExpansionPanelSummary-expandIcon MuiIconButton-edgeEnd" + className="MuiButtonBase-root MuiIconButton-root MuiAccordionSummary-expandIcon MuiIconButton-edgeEnd" onBlur={[Function]} onDragLeave={[Function]} onFocus={[Function]} @@ -279,36 +278,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))> @@ -317,8 +314,8 @@ exports[`FAQContent should render the full FAQ 1`] = ` </div> </ForwardRef(ButtonBase)> </WithStyles(ForwardRef(ButtonBase))> - </ForwardRef(ExpansionPanelSummary)> - </WithStyles(ForwardRef(ExpansionPanelSummary))> + </ForwardRef(AccordionSummary)> + </WithStyles(ForwardRef(AccordionSummary))> <WithStyles(ForwardRef(Collapse)) in={false} timeout="auto" @@ -326,9 +323,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 +350,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", @@ -369,7 +366,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` <div role="region" > - <WithStyles(ForwardRef(ExpansionPanelDetails)) + <WithStyles(ForwardRef(AccordionDetails)) classes={ Object { "root": "expansion-panel-details", @@ -377,22 +374,22 @@ exports[`FAQContent should render the full FAQ 1`] = ` } key=".1" > - <ForwardRef(ExpansionPanelDetails) + <ForwardRef(AccordionDetails) classes={ Object { - "root": "MuiExpansionPanelDetails-root expansion-panel-details", + "root": "MuiAccordionDetails-root expansion-panel-details", } } > <div - className="MuiExpansionPanelDetails-root expansion-panel-details" + className="MuiAccordionDetails-root expansion-panel-details" > <div> Rendez-vous dans la partie Options du service et cliquer sur le bouton "Se connecter à l\\'électricité". Suivez la procédure (en vous créant un compte Enedis si nécessaire). Une fois votre consentement donné, vos données de consommation seront récupérées. </div> </div> - </ForwardRef(ExpansionPanelDetails)> - </WithStyles(ForwardRef(ExpansionPanelDetails))> + </ForwardRef(AccordionDetails)> + </WithStyles(ForwardRef(AccordionDetails))> </div> </div> </div> @@ -403,9 +400,9 @@ exports[`FAQContent should render the full FAQ 1`] = ` </div> </ForwardRef(Paper)> </WithStyles(ForwardRef(Paper))> - </ForwardRef(ExpansionPanel)> - </WithStyles(ForwardRef(ExpansionPanel))> - <WithStyles(ForwardRef(ExpansionPanel)) + </ForwardRef(Accordion)> + </WithStyles(ForwardRef(Accordion))> + <WithStyles(ForwardRef(Accordion)) classes={ Object { "root": "expansion-panel-root", @@ -415,24 +412,24 @@ exports[`FAQContent should render the full FAQ 1`] = ` key="1" onChange={[Function]} > - <ForwardRef(ExpansionPanel) + <ForwardRef(Accordion) classes={ Object { "disabled": "Mui-disabled", "expanded": "Mui-expanded", - "root": "MuiExpansionPanel-root expansion-panel-root", - "rounded": "MuiExpansionPanel-rounded", + "root": "MuiAccordion-root expansion-panel-root", + "rounded": "MuiAccordion-rounded", } } expanded={false} onChange={[Function]} > <WithStyles(ForwardRef(Paper)) - className="MuiExpansionPanel-root expansion-panel-root MuiExpansionPanel-rounded" + className="MuiAccordion-root expansion-panel-root MuiAccordion-rounded" square={false} > <ForwardRef(Paper) - className="MuiExpansionPanel-root expansion-panel-root MuiExpansionPanel-rounded" + className="MuiAccordion-root expansion-panel-root MuiAccordion-rounded" classes={ Object { "elevation0": "MuiPaper-elevation0", @@ -468,9 +465,9 @@ exports[`FAQContent should render the full FAQ 1`] = ` square={false} > <div - className="MuiPaper-root MuiExpansionPanel-root expansion-panel-root MuiExpansionPanel-rounded MuiPaper-elevation1 MuiPaper-rounded" + className="MuiPaper-root MuiAccordion-root expansion-panel-root MuiAccordion-rounded MuiPaper-elevation1 MuiPaper-rounded" > - <WithStyles(ForwardRef(ExpansionPanelSummary)) + <WithStyles(ForwardRef(AccordionSummary)) aria-label="faq.accessibility.button_toggle_detail" classes={ Object { @@ -485,16 +482,17 @@ exports[`FAQContent should render the full FAQ 1`] = ` } key=".0" > - <ForwardRef(ExpansionPanelSummary) + <ForwardRef(AccordionSummary) aria-label="faq.accessibility.button_toggle_detail" classes={ Object { - "content": "MuiExpansionPanelSummary-content expansion-panel-content", + "content": "MuiAccordionSummary-content expansion-panel-content", "disabled": "Mui-disabled", - "expandIcon": "MuiExpansionPanelSummary-expandIcon", + "expandIcon": "MuiAccordionSummary-expandIcon", "expanded": "Mui-expanded", + "focusVisible": "Mui-focusVisible", "focused": "Mui-focused", - "root": "MuiExpansionPanelSummary-root expansion-panel-summary small bold-text", + "root": "MuiAccordionSummary-root expansion-panel-summary small bold-text", } } expandIcon={ @@ -506,19 +504,18 @@ exports[`FAQContent should render the full FAQ 1`] = ` <WithStyles(ForwardRef(ButtonBase)) aria-expanded={false} aria-label="faq.accessibility.button_toggle_detail" - className="MuiExpansionPanelSummary-root expansion-panel-summary small bold-text" + className="MuiAccordionSummary-root expansion-panel-summary small bold-text" component="div" disableRipple={true} disabled={false} focusRipple={false} - onBlur={[Function]} + focusVisibleClassName="Mui-focusVisible Mui-focused" onClick={[Function]} - onFocusVisible={[Function]} > <ForwardRef(ButtonBase) aria-expanded={false} aria-label="faq.accessibility.button_toggle_detail" - className="MuiExpansionPanelSummary-root expansion-panel-summary small bold-text" + className="MuiAccordionSummary-root expansion-panel-summary small bold-text" classes={ Object { "disabled": "Mui-disabled", @@ -530,15 +527,14 @@ exports[`FAQContent should render the full FAQ 1`] = ` disableRipple={true} disabled={false} focusRipple={false} - onBlur={[Function]} + focusVisibleClassName="Mui-focusVisible Mui-focused" onClick={[Function]} - onFocusVisible={[Function]} > <div aria-disabled={false} aria-expanded={false} aria-label="faq.accessibility.button_toggle_detail" - className="MuiButtonBase-root MuiExpansionPanelSummary-root expansion-panel-summary small bold-text" + className="MuiButtonBase-root MuiAccordionSummary-root expansion-panel-summary small bold-text" onBlur={[Function]} onClick={[Function]} onDragLeave={[Function]} @@ -555,13 +551,13 @@ exports[`FAQContent should render the full FAQ 1`] = ` tabIndex={0} > <div - className="MuiExpansionPanelSummary-content expansion-panel-content" + className="MuiAccordionSummary-content expansion-panel-content" > Comment accéder à mes données gaz ? </div> <WithStyles(ForwardRef(IconButton)) aria-hidden={true} - className="MuiExpansionPanelSummary-expandIcon" + className="MuiAccordionSummary-expandIcon" component="div" edge="end" role={null} @@ -569,7 +565,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` > <ForwardRef(IconButton) aria-hidden={true} - className="MuiExpansionPanelSummary-expandIcon" + className="MuiAccordionSummary-expandIcon" classes={ Object { "colorInherit": "MuiIconButton-colorInherit", @@ -591,7 +587,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` <WithStyles(ForwardRef(ButtonBase)) aria-hidden={true} centerRipple={true} - className="MuiIconButton-root MuiExpansionPanelSummary-expandIcon MuiIconButton-edgeEnd" + className="MuiIconButton-root MuiAccordionSummary-expandIcon MuiIconButton-edgeEnd" component="div" disabled={false} focusRipple={true} @@ -601,7 +597,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` <ForwardRef(ButtonBase) aria-hidden={true} centerRipple={true} - className="MuiIconButton-root MuiExpansionPanelSummary-expandIcon MuiIconButton-edgeEnd" + className="MuiIconButton-root MuiAccordionSummary-expandIcon MuiIconButton-edgeEnd" classes={ Object { "disabled": "Mui-disabled", @@ -618,7 +614,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` <div aria-disabled={false} aria-hidden={true} - className="MuiButtonBase-root MuiIconButton-root MuiExpansionPanelSummary-expandIcon MuiIconButton-edgeEnd" + className="MuiButtonBase-root MuiIconButton-root MuiAccordionSummary-expandIcon MuiIconButton-edgeEnd" onBlur={[Function]} onDragLeave={[Function]} onFocus={[Function]} @@ -667,36 +663,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))> @@ -705,8 +699,8 @@ exports[`FAQContent should render the full FAQ 1`] = ` </div> </ForwardRef(ButtonBase)> </WithStyles(ForwardRef(ButtonBase))> - </ForwardRef(ExpansionPanelSummary)> - </WithStyles(ForwardRef(ExpansionPanelSummary))> + </ForwardRef(AccordionSummary)> + </WithStyles(ForwardRef(AccordionSummary))> <WithStyles(ForwardRef(Collapse)) in={false} timeout="auto" @@ -714,9 +708,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 +735,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", @@ -757,7 +751,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` <div role="region" > - <WithStyles(ForwardRef(ExpansionPanelDetails)) + <WithStyles(ForwardRef(AccordionDetails)) classes={ Object { "root": "expansion-panel-details", @@ -765,22 +759,22 @@ exports[`FAQContent should render the full FAQ 1`] = ` } key=".1" > - <ForwardRef(ExpansionPanelDetails) + <ForwardRef(AccordionDetails) classes={ Object { - "root": "MuiExpansionPanelDetails-root expansion-panel-details", + "root": "MuiAccordionDetails-root expansion-panel-details", } } > <div - className="MuiExpansionPanelDetails-root expansion-panel-details" + className="MuiAccordionDetails-root expansion-panel-details" > <div> Rendez-vous dans la partie Options du service et cliquez sur le bouton "Se connecter au gaz". Suivez la procédure (en vous créant un compte GRDF si nécessaire). Une fois votre consentement donné, vos données de consommation seront récupérées.', </div> </div> - </ForwardRef(ExpansionPanelDetails)> - </WithStyles(ForwardRef(ExpansionPanelDetails))> + </ForwardRef(AccordionDetails)> + </WithStyles(ForwardRef(AccordionDetails))> </div> </div> </div> @@ -791,8 +785,8 @@ exports[`FAQContent should render the full FAQ 1`] = ` </div> </ForwardRef(Paper)> </WithStyles(ForwardRef(Paper))> - </ForwardRef(ExpansionPanel)> - </WithStyles(ForwardRef(ExpansionPanel))> + </ForwardRef(Accordion)> + </WithStyles(ForwardRef(Accordion))> </div> <div className="faq-section" @@ -803,7 +797,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` > Contenu du service </div> - <WithStyles(ForwardRef(ExpansionPanel)) + <WithStyles(ForwardRef(Accordion)) classes={ Object { "root": "expansion-panel-root", @@ -813,24 +807,24 @@ exports[`FAQContent should render the full FAQ 1`] = ` key="0" onChange={[Function]} > - <ForwardRef(ExpansionPanel) + <ForwardRef(Accordion) classes={ Object { "disabled": "Mui-disabled", "expanded": "Mui-expanded", - "root": "MuiExpansionPanel-root expansion-panel-root", - "rounded": "MuiExpansionPanel-rounded", + "root": "MuiAccordion-root expansion-panel-root", + "rounded": "MuiAccordion-rounded", } } expanded={false} onChange={[Function]} > <WithStyles(ForwardRef(Paper)) - className="MuiExpansionPanel-root expansion-panel-root MuiExpansionPanel-rounded" + className="MuiAccordion-root expansion-panel-root MuiAccordion-rounded" square={false} > <ForwardRef(Paper) - className="MuiExpansionPanel-root expansion-panel-root MuiExpansionPanel-rounded" + className="MuiAccordion-root expansion-panel-root MuiAccordion-rounded" classes={ Object { "elevation0": "MuiPaper-elevation0", @@ -866,9 +860,9 @@ exports[`FAQContent should render the full FAQ 1`] = ` square={false} > <div - className="MuiPaper-root MuiExpansionPanel-root expansion-panel-root MuiExpansionPanel-rounded MuiPaper-elevation1 MuiPaper-rounded" + className="MuiPaper-root MuiAccordion-root expansion-panel-root MuiAccordion-rounded MuiPaper-elevation1 MuiPaper-rounded" > - <WithStyles(ForwardRef(ExpansionPanelSummary)) + <WithStyles(ForwardRef(AccordionSummary)) aria-label="faq.accessibility.button_toggle_detail" classes={ Object { @@ -883,16 +877,17 @@ exports[`FAQContent should render the full FAQ 1`] = ` } key=".0" > - <ForwardRef(ExpansionPanelSummary) + <ForwardRef(AccordionSummary) aria-label="faq.accessibility.button_toggle_detail" classes={ Object { - "content": "MuiExpansionPanelSummary-content expansion-panel-content", + "content": "MuiAccordionSummary-content expansion-panel-content", "disabled": "Mui-disabled", - "expandIcon": "MuiExpansionPanelSummary-expandIcon", + "expandIcon": "MuiAccordionSummary-expandIcon", "expanded": "Mui-expanded", + "focusVisible": "Mui-focusVisible", "focused": "Mui-focused", - "root": "MuiExpansionPanelSummary-root expansion-panel-summary small bold-text", + "root": "MuiAccordionSummary-root expansion-panel-summary small bold-text", } } expandIcon={ @@ -904,19 +899,18 @@ exports[`FAQContent should render the full FAQ 1`] = ` <WithStyles(ForwardRef(ButtonBase)) aria-expanded={false} aria-label="faq.accessibility.button_toggle_detail" - className="MuiExpansionPanelSummary-root expansion-panel-summary small bold-text" + className="MuiAccordionSummary-root expansion-panel-summary small bold-text" component="div" disableRipple={true} disabled={false} focusRipple={false} - onBlur={[Function]} + focusVisibleClassName="Mui-focusVisible Mui-focused" onClick={[Function]} - onFocusVisible={[Function]} > <ForwardRef(ButtonBase) aria-expanded={false} aria-label="faq.accessibility.button_toggle_detail" - className="MuiExpansionPanelSummary-root expansion-panel-summary small bold-text" + className="MuiAccordionSummary-root expansion-panel-summary small bold-text" classes={ Object { "disabled": "Mui-disabled", @@ -928,15 +922,14 @@ exports[`FAQContent should render the full FAQ 1`] = ` disableRipple={true} disabled={false} focusRipple={false} - onBlur={[Function]} + focusVisibleClassName="Mui-focusVisible Mui-focused" onClick={[Function]} - onFocusVisible={[Function]} > <div aria-disabled={false} aria-expanded={false} aria-label="faq.accessibility.button_toggle_detail" - className="MuiButtonBase-root MuiExpansionPanelSummary-root expansion-panel-summary small bold-text" + className="MuiButtonBase-root MuiAccordionSummary-root expansion-panel-summary small bold-text" onBlur={[Function]} onClick={[Function]} onDragLeave={[Function]} @@ -953,13 +946,13 @@ exports[`FAQContent should render the full FAQ 1`] = ` tabIndex={0} > <div - className="MuiExpansionPanelSummary-content expansion-panel-content" + className="MuiAccordionSummary-content expansion-panel-content" > Pourquoi les prix affichés sont-ils différents de ceux indiqués sur ma facture ? </div> <WithStyles(ForwardRef(IconButton)) aria-hidden={true} - className="MuiExpansionPanelSummary-expandIcon" + className="MuiAccordionSummary-expandIcon" component="div" edge="end" role={null} @@ -967,7 +960,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` > <ForwardRef(IconButton) aria-hidden={true} - className="MuiExpansionPanelSummary-expandIcon" + className="MuiAccordionSummary-expandIcon" classes={ Object { "colorInherit": "MuiIconButton-colorInherit", @@ -989,7 +982,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` <WithStyles(ForwardRef(ButtonBase)) aria-hidden={true} centerRipple={true} - className="MuiIconButton-root MuiExpansionPanelSummary-expandIcon MuiIconButton-edgeEnd" + className="MuiIconButton-root MuiAccordionSummary-expandIcon MuiIconButton-edgeEnd" component="div" disabled={false} focusRipple={true} @@ -999,7 +992,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` <ForwardRef(ButtonBase) aria-hidden={true} centerRipple={true} - className="MuiIconButton-root MuiExpansionPanelSummary-expandIcon MuiIconButton-edgeEnd" + className="MuiIconButton-root MuiAccordionSummary-expandIcon MuiIconButton-edgeEnd" classes={ Object { "disabled": "Mui-disabled", @@ -1016,7 +1009,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` <div aria-disabled={false} aria-hidden={true} - className="MuiButtonBase-root MuiIconButton-root MuiExpansionPanelSummary-expandIcon MuiIconButton-edgeEnd" + className="MuiButtonBase-root MuiIconButton-root MuiAccordionSummary-expandIcon MuiIconButton-edgeEnd" onBlur={[Function]} onDragLeave={[Function]} onFocus={[Function]} @@ -1065,36 +1058,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))> @@ -1103,8 +1094,8 @@ exports[`FAQContent should render the full FAQ 1`] = ` </div> </ForwardRef(ButtonBase)> </WithStyles(ForwardRef(ButtonBase))> - </ForwardRef(ExpansionPanelSummary)> - </WithStyles(ForwardRef(ExpansionPanelSummary))> + </ForwardRef(AccordionSummary)> + </WithStyles(ForwardRef(AccordionSummary))> <WithStyles(ForwardRef(Collapse)) in={false} timeout="auto" @@ -1112,9 +1103,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 +1130,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", @@ -1155,7 +1146,7 @@ exports[`FAQContent should render the full FAQ 1`] = ` <div role="region" > - <WithStyles(ForwardRef(ExpansionPanelDetails)) + <WithStyles(ForwardRef(AccordionDetails)) classes={ Object { "root": "expansion-panel-details", @@ -1163,15 +1154,15 @@ exports[`FAQContent should render the full FAQ 1`] = ` } key=".1" > - <ForwardRef(ExpansionPanelDetails) + <ForwardRef(AccordionDetails) classes={ Object { - "root": "MuiExpansionPanelDetails-root expansion-panel-details", + "root": "MuiAccordionDetails-root expansion-panel-details", } } > <div - className="MuiExpansionPanelDetails-root expansion-panel-details" + className="MuiAccordionDetails-root expansion-panel-details" > <div> <p> @@ -1182,8 +1173,8 @@ exports[`FAQContent should render the full FAQ 1`] = ` </p> </div> </div> - </ForwardRef(ExpansionPanelDetails)> - </WithStyles(ForwardRef(ExpansionPanelDetails))> + </ForwardRef(AccordionDetails)> + </WithStyles(ForwardRef(AccordionDetails))> </div> </div> </div> @@ -1194,8 +1185,8 @@ exports[`FAQContent should render the full FAQ 1`] = ` </div> </ForwardRef(Paper)> </WithStyles(ForwardRef(Paper))> - </ForwardRef(ExpansionPanel)> - </WithStyles(ForwardRef(ExpansionPanel))> + </ForwardRef(Accordion)> + </WithStyles(ForwardRef(Accordion))> </div> </div> </div> diff --git a/src/components/Feedback/FeedbackModal.tsx b/src/components/Feedback/FeedbackModal.tsx index d387c86b8177ef109f2ce5662021c6edbcad4c07..9dabd1b1452261515e24d29250d5a88bf330415f 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 981bc4fd59f20493aac5a0d31a2479e87778062b..e46be103f00791fa7fbc9cdcec30e3b71849e711 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 457ebb041cf6b5cbb40126252f0199cbce288243..d2c16a07e84868ec8a7feb89f975b601455de324 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/Konnector/KonnectorViewerCard.tsx b/src/components/Konnector/KonnectorViewerCard.tsx index d7cb6b235827ea72c3ba258276dab460503a479e..b23c5f5fd9534baa80596c20522d52bca48f3222 100644 --- a/src/components/Konnector/KonnectorViewerCard.tsx +++ b/src/components/Konnector/KonnectorViewerCard.tsx @@ -30,9 +30,11 @@ import AccountService from 'services/account.service' import chevronDown from 'assets/icons/ico/chevron-down.svg' import Icon from 'cozy-ui/transpiled/react/Icon' -import ExpansionPanel from '@material-ui/core/ExpansionPanel' -import ExpansionPanelSummary from '@material-ui/core/ExpansionPanelSummary' -import ExpansionPanelDetails from '@material-ui/core/ExpansionPanelDetails' +import { + Accordion, + AccordionSummary, + AccordionDetails, +} from '@material-ui/core' import ErrorNotif from 'assets/icons/ico/notif_error.svg' import PartnersIssueNotif from 'assets/icons/ico/notif_maintenance.svg' import ConnectionNotFound from 'components/Connection/ConnectionNotFound' @@ -163,7 +165,9 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({ await refreshChallengeState() const _updatedFluidStatus = await updateGlobalFluidStatus() if (_updatedFluidStatus.length > 0) { - const partnersInfo: PartnersInfo = await partnersInfoService.getPartnersInfo() + const partnersInfo: + | PartnersInfo + | undefined = await partnersInfoService.getPartnersInfo() const updatedFluidStatus: FluidStatus[] = await fluidService.getFluidStatus( partnersInfo ) @@ -202,7 +206,9 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({ ) } if (updatedFluidStatus.length > 0) { - const partnersInfo: PartnersInfo = await partnersInfoService.getPartnersInfo() + const partnersInfo: + | PartnersInfo + | undefined = await partnersInfoService.getPartnersInfo() const _updatedFluidStatus: FluidStatus[] = await fluidService.getFluidStatus( partnersInfo ) @@ -458,7 +464,7 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({ return ( <> {!isDisconnected ? ( - <ExpansionPanel + <Accordion expanded={active} onChange={toggleAccordion} classes={{ @@ -472,7 +478,7 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({ }`, }} > - <ExpansionPanelSummary + <AccordionSummary aria-label={t( `konnector_options.accessibility.button_toggle_detail_${FluidType[ fluidStatus.fluidType @@ -496,15 +502,15 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({ > {displayKonnectorHeader()} </div> - </ExpansionPanelSummary> - <ExpansionPanelDetails + </AccordionSummary> + <AccordionDetails classes={{ root: 'expansion-panel-details', }} > {getConnectionCard()} - </ExpansionPanelDetails> - </ExpansionPanel> + </AccordionDetails> + </Accordion> ) : ( <>{getConnectionCard()}</> )} diff --git a/src/components/Onboarding/__snapshots__/WelcomeModal.spec.tsx.snap b/src/components/Onboarding/__snapshots__/WelcomeModal.spec.tsx.snap index aa3ec99575ed2df068ced3cfb0f6104c296636fa..ed873b9546d9006b7802abbe801655d430759071 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/ProfileTypeOptions.tsx b/src/components/Options/ProfileTypeOptions.tsx index e73c1cf2cadf205d238080a4bf6b3b6fb15be5da..dea8c9317f72766a0a96237a947e22192d091127 100644 --- a/src/components/Options/ProfileTypeOptions.tsx +++ b/src/components/Options/ProfileTypeOptions.tsx @@ -13,9 +13,11 @@ import { import { FluidType } from 'enum/fluid.enum' import { useHistory } from 'react-router-dom' -import ExpansionPanel from '@material-ui/core/ExpansionPanel' -import ExpansionPanelSummary from '@material-ui/core/ExpansionPanelSummary' -import ExpansionPanelDetails from '@material-ui/core/ExpansionPanelDetails' +import { + Accordion, + AccordionSummary, + AccordionDetails, +} from '@material-ui/core' import Icon from 'cozy-ui/transpiled/react/Icon' import chevronDown from 'assets/icons/ico/chevron-down.svg' import StyledCard from 'components/CommonKit/Card/StyledCard' @@ -50,14 +52,14 @@ const ProfileTypeOptions: React.FC = () => { {t('profile_type.title_profile')} </div> {profile.isProfileTypeCompleted && ( - <ExpansionPanel + <Accordion expanded={active} onChange={toggleAccordion} classes={{ root: 'expansion-panel-root', }} > - <ExpansionPanelSummary + <AccordionSummary aria-label={t( 'profile_type.accessibility.button_toggle_detail_profile' )} @@ -70,8 +72,8 @@ const ProfileTypeOptions: React.FC = () => { <div className="text-18-normal"> {t('profile_type.your_profile')} </div> - </ExpansionPanelSummary> - <ExpansionPanelDetails + </AccordionSummary> + <AccordionDetails classes={{ root: 'expansion-panel-details', }} @@ -228,8 +230,8 @@ const ProfileTypeOptions: React.FC = () => { </Button> </div> </div> - </ExpansionPanelDetails> - </ExpansionPanel> + </AccordionDetails> + </Accordion> )} {profile.isProfileTypeCompleted === false && ( <StyledCard onClick={goToForm} className="profile-link"> diff --git a/src/components/Options/__snapshots__/UnSubscribe.spec.tsx.snap b/src/components/Options/__snapshots__/UnSubscribe.spec.tsx.snap index 850bd82974778a1d842aeabab509cb128275115f..d06e84f78e27bb05e0db7fe618368590e8998070 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 24aae2ac9d18a75bd6649a3f0f91a138fcf9ebf0..8349a835e595c9dec73adafb88d0bb131ba4e4e9 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 84a49f61d48be1006412829b5198450b3742102d..e29c89b237f9032dea5b87be941e523c11cf53f2 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 f3a773803581b4d3dcc445c61ef957e9a02f5af9..6c4bfa3e7818464f168fba11ce330ff0bfee6ba0 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 f3bb2e47e2f09690cf2f11013288c95f86eb59be..82c98c1a27a01d75dec75d6d20d122cfdb5d0329 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 2658db800a221db0b89e909891c80ee2c2c69122..984a939bc105ea35a603b7ffe688585ceb598387 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 71a3d1250070ddacba5bb3616288ca56ed646521..90d1f60bddd967df923ea3fce4da2c342f9b74fe 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 4a2393ce3edae8f03dd5039fd0505b2f73094ee8..ac40276bd529b25d499200a7e7e78a4f356aef28 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} diff --git a/yarn.lock b/yarn.lock index a3a7acd15115e7cb3270ccc2ffcefb1aee31f5e7..10d6b3410677a2dded79789e2d867a35d809859f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2159,27 +2159,25 @@ resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.3.1.tgz#b50a781709c81e10701004214340f25475a171a0" integrity sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw== -"@material-ui/core@~4.8.3": - version "4.8.3" - resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.8.3.tgz#858f758b26d8417eb39310f07fb9d7a72beb8b03" - integrity sha512-ZJbfJQmkuZCSQTf0nzpfZwizmDdCq8ruZxnPNFnhoKDqgJpMvV8TJRi8vdI9ls1tMuTqxlhyhw8556fxOpWpFQ== +"@material-ui/core@~4.12.0": + version "4.12.4" + resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.4.tgz#4ac17488e8fcaf55eb6a7f5efb2a131e10138a73" + integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ== dependencies: "@babel/runtime" "^7.4.4" - "@material-ui/styles" "^4.8.2" - "@material-ui/system" "^4.7.1" - "@material-ui/types" "^4.1.1" - "@material-ui/utils" "^4.7.1" + "@material-ui/styles" "^4.11.5" + "@material-ui/system" "^4.12.2" + "@material-ui/types" "5.1.0" + "@material-ui/utils" "^4.11.3" "@types/react-transition-group" "^4.2.0" - clsx "^1.0.2" - convert-css-length "^2.0.1" - hoist-non-react-statics "^3.2.1" - normalize-scroll-left "^0.2.0" - popper.js "^1.14.1" + clsx "^1.0.4" + hoist-non-react-statics "^3.3.2" + popper.js "1.16.1-lts" prop-types "^15.7.2" - react-is "^16.8.0" - react-transition-group "^4.3.0" + react-is "^16.8.0 || ^17.0.0" + react-transition-group "^4.4.0" -"@material-ui/styles@^4.11.3", "@material-ui/styles@^4.8.2": +"@material-ui/styles@^4.11.3": version "4.11.4" resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.4.tgz#eb9dfccfcc2d208243d986457dff025497afa00d" integrity sha512-KNTIZcnj/zprG5LW0Sao7zw+yG3O35pviHzejMdcSGCdWbiO8qzRgOYL8JAxAsWBKOKYwVZxXtHWaB5T2Kvxew== @@ -2201,13 +2199,35 @@ jss-plugin-vendor-prefixer "^10.5.1" prop-types "^15.7.2" -"@material-ui/system@^4.7.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.1.tgz#2dd96c243f8c0a331b2bb6d46efd7771a399707c" - integrity sha512-lUdzs4q9kEXZGhbN7BptyiS1rLNHe6kG9o8Y307HCvF4sQxbCgpL2qi+gUk+yI8a2DNk48gISEQxoxpgph0xIw== +"@material-ui/styles@^4.11.5": + version "4.11.5" + resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.5.tgz#19f84457df3aafd956ac863dbe156b1d88e2bbfb" + integrity sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA== dependencies: "@babel/runtime" "^7.4.4" - "@material-ui/utils" "^4.11.2" + "@emotion/hash" "^0.8.0" + "@material-ui/types" "5.1.0" + "@material-ui/utils" "^4.11.3" + clsx "^1.0.4" + csstype "^2.5.2" + hoist-non-react-statics "^3.3.2" + jss "^10.5.1" + jss-plugin-camel-case "^10.5.1" + jss-plugin-default-unit "^10.5.1" + jss-plugin-global "^10.5.1" + jss-plugin-nested "^10.5.1" + jss-plugin-props-sort "^10.5.1" + jss-plugin-rule-value-function "^10.5.1" + jss-plugin-vendor-prefixer "^10.5.1" + prop-types "^15.7.2" + +"@material-ui/system@^4.12.2": + version "4.12.2" + resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.2.tgz#f5c389adf3fce4146edd489bf4082d461d86aa8b" + integrity sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw== + dependencies: + "@babel/runtime" "^7.4.4" + "@material-ui/utils" "^4.11.3" csstype "^2.5.2" prop-types "^15.7.2" @@ -2216,14 +2236,7 @@ resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2" integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A== -"@material-ui/types@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-4.1.1.tgz#b65e002d926089970a3271213a3ad7a21b17f02b" - integrity sha512-AN+GZNXytX9yxGi0JOfxHrRTbhFybjUJ05rnsBVjcB+16e466Z0Xe5IxawuOayVZgTBNDxmPKo5j4V6OnMtaSQ== - dependencies: - "@types/react" "*" - -"@material-ui/utils@^4.11.2", "@material-ui/utils@^4.7.1": +"@material-ui/utils@^4.11.2": version "4.11.2" resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.2.tgz#f1aefa7e7dff2ebcb97d31de51aecab1bb57540a" integrity sha512-Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA== @@ -2232,6 +2245,15 @@ prop-types "^15.7.2" react-is "^16.8.0 || ^17.0.0" +"@material-ui/utils@^4.11.3": + version "4.11.3" + resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.3.tgz#232bd86c4ea81dab714f21edad70b7fdf0253942" + integrity sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg== + dependencies: + "@babel/runtime" "^7.4.4" + prop-types "^15.7.2" + react-is "^16.8.0 || ^17.0.0" + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -2888,6 +2910,11 @@ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.177.tgz#f70c0d19c30fab101cad46b52be60363c43c4578" integrity sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw== +"@types/lodash@^4.14.175": + version "4.14.182" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2" + integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q== + "@types/luxon@^1.21.0": version "1.27.1" resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-1.27.1.tgz#aceeb2d5be8fccf541237e184e37ecff5faa9096" @@ -3857,6 +3884,13 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== +axios@^0.21.1: + version "0.21.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== + dependencies: + follow-redirects "^1.14.0" + axios@^0.27.0: version "0.27.2" resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" @@ -4297,6 +4331,13 @@ brorand@^1.0.1, brorand@^1.1.0: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= +brotli-size@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/brotli-size/-/brotli-size-4.0.0.tgz#a05ee3faad3c0e700a2f2da826ba6b4d76e69e5e" + integrity sha512-uA9fOtlTRC0iqKfzff1W34DXUA3GyVqbUaeo3Rw3d4gd1eavKVCETXrn3NzO74W+UVkG3UHu8WxUi+XvKI/huA== + dependencies: + duplexer "0.1.1" + browser-process-hrtime@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" @@ -4453,6 +4494,29 @@ builtins@^1.0.3: resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og= +bundlemon-utils@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/bundlemon-utils/-/bundlemon-utils-1.0.0.tgz#9c3e10f09107568913db2e69a3d3317a82b00633" + integrity sha512-+rc1Zautuch9MT7+n4O7T1+ASxcudaxisAIBVqN2xjOCaA+wYn5lyQnMPx2Ky2Cg8N4GrvuSfjNopli/GFrqVQ== + dependencies: + bytes "^3.1.0" + +bundlemon@^1.3.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/bundlemon/-/bundlemon-1.4.0.tgz#5593e00cd913e638f69a489d4d97a9abecdac85d" + integrity sha512-A5mzeMZrnUzKNNo8ng1PFlxZr57XM2HDsaX07kJ1u59BDWn2JFYNeUIUSXhmLdoqBHK9Ln7wTLXDnoqOlcJP5A== + dependencies: + axios "^0.21.1" + brotli-size "^4.0.0" + bundlemon-utils "^1.0.0" + bytes "^3.1.0" + chalk "^4.1.1" + commander "^8.0.0" + cosmiconfig "^7.0.0" + gzip-size "^6.0.0" + micromatch "^4.0.4" + yup "^0.32.11" + bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -4468,6 +4532,11 @@ bytes@3.1.1: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a" integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg== +bytes@^3.1.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== + cacache@^10.0.4: version "10.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460" @@ -4719,7 +4788,7 @@ chalk@3, chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0, chalk@^4.1.0: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -4757,6 +4826,11 @@ charenc@0.0.2: resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc= +chart.js@3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.7.1.tgz#0516f690c6a8680c6c707e31a4c1807a6f400ada" + integrity sha512-8knRegQLFnPQAheZV8MjxIXc5gQEfDFD897BJgv/klO/vtIyFFmgMXrNfgrXpbTr/XbTturxRgxIXx/Y+ASJBA== + check-types@^8.0.3: version "8.0.3" resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552" @@ -5055,7 +5129,7 @@ clone@^2.1.1: resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= -clsx@^1.0.2, clsx@^1.0.4: +clsx@^1.0.4: version "1.1.1" resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA== @@ -5186,7 +5260,7 @@ commander@^5.1.0: resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== -commander@^8.3.0: +commander@^8.0.0, commander@^8.3.0: version "8.3.0" resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== @@ -5476,11 +5550,6 @@ conventional-recommended-bump@6.1.0: meow "^8.0.0" q "^1.5.1" -convert-css-length@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/convert-css-length/-/convert-css-length-2.0.1.tgz#90a76bde5bfd24d72881a5b45d02249b2c1d257c" - integrity sha512-iGpbcvhLPRKUbBc0Quxx7w/bV14AC3ItuBEGMahA5WTYqB8lq9jH0kTXFheCBASsYnqeMFZhiTruNxr1N59Axg== - convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.8.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" @@ -6104,28 +6173,34 @@ cozy-ui@35.22.0: react-select "2.2.0" react-swipeable-views "0.13.3" -cozy-ui@60.6.0: - version "60.6.0" - resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-60.6.0.tgz#8454767932ff4f9d078b8780d3433b6a93e6b855" - integrity sha512-bNVK+TRjmtEtHzh272npmOiK64MCSIlo2bvWsBzevHhksd6x+TzazXkGR84iBQGGmm+CQI7F1+YNcg6gE7s2Yw== +cozy-ui@68.8.0: + version "68.8.0" + resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-68.8.0.tgz#4112bfe2a2fde5cc22ae046683ff7230c0c5038f" + integrity sha512-HIsL3z0KZVeNzMSKDOTRxawUqehJDNZLAWM9VtbiS0DEpYJ5zYvWyyLi8CDJP6swv/6RuuH7KRO403iic8WWgQ== dependencies: "@babel/runtime" "^7.3.4" "@popperjs/core" "^2.4.4" + bundlemon "^1.3.2" + chart.js "3.7.1" classnames "^2.2.5" cozy-interapp "^0.5.4" date-fns "^1.28.5" filesize "8.0.7" hammerjs "^2.0.8" intersection-observer "0.11.0" + mime-types "2.1.35" mui-bottom-sheet "https://github.com/cozy/mui-bottom-sheet.git#v1.0.6" node-polyglot "^2.2.2" - normalize.css "^7.0.0" + normalize.css "^8.0.0" + piwik-react-router "0.12.1" + react-chartjs-2 "4.1.0" react-markdown "^4.0.8" react-pdf "^4.0.5" react-popper "^2.2.3" react-remove-scroll "^2.4.0" react-select "^4.3.0" react-swipeable-views "^0.13.3" + rooks "^5.11.2" create-ecdh@^4.0.0: version "4.0.4" @@ -7119,7 +7194,12 @@ dotgitignore@^2.1.0: find-up "^3.0.0" minimatch "^3.0.4" -duplexer@^0.1.1: +duplexer@0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" + integrity sha512-sxNZ+ljy+RA1maXoUReeqBBpBC6RLKmg5ewzV+x+mSETmWNoKdZN6vcQjpFROemza23hGFskJtFNoUWUaQ+R4Q== + +duplexer@^0.1.1, duplexer@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== @@ -8484,7 +8564,7 @@ follow-redirects@^1.0.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381" integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA== -follow-redirects@^1.14.9: +follow-redirects@^1.14.0, follow-redirects@^1.14.9: version "1.15.1" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== @@ -8976,6 +9056,13 @@ gzip-size@^5.0.0: duplexer "^0.1.1" pify "^4.0.1" +gzip-size@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462" + integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q== + dependencies: + duplexer "^0.1.2" + hammerjs@2.0.8, hammerjs@^2.0.8: version "2.0.8" resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1" @@ -9183,7 +9270,7 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.2.1, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2: +hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -11334,7 +11421,7 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash-es@^4.17.11, lodash-es@^4.2.1: +lodash-es@^4.17.11, lodash-es@^4.17.21, lodash-es@^4.2.1: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== @@ -11887,6 +11974,18 @@ mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@2.1.35: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + mime-types@^2.1.12, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.34" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" @@ -12512,9 +12611,9 @@ msgpack5@^4.0.2: readable-stream "^2.3.6" safe-buffer "^5.1.2" -"mui-bottom-sheet@https://github.com/cozy/mui-bottom-sheet.git#v1.0.6": +"mui-bottom-sheet@git+https://github.com/cozy/mui-bottom-sheet.git#v1.0.6": version "1.0.6" - resolved "https://github.com/cozy/mui-bottom-sheet.git#494c40416ecde95732c864f9b921e7e545075aa5" + resolved "git+https://github.com/cozy/mui-bottom-sheet.git#494c40416ecde95732c864f9b921e7e545075aa5" dependencies: "@juggle/resize-observer" "^3.1.3" jest-environment-jsdom-sixteen "^1.0.3" @@ -12559,6 +12658,11 @@ nan@^2.12.1, nan@^2.13.2: resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== +nanoclone@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4" + integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA== + nanoid@^3.1.30: version "3.1.30" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" @@ -12885,16 +12989,16 @@ normalize-range@^0.1.2: resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= -normalize-scroll-left@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/normalize-scroll-left/-/normalize-scroll-left-0.2.1.tgz#978fdd04bfeb2d3543e16696814285557c127502" - integrity sha512-YanMJCtsykxVQuWiwQR531bbyPtMt/jpUKy2XcVVe/oHiDgYme0NmuEZfceLeZhFbrQtO/GS/9KvWbSfDGRblA== - normalize.css@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-7.0.0.tgz#abfb1dd82470674e0322b53ceb1aaf412938e4bf" integrity sha1-q/sd2CRwZ04DIrU86xqvQSk45L8= +normalize.css@^8.0.0: + version "8.0.1" + resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3" + integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg== + npm-run-all@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba" @@ -13750,10 +13854,10 @@ pluralize@^7.0.0: resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow== -popper.js@^1.14.1: - version "1.16.1" - resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" - integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== +popper.js@1.16.1-lts: + version "1.16.1-lts" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05" + integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA== portfinder@^1.0.25: version "1.0.28" @@ -14245,6 +14349,11 @@ propagate@^2.0.0: resolved "https://registry.yarnpkg.com/propagate/-/propagate-2.0.1.tgz#40cdedab18085c792334e64f0ac17256d38f9a45" integrity sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag== +property-expr@^2.0.4: + version "2.0.5" + resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.5.tgz#278bdb15308ae16af3e3b9640024524f4dc02cb4" + integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA== + proto-list@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" @@ -14483,6 +14592,11 @@ react-autowhatever@^10.1.2: react-themeable "^1.1.0" section-iterator "^2.0.0" +react-chartjs-2@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/react-chartjs-2/-/react-chartjs-2-4.1.0.tgz#2a123df16d3a987c54eb4e810ed766d3c03adf8d" + integrity sha512-AsUihxEp8Jm1oBhbEovE+w50m9PVNhz1sfwEIT4hZduRC0m14gHWHd0cUaxkFDb8HNkdMIGzsNlmVqKiOpU74g== + react-dom@16.14.0: version "16.14.0" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" @@ -14549,7 +14663,7 @@ react-input-autosize@^3.0.0: dependencies: prop-types "^15.5.8" -react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-is@^16.8.6: +react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -14819,7 +14933,7 @@ react-transition-group@^2.2.1: prop-types "^15.6.2" react-lifecycles-compat "^3.0.4" -react-transition-group@^4.3.0: +react-transition-group@^4.3.0, react-transition-group@^4.4.0: version "4.4.2" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg== @@ -15477,6 +15591,14 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" +rooks@^5.11.2: + version "5.11.2" + resolved "https://registry.yarnpkg.com/rooks/-/rooks-5.11.2.tgz#f7ba3a758c512c7cc807af38615f3052439578b8" + integrity sha512-kOVYjNW/0Emq9NN3DbmC41xcltK25gVV2PMGw+Et9vC5UiIKrwWYRYmMid2/WRGQ0oodOeksCkrqGwJcV2buuQ== + dependencies: + lodash.debounce "^4.0.8" + raf "^3.4.1" + route-recognizer@^0.3.4: version "0.3.4" resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3" @@ -17070,6 +17192,11 @@ toposort@^1.0.0: resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029" integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk= +toposort@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330" + integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg== + tough-cookie@^2.3.1, tough-cookie@^2.3.3, tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" @@ -18417,6 +18544,19 @@ yocto-queue@^0.1.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== +yup@^0.32.11: + version "0.32.11" + resolved "https://registry.yarnpkg.com/yup/-/yup-0.32.11.tgz#d67fb83eefa4698607982e63f7ca4c5ed3cf18c5" + integrity sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg== + dependencies: + "@babel/runtime" "^7.15.4" + "@types/lodash" "^4.14.175" + lodash "^4.17.21" + lodash-es "^4.17.21" + nanoclone "^0.2.1" + property-expr "^2.0.4" + toposort "^2.0.2" + zxcvbn@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/zxcvbn/-/zxcvbn-4.4.2.tgz#28ec17cf09743edcab056ddd8b1b06262cc73c30"