feat: add ability to fade multiple #2509
There are no files selected for viewing
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
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
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 |
|---|---|---|
|
|
@@ -756,6 +756,13 @@ func (c *compiler) compileStyleField(styles *d2graph.Style, f *d2ir.Field) { | |
| c.errorf(f.LastRef().AST(), `invalid style keyword: "%s"`, f.Name.ScalarString()) | ||
| return | ||
| } | ||
| if f.Map() != nil { | ||
| fields := f.Map().Fields | ||
| for i := 0; i < len(fields); i++ { | ||
| field := fields[i] | ||
| c.compileCompositeStyle(styles, field, f.Name.ScalarString()) | ||
| } | ||
| } | ||
|
Comment on lines
+760
to
+786
Collaborator
There was a problem hiding this comment. it should be a code smell to you that you need this much extra code. There's a more precise place to make these changes
Contributor
Author
There was a problem hiding this comment. Sure, we can simplify the process by modifying Lines 788 to 792 in b2841d5 as: func (c *compiler) compileStyle(styles *d2graph.Style, m *d2ir.Map) {
for _, f := range m.Fields {
c.compileStyleField(styles, f)
if f.Map() != nil {
for _, ff := range f.Map().Fields {
c.compileStyleField(styles, ff)
}
}
}
}However, as it’s not possible to get the parent field of a particular field, we need to pass a new parameter to Line 794 in b2841d5 to identify the parent field for opacity. |
||
| if f.Primary() == nil { | ||
| return | ||
| } | ||
|
|
@@ -768,6 +775,31 @@ func (c *compiler) compileStyleField(styles *d2graph.Style, f *d2ir.Field) { | |
| } | ||
| } | ||
|
|
||
| func (c *compiler) compileCompositeStyle(styles *d2graph.Style, f *d2ir.Field, parent string) { | ||
| if _, ok := d2ast.CompositeStyleKeywords[strings.ToLower(parent)]; !(ok && f.Name.IsUnquoted()) { | ||
| c.errorf(f.LastRef().AST(), `invalid composite style keyword: "%s"`, f.Name.ScalarString()) | ||
| return | ||
| } | ||
|
|
||
| allowedStyle := d2ast.CompositeStyleKeywords[strings.ToLower(parent)] | ||
|
|
||
| if allowedStyle != strings.ToLower(f.Name.ScalarString()) { | ||
| c.errorf(f.LastRef().AST(), `invalid style "%s" for composite style keyword: "%s"`, f.Name.ScalarString(), parent) | ||
| } | ||
|
|
||
| if f.Primary() == nil { | ||
| return | ||
| } | ||
|
|
||
| compileCompositeStyleFieldInit(styles, f, parent) | ||
| scalar := f.Primary().Value | ||
| err := styles.ApplyComposite(f.Name.ScalarString(), scalar.ScalarString(), parent) | ||
| if err != nil { | ||
| c.errorf(scalar, err.Error()) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| func compileStyleFieldInit(styles *d2graph.Style, f *d2ir.Field) { | ||
| switch f.Name.ScalarString() { | ||
| case "opacity": | ||
|
|
@@ -813,6 +845,15 @@ func compileStyleFieldInit(styles *d2graph.Style, f *d2ir.Field) { | |
| } | ||
| } | ||
|
|
||
| func compileCompositeStyleFieldInit(styles *d2graph.Style, f *d2ir.Field, parent string) { | ||
| switch f.Name.ScalarString() { | ||
|
Contributor
Author
There was a problem hiding this comment. I coundn't find an way to fetch parent value for current keyword, so defined a new function instead of using the existing func
Collaborator
There was a problem hiding this comment. Similar to the other comment, since nested keywords are already implemented elsewhere, you should question why you'd need a new function for this case. |
||
| case "opacity": | ||
| if parent == "multiple" { | ||
| styles.MultipleOpacity = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (c *compiler) compileEdge(obj *d2graph.Object, e *d2ir.Edge) { | ||
| edge, err := obj.Connect(e.ID.SrcPath, e.ID.DstPath, e.ID.SrcArrow, e.ID.DstArrow, "") | ||
| if err != nil { | ||
|
|
||
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
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently, CompositeStyleKeywords is of type
map[string]string, but in future if we support more styles undermultiplewe can convert it tomap[string][]stringto hold more values under one style.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we shouldn't need this. for example, the ability to do
label.nearis implemented, but there's no special map for that.