address last comments

mui · Apr 19, 2021 · 6c22e09 · 6c22e09
1 parent a36780c
commit 6c22e09
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 33 deletions.
diff --git a/packages/material-ui-lab/src/TimelineContent/TimelineContent.js b/packages/material-ui-lab/src/TimelineContent/TimelineContent.js
@@ -10,7 +10,6 @@ import {
 import { unstable_composeClasses as composeClasses } from '@material-ui/unstyled';
 import Typography from '@material-ui/core/Typography';
 import TimelineContext from '../Timeline/TimelineContext';
-import TimelineItemContext from '../TimelineItem/TimelineItemContext';
 import { getTimelineContentUtilityClass } from './timelineContentClasses';
 
 const overridesResolver = (props, styles) => {
@@ -50,7 +49,6 @@ const TimelineContent = React.forwardRef(function TimelineContent(inProps, ref)
   const { className, ...other } = props;
 
   const { align = 'left' } = React.useContext(TimelineContext);
-  const { classes: contextClasses = {} } = React.useContext(TimelineItemContext);
 
   const styleProps = {
     ...props,
@@ -62,7 +60,7 @@ const TimelineContent = React.forwardRef(function TimelineContent(inProps, ref)
   return (
     <TimelineContentRoot
       component="div"
-      className={clsx(classes.root, contextClasses.content, className)}
+      className={clsx(classes.root, className)}
       styleProps={styleProps}
       ref={ref}
       {...other}

diff --git a/packages/material-ui-lab/src/TimelineItem/TimelineItem.js b/packages/material-ui-lab/src/TimelineItem/TimelineItem.js
@@ -8,8 +8,9 @@ import {
   unstable_useThemeProps as useThemeProps,
 } from '@material-ui/core/styles';
 import { unstable_composeClasses as composeClasses } from '@material-ui/unstyled';
+import { timelineContentClasses } from '../TimelineContent';
+import { timelineOppositeContentClasses } from '../TimelineOppositeContent';
 import TimelineContext from '../Timeline/TimelineContext';
-import TimelineItemContext from './TimelineItemContext';
 import timelineItemClasses, { getTimelineItemUtilityClass } from './timelineItemClasses';
 
 const overridesResolver = (props, styles) => {
@@ -56,10 +57,10 @@ const TimelineItemRoot = experimentalStyled(
   ...(styleProps.align === 'alternate' && {
     '&:nth-child(even)': {
       flexDirection: 'row-reverse',
-      '& .MuiTimelineItem-content': {
+      [`& .${timelineContentClasses.root}`]: {
         textAlign: 'right',
       },
-      '& .MuiTimelineItem-oppositeContent': {
+      [`& .${timelineOppositeContentClasses.root}`]: {
         textAlign: 'left',
       },
     },
@@ -95,18 +96,12 @@ const TimelineItem = React.forwardRef(function TimelineItem(inProps, ref) {
   const classes = useUtilityClasses(styleProps);
 
   return (
-    <TimelineItemContext.Provider
-      value={{
-        classes: { content: classes.content, oppositeContent: classes.oppositeContent },
-      }}
-    >
-      <TimelineItemRoot
-        className={clsx(classes.root, className)}
-        styleProps={styleProps}
-        ref={ref}
-        {...other}
-      />
-    </TimelineItemContext.Provider>
+    <TimelineItemRoot
+      className={clsx(classes.root, className)}
+      styleProps={styleProps}
+      ref={ref}
+      {...other}
+    />
   );
 });
 

diff --git a/packages/material-ui-lab/src/TimelineItem/TimelineItemContext.js b/packages/material-ui-lab/src/TimelineItem/TimelineItemContext.js
diff --git a/packages/material-ui-lab/src/TimelineOppositeContent/TimelineOppositeContent.js b/packages/material-ui-lab/src/TimelineOppositeContent/TimelineOppositeContent.js
@@ -10,7 +10,6 @@ import { capitalize } from '@material-ui/core/utils';
 import { unstable_composeClasses as composeClasses } from '@material-ui/unstyled';
 import Typography from '@material-ui/core/Typography';
 import TimelineContext from '../Timeline/TimelineContext';
-import TimelineItemContext from '../TimelineItem/TimelineItemContext';
 import { getTimelineOppositeContentUtilityClass } from './timelineOppositeContentClasses';
 
 const overridesResolver = (props, styles) => {
@@ -58,7 +57,6 @@ const TimelineOppositeContent = React.forwardRef(function TimelineOppositeConten
   const { className, ...other } = props;
 
   const { align = 'left' } = React.useContext(TimelineContext);
-  const { classes: contextClasses = {} } = React.useContext(TimelineItemContext);
 
   const styleProps = {
     ...props,
@@ -70,7 +68,7 @@ const TimelineOppositeContent = React.forwardRef(function TimelineOppositeConten
   return (
     <TimelineOppositeContentRoot
       component="div"
-      className={clsx(classes.root, contextClasses.oppositeContent, className)}
+      className={clsx(classes.root, className)}
       styleProps={styleProps}
       ref={ref}
       {...other}