From 40885ed49b215fef6f85cc504f02a9d52f0bc045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sundstr=C3=B6m?= <jsundstrom1994@gmail.com>
Date: Mon, 7 Feb 2022 12:53:39 +0100
Subject: [PATCH] [SelectInput] Only attach click handler to label if a labelId
 is passed (#30239)

---
 packages/mui-material/src/Select/Select.test.js | 13 +++++++++++++
 packages/mui-material/src/Select/SelectInput.js |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/packages/mui-material/src/Select/Select.test.js b/packages/mui-material/src/Select/Select.test.js
index 7ab0df4bc4708f..7e9f8f2ab6f10a 100644
--- a/packages/mui-material/src/Select/Select.test.js
+++ b/packages/mui-material/src/Select/Select.test.js
@@ -1304,4 +1304,17 @@ describe('<Select />', () => {
       expect(getByTestId('root')).to.have.class('bar');
     });
   });
+
+  it('should not focus select when clicking an arbitrary element with id="undefined"', () => {
+    const { getByRole, getByTestId } = render(
+      <React.Fragment>
+        <div id="undefined" data-testid="test-element" />
+        <Select value="" />
+      </React.Fragment>,
+    );
+
+    fireEvent.click(getByTestId('test-element'));
+
+    expect(getByRole('button')).not.toHaveFocus();
+  });
 });
diff --git a/packages/mui-material/src/Select/SelectInput.js b/packages/mui-material/src/Select/SelectInput.js
index d3f2210ac3a30e..1c20c299bb496c 100644
--- a/packages/mui-material/src/Select/SelectInput.js
+++ b/packages/mui-material/src/Select/SelectInput.js
@@ -187,6 +187,9 @@ const SelectInput = React.forwardRef(function SelectInput(props, ref) {
   }, [autoFocus]);
 
   React.useEffect(() => {
+    if (!labelId) {
+      return undefined;
+    }
     const label = ownerDocument(displayRef.current).getElementById(labelId);
     if (label) {
       const handler = () => {