@pie-lib/plot 2.3.0 → 2.4.0

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.
 
+# [2.4.0](https://github.com/pie-framework/pie-lib/compare/@pie-lib/plot@2.3.0...@pie-lib/plot@2.4.0) (2022-08-15)
+
+
+### Features
+
+* **graphing, plot:** added pixel guide lines + ui improvements ([02ddff1](https://github.com/pie-framework/pie-lib/commit/02ddff1aed6a279b8a4ae1fcf100c766596c29c4))
+
+
+
+
+
 # [2.3.0](https://github.com/pie-framework/pie-lib/compare/@pie-lib/plot@2.2.0...@pie-lib/plot@2.3.0) (2022-08-01)
 
 

package/lib/root.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = exports.Root = void 0;
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -102,6 +104,8 @@ var Root = /*#__PURE__*/function (_React$Component) {
           children = _this$props2.children,
           classes = _this$props2.classes,
           onChangeTitle = _this$props2.onChangeTitle,
+          showLabels = _this$props2.showLabels,
+          showPixelGuides = _this$props2.showPixelGuides,
           showTitle = _this$props2.showTitle,
           title = _this$props2.title,
           rootRef = _this$props2.rootRef;
@@ -112,16 +116,27 @@ var Root = /*#__PURE__*/function (_React$Component) {
           height = _graphProps$size$heig === void 0 ? 500 : _graphProps$size$heig,
           domain = graphProps.domain,
           range = graphProps.range;
-      var topPadding = 50;
-      var leftPadding = topPadding + 10; // left side requires an extra padding of 10
-
-      var finalWidth = width + leftPadding * 2 + (domain.padding || 0) * 2;
-      var finalHeight = height + topPadding * 2 + (range.padding || 0) * 2;
-      var activeTitlePlugins = ['bold', 'italic', 'underline', 'strikethrough' // 'languageCharacters'
+      var padding = showLabels ? 70 : 40;
+      var extraPadding = showLabels ? 16 : 40;
+      var finalWidth = width + padding * 2 + (domain.padding || 0) * 2 + extraPadding;
+      var finalHeight = height + padding * 2 + (range.padding || 0) * 2;
+      var activeTitlePlugins = ['bold', 'italic', 'underline', 'strikethrough', 'math' // 'languageCharacters'
       ];
+      var nbOfVerticalLines = parseInt(width / 100);
+      var nbOfHorizontalLines = parseInt(height / 100);
+      var sideGridlinesPadding = parseInt(height % 100);
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.root
-      }, showTitle && /*#__PURE__*/_react["default"].createElement(_editableHtml["default"], {
+      }, showPixelGuides && /*#__PURE__*/_react["default"].createElement("div", {
+        className: classes.topPixelGuides
+      }, (0, _toConsumableArray2["default"])(Array(nbOfVerticalLines + 1).keys()).map(function (value) {
+        return /*#__PURE__*/_react["default"].createElement(_renderUi.Readable, {
+          "false": true,
+          key: "top-guide-".concat(value)
+        }, /*#__PURE__*/_react["default"].createElement("div", {
+          className: classes.topPixelIndicator
+        }, /*#__PURE__*/_react["default"].createElement("div", null, value * 100, "px"), /*#__PURE__*/_react["default"].createElement("div", null, "|")));
+      })), showTitle && /*#__PURE__*/_react["default"].createElement(_editableHtml["default"], {
         className: (0, _classnames["default"])((0, _defineProperty2["default"])({}, classes.disabledTitle, disabledTitle), classes.graphTitle),
         markup: title || '',
         width: finalWidth,
@@ -131,7 +146,9 @@ var Root = /*#__PURE__*/function (_React$Component) {
           noBorder: true
         },
         activePlugins: activeTitlePlugins
-      }), /*#__PURE__*/_react["default"].createElement("svg", {
+      }), /*#__PURE__*/_react["default"].createElement("div", {
+        className: classes.wrapper
+      }, /*#__PURE__*/_react["default"].createElement("svg", {
         width: finalWidth,
         height: finalHeight,
         className: classes.svg
@@ -144,8 +161,20 @@ var Root = /*#__PURE__*/function (_React$Component) {
           }
         },
         className: classes.graphBox,
-        transform: "translate(".concat(leftPadding, ", ").concat(topPadding, ")")
-      }, children)));
+        transform: "translate(".concat(padding, ", ").concat(padding, ")")
+      }, children)), showPixelGuides && /*#__PURE__*/_react["default"].createElement("div", {
+        className: classes.sidePixelGuides,
+        style: {
+          paddingTop: sideGridlinesPadding
+        }
+      }, (0, _toConsumableArray2["default"])(Array(nbOfHorizontalLines + 1).keys()).reverse().map(function (value) {
+        return /*#__PURE__*/_react["default"].createElement(_renderUi.Readable, {
+          "false": true,
+          key: "top-guide-".concat(value)
+        }, /*#__PURE__*/_react["default"].createElement("div", {
+          className: classes.sidePixelIndicator
+        }, "\u2501 ", value * 100, "px"));
+      }))));
     }
   }]);
   return Root;
@@ -155,10 +184,14 @@ exports.Root = Root;
 (0, _defineProperty2["default"])(Root, "propTypes", {
   title: _propTypes["default"].string,
   children: _types.ChildrenType,
+  disabledTitle: _propTypes["default"].bool,
   graphProps: _types.GraphPropsType.isRequired,
+  onChangeTitle: _propTypes["default"].func,
   onMouseMove: _propTypes["default"].func,
   classes: _propTypes["default"].object.isRequired,
+  showLabels: _propTypes["default"].bool,
   showTitle: _propTypes["default"].bool,
+  showPixelGuides: _propTypes["default"].bool,
   rootRef: _propTypes["default"].func
 });
 
@@ -169,6 +202,9 @@ var styles = function styles(theme) {
       color: _renderUi.color.text(),
       backgroundColor: _renderUi.color.background()
     },
+    wrapper: {
+      display: 'flex'
+    },
     svg: {},
     graphBox: {
       cursor: 'pointer',
@@ -177,11 +213,42 @@ var styles = function styles(theme) {
     graphTitle: {
       color: _renderUi.color.text(),
       fontSize: theme.typography.fontSize + 2,
-      padding: '8px 50px 0',
+      padding: '12px 4px 0',
       textAlign: 'center'
     },
     disabledTitle: {
       pointerEvents: 'none'
+    },
+    topPixelGuides: {
+      display: 'flex',
+      paddingTop: '6px',
+      marginLeft: '10px'
+    },
+    topPixelIndicator: {
+      color: _renderUi.color.primaryLight(),
+      display: 'flex',
+      flexDirection: 'column',
+      alignItems: 'center',
+      width: '100px',
+      pointerEvents: 'none',
+      userSelect: 'none'
+    },
+    sidePixelGuides: {
+      width: '70px',
+      display: 'flex',
+      flexDirection: 'column',
+      marginTop: '40px',
+      marginRight: '6px'
+    },
+    sidePixelIndicator: {
+      color: _renderUi.color.primaryLight(),
+      textAlign: 'right',
+      height: '20px',
+      pointerEvents: 'none',
+      userSelect: 'none',
+      '&:not(:last-child)': {
+        marginBottom: '80px'
+      }
     }
   };
 };

package/lib/root.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/root.jsx"],"names":["Root","g","props","graphProps","onMouseMove","scale","snap","coords","_groups","x","invert","y","snapped","on","mouseMove","bind","disabledTitle","children","classes","onChangeTitle","showTitle","title","rootRef","size","width","height","domain","range","topPadding","leftPadding","finalWidth","padding","finalHeight","activeTitlePlugins","root","graphTitle","noBorder","svg","r","graphBox","React","Component","PropTypes","string","ChildrenType","GraphPropsType","isRequired","func","object","bool","styles","theme","border","color","primaryLight","text","backgroundColor","background","cursor","userSelect","fontSize","typography","textAlign","pointerEvents"],"mappings":"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","sourcesContent":["import React from 'react';\nimport { ChildrenType } from './types';\nimport { withStyles } from '@material-ui/core/styles';\nimport { select, mouse } from 'd3-selection';\nimport PropTypes from 'prop-types';\nimport { GraphPropsType } from './types';\nimport { color } from '@pie-lib/render-ui';\nimport EditableHtml from '@pie-lib/editable-html';\nimport cn from 'classnames';\n\nexport class Root extends React.Component {\n  static propTypes = {\n    title: PropTypes.string,\n    children: ChildrenType,\n    graphProps: GraphPropsType.isRequired,\n    onMouseMove: PropTypes.func,\n    classes: PropTypes.object.isRequired,\n    showTitle: PropTypes.bool,\n    rootRef: PropTypes.func\n  };\n\n  mouseMove = g => {\n    const { graphProps, onMouseMove } = this.props;\n\n    if (!onMouseMove) {\n      return;\n    }\n\n    const { scale, snap } = graphProps;\n    const coords = mouse(g._groups[0][0]);\n    const x = scale.x.invert(coords[0]);\n    const y = scale.y.invert(coords[1]);\n\n    const snapped = {\n      x: snap.x(x),\n      y: snap.y(y)\n    };\n\n    onMouseMove(snapped);\n  };\n\n  componentDidMount() {\n    const g = select(this.g);\n    g.on('mousemove', this.mouseMove.bind(this, g));\n  }\n\n  componentWillUnmount() {\n    const g = select(this.g);\n    g.on('mousemove', null);\n  }\n\n  render() {\n    const {\n      disabledTitle,\n      graphProps,\n      children,\n      classes,\n      onChangeTitle,\n      showTitle,\n      title,\n      rootRef\n    } = this.props;\n    const {\n      size: { width = 500, height = 500 },\n      domain,\n      range\n    } = graphProps;\n    const topPadding = 50;\n    const leftPadding = topPadding + 10; // left side requires an extra padding of 10\n    const finalWidth = width + leftPadding * 2 + (domain.padding || 0) * 2;\n    const finalHeight = height + topPadding * 2 + (range.padding || 0) * 2;\n\n    const activeTitlePlugins = [\n      'bold',\n      'italic',\n      'underline',\n      'strikethrough'\n      // 'languageCharacters'\n    ];\n\n    return (\n      <div className={classes.root}>\n        {showTitle && (\n          <EditableHtml\n            className={cn(\n              {\n                [classes.disabledTitle]: disabledTitle\n              },\n              classes.graphTitle\n            )}\n            markup={title || ''}\n            width={finalWidth}\n            onChange={onChangeTitle}\n            placeholder={!disabledTitle && 'Click here to add a title for this graph'}\n            toolbarOpts={{ noBorder: true }}\n            activePlugins={activeTitlePlugins}\n          />\n        )}\n        <svg width={finalWidth} height={finalHeight} className={classes.svg}>\n          <g\n            ref={r => {\n              this.g = r;\n              if (rootRef) {\n                rootRef(r);\n              }\n            }}\n            className={classes.graphBox}\n            transform={`translate(${leftPadding}, ${topPadding})`}\n          >\n            {children}\n          </g>\n        </svg>\n      </div>\n    );\n  }\n}\nconst styles = theme => ({\n  root: {\n    border: `solid 1px ${color.primaryLight()}`,\n    color: color.text(),\n    backgroundColor: color.background()\n  },\n  svg: {},\n  graphBox: {\n    cursor: 'pointer',\n    userSelect: 'none'\n  },\n  graphTitle: {\n    color: color.text(),\n    fontSize: theme.typography.fontSize + 2,\n    padding: '8px 50px 0',\n    textAlign: 'center'\n  },\n  disabledTitle: {\n    pointerEvents: 'none'\n  }\n});\n\nexport default withStyles(styles)(Root);\n"],"file":"root.js"}
+{"version":3,"sources":["../src/root.jsx"],"names":["Root","g","props","graphProps","onMouseMove","scale","snap","coords","_groups","x","invert","y","snapped","on","mouseMove","bind","disabledTitle","children","classes","onChangeTitle","showLabels","showPixelGuides","showTitle","title","rootRef","size","width","height","domain","range","padding","extraPadding","finalWidth","finalHeight","activeTitlePlugins","nbOfVerticalLines","parseInt","nbOfHorizontalLines","sideGridlinesPadding","root","topPixelGuides","Array","keys","map","value","topPixelIndicator","graphTitle","noBorder","wrapper","svg","r","graphBox","sidePixelGuides","paddingTop","reverse","sidePixelIndicator","React","Component","PropTypes","string","ChildrenType","bool","GraphPropsType","isRequired","func","object","styles","theme","border","color","primaryLight","text","backgroundColor","background","display","cursor","userSelect","fontSize","typography","textAlign","pointerEvents","marginLeft","flexDirection","alignItems","marginTop","marginRight","marginBottom"],"mappings":"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","sourcesContent":["import React from 'react';\nimport { ChildrenType } from './types';\nimport { withStyles } from '@material-ui/core/styles';\nimport { select, mouse } from 'd3-selection';\nimport PropTypes from 'prop-types';\nimport { GraphPropsType } from './types';\nimport { color, Readable } from '@pie-lib/render-ui';\nimport EditableHtml from '@pie-lib/editable-html';\nimport cn from 'classnames';\n\nexport class Root extends React.Component {\n  static propTypes = {\n    title: PropTypes.string,\n    children: ChildrenType,\n    disabledTitle: PropTypes.bool,\n    graphProps: GraphPropsType.isRequired,\n    onChangeTitle: PropTypes.func,\n    onMouseMove: PropTypes.func,\n    classes: PropTypes.object.isRequired,\n    showLabels: PropTypes.bool,\n    showTitle: PropTypes.bool,\n    showPixelGuides: PropTypes.bool,\n    rootRef: PropTypes.func\n  };\n\n  mouseMove = g => {\n    const { graphProps, onMouseMove } = this.props;\n\n    if (!onMouseMove) {\n      return;\n    }\n\n    const { scale, snap } = graphProps;\n    const coords = mouse(g._groups[0][0]);\n    const x = scale.x.invert(coords[0]);\n    const y = scale.y.invert(coords[1]);\n\n    const snapped = {\n      x: snap.x(x),\n      y: snap.y(y)\n    };\n\n    onMouseMove(snapped);\n  };\n\n  componentDidMount() {\n    const g = select(this.g);\n    g.on('mousemove', this.mouseMove.bind(this, g));\n  }\n\n  componentWillUnmount() {\n    const g = select(this.g);\n    g.on('mousemove', null);\n  }\n\n  render() {\n    const {\n      disabledTitle,\n      graphProps,\n      children,\n      classes,\n      onChangeTitle,\n      showLabels,\n      showPixelGuides,\n      showTitle,\n      title,\n      rootRef\n    } = this.props;\n    const {\n      size: { width = 500, height = 500 },\n      domain,\n      range\n    } = graphProps;\n\n    const padding = showLabels ? 70 : 40;\n    const extraPadding = showLabels ? 16 : 40;\n    const finalWidth = width + padding * 2 + (domain.padding || 0) * 2 + extraPadding;\n    const finalHeight = height + padding * 2 + (range.padding || 0) * 2;\n\n    const activeTitlePlugins = [\n      'bold',\n      'italic',\n      'underline',\n      'strikethrough',\n      'math'\n      // 'languageCharacters'\n    ];\n\n    const nbOfVerticalLines = parseInt(width / 100);\n    const nbOfHorizontalLines = parseInt(height / 100);\n    const sideGridlinesPadding = parseInt(height % 100);\n\n    return (\n      <div className={classes.root}>\n        {showPixelGuides && (\n          <div className={classes.topPixelGuides}>\n            {[...Array(nbOfVerticalLines + 1).keys()].map(value => (\n              <Readable false key={`top-guide-${value}`}>\n                <div className={classes.topPixelIndicator}>\n                  <div>{value * 100}px</div>\n                  <div>|</div>\n                </div>\n              </Readable>\n            ))}\n          </div>\n        )}\n        {showTitle && (\n          <EditableHtml\n            className={cn(\n              {\n                [classes.disabledTitle]: disabledTitle\n              },\n              classes.graphTitle\n            )}\n            markup={title || ''}\n            width={finalWidth}\n            onChange={onChangeTitle}\n            placeholder={!disabledTitle && 'Click here to add a title for this graph'}\n            toolbarOpts={{ noBorder: true }}\n            activePlugins={activeTitlePlugins}\n          />\n        )}\n        <div className={classes.wrapper}>\n          <svg width={finalWidth} height={finalHeight} className={classes.svg}>\n            <g\n              ref={r => {\n                this.g = r;\n                if (rootRef) {\n                  rootRef(r);\n                }\n              }}\n              className={classes.graphBox}\n              transform={`translate(${padding}, ${padding})`}\n            >\n              {children}\n            </g>\n          </svg>\n          {showPixelGuides && (\n            <div className={classes.sidePixelGuides} style={{ paddingTop: sideGridlinesPadding }}>\n              {[...Array(nbOfHorizontalLines + 1).keys()].reverse().map(value => (\n                <Readable false key={`top-guide-${value}`}>\n                  <div className={classes.sidePixelIndicator}>━ {value * 100}px</div>\n                </Readable>\n              ))}\n            </div>\n          )}\n        </div>\n      </div>\n    );\n  }\n}\nconst styles = theme => ({\n  root: {\n    border: `solid 1px ${color.primaryLight()}`,\n    color: color.text(),\n    backgroundColor: color.background()\n  },\n  wrapper: {\n    display: 'flex'\n  },\n  svg: {},\n  graphBox: {\n    cursor: 'pointer',\n    userSelect: 'none'\n  },\n  graphTitle: {\n    color: color.text(),\n    fontSize: theme.typography.fontSize + 2,\n    padding: '12px 4px 0',\n    textAlign: 'center'\n  },\n  disabledTitle: {\n    pointerEvents: 'none'\n  },\n  topPixelGuides: {\n    display: 'flex',\n    paddingTop: '6px',\n    marginLeft: '10px'\n  },\n  topPixelIndicator: {\n    color: color.primaryLight(),\n    display: 'flex',\n    flexDirection: 'column',\n    alignItems: 'center',\n    width: '100px',\n    pointerEvents: 'none',\n    userSelect: 'none'\n  },\n  sidePixelGuides: {\n    width: '70px',\n    display: 'flex',\n    flexDirection: 'column',\n    marginTop: '40px',\n    marginRight: '6px'\n  },\n  sidePixelIndicator: {\n    color: color.primaryLight(),\n    textAlign: 'right',\n    height: '20px',\n    pointerEvents: 'none',\n    userSelect: 'none',\n\n    '&:not(:last-child)': {\n      marginBottom: '80px'\n    }\n  }\n});\n\nexport default withStyles(styles)(Root);\n"],"file":"root.js"}

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Some underlying components for building charts/graphs",
   "keywords": [
     "react",
@@ -38,6 +38,6 @@
   "peerDependencies": {
     "react": "^16.8.1"
   },
-  "gitHead": "5f0932d39d7f01be0f96665b8fbe45ee745c2868",
+  "gitHead": "5cd198308a7395a8faa8d9c09ab548964d9d65bf",
   "scripts": {}
 }

package/src/root.jsx

@@ -4,7 +4,7 @@ import { withStyles } from '@material-ui/core/styles';
 import { select, mouse } from 'd3-selection';
 import PropTypes from 'prop-types';
 import { GraphPropsType } from './types';
-import { color } from '@pie-lib/render-ui';
+import { color, Readable } from '@pie-lib/render-ui';
 import EditableHtml from '@pie-lib/editable-html';
 import cn from 'classnames';
 
@@ -12,10 +12,14 @@ export class Root extends React.Component {
   static propTypes = {
     title: PropTypes.string,
     children: ChildrenType,
+    disabledTitle: PropTypes.bool,
     graphProps: GraphPropsType.isRequired,
+    onChangeTitle: PropTypes.func,
     onMouseMove: PropTypes.func,
     classes: PropTypes.object.isRequired,
+    showLabels: PropTypes.bool,
     showTitle: PropTypes.bool,
+    showPixelGuides: PropTypes.bool,
     rootRef: PropTypes.func
   };
 
@@ -56,6 +60,8 @@ export class Root extends React.Component {
       children,
       classes,
       onChangeTitle,
+      showLabels,
+      showPixelGuides,
       showTitle,
       title,
       rootRef
@@ -65,21 +71,39 @@ export class Root extends React.Component {
       domain,
       range
     } = graphProps;
-    const topPadding = 50;
-    const leftPadding = topPadding + 10; // left side requires an extra padding of 10
-    const finalWidth = width + leftPadding * 2 + (domain.padding || 0) * 2;
-    const finalHeight = height + topPadding * 2 + (range.padding || 0) * 2;
+
+    const padding = showLabels ? 70 : 40;
+    const extraPadding = showLabels ? 16 : 40;
+    const finalWidth = width + padding * 2 + (domain.padding || 0) * 2 + extraPadding;
+    const finalHeight = height + padding * 2 + (range.padding || 0) * 2;
 
     const activeTitlePlugins = [
       'bold',
       'italic',
       'underline',
-      'strikethrough'
+      'strikethrough',
+      'math'
       // 'languageCharacters'
     ];
 
+    const nbOfVerticalLines = parseInt(width / 100);
+    const nbOfHorizontalLines = parseInt(height / 100);
+    const sideGridlinesPadding = parseInt(height % 100);
+
     return (
       <div className={classes.root}>
+        {showPixelGuides && (
+          <div className={classes.topPixelGuides}>
+            {[...Array(nbOfVerticalLines + 1).keys()].map(value => (
+              <Readable false key={`top-guide-${value}`}>
+                <div className={classes.topPixelIndicator}>
+                  <div>{value * 100}px</div>
+                  <div>|</div>
+                </div>
+              </Readable>
+            ))}
+          </div>
+        )}
         {showTitle && (
           <EditableHtml
             className={cn(
@@ -96,20 +120,31 @@ export class Root extends React.Component {
             activePlugins={activeTitlePlugins}
           />
         )}
-        <svg width={finalWidth} height={finalHeight} className={classes.svg}>
-          <g
-            ref={r => {
-              this.g = r;
-              if (rootRef) {
-                rootRef(r);
-              }
-            }}
-            className={classes.graphBox}
-            transform={`translate(${leftPadding}, ${topPadding})`}
-          >
-            {children}
-          </g>
-        </svg>
+        <div className={classes.wrapper}>
+          <svg width={finalWidth} height={finalHeight} className={classes.svg}>
+            <g
+              ref={r => {
+                this.g = r;
+                if (rootRef) {
+                  rootRef(r);
+                }
+              }}
+              className={classes.graphBox}
+              transform={`translate(${padding}, ${padding})`}
+            >
+              {children}
+            </g>
+          </svg>
+          {showPixelGuides && (
+            <div className={classes.sidePixelGuides} style={{ paddingTop: sideGridlinesPadding }}>
+              {[...Array(nbOfHorizontalLines + 1).keys()].reverse().map(value => (
+                <Readable false key={`top-guide-${value}`}>
+                  <div className={classes.sidePixelIndicator}>━ {value * 100}px</div>
+                </Readable>
+              ))}
+            </div>
+          )}
+        </div>
       </div>
     );
   }
@@ -120,6 +155,9 @@ const styles = theme => ({
     color: color.text(),
     backgroundColor: color.background()
   },
+  wrapper: {
+    display: 'flex'
+  },
   svg: {},
   graphBox: {
     cursor: 'pointer',
@@ -128,11 +166,43 @@ const styles = theme => ({
   graphTitle: {
     color: color.text(),
     fontSize: theme.typography.fontSize + 2,
-    padding: '8px 50px 0',
+    padding: '12px 4px 0',
     textAlign: 'center'
   },
   disabledTitle: {
     pointerEvents: 'none'
+  },
+  topPixelGuides: {
+    display: 'flex',
+    paddingTop: '6px',
+    marginLeft: '10px'
+  },
+  topPixelIndicator: {
+    color: color.primaryLight(),
+    display: 'flex',
+    flexDirection: 'column',
+    alignItems: 'center',
+    width: '100px',
+    pointerEvents: 'none',
+    userSelect: 'none'
+  },
+  sidePixelGuides: {
+    width: '70px',
+    display: 'flex',
+    flexDirection: 'column',
+    marginTop: '40px',
+    marginRight: '6px'
+  },
+  sidePixelIndicator: {
+    color: color.primaryLight(),
+    textAlign: 'right',
+    height: '20px',
+    pointerEvents: 'none',
+    userSelect: 'none',
+
+    '&:not(:last-child)': {
+      marginBottom: '80px'
+    }
   }
 });