fix(timeline): Fix yaxis label color in dark mode (opensearch-project…

…#3698) - Render label as HTML instead of in the Canvas so that it picks up text color from CSS theme - Update CSS styles of yaxis label to match chart title - Update HTML rendering to support custom color overrides via inline styles Fixes opensearch-project#2250 Signed-off-by: Josh Romero <[email protected]> Signed-off-by: vagimeli <[email protected]>
vagimeli · Apr 4, 2023 · b92d878 · b92d878
1 parent 9cadb00
commit b92d878
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -111,6 +111,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [Search Telemetry] Fixes search telemetry's observable object that won't be GC-ed([#3390](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3390))
 - Clean up and rebuild `@osd/pm` ([#3570](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3570))
 - [Vega] Add Filter custom label for opensearchDashboardsAddFilter ([#3640](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3640))
+- [Timeline] Fix y-axis label color in dark mode ([#3698](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3698))
 
 ### 🚞 Infrastructure
 

diff --git a/packages/osd-ui-shared-deps/flot_charts/jquery_flot_axislabels.js b/packages/osd-ui-shared-deps/flot_charts/jquery_flot_axislabels.js
@@ -159,6 +159,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
                       'Label" " class="axisLabels" style="position:absolute;">'
                       + this.opts.axisLabel + '</div>');
         this.plot.getPlaceholder().append(this.elem);
+        if (this.opts.axisLabelColour) {
+            this.elem.css('color', this.opts.axisLabelColour);
+        }
         if (this.position == 'top') {
             this.elem.css('left', box.left + box.width/2 - this.labelWidth/2 +
                           'px');
@@ -261,6 +264,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
                       'Label" style="position:absolute; ' +
                       this.transforms(offsets.degrees, offsets.x, offsets.y) +
                       '">' + this.opts.axisLabel + '</div>');
+        if (this.opts.axisLabelColour) {
+            this.elem.css('color', this.opts.axisLabelColour);
+        }
         this.plot.getPlaceholder().append(this.elem);
     };
 

diff --git a/src/plugins/vis_type_timeline/public/components/timeline_vis.scss b/src/plugins/vis_type_timeline/public/components/timeline_vis.scss
@@ -7,12 +7,16 @@
   // Custom Jquery FLOT / schema selectors
   // Cannot change at the moment
 
-  .chart-top-title {
+  .chart-top-title,
+  .axisLabels {
     @include euiFontSizeXS;
 
+    font-weight: $euiFontWeightBold;
+  }
+
+  .chart-top-title {
     flex: 0;
     text-align: center;
-    font-weight: $euiFontWeightBold;
   }
 
   .chart-canvas {

diff --git a/src/plugins/vis_type_timeline/server/series_functions/yaxis.js b/src/plugins/vis_type_timeline/server/series_functions/yaxis.js
@@ -143,7 +143,7 @@ export default new Chainable('yaxis', {
       myAxis.axisLabelFontSizePixels = 11;
       myAxis.axisLabel = label;
       myAxis.axisLabelColour = color;
-      myAxis.axisLabelUseCanvas = true;
+      myAxis.axisLabelUseCanvas = false;
 
       if (tickDecimals) {
         myAxis.tickDecimals = tickDecimals < 0 ? 0 : tickDecimals;