Merge pull request #3541 from bettyblocks/acceptance

release
bettyblocks · Dec 2, 2024 · 93bedc6 · 93bedc6
2 parents 1b48262 + 3e4d4e6
commit 93bedc6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## [2.198.1](https://github.com/bettyblocks/material-ui-component-set/compare/v2.198.0...v2.198.1) (2024-11-29)
+
+
+### Bug Fixes
+
+* wrap select in a formfield component ([4d253fd](https://github.com/bettyblocks/material-ui-component-set/commit/4d253fd8b177efdecee636fb352c440090bb6189))
+
+# [2.198.0](https://github.com/bettyblocks/material-ui-component-set/compare/v2.197.1...v2.198.0) (2024-11-28)
+
+
+### Features
+
+* make text area still scrollable when disabled ([7bafa7f](https://github.com/bettyblocks/material-ui-component-set/commit/7bafa7f435ca9de92d4e200a13ca2034ed7f97c9))
+
 ## [2.197.1](https://github.com/bettyblocks/material-ui-component-set/compare/v2.197.0...v2.197.1) (2024-11-19)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "component-set",
-  "version": "2.197.1",
+  "version": "2.198.1",
   "main": "dist/templates.json",
   "license": "UNLICENSED",
   "private": false,

diff --git a/src/components/selectInput.js b/src/components/selectInput.js
@@ -37,7 +37,7 @@
       useRelation,
       useText,
     } = B;
-    const { TextField, MenuItem } = window.MaterialUI.Core;
+    const { TextField, MenuItem, FormControl } = window.MaterialUI.Core;
     const isDev = env === 'dev';
     const [errorState, setErrorState] = useState(false);
     const [afterFirstInvalidation, setAfterFirstInvalidation] = useState(false);
@@ -337,7 +337,7 @@
     };
 
     const SelectCmp = (
-      <>
+      <FormControl fullWidth={fullWidth}>
         <TextField
           id={actionVariableId}
           InputLabelProps={{ htmlFor: labelControlRef }}
@@ -353,7 +353,6 @@
             }`,
           }}
           variant={variant}
-          fullWidth={fullWidth}
           onChange={handleChange}
           onBlur={validationHandler}
           inputProps={{
@@ -389,7 +388,7 @@
           required={required}
           value={placeholderLabelText === currentValue ? '' : currentValue}
         />
-      </>
+      </FormControl>
     );
 
     return isDev ? <div className={classes.root}>{SelectCmp}</div> : SelectCmp;

diff --git a/src/components/textinput.js b/src/components/textinput.js
@@ -383,7 +383,6 @@
           ],
         },
         '&.Mui-disabled': {
-          pointerEvents: 'none',
           opacity: '0.7',
         },
       },
@@ -427,8 +426,12 @@
           '&:hover': {
             '& .MuiOutlinedInput-notchedOutline, & .MuiFilledInput-underline, & .MuiInput-underline':
               {
-                borderColor: ({ options: { borderHoverColor } }) => [
-                  style.getColor(borderHoverColor),
+                borderColor: ({
+                  options: { borderHoverColor, borderColor, disabled },
+                }) => [
+                  disabled
+                    ? style.getColor(borderColor)
+                    : style.getColor(borderHoverColor),
                   '!important',
                 ],
               },
@@ -459,7 +462,6 @@
             },
           },
           '&.Mui-disabled': {
-            pointerEvents: 'none',
             opacity: '0.7',
           },
         },