@pie-lib/graphing-module 1.9.0 → 1.9.2

package/module/index.js

@@ -1,7 +1,7 @@
-import {_dll_prop_types, _dll_pie_lib__render_ui, _dll_material_ui__core_styles, _dll_react, _dll_classnames, _dll_react_dom, _dll_lodash, _dll_debug, _dll_material_ui__core, _dll_material_ui__core_styles_color_manipulator, _dll_material_ui__icons} from "../../shared-module@^1.5.18/module/index.js";
-import {_dll_pie_lib__editable_html} from "../../editable-html-module@^3.2.0/module/index.js";
-import {_dll_pie_lib__drag} from "../../drag-module@^1.0.70/module/index.js";
-import {_dll_pie_lib__config_ui} from "../../config-module@^2.1.18/module/index.js";
+import {_dll_prop_types, _dll_pie_lib__render_ui, _dll_material_ui__core_styles, _dll_react, _dll_classnames, _dll_react_dom, _dll_lodash, _dll_debug, _dll_material_ui__core, _dll_material_ui__core_styles_color_manipulator, _dll_material_ui__icons} from "../../shared-module@^1.5.20/module/index.js";
+import {_dll_pie_lib__editable_html} from "../../editable-html-module@^3.2.2/module/index.js";
+import {_dll_pie_lib__drag} from "../../drag-module@^1.0.72/module/index.js";
+import {_dll_pie_lib__config_ui} from "../../config-module@^2.1.20/module/index.js";
 const PropTypes$D = _dll_prop_types;
 const BaseDomainRangeType = {
   min: PropTypes$D.number.isRequired,
@@ -828,14 +828,15 @@ const {withStyles: withStyles$m} = _dll_material_ui__core_styles;
 const EditableHtml$2 = _dll_pie_lib__editable_html;
 const _jsxFileName$x = "/home/circleci/repo/packages/plot/src/label.jsx";
 const LabelComponent = props => {
-  const {classes, disabledLabel, graphHeight, graphWidth, isChartBottomLabel, isChartLeftLabel, placeholder, text, side, onChange} = props;
+  const {classes, disabledLabel, graphHeight, graphWidth, isChartBottomLabel, isDefineChartBottomLabel, isChartLeftLabel, isDefineChartLeftLabel, placeholder, text, side, onChange} = props;
   const [rotatedToHorizontal, setRotatedToHorizontal] = useState$2(false);
   const activePlugins = ['bold', 'italic', 'underline', 'strikethrough', 'math'];
-  const chartValue = side === 'left' && isChartLeftLabel && graphHeight - 148;
+  const isChart = isChartBottomLabel || isChartLeftLabel || isDefineChartBottomLabel || isDefineChartLeftLabel;
+  const chartValue = side === 'left' && isDefineChartLeftLabel && graphHeight - 220;
   const defaultStyle = {
     width: chartValue || (side === 'left' || side === 'right' ? graphHeight - 8 : graphWidth - 8),
-    top: chartValue || side === 'left' && `${graphHeight - 8}px` || side === 'bottom' && `${graphHeight - 90}px` || 0,
-    left: side === 'right' && `${graphWidth - 8}px` || (isChartLeftLabel || isChartBottomLabel) && '50px' || 0
+    top: chartValue || isChartLeftLabel && `${graphHeight - 70}px` || side === 'left' && `${graphHeight - 8}px` || isChartBottomLabel && `${graphHeight - 40}px` || side === 'bottom' && `${graphHeight - 90}px` || 0,
+    left: side === 'right' && `${graphWidth - 8}px` || (isDefineChartLeftLabel || isDefineChartBottomLabel) && '40px' || isChartBottomLabel && '-10px' || 0
   };
   const rotatedStyle = {
     width: graphWidth - 8,
@@ -848,21 +849,21 @@ const LabelComponent = props => {
     __self: undefined,
     __source: {
       fileName: _jsxFileName$x,
-      lineNumber: 54
+      lineNumber: 62
     }
   }, React$F.createElement('div', {
-    className: cn$4(classes.axisLabel, {
+    className: cn$4(isChart ? classes.chartLabel : classes.axisLabel, {
       [classes.rotateLeftLabel]: side === 'left' && !rotatedToHorizontal,
       [classes.rotateRightLabel]: side === 'right' && !rotatedToHorizontal,
       [classes.editLabel]: rotatedToHorizontal,
-      [classes.customBottom]: isChartBottomLabel
+      [classes.customBottom]: isChartBottomLabel || isDefineChartBottomLabel
     }),
     style: rotatedToHorizontal ? rotatedStyle : defaultStyle,
     onClick: rotateLabel,
     __self: undefined,
     __source: {
       fileName: _jsxFileName$x,
-      lineNumber: 55
+      lineNumber: 63
     }
   }, disabledLabel ? React$F.createElement('div', {
     className: classes.disabledLabel,
@@ -872,7 +873,7 @@ const LabelComponent = props => {
     __self: undefined,
     __source: {
       fileName: _jsxFileName$x,
-      lineNumber: 66
+      lineNumber: 74
     }
   }) : React$F.createElement(EditableHtml$2, {
     markup: text || '',
@@ -888,7 +889,7 @@ const LabelComponent = props => {
     __self: undefined,
     __source: {
       fileName: _jsxFileName$x,
-      lineNumber: 68
+      lineNumber: 76
     }
   })));
 };
@@ -902,6 +903,12 @@ var Label$1 = withStyles$m(theme => ({
     margin: '4px',
     padding: '4px 0'
   },
+  chartLabel: {
+    fontSize: theme.typography.fontSize + 2,
+    textAlign: 'center',
+    margin: '4px',
+    padding: '4px 0'
+  },
   disabledLabel: {
     pointerEvents: 'none',
     width: '100%'
@@ -1029,7 +1036,7 @@ class Root$1 extends React$E.Component {
     const finalWidth = width + leftPadding * 2 + (domain.padding || 0) * 2;
     const finalHeight = height + topPadding * 2 + (range.padding || 0) * 2;
     const activeTitlePlugins = ['bold', 'italic', 'underline', 'strikethrough', 'math'];
-    const actualHeight = defineChart && showPixelGuides ? height - 150 : height;
+    const actualHeight = defineChart && showPixelGuides ? height - 160 : height;
     const nbOfVerticalLines = parseInt(width / 100);
     const nbOfHorizontalLines = parseInt(actualHeight / 100);
     const sideGridlinesPadding = parseInt(actualHeight % 100);
@@ -1078,7 +1085,10 @@ class Root$1 extends React$E.Component {
         lineNumber: 131
       }
     }, "|"))))), showTitle && (disabledTitle ? React$E.createElement('div', {
-      className: cn$3(classes.graphTitle, classes.disabledTitle),
+      style: isChart && ({
+        width: finalWidth
+      }),
+      className: cn$3(isChart ? classes.chartTitle : classes.graphTitle, classes.disabledTitle),
       dangerouslySetInnerHTML: {
         __html: title || ''
       },
@@ -1088,9 +1098,12 @@ class Root$1 extends React$E.Component {
         lineNumber: 139
       }
     }) : React$E.createElement(EditableHtml$1, {
+      style: isChart && ({
+        width: finalWidth
+      }),
       className: cn$3({
         [classes.rightMargin]: showPixelGuides
-      }, classes.graphTitle),
+      }, isChart ? classes.chartTitle : classes.graphTitle),
       markup: title || '',
       onChange: onChangeTitle,
       placeholder: defineChart && titlePlaceholder || !disabledTitle && 'Click here to add a title for this graph',
@@ -1102,7 +1115,7 @@ class Root$1 extends React$E.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$w,
-        lineNumber: 144
+        lineNumber: 152
       }
     })), showLabels && !isChart && React$E.createElement(Label$1, {
       side: "top",
@@ -1115,14 +1128,14 @@ class Root$1 extends React$E.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$w,
-        lineNumber: 158
+        lineNumber: 174
       }
     }), React$E.createElement('div', {
       className: classes.wrapper,
       __self: this,
       __source: {
         fileName: _jsxFileName$w,
-        lineNumber: 168
+        lineNumber: 184
       }
     }, showLabels && React$E.createElement(Label$1, {
       side: "left",
@@ -1131,12 +1144,13 @@ class Root$1 extends React$E.Component {
       placeholder: _optionalChain$1([labelsPlaceholders, 'optionalAccess', _2 => _2.left]),
       graphHeight: finalHeight,
       graphWidth: finalWidth,
-      isChartLeftLabel: isChart && defineChart,
+      isChartLeftLabel: isChart && !defineChart,
+      isDefineChartLeftLabel: isChart && defineChart,
       onChange: value => this.onChangeLabel(value, 'left'),
       __self: this,
       __source: {
         fileName: _jsxFileName$w,
-        lineNumber: 170
+        lineNumber: 186
       }
     }), React$E.createElement('svg', {
       width: finalWidth,
@@ -1145,7 +1159,7 @@ class Root$1 extends React$E.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$w,
-        lineNumber: 181
+        lineNumber: 198
       }
     }, React$E.createElement('g', {
       ref: r => {
@@ -1159,7 +1173,7 @@ class Root$1 extends React$E.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$w,
-        lineNumber: 186
+        lineNumber: 203
       }
     }, children)), showLabels && !isChart && React$E.createElement(Label$1, {
       side: "right",
@@ -1172,7 +1186,7 @@ class Root$1 extends React$E.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$w,
-        lineNumber: 200
+        lineNumber: 217
       }
     }), showPixelGuides && React$E.createElement('div', {
       className: classes.sidePixelGuides,
@@ -1183,7 +1197,7 @@ class Root$1 extends React$E.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$w,
-        lineNumber: 211
+        lineNumber: 228
       }
     }, [...Array(nbOfHorizontalLines + 1).keys()].reverse().map(value => React$E.createElement(Readable$2, {
       false: true,
@@ -1191,14 +1205,14 @@ class Root$1 extends React$E.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$w,
-        lineNumber: 219
+        lineNumber: 236
       }
     }, React$E.createElement('div', {
       className: classes.sidePixelIndicator,
       __self: this,
       __source: {
         fileName: _jsxFileName$w,
-        lineNumber: 220
+        lineNumber: 237
       }
     }, "━ ", value * 100, "px"))))), showLabels && React$E.createElement(Label$1, {
       side: "bottom",
@@ -1207,12 +1221,13 @@ class Root$1 extends React$E.Component {
       placeholder: _optionalChain$1([labelsPlaceholders, 'optionalAccess', _4 => _4.bottom]),
       graphHeight: finalHeight,
       graphWidth: finalWidth,
-      isChartBottomLabel: isChart && defineChart,
+      isChartBottomLabel: isChart && !defineChart,
+      isDefineChartBottomLabel: isChart && defineChart,
       onChange: value => this.onChangeLabel(value, 'bottom'),
       __self: this,
       __source: {
         fileName: _jsxFileName$w,
-        lineNumber: 227
+        lineNumber: 244
       }
     }));
   }
@@ -1248,6 +1263,12 @@ const styles$9 = theme => ({
     padding: '12px 4px 0',
     textAlign: 'center'
   },
+  chartTitle: {
+    color: color$i.text(),
+    fontSize: theme.typography.fontSize + 4,
+    padding: '12px 4px 0',
+    textAlign: 'center'
+  },
   disabledTitle: {
     pointerEvents: 'none'
   },
@@ -11642,13 +11663,25 @@ class RawBp extends React$n.Component {
         lineNumber: 45
       }
     }, React$n.createElement('circle', {
+      style: {
+        fill: 'transparent'
+      },
+      r: r * 2,
+      cx: 2 * scale.x(x),
+      cy: 2 * scale.y(y),
+      __self: this,
+      __source: {
+        fileName: _jsxFileName$n,
+        lineNumber: 56
+      }
+    }), React$n.createElement('circle', {
       r: r,
       cx: scale.x(x),
       cy: scale.y(y),
       __self: this,
       __source: {
         fileName: _jsxFileName$n,
-        lineNumber: 56
+        lineNumber: 57
       }
     }), labelNode && coordinatesOnHover && showCoordinates && ReactDOM$4.createPortal(React$n.createElement(CoordinatesLabel$1, {
       graphProps: graphProps,
@@ -11657,7 +11690,7 @@ class RawBp extends React$n.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$n,
-        lineNumber: 61
+        lineNumber: 62
       }
     }), labelNode));
   }

package/module/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-lib/graphing-module",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "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.5.0"
+        "version": "2.5.1"
       },
       "@pie-lib/graphing": {
-        "version": "2.11.0"
+        "version": "2.11.1"
       },
       "d3-scale": {
         "version": "2.2.2"
@@ -22,24 +22,24 @@
         "version": "1.4.2"
       }
     },
-    "hash": "9bead60a43127f1232f4ac87ffa004e649c3f21c"
+    "hash": "3213371d0937190b266565a534761516aeea207a"
   },
   "modules": [
     {
       "name": "@pie-lib/shared-module",
-      "version": "^1.5.18"
+      "version": "^1.5.20"
     },
     {
       "name": "@pie-lib/editable-html-module",
-      "version": "^3.2.0"
+      "version": "^3.2.2"
     },
     {
       "name": "@pie-lib/drag-module",
-      "version": "^1.0.70"
+      "version": "^1.0.72"
     },
     {
       "name": "@pie-lib/config-module",
-      "version": "^2.1.18"
+      "version": "^2.1.20"
     }
   ],
   "isLocal": true

package/package.json

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