dynamic-mui 1.1.1 → 1.1.3

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

@@ -30,29 +30,52 @@ 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;
-  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));
-    return options === null || options === void 0 ? void 0 : options.filter(_ref => {
+  let separator = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : ',';
+  try {
+    const safeOptions = Array.isArray(options) ? options : [];
+    if (isMultiple) {
+      let values = [];
+      if (Array.isArray(defaultValue)) {
+        values = defaultValue;
+      } else if (typeof defaultValue === 'string' && defaultValue.trim() !== '') {
+        let tempSeparator = separator;
+        if (defaultValue.includes(',')) tempSeparator = ',';else if (defaultValue.includes(';')) tempSeparator = ';';
+        values = defaultValue.split(tempSeparator).map(v => v.trim());
+      }
+      const dValueSet = new Set(values);
+      return safeOptions.filter(_ref => {
+        let {
+          value
+        } = _ref;
+        return dValueSet.has(value);
+      });
+    }
+    if (Array.isArray(defaultValue)) {
+      const first = defaultValue[0];
+      return safeOptions.find(_ref2 => {
+        let {
+          value
+        } = _ref2;
+        return value === first;
+      });
+    }
+    return safeOptions.find(_ref3 => {
       let {
         value
-      } = _ref;
-      return dValueSet === null || dValueSet === void 0 ? void 0 : dValueSet.has(value);
+      } = _ref3;
+      return value === defaultValue;
     });
+  } catch (err) {
+    // eslint-disable-next-line no-console
+    console.error('getValue error:', err);
+    return isMultiple ? [] : null;
   }
-  return options.find(_ref2 => {
-    let {
-      value
-    } = _ref2;
-    return value === defaultValue;
-  });
 };
-function Select(_ref3) {
+function Select(_ref4) {
   let {
     attributes,
     onChange
-  } = _ref3;
+  } = _ref4;
   const {
     MuiAttributes = {},
     options = [],
@@ -60,7 +83,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 +106,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/docs/asset-manifest.json

@@ -1,9 +1,9 @@
 {
   "files": {
-    "main.js": "/DinakaranS/-dynamic-mui/build/bundle.d0a39e98.js",
+    "main.js": "/DinakaranS/-dynamic-mui/build/bundle.33388aca.js",
     "index.html": "/DinakaranS/-dynamic-mui/index.html"
   },
   "entrypoints": [
-    "build/bundle.d0a39e98.js"
+    "build/bundle.33388aca.js"
   ]
 }