From da7bf56c03d4f315693e5a7ea00d162355c7df64 Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Thu, 19 Jan 2023 12:43:22 -0600
Subject: [PATCH] Canvas: Inconsistent border behavior  (#61794)

---
 public/app/plugins/panel/canvas/CanvasPanel.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/canvas/CanvasPanel.tsx b/public/app/plugins/panel/canvas/CanvasPanel.tsx
index e2f66a6665a..eacad31a7dc 100644
--- a/public/app/plugins/panel/canvas/CanvasPanel.tsx
+++ b/public/app/plugins/panel/canvas/CanvasPanel.tsx
@@ -153,7 +153,7 @@ export class CanvasPanel extends Component<Props, State> {
   };
 
   shouldComponentUpdate(nextProps: Props, nextState: State) {
-    const { width, height, data } = this.props;
+    const { width, height, data, options } = this.props;
     let changed = false;
 
     if (width !== nextProps.width || height !== nextProps.height) {
@@ -166,6 +166,11 @@ export class CanvasPanel extends Component<Props, State> {
       changed = true;
     }
 
+    if (options !== nextProps.options && !this.scene.ignoreDataUpdate) {
+      this.scene.updateData(nextProps.data);
+      changed = true;
+    }
+
     if (this.state.refresh !== nextState.refresh) {
       changed = true;
     }