Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork2k
Support adding text labels to lines and shapes#6454
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
86 commits Select commitHold shift + click to select a range
7ee2e85 add attributes for text on shapes
emilykl932fa65 draw text, but not in the right place
emilykl1d0e471 draw text in correct place, when x0 and y0 are defined for shape
emilykle46e1bc update shape label api
emilykl60823dc implement xanchor
emilykl2f8c810 add image test
emilykle405293 fix xanchor bug
emilykle31de9e partial handling of re-render
emilykl0bcfff3 handle numeric angles
emilykl9972dc9 handle auto angle for lines, put label drawing code into func
emilykl6d5709a nicer colors on image test
emilykl072edf6 fix weird behavior on pan
emilykl8bee979 disable mathjax rendering for shape text
emilykl8528561 clip shape text outside plot area
emilyklb4a4576 fix textangle bug for lines -- angle should always be correct now
emilykl97ee8c4 correctly handle position prop in most cases
emilykl674abd8 revert shapes demo to original
emilykl3743de4 handle label font
emilyklc3cc5ed redraw text during shape move/resize
emilykl45a0564 handle yanchor for text
emilyklb8085c2 rename mock
emilykl8c0476e handle multiline text and support text on arbitrary paths (sort of)
emilykl95dd9b6 fix jasmine tests... maybe
emilykl58e39cb update plot-schema.json
emilykl488318f add data-index attr to shape group
emilyklc8d20f2 update jasmine test
emilykldad6ea5 add mocks for text on shapes
emilykl3134869 fix mocks
emilyklf17e218 add image baselines
emilykl01ef185 fix text positioning for lines
emilykld8c4790 Apply suggestions from code review
emilykl5f39a62 rename position to textposition, fix some defaults
emilykl1ab9e24 fix docstrings for xanchor and yanchor
emilyklb9ea251 updated plot-schema.json
emilykl1f366a8 updated image baselines
emilyklf1087f3 updated plot-schema.json
emilyklf1570cf fix Jasmine tests in shapes_test.js
emilyklbaec66d revert dist/plot-schema.json
emilykld83e0cd update textangle docstring and fix edge case
emilykla91d12f remove label dflt
emilykl4948d67 Update src/components/shapes/draw.js
emilykla5e19d3 Update src/components/shapes/draw.js
emilykle55953e add new mock
emilykl44d5f08 fix text position for paths
emilykl5424ac5 fix mock
emilykl8769cff add label attributes to newshape (broken)
emilyklf192a16 adjust edit types for newshape.label
archmoj7ca5cf8 fix syntax in zz-text_on_shapes_reversed_axes mock
archmoj822fe0d add baseline
archmojd50da33 fix circular dependency
archmoj8cec651 set newshape label editType
archmoj36771a8 change default xanchor and yanchor behavior
emilykl3f9727a update mocks
emilykl9a4a121 Merge branch 'add-text-to-shapes' of https://github.com/plotly/plotly…
emilykle493873 validate new mock
archmoja17a315 update yanchor values and defaults in draw_newshape
emilykld9bef04 Merge branch 'add-text-to-shapes' of https://github.com/plotly/plotly…
emilyklf54f102 input newshape label attributes
archmojf642a52 draw labels on new shapes
archmojdfb608e provide missing editTypes
archmojc20370a merge shapes/defaults.js
emilyklfeb2f38 standardize default yanchor behavior between shape and draw_newshape
emilykl11b3421 better docstrings for xanchor and yanchor
emilyklea9493e update image baselines
emilykl52463fa update plot-schema
emilykl394b48f improve label.textposition docstring
emilykl1325b7c only coerce label properties if label text is given
emilykl63bb5d9 fix line xanchor behavior when x0 == x1
emilykl61e3df7 docstring update
emilykl40933d0 update plot-schema
emilykl8d35f6e set default angle to auto for all shapes
emilykld5d1927 set min padding to 0
emilyklc34d6de update plot-schema
emilyklffea962 docstring: specify padding is in px
emilyklebe85c4 calculate textangle sin and cos only once
emilykld113bcf docstring updates
emilyklc703c11 simplify dfltYanchor implementation
emilykl468363e change temp render logic
emilyklcdf2d37 update shape label while editing an editable shape
archmoj9eb7c90 test label behavior for draw_newshape
emilykl3d2c792 update docstring formatting
emilykl394555c update plot-schema
emilykleaf270d add draft log
emilykl095561f update draft log
emilyklb0b8ab1 Merge branch 'master' into add-text-to-shapes
emilykld927b6a run linter
emilyklFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
docstring updates
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commitd113bcf4db9eeb5d6c82275b3abce03ea8dbdeed
There are no files selected for viewing
2 changes: 1 addition & 1 deletionsrc/components/shapes/attributes.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -301,7 +301,7 @@ module.exports = templatedArray('shape', { | ||
| dflt: 3, | ||
emilykl marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| min: 0, | ||
| editType: 'arraydraw', | ||
| description: 'Sets padding (in px) between edge of label andedge of shape.' | ||
| }, | ||
| editType: 'arraydraw' | ||
| }, | ||
archmoj marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
12 changes: 6 additions & 6 deletionssrc/components/shapes/draw_newshape/attributes.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
14 changes: 7 additions & 7 deletionstest/plot-schema.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -3580,7 +3580,7 @@ | ||
| "editType": "none", | ||
| "valType": "color" | ||
| }, | ||
| "description": "Sets thenewshape label text font.", | ||
| "editType": "none", | ||
| "family": { | ||
| "description": "HTML font family - the typeface that will be applied by the web browser. The web browser will only be able to apply a font if it is available on the system which it operates. Provide multiple font families, separated by commas, to indicate the preference in which to apply fonts if they aren't available on the system. The Chart Studio Cloud (at https://chart-studio.plotly.com or on-premise) generates images on a server, where only a select number of fonts are installed and supported. These include *Arial*, *Balto*, *Courier New*, *Droid Sans*,, *Droid Serif*, *Droid Sans Mono*, *Gravitas One*, *Old Standard TT*, *Open Sans*, *Overpass*, *PT Sans Narrow*, *Raleway*, *Times New Roman*.", | ||
| @@ -3597,15 +3597,15 @@ | ||
| } | ||
| }, | ||
| "padding": { | ||
| "description": "Sets padding (in px) between edge of label andedge of new shape.", | ||
| "dflt": 3, | ||
| "editType": "none", | ||
| "min": 0, | ||
| "valType": "number" | ||
| }, | ||
| "role": "object", | ||
| "text": { | ||
| "description": "Sets the text to display withthe newshape.", | ||
| "dflt": "", | ||
| "editType": "none", | ||
| "valType": "string" | ||
| @@ -3617,7 +3617,7 @@ | ||
| "valType": "angle" | ||
| }, | ||
| "textposition": { | ||
| "description": "Sets the position of the label text relative to thenewshape. Supported values for rectangles, circles and paths are `top left`, `top center`, `top right`, `middle left`, `middle center`, `middle right`, `bottom left`, `bottom center`, and `bottom right`. Supported values for lines are `start`, `middle`, and `end`. Default: `middle center` for rectangles, circles, and paths; `middle` for lines.", | ||
| "editType": "none", | ||
| "valType": "enumerated", | ||
| "values": [ | ||
| @@ -3636,7 +3636,7 @@ | ||
| ] | ||
LiamConnors marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| }, | ||
| "xanchor": { | ||
| "description": "Sets the label's horizontal position anchor This anchor binds the specified `label.textposition` to the *left*, *center* or *right* of the label text. For example, if `label.textposition` is set to *top right* and `xanchor` to *right* then the right-most portion of the label text lines up with the right-most edge of thenewshape.", | ||
| "dflt": "auto", | ||
| "editType": "none", | ||
| "valType": "enumerated", | ||
| @@ -3648,7 +3648,7 @@ | ||
| ] | ||
| }, | ||
| "yanchor": { | ||
| "description": "Sets the label's vertical position anchor This anchor binds the specified `label.textposition` to the *top*, *middle* or *bottom* of the label text. For example, if `label.textposition` is set to *top right* and `yanchor` to *top* then the top-most portion of the label text lines up with the top-most edge of thenewshape.", | ||
| "editType": "none", | ||
| "valType": "enumerated", | ||
| "values": [ | ||
| @@ -7218,7 +7218,7 @@ | ||
| } | ||
| }, | ||
| "padding": { | ||
| "description": "Sets padding (in px) between edge of label andedge of shape.", | ||
| "dflt": 3, | ||
| "editType": "arraydraw", | ||
| "min": 0, | ||
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.