From 559a93d3798d0dcc6f2c5548219652001a911cfd Mon Sep 17 00:00:00 2001
From: David Wheatley <hi@davwheat.dev>
Date: Wed, 21 Jul 2021 11:29:19 +0100
Subject: [PATCH] Prevent class attrs overriding default Select classes

---
 framework/core/js/src/common/components/Select.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/framework/core/js/src/common/components/Select.js b/framework/core/js/src/common/components/Select.js
index 4e6ca8e32..b216cd7cf 100644
--- a/framework/core/js/src/common/components/Select.js
+++ b/framework/core/js/src/common/components/Select.js
@@ -22,18 +22,20 @@ export default class Select extends Component {
       onchange,
       value,
       disabled,
+      className,
+      class: _class,
 
       // Destructure the `wrapperAttrs` object to extract the `className` for passing to `classList()`
       // `= {}` prevents errors when `wrapperAttrs` is undefined
-      wrapperAttrs: { className: wrapperClassName, ...wrapperAttrs } = {},
+      wrapperAttrs: { className: wrapperClassName, class: wrapperClass, ...wrapperAttrs } = {},
 
       ...domAttrs
     } = this.attrs;
 
     return (
-      <span className={classList('Select', wrapperClassName)} {...wrapperAttrs}>
+      <span className={classList('Select', wrapperClassName, wrapperClass)} {...wrapperAttrs}>
         <select
-          className="Select-input FormControl"
+          className={classList("Select-input FormControl", className, _class)}
           onchange={onchange ? withAttr('value', onchange.bind(this)) : undefined}
           value={value}
           disabled={disabled}