From a0fe969262efc7f0c9c633ede6b35537dd673a5a Mon Sep 17 00:00:00 2001
From: David Wheatley <hi@davwheat.dev>
Date: Tue, 13 Jul 2021 13:42:46 +0100
Subject: [PATCH] Allow extra attrs provided to `<Select>` to be passed through
 to the DOM element (#2959)

* Allow extra attrs provided to `<Select>` to be passed through to the DOM element

* Allow direct passing attrs to the Select wrapper

* Format
---
 .../core/js/src/common/components/Select.js   | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/framework/core/js/src/common/components/Select.js b/framework/core/js/src/common/components/Select.js
index d4cfab4fa..4e6ca8e32 100644
--- a/framework/core/js/src/common/components/Select.js
+++ b/framework/core/js/src/common/components/Select.js
@@ -1,6 +1,7 @@
 import Component from '../Component';
 import icon from '../helpers/icon';
 import withAttr from '../utils/withAttr';
+import classList from '../utils/classList';
 
 /**
  * The `Select` component displays a <select> input, surrounded with some extra
@@ -10,18 +11,33 @@ import withAttr from '../utils/withAttr';
  * - `onchange` A callback to run when the selected value is changed.
  * - `value` The value of the selected option.
  * - `disabled` Disabled state for the input.
+ * - `wrapperAttrs` A map of attrs to be passed to the DOM element wrapping the `<select>`
+ *
+ * Other attributes are passed directly to the `<select>` element rendered to the DOM.
  */
 export default class Select extends Component {
   view() {
-    const { options, onchange, value, disabled } = this.attrs;
+    const {
+      options,
+      onchange,
+      value,
+      disabled,
+
+      // Destructure the `wrapperAttrs` object to extract the `className` for passing to `classList()`
+      // `= {}` prevents errors when `wrapperAttrs` is undefined
+      wrapperAttrs: { className: wrapperClassName, ...wrapperAttrs } = {},
+
+      ...domAttrs
+    } = this.attrs;
 
     return (
-      <span className="Select">
+      <span className={classList('Select', wrapperClassName)} {...wrapperAttrs}>
         <select
           className="Select-input FormControl"
           onchange={onchange ? withAttr('value', onchange.bind(this)) : undefined}
           value={value}
           disabled={disabled}
+          {...domAttrs}
         >
           {Object.keys(options).map((key) => (
             <option value={key}>{options[key]}</option>