Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Expose axisTimeCombinations #193

Merged
merged 6 commits into from
Nov 25, 2020
Merged

fix: Expose axisTimeCombinations #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6df22f7
Export axisTimeCombinations
Golodhros Nov 24, 2020
02ed02d
Update Britecharts version
Golodhros Nov 24, 2020
269b076
Fixes jest issue with canvas
Golodhros Nov 24, 2020
fd98f68
Adding prettier
Golodhros Nov 24, 2020
ebd0a7f
Configure prettier and reubicate plop
Golodhros Nov 24, 2020
928a135
Exposing axisTimeCombinations in tooltip
Golodhros Nov 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ coverage
node_modules

# Workspaces
.idea/
*.iml
*.sublime-*
.vscode/

# OSX
.DS_Store
Expand Down
9 changes: 9 additions & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Artifacts
dist
lib

# Plop Templates
src/templates

# Depenencies
node_modules
301 changes: 164 additions & 137 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,143 +1,170 @@
{
"name": "britecharts-react",
"description": "Britecharts-react is a React wrapper for the Britecharts charting library",
"main": "dist/britecharts-react.min.js",
"module": "lib/esm/index.js",
"browser": "dist/britecharts-react.min.js",
"repository": {
"type": "git",
"url": "https://github.com/britecharts/britecharts-react.git"
},
"homepage": "https://britecharts.github.io/britecharts-react/",
"bugs": {
"url": "https://github.com/britecharts/britecharts-react/issues"
},
"keywords": [
"d3",
"react",
"javascript",
"chart",
"data-visualization",
"es6",
"interactive-visualizations"
],
"contributors": [
{
"name": "Marcos Iglesias",
"email": "golodhros@gmail.com"
"name": "britecharts-react",
"description": "Britecharts-react is a React wrapper for the Britecharts charting library",
"main": "dist/britecharts-react.min.js",
"module": "lib/esm/index.js",
"browser": "dist/britecharts-react.min.js",
"repository": {
"type": "git",
"url": "https://github.com/britecharts/britecharts-react.git"
},
{
"name": "Daler Asrorov",
"email": "asrorids@gmail.com"
"homepage": "https://britecharts.github.io/britecharts-react/",
"bugs": {
"url": "https://github.com/britecharts/britecharts-react/issues"
},
{
"name": "Jaylum Chen",
"email": "jaylum@eventbrite.com"
},
{
"name": "Amber Rockwood",
"email": "arockwood@eventbrite.com"
},
{
"name": "Sun Dai",
"email": "sundaisf@gmail.com"
}
],
"version": "0.5.4",
"license": "Apache-2.0",
"scripts": {
"start": "webpack-dashboard -- nodemon --watch webpack.config.js --mode development --exec \"webpack-dev-server --env development\"",
"prebuild": "rimraf lib && rimraf dist",
"build": "webpack --env production --mode production --progress && yarn run build:esm",
"build:esm": "babel-node src/scripts/es/build.js",
"docs": "yarn run styleguide:build",
"lint": "eslint src/ webpack.*.js --cache",
"lint:fix": "eslint src/ webpack.*.js --cache --fix",
"test": "jest",
"test:watch": "jest --watch",
"styleguide": "styleguidist server",
"styleguide:build": "styleguidist build",
"clean": "yarn cache clean && rimraf node_modules",
"release": "grunt release:patch",
"release:minor": "grunt release:minor",
"release:major": "grunt release:major"
},
"devDependencies": {
"@types/react": "^16.9.55",
"@typescript-eslint/eslint-plugin": "^4.7.0",
"@typescript-eslint/parser": "^4.7.0",
"typescript": "^4.0.5",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.3",
"babel-eslint": "^10.0.1",
"babel-jest": "^23.6.0",
"babel-loader": "7.1.5",
"babel-minify-webpack-plugin": "^0.3.1",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"child-process-promise": "^2.2.1",
"colors": "^1.3.2",
"copy-webpack-plugin": "^4.6.0",
"core-js": "^2.5.7",
"enzyme": "^3.7.0",
"enzyme-adapter-react-16": "^1.7.0",
"eslint": "^5.9.0",
"eslint-config-eventbrite": "^5.0.0",
"eslint-config-eventbrite-react": "^6.0.0",
"eslint-loader": "^2.1.1",
"eslint-plugin-babel": "^5.2.1",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^22.0.0",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-react": "^7.11.1",
"fs": "^0.0.1-security",
"fs-promise": "^2.0.3",
"grunt": "^1.0.3",
"grunt-release": "git://github.com/beevelop/grunt-release",
"grunt-shell": "^2.1.0",
"html-webpack-plugin": "^3.2.0",
"install": "^0.12.2",
"jest": "^23.6.0",
"load-grunt-tasks": "^4.0.0",
"nodemon": "^1.18.6",
"npm": "^6.4.1",
"path": "^0.12.7",
"plop": "^2.2.0",
"prop-types": "^15.6.2",
"react": "^16.6.1",
"react-dev-utils": "^6.1.1",
"react-dom": "^16.6.1",
"react-styleguidist": "^8.0.3",
"react-test-renderer": "^16.6.1",
"rimraf": "^2.6.2",
"uglifyjs-webpack-plugin": "^2.0.1",
"webpack": "^4.25.1",
"webpack-bundle-analyzer": "^3.0.3",
"webpack-cli": "^3.1.2",
"webpack-dashboard": "^2.0.0",
"webpack-dev-server": "^3.1.10",
"webpack-merge": "^4.1.4"
},
"peerDependencies": {
"prop-types": ">=15",
"react": ">=15",
"react-dom": ">=15"
},
"dependencies": {
"britecharts": "2.17.2",
"d3-selection": "^1.4.2"
},
"jest": {
"moduleDirectories": [
"node_modules"
"keywords": [
"d3",
"react",
"javascript",
"chart",
"data-visualization",
"es6",
"interactive-visualizations"
],
"testPathIgnorePatterns": [
"<rootDir>/node_modules/",
"<rootDir>/src/charts/template/"
"contributors": [
{
"name": "Marcos Iglesias",
"email": "golodhros@gmail.com"
},
{
"name": "Daler Asrorov",
"email": "asrorids@gmail.com"
},
{
"name": "Jaylum Chen",
"email": "jaylum@eventbrite.com"
},
{
"name": "Amber Rockwood",
"email": "arockwood@eventbrite.com"
},
{
"name": "Sun Dai",
"email": "sundaisf@gmail.com"
}
],
"setupTestFrameworkScriptFile": "<rootDir>/jest.setup.js"
},
"types": "src/typings/index.d.ts"
"version": "0.5.4",
"license": "Apache-2.0",
"scripts": {
"build:esm": "babel-node src/scripts/es/build.js",
"build": "webpack --env production --mode production --progress && yarn run build:esm",
"clean": "yarn cache clean && rimraf node_modules",
"docs": "yarn run styleguide:build",
"format": "prettier --loglevel warn --write \"src/**/*.{js,ts}\"",
"generate": "plop --plopfile='./src/scripts/plopfile.js'",
"lint:fix": "eslint src/ webpack.*.js --cache --fix",
"lint": "eslint src/ webpack.*.js --cache",
"prebuild": "rimraf lib && rimraf dist",
"release:major": "grunt release:major",
"release:minor": "grunt release:minor",
"release": "grunt release:patch",
"start": "webpack-dashboard -- nodemon --watch webpack.config.js --mode development --exec \"webpack-dev-server --env development\"",
"styleguide:build": "styleguidist build",
"styleguide": "styleguidist server",
"test:watch": "jest --watch",
"test": "jest"
},
"devDependencies": {
"@types/react": "^16.9.55",
"@typescript-eslint/eslint-plugin": "^4.7.0",
"@typescript-eslint/parser": "^4.7.0",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.3",
"babel-eslint": "^10.0.1",
"babel-jest": "^23.6.0",
"babel-loader": "7.1.5",
"babel-minify-webpack-plugin": "^0.3.1",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"child-process-promise": "^2.2.1",
"colors": "^1.3.2",
"copy-webpack-plugin": "^4.6.0",
"core-js": "^2.5.7",
"enzyme": "^3.7.0",
"enzyme-adapter-react-16": "^1.7.0",
"eslint": "^5.9.0",
"eslint-config-eventbrite": "^5.0.0",
"eslint-config-eventbrite-react": "^6.0.0",
"eslint-loader": "^2.1.1",
"eslint-plugin-babel": "^5.2.1",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^22.0.0",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-react": "^7.11.1",
"fs": "^0.0.1-security",
"fs-promise": "^2.0.3",
"grunt": "^1.0.3",
"grunt-release": "git://github.com/beevelop/grunt-release",
"grunt-shell": "^2.1.0",
"html-webpack-plugin": "^3.2.0",
"install": "^0.12.2",
"jest": "^23.6.0",
"jest-canvas-mock": "^2.3.0",
"load-grunt-tasks": "^4.0.0",
"nodemon": "^1.18.6",
"npm": "^6.4.1",
"path": "^0.12.7",
"plop": "^2.2.0",
"prettier": "^2.2.0",
"prop-types": "^15.6.2",
"react": "^16.6.1",
"react-dev-utils": "^6.1.1",
"react-dom": "^16.6.1",
"react-styleguidist": "^8.0.3",
"react-test-renderer": "^16.6.1",
"rimraf": "^2.6.2",
"typescript": "^4.0.5",
"uglifyjs-webpack-plugin": "^2.0.1",
"webpack": "^4.25.1",
"webpack-bundle-analyzer": "^3.0.3",
"webpack-cli": "^3.1.2",
"webpack-dashboard": "^2.0.0",
"webpack-dev-server": "^3.1.10",
"webpack-merge": "^4.1.4"
},
"peerDependencies": {
"prop-types": ">=15",
"react": ">=15",
"react-dom": ">=15"
},
"dependencies": {
"britecharts": "2.17.2",
"d3-selection": "^1.4.2"
},
"prettier": {
"endOfLine": "lf",
"tabWidth": 4,
"semi": true,
"bracketSpacing": true,
"singleQuote": true,
"arrowParens": "always",
"overrides": [
{
"files": "*.md",
"options": {
"printWidth": 70,
"useTabs": false,
"trailingComma": "none",
"arrowParens": "avoid",
"proseWrap": "never"
}
}
]
},
"jest": {
"moduleDirectories": [
"node_modules"
],
"testPathIgnorePatterns": [
"<rootDir>/node_modules/",
"<rootDir>/src/templates/"
],
"setupFiles": [
"jest-canvas-mock"
],
"setupTestFrameworkScriptFile": "<rootDir>/jest.setup.js"
},
"types": "src/typings/index.d.ts"
}
47 changes: 0 additions & 47 deletions plopfile.js
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions src/charts/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
export const britechartsCustomEvents = ['customMouseOver', 'customMouseMove', 'customMouseOut'];

export const axisTimeCombinations = {
MINUTE_HOUR: 'minute-hour',
HOUR_DAY: 'hour-daymonth',
DAY_MONTH: 'day-month',
MONTH_YEAR: 'month-year',
CUSTOM: 'custom',
};
3 changes: 3 additions & 0 deletions src/charts/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ export {default as Sparkline} from './sparkline/Sparkline';
export {default as StackedArea} from './stackedArea/StackedArea.js';
export {default as StackedBar} from './stackedBar/StackedBar.js';
export {default as Step} from './step/Step.js';

export {default as Tooltip} from './tooltip/Tooltip.js';

export {default as ResponsiveContainer } from './helpers/responsiveContainer.js';
export {default as withResponsiveness} from './helpers/withResponsiveness.js';

export * from './constants';
Loading