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

Waterfall charts #3531

Merged

archmoj merged 78 commits into master from waterfall-new-trace

Mar 28, 2019

Contributor

archmoj commented Feb 10, 2019 •

edited

Loading

Fixes #3037.
A prototype for waterfall new trace type mainly based on bar.

TODO:

add a selection test
Why aren't arrayOk offset and width working?
add total color container an keep marker similar to bars
implement waterfallmode, waterfallgap and waterfallgroupgap
fixup cliponaxis:false support
fixup lasso/select


          started waterfall

8f89564

archmoj added status: in progress labels

etpinard reviewed

View reviewed changes

src/traces/bar/calc.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/bar/cross_trace_calc.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

src/traces/bar/calc.js Outdated Show resolved Hide resolved

etpinard reviewed

View reviewed changes

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

etpinard reviewed

View reviewed changes

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

etpinard reviewed

View reviewed changes

src/traces/waterfall/attributes.js Outdated


		width: barAttrs.width,

		marker: extendFlat({}, barAttrs.marker, {

Contributor

etpinard Feb 10, 2019

We should have two marker containers for waterfall traces: one for increasing bars and one for decreasing bars, similar to how ohlc and candlestick do it.

plotly.js/src/traces/ohlc/attributes.js

Lines 89 to 91 in 02e51d8

    
           increasing: directionAttrs(INCREASING_COLOR), 
        
           decreasing: directionAttrs(DECREASING_COLOR),

etpinard reviewed

View reviewed changes

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

Contributor

etpinard commented Feb 10, 2019

@archmoj can you point me the "real" waterfall mocks you added? I see that you remade all the bar mocks with waterfall traces. That's cool, but not 100% helpful as some bar attributes won't apply to waterfall traces (e.g. as mentioned in #3531 (comment))

Similarly, copying the entire bar_test.js suite and switching traces to type: 'waterfall' is an overkill. We don't have to test "all" the Bar logic that we're reusing to render waterfall traces.

Contributor Author

archmoj commented Feb 11, 2019

@archmoj can you point me the "real" waterfall mocks you added?

Most of them start with waterfall_profit-loss_. Thanks.

archmoj added 18 commits

February 11, 2019 11:14


          rm traceIs waterfall as it described as bar


          isFall > isSum as we may use rise and fall for positive and negative …

cfe8eb2

…values


          separated calc for waterfall - pass 1

dbc98b5


          removed barnorm stack and base

acc3640


          removed more useless mocks

9537ee8


          easier to use api

6be0a4a


          new baselines

d6a69f2


          handle undefined cases in extract instructions

34b6a0a


          new baselines

aa58571


          auto compute color array based on vals when array left empty

6a4666a


          new baselines

3fb3597


          defualt to remove instructions from ax text

dc1b420


          only accept valid tokens

f8507ce


          new baselines

a875ac7


          only run waterfalls on CI for now

69956a0


          use operators instead of instr and token

82dfd18


          handle initial values

87ad17c


          correct baselines cases without an initial value

b0fdced

archmoj and others added 8 commits

March 27, 2019 12:22


          dont coerce connector if visible false

2a25753


          turn connector.(color|dash|width) into -> connector.line.(color|dash|…

…width)


          make restyle connector visible (true|false) work

4a044e4


          fixup restyle connector visible remove nodes

c53bcce


          added connector restyle visible true false

3b984ff


          no need to loop over all the traces when waterfallmode is not group

6b3eeab


          make waterfall NOT a 'bar' category

ce0a56a

- this was causing more issues than it solved.


          revamp waterfall marker style logic

412bf9d

- use (increasing|decreasing|totals).marker containers
- use calcdata[i][j].dir (like ohlc/candlestick) to determine cont
- 🔪 arraysToCalcdata, *.marker* attrs are editType:'style'
- adapt Bar.plot and Bar textPointStyle for waterfall use
- split out reusable Bar.hoverPoints logic for waterfall use
- bring some Bar methods back to `master`

Contributor

etpinard commented Mar 27, 2019

Update: branch master...waterfall_tests-tmp has the latest (most bug-free) version of waterfall.

We're currently still testing a few things on that branch. We'll rebase those commits those tomorrow morning.

Contributor Author

archmoj commented Mar 28, 2019

Update: branch master...waterfall_tests-tmp has the latest (most bug-free) version of waterfall.

We're currently still testing a few things on that branch. We'll rebase those commits those tomorrow morning.

@etpinard few more tests are added here: waterfall_tests-tmp...waterfall_more-tests

etpinard and others added 11 commits

March 28, 2019 10:07


          🔪 [un]selected style container for waterfall (for now)

a55777f

- use a ohlc/candlestick approach to styling onSelect

bypass [un]selected now that it is not supported in waterfall


          do not show hover label when size===0

dee39dc


          adapt waterfall legend to new *marker* styles ...

a138ebd

- add logic to not show 'totals' part in legend item
  when waterfall trace does not show totals bars

fixup bar / waterfall styles


          fixup (from 🔪 'bar' category commit)

7019a12


          fixup waterfall mocks and baselines

8bbc863


          fixup mock list

b6fdaed


          adapt failing waterfall jasmine tests

cb8f1ec


          fixup waterfall bar path query

1447b40


          add a flaky flag for one test

4eb5daf


          waterfall marker description - set default to between mode - added sp…

f3a071e

…anning to few mocks - updated baselines


          fix waterfall connectors - not to draw lines between null amounts - u…

1721ab7

…sing BADNUM

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

archmoj added 2 commits

March 28, 2019 14:49


          Merge remote-tracking branch 'origin/master' into waterfall-new-trace


          set a noCI flag for the select test

1d275f5

Contributor

etpinard commented Mar 28, 2019

💃 💃 💃

Awesome work!

archmoj merged commit 978303e into master

archmoj deleted the waterfall-new-trace branch

March 28, 2019 20:01

etpinard mentioned this pull request

Add waterfall trace to finance bundle #3708

Merged

alexcjohnson mentioned this pull request

add stacked waterfall charts #4450

Open

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

Labels

None yet