From 84e489ca7910fb8f4e60a73032c545e5dac4bbde Mon Sep 17 00:00:00 2001 From: Anthony Geourjon <anthony.geourjon@tetras-libre.fr> Date: Tue, 2 Jan 2024 12:13:17 +0100 Subject: [PATCH] WIP Merge annotation video into mui 5 Reorganize import for MUI5 --- src/components/AnnotationManifestsAccordion.js | 10 +++++----- src/components/AnnotationManifestsItem.js | 8 ++++---- src/components/AnnotationsOverlayVideo.js | 2 +- src/components/ViewerNavigationVideo.js | 16 ++++++++-------- .../WindowCanvasNavigationControlsVideo.js | 4 ++-- src/containers/AnnotationManifestsAccordion.js | 2 -- src/containers/AnnotationManifestsItem.js | 2 -- src/containers/ViewerNavigationVideo.js | 2 -- .../WindowCanvasNavigationControlsVideo.js | 3 --- 9 files changed, 20 insertions(+), 29 deletions(-) diff --git a/src/components/AnnotationManifestsAccordion.js b/src/components/AnnotationManifestsAccordion.js index 62766ec1c..4601362c1 100644 --- a/src/components/AnnotationManifestsAccordion.js +++ b/src/components/AnnotationManifestsAccordion.js @@ -1,9 +1,9 @@ import React, { Component } from 'react'; -import Accordion from '@material-ui/core/Accordion'; -import AccordionSummary from '@material-ui/core/AccordionSummary'; -import ExpandMoreIcon from '@material-ui/icons/ExpandMoreSharp'; -import Typography from '@material-ui/core/Typography'; -import AccordionDetails from '@material-ui/core/AccordionDetails'; +import Accordion from '@mui/material/Accordion'; +import AccordionSummary from '@mui/material/AccordionSummary'; +import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; +import Typography from '@mui/material/Typography'; +import AccordionDetails from '@mui/material/AccordionDetails' import PropTypes from 'prop-types'; import AnnotationManifestsItem from '../containers/AnnotationManifestsItem'; diff --git a/src/components/AnnotationManifestsItem.js b/src/components/AnnotationManifestsItem.js index 657a5c842..79c9758e8 100644 --- a/src/components/AnnotationManifestsItem.js +++ b/src/components/AnnotationManifestsItem.js @@ -1,11 +1,11 @@ import { Component } from 'react'; -import Typography from '@material-ui/core/Typography'; +import Typography from '@mui/material/Typography'; import PropTypes from 'prop-types'; import { Card, CardActionArea, CardActions, CardContent, CardMedia, Fab, -} from '@material-ui/core'; -import Button from '@material-ui/core/Button'; -import Tooltip from '@material-ui/core/Tooltip'; +} from '@mui/material'; +import Button from '@mui/material/Button'; +import Tooltip from '@mui/material/Tooltip'; /** * AnnotationManifestsItem diff --git a/src/components/AnnotationsOverlayVideo.js b/src/components/AnnotationsOverlayVideo.js index 57e03df4f..b3dd3911d 100755 --- a/src/components/AnnotationsOverlayVideo.js +++ b/src/components/AnnotationsOverlayVideo.js @@ -6,7 +6,7 @@ import flatten from 'lodash/flatten'; import sortBy from 'lodash/sortBy'; import xor from 'lodash/xor'; import ResizeObserver from 'react-resize-observer'; -import CircularProgress from '@material-ui/core/CircularProgress'; +import CircularProgress from '@mui/material/CircularProgress'; import CanvasOverlayVideo from '../lib/CanvasOverlayVideo'; import CanvasWorld from '../lib/CanvasWorld'; import CanvasAnnotationDisplay from '../lib/CanvasAnnotationDisplay'; diff --git a/src/components/ViewerNavigationVideo.js b/src/components/ViewerNavigationVideo.js index 86be2d95d..48c266fba 100755 --- a/src/components/ViewerNavigationVideo.js +++ b/src/components/ViewerNavigationVideo.js @@ -1,13 +1,13 @@ -import ClosedCaption from '@material-ui/icons/ClosedCaption'; -import ClosedCaptionOutlined from '@material-ui/icons/ClosedCaptionOutlined'; +import ClosedCaption from '@mui/icons-material/ClosedCaption'; +import ClosedCaptionOutlined from '@mui/icons-material/ClosedCaptionOutlined'; import { Component } from 'react'; -import PauseRoundedIcon from '@material-ui/icons/PauseRounded'; -import PlayArrowRoundedIcon from '@material-ui/icons/PlayArrowRounded'; +import PauseRoundedIcon from '@mui/icons-material/PauseRounded'; +import PlayArrowRoundedIcon from '@mui/icons-material/PlayArrowRounded'; import PropTypes from 'prop-types'; -import Slider from '@material-ui/core/Slider'; -import Typography from '@material-ui/core/Typography'; -import VolumeOffIcon from '@material-ui/icons/VolumeOff'; -import VolumeUpIcon from '@material-ui/icons/VolumeUp'; +import Slider from '@mui/material/Slider'; +import Typography from '@mui/material/Typography'; +import VolumeOffIcon from '@mui/icons-material/VolumeOff'; +import VolumeUpIcon from '@mui/icons-material/VolumeUp'; import MiradorMenuButton from '../containers/MiradorMenuButton'; import ns from '../config/css-ns'; diff --git a/src/components/WindowCanvasNavigationControlsVideo.js b/src/components/WindowCanvasNavigationControlsVideo.js index b52c99572..c5648fe3f 100755 --- a/src/components/WindowCanvasNavigationControlsVideo.js +++ b/src/components/WindowCanvasNavigationControlsVideo.js @@ -1,8 +1,8 @@ import { Component } from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import Paper from '@material-ui/core/Paper'; -import Typography from '@material-ui/core/Typography'; +import Paper from '@mui/material/Paper'; +import Typography from '@mui/material/Typography'; import ViewerInfo from '../containers/ViewerInfo'; import ViewerNavigation from '../containers/ViewerNavigation'; import ViewerNavigationVideo from '../containers/ViewerNavigationVideo'; diff --git a/src/containers/AnnotationManifestsAccordion.js b/src/containers/AnnotationManifestsAccordion.js index e9229f8dd..0bb19f5ba 100644 --- a/src/containers/AnnotationManifestsAccordion.js +++ b/src/containers/AnnotationManifestsAccordion.js @@ -1,7 +1,6 @@ import { compose } from 'redux'; import { connect } from 'react-redux'; import { withTranslation } from 'react-i18next'; -import { withStyles } from '@material-ui/core/styles'; import { withPlugins } from '../extend/withPlugins'; import { AnnotationManifestsAccordion } from '../components/AnnotationManifestsAccordion'; import { getConfig } from '../state/selectors'; @@ -32,7 +31,6 @@ const styles = theme => ({ const enhance = compose( withTranslation(), - withStyles(styles), connect(mapStateToProps, mapDispatchToProps), withPlugins('AnnotationManifestsAccordion'), ); diff --git a/src/containers/AnnotationManifestsItem.js b/src/containers/AnnotationManifestsItem.js index ad31d07b2..088c06d30 100644 --- a/src/containers/AnnotationManifestsItem.js +++ b/src/containers/AnnotationManifestsItem.js @@ -1,7 +1,6 @@ import { compose } from 'redux'; import { connect } from 'react-redux'; import { withTranslation } from 'react-i18next'; -import { withStyles } from '@material-ui/core/styles'; import { withPlugins } from '../extend/withPlugins'; import * as actions from '../state/actions'; import { AnnotationManifestsItem } from '../components/AnnotationManifestsItem'; @@ -59,7 +58,6 @@ const styles = theme => ({ const enhance = compose( withTranslation(), - withStyles(styles), connect(mapStateToProps, mapDispatchToProps), withPlugins('AnnotationManifestsItem'), ); diff --git a/src/containers/ViewerNavigationVideo.js b/src/containers/ViewerNavigationVideo.js index 5d894b0d9..76b4f00ab 100755 --- a/src/containers/ViewerNavigationVideo.js +++ b/src/containers/ViewerNavigationVideo.js @@ -1,7 +1,6 @@ import { compose } from 'redux'; import { connect } from 'react-redux'; import { withTranslation } from 'react-i18next'; -import { withStyles } from '@material-ui/core/styles'; import { withPlugins } from '../extend/withPlugins'; import * as actions from '../state/actions'; import { ViewerNavigationVideo } from '../components/ViewerNavigationVideo'; @@ -69,7 +68,6 @@ const styles = { }; const enhance = compose( - withStyles(styles), withTranslation(), connect(mapStateToProps, mapDispatchToProps), withPlugins('ViewerNavigationVideo'), diff --git a/src/containers/WindowCanvasNavigationControlsVideo.js b/src/containers/WindowCanvasNavigationControlsVideo.js index 6c0ed55e8..5424c3d8e 100755 --- a/src/containers/WindowCanvasNavigationControlsVideo.js +++ b/src/containers/WindowCanvasNavigationControlsVideo.js @@ -1,8 +1,6 @@ import { connect } from 'react-redux'; import { compose } from 'redux'; import { withSize } from 'react-sizeme'; -import { withStyles } from '@material-ui/core'; -import { fade } from '@material-ui/core/styles/colorManipulator'; import { withPlugins } from '../extend/withPlugins'; import { getWorkspace } from '../state/selectors'; import { WindowCanvasNavigationControlsVideo } from '../components/WindowCanvasNavigationControlsVideo'; @@ -44,7 +42,6 @@ const styles = theme => ({ const enhance = compose( connect(mapStateToProps), - withStyles(styles), withSize(), connect(mapStateToProps, mapDispatchToProps), withPlugins('WindowCanvasNavigationControlsVideo'), -- GitLab