dynamic-mui 1.0.83 → 1.0.85

package/craco.config.js

@@ -1,11 +1,29 @@
+/// /////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2023 Realm Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+/// /////////////////////////////////////////////////////////////////////////
+
 module.exports = {
-  // 1) Keep your existing webpack tweaks
   webpack: {
     configure(config) {
       const experiments = {
         ...config.experiments,
         topLevelAwait: true,
       };
+
       return {
         ...config,
         experiments,
@@ -13,23 +31,4 @@ module.exports = {
     },
     alias: {},
   },
-
-  // 2) Add an eslint section so CRACO drives all of ESLint
-  eslint: {
-    enable: true,
-    mode: 'extends', // use "extends" mode to build on CRA’s base
-    configure: {
-      extends: [
-        'react-app', // CRA’s default
-        'react-app/jest',
-        'airbnb', // your Airbnb rules
-        'prettier', // disable conflicts with Prettier
-      ],
-      plugins: ['react', 'react-hooks', 'jsx-a11y', 'import', 'prettier'],
-      rules: {
-        'react/react-in-jsx-scope': 'off',
-        'prettier/prettier': 'error',
-      },
-    },
-  },
 };

package/dist-modules/components/charts/Mixchart/mixChart.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = MixChart;
 var React = _interopRequireWildcard(require("react"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
-var _ChartContainer = require("@mui/x-charts/ChartContainer");
+var _ResponsiveChartContainer = require("@mui/x-charts/ResponsiveChartContainer");
 var _LineChart = require("@mui/x-charts/LineChart");
 var _BarChart = require("@mui/x-charts/BarChart");
 var _ChartsXAxis = require("@mui/x-charts/ChartsXAxis");
@@ -39,7 +39,7 @@ function MixChart(_ref) {
       maxWidth: 600
     },
     key: id
-  }, MuiBoxAttributes), /*#__PURE__*/React.createElement(_ChartContainer.ChartContainer, _extends({
+  }, MuiBoxAttributes), /*#__PURE__*/React.createElement(_ResponsiveChartContainer.ResponsiveChartContainer, _extends({
     sx: _objectSpread({
       [".".concat(_ChartsAxis.axisClasses.left, " .").concat(_ChartsAxis.axisClasses.label)]: {
         transform: 'translate(-25px, 0)'

package/dist-modules/components/controls/Select/select.js

@@ -31,35 +31,34 @@ const getValue = function () {
   let defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   let isMultiple = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   if (isMultiple) {
-    const values = Array.isArray(defaultValue) ? defaultValue : (() => {
-      let sep = ',';
-      if (defaultValue.includes(';')) sep = ';';
-      return defaultValue.split(sep).map(v => v.trim());
-    })();
-    const dValueSet = new Set(values);
-    return options.filter(opt => dValueSet.has(opt.value));
+    let separator = ',';
+    if (defaultValue !== null && defaultValue !== void 0 && defaultValue.includes(',')) separator = ',';else if (defaultValue !== null && defaultValue !== void 0 && defaultValue.includes(';')) separator = ';';
+    const dValueSet = new Set(defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.split(separator));
+    return options === null || options === void 0 ? void 0 : options.filter(_ref => {
+      let {
+        value
+      } = _ref;
+      return dValueSet === null || dValueSet === void 0 ? void 0 : dValueSet.has(value);
+    });
   }
-  return options.find(_ref => {
+  return options.find(_ref2 => {
     let {
       value
-    } = _ref;
+    } = _ref2;
     return value === defaultValue;
   });
 };
-function Select(_ref2) {
+function Select(_ref3) {
   let {
     attributes,
     onChange
-  } = _ref2;
+  } = _ref3;
   const {
     MuiAttributes = {},
     options = [],
     MuiBoxAttributes = {},
     id = '',
-    InputProps = {},
-    additionalProps = {
-      split: ','
-    }
+    InputProps = {}
   } = attributes;
   const [value, setValue] = _react.default.useState((attributes === null || attributes === void 0 ? void 0 : attributes.value) && getValue(options, attributes === null || attributes === void 0 ? void 0 : attributes.value, MuiAttributes.multiple));
   const getMuiAttributes = () => {
@@ -89,7 +88,7 @@ function Select(_ref2) {
       const data = MuiAttributes.multiple ? newValue.map(extractValue) : extractValue(newValue);
       onChange({
         id,
-        value: MuiAttributes.multiple ? data === null || data === void 0 ? void 0 : data.join(additionalProps === null || additionalProps === void 0 ? void 0 : additionalProps.split) : data,
+        value: MuiAttributes.multiple ? data.toString() : data,
         option: newValue
       });
     } else onChange({

package/dist-modules/components/controls/Switch/switch.js

@@ -15,7 +15,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
-const ColorSwitch = (0, _styles.styled)(_ref => {
+const ColorSwitch = (0, _styles.experimentalStyled)(_ref => {
   let {
       color
     } = _ref,

package/dist-modules/components/controls/TextField/textfield.js

@@ -12,7 +12,13 @@ var _helper = require("../../../util/helper");
 var _validation = _interopRequireDefault(require("../../../util/validation"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } /* eslint-disable react/jsx-no-duplicate-props */
 function TextField(_ref) {
+  var _MuiAttributes$slotPr;
   let {
     attributes,
     rules = {},
@@ -59,7 +65,6 @@ function TextField(_ref) {
     const {
       value
     } = args[0].target;
-    // const formatValue = value ? getValue(value) : '';
     const validator = validate(value);
     setTextData({
       value,
@@ -81,25 +86,47 @@ function TextField(_ref) {
       helperText: validator.message,
       error: !validator.isValid
     });
-    if (typeof onChange === 'function') {
-      onChange({
-        id,
-        value: formatValue
-      });
-    }
+    if (typeof onChange === 'function') onChange({
+      id,
+      value: formatValue
+    });
   };
-  const handleOnFocus = () => {
-    // const { value } = args[0].target;
-    // const formatValue = getValue(value);
-    // const validator = validate(formatValue);
-    // setTextData({
-    //   value: formatValue,
-    //   helperText: validator.message,
-    // });
+  const handleOnFocus = () => {};
+
+  // Wheel-block for numeric inputs
+  const isNumberType = (MuiAttributes === null || MuiAttributes === void 0 ? void 0 : MuiAttributes.type) === 'number' || (attributes === null || attributes === void 0 ? void 0 : attributes.type) === 'number' || (MuiAttributes === null || MuiAttributes === void 0 ? void 0 : MuiAttributes.inputMode) === 'numeric';
+  const onWheelBlock = e => {
+    const el = e.currentTarget;
+    el.blur();
+    setTimeout(() => el.focus(), 0);
   };
+
+  // Build merged input props we want to ensure exist
+  const ourInputProps = _objectSpread(_objectSpread({}, isNumberType ? {
+    onWheel: onWheelBlock
+  } : {}), {}, {
+    inputMode: (MuiAttributes === null || MuiAttributes === void 0 ? void 0 : MuiAttributes.inputProps) && MuiAttributes.inputProps.inputMode || (MuiAttributes === null || MuiAttributes === void 0 || (_MuiAttributes$slotPr = MuiAttributes.slotProps) === null || _MuiAttributes$slotPr === void 0 ? void 0 : _MuiAttributes$slotPr.input) && MuiAttributes.slotProps.input.inputMode || 'numeric'
+  });
+  const isV6 = !!(MuiAttributes !== null && MuiAttributes !== void 0 && MuiAttributes.slotProps);
+  const baseAttrs = _objectSpread({}, MuiAttributes);
+  let finalInputProps;
+  let finalSlotProps;
+  if (isV6) {
+    const existingSlotInput = MuiAttributes.slotProps && MuiAttributes.slotProps.input || {};
+    finalSlotProps = _objectSpread(_objectSpread({}, MuiAttributes.slotProps || {}), {}, {
+      input: _objectSpread(_objectSpread({}, existingSlotInput), ourInputProps)
+    });
+    delete baseAttrs.slotProps;
+  } else {
+    const existingInputProps = MuiAttributes.inputProps || {};
+    finalInputProps = _objectSpread(_objectSpread({}, existingInputProps), ourInputProps);
+    delete baseAttrs.inputProps;
+  }
   return /*#__PURE__*/_react.default.createElement(_TextField.default, _extends({
     fullWidth: true
-  }, MuiAttributes, {
+  }, baseAttrs, {
+    inputProps: !isV6 ? finalInputProps : undefined,
+    slotProps: isV6 ? finalSlotProps : undefined,
     InputProps: (0, _helper.getInputProps)(InputProps),
     onChange: handleOnChange,
     onBlur: handleOnBlur,
@@ -110,11 +137,8 @@ function TextField(_ref) {
   }));
 }
 TextField.propTypes = process.env.NODE_ENV !== "production" ? {
-  /** Attributes for TextField */
   attributes: _propTypes.default.objectOf(_propTypes.default.object),
-  /** Rules to be used */
   rules: _propTypes.default.objectOf(_propTypes.default.array),
-  /** Function */
   onChange: _propTypes.default.func
 } : {};
 TextField.defaultProps = {

package/dist-modules/util/helper.js

@@ -58,13 +58,13 @@ function getInputProps(InputProps) {
       text,
       textstyle = {}
     } = InputProps;
-    return position ? {
+    return {
       ["".concat(position, "Adornment")]: /*#__PURE__*/_react.default.createElement(_material.InputAdornment, _extends({}, MuiInputAdornment, {
         key: "custom-icon-Adornment-".concat(position)
       }), icon && /*#__PURE__*/_react.default.createElement(_material.Icon, null, icon), !(0, _isEmpty.default)(textstyle) ? /*#__PURE__*/_react.default.createElement("div", {
         style: textstyle
       }, text || '') : text || '')
-    } : _objectSpread({}, InputProps);
+    };
   }
   return {};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dynamic-mui",
-  "version": "1.0.83",
+  "version": "1.0.85",
   "author": "Dinakaran S",
   "user": "dinakarans",
   "repository": {
@@ -19,11 +19,11 @@
     "@babel/plugin-transform-modules-commonjs": "^7.26.3",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
-    "@mui/icons-material": "^7.3.0",
-    "@mui/material": "^7.3.0",
-    "@mui/x-charts": "^8.9.2",
-    "@mui/x-data-grid": "^8.9.2",
-    "@mui/x-date-pickers": "^8.9.2",
+    "@mui/icons-material": "^6.3.1",
+    "@mui/material": "^6.3.1",
+    "@mui/x-charts": "^7.23.2",
+    "@mui/x-data-grid": "^7.23.5",
+    "@mui/x-date-pickers": "^7.23.3",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",