commit 6270de3296f8f897e33076233ac25a783fb71243 Author: Simon Willison Date: Mon Jun 25 09:12:45 2018 -0700 First working version diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0238662 --- /dev/null +++ b/.gitignore @@ -0,0 +1,24 @@ +*.pyc +__pycache__ +dist +*.egg-info + +# dependencies +/node_modules + +# testing +/coverage + +# production +/build + +# misc +.DS_Store +.env.local +.env.development.local +.env.test.local +.env.production.local + +npm-debug.log* +yarn-debug.log* +yarn-error.log* diff --git a/README.md b/README.md new file mode 100644 index 0000000..3e93a82 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# datasette-vega + +A [Datasette](https://github.com/simonw/datasette) plugin that provides tools for generating charts using [Vega](https://vega.github.io/). diff --git a/package.json b/package.json new file mode 100644 index 0000000..fbdb550 --- /dev/null +++ b/package.json @@ -0,0 +1,19 @@ +{ + "name": "datasette-vega", + "version": "0.1.0", + "private": true, + "dependencies": { + "react": "^16.4.1", + "react-dom": "^16.4.1", + "react-scripts": "1.1.4", + "source-map-explorer": "^1.5.0", + "vega-embed": "^3.15.0", + "vega-lib": "^4.0.0-rc.3" + }, + "scripts": { + "start": "react-scripts start", + "build": "react-scripts build", + "test": "react-scripts test --env=jsdom", + "eject": "react-scripts eject" + } +} diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000..a11777c Binary files /dev/null and b/public/favicon.ico differ diff --git a/public/index.html b/public/index.html new file mode 100644 index 0000000..2136c15 --- /dev/null +++ b/public/index.html @@ -0,0 +1,43 @@ + + + + + + + + + + + React App + + + +
+
+
+
+ + + diff --git a/public/manifest.json b/public/manifest.json new file mode 100644 index 0000000..ef19ec2 --- /dev/null +++ b/public/manifest.json @@ -0,0 +1,15 @@ +{ + "short_name": "React App", + "name": "Create React App Sample", + "icons": [ + { + "src": "favicon.ico", + "sizes": "64x64 32x32 24x24 16x16", + "type": "image/x-icon" + } + ], + "start_url": "./index.html", + "display": "standalone", + "theme_color": "#000000", + "background_color": "#ffffff" +} diff --git a/src/App.css b/src/App.css new file mode 100644 index 0000000..199ea14 --- /dev/null +++ b/src/App.css @@ -0,0 +1,68 @@ +.vega-embed { + position: relative; + display: inline-block; + padding-right: 38px; +} + +.vega-embed .vega-actions-wrapper { + display: inline-flex; + position: absolute; + top: 0; + right: 0; + padding: 6px; + z-index: 1000; + + opacity: 0.2; + background: white; + box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.1); + color: #1b1e23; + border: 1px solid #aaa; + border-radius: 999px; + transition: opacity 0.4s ease-in; +} + +.vega-embed:hover .vega-actions-wrapper { + transition: opacity 0.2s ease; + opacity: 1; +} + +.vega-embed .vega-actions { + position: absolute; + top: 0; + right: 0; + display: none; + flex-direction: column; + + padding-bottom: 8px; + padding-top: 8px; + border-radius: 4px; + box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.2); + border: 1px solid #d9d9d9; + background: white; +} + +.vega-embed .vega-actions-wrapper:hover { + background: transparent; + color: transparent; + border: none; + box-shadow: none; +} + +.vega-embed .vega-actions-wrapper:hover .vega-actions { + display: flex; +} + +.vega-embed .vega-actions a { + padding: 8px 16px; + font-family: sans-serif; + font-size: 14px; + font-weight: 600; + white-space: nowrap; + color: #434a56; + text-decoration: none; +} + +.vega-embed .vega-actions a:hover { + background-color: #f7f7f9; + color: #1b1e23; +} diff --git a/src/App.js b/src/App.js new file mode 100644 index 0000000..1f9dd53 --- /dev/null +++ b/src/App.js @@ -0,0 +1,156 @@ +import React, { Component } from 'react'; +import vegaEmbed from 'vega-embed'; +import './App.css'; + +const serialize = obj => Object.keys(obj).map( + key => obj[key] ? `g.${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}` : '' +).join('&'); + +const unserialize = s => { + if (s && s[0] === '#') { + s = s.slice(1); + } + if (!s) { + return {}; + } + var obj = {}; + s.split('&').forEach(bit => { + let pair = bit.split('='); + obj[decodeURIComponent(pair[0]).replace(/^g\./, '')] = decodeURIComponent(pair[1]); + }); + return obj; +}; + +class App extends Component { + state = { + mark: "bar", + x_column: this.props.columns[0], + x_type: "ordinal", + y_column: this.props.columns[1], + y_type: "quantitative", + color_column: "", + size_column: "" + } + markOptions = [ + {"value": "bar", "name": "bar"}, + {"value": "line", "name": "line"}, + {"value": "circle", "name": "circle"}, + {"value": "square", "name": "square"}, + {"value": "point", "name": "point"}, + ] + typeOptions = [ + {"value": "quantitative", "name": "Numbers (quantitative)"}, + {"value": "quantitative-bin", "name": "Numbers (quantitative), binned"}, + {"value": "temporal", "name": "Dates and times (temporal)"}, + {"value": "temporal-bin", "name": "Dates and times (temporal), binned"}, + {"value": "ordinal", "name": "Labels (ordinal)"}, + {"value": "nominal", "name": "Categories (nominal)"}, + ] + onChangeSelect(name, ev) { + ev.persist(); + window.lastEv = ev; + this.setState({[name]: ev.target.value}, () => { + this.renderGraph(); + }); + } + componentDidMount() { + window.onpopstate = this.onPopStateChange.bind(this); + this.renderGraph(); + } + onPopStateChange(ev) { + window.lastPopEv = ev; + let expected = '#' + serialize(this.state); + if (expected !== document.location.hash) { + this.setState( + unserialize(document.location.hash), this.renderGraph.bind(this) + ); + } + } + renderGraph() { + const x_type = this.state.x_type.split('-bin')[0]; + const y_type = this.state.y_type.split('-bin')[0]; + const x_bin = !!/-bin$/.exec(this.state.x_type); + const y_bin = !!/-bin$/.exec(this.state.y_type); + let encoding = { + x: {field: this.state.x_column, type: x_type, bin: x_bin}, + y: {field: this.state.y_column, type: y_type, bin: y_bin} + } + if (this.state.color_column) { + encoding.color = {field: this.state.color_column, type: "nominal"}; + } + if (this.state.size_column) { + encoding.size = {field: this.state.size_column, type: "quantitative"}; + } + const spec = { + data: { + url: this.props.json_url + }, + mark: this.state.mark, + encoding: encoding + } + if (spec.mark) { + vegaEmbed("#vis", spec, {theme: 'quartz', tooltip: true}); + document.location.hash = '#' + serialize(this.state); + this.setState({spec: spec}); + } + } + toggleAxis(ev) { + ev.preventDefault(); + this.setState(prevState => ({ + x_column: prevState.y_column, + y_column: prevState.x_column, + x_type: prevState.y_type, + y_type: prevState.x_type, + }), this.renderGraph); + } + render() { + const onChangeSelect = this.onChangeSelect.bind(this); + if (!this.state.mark) { + return null; + } + return ( +
+
+ Mark: +
+
+ X column: +
+
+ X type: +
+
+ Y column: +
+
+ Y type: +
+
+ Color column: +
+
+ Size column: +
+
+
+ ); + } +} + +export default App; diff --git a/src/App.test.js b/src/App.test.js new file mode 100644 index 0000000..a754b20 --- /dev/null +++ b/src/App.test.js @@ -0,0 +1,9 @@ +import React from 'react'; +import ReactDOM from 'react-dom'; +import App from './App'; + +it('renders without crashing', () => { + const div = document.createElement('div'); + ReactDOM.render(, div); + ReactDOM.unmountComponentAtNode(div); +}); diff --git a/src/index.css b/src/index.css new file mode 100644 index 0000000..b4cc725 --- /dev/null +++ b/src/index.css @@ -0,0 +1,5 @@ +body { + margin: 0; + padding: 0; + font-family: sans-serif; +} diff --git a/src/index.js b/src/index.js new file mode 100644 index 0000000..3410be8 --- /dev/null +++ b/src/index.js @@ -0,0 +1,23 @@ +import React from 'react'; +import ReactDOM from 'react-dom'; +import './index.css'; +import App from './App'; + +ReactDOM.render( + /*, document.getElementById('root') +);