From 66f79e53e514119f7c5c4009cec720a759f51259 Mon Sep 17 00:00:00 2001
From: kay delaney <45561153+kaydelaney@users.noreply.github.com>
Date: Wed, 11 Jun 2025 12:45:14 +0100
Subject: [PATCH] Dashboards: Pass id prop to Switch component for bool inputs
 (#106438)

---
 public/app/core/components/OptionsUI/registry.tsx      | 3 +--
 public/app/plugins/panel/geomap/editor/layerEditor.tsx | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/app/core/components/OptionsUI/registry.tsx b/public/app/core/components/OptionsUI/registry.tsx
index d1c51c96de8..123ede77f89 100644
--- a/public/app/core/components/OptionsUI/registry.tsx
+++ b/public/app/core/components/OptionsUI/registry.tsx
@@ -87,8 +87,7 @@ export const getAllOptionEditors = () => {
     name: 'Boolean',
     description: 'Allows boolean values input',
     editor(props) {
-      const { id, ...rest } = props; // Remove id from properties passed into switch
-      return <Switch {...rest} onChange={(e) => props.onChange(e.currentTarget.checked)} />;
+      return <Switch {...props} onChange={(e) => props.onChange(e.currentTarget.checked)} />;
     },
   };
 
diff --git a/public/app/plugins/panel/geomap/editor/layerEditor.tsx b/public/app/plugins/panel/geomap/editor/layerEditor.tsx
index 064e6189cf7..865b9f94654 100644
--- a/public/app/plugins/panel/geomap/editor/layerEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/layerEditor.tsx
@@ -122,7 +122,7 @@ export function getLayerEditor(opts: LayerEditorOptions): NestedPanelOptions<Map
           });
         }
         builder.addBooleanSwitch({
-          path: 'tooltip',
+          path: 'layer-tooltip',
           name: 'Display tooltip',
           description: 'Show the tooltip for layer',
           defaultValue: true,