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

Funnelarea traces #3876

Merged

archmoj merged 37 commits into master from funnelarea-traces

May 22, 2019

Contributor

archmoj commented May 17, 2019 •

edited

Loading

Plotly funnelarea traces based on pie & bar/funnel insidetext refactors.

resolves #3504

@plotly/plotly_js

TODOs:

add jasmine tests to cover different scenarios of having both pie and funnelarea
fixup scalegroup to handle scenarios with different dimension ratios
improve aspectratio logic to take into account pixel values i.e. layout & domain ratios

Codepen examples:

archmoj added 4 commits

May 17, 2019 10:17


          add funnelarea to lib components plot api etc

d77474e


          refactor other traces to reuse code in funnelarea

2d090d1


          add funnelarea trace code

7b0e602


          add funnelarea jasmine and image tests

1b8caed

etpinard added status: in progress labels

etpinard added this to the v1.48.0 milestone

archmoj and others added 2 commits

May 17, 2019 22:23


          correct groupscale in various dim ratios

32b7b0b


          Merge branch 'master' into funnelarea-traces

68bebc2

etpinard reviewed

View reviewed changes

src/traces/pie/index.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/pie/layout_defaults.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/plots/plots.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/lib/index.js Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/funnelarea/attributes.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/funnelarea/layout_attributes.js Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/funnelarea/plot.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/funnelarea/plot.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/funnelarea/plot.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

test/jasmine/tests/funnelarea_test.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

test/jasmine/tests/funnelarea_test.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/lib/index.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

test/jasmine/tests/funnelarea_test.js Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/funnelarea/attributes.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/funnelarea/attributes.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/funnelarea/attributes.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/funnelarea/defaults.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/funnelarea/calc.js Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/funnelarea/plot.js Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/funnelarea/plot.js Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/funnelarea/defaults.js Show resolved Hide resolved

archmoj added 2 commits

May 21, 2019 11:00


          add textposition inside none - change pie title and textposition edit…

8af4d12

…Type from calc to plot

mock funnelarea with textposition none


          Merge branch 'funnelarea-traces' into funnelarea-traces_dev

4711c5c

etpinard reviewed

View reviewed changes

src/traces/funnelarea/attributes.js Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/components/legend/style.js Show resolved Hide resolved


          drop funnelarea sort - auto sort when funnelarea is aggregated - fixu…

a9625b6

…p funnelarea tests without using sort

etpinard mentioned this pull request

Better legend items visual for pie-like traces with same labels / different colors #3885

Closed

etpinard added 2 commits

May 21, 2019 13:39


          Merge branch 'master' into funnelarea-traces

1426be7


          use trace._meta for funnelarea title.text

79415cd

etpinard reviewed

View reviewed changes

src/traces/pie/layout_attributes.js Outdated Show resolved Hide resolved

archmoj and others added 8 commits

May 21, 2019 14:05


          remove outsudetext from funnelarea mock

e227763


          clear TODO comment for hiddenlabels role

04b14a8


          apply domain width and height with aspectratio

4d89d1d


          add delay between sort-by-value tests

23bc199


          add test for pie title.position restyle calls

dd673a2

... which are now correctly declared as editType:'plot'


          🔪 "TODO: test" for attrs that already have sufficient coverage

6673fac


          drop @flaky on @noci test

c64fe84

... @flaky here is useless


          drop @noci on funnel & waterfall select tests

77f1c59

etpinard reviewed

View reviewed changes

test/jasmine/tests/calcdata_test.js Show resolved Hide resolved

archmoj added 5 commits

May 22, 2019 10:27


          improve funnelarea scalegroup

28b2f14


          add shapes around domain boxes in funnelarea mocks

c42a899


          flip processing aspectratio

84b0dd1


          remove unused mock

08a1f7b


          fit r using trace.aspectratio when having non scalegroup

b8b3d94

archmoj added status: reviewable and removed status: in progress labels

Contributor

etpinard commented May 22, 2019

Awesome work @archmoj funnelarea is looking rock solid 💪

v1.48.0 will be the first time a release will feature two new trace types added by the same dev. Be proud 🥇

💃 💃 (once CI gets its life back in order).

archmoj merged commit 5ce2a83 into master

archmoj deleted the funnelarea-traces branch

May 22, 2019 19:51

Contributor Author

archmoj commented May 22, 2019

Awesome work @archmoj funnelarea is looking rock solid

v1.48.0 will be the first time a release will feature two new trace types added by the same dev. Be proud

(once CI gets its life back in order).

@etpinard obviously your review & supervision helped that possible.
Cheers.

etpinard mentioned this pull request

pie legends with conflicting colors #2858

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet