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

package/src/line/common/line.jsx

@@ -4,7 +4,7 @@ import { LinePath } from '@vx/shape';
 import PropTypes from 'prop-types';
 import { types } from '@pie-lib/plot';
 import DraggableHandle, { DragHandle } from './drag-handle';
-import { withStyles } from '@material-ui/core/styles/index';
+import { styled } from '@mui/material/styles';
 import isEqual from 'lodash/isEqual';
 import { color } from '@pie-lib/render-ui';
 
@@ -23,11 +23,17 @@ const getData = (data, domain) => {
   }));
 };
 
+const StyledLinePath = styled(LinePath)(() => ({
+  fill: 'transparent',
+  stroke: color.defaults.TERTIARY,
+  strokeWidth: 3,
+  transition: 'stroke 200ms ease-in, stroke-width 200ms ease-in',
+}));
+
 export class RawLine extends React.Component {
   static propTypes = {
     onChange: PropTypes.func,
     value: PropTypes.number,
-    classes: PropTypes.object,
     label: PropTypes.string,
     xBand: PropTypes.func,
     index: PropTypes.number.isRequired,
@@ -78,18 +84,19 @@ export class RawLine extends React.Component {
   };
 
   render() {
-    const { graphProps, data, classes, CustomDraggableComponent, defineChart, correctData } = this.props;
+    const { graphProps, data, CustomDraggableComponent, defineChart, correctData } = this.props;
     const { line: lineState, dragging } = this.state;
     const { scale } = graphProps;
     const lineToUse = dragging ? lineState : getData(data, graphProps.domain);
 
+    console.log('defineChart', lineToUse);
     return (
       <React.Fragment>
-        <LinePath
+        <StyledLinePath
           data={lineToUse}
           x={(d) => scale.x(d.x)}
           y={(d) => scale.y(d.dragValue !== undefined ? d.dragValue : d.y)}
-          className={classes.line}
+          className="line"
         />
         {lineToUse &&
           lineToUse.map((point, i) => {
@@ -97,6 +104,8 @@ export class RawLine extends React.Component {
             const enableDraggable = defineChart || point.interactive;
             const Component = enableDraggable ? DraggableHandle : DragHandle;
 
+            console.log('point', point);
+            
             return (
               <Component
                 key={`point-${point.x}-${i}`}
@@ -120,14 +129,14 @@ export class RawLine extends React.Component {
   }
 }
 
-const StyledLine = withStyles(() => ({
-  line: {
+const StyledLine = styled(RawLine)(() => ({
+  '& .line': {
     fill: 'transparent',
     stroke: color.defaults.TERTIARY,
     strokeWidth: 3,
     transition: 'stroke 200ms ease-in, stroke-width 200ms ease-in',
   },
-}))(RawLine);
+}));
 
 export class Line extends React.Component {
   static propTypes = {

package/src/line/line-cross.js

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { LinePath } from '@vx/shape';
 import { Group } from '@vx/group';
-import classNames from 'classnames';
+import { styled } from '@mui/material/styles';
 
 import { color } from '@pie-lib/render-ui';
 import { dataToXBand } from '../utils';
@@ -10,18 +10,44 @@ import { types } from '@pie-lib/plot';
 import RawLine from './common/line';
 import { CorrectnessIndicator, SmallCorrectPointIndicator } from '../common/correctness-indicators';
 
+const StyledLinePath = styled(LinePath)(() => ({
+  stroke: color.defaults.TEXT,
+  transition: 'fill 200ms linear, height 200ms linear',
+  '&.non-interactive': {
+    stroke: color.disabled?.() || '#ccc',
+  },
+}));
+
+const StyledGroup = styled(Group)(({ correctness, interactive }) => ({
+  stroke: color.defaults.TEXT,
+  transition: 'fill 200ms linear, height 200ms linear',
+  ...(correctness && !interactive && {
+    fill: `${color.defaults.BLACK} !important`,
+    stroke: `${color.defaults.BLACK} !important`,
+  }),
+  '&.non-interactive': {
+    stroke: color.disabled?.() || '#ccc',
+  },
+}));
+
+const StyledTransparentHandle = styled('circle')(() => ({
+  height: '20px',
+  fill: 'transparent',
+  stroke: 'transparent',
+}));
+
 const DraggableComponent = (props) => {
-  const { classes = {}, className, scale, x, y, r, correctness, interactive, correctData, label, ...rest } = props;
+  const { className, scale, x, y, r, correctness, interactive, correctData, label, ...rest } = props;
   const [hover, setHover] = useState(false);
 
   const squareSize = r * 4;
   const squareHalf = squareSize / 2;
   const cx = scale.x(x);
   const cy = scale.y(y);
-
+  
   return (
-    <Group className={classNames(className, classes.line, correctness && !interactive && classes.disabledPoint)}>
-      <LinePath
+    <StyledGroup className={className} correctness={correctness} interactive={interactive}>
+      <StyledLinePath
         data={[
           { x: scale.x(x) - r, y: scale.y(y) + r },
           { x: scale.x(x) + r, y: scale.y(y) - r },
@@ -32,7 +58,7 @@ const DraggableComponent = (props) => {
         strokeWidth={5}
         style={{ pointerEvents: 'none' }}
       />
-      <LinePath
+      <StyledLinePath
         data={[
           { x: scale.x(x) - r, y: scale.y(y) - r },
           { x: scale.x(x) + r, y: scale.y(y) + r },
@@ -55,11 +81,10 @@ const DraggableComponent = (props) => {
           pointerEvents="none"
         />
       )}
-      <circle
+      <StyledTransparentHandle
         cx={cx}
         cy={cy}
         r={r * 2}
-        className={classNames(classes.transparentHandle)}
         onMouseEnter={() => setHover(true)}
         onMouseLeave={() => setHover(false)}
         {...rest}
@@ -69,7 +94,6 @@ const DraggableComponent = (props) => {
         scale={scale}
         x={x}
         y={y}
-        classes={classes}
         r={r}
         correctness={correctness}
         interactive={interactive}
@@ -80,11 +104,10 @@ const DraggableComponent = (props) => {
         x={x}
         r={r}
         correctness={correctness}
-        classes={classes}
         correctData={correctData}
         label={label}
       />
-    </Group>
+    </StyledGroup>
   );
 };
 
@@ -94,11 +117,13 @@ DraggableComponent.propTypes = {
   y: PropTypes.number,
   r: PropTypes.number,
   className: PropTypes.string,
-  classes: PropTypes.object,
   correctness: PropTypes.shape({
     value: PropTypes.string,
     label: PropTypes.string,
   }),
+  interactive: PropTypes.bool,
+  correctData: PropTypes.array,
+  label: PropTypes.string,
 };
 
 export class LineCross extends React.Component {

package/src/line/line-dot.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import classNames from 'classnames';
+import { styled } from '@mui/material/styles';
 
 import { types } from '@pie-lib/plot';
 import { color } from '@pie-lib/render-ui';
@@ -8,12 +8,23 @@ import { dataToXBand } from '../utils';
 import RawLine from './common/line';
 import { CorrectnessIndicator, SmallCorrectPointIndicator } from '../common/correctness-indicators';
 
+
+const StyledHandle = styled('circle')(({ correctness, interactive }) => ({
+}));
+
+
+const StyledTransparentHandle = styled('circle')(() => ({
+  height: '20px',
+  fill: 'transparent', // keep it invisible
+  stroke: 'none',
+  pointerEvents: 'auto', // allow drag events
+}));
+
 const DraggableComponent = ({
   scale,
   x,
   y,
   className,
-  classes,
   r,
   correctness,
   interactive,
@@ -25,20 +36,28 @@ const DraggableComponent = ({
   const allowRolloverEvent = !correctness && interactive;
 
   return (
-    <g onMouseEnter={() => setIsHovered(true)} onMouseLeave={() => setIsHovered(false)}>
-      <circle
+    <g
+      onMouseEnter={() => setIsHovered(true)}
+      onMouseLeave={() => setIsHovered(false)}
+      onTouchStart={() => setIsHovered(true)}
+      onTouchEnd={() => setIsHovered(false)}
+    >
+      <StyledTransparentHandle
         cx={scale.x(x)}
         cy={scale.y(y)}
         r={r * 3}
-        className={classNames(classes.transparentHandle, className)}
-        pointerEvents={correctness ? 'none' : ''}
+        className={className}
+        onMouseEnter={() => setIsHovered(true)}
+        onMouseLeave={() => setIsHovered(false)}
         {...rest}
       />
-      <circle
+      <StyledHandle
         cx={scale.x(x)}
         cy={scale.y(y)}
         r={r}
-        className={classNames(className, classes.handle, correctness && !interactive && classes.disabledPoint)}
+        className={className}
+        correctness={correctness}
+        interactive={interactive}
         {...rest}
       />
       {/* show correctness indicators */}
@@ -46,7 +65,6 @@ const DraggableComponent = ({
         scale={scale}
         x={x}
         y={y}
-        classes={classes}
         r={r}
         correctness={correctness}
         interactive={interactive}
@@ -58,7 +76,6 @@ const DraggableComponent = ({
         x={x}
         r={r}
         correctness={correctness}
-        classes={classes}
         correctData={correctData}
         label={label}
       />
@@ -85,11 +102,13 @@ DraggableComponent.propTypes = {
   y: PropTypes.number,
   r: PropTypes.number,
   className: PropTypes.string,
-  classes: PropTypes.object,
   correctness: PropTypes.shape({
     value: PropTypes.string,
     label: PropTypes.string,
   }),
+  interactive: PropTypes.bool,
+  correctData: PropTypes.array,
+  label: PropTypes.string,
 };
 
 export class LineDot extends React.Component {

package/src/mark-label.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useCallback, useEffect, useRef } from 'react';
 import classNames from 'classnames';
-import { withStyles } from '@material-ui/core/styles';
+import { styled } from '@mui/material/styles';
 import AutosizeInput from 'react-input-autosize';
 import PropTypes from 'prop-types';
 
@@ -9,46 +9,46 @@ import { correct, incorrect, disabled } from './common/styles';
 import { color } from '@pie-lib/render-ui';
 import { renderMath } from '@pie-lib/math-rendering';
 
-const styles = (theme) => ({
-  input: {
-    float: 'right',
-    fontFamily: theme.typography.fontFamily,
-    fontSize: theme.typography.fontSize,
-    border: 'none',
-    '&.correct': correct('color'),
-    '&.incorrect': incorrect('color'),
-    '&.disabled': {
-      backgroundColor: 'transparent !important',
-    },
-    '&.error': { border: `2px solid ${theme.palette.error.main}` },
-  },
-  mathInput: {
-    pointerEvents: 'auto',
-    textAlign: 'center',
-    fontSize: theme.typography.fontSize + 2,
-    fontFamily: theme.typography.fontFamily,
-    color: color.primaryDark(),
-    paddingTop: theme.typography.fontSize / 2,
+const StyledContainer = styled('div')({
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'center',
+});
+
+const StyledInput = styled('input')(({ theme }) => ({
+  float: 'right',
+  fontFamily: theme.typography.fontFamily,
+  fontSize: theme.typography.fontSize,
+  border: 'none',
+  '&.correct': correct('color'),
+  '&.incorrect': incorrect('color'),
+  '&.disabled': {
+    backgroundColor: 'transparent !important',
   },
-  disabled: {
+  '&.error': { border: `2px solid ${theme.palette.error.main}` },
+}));
+
+const StyledMathInput = styled('div')(({ theme }) => ({
+  pointerEvents: 'auto',
+  textAlign: 'center',
+  fontSize: theme.typography.fontSize + 2,
+  fontFamily: theme.typography.fontFamily,
+  color: color.primaryDark(),
+  paddingTop: theme.typography.fontSize / 2,
+  '&.disabled': {
     ...disabled('color'),
     backgroundColor: 'transparent !important',
   },
-  error: {
+  '&.error': {
     border: `2px solid ${theme.palette.error.main}`,
   },
-  correct: {
+  '&.correct': {
     ...correct('color'),
   },
-  incorrect: {
+  '&.incorrect': {
     ...incorrect('color'),
   },
-  flexContainer: {
-    display: 'flex',
-    flexDirection: 'column',
-    alignItems: 'center',
-  },
-});
+}));
 
 function isFractionFormat(label) {
   const trimmedLabel = label?.trim() || '';
@@ -85,7 +85,6 @@ export const MarkLabel = (props) => {
 
   const {
     mark,
-    classes,
     disabled,
     inputRef: externalInputRef,
     barWidth,
@@ -139,20 +138,20 @@ export const MarkLabel = (props) => {
   }, []);
 
   return (
-    <div className={classes.flexContainer}>
+    <StyledContainer>
       {correctnessIndicator}
       {isMathRendering() ? (
-        <div
+        <StyledMathInput
           ref={(r) => {
             root = r;
             externalInputRef(r);
           }}
           dangerouslySetInnerHTML={{ __html: getLabelMathFormat(label) }}
-          className={classNames(classes.mathInput, {
-            [classes.disabled]: disabled,
-            [classes.error]: error,
-            [classes.correct]: mark.editable && correctness?.label === 'correct',
-            [classes.incorrect]: mark.editable && correctness?.label === 'incorrect',
+          className={classNames({
+            disabled: disabled,
+            error: error,
+            correct: mark.editable && correctness?.label === 'correct',
+            incorrect: mark.editable && correctness?.label === 'incorrect',
           })}
           onClick={() => setIsEditing(true)}
           style={{
@@ -163,17 +162,17 @@ export const MarkLabel = (props) => {
             visibility: isHiddenLabel ? 'hidden' : 'unset',
             marginTop: correctnessIndicator ? '24px' : '0',
           }}
-        ></div>
+        ></StyledMathInput>
       ) : (
         <AutosizeInput
           inputRef={(r) => {
             _ref(r);
             externalInputRef(r);
           }}
+          name='mark-label-input'
           autoFocus={isEditing || autoFocus}
           disabled={disabled}
           inputClassName={classNames(
-            classes.input,
             correctness && mark.editable ? correctness.label : null,
             disabled && 'disabled',
             error && 'error',
@@ -185,6 +184,7 @@ export const MarkLabel = (props) => {
             boxSizing: 'border-box',
             paddingLeft: 0,
             paddingRight: 0,
+            border: 'none',
             ...extraStyle,
           }}
           value={label}
@@ -203,7 +203,7 @@ export const MarkLabel = (props) => {
           onBlur={onChangeProp}
         />
       )}
-    </div>
+    </StyledContainer>
   );
 };
 
@@ -213,7 +213,6 @@ MarkLabel.propTypes = {
   error: PropTypes.any,
   onChange: PropTypes.func,
   graphProps: types.GraphPropsType,
-  classes: PropTypes.object,
   inputRef: PropTypes.func,
   mark: PropTypes.object,
   barWidth: PropTypes.number,
@@ -227,4 +226,4 @@ MarkLabel.propTypes = {
   correctnessIndicator: PropTypes.node,
 };
 
-export default withStyles(styles)(MarkLabel);
+export default MarkLabel;

package/src/plot/common/plot.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import Check from '@material-ui/icons/Check';
-import { withStyles } from '@material-ui/core/styles/index';
+import Check from '@mui/icons-material/Check';
+import { styled } from '@mui/material/styles';
 import { Group } from '@vx/group';
 import debug from 'debug';
 
@@ -19,7 +19,6 @@ export class RawPlot extends React.Component {
   static propTypes = {
     onChangeCategory: PropTypes.func,
     value: PropTypes.number,
-    classes: PropTypes.object,
     label: PropTypes.string,
     xBand: PropTypes.func,
     index: PropTypes.number.isRequired,
@@ -68,7 +67,7 @@ export class RawPlot extends React.Component {
     this.setDragValue(next);
   };
 
-  renderCorrectnessIcon = (barX, barWidth, correctVal, correctness, classes, scale, pointHeight, pointDiameter) => {
+  renderCorrectnessIcon = (barX, barWidth, correctVal, correctness, scale, pointHeight, pointDiameter) => {
     let iconY;
 
     if (correctVal === 0) {
@@ -83,7 +82,7 @@ export class RawPlot extends React.Component {
     return (
       <foreignObject x={barX + barWidth / 2 - ICON_SIZE / 2} y={iconY} width={ICON_SIZE} height={ICON_SIZE}>
         <Check
-          className={classNames(classes.correctnessIcon, classes.correctIcon, classes.smallIcon)}
+          className={classNames('correctnessIcon', 'correctIcon', 'smallIcon')}
           title={correctness.label}
         />
       </foreignObject>
@@ -95,7 +94,6 @@ export class RawPlot extends React.Component {
       graphProps,
       value,
       label,
-      classes,
       xBand,
       index,
       CustomBarElement,
@@ -103,6 +101,7 @@ export class RawPlot extends React.Component {
       correctness,
       defineChart,
       correctData,
+      className
     } = this.props;
 
     const { scale, range, size } = graphProps;
@@ -130,6 +129,7 @@ export class RawPlot extends React.Component {
     return (
       <React.Fragment>
         <g
+          className={className}
           onMouseEnter={this.handleMouseEnter}
           onMouseLeave={this.handleMouseLeave}
           onTouchStart={this.handleMouseEnter}
@@ -155,7 +155,6 @@ export class RawPlot extends React.Component {
               pointHeight,
               label,
               value,
-              classes,
               scale,
             }),
           )}
@@ -173,7 +172,6 @@ export class RawPlot extends React.Component {
                   barWidth,
                   correctVal,
                   correctness,
-                  classes,
                   scale,
                   pointHeight,
                   pointDiameter,
@@ -202,7 +200,6 @@ export class RawPlot extends React.Component {
                       pointHeight={pointHeight}
                       label={label}
                       value={value}
-                      classes={classes}
                       scale={scale}
                       dottedOverline={true}
                     />
@@ -211,7 +208,6 @@ export class RawPlot extends React.Component {
                       barWidth,
                       correctVal,
                       correctness,
-                      classes,
                       scale,
                       pointHeight,
                       pointDiameter,
@@ -235,7 +231,6 @@ export class RawPlot extends React.Component {
                       pointHeight,
                       label,
                       value,
-                      classes,
                       scale,
                       dottedOverline: true,
                     }),
@@ -245,7 +240,6 @@ export class RawPlot extends React.Component {
                     barWidth,
                     correctVal,
                     correctness,
-                    classes,
                     scale,
                     pointHeight,
                     pointDiameter,
@@ -273,30 +267,30 @@ export class RawPlot extends React.Component {
   }
 }
 
-const Bar = withStyles((theme) => ({
-  dot: {
+const Bar = styled(RawPlot)(({ theme }) => ({
+  '& .dot': {
     fill: color.visualElementsColors.PLOT_FILL_COLOR,
     '&.correct': correct('stroke'),
     '&.incorrect': incorrect('stroke'),
   },
-  dotColor: {
+  '& .dotColor': {
     fill: color.visualElementsColors.PLOT_FILL_COLOR,
     '&.correct': correct('fill'),
     '&.incorrect': incorrect('fill'),
   },
-  line: {
+  '& .line': {
     stroke: color.visualElementsColors.PLOT_FILL_COLOR,
     '&.correct': correct('stroke'),
     '&.incorrect': incorrect('stroke'),
   },
-  correctIcon: {
+  '& .correctIcon': {
     backgroundColor: color.correct(),
   },
-  incorrectIcon: {
+  '& .incorrectIcon': {
     backgroundColor: color.incorrectWithIcon(),
   },
-  correctnessIcon: {
-    borderRadius: theme.spacing.unit * 2,
+  '& .correctnessIcon': {
+    borderRadius: theme.spacing(2),
     color: color.defaults.WHITE,
     fontSize: '16px',
     width: '16px',
@@ -305,13 +299,14 @@ const Bar = withStyles((theme) => ({
     border: `1px solid ${color.defaults.WHITE}`,
     stroke: 'initial',
     boxSizing: 'unset', // to override the default border-box in IBX
+    display: 'block',
   },
-  smallIcon: {
+  '& .smallIcon': {
     fontSize: '10px',
     width: '10px',
     height: '10px',
   },
-}))(RawPlot);
+}));
 
 export class Plot extends React.Component {
   static propTypes = {

package/src/plot/dot.js

@@ -6,9 +6,17 @@ import { types } from '@pie-lib/plot';
 import { dataToXBand } from '../utils';
 import Plot from './common/plot';
 import { color } from '@pie-lib/render-ui';
+import { styled } from '@mui/material/styles';
+import { correct, incorrect } from '../common/styles';
+
+const StyledCircle = styled(Circle)(() => ({
+  fill: 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 r = pointDiameter / 2;
   const cx = barX + (barWidth - pointDiameter) / 2 + r;
@@ -26,7 +34,7 @@ const CustomBarElement = (props) => {
       fill="none"
     />
   ) : (
-    <Circle key={`point-${label}-${value}-${index}`} className={classes.dot} cx={cx} cy={cy} r={r} />
+    <StyledCircle key={`point-${label}-${value}-${index}`} cx={cx} cy={cy} r={r} />
   );
 };
 
@@ -38,7 +46,6 @@ CustomBarElement.propTypes = {
   pointHeight: PropTypes.number,
   value: PropTypes.number,
   label: PropTypes.string,
-  classes: PropTypes.object,
   scale: PropTypes.object,
   dottedOverline: PropTypes.bool,
 };