@pie-lib/graphing 2.4.3-next.333 → 2.4.3-next.350

package/lib/graph-with-controls.js

@@ -109,26 +109,23 @@ var filterByVisibleToolTypes = function filterByVisibleToolTypes(toolbarTools, m
 
 exports.filterByVisibleToolTypes = filterByVisibleToolTypes;
 
+var getDefaultCurrentTool = function getDefaultCurrentTool(toolType) {
+  return _tools.toolsArr.find(function (tool) {
+    return tool.type === toolType;
+  }) || null;
+};
+
 var GraphWithControls = /*#__PURE__*/function (_React$Component) {
   _inherits(GraphWithControls, _React$Component);
 
   var _super = _createSuper(GraphWithControls);
 
-  function GraphWithControls() {
+  function GraphWithControls(props) {
     var _this;
 
     _classCallCheck(this, GraphWithControls);
 
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-
-    _defineProperty(_assertThisInitialized(_this), "state", {
-      currentTool: null,
-      labelModeEnabled: false
-    });
+    _this = _super.call(this, props);
 
     _defineProperty(_assertThisInitialized(_this), "changeCurrentTool", function (tool, tools) {
       return _this.setState({
@@ -146,10 +143,26 @@ var GraphWithControls = /*#__PURE__*/function (_React$Component) {
       });
     });
 
+    _this.state = {
+      currentTool: getDefaultCurrentTool(props.defaultTool),
+      labelModeEnabled: false
+    };
     return _this;
   }
 
   _createClass(GraphWithControls, [{
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      var defaultTool = this.props.defaultTool;
+
+      if (prevProps.defaultTool !== defaultTool) {
+        var currentTool = getDefaultCurrentTool(defaultTool);
+        this.setState({
+          currentTool: currentTool
+        });
+      }
+    }
+  }, {
     key: "render",
     value: function render() {
       var _this2 = this;

package/lib/graph-with-controls.js.map

@@ -1 +1 @@
-{"version":3,"file":"graph-with-controls.js","names":["setToolbarAvailability","toolbarTools","toolsArr","map","tA","toolbar","find","t","type","toolIsAvailable","tools","currentTool","tool","getAvailableTool","filterByValidToolTypes","backgroundMarks","filter","bM","allTools","filterByVisibleToolTypes","marks","GraphWithControls","labelModeEnabled","setState","state","props","axesSettings","classes","className","coordinatesOnHover","disabled","domain","labels","onChangeMarks","onUndo","onRedo","onReset","range","size","title","uniq","tT","isString","classNames","graphWithControls","controls","changeCurrentTool","toggleLabelMode","r","labelNode","undefined","React","Component","graphPropTypes","PropTypes","func","arrayOf","string","styles","theme","width","display","justifyContent","padding","spacing","unit","color","text","backgroundColor","primaryLight","borderTop","primaryDark","borderBottom","borderLeft","borderRight","fontSize","typography","withStyles"],"sources":["../src/graph-with-controls.jsx"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport classNames from 'classnames';\nimport uniq from 'lodash/uniq';\nimport isString from 'lodash/isString';\nimport { color } from '@pie-lib/render-ui';\n\nimport ToolMenu from './tool-menu';\nimport Graph, { graphPropTypes } from './graph';\nimport UndoRedo from './undo-redo';\nimport { allTools, toolsArr } from './tools';\n\nexport const setToolbarAvailability = toolbarTools =>\n  toolsArr.map(tA => ({ ...tA, toolbar: !!toolbarTools.find(t => t === tA.type) })) || [];\n\nexport const toolIsAvailable = (tools, currentTool) =>\n  currentTool && tools && (tools.find(tool => tool.type === currentTool.type) || {}).toolbar;\n\nexport const getAvailableTool = tools => tools.find(tool => tool.toolbar);\n\nexport const filterByValidToolTypes = backgroundMarks =>\n  backgroundMarks.filter(bM => !!allTools.find(tool => tool === bM.type));\n\nexport const filterByVisibleToolTypes = (toolbarTools, marks) =>\n  marks.filter(bM => !!toolbarTools.find(tool => tool === bM.type));\n\nexport class GraphWithControls extends React.Component {\n  static propTypes = {\n    ...graphPropTypes,\n    onUndo: PropTypes.func,\n    onRedo: PropTypes.func,\n    onReset: PropTypes.func,\n    toolbarTools: PropTypes.arrayOf(PropTypes.string) // array of tool types that have to be displayed in the toolbar, same shape as 'allTools'\n  };\n\n  static defaultProps = { toolbarTools: [] };\n\n  state = { currentTool: null, labelModeEnabled: false };\n\n  changeCurrentTool = (tool, tools) =>\n    this.setState({ currentTool: tools.find(t => t.type === tool) });\n\n  toggleLabelMode = () => this.setState(state => ({ labelModeEnabled: !state.labelModeEnabled }));\n\n  render() {\n    let { currentTool, labelModeEnabled } = this.state;\n\n    const {\n      axesSettings,\n      classes,\n      className,\n      coordinatesOnHover,\n      disabled,\n      domain,\n      labels,\n      onChangeMarks,\n      onUndo,\n      onRedo,\n      onReset,\n      range,\n      size,\n      title\n    } = this.props;\n\n    let { backgroundMarks, marks, toolbarTools } = this.props;\n\n    // make sure only valid tool types are kept (string) and without duplicates\n    toolbarTools = uniq(toolbarTools || []).filter(tT => !!isString(tT)) || [];\n\n    // keep only the backgroundMarks that have valid types\n    backgroundMarks = filterByValidToolTypes(backgroundMarks || []);\n\n    // keep only the marks that have types which appear in toolbar\n    marks = filterByVisibleToolTypes(toolbarTools, marks || []);\n\n    const tools = setToolbarAvailability(toolbarTools);\n\n    // set current tool if there's no current tool or if the existing one is no longer available\n    if (!currentTool || !toolIsAvailable(tools, currentTool)) {\n      currentTool = getAvailableTool(tools);\n    }\n\n    return (\n      <div className={classNames(classes.graphWithControls, className)}>\n        <div className={classes.controls}>\n          <ToolMenu\n            currentToolType={currentTool && currentTool.type}\n            disabled={!!disabled}\n            labelModeEnabled={labelModeEnabled}\n            onChange={tool => this.changeCurrentTool(tool, tools)}\n            onToggleLabelMode={this.toggleLabelMode}\n            toolbarTools={toolbarTools}\n          />\n\n          {!disabled && <UndoRedo onUndo={onUndo} onRedo={onRedo} onReset={onReset} />}\n        </div>\n\n        <div ref={r => (this.labelNode = r)} />\n\n        <Graph\n          axesSettings={axesSettings}\n          backgroundMarks={backgroundMarks}\n          coordinatesOnHover={coordinatesOnHover}\n          currentTool={currentTool}\n          domain={domain}\n          labels={labels}\n          labelModeEnabled={labelModeEnabled}\n          marks={marks}\n          onChangeMarks={!disabled ? onChangeMarks : undefined}\n          range={range}\n          size={size}\n          title={title}\n          tools={tools}\n        />\n      </div>\n    );\n  }\n}\n\nconst styles = theme => ({\n  graphWithControls: {},\n  controls: {\n    width: 'inherit',\n    display: 'flex',\n    justifyContent: 'space-between',\n    padding: theme.spacing.unit,\n    color: color.text(),\n    backgroundColor: color.primaryLight(),\n    borderTop: `solid 1px ${color.primaryDark()}`,\n    borderBottom: `solid 0px ${color.primaryDark()}`,\n    borderLeft: `solid 1px ${color.primaryDark()}`,\n    borderRight: `solid 1px ${color.primaryDark()}`,\n    '& button': {\n      fontSize: theme.typography.fontSize\n    }\n  }\n});\n\nexport default withStyles(styles)(GraphWithControls);\n"],"mappings":"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"}
+{"version":3,"file":"graph-with-controls.js","names":["setToolbarAvailability","toolbarTools","toolsArr","map","tA","toolbar","find","t","type","toolIsAvailable","tools","currentTool","tool","getAvailableTool","filterByValidToolTypes","backgroundMarks","filter","bM","allTools","filterByVisibleToolTypes","marks","getDefaultCurrentTool","toolType","GraphWithControls","props","setState","state","labelModeEnabled","defaultTool","prevProps","axesSettings","classes","className","coordinatesOnHover","disabled","domain","labels","onChangeMarks","onUndo","onRedo","onReset","range","size","title","uniq","tT","isString","classNames","graphWithControls","controls","changeCurrentTool","toggleLabelMode","r","labelNode","undefined","React","Component","graphPropTypes","PropTypes","func","arrayOf","string","styles","theme","width","display","justifyContent","padding","spacing","unit","color","text","backgroundColor","primaryLight","borderTop","primaryDark","borderBottom","borderLeft","borderRight","fontSize","typography","withStyles"],"sources":["../src/graph-with-controls.jsx"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport classNames from 'classnames';\nimport uniq from 'lodash/uniq';\nimport isString from 'lodash/isString';\nimport { color } from '@pie-lib/render-ui';\n\nimport ToolMenu from './tool-menu';\nimport Graph, { graphPropTypes } from './graph';\nimport UndoRedo from './undo-redo';\nimport { allTools, toolsArr } from './tools';\n\nexport const setToolbarAvailability = toolbarTools =>\n  toolsArr.map(tA => ({ ...tA, toolbar: !!toolbarTools.find(t => t === tA.type) })) || [];\n\nexport const toolIsAvailable = (tools, currentTool) =>\n  currentTool && tools && (tools.find(tool => tool.type === currentTool.type) || {}).toolbar;\n\nexport const getAvailableTool = tools => tools.find(tool => tool.toolbar);\n\nexport const filterByValidToolTypes = backgroundMarks =>\n  backgroundMarks.filter(bM => !!allTools.find(tool => tool === bM.type));\n\nexport const filterByVisibleToolTypes = (toolbarTools, marks) =>\n  marks.filter(bM => !!toolbarTools.find(tool => tool === bM.type));\n\nconst getDefaultCurrentTool = toolType => toolsArr.find(tool => tool.type === toolType) || null;\n\nexport class GraphWithControls extends React.Component {\n  static propTypes = {\n    ...graphPropTypes,\n    onUndo: PropTypes.func,\n    onRedo: PropTypes.func,\n    onReset: PropTypes.func,\n    toolbarTools: PropTypes.arrayOf(PropTypes.string) // array of tool types that have to be displayed in the toolbar, same shape as 'allTools'\n  };\n\n  static defaultProps = { toolbarTools: [] };\n\n  constructor(props) {\n    super(props);\n\n    this.state = {\n      currentTool: getDefaultCurrentTool(props.defaultTool),\n      labelModeEnabled: false\n    };\n  }\n\n  componentDidUpdate(prevProps) {\n    const { defaultTool } = this.props;\n\n    if (prevProps.defaultTool !== defaultTool) {\n      const currentTool = getDefaultCurrentTool(defaultTool);\n\n      this.setState({ currentTool });\n    }\n  }\n\n  changeCurrentTool = (tool, tools) =>\n    this.setState({ currentTool: tools.find(t => t.type === tool) });\n\n  toggleLabelMode = () => this.setState(state => ({ labelModeEnabled: !state.labelModeEnabled }));\n\n  render() {\n    let { currentTool, labelModeEnabled } = this.state;\n\n    const {\n      axesSettings,\n      classes,\n      className,\n      coordinatesOnHover,\n      disabled,\n      domain,\n      labels,\n      onChangeMarks,\n      onUndo,\n      onRedo,\n      onReset,\n      range,\n      size,\n      title\n    } = this.props;\n\n    let { backgroundMarks, marks, toolbarTools } = this.props;\n\n    // make sure only valid tool types are kept (string) and without duplicates\n    toolbarTools = uniq(toolbarTools || []).filter(tT => !!isString(tT)) || [];\n\n    // keep only the backgroundMarks that have valid types\n    backgroundMarks = filterByValidToolTypes(backgroundMarks || []);\n\n    // keep only the marks that have types which appear in toolbar\n    marks = filterByVisibleToolTypes(toolbarTools, marks || []);\n\n    const tools = setToolbarAvailability(toolbarTools);\n\n    // set current tool if there's no current tool or if the existing one is no longer available\n    if (!currentTool || !toolIsAvailable(tools, currentTool)) {\n      currentTool = getAvailableTool(tools);\n    }\n\n    return (\n      <div className={classNames(classes.graphWithControls, className)}>\n        <div className={classes.controls}>\n          <ToolMenu\n            currentToolType={currentTool && currentTool.type}\n            disabled={!!disabled}\n            labelModeEnabled={labelModeEnabled}\n            onChange={tool => this.changeCurrentTool(tool, tools)}\n            onToggleLabelMode={this.toggleLabelMode}\n            toolbarTools={toolbarTools}\n          />\n\n          {!disabled && <UndoRedo onUndo={onUndo} onRedo={onRedo} onReset={onReset} />}\n        </div>\n\n        <div ref={r => (this.labelNode = r)} />\n\n        <Graph\n          axesSettings={axesSettings}\n          backgroundMarks={backgroundMarks}\n          coordinatesOnHover={coordinatesOnHover}\n          currentTool={currentTool}\n          domain={domain}\n          labels={labels}\n          labelModeEnabled={labelModeEnabled}\n          marks={marks}\n          onChangeMarks={!disabled ? onChangeMarks : undefined}\n          range={range}\n          size={size}\n          title={title}\n          tools={tools}\n        />\n      </div>\n    );\n  }\n}\n\nconst styles = theme => ({\n  graphWithControls: {},\n  controls: {\n    width: 'inherit',\n    display: 'flex',\n    justifyContent: 'space-between',\n    padding: theme.spacing.unit,\n    color: color.text(),\n    backgroundColor: color.primaryLight(),\n    borderTop: `solid 1px ${color.primaryDark()}`,\n    borderBottom: `solid 0px ${color.primaryDark()}`,\n    borderLeft: `solid 1px ${color.primaryDark()}`,\n    borderRight: `solid 1px ${color.primaryDark()}`,\n    '& button': {\n      fontSize: theme.typography.fontSize\n    }\n  }\n});\n\nexport default withStyles(styles)(GraphWithControls);\n"],"mappings":"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"}

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.4.3-next.333+9e77aef6",
+  "version": "2.4.3-next.350+b185c466",
   "description": "Graphing components",
   "keywords": [
     "react",
@@ -19,8 +19,8 @@
     "@mapbox/point-geometry": "^0.1.0",
     "@material-ui/core": "^3.8.3",
     "@pie-lib/graphing-utils": "^1.1.20",
-    "@pie-lib/plot": "^2.1.10-next.408+9e77aef6",
-    "@pie-lib/render-ui": "^4.12.1-next.333+9e77aef6",
+    "@pie-lib/plot": "^2.2.0",
+    "@pie-lib/render-ui": "^4.12.8",
     "@vx/axis": "^0.0.189",
     "@vx/clip-path": "^0.0.189",
     "@vx/event": "^0.0.189",
@@ -43,6 +43,6 @@
   "peerDependencies": {
     "react": "^16.8.1"
   },
-  "gitHead": "9e77aef6241de40777005d2ab73f57e4e45fb744",
+  "gitHead": "b185c466fab76384eca91a7edc4d9f823cca6638",
   "scripts": {}
 }

package/src/graph-with-controls.jsx

@@ -25,6 +25,8 @@ export const filterByValidToolTypes = backgroundMarks =>
 export const filterByVisibleToolTypes = (toolbarTools, marks) =>
   marks.filter(bM => !!toolbarTools.find(tool => tool === bM.type));
 
+const getDefaultCurrentTool = toolType => toolsArr.find(tool => tool.type === toolType) || null;
+
 export class GraphWithControls extends React.Component {
   static propTypes = {
     ...graphPropTypes,
@@ -36,7 +38,24 @@ export class GraphWithControls extends React.Component {
 
   static defaultProps = { toolbarTools: [] };
 
-  state = { currentTool: null, labelModeEnabled: false };
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      currentTool: getDefaultCurrentTool(props.defaultTool),
+      labelModeEnabled: false
+    };
+  }
+
+  componentDidUpdate(prevProps) {
+    const { defaultTool } = this.props;
+
+    if (prevProps.defaultTool !== defaultTool) {
+      const currentTool = getDefaultCurrentTool(defaultTool);
+
+      this.setState({ currentTool });
+    }
+  }
 
   changeCurrentTool = (tool, tools) =>
     this.setState({ currentTool: tools.find(t => t.type === tool) });