dynamic-mui 1.1.0 → 1.1.2

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

@@ -30,10 +30,11 @@ const getValue = function () {
   let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   let defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   let isMultiple = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  let separator = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : ',';
   if (isMultiple) {
-    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));
+    let tempSeparator = separator;
+    if (defaultValue !== null && defaultValue !== void 0 && defaultValue.includes(',')) tempSeparator = ',';else if (defaultValue !== null && defaultValue !== void 0 && defaultValue.includes(';')) tempSeparator = ';';
+    const dValueSet = new Set(defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.split(tempSeparator));
     return options === null || options === void 0 ? void 0 : options.filter(_ref => {
       let {
         value
@@ -60,7 +61,7 @@ function Select(_ref3) {
     id = '',
     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 [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, attributes === null || attributes === void 0 ? void 0 : attributes.separator));
   const getMuiAttributes = () => {
     if (MuiAttributes.multiple) {
       MuiAttributes.renderOption = function (props) {
@@ -83,20 +84,30 @@ function Select(_ref3) {
   };
   const extractValue = option => (option === null || option === void 0 ? void 0 : option.value) || (option === null || option === void 0 ? void 0 : option.title) || (option === null || option === void 0 ? void 0 : option.label);
   const onChangeEvent = (0, _react.useCallback)((event, newValue) => {
+    var _attributes$separator;
     setValue(newValue);
+
+    // Use attributes?.separator, default to ';'
+    const separator = (_attributes$separator = attributes === null || attributes === void 0 ? void 0 : attributes.separator) !== null && _attributes$separator !== void 0 ? _attributes$separator : ';';
     if (newValue) {
       const data = MuiAttributes.multiple ? newValue.map(extractValue) : extractValue(newValue);
+      const customValue = MuiAttributes.multiple ? data.join(separator) // <-- use custom separator here
+      : data;
       onChange({
         id,
-        value: MuiAttributes.multiple ? data.toString() : data,
+        value: customValue,
         option: newValue
       });
-    } else onChange({
-      id,
-      value: '',
-      option: newValue
-    });
-  }, []);
+    } else {
+      onChange({
+        id,
+        value: '',
+        option: newValue
+      });
+    }
+  }, [id, onChange, attributes === null || attributes === void 0 ? void 0 : attributes.separator,
+  // so changes to separator update the callback
+  MuiAttributes.multiple, extractValue]);
   return /*#__PURE__*/_react.default.createElement(_Autocomplete.default, _extends({
     disablePortal: false
   }, getMuiAttributes(), {

package/dist-modules/util/helper.js

@@ -12,37 +12,74 @@ var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 var _material = require("@mui/material");
 var _xDatePickers = require("@mui/x-date-pickers");
 var _react = _interopRequireDefault(require("react"));
+const _excluded = ["xs", "sm", "md", "lg", "xl", "size"];
 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); }
-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; }
 function generateLayout(data) {
   const layout = {
     wrows: [],
     worows: []
   };
-  // All Items
   const wrows = (0, _lodash.clone)(data);
-  // Remove Without Rows
-  layout.worows = (0, _lodash.remove)(wrows, item => {
+
+  // Items without a row -> worows
+  const removed = (0, _lodash.remove)(wrows, item => {
     const isLayout = item.layout ? item.layout.row : item.layout;
     return isLayout === undefined;
-  }); // Concat all items without rows
+  });
+
+  // Create a new item with MUI v7-friendly layout.size (no param reassign)
+  const normalizeItem = it => {
+    var _it$layout;
+    const l = (_it$layout = it.layout) !== null && _it$layout !== void 0 ? _it$layout : {};
+    const computedSize = (() => {
+      if (l.size && typeof l.size === 'object') return l.size;
+      const s = {};
+      if (l.xs != null) s.xs = l.xs;
+      if (l.sm != null) s.sm = l.sm;
+      if (l.md != null) s.md = l.md;
+      if (l.lg != null) s.lg = l.lg;
+      if (l.xl != null) s.xl = l.xl;
+      return Object.keys(s).length ? s : {
+        xs: 12
+      };
+    })();
 
-  // All row indices
+    // strip legacy breakpoint keys; keep everything else on layout
+    const {
+        xs,
+        sm,
+        md,
+        lg,
+        xl,
+        size
+      } = l,
+      restLayout = _objectWithoutProperties(l, _excluded);
+    const normalizedLayout = _objectSpread(_objectSpread({}, restLayout), {}, {
+      size: size !== null && size !== void 0 ? size : computedSize
+    });
+    return _objectSpread(_objectSpread({}, it), {}, {
+      layout: normalizedLayout
+    });
+  };
+  layout.worows = removed.map(normalizeItem);
+
+  // Group remaining items by row
   const rowIndex = (0, _lodash.map)(wrows, 'layout.row');
   const uniqIndex = (0, _lodash.uniq)(rowIndex);
   const sortedIndex = (0, _lodash.sortBy)(uniqIndex);
   (0, _lodash.each)(sortedIndex, value => {
     const rows = [];
-    (0, _lodash.each)(wrows, item => {
-      if (item.layout) {
-        if (item.layout.row === value) {
-          rows.push(item);
-        }
+    (0, _lodash.each)(wrows, it => {
+      if (it.layout && it.layout.row === value) {
+        rows.push(normalizeItem(it));
       }
     });
     layout.wrows.push(rows);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dynamic-mui",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "author": "Dinakaran S",
   "user": "dinakarans",
   "repository": {
@@ -28,7 +28,7 @@
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "dayjs": "^1.11.13",
+    "dayjs": "^1.11.19",
     "lodash": "^4.17.21",
     "numeral": "^2.0.6",
     "prop-types": "^15.8.1",