clarify mapping and just apply colorscale to the right color names

MetalBlueberry · Aug 21, 2024 · b567802 · b567802
1 parent 2e8e6b5
commit b567802
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 15 deletions.
diff --git a/examples/bar_custom/main.go b/examples/bar_custom/main.go
@@ -55,8 +55,8 @@ func main() {
 		X:            xValue,
 		Y:            yValue,
 		Text:         grob.ArrayOKArray(toString(yValue)...),
-		Textposition: grob.BarTextpositionAuto,
-		Hoverinfo:    grob.BarHoverinfoNone,
+		Textposition: grob.ArrayOKValue(grob.BarTextpositionAuto),
+		Hoverinfo:    grob.ArrayOKValue(grob.BarHoverinfoNone),
 		Marker: &grob.BarMarker{
 			Color: grob.ArrayOKValue(grob.UseColor(grob.Color(
 				markerColor.Hex(), // Use colorfull

diff --git a/examples/wasm/main.go b/examples/wasm/main.go
@@ -1,3 +1,5 @@
+//go:build ignore
+
 package main
 
 import (

diff --git a/generated/v2.19.0/graph_objects/contour_gen.go b/generated/v2.19.0/graph_objects/contour_gen.go
diff --git a/generated/v2.19.0/graph_objects/contourcarpet_gen.go b/generated/v2.19.0/graph_objects/contourcarpet_gen.go
diff --git a/generated/v2.19.0/graph_objects/layout_gen.go b/generated/v2.19.0/graph_objects/layout_gen.go
diff --git a/generated/v2.29.1/graph_objects/contour_gen.go b/generated/v2.29.1/graph_objects/contour_gen.go
diff --git a/generated/v2.29.1/graph_objects/contourcarpet_gen.go b/generated/v2.29.1/graph_objects/contourcarpet_gen.go
diff --git a/generated/v2.29.1/graph_objects/layout_gen.go b/generated/v2.29.1/graph_objects/layout_gen.go
diff --git a/generated/v2.31.1/graph_objects/contour_gen.go b/generated/v2.31.1/graph_objects/contour_gen.go
diff --git a/generated/v2.31.1/graph_objects/contourcarpet_gen.go b/generated/v2.31.1/graph_objects/contourcarpet_gen.go
diff --git a/generated/v2.31.1/graph_objects/layout_gen.go b/generated/v2.31.1/graph_objects/layout_gen.go
diff --git a/generator/typefile.go b/generator/typefile.go
@@ -178,7 +178,9 @@ func (file *typeFile) parseAttributes(namePrefix string, typePrefix string, attr
 
 		default:
 			ty := valTypeMap[attr.ValType]
-			if attr.ValType == ValTypeColor && attrs["colorscale"] != nil {
+
+			// Special case, the attribute color may also be a ColorScale
+			if attr.ValType == ValTypeColor && attr.Name == "color" && attrs["colorscale"] != nil {
 				ty = "ColorWithColorScale"
 			}
 			if attr.ArrayOK {