@pie-lib/graphing-solution-set 2.16.0-beta.0

package/src/tools/shared/line/index.jsx

@@ -0,0 +1,473 @@
+import React from 'react';
+import isEqual from 'lodash/isEqual';
+import cloneDeep from 'lodash/cloneDeep';
+import { BasePoint } from '../point';
+import { types, utils, gridDraggable, trig } from '@pie-lib/plot';
+import PropTypes from 'prop-types';
+import { disabled, correct, incorrect, missing } from '../styles';
+import ReactDOM from 'react-dom';
+import MarkLabel from '../../../mark-label';
+import isEmpty from 'lodash/isEmpty';
+import { color } from '@pie-lib/render-ui';
+import { getMiddleOfTwoPoints, equalPoints, sameAxes } from '../../../utils';
+
+export const lineTool = (type, Component) => () => ({
+  type,
+  Component,
+  addPoint: (point, mark) => {
+    if (mark && equalPoints(mark.root, point)) {
+      return mark;
+    }
+
+    if (!mark) {
+      return {
+        type,
+        building: true,
+        from: point,
+      };
+    }
+
+    if (equalPoints(point, mark.from)) {
+      return { ...mark };
+    }
+
+    return { ...mark, building: false, to: point };
+  },
+});
+
+export const lineToolComponent = (Component) => {
+  return class LineToolComponent extends React.Component {
+    static propTypes = {
+      ...types.ToolPropTypeFields,
+      graphProps: types.GraphPropsType.isRequired,
+    };
+
+    constructor(props) {
+      super(props);
+      this.state = {};
+    }
+
+    startDrag = () => this.setState({ mark: { ...this.props.mark } });
+
+    stopDrag = () => {
+      const { onChange, mark } = this.props;
+      const update = { ...this.state.mark };
+
+      this.setState({ mark: undefined }, () => {
+        const { type } = update;
+        let shouldNotChange =
+          type &&
+          (type === 'parabola' || type === 'sine' || type === 'absolute' || type === 'exponential') &&
+          sameAxes(update.from, update.to);
+        if (!shouldNotChange && type && type === 'exponential' && update.from && update.to) {
+          shouldNotChange = update.from.y === 0 || update.to.y === 0 || update.from.y * update.to.y < 0;
+        }
+        if (!isEqual(mark, update) && !shouldNotChange) {
+          onChange(mark, update);
+        }
+      });
+    };
+
+    changeMark = ({ from, to, middle }) => {
+      let mark = { ...this.state.mark, from, to };
+
+      if (middle) {
+        mark = { ...mark, middle };
+      }
+
+      this.setState({ mark });
+    };
+
+    changeMarkProps = ({ from, to, middle }) => {
+      const { onChange, mark } = this.props;
+      let update = { ...mark, ...this.state.mark };
+
+      if (from) {
+        update = { ...update, from };
+      }
+
+      if (to) {
+        update = { ...update, to };
+      }
+
+      if (middle) {
+        update = { ...update, middle };
+      }
+
+      if (!isEqual(mark, update)) {
+        onChange(mark, update);
+      }
+    };
+
+    render() {
+      const { graphProps, onClick, labelNode, labelModeEnabled, coordinatesOnHover, gssLineData } = this.props;
+      const mark = this.state.mark ? this.state.mark : this.props.mark;
+
+      const from = cloneDeep(mark.from);
+      const to = cloneDeep(mark.to);
+      const middle = cloneDeep(mark.middle);
+
+      // SET DISABLED
+      // if it's a background mark, we need to force disable it
+      if (from && mark.isBackground) {
+        from.disabled = true;
+      }
+
+      if (to && mark.isBackground) {
+        to.disabled = true;
+      }
+
+      if (middle && mark.isBackground) {
+        middle.disabled = true;
+      }
+
+      return (
+        <Component
+          disabled={mark.disabled}
+          coordinatesOnHover={coordinatesOnHover}
+          correctness={mark.correctness}
+          from={from}
+          to={to}
+          middle={middle}
+          graphProps={graphProps}
+          fill={mark && mark.fill}
+          gssLineData={gssLineData}
+          onChange={this.changeMark}
+          changeMarkProps={this.changeMarkProps}
+          onClick={onClick}
+          onDragStart={this.startDrag}
+          onDragStop={this.stopDrag}
+          labelNode={labelNode}
+          labelModeEnabled={labelModeEnabled}
+        />
+      );
+    }
+  };
+};
+
+const dragOpts = () => ({
+  bounds: (props, { domain, range }) => {
+    const area = utils.lineToArea(props.from, props.to);
+    return utils.bounds(area, domain, range);
+  },
+  anchorPoint: (props) => {
+    const { from } = props;
+    return from;
+  },
+  fromDelta: (props, delta) => {
+    const { from, to } = props;
+    return {
+      from: utils.point(from).add(utils.point(delta)),
+      to: utils.point(to).add(utils.point(delta)),
+    };
+  },
+});
+
+export const lineBase = (Comp, opts) => {
+  const DraggableComp = gridDraggable(dragOpts())(Comp);
+
+  const FromPoint = opts && opts.from ? opts.from : BasePoint;
+  const ToPoint = opts && opts.to ? opts.to : BasePoint;
+
+  class LineBase extends React.Component {
+    static propTypes = {
+      coordinatesOnHover: PropTypes.bool,
+      graphProps: types.GraphPropsType,
+      from: types.PointType,
+      to: types.PointType,
+      middle: types.PointType,
+      onChange: PropTypes.func,
+      onDragStart: PropTypes.func,
+      onDragStop: PropTypes.func,
+      onClick: PropTypes.func,
+      correctness: PropTypes.string,
+      fill: PropTypes.string,
+      gssLineData: PropTypes.object,
+      disabled: PropTypes.bool,
+      labelNode: PropTypes.object,
+      labelModeEnabled: PropTypes.bool,
+      changeMarkProps: PropTypes.func,
+    };
+
+    onChangePoint = (point) => {
+      const { middle, onChange } = this.props;
+      const { from, to } = point;
+
+      // because point.from.label and point.to.label can be different
+      if (!equalPoints(from, to)) {
+        if (middle) {
+          point.middle = { ...middle, ...getMiddleOfTwoPoints(from, to) };
+        }
+
+        onChange(point);
+      }
+    };
+
+    dragComp = ({ from: draggedFrom, to: draggedTo }) => {
+      const { from, to, onChange, middle } = this.props;
+
+      if (from.label) {
+        draggedFrom.label = from.label;
+      }
+
+      if (to.label) {
+        draggedTo.label = to.label;
+      }
+
+      const updated = { from: draggedFrom, to: draggedTo };
+
+      if (middle) {
+        updated.middle = { ...middle, ...getMiddleOfTwoPoints(draggedFrom, draggedTo) };
+      }
+
+      onChange(updated);
+    };
+
+    dragFrom = (draggedFrom) => {
+      const { from, to } = this.props;
+
+      if (from.label) {
+        draggedFrom.label = from.label;
+      }
+
+      if (!equalPoints(draggedFrom, to)) {
+        this.onChangePoint({ from: draggedFrom, to: to });
+      }
+    };
+
+    dragTo = (draggedTo) => {
+      const { from, to } = this.props;
+
+      if (to.label) {
+        draggedTo.label = to.label;
+      }
+
+      if (!equalPoints(from, draggedTo)) {
+        this.onChangePoint({ from: from, to: draggedTo });
+      }
+    };
+
+    labelChange = (point, type) => {
+      const { changeMarkProps } = this.props;
+      const update = { ...point };
+
+      if (!point.label || isEmpty(point.label)) {
+        delete update.label;
+      }
+
+      changeMarkProps({ [type]: update });
+    };
+
+    clickPoint = (point, type, data) => {
+      const { changeMarkProps, disabled, from, to, labelModeEnabled, onClick } = this.props;
+
+      if (!labelModeEnabled) {
+        onClick(point || data);
+        return;
+      }
+
+      if (disabled) {
+        return;
+      }
+
+      if (type === 'middle' && !point && from && to) {
+        point = { ...point, ...getMiddleOfTwoPoints(from, to) };
+      }
+
+      changeMarkProps({ from, to, [type]: { label: '', ...point } });
+
+      if (this.input[type]) {
+        this.input[type].focus();
+      }
+    };
+
+    // IMPORTANT, do not remove
+    input = {};
+
+    render() {
+      const {
+        coordinatesOnHover,
+        graphProps,
+        fill,
+        gssLineData,
+        onDragStart,
+        onDragStop,
+        from,
+        to,
+        middle,
+        disabled,
+        correctness,
+        onClick,
+        labelNode,
+        labelModeEnabled,
+      } = this.props;
+      let common = { graphProps, fill, onDragStart, onDragStop, disabled, correctness, onClick };
+      if (gssLineData && gssLineData.selectedTool === 'solutionSet') {
+        //removing dragging option for line if solution set is clicked.
+        common = { graphProps, fill, disabled, correctness, onClick };
+      }
+      const angle = to ? trig.toDegrees(trig.angle(from, to)) : 0;
+
+      let fromLabelNode = null;
+      let toLabelNode = null;
+      let lineLabelNode = null;
+
+      if (labelNode) {
+        if (from && from.hasOwnProperty('label')) {
+          fromLabelNode = ReactDOM.createPortal(
+            <MarkLabel
+              inputRef={(r) => (this.input.from = r)}
+              disabled={!labelModeEnabled}
+              mark={from}
+              graphProps={graphProps}
+              onChange={(label) => this.labelChange({ ...from, label }, 'from')}
+            />,
+            labelNode,
+          );
+        }
+
+        if (to && to.hasOwnProperty('label')) {
+          toLabelNode = ReactDOM.createPortal(
+            <MarkLabel
+              inputRef={(r) => (this.input.to = r)}
+              disabled={!labelModeEnabled}
+              mark={to}
+              graphProps={graphProps}
+              onChange={(label) => this.labelChange({ ...to, label }, 'to')}
+            />,
+            labelNode,
+          );
+        }
+
+        if (middle && middle.hasOwnProperty('label')) {
+          lineLabelNode = ReactDOM.createPortal(
+            <MarkLabel
+              inputRef={(r) => (this.input.middle = r)}
+              disabled={!labelModeEnabled}
+              mark={middle}
+              graphProps={graphProps}
+              onChange={(label) => this.labelChange({ ...middle, label }, 'middle')}
+            />,
+            labelNode,
+          );
+        }
+      }
+      if (gssLineData && gssLineData.selectedTool === 'solutionSet') {
+        //removing dragging feature of line and point if solution set is true.
+        return (
+          <g>
+            {to && <DraggableComp from={from} to={to} middle={middle} {...common} />}
+            {lineLabelNode}
+
+            <FromPoint
+              x={from.x}
+              y={from.y}
+              labelNode={labelNode}
+              coordinatesOnHover={coordinatesOnHover}
+              {...common}
+            />
+            {fromLabelNode}
+
+            {to && (
+              <ToPoint
+                x={to.x}
+                y={to.y}
+                angle={angle} //angle + 45}
+                labelNode={labelNode}
+                coordinatesOnHover={coordinatesOnHover}
+                {...common}
+              />
+            )}
+            {toLabelNode}
+          </g>
+        );
+      } else {
+        return (
+          <g>
+            {to && (
+              <DraggableComp
+                from={from}
+                to={to}
+                middle={middle}
+                onDrag={this.dragComp}
+                {...common}
+                onClick={(data) => this.clickPoint(middle, 'middle', data)}
+              />
+            )}
+            {lineLabelNode}
+
+            <FromPoint
+              x={from.x}
+              y={from.y}
+              labelNode={labelNode}
+              coordinatesOnHover={coordinatesOnHover}
+              onDrag={this.dragFrom}
+              {...common}
+              onClick={(data) => this.clickPoint(from, 'from', data)}
+            />
+            {fromLabelNode}
+
+            {to && (
+              <ToPoint
+                x={to.x}
+                y={to.y}
+                angle={angle} //angle + 45}
+                labelNode={labelNode}
+                coordinatesOnHover={coordinatesOnHover}
+                onDrag={this.dragTo}
+                {...common}
+                onClick={(data) => this.clickPoint(to, 'to', data)}
+              />
+            )}
+            {toLabelNode}
+          </g>
+        );
+      }
+    }
+  }
+
+  return LineBase;
+};
+
+export const styles = {
+  line: () => ({
+    fill: 'transparent',
+    stroke: color.defaults.BLACK,
+    strokeWidth: 4,
+    transition: 'stroke 200ms ease-in, stroke-width 200ms ease-in',
+    '&:hover': {
+      strokeWidth: 6,
+      stroke: color.defaults.BLACK,
+    },
+  }),
+  dashedLine: () => ({
+    fill: 'transparent',
+    stroke: color.defaults.BLACK,
+    strokeWidth: 4,
+    transition: 'stroke 200ms ease-in, stroke-width 200ms ease-in',
+    '&:hover': {
+      strokeWidth: 6,
+      stroke: color.defaults.BLACK,
+    },
+    strokeDasharray: '3,3',
+  }),
+  arrow: () => ({
+    fill: color.defaults.SECONDARY,
+  }),
+  disabledArrow: () => ({
+    ...disabled(),
+  }),
+  disabled: () => ({
+    ...disabled('stroke'),
+    strokeWidth: 2,
+  }),
+  correct: (theme, key) => ({
+    ...correct(key),
+  }),
+  incorrect: (theme, key) => ({
+    ...incorrect(key),
+  }),
+  missing: (theme, key) => ({
+    ...missing(key),
+  }),
+};

package/src/tools/shared/line/line-path.jsx

@@ -0,0 +1,88 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { withStyles } from '@material-ui/core/styles';
+import { types } from '@pie-lib/plot';
+import classNames from 'classnames';
+import { disabled, correct, incorrect, missing } from '../styles';
+import * as vx from '@vx/shape';
+import { color } from '@pie-lib/render-ui';
+
+export class RawLinePath extends React.Component {
+  static propTypes = {
+    className: PropTypes.string,
+    classes: PropTypes.object,
+    data: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.number)),
+    graphProps: types.GraphPropsType.isRequired,
+    disabled: PropTypes.bool,
+    correctness: PropTypes.string,
+    from: types.PointType,
+    to: types.PointType,
+    isDragging: PropTypes.bool,
+  };
+
+  static defaultProps = {
+    from: {},
+    to: {},
+  };
+
+  render() {
+    /* eslint-disable no-unused-vars */
+    const { data, classes, className, disabled, correctness, from, to, graphProps, isDragging, ...rest } = this.props;
+    /* eslint-enable */
+
+    return (
+      <React.Fragment>
+        <vx.LinePath
+          data={data}
+          className={classNames(classes.drawLine, disabled && classes.disabled, classes[correctness], className)}
+          {...rest}
+        />
+        <vx.LinePath
+          data={data}
+          className={classNames(
+            classes.line,
+            isDragging && classes.dragging,
+            disabled && classes.disabled,
+            classes[correctness],
+            className,
+          )}
+          {...rest}
+        />
+      </React.Fragment>
+    );
+  }
+}
+
+const dragging = () => ({
+  strokeWidth: 7,
+  stroke: color.defaults.BLACK,
+});
+
+export const LinePath = withStyles((theme) => ({
+  drawLine: {
+    fill: 'none',
+    strokeWidth: 2,
+    stroke: color.secondaryLight(),
+  },
+  line: {
+    strokeWidth: 6,
+    fill: 'none',
+    transition: 'stroke-width 200ms ease-in, stroke 200ms ease-in',
+    stroke: 'transparent',
+    '&:hover': dragging(theme),
+  },
+  dragging: dragging(theme),
+  disabled: {
+    ...disabled('stroke'),
+    strokeWidth: 2,
+  },
+  correct: {
+    ...correct('stroke'),
+  },
+  incorrect: {
+    ...incorrect('stroke'),
+  },
+  missing: {
+    ...missing('stroke'),
+  },
+}))(RawLinePath);

package/src/tools/shared/line/with-root-edge.jsx

@@ -0,0 +1,97 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { types } from '@pie-lib/plot';
+import { LinePath } from './line-path';
+import { curveMonotoneX } from '@vx/curve';
+import { lineBase, lineToolComponent } from './index';
+
+const toRootEdge = (m) => {
+  const out = { ...m };
+  out.root = { ...m.from };
+  out.edge = m.to ? { ...m.to } : undefined;
+  delete out.from;
+  delete out.to;
+  return out;
+};
+
+const toFromTo = (m) => {
+  const out = { ...m };
+  out.from = { ...m.root };
+  out.to = m.edge ? { ...m.edge } : undefined;
+  delete out.root;
+  delete out.edge;
+  return out;
+};
+
+export const rootEdgeToFromToWrapper = (BaseComp) => {
+  const Wrapper = (props) => {
+    const m = toFromTo(props.mark);
+
+    const onChange = (current, next) => {
+      props.onChange(toRootEdge(current), toRootEdge(next));
+    };
+
+    return <BaseComp {...props} mark={m} onChange={onChange} />;
+  };
+
+  Wrapper.propTypes = {
+    onChange: PropTypes.func,
+    mark: PropTypes.object,
+  };
+
+  return Wrapper;
+};
+
+export const rootEdgeComponent = (RootEdgeComp) => {
+  const BaseComponent = lineToolComponent(RootEdgeComp);
+  return rootEdgeToFromToWrapper(BaseComponent);
+};
+
+const withPointsGenerationLinePath = (getPoints) => {
+  const LinePathComponent = (props) => {
+    const { graphProps, from, to, onClick, onDragStart, onDragStop, onChange, disabled, correctness, ...rest } = props;
+
+    const { dataPoints, enableCurve = true } = getPoints({
+      graphProps: props.graphProps,
+      root: from,
+      edge: to,
+    });
+
+    const raw = dataPoints.map((d) => [graphProps.scale.x(d.x), graphProps.scale.y(d.y)]);
+
+    const common = {
+      onClick,
+      graphProps,
+      onDragStart,
+      onDragStop,
+      onChange,
+      disabled,
+      correctness,
+    };
+
+    if (!enableCurve) {
+      return <LinePath data={raw} from={from} to={to} {...common} {...rest} />;
+    } else {
+      return <LinePath data={raw} from={from} to={to} curve={curveMonotoneX} {...common} {...rest} />;
+    }
+  };
+
+  LinePathComponent.propTypes = {
+    graphProps: types.GraphPropsType.isRequired,
+    from: types.PointType.isRequired,
+    to: types.PointType,
+    onClick: PropTypes.func,
+    onDragStart: PropTypes.func,
+    onDragStop: PropTypes.func,
+    onChange: PropTypes.func,
+    disabled: PropTypes.bool,
+    correctness: PropTypes.string,
+  };
+
+  return LinePathComponent;
+};
+
+export const withRootEdge = (getPoints) => {
+  const LinePathComp = withPointsGenerationLinePath(getPoints);
+  return lineBase(LinePathComp);
+};

package/src/tools/shared/point/__tests__/__snapshots__/arrow-point.test.jsx.snap

@@ -0,0 +1,55 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ArrowPoint snapshot renders 1`] = `
+<RawArrow
+  className="className"
+  classes={
+    Object {
+      "correct": "RawArrow-correct-3",
+      "disabled": "RawArrow-disabled-2",
+      "incorrect": "RawArrow-incorrect-4",
+      "missing": "RawArrow-missing-5",
+      "point": "RawArrow-point-1",
+    }
+  }
+  from={
+    Object {
+      "x": 0,
+      "y": 0,
+    }
+  }
+  graphProps={
+    Object {
+      "domain": Object {
+        "max": 1,
+        "min": 0,
+        "step": 1,
+      },
+      "range": Object {
+        "max": 1,
+        "min": 0,
+        "step": 1,
+      },
+      "scale": Object {
+        "x": [MockFunction],
+        "y": [MockFunction],
+      },
+      "size": Object {
+        "height": 400,
+        "width": 400,
+      },
+      "snap": Object {
+        "x": [MockFunction],
+        "y": [MockFunction],
+      },
+    }
+  }
+  onChange={[MockFunction]}
+  to={
+    Object {
+      "x": 1,
+      "y": 1,
+    }
+  }
+/>
+`;