removed unused classes, small fix

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

Hide file tree

Showing 5 changed files with 7 additions and 36 deletions.
diff --git a/docs/pages/api-docs/timeline-item.json b/docs/pages/api-docs/timeline-item.json
@@ -6,15 +6,7 @@
   },
   "name": "TimelineItem",
   "styles": {
-    "classes": [
-      "root",
-      "alignLeft",
-      "alignRight",
-      "alignAlternate",
-      "missingOppositeContent",
-      "content",
-      "oppositeContent"
-    ],
+    "classes": ["root", "alignLeft", "alignRight", "alignAlternate", "missingOppositeContent"],
     "globalClasses": {},
     "name": "MuiTimelineItem"
   },

diff --git a/docs/translations/api-docs/timeline-item/timeline-item.json b/docs/translations/api-docs/timeline-item/timeline-item.json
@@ -26,14 +26,6 @@
       "description": "Styles applied to {{nodeName}} if {{conditions}}.",
       "nodeName": "the root element",
       "conditions": "TimelineOppositeContent isn't provided"
-    },
-    "content": {
-      "description": "Styles applied to {{nodeName}}.",
-      "nodeName": "the timeline content node"
-    },
-    "oppositeContent": {
-      "description": "Styles applied to {{nodeName}}.",
-      "nodeName": "the timeline opposite content node"
     }
   }
 }
diff --git a/packages/material-ui-lab/src/TimelineItem/TimelineItem.d.ts b/packages/material-ui-lab/src/TimelineItem/TimelineItem.d.ts
@@ -22,10 +22,6 @@ export interface TimelineItemProps extends StandardProps<React.HTMLAttributes<HT
     alignAlternate?: string;
     /** Styles applied to the root element if TimelineOppositeContent isn't provided. */
     missingOppositeContent?: string;
-    /** Styles applied to the timeline content node. */
-    content?: string;
-    /** Styles applied to the timeline opposite content node. */
-    oppositeContent?: string;
   };
   /**
    * The system prop that allows defining system overrides as well as additional CSS styles.

diff --git a/packages/material-ui-lab/src/TimelineItem/TimelineItem.js b/packages/material-ui-lab/src/TimelineItem/TimelineItem.js
@@ -1,7 +1,6 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
-import { deepmerge } from '@material-ui/utils';
 import { capitalize, isMuiElement } from '@material-ui/core/utils';
 import {
   experimentalStyled,
@@ -16,23 +15,17 @@ import timelineItemClasses, { getTimelineItemUtilityClass } from './timelineItem
 const overridesResolver = (props, styles) => {
   const { styleProps } = props;
 
-  return deepmerge(
-    {
-      ...styles[`align${capitalize(styleProps.align)}`],
-      [`& .${timelineItemClasses.content}`]: styles.content,
-      [`& .${timelineItemClasses.oppositeContent}`]: styles.oppositeContent,
-    },
-    styles.root || {},
-  );
+  return {
+    ...styles.root,
+    ...styles[`align${capitalize(styleProps.align)}`],
+  };
 };
 
 const useUtilityClasses = (styleProps) => {
-  const { align, classes } = styleProps;
+  const { align, classes, hasOppositeContent } = styleProps;
 
   const slots = {
-    root: ['root', `align${capitalize(align)}`],
-    content: ['content'],
-    oppositeContent: ['oppositeContent'],
+    root: ['root', `align${capitalize(align)}`, !hasOppositeContent && 'missingOppositeContent'],
   };
 
   return composeClasses(slots, getTimelineItemUtilityClass, classes);

diff --git a/packages/material-ui-lab/src/TimelineItem/timelineItemClasses.js b/packages/material-ui-lab/src/TimelineItem/timelineItemClasses.js
@@ -10,8 +10,6 @@ const timelineItemClasses = generateUtilityClasses('MuiTimelineItem', [
   'alignRight',
   'alignAlternate',
   'missingOppositeContent',
-  'content',
-  'oppositeContent',
 ]);
 
 export default timelineItemClasses;