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

Support adding text labels to lines and shapes #6454

Merged
merged 86 commits into from
Mar 10, 2023
Merged

Support adding text labels to lines and shapes #6454

merged 86 commits into from
Mar 10, 2023

Commits on Feb 20, 2023

  1. add attributes for text on shapes

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    7ee2e85 View commit details
    Browse the repository at this point in the history

  2. draw text, but not in the right place

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    932fa65 View commit details
    Browse the repository at this point in the history

  3. draw text in correct place, when x0 and y0 are defined for shape

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    1d0e471 View commit details
    Browse the repository at this point in the history

  4. update shape label api

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    e46e1bc View commit details
    Browse the repository at this point in the history

  5. implement xanchor

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    60823dc View commit details
    Browse the repository at this point in the history

  6. add image test

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    2f8c810 View commit details
    Browse the repository at this point in the history

  7. fix xanchor bug

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    e405293 View commit details
    Browse the repository at this point in the history

  8. partial handling of re-render

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    e31de9e View commit details
    Browse the repository at this point in the history

  9. handle numeric angles

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    0bcfff3 View commit details
    Browse the repository at this point in the history

  10. handle auto angle for lines, put label drawing code into func

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    9972dc9 View commit details
    Browse the repository at this point in the history

  11. nicer colors on image test

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    6d5709a View commit details
    Browse the repository at this point in the history

  12. fix weird behavior on pan

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    072edf6 View commit details
    Browse the repository at this point in the history

  13. disable mathjax rendering for shape text

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    8bee979 View commit details
    Browse the repository at this point in the history

  14. clip shape text outside plot area

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    8528561 View commit details
    Browse the repository at this point in the history

  15. fix textangle bug for lines -- angle should always be correct now

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    b4a4576 View commit details
    Browse the repository at this point in the history

  16. correctly handle position prop in most cases

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    97ee8c4 View commit details
    Browse the repository at this point in the history

  17. revert shapes demo to original

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    674abd8 View commit details
    Browse the repository at this point in the history

  18. handle label font

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    3743de4 View commit details
    Browse the repository at this point in the history

  19. redraw text during shape move/resize

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    c3cc5ed View commit details
    Browse the repository at this point in the history

  20. handle yanchor for text

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    45a0564 View commit details
    Browse the repository at this point in the history

  21. rename mock

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    b8085c2 View commit details
    Browse the repository at this point in the history

  22. handle multiline text and support text on arbitrary paths (sort of)

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    8c0476e View commit details
    Browse the repository at this point in the history

  23. fix jasmine tests... maybe

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    95dd9b6 View commit details
    Browse the repository at this point in the history

  24. update plot-schema.json

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    58e39cb View commit details
    Browse the repository at this point in the history

  25. add data-index attr to shape group

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    488318f View commit details
    Browse the repository at this point in the history

  26. update jasmine test

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    c8d20f2 View commit details
    Browse the repository at this point in the history

  27. add mocks for text on shapes

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    dad6ea5 View commit details
    Browse the repository at this point in the history

  28. fix mocks

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    3134869 View commit details
    Browse the repository at this point in the history

  29. add image baselines

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    f17e218 View commit details
    Browse the repository at this point in the history

  30. fix text positioning for lines

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    01ef185 View commit details
    Browse the repository at this point in the history

  31. Apply suggestions from code review 

    Apply two of @archmoj 's suggestions

Co-authored-by: Mojtaba Samimi <33888540+archmoj@users.noreply.github.com>
    @emilykl @archmoj
    emilykl and archmoj committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    d8c4790 View commit details
    Browse the repository at this point in the history

  32. rename position to textposition, fix some defaults

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    5f39a62 View commit details
    Browse the repository at this point in the history

  33. fix docstrings for xanchor and yanchor

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    1ab9e24 View commit details
    Browse the repository at this point in the history

  34. updated plot-schema.json

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    b9ea251 View commit details
    Browse the repository at this point in the history

  35. updated image baselines

    @emilykl
    emilykl committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    1f366a8 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. updated plot-schema.json

    @emilykl
    emilykl committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    f1087f3 View commit details
    Browse the repository at this point in the history

  2. fix Jasmine tests in shapes_test.js

    @emilykl
    emilykl committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    f1570cf View commit details
    Browse the repository at this point in the history

  3. revert dist/plot-schema.json

    @emilykl
    emilykl committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    baec66d View commit details
    Browse the repository at this point in the history

  4. update textangle docstring and fix edge case

    @emilykl
    emilykl committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    d83e0cd View commit details
    Browse the repository at this point in the history

  5. remove label dflt

    @emilykl
    emilykl committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    a91d12f View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. Update src/components/shapes/draw.js 

    Co-authored-by: Mojtaba Samimi <33888540+archmoj@users.noreply.github.com>
    @emilykl @archmoj
    emilykl and archmoj authored Feb 23, 2023
    Configuration menu
    Copy the full SHA
    4948d67 View commit details
    Browse the repository at this point in the history

  2. Update src/components/shapes/draw.js 

    Co-authored-by: Mojtaba Samimi <33888540+archmoj@users.noreply.github.com>
    @emilykl @archmoj
    emilykl and archmoj authored Feb 23, 2023
    Configuration menu
    Copy the full SHA
    a5e19d3 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2023

  1. add new mock

    @emilykl
    emilykl committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    e55953e View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. fix text position for paths

    @emilykl
    emilykl committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    44d5f08 View commit details
    Browse the repository at this point in the history

  2. fix mock

    @emilykl
    emilykl committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    5424ac5 View commit details
    Browse the repository at this point in the history

  3. add label attributes to newshape (broken)

    @emilykl
    emilykl committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    8769cff View commit details
    Browse the repository at this point in the history

  4. adjust edit types for newshape.label

    @archmoj
    archmoj committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    f192a16 View commit details
    Browse the repository at this point in the history

  5. fix syntax in zz-text_on_shapes_reversed_axes mock

    @archmoj
    archmoj committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    7ca5cf8 View commit details
    Browse the repository at this point in the history

  6. add baseline

    @archmoj
    archmoj committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    822fe0d View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. fix circular dependency

    @archmoj
    archmoj committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    d50da33 View commit details
    Browse the repository at this point in the history

  2. set newshape label editType

    @archmoj
    archmoj committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    8cec651 View commit details
    Browse the repository at this point in the history

  3. change default xanchor and yanchor behavior

    @emilykl
    emilykl committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    36771a8 View commit details
    Browse the repository at this point in the history

  4. update mocks

    @emilykl
    emilykl committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    3f9727a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'add-text-to-shapes' of https://github.com/plotly/plotly.js 

     into add-text-to-shapes
    @emilykl
    emilykl committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    9a4a121 View commit details
    Browse the repository at this point in the history

  6. validate new mock

    @archmoj
    archmoj committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    e493873 View commit details
    Browse the repository at this point in the history

  7. update yanchor values and defaults in draw_newshape

    @emilykl
    emilykl committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    a17a315 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'add-text-to-shapes' of https://github.com/plotly/plotly.js 

     into add-text-to-shapes
    @emilykl
    emilykl committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    d9bef04 View commit details
    Browse the repository at this point in the history

  9. input newshape label attributes

    @archmoj
    archmoj committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    f54f102 View commit details
    Browse the repository at this point in the history

  10. draw labels on new shapes

    @archmoj
    archmoj committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    f642a52 View commit details
    Browse the repository at this point in the history

  11. provide missing editTypes

    @archmoj
    archmoj committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    dfb608e View commit details
    Browse the repository at this point in the history

  12. merge shapes/defaults.js

    @emilykl
    emilykl committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    c20370a View commit details
    Browse the repository at this point in the history

  13. standardize default yanchor behavior between shape and draw_newshape

    @emilykl
    emilykl committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    feb2f38 View commit details
    Browse the repository at this point in the history

  14. better docstrings for xanchor and yanchor

    @emilykl
    emilykl committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    11b3421 View commit details
    Browse the repository at this point in the history

  15. update image baselines

    @emilykl
    emilykl committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    ea9493e View commit details
    Browse the repository at this point in the history

  16. update plot-schema

    @emilykl
    emilykl committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    52463fa View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. improve label.textposition docstring

    @emilykl
    emilykl committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    394b48f View commit details
    Browse the repository at this point in the history

  2. only coerce label properties if label text is given

    @emilykl
    emilykl committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    1325b7c View commit details
    Browse the repository at this point in the history

  3. fix line xanchor behavior when x0 == x1

    @emilykl
    emilykl committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    63bb5d9 View commit details
    Browse the repository at this point in the history

  4. docstring update

    @emilykl
    emilykl committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    61e3df7 View commit details
    Browse the repository at this point in the history

  5. update plot-schema

    @emilykl
    emilykl committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    40933d0 View commit details
    Browse the repository at this point in the history

  6. set default angle to auto for all shapes

    @emilykl
    emilykl committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    8d35f6e View commit details
    Browse the repository at this point in the history

  7. set min padding to 0

    @emilykl
    emilykl committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    d5d1927 View commit details
    Browse the repository at this point in the history

  8. update plot-schema

    @emilykl
    emilykl committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    c34d6de View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. docstring: specify padding is in px

    @emilykl
    emilykl committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    ffea962 View commit details
    Browse the repository at this point in the history

  2. calculate textangle sin and cos only once

    @emilykl
    emilykl committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    ebe85c4 View commit details
    Browse the repository at this point in the history

  3. docstring updates

    @emilykl
    emilykl committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    d113bcf View commit details
    Browse the repository at this point in the history

  4. simplify dfltYanchor implementation

    @emilykl
    emilykl committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    c703c11 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2023

  1. change temp render logic

    @emilykl
    emilykl committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    468363e View commit details
    Browse the repository at this point in the history

  2. update shape label while editing an editable shape

    @archmoj @emilykl
    archmoj authored and emilykl committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    cdf2d37 View commit details
    Browse the repository at this point in the history

  3. test label behavior for draw_newshape

    @emilykl
    emilykl committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    9eb7c90 View commit details
    Browse the repository at this point in the history

  4. update docstring formatting

    @emilykl
    emilykl committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    3d2c792 View commit details
    Browse the repository at this point in the history

  5. update plot-schema

    @emilykl
    emilykl committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    394555c View commit details
    Browse the repository at this point in the history

  6. add draft log

    @emilykl
    emilykl committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    eaf270d View commit details
    Browse the repository at this point in the history

  7. update draft log

    @emilykl
    emilykl committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    095561f View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. Merge branch 'master' into add-text-to-shapes

    @emilykl
    emilykl committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    b0b8ab1 View commit details
    Browse the repository at this point in the history

  2. run linter

    @emilykl
    emilykl committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    d927b6a View commit details
    Browse the repository at this point in the history