@pie-lib/graphing-solution-set 4.0.4-next.3 → 4.0.4-next.30

package/src/tools/polygon/component.jsx

@@ -1,324 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { ToolPropTypeFields } from '../shared/types';
-import { chunk, initial, isEmpty } from 'lodash-es';
-import debug from 'debug';
-import DraggablePolygon from './polygon';
-import { types } from '@pie-lib/plot';
-import invariant from 'invariant';
-import ReactDOM from 'react-dom';
-import MarkLabel from '../../mark-label';
-import { equalPoints, getMiddleOfTwoPoints, getRightestPoints } from '../../utils';
-
-const log = debug('pie-lib:graphing-solution-set:polygon');
-
-export const buildLines = (points, closed) => {
-  const expanded = points.reduce((acc, p, index) => {
-    acc.push({ ...p, index });
-
-    const isLast = index === points.length - 1;
-    const next = isLast ? 0 : index + 1;
-
-    acc.push({ ...points[next], index: next });
-
-    return acc;
-  }, []);
-
-  const all = chunk(expanded, 2).map(([from, to]) => {
-    return { from, to };
-  });
-
-  return closed ? all : initial(all);
-};
-
-export const swap = (arr, ...rest) => {
-  const pairs = chunk(rest, 2);
-
-  return pairs.reduce(
-    (acc, pr) => {
-      if (pr.length === 2) {
-        let [e, replacement] = pr;
-
-        invariant(Number.isFinite(e.index), 'Index must be defined');
-
-        const index = e.index;
-        // const i = acc.findIndex(pt => pt.x === e.x && pt.y === e.y);
-
-        if (index >= 0) {
-          acc.splice(index, 1, replacement);
-
-          return acc;
-        } else {
-          return acc;
-        }
-      } else {
-        return acc;
-      }
-    },
-    [...arr],
-  );
-};
-
-export class RawBaseComponent extends React.Component {
-  static propTypes = {
-    className: PropTypes.string,
-    disabled: PropTypes.bool,
-    correctness: PropTypes.string,
-    points: PropTypes.arrayOf(types.PointType),
-    closed: PropTypes.bool,
-    isSolution: PropTypes.bool,
-    coordinatesOnHover: PropTypes.bool,
-    onChange: PropTypes.func.isRequired,
-    onClosePolygon: PropTypes.func.isRequired,
-    onDragStart: PropTypes.func,
-    onDragStop: PropTypes.func,
-    onClick: PropTypes.func,
-    graphProps: types.GraphPropsType.isRequired,
-    isToolActive: PropTypes.bool,
-    middle: PropTypes.object,
-    labelNode: PropTypes.object,
-    labelModeEnabled: PropTypes.bool,
-    onChangeLabelProps: PropTypes.func,
-    onChangeProps: PropTypes.func,
-  };
-
-  static defaultProps = {
-    points: [],
-  };
-
-  dragPoint = (index, from, to) => {
-    log('[dragPoint] from, to:', from, to);
-    const { onChange, points } = this.props;
-    const update = [...points];
-    const overlapPoint = !!(points || []).find((p) => equalPoints(p, to));
-
-    if (equalPoints(from, to) || overlapPoint) {
-      return;
-    }
-
-    if (points[index].label) {
-      to.label = points[index].label;
-    }
-
-    update.splice(index, 1, to);
-    onChange(update);
-  };
-
-  dragLine = (existing, next) => {
-    log('[dragLine]: ', existing, next);
-    const { onChange } = this.props;
-
-    if (existing.from.label) {
-      next.from.label = existing.from.label;
-    }
-
-    if (existing.to.label) {
-      next.to.label = existing.to.label;
-    }
-
-    const points = swap(this.props.points, existing.from, next.from, existing.to, next.to);
-    onChange(points);
-  };
-
-  dragPoly = (existing, next) => {
-    log('[dragPoly] ', existing, next);
-    const { onChange } = this.props;
-
-    next.forEach((point, index) => {
-      if (existing[index].label) {
-        next[index].label = existing[index].label;
-      }
-    });
-
-    onChange(next);
-  };
-
-  close = () => {
-    const { points, onClosePolygon } = this.props;
-    log('[close] ...');
-
-    if (points.length >= 3) {
-      onClosePolygon();
-    } else {
-      log('[close] - nope');
-    }
-  };
-
-  labelChange = (point, index) => {
-    const { points, onChangeProps } = this.props;
-    const updatedPoint = { ...point };
-
-    if (!point.label || isEmpty(point.label)) {
-      delete updatedPoint.label;
-    }
-
-    const update = [...points];
-
-    update.splice(index, 1, updatedPoint);
-    onChangeProps(update);
-  };
-
-  clickPoint = (point, index, data) => {
-    const { closed, disabled, onClick, isToolActive, labelModeEnabled, onChangeProps, onChangeLabelProps, points } =
-      this.props;
-
-    if (labelModeEnabled) {
-      if (disabled) {
-        return;
-      }
-
-      if (points && index === points.length) {
-        const { a, b } = getRightestPoints(points);
-        const middle = { label: '', ...point, ...getMiddleOfTwoPoints(a, b) };
-
-        onChangeLabelProps(middle);
-      } else {
-        const update = [...points];
-
-        update.splice(index, 1, { label: '', ...point });
-        onChangeProps(update);
-      }
-
-      if (this.input[index]) {
-        this.input[index].focus();
-      }
-
-      return;
-    }
-
-    if (isToolActive && !closed && index === 0) {
-      this.close();
-      return;
-    }
-
-    onClick(point || data);
-  };
-
-  // IMPORTANT, do not remove
-  input = {};
-
-  render() {
-    const {
-      closed,
-      graphProps,
-      onChangeLabelProps,
-      points,
-      middle,
-      labelNode,
-      labelModeEnabled,
-      isSolution = false,
-    } = this.props;
-    const polygonLabelIndex = (points && points.length) || 0;
-    if (labelNode && middle && Object.prototype.hasOwnProperty.call(middle, 'label')) {
-      ReactDOM.createPortal(
-        <MarkLabel
-          inputRef={(r) => (this.input[polygonLabelIndex] = r)}
-          disabled={!labelModeEnabled}
-          mark={middle}
-          graphProps={graphProps}
-          onChange={(label) => onChangeLabelProps({ ...middle, label })}
-        />,
-        labelNode,
-      );
-    }
-    return (
-      <g>
-        <React.Fragment>
-          <DraggablePolygon
-            points={points}
-            closed={closed}
-            isSolution={isSolution}
-            graphProps={graphProps}
-            onClick={this.clickPoint.bind(this, middle, polygonLabelIndex)}
-          />
-        </React.Fragment>
-      </g>
-    );
-  }
-}
-
-export const BaseComponent = RawBaseComponent;
-
-export default class Component extends React.Component {
-  static propTypes = {
-    ...ToolPropTypeFields,
-    graphProps: types.GraphPropsType.isRequired,
-  };
-
-  static defaultProps = {};
-
-  constructor(props) {
-    super(props);
-    this.state = {};
-  }
-
-  change = (points) => {
-    const {
-      mark: { middle },
-    } = this.props;
-    const mark = { ...this.state.mark, points };
-
-    if (middle) {
-      const { a, b } = getRightestPoints(points);
-
-      mark.middle = { ...middle, ...getMiddleOfTwoPoints(a, b) };
-    }
-
-    this.setState({ mark });
-  };
-
-  changeProps = (points) => {
-    const mark = { ...this.props.mark, points };
-
-    this.props.onChange(this.props.mark, mark);
-  };
-
-  changeLabelProps = (point) => {
-    const { mark, onChange } = this.props;
-    const middle = { ...mark.middle, ...point };
-
-    onChange(mark, { ...mark, middle });
-  };
-
-  closePolygon = () => {
-    log('[closePolygon] ...');
-    const { onComplete, mark } = this.props;
-    const update = { ...mark, closed: true };
-
-    onComplete(mark, update);
-  };
-
-  dragStart = () => this.setState({ mark: this.props.mark });
-
-  dragStop = () => {
-    const { onChange } = this.props;
-    const m = { ...this.state.mark };
-
-    this.setState({ mark: undefined }, () => {
-      onChange(this.props.mark, m);
-    });
-  };
-
-  render() {
-    const { coordinatesOnHover, mark, graphProps, onClick, isToolActive, labelNode, labelModeEnabled } = this.props;
-    const { mark: stateMark } = this.state;
-
-    return (
-      <BaseComponent
-        {...(stateMark || mark)}
-        coordinatesOnHover={coordinatesOnHover}
-        onChange={this.change}
-        onChangeLabelProps={this.changeLabelProps}
-        onChangeProps={this.changeProps}
-        onClosePolygon={this.closePolygon}
-        onDragStart={this.dragStart}
-        onDragStop={this.dragStop}
-        onClick={onClick}
-        graphProps={graphProps}
-        isToolActive={isToolActive}
-        labelNode={labelNode}
-        labelModeEnabled={labelModeEnabled}
-      />
-    );
-  }
-}

package/src/tools/polygon/index.js

@@ -1,52 +0,0 @@
-import Polygon from './component';
-import { equalPoints } from '../../utils';
-
-export const addPointToArray = (point, arr) => {
-  arr = arr || [];
-
-  if (arr.length === 0) {
-    return { points: [point], closed: false };
-  } else if (arr.length === 1) {
-    if (equalPoints(point, arr[0])) {
-      return { points: arr, closed: false };
-    } else {
-      return { points: [...arr, point], closed: false };
-    }
-  } else if (arr.length >= 2) {
-    const closed = equalPoints(point, arr[0]);
-
-    if (closed) {
-      return { points: arr, closed };
-    } else {
-      const hasPoint = !!arr.find((p) => equalPoints(p, point));
-
-      if (hasPoint) {
-        return { points: arr, closed: false };
-      } else {
-        return { points: [...arr, point], closed: false };
-      }
-    }
-  }
-};
-
-export const tool = () => ({
-  type: 'polygon',
-  Component: Polygon,
-  complete: (data, mark) => {
-    return { ...mark, building: false, closed: true };
-  },
-  addPoint: (point, mark) => {
-    if (!mark) {
-      return {
-        type: 'polygon',
-        points: [point],
-        closed: false,
-        building: true,
-      };
-    } else {
-      const { closed, points } = addPointToArray(point, mark.points);
-
-      return { ...mark, closed, points, building: !closed };
-    }
-  },
-});

package/src/tools/polygon/line.jsx

@@ -1,80 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { styled } from '@mui/material/styles';
-import { gridDraggable, types } from '@pie-lib/plot';
-import { color } from '@pie-lib/render-ui';
-import * as utils from '../../utils';
-import { correct, disabled, incorrect, missing } from '../shared/styles';
-
-const StyledLine = styled('line', {
-  shouldForwardProp: (prop) => !['disabled', 'correctness'].includes(prop),
-})(({ disabled: isDisabled, correctness }) => ({
-  strokeWidth: 6,
-  transition: 'stroke-width 200ms ease-in, stroke 200ms ease-in',
-  stroke: 'transparent',
-  '&:hover': {
-    strokeWidth: 7,
-    stroke: color.defaults.SECONDARY,
-  },
-  ...(isDisabled && {
-    ...disabled('stroke'),
-    strokeWidth: 2,
-  }),
-  ...(correctness === 'correct' && correct('stroke')),
-  ...(correctness === 'incorrect' && incorrect('stroke')),
-  ...(correctness === 'missing' && missing('stroke')),
-}));
-
-class RawLine extends React.Component {
-  static propTypes = {
-    className: PropTypes.string,
-    from: types.PointType,
-    to: types.PointType,
-    graphProps: types.GraphPropsType.isRequired,
-    disabled: PropTypes.bool,
-    correctness: PropTypes.string,
-  };
-
-  static defaultProps = {
-    from: {},
-    to: {},
-  };
-
-  render() {
-    const { graphProps, from, to, className, disabled, correctness, ...rest } = this.props;
-    const { scale } = graphProps;
-    return (
-      <StyledLine
-        x1={scale.x(from.x)}
-        y1={scale.y(from.y)}
-        x2={scale.x(to.x)}
-        y2={scale.y(to.y)}
-        disabled={disabled}
-        correctness={correctness}
-        className={className}
-        {...rest}
-      />
-    );
-  }
-}
-
-export const Line = RawLine;
-
-export default gridDraggable({
-  bounds: (props, { domain, range }) => {
-    const { from, to } = props;
-    const area = utils.lineToArea(from, 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)),
-    };
-  },
-})(Line);

package/src/tools/polygon/polygon.jsx

@@ -1,93 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { styled } from '@mui/material/styles';
-import { gridDraggable, types } from '@pie-lib/plot';
-import * as utils from '../../utils';
-import { correct, incorrect } from '../shared/styles';
-
-const StyledPolygon = styled('polygon', {
-  shouldForwardProp: (prop) => !['isSolution', 'correctness'].includes(prop),
-})(({ isSolution, correctness }) => ({
-  fill: isSolution ? 'rgb(60, 73, 150, 0.6)' : 'transparent',
-  strokeWidth: 2,
-  '&:hover': {
-    fill: isSolution ? 'rgb(60, 73, 150, 0.6)' : 'rgb(0, 0, 0, 0.25)',
-  },
-  ...(correctness === 'correct' && correct('stroke')),
-  ...(correctness === 'incorrect' && incorrect('stroke')),
-}));
-
-const StyledPolyline = styled('polyline', {
-  shouldForwardProp: (prop) => !['isSolution', 'correctness'].includes(prop),
-})(({ isSolution, correctness }) => ({
-  fill: isSolution ? 'rgb(60, 73, 150, 0.6)' : 'transparent',
-  strokeWidth: 2,
-  '&:hover': {
-    fill: isSolution ? 'rgb(60, 73, 150, 0.6)' : 'rgb(0, 0, 0, 0.25)',
-  },
-  ...(correctness === 'correct' && correct('stroke')),
-  ...(correctness === 'incorrect' && incorrect('stroke')),
-}));
-
-export const getPointString = (points, scale) => {
-  return (points || [])
-    .map((p) => {
-      const scaledPoint = {
-        x: scale.x(p.x),
-        y: scale.y(p.y),
-      };
-      return `${scaledPoint.x},${scaledPoint.y}`;
-    })
-    .join(' ');
-};
-
-export class RawPolygon extends React.Component {
-  static propTypes = {
-    className: PropTypes.string,
-    isSolution: PropTypes.bool,
-    points: PropTypes.arrayOf(types.PointType),
-    graphProps: types.GraphPropsType.isRequired,
-    closed: PropTypes.bool.isRequired,
-    correctness: PropTypes.string,
-  };
-
-  static defaultProps = {
-    points: [],
-  };
-
-  render() {
-    const { points, className, correctness, graphProps, closed, isSolution, ...rest } = this.props;
-    const { scale } = graphProps;
-
-    const pointString = getPointString(points, scale);
-    const Component = closed ? StyledPolygon : StyledPolyline;
-    return (
-      <Component
-        points={pointString}
-        isSolution={isSolution}
-        correctness={correctness}
-        className={className}
-        {...rest}
-      />
-    );
-  }
-}
-
-export const Polygon = RawPolygon;
-
-export default gridDraggable({
-  bounds: (props, { domain, range }) => {
-    const { points } = props;
-    const area = utils.polygonToArea(points);
-    return utils.bounds(area, domain, range);
-  },
-  anchorPoint: (props) => {
-    const { points } = props;
-    return points[0];
-  },
-  fromDelta: (props, delta) => {
-    const { points } = props;
-
-    return points.map((p) => utils.point(p).add(utils.point(delta)));
-  },
-})(Polygon);

package/src/tools/shared/__tests__/arrow-head.test.jsx

@@ -1,33 +0,0 @@
-import { render } from '@pie-lib/test-utils';
-import React from 'react';
-import { ArrowHead, ArrowMarker } from '../arrow-head';
-
-describe('ArrowHead', () => {
-  const renderComponent = (extras) => {
-    const defaults = { size: 10, transform: '' };
-    const props = { ...defaults, ...extras };
-    return render(<ArrowHead {...props} />);
-  };
-
-  describe('rendering', () => {
-    it('renders without crashing', () => {
-      const { container } = renderComponent();
-      expect(container.firstChild).toBeInTheDocument();
-    });
-  });
-});
-
-describe('ArrowMarker', () => {
-  const renderComponent = (extras) => {
-    const defaults = { id: 'id', size: 10, className: 'className' };
-    const props = { ...defaults, ...extras };
-    return render(<ArrowMarker {...props} />);
-  };
-
-  describe('rendering', () => {
-    it('renders without crashing', () => {
-      const { container } = renderComponent();
-      expect(container.firstChild).toBeInTheDocument();
-    });
-  });
-});

package/src/tools/shared/arrow-head.jsx

@@ -1,46 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { color } from '@pie-lib/render-ui';
-
-export const ArrowHead = ({ size, transform, points }) => (
-  <polygon points={points || `0,0 ${size},${size / 2} 0,${size}`} transform={transform} />
-);
-ArrowHead.propTypes = {
-  points: PropTypes.string,
-  size: PropTypes.number,
-  transform: PropTypes.string,
-};
-ArrowHead.defaultProps = {
-  points: '',
-  size: 10,
-  transform: '',
-};
-export const genUid = () => {
-  const v = (Math.random() * 1000).toFixed(0);
-  return `arrow-${v}`;
-};
-export const ArrowMarker = ({ id, size, className }) => {
-  return (
-    <marker
-      id={id}
-      viewBox={`0 0 ${size} ${size}`}
-      refX={size / 2}
-      refY={size / 2}
-      markerWidth={size}
-      markerHeight={size}
-      orient="auto-start-reverse"
-      className={className}
-      style={{ fill: color.defaults.BLACK }}
-    >
-      <ArrowHead size={size} />
-    </marker>
-  );
-};
-ArrowMarker.propTypes = {
-  id: PropTypes.string,
-  size: PropTypes.number,
-  className: PropTypes.string,
-};
-ArrowMarker.defaultProps = {
-  size: 5,
-};