From 52d2584934a674008b0e9c6575bb063514177afc Mon Sep 17 00:00:00 2001
From: Josh Romero <rmerqg@amazon.com>
Date: Mon, 27 Mar 2023 17:41:16 +0000
Subject: [PATCH] fix(timeline): Fix yaxis label color in dark mode

- 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

Signed-off-by: Josh Romero <rmerqg@amazon.com>
---
 .../flot_charts/jquery_flot_axislabels.js                  | 6 ++++++
 .../vis_type_timeline/public/components/timeline_vis.scss  | 7 +++++--
 .../vis_type_timeline/server/series_functions/yaxis.js     | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

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
index cda8038953c7..a656bce50fab 100644
--- 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
index cdcb4253eb13..b86bb2d044ec 100644
--- 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,15 @@
   // 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
index d5b4eebf1283..66f38264965f 100644
--- 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;