@pie-lib/graphing-module 1.0.23 → 1.0.26

package/module/index.js

@@ -1,4 +1,4 @@
-import {_dll_prop_types, _dll_lodash, _dll_react, _dll_material_ui__core_styles, _dll_material_ui__core, _dll_pie_lib__render_ui, _dll_react_dom, _dll_debug, _dll_classnames, _dll_material_ui__core_styles_color_manipulator} from "../../shared-module@^1.4.2/module/index.js";
+import {_dll_prop_types, _dll_lodash, _dll_react, _dll_material_ui__core_styles, _dll_material_ui__core, _dll_pie_lib__render_ui, _dll_react_dom, _dll_debug, _dll_classnames, _dll_material_ui__core_styles_color_manipulator} from "../../shared-module@^1.4.5/module/index.js";
 const PropTypes$C = _dll_prop_types;
 const BaseDomainRangeType = {
   min: PropTypes$C.number.isRequired,
@@ -1109,7 +1109,7 @@ const amountToIncreaseWidth$2 = longestWord => {
   if (!longestWord) {
     return 0;
   }
-  return longestWord * 10;
+  return longestWord * 20;
 };
 var utils$1 = Object.freeze({
   __proto__: null,
@@ -1144,14 +1144,17 @@ const GraphTitle = withStyles$k(theme => ({
   }
 }))(({value, classes}) => React$D.createElement(Typography, {
   className: classes.title,
-  variant: "h5",
   color: "primary",
+  variant: "h5",
+  dangerouslySetInnerHTML: {
+    __html: value
+  },
   __self: undefined,
   __source: {
     fileName: _jsxFileName$v,
     lineNumber: 19
   }
-}, value));
+}));
 class Root$1 extends React$D.Component {
   constructor(...args) {
     super(...args);
@@ -1206,14 +1209,14 @@ class Root$1 extends React$D.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$v,
-        lineNumber: 76
+        lineNumber: 79
       }
     }, title && React$D.createElement(GraphTitle, {
       value: title,
       __self: this,
       __source: {
         fileName: _jsxFileName$v,
-        lineNumber: 77
+        lineNumber: 80
       }
     }), React$D.createElement('svg', {
       width: finalWidth,
@@ -1222,7 +1225,7 @@ class Root$1 extends React$D.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$v,
-        lineNumber: 78
+        lineNumber: 81
       }
     }, React$D.createElement('g', {
       ref: r => {
@@ -1236,7 +1239,7 @@ class Root$1 extends React$D.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$v,
-        lineNumber: 79
+        lineNumber: 82
       }
     }, children)));
   }
@@ -3008,7 +3011,7 @@ var amountToIncreaseWidth$1 = function amountToIncreaseWidth(longestWord) {
   if (!longestWord) {
     return 0;
   }
-  return longestWord * 10;
+  return longestWord * 20;
 };
 utils.amountToIncreaseWidth = amountToIncreaseWidth$1;
 const debug$8 = _dll_debug;
@@ -9408,6 +9411,7 @@ class Graph extends React$r.Component {
           ...m,
           disabled: true
         },
+        labelNode: this.state.labelNode,
         ...common,
         __self: this,
         __source: {
@@ -9433,7 +9437,7 @@ class Graph extends React$r.Component {
         __self: this,
         __source: {
           fileName: _jsxFileName$o,
-          lineNumber: 202
+          lineNumber: 203
         }
       });
     }), React$r.createElement('foreignObject', {
@@ -9447,7 +9451,7 @@ class Graph extends React$r.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$o,
-        lineNumber: 218
+        lineNumber: 219
       }
     })));
   }
@@ -11320,49 +11324,23 @@ class Arrow$1 extends React$j.Component {
       graphProps: GraphPropsType.isRequired
     };
   }
-  getRotation(currentAngle, referenceAngle, x, y) {
-    const breakpoint = referenceAngle + 10;
-    return `rotate(${-currentAngle - (currentAngle > breakpoint ? 15 : 0)}, ${x},${y})`;
-  }
-  getRotationWithBreakpoint(currentAngle, referenceAngle, x, y) {
-    const firstBreakpoint = referenceAngle + 10;
-    const secondBreakpoint = referenceAngle + 65;
-    let t;
-    if (currentAngle >= firstBreakpoint && currentAngle < secondBreakpoint) {
-      t = 15;
-    } else if (currentAngle > secondBreakpoint) {
-      t = 7;
-    } else {
-      t = 0;
-    }
-    return `rotate(${-currentAngle + t}, ${x},${y})`;
-  }
   render() {
     const {classes, angle, className, x, y, disabled, correctness, graphProps, ...rest} = this.props;
     const size = thinnerShapesNeeded(graphProps) ? 12 : 14;
     const {scale} = graphProps;
     const scaledX = scale.x(x);
     const scaledY = scale.y(y);
-    let transform;
+    const transform = `rotate(${-angle}, ${scaledX},${scaledY})`;
     const points = `${scaledX},${scaledY}
         ${scaledX - size},${scaledY - size / 2}
         ${scaledX - size}, ${scaledY + size / 2}`;
-    if (angle >= 0 && angle < 90) {
-      transform = this.getRotation(angle, 0, scaledX, scaledY);
-    } else if (angle >= 90 && angle < 180) {
-      transform = this.getRotationWithBreakpoint(angle, 90, scaledX, scaledY);
-    } else if (angle >= 180 && angle < 270) {
-      transform = this.getRotation(angle, 180, scaledX, scaledY);
-    } else {
-      transform = this.getRotationWithBreakpoint(angle, 280, scaledX, scaledY);
-    }
     return React$j.createElement('g', {
       className: classNames$c(classes.point, disabled && classes.disabled, classes[correctness], className),
       ...rest,
       __self: this,
       __source: {
         fileName: _jsxFileName$j,
-        lineNumber: 74
+        lineNumber: 45
       }
     }, React$j.createElement(ArrowHead, {
       size: size,
@@ -11371,7 +11349,7 @@ class Arrow$1 extends React$j.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$j,
-        lineNumber: 83
+        lineNumber: 54
       }
     }));
   }
@@ -11754,8 +11732,9 @@ const styles$5 = theme => ({
     color: color$9.primaryDark()
   },
   disabled: {
-    border: `solid 1px ${color$9.primaryDark()}`,
-    background: color$9.background()
+    border: `solid 1px ${color$9.disabled()}`,
+    background: color$9.background(),
+    color: color$9.disabled()
   }
 });
 const position = (graphProps, mark, rect) => {
@@ -11835,20 +11814,21 @@ const MarkLabel = props => {
     pointerEvents: 'auto',
     ...leftTop
   };
+  const disabledInput = disabled || mark.disabled;
   return React$i.createElement(_default, {
     inputRef: r => {
       _ref(r);
       externalInputRef(r);
     },
-    disabled: disabled,
-    inputClassName: cn$1(classes.input, disabled && classes.disabled),
+    disabled: disabledInput,
+    inputClassName: cn$1(classes.input, disabledInput && classes.disabled),
     value: label,
     style: style,
     onChange: onChange,
     __self: undefined,
     __source: {
       fileName: _jsxFileName$i,
-      lineNumber: 100
+      lineNumber: 103
     }
   });
 };
@@ -12302,6 +12282,15 @@ const lineToolComponent = Component => {
     render() {
       const {graphProps, onClick, labelNode, labelModeEnabled, coordinatesOnHover} = this.props;
       const mark = this.state.mark ? this.state.mark : this.props.mark;
+      if (mark.from && mark.disabled) {
+        mark.from.disabled = mark.disabled;
+      }
+      if (mark.to && mark.disabled) {
+        mark.to.disabled = mark.disabled;
+      }
+      if (mark.middle && mark.disabled) {
+        mark.middle.disabled = mark.disabled;
+      }
       return React$e.createElement(Component, {
         disabled: mark.disabled,
         coordinatesOnHover: coordinatesOnHover,
@@ -12320,7 +12309,7 @@ const lineToolComponent = Component => {
         __self: this,
         __source: {
           fileName: _jsxFileName$e,
-          lineNumber: 102
+          lineNumber: 117
         }
       });
     }
@@ -12508,7 +12497,7 @@ const lineBase = (Comp, opts) => {
             __self: this,
             __source: {
               fileName: _jsxFileName$e,
-              lineNumber: 276
+              lineNumber: 291
             }
           }), labelNode);
         }
@@ -12525,7 +12514,7 @@ const lineBase = (Comp, opts) => {
             __self: this,
             __source: {
               fileName: _jsxFileName$e,
-              lineNumber: 289
+              lineNumber: 304
             }
           }), labelNode);
         }
@@ -12542,7 +12531,7 @@ const lineBase = (Comp, opts) => {
             __self: this,
             __source: {
               fileName: _jsxFileName$e,
-              lineNumber: 302
+              lineNumber: 317
             }
           }), labelNode);
         }
@@ -12551,7 +12540,7 @@ const lineBase = (Comp, opts) => {
         __self: this,
         __source: {
           fileName: _jsxFileName$e,
-          lineNumber: 315
+          lineNumber: 330
         }
       }, to && React$e.createElement(DraggableComp, {
         from: from,
@@ -12563,7 +12552,7 @@ const lineBase = (Comp, opts) => {
         __self: this,
         __source: {
           fileName: _jsxFileName$e,
-          lineNumber: 317
+          lineNumber: 332
         }
       }), lineLabelNode, React$e.createElement(FromPoint, {
         x: from.x,
@@ -12576,7 +12565,7 @@ const lineBase = (Comp, opts) => {
         __self: this,
         __source: {
           fileName: _jsxFileName$e,
-          lineNumber: 328
+          lineNumber: 343
         }
       }), fromLabelNode, to && React$e.createElement(ToPoint, {
         x: to.x,
@@ -12590,7 +12579,7 @@ const lineBase = (Comp, opts) => {
         __self: this,
         __source: {
           fileName: _jsxFileName$e,
-          lineNumber: 340
+          lineNumber: 355
         }
       }), toLabelNode);
     }
@@ -14138,19 +14127,28 @@ const lineStyles = theme => ({
   incorrect: styles$3.incorrect(theme, 'stroke')
 });
 const Line = props => {
-  const {className, classes, disabled, correctness, graphProps, from, to, ...rest} = props;
-  const {scale} = graphProps;
+  const {className, classes, disabled, correctness, graphProps: {scale}, from, to, ...rest} = props;
+  const startPoint = {
+    x: scale.x(from.x),
+    y: scale.y(from.y)
+  };
+  const endPoint = {
+    x: scale.x(to.x),
+    y: scale.y(to.y)
+  };
+  const length = getDistanceBetweenTwoPoints(startPoint, endPoint);
   return React$5.createElement('line', {
     className: classNames$3(classes.line, disabled && classes.disabled, classes[correctness], className),
-    x1: scale.x(from.x),
-    y1: scale.y(from.y),
-    x2: scale.x(to.x),
-    y2: scale.y(to.y),
+    x1: startPoint.x,
+    y1: startPoint.y,
+    x2: endPoint.x,
+    y2: endPoint.y,
+    strokeDasharray: length - 7,
     ...rest,
     __self: undefined,
     __source: {
       fileName: _jsxFileName$5,
-      lineNumber: 20
+      lineNumber: 33
     }
   });
 };

package/module/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-lib/graphing-module",
-  "version": "1.0.23",
+  "version": "1.0.26",
   "mappings": {
     "@pie-lib/plot": "_dll_pie_lib__plot",
     "@pie-lib/graphing": "_dll_pie_lib__graphing",
@@ -10,10 +10,10 @@
   "versionInfo": {
     "data": {
       "@pie-lib/plot": {
-        "version": "2.1.9"
+        "version": "2.1.10"
       },
       "@pie-lib/graphing": {
-        "version": "2.4.10"
+        "version": "2.4.12"
       },
       "d3-scale": {
         "version": "2.2.2"
@@ -22,12 +22,12 @@
         "version": "1.4.2"
       }
     },
-    "hash": "8d9d0c11032014b49b8c98cbd7d2e8856b73ad26"
+    "hash": "d3b0cdc42a9437ab48f619dcf0a760adb5df9855"
   },
   "modules": [
     {
       "name": "@pie-lib/shared-module",
-      "version": "^1.4.2"
+      "version": "^1.4.5"
     }
   ],
   "isLocal": true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-lib/graphing-module",
-  "version": "1.0.23",
+  "version": "1.0.26",
   "module": "module/index.js",
   "repository": "pie-framework/pie-lib",
   "publishConfig": {