@pie-lib/graphing-module 1.0.26 → 1.0.29

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.5/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.8/module/index.js";
 const PropTypes$C = _dll_prop_types;
 const BaseDomainRangeType = {
   min: PropTypes$C.number.isRequired,
@@ -8382,7 +8382,7 @@ const {head: head} = _dll_lodash;
 const {tail: tail} = _dll_lodash;
 const {isEqual: isEqual$6} = _dll_lodash;
 const {isEmpty: isEmpty$4} = _dll_lodash;
-const {cloneDeep: cloneDeep$1} = _dll_lodash;
+const {cloneDeep: cloneDeep$2} = _dll_lodash;
 const bounds = bounds$2;
 const point = point$4;
 const getAngleDeg = () => 0;
@@ -8452,7 +8452,7 @@ const pointsToArea = (a, b) => {
   };
 };
 const getRightestPoints = points => {
-  const sortedPoints = cloneDeep$1(points);
+  const sortedPoints = cloneDeep$2(points);
   sortedPoints.sort((a, b) => b.x - a.x);
   return {
     a: sortedPoints[0],
@@ -8521,7 +8521,7 @@ const isDuplicatedMark = (mark, marks, oldMark) => {
       const {from, to} = mark;
       return equalPoints(from, m.from) && equalPoints(to, m.to) || equalPoints(from, m.to) && equalPoints(to, m.from) || type === 'line' && isSameLine(m, mark);
     } else if (type === 'polygon') {
-      return isEqual$6(sortPoints(cloneDeep$1(mark.points)), sortPoints(cloneDeep$1(m.points)));
+      return isEqual$6(sortPoints(cloneDeep$2(mark.points)), sortPoints(cloneDeep$2(m.points)));
     } else if (type === 'point') {
       return equalPoints(m, mark);
     }
@@ -9186,7 +9186,7 @@ Bg.__initStatic2();
 const React$r = _dll_react;
 const PropTypes$p = _dll_prop_types;
 const {isEqual: isEqual$5} = _dll_lodash;
-const {cloneDeep: cloneDeep} = _dll_lodash;
+const {cloneDeep: cloneDeep$1} = _dll_lodash;
 const debug$7 = _dll_debug;
 const _jsxFileName$o = "/home/circleci/repo/packages/graphing/src/graph.jsx";
 const log$7 = debug$7('pie-lib:graphing:graph');
@@ -9216,7 +9216,7 @@ const getMaskSize = size => ({
 });
 const removeBuildingToolIfCurrentToolDiffers = ({marks, currentTool}) => {
   const buildingMark = marks.filter(m => m.building)[0];
-  let newMarks = cloneDeep(marks);
+  let newMarks = cloneDeep$1(marks);
   if (buildingMark && currentTool && buildingMark.type !== currentTool.type) {
     const index = newMarks.findIndex(m => isEqual$5(m, buildingMark));
     if (index >= 0) {
@@ -9258,7 +9258,7 @@ class Graph extends React$r.Component {
   __init3() {
     this.changeMark = (oldMark, newMark) => {
       const {onChangeMarks, marks} = this.props;
-      let newMarks = cloneDeep(marks);
+      let newMarks = cloneDeep$1(marks);
       const index = newMarks.findIndex(m => isEqual$5(m, oldMark));
       if (index >= 0 && !isDuplicatedMark(newMark, marks, oldMark)) {
         newMarks.splice(index, 1, newMark);
@@ -9278,7 +9278,7 @@ class Graph extends React$r.Component {
   __init5() {
     this.updateMarks = (existing, update, addIfMissing = false) => {
       const {onChangeMarks, marks} = this.props;
-      let newMarks = cloneDeep(marks);
+      let newMarks = cloneDeep$1(marks);
       if (!update.building && isDuplicatedMark(update, marks)) {
         return;
       }
@@ -9409,7 +9409,8 @@ class Graph extends React$r.Component {
         key: `${markType}-${index}-bg`,
         mark: {
           ...m,
-          disabled: true
+          disabled: true,
+          isBackground: true
         },
         labelNode: this.state.labelNode,
         ...common,
@@ -11732,6 +11733,10 @@ const styles$5 = theme => ({
     color: color$9.primaryDark()
   },
   disabled: {
+    border: `solid 1px ${color$9.primaryDark()}`,
+    background: color$9.background()
+  },
+  disabledMark: {
     border: `solid 1px ${color$9.disabled()}`,
     background: color$9.background(),
     color: color$9.disabled()
@@ -11821,14 +11826,14 @@ const MarkLabel = props => {
       externalInputRef(r);
     },
     disabled: disabledInput,
-    inputClassName: cn$1(classes.input, disabledInput && classes.disabled),
+    inputClassName: cn$1(classes.input, disabled && classes.disabled, mark.disabled && classes.disabledMark),
     value: label,
     style: style,
     onChange: onChange,
     __self: undefined,
     __source: {
       fileName: _jsxFileName$i,
-      lineNumber: 103
+      lineNumber: 107
     }
   });
 };
@@ -12159,6 +12164,7 @@ const LinePath = withStyles$b(theme => ({
 }))(RawLinePath);
 const React$e = _dll_react;
 const {isEqual: isEqual$2} = _dll_lodash;
+const {cloneDeep: cloneDeep} = _dll_lodash;
 const {isEmpty: isEmpty$2} = _dll_lodash;
 const PropTypes$e = _dll_prop_types;
 const ReactDOM$2 = _dll_react_dom;
@@ -12282,22 +12288,25 @@ 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;
+      const from = cloneDeep(mark.from);
+      const to = cloneDeep(mark.to);
+      const middle = cloneDeep(mark.middle);
+      if (from && mark.isBackground) {
+        from.disabled = true;
       }
-      if (mark.to && mark.disabled) {
-        mark.to.disabled = mark.disabled;
+      if (to && mark.isBackground) {
+        to.disabled = true;
       }
-      if (mark.middle && mark.disabled) {
-        mark.middle.disabled = mark.disabled;
+      if (middle && mark.isBackground) {
+        middle.disabled = true;
       }
       return React$e.createElement(Component, {
         disabled: mark.disabled,
         coordinatesOnHover: coordinatesOnHover,
         correctness: mark.correctness,
-        from: mark.from,
-        to: mark.to,
-        middle: mark.middle,
+        from: from,
+        to: to,
+        middle: middle,
         graphProps: graphProps,
         onChange: this.changeMark,
         changeMarkProps: this.changeMarkProps,
@@ -12309,7 +12318,7 @@ const lineToolComponent = Component => {
         __self: this,
         __source: {
           fileName: _jsxFileName$e,
-          lineNumber: 117
+          lineNumber: 121
         }
       });
     }
@@ -12497,7 +12506,7 @@ const lineBase = (Comp, opts) => {
             __self: this,
             __source: {
               fileName: _jsxFileName$e,
-              lineNumber: 291
+              lineNumber: 295
             }
           }), labelNode);
         }
@@ -12514,7 +12523,7 @@ const lineBase = (Comp, opts) => {
             __self: this,
             __source: {
               fileName: _jsxFileName$e,
-              lineNumber: 304
+              lineNumber: 308
             }
           }), labelNode);
         }
@@ -12531,7 +12540,7 @@ const lineBase = (Comp, opts) => {
             __self: this,
             __source: {
               fileName: _jsxFileName$e,
-              lineNumber: 317
+              lineNumber: 321
             }
           }), labelNode);
         }
@@ -12540,7 +12549,7 @@ const lineBase = (Comp, opts) => {
         __self: this,
         __source: {
           fileName: _jsxFileName$e,
-          lineNumber: 330
+          lineNumber: 334
         }
       }, to && React$e.createElement(DraggableComp, {
         from: from,
@@ -12552,7 +12561,7 @@ const lineBase = (Comp, opts) => {
         __self: this,
         __source: {
           fileName: _jsxFileName$e,
-          lineNumber: 332
+          lineNumber: 336
         }
       }), lineLabelNode, React$e.createElement(FromPoint, {
         x: from.x,
@@ -12565,7 +12574,7 @@ const lineBase = (Comp, opts) => {
         __self: this,
         __source: {
           fileName: _jsxFileName$e,
-          lineNumber: 343
+          lineNumber: 347
         }
       }), fromLabelNode, to && React$e.createElement(ToPoint, {
         x: to.x,
@@ -12579,7 +12588,7 @@ const lineBase = (Comp, opts) => {
         __self: this,
         __source: {
           fileName: _jsxFileName$e,
-          lineNumber: 355
+          lineNumber: 359
         }
       }), toLabelNode);
     }

package/module/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-lib/graphing-module",
-  "version": "1.0.26",
+  "version": "1.0.29",
   "mappings": {
     "@pie-lib/plot": "_dll_pie_lib__plot",
     "@pie-lib/graphing": "_dll_pie_lib__graphing",
@@ -13,7 +13,7 @@
         "version": "2.1.10"
       },
       "@pie-lib/graphing": {
-        "version": "2.4.12"
+        "version": "2.4.15"
       },
       "d3-scale": {
         "version": "2.2.2"
@@ -22,12 +22,12 @@
         "version": "1.4.2"
       }
     },
-    "hash": "d3b0cdc42a9437ab48f619dcf0a760adb5df9855"
+    "hash": "741a0e77165aa9134e532428a8e5f77087753dd1"
   },
   "modules": [
     {
       "name": "@pie-lib/shared-module",
-      "version": "^1.4.5"
+      "version": "^1.4.8"
     }
   ],
   "isLocal": true

package/package.json

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