@pie-lib/graphing 2.34.3-next.2 → 2.34.4-next.0

package/src/axis/axes.jsx

@@ -1,9 +1,9 @@
 import React from 'react';
-import { Axis } from '@vx/axis';
+import { Axis } from '@visx/axis';
 import { types } from '@pie-lib/plot';
 import PropTypes from 'prop-types';
 import Arrow from './arrow';
-import { withStyles } from '@material-ui/core';
+import { styled } from '@mui/material/styles';
 import { countWords, findLongestWord, amountToIncreaseWidth, getTickValues } from '../utils';
 import { color, Readable } from '@pie-lib/render-ui';
 
@@ -21,34 +21,37 @@ const AxisDefaultProps = {
   },
 };
 
-const axisStyles = (theme) => ({
-  line: {
+const StyledArrow = styled(Arrow)(() => ({
+  fill: color.defaults.PRIMARY,
+}));
+
+const StyledLabel = styled('div')(({ theme }) => ({
+  fontSize: theme.typography.fontSize,
+}));
+
+const StyledAxisLabelHolder = styled('div')(({ theme }) => ({
+  padding: 0,
+  margin: 0,
+  textAlign: 'center',
+  '* > *': {
+    margin: 0,
+    padding: 0,
+  },
+  fontSize: theme.typography.fontSize,
+}));
+
+const StyledAxesGroup = styled('g')(() => ({
+  '& .visx-axis-line': {
     stroke: color.defaults.PRIMARY,
     strokeWidth: 3,
   },
-  arrow: {
-    fill: color.defaults.PRIMARY,
-  },
-  tick: {
+  '& .visx-axis-tick': {
     fill: color.defaults.PRIMARY,
-    '& > line': {
+    '& line': {
       stroke: color.defaults.PRIMARY,
     },
   },
-  labelFontSize: {
-    fontSize: theme.typography.fontSize,
-  },
-  axisLabelHolder: {
-    padding: 0,
-    margin: 0,
-    textAlign: 'center',
-    '* > *': {
-      margin: 0,
-      padding: 0,
-    },
-    fontSize: theme.typography.fontSize,
-  },
-});
+}));
 
 const tickLabelStyles = {
   fontFamily: 'Roboto',
@@ -84,7 +87,6 @@ export const firstNegativeValue = (interval) => (interval || []).find((element)
 export class RawXAxis extends React.Component {
   static propTypes = {
     ...AxisPropTypes,
-    classes: PropTypes.object,
     graphProps: types.GraphPropsType.isRequired,
   };
   static defaultProps = AxisDefaultProps;
@@ -92,7 +94,6 @@ export class RawXAxis extends React.Component {
   render() {
     const {
       includeArrows,
-      classes,
       graphProps,
       columnTicksValues,
       skipValues,
@@ -101,12 +102,6 @@ export class RawXAxis extends React.Component {
     } = this.props;
     const { scale, domain, size, range } = graphProps || {};
 
-    // Having 0 as a number in columnTicksValues does not make 0 to show up
-    // so we use this trick, by defining it as a string:
-    const tickValues =
-      (domain.labelStep || range.labelStep) && domain.min <= 0 ? ['0', ...columnTicksValues] : columnTicksValues;
-    // However, the '0' has to be displayed only if other tick labels (y-axis or x-axis) are displayed
-
     const labelProps = (label) => {
       const y = skipValues && skipValues[0] === label ? distanceFromOriginToFirstNegativeY + 4 : dy;
 
@@ -114,8 +109,8 @@ export class RawXAxis extends React.Component {
         ...tickLabelStyles,
         textAnchor: 'middle',
         y: y,
-        dx: label === '0' ? -10 : 0,
-        dy: label === '0' ? -7 : 0,
+        dx: label === 0 ? -10 : 0,
+        dy: label === 0 ? -7 : 0,
       };
     };
 
@@ -124,36 +119,35 @@ export class RawXAxis extends React.Component {
     const necessaryWidth = amountToIncreaseWidth(longestWord) + 2;
 
     return (
-      <React.Fragment>
+      <StyledAxesGroup>
         <Axis
-          axisLineClassName={classes.line}
           scale={scale.x}
           top={scale.y(0)}
           left={0}
           label={domain.label}
           rangePadding={8}
-          tickClassName={classes.tick}
           tickFormat={(value) => value}
           tickLabelProps={labelProps}
-          tickValues={tickValues}
+          tickValues={columnTicksValues}
+          hideZero={!(domain.labelStep || range.labelStep) && domain.min <= 0}
         />
         {includeArrows && includeArrows.left && (
-          <Arrow direction="left" x={domain.min} y={0} className={classes.arrow} scale={scale} />
+          <StyledArrow direction="left" x={domain.min} y={0} scale={scale} />
         )}
         {includeArrows && includeArrows.right && (
-          <Arrow direction="right" x={domain.max} y={0} className={classes.arrow} scale={scale} />
+          <StyledArrow direction="right" x={domain.max} y={0} scale={scale} />
         )}
         {domain.axisLabel && (
           <foreignObject x={size.width + 17} y={scale.y(0) - 9} width={necessaryWidth} height={20 * necessaryRows}>
-            <div dangerouslySetInnerHTML={{ __html: domain.axisLabel }} className={classes.labelFontSize} />
+            <StyledLabel dangerouslySetInnerHTML={{ __html: domain.axisLabel }} />
           </foreignObject>
         )}
-      </React.Fragment>
+      </StyledAxesGroup>
     );
   }
 }
 
-const XAxis = withStyles(axisStyles)(RawXAxis);
+const XAxis = RawXAxis;
 
 export class RawYAxis extends React.Component {
   static propTypes = {
@@ -163,7 +157,7 @@ export class RawYAxis extends React.Component {
   static defaultProps = AxisDefaultProps;
 
   render() {
-    const { classes, includeArrows, graphProps, skipValues, rowTickValues } = this.props;
+    const { includeArrows, graphProps, skipValues, rowTickValues } = this.props;
     const { scale, range, size } = graphProps || {};
 
     const necessaryWidth = range.axisLabel ? amountToIncreaseWidth(range.axisLabel.length) : 0;
@@ -171,9 +165,8 @@ export class RawYAxis extends React.Component {
     const customTickFormat = (value) => (skipValues && skipValues.indexOf(value) >= 0 ? '' : value);
 
     return (
-      <React.Fragment>
+      <StyledAxesGroup>
         <Axis
-          axisLineClassName={classes.line}
           orientation={'left'}
           scale={scale.y}
           top={0}
@@ -183,7 +176,6 @@ export class RawYAxis extends React.Component {
           labelProps={{ 'data-pie-readable': false }}
           rangePadding={8}
           tickLength={10}
-          tickClassName={classes.tick}
           tickFormat={customTickFormat}
           tickLabelProps={(value) => {
             let digits = value.toLocaleString().replace(/[.-]/g, '').length || 1;
@@ -199,31 +191,29 @@ export class RawYAxis extends React.Component {
           tickTextAnchor={'bottom'}
           tickValues={rowTickValues}
         />
-
         {includeArrows && includeArrows.down && (
-          <Arrow direction="down" x={0} y={range.min} className={classes.arrow} scale={scale} />
+          <StyledArrow direction="down" x={0} y={range.min} scale={scale} />
         )}
         {includeArrows && includeArrows.up && (
-          <Arrow direction="up" x={0} y={range.max} className={classes.arrow} scale={scale} />
+          <StyledArrow direction="up" x={0} y={range.max} scale={scale} />
         )}
         {range.axisLabel && (
           <foreignObject x={scale.x(0) - necessaryWidth / 2} y={-33} width={necessaryWidth} height="20">
             <Readable false>
-              <div dangerouslySetInnerHTML={{ __html: range.axisLabel }} className={classes.axisLabelHolder} />
+              <StyledAxisLabelHolder dangerouslySetInnerHTML={{ __html: range.axisLabel }} />
             </Readable>
           </foreignObject>
         )}
-      </React.Fragment>
+      </StyledAxesGroup>
     );
   }
 }
 
-const YAxis = withStyles(axisStyles)(RawYAxis);
+const YAxis = RawYAxis;
 
 export default class Axes extends React.Component {
   static propTypes = {
     ...AxisPropTypes,
-    classes: PropTypes.object,
     graphProps: types.GraphPropsType.isRequired,
   };
   static defaultProps = AxisDefaultProps;
@@ -283,7 +273,7 @@ export default class Axes extends React.Component {
 
     // each axis has to be displayed only if the domain & range include it
     return (
-      <React.Fragment>
+      <StyledAxesGroup>
         {range.min <= 0 ? (
           <XAxis
             {...this.props}
@@ -301,7 +291,7 @@ export default class Axes extends React.Component {
             distanceFromOriginToFirstNegativeX={distanceFromOriginToFirstNegativeX}
           />
         ) : null}
-      </React.Fragment>
+      </StyledAxesGroup>
     );
   }
 }

package/src/coordinates-label.jsx

@@ -2,23 +2,22 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { types } from '@pie-lib/plot';
 import { color } from '@pie-lib/render-ui';
-import { withStyles } from '@material-ui/core/styles';
-import InputBase from '@material-ui/core/InputBase';
+import { styled } from '@mui/material/styles';
+import InputBase from '@mui/material/InputBase';
 import { roundNumber } from './utils';
 
-const styles = (theme) => ({
-  input: {
-    fontFamily: theme.typography.fontFamily,
-    fontSize: theme.typography.fontSize,
-    borderRadius: '8px',
-    background: theme.palette.common.white,
-    color: color.defaults.PRIMARY_DARK,
-  },
-  inputLabel: {
+const StyledInputBase = styled(InputBase)(({ theme }) => ({
+  fontFamily: theme.typography.fontFamily,
+  fontSize: theme.typography.fontSize,
+  borderRadius: '8px',
+  background: theme.palette.common.white,
+  color: color.defaults.PRIMARY_DARK,
+  '& .MuiInputBase-input': {
     padding: 0,
   },
-});
+}));
 
+// eslint-disable-next-line react/prop-types
 export const getLabelPosition = (graphProps, x, y, labelLength) => {
   const { scale, domain, range } = graphProps;
   // treat corner cases for maximum and minimum
@@ -39,7 +38,7 @@ export const getLabelPosition = (graphProps, x, y, labelLength) => {
   };
 };
 
-export const CoordinatesLabel = ({ x, y, graphProps, classes }) => {
+export const CoordinatesLabel = ({ x, y, graphProps }) => {
   const label = `(${roundNumber(x)}, ${roundNumber(y)})`;
   const labelLength = (label.length || 0) * 6;
   const labelPosition = getLabelPosition(graphProps, x, y, labelLength);
@@ -53,10 +52,8 @@ export const CoordinatesLabel = ({ x, y, graphProps, classes }) => {
   };
 
   return (
-    <InputBase
+    <StyledInputBase
       style={style}
-      classes={{ input: classes.inputLabel }}
-      className={classes.input}
       value={label}
       inputProps={{ ariaLabel: 'naked' }}
     />
@@ -65,9 +62,8 @@ export const CoordinatesLabel = ({ x, y, graphProps, classes }) => {
 
 CoordinatesLabel.propTypes = {
   graphProps: types.GraphPropsType,
-  classes: PropTypes.object,
   x: PropTypes.number,
   y: PropTypes.number,
 };
 
-export default withStyles(styles)(CoordinatesLabel);
+export default CoordinatesLabel;

package/src/graph-with-controls.jsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withStyles } from '@material-ui/core/styles';
-import classNames from 'classnames';
+import { styled } from '@mui/material/styles';
 import uniq from 'lodash/uniq';
 import isString from 'lodash/isString';
 import { color } from '@pie-lib/render-ui';
@@ -10,8 +9,45 @@ import ToolMenu from './tool-menu';
 import Graph, { graphPropTypes } from './graph';
 import UndoRedo from './undo-redo';
 import { allTools, toolsArr } from './tools';
-import { ExpansionPanel, ExpansionPanelDetails, ExpansionPanelSummary, Typography } from '@material-ui/core';
-import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+import { Accordion, AccordionDetails, AccordionSummary, Typography } from '@mui/material';
+import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
+
+const StyledGraphContainer = styled('div')({
+  display: 'flex',
+  flexDirection: 'column',
+  width: 'min-content',
+});
+
+const StyledControls = styled('div')(({ theme }) => ({
+  display: 'flex',
+  justifyContent: 'space-between',
+  padding: theme.spacing(1),
+  color: color.text(),
+  backgroundColor: color.primaryLight(),
+  '& button': {
+    fontSize: theme.typography.fontSize,
+  },
+}));
+
+const StyledAccordion = styled(Accordion)({
+  backgroundColor: color.primaryLight(),
+  width: '100%',
+});
+
+const StyledAccordionSummary = styled(AccordionSummary)(({ theme }) => ({
+  padding: `0 ${theme.spacing(1)}px`,
+  minHeight: '32px !important',
+  '& .MuiAccordionSummary-content': {
+    margin: '4px 0 !important',
+  },
+}));
+
+const StyledAccordionDetails = styled(AccordionDetails)(({ theme }) => ({
+  padding: 0,
+  marginTop: theme.spacing(1),
+  display: 'flex',
+  justifyContent: 'space-between',
+}));
 
 export const setToolbarAvailability = (toolbarTools) =>
   toolsArr.map((tA) => ({ ...tA, toolbar: !!toolbarTools.find((t) => t === tA.type) })) || [];
@@ -29,23 +65,16 @@ export const filterByVisibleToolTypes = (toolbarTools, marks) =>
 
 const getDefaultCurrentTool = (toolType) => toolsArr.find((tool) => tool.type === toolType) || null;
 
-const Collapsible = ({ classes, children, title }) => (
-  <ExpansionPanel elevation={0} className={classes.expansionPanel} disabledGutters={true} square={true}>
-    <ExpansionPanelSummary
-      classes={{
-        root: classes.summaryRoot,
-        content: classes.summaryContent,
-      }}
-      expandIcon={<ExpandMoreIcon />}
-    >
+const Collapsible = ({ children, title }) => (
+  <StyledAccordion elevation={0} disableGutters={true} square={true} TransitionProps={{ timeout: { enter: 225, exit: 195 } }}>
+    <StyledAccordionSummary expandIcon={<ExpandMoreIcon />}>
       <Typography variant="subheading">{title}</Typography>
-    </ExpansionPanelSummary>
-    <ExpansionPanelDetails className={classes.details}>{children}</ExpansionPanelDetails>
-  </ExpansionPanel>
+    </StyledAccordionSummary>
+    <StyledAccordionDetails>{children}</StyledAccordionDetails>
+  </StyledAccordion>
 );
 
 Collapsible.propTypes = {
-  classes: PropTypes.object,
   children: PropTypes.array,
   title: PropTypes.string,
 };
@@ -96,7 +125,6 @@ export class GraphWithControls extends React.Component {
     let { currentTool, labelModeEnabled } = this.state;
     const {
       axesSettings,
-      classes,
       className,
       coordinatesOnHover,
       collapsibleToolbar,
@@ -162,16 +190,16 @@ export class GraphWithControls extends React.Component {
     );
 
     return (
-      <div className={classNames(classes.graphWithControls, className)}>
-        <div className={classes.controls}>
+      <StyledGraphContainer className={className}>
+        <StyledControls>
           {collapsibleToolbar ? (
-            <Collapsible classes={classes} title={collapsibleToolbarTitle}>
+            <Collapsible title={collapsibleToolbarTitle}>
               {graphActions}
             </Collapsible>
           ) : (
             graphActions
           )}
-        </div>
+        </StyledControls>
 
         <div ref={(r) => (this.labelNode = r)} />
 
@@ -201,44 +229,9 @@ export class GraphWithControls extends React.Component {
           removeIncompleteTool={removeIncompleteTool}
           limitLabeling={limitLabeling}
         />
-      </div>
+      </StyledGraphContainer>
     );
   }
 }
 
-const styles = (theme) => ({
-  graphWithControls: {
-    display: 'flex',
-    flexDirection: 'column',
-    width: 'min-content',
-  },
-  controls: {
-    display: 'flex',
-    justifyContent: 'space-between',
-    padding: theme.spacing.unit,
-    color: color.text(),
-    backgroundColor: color.primaryLight(),
-    '& button': {
-      fontSize: theme.typography.fontSize,
-    },
-  },
-  expansionPanel: {
-    backgroundColor: color.primaryLight(),
-    width: '100%',
-  },
-  summaryRoot: {
-    padding: `0 ${theme.spacing.unit}px`,
-    minHeight: '32px !important',
-  },
-  summaryContent: {
-    margin: '4px 0 !important',
-  },
-  details: {
-    padding: 0,
-    marginTop: theme.spacing.unit,
-    display: 'flex',
-    justifyContent: 'space-between',
-  },
-});
-
-export default withStyles(styles)(GraphWithControls);
+export default GraphWithControls;