@pie-element/graphing 3.7.22 → 3.7.23

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.7.23](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing@3.7.22...@pie-element/graphing@3.7.23) (2022-06-13)
+
+
+### Bug Fixes
+
+* **graphing:** fixed horizontal/vertical gridlines when includeAxes is false PD-1842 (merged with develop) ([52f38ea](https://github.com/pie-framework/pie-elements/commit/52f38ea44fb9be0e438537abb0ecf1e1308a8834))
+
+
+
+
+
 ## [3.7.22](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing@3.7.21...@pie-element/graphing@3.7.22) (2022-06-13)
 
 **Note:** Version bump only for package @pie-element/graphing

package/configure/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.3.23](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-configure@3.3.22...@pie-element/graphing-configure@3.3.23) (2022-06-13)
+
+
+### Bug Fixes
+
+* **graphing:** fixed horizontal/vertical gridlines when includeAxes is false PD-1842 (merged with develop) ([52f38ea](https://github.com/pie-framework/pie-elements/commit/52f38ea44fb9be0e438537abb0ecf1e1308a8834))
+
+
+
+
+
 ## [3.3.22](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-configure@3.3.21...@pie-element/graphing-configure@3.3.22) (2022-06-13)
 
 **Note:** Version bump only for package @pie-element/graphing-configure

package/configure/lib/graphing-config.js

@@ -104,14 +104,24 @@ var GraphingConfig = /*#__PURE__*/function (_React$Component) {
       var updatedModel = _objectSpread(_objectSpread({}, model), config);
 
       var domain = updatedModel.domain,
+          includeAxes = updatedModel.includeAxes,
           graph = updatedModel.graph,
           range = updatedModel.range,
           standardGrid = updatedModel.standardGrid;
-      var gridValues = {};
-      var labelValues = {};
-      var domainConstraints = (0, _utils.applyConstraints)(domain, graph.width, oldGridValues.domain, oldLabelValues.domain);
-      gridValues.domain = domainConstraints.gridValues;
-      labelValues.domain = domainConstraints.labelValues;
+      var gridValues = {
+        domain: [],
+        range: []
+      };
+      var labelValues = {
+        domain: [],
+        range: []
+      };
+
+      if (includeAxes) {
+        var domainConstraints = (0, _utils.applyConstraints)(domain, graph.width, oldGridValues.domain, oldLabelValues.domain);
+        gridValues.domain = domainConstraints.gridValues || [];
+        labelValues.domain = domainConstraints.labelValues || [];
+      }
 
       if (standardGrid) {
         gridValues.range = gridValues.domain;
@@ -119,9 +129,11 @@ var GraphingConfig = /*#__PURE__*/function (_React$Component) {
         range.step = domain.step;
         range.labelStep = domain.labelStep;
       } else {
-        var rangeConstraints = (0, _utils.applyConstraints)(range, graph.height, oldGridValues.range, oldLabelValues.range);
-        gridValues.range = rangeConstraints.gridValues;
-        labelValues.range = rangeConstraints.labelValues;
+        if (includeAxes) {
+          var rangeConstraints = (0, _utils.applyConstraints)(range, graph.height, oldGridValues.range, oldLabelValues.range);
+          gridValues.range = rangeConstraints.gridValues || [];
+          labelValues.range = rangeConstraints.labelValues || [];
+        }
       }
 
       _this.setState({

package/configure/lib/graphing-config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphing-config.jsx"],"names":["tools","allTools","styles","theme","container","display","flexWrap","marginBottom","spacing","unit","gridConfig","flexDirection","marginRight","graphConfig","subheading","body","GraphingConfig","props","backgroundMarks","model","onChange","config","state","oldGridValues","gridValues","oldLabelValues","labelValues","updatedModel","domain","graph","range","standardGrid","domainConstraints","width","step","labelStep","rangeConstraints","height","setState","classes","graphDimensions","arrows","coordinatesOnHover","includeAxes","labels","title","enabled","min","max","sizeConstraints","Math","onConfigChange","includeArrows","changeBackgroundMarks","React","Component","PropTypes","object","isRequired","authoringEnabled","bool","func"],"mappings":"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","sourcesContent":["import * as React from 'react';\nimport PropTypes from 'prop-types';\nimport { GraphContainer, GridSetup, tools } from '@pie-lib/graphing';\nimport { Typography } from '@material-ui/core';\nimport { withStyles } from '@material-ui/core/styles';\nimport { applyConstraints, getGridValues, getLabelValues } from './utils';\n\nconst { allTools = [] } = tools;\n\nconst styles = theme => ({\n  container: {\n    display: 'flex',\n    flexWrap: 'wrap',\n    marginBottom: theme.spacing.unit * 7\n  },\n  gridConfig: {\n    display: 'flex',\n    flexDirection: 'column',\n    marginRight: theme.spacing.unit * 4,\n    marginBottom: theme.spacing.unit * 3\n  },\n  graphConfig: {\n    display: 'flex',\n    flexDirection: 'column'\n  },\n  subheading: {\n    marginBottom: theme.spacing.unit * 2\n  },\n  body: {\n    marginBottom: theme.spacing.unit\n  }\n});\n\nexport class GraphingConfig extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object.isRequired,\n    authoringEnabled: PropTypes.bool,\n    graphDimensions: PropTypes.object,\n    model: PropTypes.object.isRequired,\n    onChange: PropTypes.func.isRequired,\n  };\n\n  constructor(props) {\n    super(props);\n    const { domain, range, graph } = props.model || {};\n\n    const gridValues = {\n      domain: getGridValues(domain, graph.width, true),\n      range: getGridValues(range, graph.height, true)\n    };\n    const labelValues = {\n      domain: getLabelValues(domain.step),\n      range: getLabelValues(range.step)\n    };\n\n    this.state = { gridValues, labelValues };\n  };\n\n  changeBackgroundMarks = backgroundMarks => {\n    const model = { ...this.props.model, backgroundMarks };\n\n    this.props.onChange(model);\n  };\n\n  onConfigChange = config => {\n    const { model, onChange } = this.props;\n    const { gridValues: oldGridValues, labelValues: oldLabelValues } = this.state;\n    const updatedModel = { ...model, ...config };\n    const { domain, graph, range, standardGrid } = updatedModel;\n    const gridValues = {};\n    const labelValues = {};\n\n    const domainConstraints = applyConstraints(domain, graph.width, oldGridValues.domain, oldLabelValues.domain);\n\n    gridValues.domain = domainConstraints.gridValues;\n    labelValues.domain = domainConstraints.labelValues;\n\n    if (standardGrid) {\n      gridValues.range = gridValues.domain;\n      labelValues.range = labelValues.domain;\n      range.step = domain.step;\n      range.labelStep = domain.labelStep;\n    } else {\n      const rangeConstraints = applyConstraints(range, graph.height, oldGridValues.range, oldLabelValues.range);\n\n      gridValues.range = rangeConstraints.gridValues;\n      labelValues.range = rangeConstraints.labelValues;\n    }\n\n    this.setState({ gridValues, labelValues });\n    onChange(updatedModel);\n  };\n\n  render() {\n    const { classes, model, graphDimensions } = this.props;\n    const {\n      arrows,\n      backgroundMarks,\n      coordinatesOnHover,\n      domain,\n      includeAxes,\n      labels,\n      range,\n      standardGrid,\n      title\n    } = model || {};\n    const graph = (model || {}).graph || {};\n    const { enabled, min, max, step } = graphDimensions || {};\n    const { gridValues, labelValues } = this.state;\n\n    const sizeConstraints = {\n      min: Math.max(150, min),\n      max: Math.min(800, max),\n      step: step >= 1 ? Math.min(200, step) : 20\n    };\n\n    return (\n      <div className={classes.container}>\n        <div className={classes.gridConfig}>\n          <GridSetup\n            domain={domain}\n            dimensionsEnabled={enabled}\n            gridValues={gridValues}\n            includeAxes={includeAxes}\n            labelValues={labelValues}\n            range={range}\n            size={graph}\n            sizeConstraints={sizeConstraints}\n            standardGrid={standardGrid}\n            onChange={this.onConfigChange}\n          />\n        </div>\n\n        <div className={classes.graphConfig} key=\"graph\">\n          <Typography component=\"div\" variant=\"subheading2\" className={classes.subheading}>\n            <span>Define Graph Attributes</span>\n          </Typography>\n\n          <Typography component=\"div\" variant=\"body1\" className={classes.body}>\n            <span>Use this interface to add/edit a title and/or labels, and to set background shapes</span>\n          </Typography>\n\n          <GraphContainer\n            axesSettings={{ includeArrows: arrows }}\n            backgroundMarks={[]}\n            coordinatesOnHover={coordinatesOnHover}\n            domain={domain}\n            key=\"graphing-config\"\n            labels={labels}\n            marks={backgroundMarks}\n            onChangeMarks={this.changeBackgroundMarks}\n            range={range}\n            size={{ width: graph.width, height: graph.height }}\n            title={title}\n            toolbarTools={allTools}\n          />\n        </div>\n      </div>\n    );\n  }\n};\n\nexport default withStyles(styles)(GraphingConfig);\n"],"file":"graphing-config.js"}
+{"version":3,"sources":["../src/graphing-config.jsx"],"names":["tools","allTools","styles","theme","container","display","flexWrap","marginBottom","spacing","unit","gridConfig","flexDirection","marginRight","graphConfig","subheading","body","GraphingConfig","props","backgroundMarks","model","onChange","config","state","oldGridValues","gridValues","oldLabelValues","labelValues","updatedModel","domain","includeAxes","graph","range","standardGrid","domainConstraints","width","step","labelStep","rangeConstraints","height","setState","classes","graphDimensions","arrows","coordinatesOnHover","labels","title","enabled","min","max","sizeConstraints","Math","onConfigChange","includeArrows","changeBackgroundMarks","React","Component","PropTypes","object","isRequired","authoringEnabled","bool","func"],"mappings":"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","sourcesContent":["import * as React from 'react';\nimport PropTypes from 'prop-types';\nimport { GraphContainer, GridSetup, tools } from '@pie-lib/graphing';\nimport { Typography } from '@material-ui/core';\nimport { withStyles } from '@material-ui/core/styles';\nimport { applyConstraints, getGridValues, getLabelValues } from './utils';\n\nconst { allTools = [] } = tools;\n\nconst styles = theme => ({\n  container: {\n    display: 'flex',\n    flexWrap: 'wrap',\n    marginBottom: theme.spacing.unit * 7\n  },\n  gridConfig: {\n    display: 'flex',\n    flexDirection: 'column',\n    marginRight: theme.spacing.unit * 4,\n    marginBottom: theme.spacing.unit * 3\n  },\n  graphConfig: {\n    display: 'flex',\n    flexDirection: 'column'\n  },\n  subheading: {\n    marginBottom: theme.spacing.unit * 2\n  },\n  body: {\n    marginBottom: theme.spacing.unit\n  }\n});\n\nexport class GraphingConfig extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object.isRequired,\n    authoringEnabled: PropTypes.bool,\n    graphDimensions: PropTypes.object,\n    model: PropTypes.object.isRequired,\n    onChange: PropTypes.func.isRequired,\n  };\n\n  constructor(props) {\n    super(props);\n    const { domain, range, graph } = props.model || {};\n\n    const gridValues = {\n      domain: getGridValues(domain, graph.width, true),\n      range: getGridValues(range, graph.height, true)\n    };\n    const labelValues = {\n      domain: getLabelValues(domain.step),\n      range: getLabelValues(range.step)\n    };\n\n    this.state = { gridValues, labelValues };\n  };\n\n  changeBackgroundMarks = backgroundMarks => {\n    const model = { ...this.props.model, backgroundMarks };\n\n    this.props.onChange(model);\n  };\n\n  onConfigChange = config => {\n    const { model, onChange } = this.props;\n    const { gridValues: oldGridValues, labelValues: oldLabelValues } = this.state;\n    const updatedModel = { ...model, ...config };\n    const { domain, includeAxes, graph, range, standardGrid } = updatedModel;\n    const gridValues = { domain: [], range: [] };\n    const labelValues = { domain: [], range: [] };\n\n    if (includeAxes) {\n      const domainConstraints = applyConstraints(domain, graph.width, oldGridValues.domain, oldLabelValues.domain);\n\n      gridValues.domain = domainConstraints.gridValues || [];\n      labelValues.domain = domainConstraints.labelValues || [];\n    }\n\n    if (standardGrid) {\n      gridValues.range = gridValues.domain;\n      labelValues.range = labelValues.domain;\n      range.step = domain.step;\n      range.labelStep = domain.labelStep;\n    } else {\n      if (includeAxes) {\n        const rangeConstraints = applyConstraints(range, graph.height, oldGridValues.range, oldLabelValues.range);\n\n        gridValues.range = rangeConstraints.gridValues || [];\n        labelValues.range = rangeConstraints.labelValues || [];\n      }\n    }\n\n    this.setState({ gridValues, labelValues });\n    onChange(updatedModel);\n  };\n\n  render() {\n    const { classes, model, graphDimensions } = this.props;\n    const {\n      arrows,\n      backgroundMarks,\n      coordinatesOnHover,\n      domain,\n      includeAxes,\n      labels,\n      range,\n      standardGrid,\n      title\n    } = model || {};\n    const graph = (model || {}).graph || {};\n    const { enabled, min, max, step } = graphDimensions || {};\n    const { gridValues, labelValues } = this.state;\n\n    const sizeConstraints = {\n      min: Math.max(150, min),\n      max: Math.min(800, max),\n      step: step >= 1 ? Math.min(200, step) : 20\n    };\n\n    return (\n      <div className={classes.container}>\n        <div className={classes.gridConfig}>\n          <GridSetup\n            domain={domain}\n            dimensionsEnabled={enabled}\n            gridValues={gridValues}\n            includeAxes={includeAxes}\n            labelValues={labelValues}\n            range={range}\n            size={graph}\n            sizeConstraints={sizeConstraints}\n            standardGrid={standardGrid}\n            onChange={this.onConfigChange}\n          />\n        </div>\n\n        <div className={classes.graphConfig} key=\"graph\">\n          <Typography component=\"div\" variant=\"subheading2\" className={classes.subheading}>\n            <span>Define Graph Attributes</span>\n          </Typography>\n\n          <Typography component=\"div\" variant=\"body1\" className={classes.body}>\n            <span>Use this interface to add/edit a title and/or labels, and to set background shapes</span>\n          </Typography>\n\n          <GraphContainer\n            axesSettings={{ includeArrows: arrows }}\n            backgroundMarks={[]}\n            coordinatesOnHover={coordinatesOnHover}\n            domain={domain}\n            key=\"graphing-config\"\n            labels={labels}\n            marks={backgroundMarks}\n            onChangeMarks={this.changeBackgroundMarks}\n            range={range}\n            size={{ width: graph.width, height: graph.height }}\n            title={title}\n            toolbarTools={allTools}\n          />\n        </div>\n      </div>\n    );\n  }\n};\n\nexport default withStyles(styles)(GraphingConfig);\n"],"file":"graphing-config.js"}

package/configure/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pie-element/graphing-configure",
   "private": true,
-  "version": "3.3.22",
+  "version": "3.3.23",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "repository": "pie-framework/pie-elements",
-  "version": "3.7.22",
+  "version": "3.7.23",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -24,7 +24,7 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "2b16a41c0627a27ee758af9285afde4d226dc12b",
+  "gitHead": "d98f067faa382bfab496bf32054e959eb1ffbd5d",
   "main": "lib/index.js",
   "module": "src/index.js"
 }