@pie-lib/charting 5.36.1 → 5.37.0-mui-update.0

package/src/plot/line.js

@@ -2,14 +2,22 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { LinePath } from '@vx/shape';
 import { Group } from '@vx/group';
+import { styled } from '@mui/material/styles';
 
 import { types } from '@pie-lib/plot';
 import { dataToXBand } from '../utils';
 import { color } from '@pie-lib/render-ui';
 import Plot from './common/plot';
+import { correct, incorrect } from '../common/styles';
+
+const StyledLinePath = styled(LinePath)(() => ({
+  stroke: color.visualElementsColors.PLOT_FILL_COLOR,
+  '&.correct': correct('stroke'),
+  '&.incorrect': incorrect('stroke'),
+}));
 
 const CustomBarElement = (props) => {
-  const { index, pointDiameter, barX, barWidth, pointHeight, label, value, classes, scale, dottedOverline } = props;
+  const { index, pointDiameter, barX, barWidth, pointHeight, label, value, scale, dottedOverline } = props;
 
   const x = barX + (barWidth - pointDiameter) / 2;
   const y = scale.y(index) - (pointHeight - pointDiameter) / 2;
@@ -28,27 +36,27 @@ const CustomBarElement = (props) => {
     />
   ) : (
     <Group>
-      <LinePath
+      <StyledLinePath
         data={[
           { x, y },
           { x: x + pointDiameter, y: y - pointDiameter },
         ]}
         key={`point-${label}-${value}-${index}-1`}
-        className={classes.line}
+        className={'line'}
         x={(d) => d.x}
         y={(d) => d.y}
         strokeWidth={pointDiameter / 5}
       />
-      <LinePath
+      <StyledLinePath
         data={[
           { x, y: y - pointDiameter },
           { x: x + pointDiameter, y },
         ]}
         key={`point-${label}-${value}-${index}-2`}
-        className={classes.line}
         x={(d) => d.x}
         y={(d) => d.y}
         strokeWidth={pointDiameter / 5}
+        className={'line'}
       />
     </Group>
   );
@@ -62,8 +70,8 @@ CustomBarElement.propTypes = {
   pointHeight: PropTypes.number,
   value: PropTypes.number,
   label: PropTypes.string,
-  classes: PropTypes.object,
   scale: PropTypes.object,
+  dottedOverline: PropTypes.bool,
 };
 
 export class LinePlot extends React.Component {

package/src/tool-menu.jsx

@@ -3,57 +3,54 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { color } from '@pie-lib/render-ui';
 
-import { withStyles } from '@material-ui/core/styles';
-import cn from 'classnames';
-import Button from '@material-ui/core/Button';
+import { styled } from '@mui/material/styles';
+import Button from '@mui/material/Button';
 import Translator from '@pie-lib/translator';
 
 const { translator } = Translator;
 
-const buttonStyles = (theme) => ({
-  root: {
-    color: color.text(),
-    border: `1px solid ${color.secondary()}`,
-    fontSize: theme.typography.fontSize,
-  },
-  selected: {
+const StyledMiniButton = styled(Button)(({ theme, selected, disabled }) => ({
+  color: color.text(),
+  border: `1px solid ${color.secondary()}`,
+  fontSize: theme.typography.fontSize,
+  ...(selected && {
     backgroundColor: color.background(),
     '& span': {
       color: color.primaryDark(),
     },
-  },
-  notSelected: {
+  }),
+  ...(!selected && !disabled && {
     '& span': {
       color: color.primary(),
     },
     backgroundColor: color.background(),
-  },
-  disabled: {
+  }),
+  ...(disabled && {
     '& span': {
       color: color.primary(),
     },
     backgroundColor: color.disabled(),
-  },
-});
+  }),
+}));
 
-export const MiniButton = withStyles(buttonStyles)((props) => {
-  const { disabled, classes, className, selected, value, onClick } = props;
+export const MiniButton = (props) => {
+  const { disabled, className, selected, value, onClick } = props;
   return (
-    <Button
+    <StyledMiniButton
       size="small"
       disabled={disabled}
+      selected={selected}
       color={selected ? 'secondary' : 'default'}
-      className={cn(classes.root, selected && classes.selected, className)}
-      classes={{ disabled: cn(disabled && classes.disabled) }}
+      className={className}
       value={value}
       key={value}
       variant="outlined"
       onClick={onClick}
     >
       {value}
-    </Button>
+    </StyledMiniButton>
   );
-});
+};
 MiniButton.propTypes = {
   disabled: PropTypes.bool,
   className: PropTypes.string,