From f1e5a02af548d3c9440b2b41c57ae648b412da93 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 15:24:01 +0300
Subject: [PATCH] Update dependency rc-cascader to v3.25.0 (#86045)

* Update dependency rc-cascader to v3.25.0

* fix type errors

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 packages/grafana-ui/package.json              |  2 +-
 .../ButtonCascader/ButtonCascader.tsx         |  4 +--
 .../src/components/Cascader/optionMappings.ts | 27 ++++++++++---------
 yarn.lock                                     | 10 +++----
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 8668b8e20c0..251faf73941 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -78,7 +78,7 @@
     "monaco-editor": "0.34.1",
     "ol": "7.4.0",
     "prismjs": "1.29.0",
-    "rc-cascader": "3.24.1",
+    "rc-cascader": "3.25.0",
     "rc-drawer": "7.1.0",
     "rc-slider": "10.6.2",
     "rc-time-picker": "^3.7.3",
diff --git a/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.tsx b/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.tsx
index 3fe1450c51c..e422842b687 100644
--- a/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.tsx
+++ b/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import RCCascader from 'rc-cascader';
+import RCCascader, { BaseOptionType } from 'rc-cascader';
 import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
@@ -17,7 +17,7 @@ export interface ButtonCascaderProps {
   icon?: IconName;
   disabled?: boolean;
   value?: string[];
-  fieldNames?: { label: string; value: string; children: string };
+  fieldNames?: { label: keyof BaseOptionType; value: keyof BaseOptionType; children: keyof BaseOptionType };
   loadData?: (selectedOptions: CascaderOption[]) => void;
   onChange?: (value: string[], selectedOptions: CascaderOption[]) => void;
   onPopupVisibleChange?: (visible: boolean) => void;
diff --git a/packages/grafana-ui/src/components/Cascader/optionMappings.ts b/packages/grafana-ui/src/components/Cascader/optionMappings.ts
index d437d0bfe83..3292739836e 100644
--- a/packages/grafana-ui/src/components/Cascader/optionMappings.ts
+++ b/packages/grafana-ui/src/components/Cascader/optionMappings.ts
@@ -1,18 +1,20 @@
-import { SingleValueType, BaseOptionType as RCCascaderOption } from 'rc-cascader/lib/Cascader';
+import { BaseOptionType as RCCascaderOption, CascaderProps } from 'rc-cascader';
 
 import { CascaderOption } from './Cascader';
 
 type onChangeType = ((values: string[], options: CascaderOption[]) => void) | undefined;
 
-export const onChangeCascader = (onChanged: onChangeType) => (values: SingleValueType, options: RCCascaderOption[]) => {
-  if (onChanged) {
-    // map values to strings for backwards compatibility with Cascader components
-    onChanged(
-      values.map((value) => String(value)),
-      fromRCOptions(options)
-    );
-  }
-};
+export const onChangeCascader =
+  (onChanged: onChangeType): CascaderProps['onChange'] =>
+  (values, options) => {
+    if (onChanged) {
+      // map values to strings for backwards compatibility with Cascader components
+      onChanged(
+        values.map((value) => String(value)),
+        fromRCOptions(options)
+      );
+    }
+  };
 
 type onLoadDataType = ((options: CascaderOption[]) => void) | undefined;
 
@@ -27,8 +29,9 @@ const fromRCOptions = (options: RCCascaderOption[]): CascaderOption[] => {
 };
 
 const fromRCOption = (option: RCCascaderOption): CascaderOption => {
+  const value = option.value ? String(option.value) : '';
   return {
-    value: option.value ?? '',
-    label: option.label,
+    value,
+    label: typeof option.label === 'string' ? option.label : value,
   };
 };
diff --git a/yarn.lock b/yarn.lock
index 30dd730c395..9671a6bbe75 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4124,7 +4124,7 @@ __metadata:
     ol: "npm:7.4.0"
     prismjs: "npm:1.29.0"
     process: "npm:^0.11.10"
-    rc-cascader: "npm:3.24.1"
+    rc-cascader: "npm:3.25.0"
     rc-drawer: "npm:7.1.0"
     rc-slider: "npm:10.6.2"
     rc-time-picker: "npm:^3.7.3"
@@ -25518,9 +25518,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-cascader@npm:3.24.1":
-  version: 3.24.1
-  resolution: "rc-cascader@npm:3.24.1"
+"rc-cascader@npm:3.25.0":
+  version: 3.25.0
+  resolution: "rc-cascader@npm:3.25.0"
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
     array-tree-filter: "npm:^2.1.0"
@@ -25531,7 +25531,7 @@ __metadata:
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: 10/7b48dd7ae519809d0713a79efbfcede93e10218cb099ce1fa43fc4c96c902367e9a1cabab4586ef1cec2d1670cf4941f2672dfddb8f53e00dfe76cf363416774
+  checksum: 10/029250563c6b246568b47a81a168701aa64520e8a5e9a33999af86cc284a9eef8c1381c42ed98d56079c760f7d3ca230de4d5d80f99798dd61e7dce829a75a17
   languageName: node
   linkType: hard