Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Feature/migration new context api #799

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.

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

Open
oprstchn wants to merge 77 commits into plotly:master
base: master
Choose a base branch
Loading
from oprstchn:feature/migration_new_context_api
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
e107d87
update react and create context
oprstchn Nov 8, 2018
fbbcfbb
add Provider
oprstchn Nov 8, 2018
f059bf5
remove provider
oprstchn Nov 11, 2018
175ca3e
connect To ContextType
oprstchn Nov 11, 2018
58ca319
fix eslint
oprstchn Nov 11, 2018
abb529c
remove test:jswatch
oprstchn Nov 11, 2018
2d2fb96
Merge branch 'fork_master' into feature/remove_contextTypees
oprstchn Nov 11, 2018
826794b
Merge pull request #3 from oprstchn/feature/remove_contextTypees
oprstchn Nov 11, 2018
a63e234
change peerDependencies
oprstchn Nov 11, 2018
f7239bc
update webpack 4 and webpack-dev-server v3
oprstchn Nov 11, 2018
ff83b6f
make:lib
oprstchn Nov 11, 2018
a529a8e
temporary change main point
oprstchn Nov 11, 2018
5a14605
add make files
oprstchn Nov 11, 2018
eafc0c2
add index.js
oprstchn Nov 11, 2018
3df797c
Remake
oprstchn Nov 11, 2018
ff7d646
remove context
oprstchn Nov 11, 2018
bf76d50
remake
oprstchn Nov 11, 2018
8614ed5
remake
oprstchn Nov 11, 2018
c861c06
add fold__top box-sizing:content-box
oprstchn Nov 12, 2018
8867201
remove Item.contextType
oprstchn Nov 12, 2018
40c5dba
add props updatePayload in PlotlyEditor
oprstchn Nov 12, 2018
45d0e4b
Merge pull request #4 from oprstchn/feature/update_datasource
oprstchn Nov 12, 2018
c9a7cdf
change handleDataSourceUpdate to handleUpdateActions
oprstchn Nov 14, 2018
176ea32
change handleDataSourceUpdate to handleUpdateActions
oprstchn Nov 14, 2018
f7f528a
remake
oprstchn Nov 14, 2018
0098581
remove lib
oprstchn Nov 15, 2018
6fa1ade
remove contextTypes in GraphCreatePanel;
oprstchn Nov 15, 2018
d55fa99
remove contextTypes in connector
oprstchn Nov 15, 2018
d4978c6
remove contextTypes
oprstchn Nov 16, 2018
a4d9b7e
pass to context in props
oprstchn Nov 19, 2018
927a0b8
fix UnconnnectedContainerVisibility-test
oprstchn Nov 19, 2018
1224183
fix tests
oprstchn Nov 20, 2018
83ce0e6
all test pass
oprstchn Nov 20, 2018
7579cae
remove contextTypes
oprstchn Nov 20, 2018
71aadd0
remove contextTypes and getChildContext
oprstchn Nov 20, 2018
ebeb8b3
fix TransformAccordion
oprstchn Nov 21, 2018
b4461ba
remove comment out
oprstchn Nov 21, 2018
1434b26
complete remove contextTypes and getChildContext
oprstchn Nov 21, 2018
d39719a
temporary checkin src in .npmignore
oprstchn Nov 21, 2018
2d5d3c0
remove optionalPanel
oprstchn Nov 21, 2018
b508121
remove unnecessary requireContext
oprstchn Nov 21, 2018
e9016d2
Merge remote-tracking branch 'upstream/master' into fork_master
oprstchn Nov 21, 2018
6fe11d4
Merge branch 'fork_master' into feature/migration_new_context_api
oprstchn Nov 21, 2018
805ef94
fix prop-types error
oprstchn Nov 22, 2018
c505ba6
fix prop-types in aggregationToTransform
oprstchn Nov 22, 2018
27cd1fb
update devDependency
oprstchn Nov 22, 2018
68fe356
update percy
oprstchn Nov 24, 2018
2c8e276
fix UnconnectedVisibilitySelect
oprstchn Nov 25, 2018
97b4117
fix RangeSelectorAccordion
oprstchn Nov 25, 2018
75e9679
fix ImageStyles
oprstchn Nov 25, 2018
7d4ecc1
fix some context pass
oprstchn Nov 25, 2018
0cf1f13
fix colors in processing
oprstchn Nov 25, 2018
f89d10c
remove key
oprstchn Nov 25, 2018
ad1effc
change pacakge.json prop-types
oprstchn Nov 25, 2018
fbdc732
fix StyleTracePanel
oprstchn Nov 25, 2018
18bee1d
remove Field text
oprstchn Nov 25, 2018
c03d55b
add RecursiveComponent
oprstchn Nov 25, 2018
0d12c92
fix UpdateMenuPanel
oprstchn Nov 26, 2018
3c2aeda
fix ColorBars
oprstchn Nov 26, 2018
36b5fa5
move circleci.yml to .circleci/config.yml
oprstchn Nov 26, 2018
17380d3
add sudo
oprstchn Nov 26, 2018
b11f046
apt-get install
oprstchn Nov 26, 2018
b7b7c3b
split apt
oprstchn Nov 26, 2018
4f27c4a
update prettier
oprstchn Nov 26, 2018
1c0f6ab
remove react-percy in package.json
oprstchn Nov 26, 2018
04bee52
update percy
oprstchn Nov 26, 2018
1f61ee6
avoid percy
oprstchn Nov 26, 2018
6f29fd5
Merge pull request #9 from oprstchn/fix/circleci
oprstchn Nov 26, 2018
6ca0995
add @percy/react-percy-ci
oprstchn Nov 26, 2018
70d2381
add percy-test
oprstchn Nov 26, 2018
1fd7113
avoid react-percy in circleci
oprstchn Nov 26, 2018
47dd6bf
fix
oprstchn Nov 27, 2018
dbf7fda
test circleci
oprstchn Nov 27, 2018
d0e1777
fix npm install order
oprstchn Nov 27, 2018
4eaf045
fix
oprstchn Nov 27, 2018
d467d3e
Merge pull request #8 from oprstchn/fix/reac-percy
oprstchn Nov 27, 2018
5171cb8
Merge branch 'master' into feature/migration_new_context_api
oprstchn Dec 3, 2018
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
7 changes: 5 additions & 2 deletions circle.yml → .circleci/config.yml
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
build:
docker:
# specify the version you desire here
- image: circleci/node:8.9
- image: circleci/node:8.11

working_directory: ~/react-chart-editor

Expand All @@ -13,8 +13,11 @@ jobs:
keys:
- v1-dependencies-{{ checksum "package.json" }}
- v1-dependencies-

- run: sudo apt-get update -y
- run: sudo apt-get install xserver-xorg-dev libxi-dev libxext-dev -y
- run: npm install
- run: npm install --save-dev @percy/react
- run: npm rebuild node-sass

- save_cache:
paths:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ npm-debug.log*
.*
!.gitignore
!.gitattributes
!.circleci
!.npmignore
!.eslintrc
!.eslintignore

example/dist

lib
# lib
!src/lib

accessTokens.js
Expand Down
22 changes: 2 additions & 20 deletions dev/App.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,27 +184,9 @@ class App extends Component {
// makeDefaultTrace={() => ({type: 'scattergl', mode: 'markers'})}
// fontOptions={[{label:'Arial', value: 'arial'}]}
// chartHelp={chartHelp}
// menuPanelOrder={menuPanelOrder}
>
<DefaultEditor
// menuPanelOrder={[
// {group: 'Dev', name: 'JSON'},
// {group: 'Dev', name: 'Inspector'},
// {group: 'Structure', name: 'Create'},
// {group: 'Structure', name: 'Subplots'},
// {group: 'Structure', name: 'Transforms'},
// {group: 'Test', name: 'Testing'},
// {group: 'Style', name: 'General'},
// {group: 'Style', name: 'Traces'},
// {group: 'Style', name: 'Axes'},
// {group: 'Style', name: 'Legend'},
// {group: 'Style', name: 'Color Bars'},
// {group: 'Style', name: 'Annotation'},
// {group: 'Style', name: 'Shapes'},
// {group: 'Style', name: 'Images'},
// {group: 'Style', name: 'Sliders'},
// {group: 'Style', name: 'Menus'},
// ]}
>
<DefaultEditor>
<Panel group="Dev" name="JSON">
<div className="mocks">
<Select
Expand Down
31 changes: 16 additions & 15 deletions package.json
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"draft-js-utils": "^1.2.0",
"fast-isnumeric": "^1.1.1",
"immutability-helper": "^2.7.1",
"prop-types": "^15.6.2",
"plotly-icons": "1.2.2",
"plotly.js": "1.42.1",
"prop-types": "^15.5.10",
"plotly.js": "^1.42.5",
"raf": "^3.4.0",
"react-color": "^2.13.8",
"react-colorscales": "0.7.2",
Expand All @@ -30,7 +30,7 @@
"tinycolor2": "^1.4.1"
},
"devDependencies": {
"@percy/react": "^0.4.3",
"@percy/react": "^0.4.6",
"autoprefixer": "^9.1.3",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
Expand All @@ -45,40 +45,41 @@
"babel-traverse": "^6.26.0",
"css-loader": "^0.28.11",
"cssnano": "^3.10.0",
"enzyme": "^3.1.0",
"enzyme-adapter-react-16": "^1.0.4",
"enzyme": "^3.7.0",
"enzyme-adapter-react-16": "^1.7.0",
"eslint": "^5.4.0",
"eslint-config-prettier": "^3.0.1",
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-react": "^7.4.0",
"eslint-plugin-react-percy": "^0.2.1",
"eslint-plugin-react-percy": "^0.2.4",
"fs": "^0.0.1-security",
"gl": "^4.0.4",
"glob": "^7.1.2",
"jest": "^23.5.0",
"jest": "^23.6.0",
"jest-cli": "^23.5.0",
"mkdirp": "^0.5.1",
"node-sass": "^4.7.2",
"postcss": "^6.0.23",
"postcss-combine-duplicated-selectors": "^6.0.2",
"postcss-custom-properties": "^6.3.1",
"postcss-remove-root": "^0.0.2",
"prettier": "1.14.2",
"react": "^16.0.0",
"prettier": "^1.15.2",
"react": "^16.6.3",
"react-ace": "^6.1.4",
"react-dom": "^16.0.0",
"react-hot-loader": "^4.0.0-beta.21",
"react-dom": "^16.6.3",
"react-hot-loader": "^4.3.12",
"react-inspector": "^2.2.2",
"react-test-renderer": "^16.2.0",
"rimraf": "2.6.2",
"sass-loader": "^7.1.0",
"style-loader": "^0.23.0",
"webpack": "^3.10.0",
"webpack-dev-server": "^2.11.1"
"webpack": "^4.25.1",
"webpack-cli": "^3.1.2",
"webpack-dev-server": "^3.1.10"
},
"peerDependencies": {
"react": ">15",
"react-dom": ">15"
"react": ">=16.6.0",
"react-dom": ">=16.6.0"
},
"homepage": "https://plotly.github.io/react-chart-editor/",
"jest": {
Expand Down
15 changes: 15 additions & 0 deletions react-chart-editor.iml
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="FacetManager">
<facet type="Python" name="Python">
<configuration sdkName="Python 3.6.0 (~/.pyenv/versions/3.6.0/bin/python3.6)" />
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Python 3.6.0 (~/.pyenv/versions/3.6.0/bin/python3.6) interpreter library" level="application" />
</component>
</module>
Loading

AltStyle によって変換されたページ (->オリジナル) /