feat(react-scheduler): redesign AppointmentTooltip (#2474)

DevExpress · Oct 25, 2019 · 41b8f28 · 41b8f28
1 parent 604c2ed
commit 41b8f28
Show file tree

Hide file tree

Showing 18 changed files with 742 additions and 357 deletions.
diff --git a/...r-demos/src/demo-sources/scheduler-featured-appearance-customization/material-ui/demo.jsx b/...r-demos/src/demo-sources/scheduler-featured-appearance-customization/material-ui/demo.jsx
@@ -17,19 +17,16 @@ import {
   AppointmentForm,
 } from '@devexpress/dx-react-scheduler-material-ui';
 import { connectProps } from '@devexpress/dx-react-core';
-import moment from 'moment';
 import { withStyles } from '@material-ui/core/styles';
 import PriorityHigh from '@material-ui/icons/PriorityHigh';
 import LowPriority from '@material-ui/icons/LowPriority';
+import Lens from '@material-ui/icons/Lens';
 import Event from '@material-ui/icons/Event';
 import AccessTime from '@material-ui/icons/AccessTime';
 import Paper from '@material-ui/core/Paper';
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemIcon from '@material-ui/core/ListItemIcon';
-import ListItemText from '@material-ui/core/ListItemText';
 import MenuItem from '@material-ui/core/MenuItem';
 import Select from '@material-ui/core/Select';
+import Grid from '@material-ui/core/Grid';
 import FormControl from '@material-ui/core/FormControl';
 import classNames from 'clsx';
 import { lighten } from '@material-ui/core/styles/colorManipulator';
@@ -61,14 +58,12 @@ const styles = theme => ({
     acc[`${title}PriorityHover`] = { '&:hover': { background: activeColor } };
     return acc;
   }, {}),
-  contentItem: {
-    paddingLeft: 0,
-  },
   contentItemValue: {
     padding: 0,
   },
   contentItemIcon: {
-    marginRight: theme.spacing(1),
+    textAlign: 'center',
+    verticalAlign: 'middle',
   },
   flexibleSpace: {
     margin: '0 auto 0 0',
@@ -91,15 +86,53 @@ const styles = theme => ({
   defaultBullet: {
     background: theme.palette.divider,
   },
-  tooltipContent: {
-    paddingLeft: theme.spacing(2.2),
-    paddingRight: theme.spacing(2.2),
-  },
   titleNoWrap: {
     '& div > div > div': {
       whiteSpace: 'normal',
     },
   },
+  content: {
+    padding: theme.spacing(3, 1),
+    paddingTop: 0,
+    backgroundColor: theme.palette.background.paper,
+    boxSizing: 'border-box',
+    width: '400px',
+  },
+  text: {
+    ...theme.typography.body2,
+    display: 'inline-block',
+  },
+  title: {
+    ...theme.typography.h6,
+    color: theme.palette.text.secondary,
+    fontWeight: theme.typography.fontWeightBold,
+    overflow: 'hidden',
+    textOverflow: 'ellipsis',
+    whiteSpace: 'nowrap',
+  },
+  icon: {
+    verticalAlign: 'middle',
+  },
+  grayIcon: {
+    color: theme.palette.action.active,
+  },
+  lens: {
+    width: theme.spacing(4.5),
+    height: theme.spacing(4.5),
+    verticalAlign: 'super',
+  },
+  textCenter: {
+    textAlign: 'center',
+  },
+  dateAndTitle: {
+    lineHeight: 1.1,
+  },
+  titleContainer: {
+    paddingBottom: theme.spacing(2),
+  },
+  container: {
+    paddingBottom: theme.spacing(1.5),
+  },
 });
 
 const PrioritySelectorItem = ({ id, classes }) => {
@@ -177,54 +210,53 @@ const EditButton = withStyles(styles, { name: 'EditButton' })(
   ),
 );
 
-const TooltipHeader = withStyles(styles, { name: 'TooltipHeader' })(
-  ({ classes, appointmentData, ...restProps }) => {
-    const priorityClasses = createClassesByPriorityId(
-      appointmentData.priorityId, classes,
-      { background: true },
-    );
-    return (
-      <AppointmentTooltip.Header
-        {...restProps}
-        appointmentData={appointmentData}
-        className={classNames(priorityClasses, classes.titleNoWrap)}
-      />
-    );
-  },
-);
-
 const TooltipContent = withStyles(styles, { name: 'TooltipContent' })(
-  ({ classes, appointmentData, ...restProps }) => {
+  // #FOLD_BLOCK
+  ({ classes, appointmentData, formatDate }) => {
     const priority = getPriorityById(appointmentData.priorityId);
     const priorityClasses = createClassesByPriorityId(
       appointmentData.priorityId, classes, { color: true },
     );
-    let icon = <LowPriority />;
-    if (appointmentData.priorityId === 2) icon = <Event />;
-    else if (appointmentData.priorityId === 3) icon = <PriorityHigh />;
+    let icon = <LowPriority className={classes.icon} />;
+    if (appointmentData.priorityId === 2) icon = <Event className={classes.icon} />;
+    else if (appointmentData.priorityId === 3) icon = <PriorityHigh className={classes.icon} />;
     return (
-      <AppointmentTooltip.Content {...restProps} className={classes.tooltipContent}>
-        <List>
-          <ListItem className={classes.contentItem}>
-            <ListItemIcon className={`${classes.contentItemIcon} ${priorityClasses}`}>
-              {icon}
-            </ListItemIcon>
-            <ListItemText className={classes.contentItemValue}>
-              <span className={priorityClasses}>{` ${priority} priority`}</span>
-            </ListItemText>
-          </ListItem>
-          <ListItem className={classes.contentItem}>
-            <ListItemIcon className={`${classes.contentItemIcon}`}>
-              <AccessTime />
-            </ListItemIcon>
-            <ListItemText className={classes.contentItemValue}>
-              {moment(appointmentData.startDate).format('h:mm A')}
-              {' - '}
-              {moment(appointmentData.endDate).format('h:mm A')}
-            </ListItemText>
-          </ListItem>
-        </List>
-      </AppointmentTooltip.Content>
+      <div className={classes.content}>
+        <Grid container alignItems="center" className={classes.titleContainer}>
+          <Grid item xs={2} className={classNames(classes.textCenter, priorityClasses)}>
+            <Lens className={classes.lens} />
+          </Grid>
+          <Grid item xs={10}>
+            <div>
+              <div className={classNames(classes.title, classes.dateAndTitle)}>
+                {appointmentData.title}
+              </div>
+              <div className={classNames(classes.text, classes.dateAndTitle)}>
+                {formatDate(appointmentData.startDate, { day: 'numeric', weekday: 'long' })}
+              </div>
+            </div>
+          </Grid>
+        </Grid>
+        <Grid container alignItems="center" className={classes.container}>
+          <Grid item xs={2} className={classes.textCenter}>
+            <AccessTime className={classNames(classes.icon, classes.grayIcon)} />
+          </Grid>
+          <Grid item xs={10}>
+            <div className={classes.text}>
+              {`${formatDate(appointmentData.startDate, { hour: 'numeric', minute: 'numeric' })}
+              - ${formatDate(appointmentData.endDate, { hour: 'numeric', minute: 'numeric' })}`}
+            </div>
+          </Grid>
+        </Grid>
+        <Grid container alignItems="center">
+          <Grid className={classNames(classes.contentItemIcon, priorityClasses)} item xs={2}>
+            {icon}
+          </Grid>
+          <Grid className={classes.contentItemValue} item xs={10}>
+            <span className={priorityClasses}>{` ${priority} priority`}</span>
+          </Grid>
+        </Grid>
+      </div>
     );
   },
 );
@@ -294,7 +326,6 @@ export default class Demo extends React.PureComponent {
           <ViewSwitcher />
           <AllDayPanel />
           <AppointmentTooltip
-            headerComponent={TooltipHeader}
             contentComponent={TooltipContent}
             commandButtonComponent={EditButton}
             showOpenButton

diff --git a/...er-demos/src/demo-sources/scheduler-featured-integrated-data-shaping/material-ui/demo.tsx b/...er-demos/src/demo-sources/scheduler-featured-integrated-data-shaping/material-ui/demo.tsx
@@ -271,6 +271,7 @@ export default () => (
         timeTableCellComponent={TimeTableCell}
       />
       <DayView
+        displayName={'Three days'}
         startDayHour={9}
         endDayHour={17}
         intervalCount={3}

diff --git a/...x-react-scheduler-demos/src/demo-sources/scheduler-featured-overview/material-ui/demo.jsx b/...x-react-scheduler-demos/src/demo-sources/scheduler-featured-overview/material-ui/demo.jsx
@@ -15,10 +15,13 @@ import {
   AppointmentForm,
   EditRecurrenceMenu,
 } from '@devexpress/dx-react-scheduler-material-ui';
+import Grid from '@material-ui/core/Grid';
 import WbSunny from '@material-ui/icons/WbSunny';
 import FilterDrama from '@material-ui/icons/FilterDrama';
 import Opacity from '@material-ui/icons/Opacity';
 import ColorLens from '@material-ui/icons/ColorLens';
+import Lens from '@material-ui/icons/Lens';
+import AccessTime from '@material-ui/icons/AccessTime';
 import { withStyles } from '@material-ui/core/styles';
 import { owners } from '../../../demo-data/tasks';
 
@@ -191,10 +194,49 @@ const styles = theme => ({
     alignItems: 'center',
   },
   ...owners.reduce((acc, { id, color }) => {
-    acc[`${id}PriorityBackground`] = { background: color, '& button.edit-button': { background: lighten(color, 0.15) } };
     acc[`${id}PriorityColor`] = { color };
     return acc;
   }, {}),
+  tooltipContent: {
+    padding: theme.spacing(3, 1),
+    paddingTop: 0,
+    backgroundColor: theme.palette.background.paper,
+    boxSizing: 'border-box',
+    width: '400px',
+  },
+  tooltipText: {
+    ...theme.typography.body2,
+    display: 'inline-block',
+  },
+  title: {
+    ...theme.typography.h6,
+    color: theme.palette.text.secondary,
+    fontWeight: theme.typography.fontWeightBold,
+    overflow: 'hidden',
+    textOverflow: 'ellipsis',
+    whiteSpace: 'nowrap',
+  },
+  icon: {
+    color: theme.palette.action.active,
+    verticalAlign: 'middle',
+  },
+  circle: {
+    width: theme.spacing(4.5),
+    height: theme.spacing(4.5),
+    verticalAlign: 'super',
+  },
+  textCenter: {
+    textAlign: 'center',
+  },
+  dateAndTitle: {
+    lineHeight: 1.1,
+  },
+  titleContainer: {
+    paddingBottom: theme.spacing(2),
+  },
+  container: {
+    paddingBottom: theme.spacing(1.5),
+  },
 });
 
 const WeatherIcon = ({ classes, id }) => {
@@ -267,34 +309,45 @@ const FlexibleSpace = withStyles(styles, { name: 'ToolbarRoot' })(({ classes, ..
     </div>
   </Toolbar.FlexibleSpace>
 ));
-
-const TooltipHeader = withStyles(styles, { name: 'TooltipHeader' })(
+const TooltipContent = withStyles(styles, { name: 'TooltipContent' })(
   // #FOLD_BLOCK
-  ({ classes, appointmentData, ...restProps }) => {
+  ({ classes, appointmentData, formatDate }) => {
     const priorityClasses = createClassesByPriorityId(
-      appointmentData.ownerId, classes,
-      { background: true },
+      appointmentData.ownerId, classes, { color: true },
     );
     return (
-      <AppointmentTooltip.Header
-        {...restProps}
-        appointmentData={appointmentData}
-        className={priorityClasses}
-      />
+      <div className={classes.tooltipContent}>
+        <Grid container alignItems="center" className={classes.titleContainer}>
+          <Grid item xs={2} className={classNames(classes.textCenter, priorityClasses)}>
+            <Lens className={classes.circle} />
+          </Grid>
+          <Grid item xs={10}>
+            <div>
+              <div className={classNames(classes.title, classes.dateAndTitle)}>
+                {appointmentData.title}
+              </div>
+              <div className={classNames(classes.tooltipText, classes.dateAndTitle)}>
+                {formatDate(appointmentData.startDate, { day: 'numeric', weekday: 'long' })}
+              </div>
+            </div>
+          </Grid>
+        </Grid>
+        <Grid container alignItems="center" className={classes.container}>
+          <Grid item xs={2} className={classes.textCenter}>
+            <AccessTime className={classes.icon} />
+          </Grid>
+          <Grid item xs={10}>
+            <div className={classes.tooltipText}>
+              {`${formatDate(appointmentData.startDate, { hour: 'numeric', minute: 'numeric' })}
+              - ${formatDate(appointmentData.endDate, { hour: 'numeric', minute: 'numeric' })}`}
+            </div>
+          </Grid>
+        </Grid>
+      </div>
     );
   },
 );
 
-const EditButton = withStyles(styles, { name: 'EditButton' })(
-  ({ classes, id, ...restProps }) => (
-    <AppointmentTooltip.CommandButton
-      {...restProps}
-      {...id === 'open' ? { className: 'edit-button' } : null}
-      id={id}
-    />
-  ),
-);
-
 export default class Demo extends React.PureComponent {
   // #FOLD_BLOCK
   constructor(props) {
@@ -360,8 +413,7 @@ export default class Demo extends React.PureComponent {
             showCloseButton
             showDeleteButton
             showOpenButton
-            headerComponent={TooltipHeader}
-            commandButtonComponent={EditButton}
+            contentComponent={TooltipContent}
           />
           <AppointmentForm
             readOnly