@pie-lib/graphing-solution-set 2.34.1 → 2.35.0-mui-update.0

package/src/axis/axes.jsx

@@ -3,7 +3,7 @@ import { Axis } from '@vx/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,33 +21,36 @@ const AxisDefaultProps = {
   },
 };
 
-const axisStyles = (theme) => ({
-  line: {
+const StyledAxis = styled(Axis)(({ theme }) => ({
+  '& .vx-axis-line': {
     stroke: '#8a92c0',
     strokeWidth: 4,
   },
-  arrow: {
-    fill: '#8a92c0',
-  },
-  tick: {
+  '& .vx-axis-tick': {
     fill: color.defaults.BLACK,
     '& > line': {
       stroke: '#8a92c0',
     },
   },
-  labelFontSize: {
-    fontSize: theme.typography.fontSize,
-  },
-  axisLabelHolder: {
-    padding: 0,
+}));
+
+const LabelContainer = styled('div')(({ theme }) => ({
+  fontSize: theme.typography.fontSize,
+}));
+
+const AxisLabelHolder = styled('div')(({ theme }) => ({
+  padding: 0,
+  margin: 0,
+  textAlign: 'center',
+  '* > *': {
     margin: 0,
-    textAlign: 'center',
-    '* > *': {
-      margin: 0,
-      padding: 0,
-    },
-    fontSize: theme.typography.fontSize,
+    padding: 0,
   },
+  fontSize: theme.typography.fontSize,
+}));
+
+const StyledArrow = styled(Arrow)({
+  fill: '#8a92c0',
 });
 
 const tickLabelStyles = {
@@ -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,
@@ -125,27 +126,25 @@ export class RawXAxis extends React.Component {
 
     return (
       <React.Fragment>
-        <Axis
-          axisLineClassName={classes.line}
+        <StyledAxis
           scale={scale.x}
           top={scale.y(0)}
           left={0}
           label={domain.label}
           rangePadding={8}
-          tickClassName={classes.tick}
           tickFormat={(value) => value}
           tickLabelProps={labelProps}
           tickValues={tickValues}
         />
         {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} />
+            <LabelContainer dangerouslySetInnerHTML={{ __html: domain.axisLabel }} />
           </foreignObject>
         )}
       </React.Fragment>
@@ -153,7 +152,7 @@ export class RawXAxis extends React.Component {
   }
 }
 
-const XAxis = withStyles(axisStyles)(RawXAxis);
+const XAxis = RawXAxis;
 
 export class RawYAxis extends React.Component {
   static propTypes = {
@@ -163,7 +162,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;
@@ -172,8 +171,7 @@ export class RawYAxis extends React.Component {
 
     return (
       <React.Fragment>
-        <Axis
-          axisLineClassName={classes.line}
+        <StyledAxis
           orientation={'left'}
           scale={scale.y}
           top={0}
@@ -183,7 +181,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,17 +196,16 @@ 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} />
+              <AxisLabelHolder dangerouslySetInnerHTML={{ __html: range.axisLabel }} />
             </Readable>
           </foreignObject>
         )}
@@ -218,12 +214,11 @@ export class RawYAxis extends React.Component {
   }
 }
 
-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;

package/src/coordinates-label.jsx

@@ -2,22 +2,20 @@ 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.BLACK,
-  },
-  inputLabel: {
+const StyledInputBase = styled(InputBase)(({ theme }) => ({
+  fontFamily: theme.typography.fontFamily,
+  fontSize: theme.typography.fontSize,
+  borderRadius: '8px',
+  background: theme.palette.common.white,
+  color: color.defaults.BLACK,
+  '& .MuiInputBase-input': {
     padding: 0,
   },
-});
+}));
 
 export const getLabelPosition = (graphProps, x, y, labelLength) => {
   const { scale, domain, range } = graphProps;
@@ -39,7 +37,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 +51,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 +61,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,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withStyles } from '@material-ui/core/styles';
+import { styled } from '@mui/material/styles';
 import classNames from 'classnames';
 import uniq from 'lodash/uniq';
 import isString from 'lodash/isString';
@@ -9,11 +9,19 @@ 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';
 
 export const setToolbarAvailability = (toolbarTools) =>
-  toolsArr.map((tA) => ({ ...tA, toolbar: !!toolbarTools.find((t) => t === tA.type) })) || [];
+  toolsArr.map((tA) => ({
+    ...tA,
+    toolbar: !!toolbarTools.find((t) => t === tA.type),
+  })) || [];
 
 export const toolIsAvailable = (tools, currentTool) =>
   currentTool && tools && (tools.find((tool) => tool.type === currentTool.type) || {}).toolbar;
@@ -26,26 +34,66 @@ export const filterByValidToolTypes = (backgroundMarks) =>
 export const filterByVisibleToolTypes = (toolbarTools, marks) =>
   marks.filter((bM) => !!toolbarTools.find((tool) => tool === bM.type));
 
-const getDefaultCurrentTool = (toolType) => toolsArr.find((tool) => tool.type === toolType) || null;
+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 />}
-    >
-      <Typography variant="subheading">{title}</Typography>
-    </ExpansionPanelSummary>
-    <ExpansionPanelDetails className={classes.details}>{children}</ExpansionPanelDetails>
-  </ExpansionPanel>
+const GraphWithControlsRoot = styled('div')(({ theme }) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  width: 'min-content',
+}));
+
+const Controls = styled('div')(({ theme }) => ({
+  display: 'flex',
+  justifyContent: 'space-between',
+  padding: 'calc(1.25rem - 12px) calc(1.25rem - 12px) 1.25rem',
+  color: color.text(),
+  backgroundColor: '#9FA8DA',
+  '& button': {
+    fontSize: '0.875rem',
+    padding: '0.25rem .3rem',
+    width: '5rem',
+  },
+}));
+
+const StyledAccordion = styled(Accordion)(({ theme }) => ({
+  backgroundColor: color.primaryLight(),
+  width: '100%',
+  boxShadow: 'none',
+}));
+
+const StyledAccordionSummary = styled(AccordionSummary)(({ theme }) => ({
+  padding: `0 ${theme.spacing(1)}`,
+  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',
+}));
+
+const UndoRedoOuterDiv = styled('div')(() => ({
+  display: 'flex',
+  flexDirection: 'column',
+  marginTop: '.5rem',
+}));
+
+const Collapsible = ({ children, title }) => (
+  <StyledAccordion square disableGutters>
+    <StyledAccordionSummary expandIcon={<ExpandMoreIcon />}>
+      <Typography variant="subtitle1">{title}</Typography>
+    </StyledAccordionSummary>
+    <StyledAccordionDetails>{children}</StyledAccordionDetails>
+  </StyledAccordion>
 );
 
 Collapsible.propTypes = {
-  classes: PropTypes.object,
-  children: PropTypes.array,
+  children: PropTypes.node,
   title: PropTypes.string,
 };
 
@@ -55,7 +103,7 @@ export class GraphWithControls extends React.Component {
     onUndo: PropTypes.func,
     onRedo: PropTypes.func,
     onReset: PropTypes.func,
-    toolbarTools: PropTypes.arrayOf(PropTypes.string), // array of tool types that have to be displayed in the toolbar, same shape as 'allTools'
+    toolbarTools: PropTypes.arrayOf(PropTypes.string),
     language: PropTypes.string,
   };
 
@@ -71,7 +119,6 @@ export class GraphWithControls extends React.Component {
 
   constructor(props) {
     super(props);
-
     this.state = {
       currentTool: getDefaultCurrentTool(props.defaultTool),
       labelModeEnabled: false,
@@ -80,23 +127,22 @@ export class GraphWithControls extends React.Component {
 
   componentDidUpdate(prevProps) {
     const { defaultTool } = this.props;
-
     if (prevProps.defaultTool !== defaultTool) {
       const currentTool = getDefaultCurrentTool(defaultTool);
-
       this.setState({ currentTool });
     }
   }
 
-  changeCurrentTool = (tool, tools) => this.setState({ currentTool: tools.find((t) => t.type === tool) });
+  changeCurrentTool = (tool, tools) =>
+    this.setState({ currentTool: tools.find((t) => t.type === tool) });
 
-  toggleLabelMode = () => this.setState((state) => ({ labelModeEnabled: !state.labelModeEnabled }));
+  toggleLabelMode = () =>
+    this.setState((state) => ({ labelModeEnabled: !state.labelModeEnabled }));
 
   render() {
     let { currentTool, labelModeEnabled } = this.state;
     const {
       axesSettings,
-      classes,
       className,
       coordinatesOnHover,
       collapsibleToolbar,
@@ -126,15 +172,11 @@ export class GraphWithControls extends React.Component {
       onSolutionSetSelected,
       onCustomReset,
     } = this.props;
+
     let { backgroundMarks, marks, toolbarTools } = this.props;
 
-    // make sure only valid tool types are kept (string) and without duplicates
     toolbarTools = uniq(toolbarTools || []).filter((tT) => !!isString(tT)) || [];
-
-    // keep only the backgroundMarks that have valid types
     backgroundMarks = filterByValidToolTypes(backgroundMarks || []);
-
-    // keep only the marks that have types which appear in toolbar
     marks = filterByVisibleToolTypes(toolbarTools, marks || []);
 
     if (gssLineData && gssLineData.lineA && marks[0] && marks[0].type === 'line')
@@ -143,14 +185,12 @@ export class GraphWithControls extends React.Component {
       marks[1].fill = gssLineData.lineB.lineType;
 
     const tools = setToolbarAvailability(toolbarTools);
-
-    // set current tool if there's no current tool or if the existing one is no longer available
     if (!currentTool || !toolIsAvailable(tools, currentTool)) {
       currentTool = getAvailableTool(tools);
     }
 
     const gssActions = gssLineData && (
-      <React.Fragment>
+      <>
         <ToolMenu
           numberOfLines={gssLineData.numberOfLines}
           gssLineData={gssLineData}
@@ -159,29 +199,28 @@ export class GraphWithControls extends React.Component {
           language={language}
         />
         {!disabled && (
-          <UndoRedo
-            className={classes.undoRedoOuterDiv}
-            onUndo={onUndo}
-            onRedo={onRedo}
-            onReset={onCustomReset}
-            language={language}
-          />
+          <UndoRedoOuterDiv>
+            <UndoRedo
+              onUndo={onUndo}
+              onRedo={onRedo}
+              onReset={onCustomReset}
+              language={language}
+            />
+          </UndoRedoOuterDiv>
         )}
-      </React.Fragment>
+      </>
     );
 
     return (
-      <div className={classNames(classes.graphWithControls, className)}>
+      <GraphWithControlsRoot className={classNames(className)}>
         {!disableToolbar && (
-          <div className={classes.controls}>
+          <Controls>
             {collapsibleToolbar ? (
-              <Collapsible classes={classes} title={collapsibleToolbarTitle}>
-                {gssActions}
-              </Collapsible>
+              <Collapsible title={collapsibleToolbarTitle}>{gssActions}</Collapsible>
             ) : (
               gssActions
             )}
-          </div>
+          </Controls>
         )}
 
         <div ref={(r) => (this.labelNode = r)} />
@@ -213,51 +252,9 @@ export class GraphWithControls extends React.Component {
           onSolutionSetSelected={onSolutionSetSelected}
           disabled={!!disabled}
         />
-      </div>
+      </GraphWithControlsRoot>
     );
   }
 }
 
-const styles = (theme) => ({
-  graphWithControls: {
-    display: 'flex',
-    flexDirection: 'column',
-    width: 'min-content',
-  },
-  controls: {
-    display: 'flex',
-    justifyContent: 'space-between',
-    padding: 'calc(1.25rem - 12px) calc(1.25rem - 12px) 1.25rem',
-    color: color.text(),
-    backgroundColor: '#9FA8DA',
-    '& button': {
-      fontSize: '0.875rem',
-      padding: '0.25rem .3rem',
-      width: '5rem',
-    },
-  },
-  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',
-  },
-  undoRedoOuterDiv: {
-    display: 'flex',
-    flexDirection: 'column',
-    marginTop: '.5rem',
-  },
-});
-
-export default withStyles(styles)(GraphWithControls);
+export default GraphWithControls;