orc-shared 5.99.0-dev.4 → 5.99.0-dev.6

package/dist/components/Form/Inputs/MultiSelector.js

@@ -1,12 +1,13 @@
 "use strict";
 
 exports.__esModule = true;
-exports.selectEventUpdater = exports.default = void 0;
+exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
+var _reactIntl = require("react-intl");
 var _Select = _interopRequireDefault(require("../../MaterialUI/Inputs/Select"));
-var _utils = require("../../../utils");
 var _SelectProps = _interopRequireDefault(require("../../MaterialUI/Inputs/SelectProps"));
-var _excluded = ["value", "options", "update"];
+var _sharedMessages = _interopRequireDefault(require("../../../sharedMessages"));
+var _excluded = ["value", "width", "options", "update", "addClearSelectAll", "multipleRenderValue"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 (function () {
   var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
@@ -24,29 +25,81 @@ var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoader
 var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
-var selectEventUpdater = exports.selectEventUpdater = (0, _utils.memoize)(function (update) {
-  return function (value) {
-    return update(value);
-  };
-});
+var clearValue = "__#Clear#__";
+var selectAllValue = "__#SelectAll#__";
 var MultiSelector = function MultiSelector(_ref) {
   var value = _ref.value,
+    _ref$width = _ref.width,
+    width = _ref$width === void 0 ? 700 : _ref$width,
     options = _ref.options,
     update = _ref.update,
+    addClearSelectAll = _ref.addClearSelectAll,
+    multipleRenderValue = _ref.multipleRenderValue,
     props = _objectWithoutProperties(_ref, _excluded);
+  var _useIntl = (0, _reactIntl.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
+  var valueUpdater = function valueUpdater(value) {
+    if (value.indexOf(clearValue) >= 0) {
+      update([]);
+    } else if (value.indexOf(selectAllValue) >= 0) {
+      update(options.map(function (x) {
+        return x.value;
+      }));
+    } else {
+      update(value);
+    }
+  };
   var selectProps = new _SelectProps.default();
+  var selectionOptions = [];
+  if (addClearSelectAll) {
+    if (value.length > 0) {
+      selectionOptions.push({
+        label: formatMessage(_sharedMessages.default.clear),
+        value: clearValue
+      });
+    }
+    if (value.length !== options.length) {
+      selectionOptions.push({
+        label: formatMessage(_sharedMessages.default.selectAll),
+        value: selectAllValue
+      });
+    }
+  }
+  var allOptions = [].concat(selectionOptions, options);
   selectProps.set(_SelectProps.default.propNames.value, value);
   selectProps.set(_SelectProps.default.propNames.onClose, props.onBlur);
   selectProps.set(_SelectProps.default.propNames.disabled, props.disabled);
   selectProps.set(_SelectProps.default.propNames.multiple, true);
-  selectProps.set(_SelectProps.default.propNames.update, selectEventUpdater(update));
+  selectProps.set(_SelectProps.default.propNames.multipleSelectWidth, width);
+  selectProps.set(_SelectProps.default.propNames.update, valueUpdater);
+  selectProps.set(_SelectProps.default.propNames.autoWidth, false);
+  selectProps.set(_SelectProps.default.propNames.autoFocus, false);
+  selectProps.set(_SelectProps.default.propNames.renderValue, multipleRenderValue ? function () {
+    return multipleRenderValue(value, options);
+  } : null);
+  selectProps.set(_SelectProps.default.propNames.positionOverride, {
+    anchorOrigin: {
+      vertical: "bottom",
+      horizontal: "left"
+    },
+    transformOrigin: {
+      vertical: "top",
+      horizontal: "left"
+    }
+  });
   var hasError = props.required && (!Array.isArray(value) || value.length === 0);
   selectProps.set(_SelectProps.default.propNames.error, hasError);
   return /*#__PURE__*/_react.default.createElement(_Select.default, {
-    options: options,
+    options: allOptions,
     selectProps: selectProps
   });
 };
+__signature__(MultiSelector, "useIntl{{ formatMessage }}", function () {
+  return [_reactIntl.useIntl];
+});
+__signature__(MultiSelector, "useIntl{{ formatMessage }}", function () {
+  return [_reactIntl.useIntl];
+});
 var _default = MultiSelector;
 var _default2 = _default;
 var _default3 = exports.default = _default2;
@@ -56,7 +109,8 @@ var _default3 = exports.default = _default2;
   if (!reactHotLoader) {
     return;
   }
-  reactHotLoader.register(selectEventUpdater, "selectEventUpdater", "/home/vsts/work/1/s/src/components/Form/Inputs/MultiSelector.js");
+  reactHotLoader.register(clearValue, "clearValue", "/home/vsts/work/1/s/src/components/Form/Inputs/MultiSelector.js");
+  reactHotLoader.register(selectAllValue, "selectAllValue", "/home/vsts/work/1/s/src/components/Form/Inputs/MultiSelector.js");
   reactHotLoader.register(MultiSelector, "MultiSelector", "/home/vsts/work/1/s/src/components/Form/Inputs/MultiSelector.js");
   reactHotLoader.register(_default, "default", "/home/vsts/work/1/s/src/components/Form/Inputs/MultiSelector.js");
 })();
@@ -71,7 +125,8 @@ var _default3 = exports.default = _default2;
   if (!reactHotLoader) {
     return;
   }
-  reactHotLoader.register(selectEventUpdater, "selectEventUpdater", "/home/vsts/work/1/s/src/components/Form/Inputs/MultiSelector.js");
+  reactHotLoader.register(clearValue, "clearValue", "/home/vsts/work/1/s/src/components/Form/Inputs/MultiSelector.js");
+  reactHotLoader.register(selectAllValue, "selectAllValue", "/home/vsts/work/1/s/src/components/Form/Inputs/MultiSelector.js");
   reactHotLoader.register(MultiSelector, "MultiSelector", "/home/vsts/work/1/s/src/components/Form/Inputs/MultiSelector.js");
   reactHotLoader.register(_default2, "default", "/home/vsts/work/1/s/src/components/Form/Inputs/MultiSelector.js");
 })();

package/dist/components/Form/Inputs/Selector.js

@@ -1,10 +1,9 @@
 "use strict";
 
 exports.__esModule = true;
-exports.selectEventUpdater = exports.default = void 0;
+exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _Select = _interopRequireDefault(require("../../MaterialUI/Inputs/Select"));
-var _utils = require("../../../utils");
 var _SelectProps = _interopRequireDefault(require("../../MaterialUI/Inputs/SelectProps"));
 var _excluded = ["value", "options", "update"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -24,11 +23,6 @@ var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoader
 var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
-var selectEventUpdater = exports.selectEventUpdater = (0, _utils.memoize)(function (update) {
-  return function (value) {
-    return update(value);
-  };
-});
 var Selector = function Selector(_ref) {
   var value = _ref.value,
     options = _ref.options,
@@ -38,7 +32,18 @@ var Selector = function Selector(_ref) {
   selectProps.set(_SelectProps.default.propNames.value, value);
   selectProps.set(_SelectProps.default.propNames.onClose, props.onBlur);
   selectProps.set(_SelectProps.default.propNames.disabled, props.disabled);
-  selectProps.set(_SelectProps.default.propNames.update, selectEventUpdater(update));
+  selectProps.set(_SelectProps.default.propNames.update, update);
+  selectProps.set(_SelectProps.default.propNames.autoWidth, false);
+  selectProps.set(_SelectProps.default.propNames.positionOverride, {
+    anchorOrigin: {
+      vertical: "bottom",
+      horizontal: "left"
+    },
+    transformOrigin: {
+      vertical: "top",
+      horizontal: "left"
+    }
+  });
   var hasError = props.required && !value ? true : false;
   selectProps.set(_SelectProps.default.propNames.error, hasError);
   return /*#__PURE__*/_react.default.createElement(_Select.default, {
@@ -55,7 +60,6 @@ var _default3 = exports.default = _default2;
   if (!reactHotLoader) {
     return;
   }
-  reactHotLoader.register(selectEventUpdater, "selectEventUpdater", "/home/vsts/work/1/s/src/components/Form/Inputs/Selector.js");
   reactHotLoader.register(Selector, "Selector", "/home/vsts/work/1/s/src/components/Form/Inputs/Selector.js");
   reactHotLoader.register(_default, "default", "/home/vsts/work/1/s/src/components/Form/Inputs/Selector.js");
 })();
@@ -70,7 +74,6 @@ var _default3 = exports.default = _default2;
   if (!reactHotLoader) {
     return;
   }
-  reactHotLoader.register(selectEventUpdater, "selectEventUpdater", "/home/vsts/work/1/s/src/components/Form/Inputs/Selector.js");
   reactHotLoader.register(Selector, "Selector", "/home/vsts/work/1/s/src/components/Form/Inputs/Selector.js");
   reactHotLoader.register(_default2, "default", "/home/vsts/work/1/s/src/components/Form/Inputs/Selector.js");
 })();

package/dist/components/MaterialUI/Inputs/Select.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.SelectIconButton = void 0;
+exports.renderMultipleValues = exports.default = exports.SelectIconButton = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem"));
 var _Select = _interopRequireDefault(require("@material-ui/core/Select"));
@@ -12,6 +12,8 @@ var _TooltippedTypography = _interopRequireDefault(require("./../DataDisplay/Too
 var _Icon = _interopRequireDefault(require("./../DataDisplay/Icon"));
 var _IconButton = _interopRequireDefault(require("@material-ui/core/IconButton"));
 var _core = require("@material-ui/core");
+var _FormControl = _interopRequireDefault(require("@material-ui/core/FormControl"));
+var _useWindowSize = _interopRequireDefault(require("../../../hooks/useWindowSize"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -23,11 +25,6 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
   var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
   enterModule && enterModule(module);
 })();
-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 _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -35,6 +32,11 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 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); }
 var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
@@ -43,8 +45,12 @@ var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoader
 };
 var useStyles = (0, _styles.makeStyles)(function (theme) {
   return {
-    baseItem: {
-      maxWidth: theme.spacing(35)
+    baseItem: function baseItem(props) {
+      return _objectSpread({}, props.autoWidth ? {
+        maxWidth: theme.spacing(35)
+      } : {
+        maxWidth: theme.spacing(props.multipleWidthSpacing)
+      });
     },
     level0: {},
     level1: {
@@ -75,35 +81,39 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
       display: "flex",
       flexDirection: "column"
     },
-    selectPaper: {
-      border: "1px solid ".concat(theme.palette.grey.borders),
-      minWidth: "auto !important",
-      width: "auto !important",
-      "& ul": {
-        minWidth: theme.spacing(17.5),
-        maxHeight: theme.spacing(30),
-        paddingTop: 0,
-        paddingBottom: 0
-      },
-      "& li": {
-        fontSize: theme.typography.fontSize,
-        fontFamily: theme.typography.fontFamily,
-        textTransform: "none",
-        color: theme.palette.grey.dark,
-        paddingTop: theme.spacing(1),
-        paddingBottom: theme.spacing(1),
-        borderRadius: 0,
-        whiteSpace: "normal",
-        "&:hover": {
-          backgroundColor: theme.palette.primary.light
+    selectPaper: function selectPaper(props) {
+      return _objectSpread({
+        border: "1px solid ".concat(theme.palette.grey.borders),
+        "& ul": {
+          minWidth: theme.spacing(17.5),
+          maxHeight: theme.spacing(30),
+          paddingTop: 0,
+          paddingBottom: 0
         },
-        "&:focus, &:active": {
+        "& li": {
+          fontSize: theme.typography.fontSize,
+          fontFamily: theme.typography.fontFamily,
+          textTransform: "none",
+          color: theme.palette.grey.dark,
+          paddingTop: theme.spacing(1),
+          paddingBottom: theme.spacing(1),
           borderRadius: 0,
+          whiteSpace: "normal",
           "&:hover": {
-            backgroundColor: theme.palette.primary.light
+            backgroundColor: theme.palette.primary.main
+          },
+          "&:focus, &:active": {
+            borderRadius: 0,
+            boxShadow: props.multiple ? "none" : "0 0 ".concat(theme.spacing(0.4), " #4fa1f0"),
+            "&:hover": {
+              backgroundColor: theme.palette.primary.main
+            }
           }
         }
-      }
+      }, props.autoWidth ? {
+        minWidth: "auto !important",
+        width: "auto !important"
+      } : {});
     },
     label: {
       fontSize: theme.typography.fontSize,
@@ -136,6 +146,12 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
       color: theme.palette.text.primary,
       backgroundColor: theme.palette.grey.light,
       border: 0
+    },
+    formControl: function formControl(props) {
+      return {
+        maxWidth: theme.spacing(props.multipleWidthSpacing),
+        minWidth: theme.spacing(props.multipleWidthSpacing)
+      };
     }
   };
 });
@@ -185,13 +201,18 @@ __signature__(SelectIconButton, "useStyles{classes}", function () {
 __signature__(SelectIconButton, "useStyles{classes}", function () {
   return [useStyles];
 });
-var renderMultipleValues = function renderMultipleValues(selected) {
-  return selected == null ? void 0 : selected.join(", ");
+var renderMultipleValues = exports.renderMultipleValues = function renderMultipleValues(value, options) {
+  return options.filter(function (x) {
+    return value.indexOf(x.value) !== -1;
+  }).map(function (x) {
+    return x.label;
+  }).join(", ");
 };
 var selectEmptyValue = "~~#~~";
 var Select = function Select(_ref) {
   var _selectProps$get;
-  var options = _ref.options,
+  var _ref$options = _ref.options,
+    options = _ref$options === void 0 ? [] : _ref$options,
     selectProps = _ref.selectProps,
     children = _ref.children;
   if ((0, _SelectProps.isSelectProps)(selectProps) === false) {
@@ -202,7 +223,6 @@ var Select = function Select(_ref) {
     open = _useState2[0],
     setOpen = _useState2[1];
   var ref = (0, _react.useRef)(null);
-  var classes = useStyles();
   var update = selectProps == null ? void 0 : selectProps.get(_SelectProps.default.propNames.update);
   var value = (_selectProps$get = selectProps == null ? void 0 : selectProps.get(_SelectProps.default.propNames.value)) != null ? _selectProps$get : "";
   var sortType = (selectProps == null ? void 0 : selectProps.get(_SelectProps.default.propNames.sortType)) || _SelectProps.sortTypeEnum.none;
@@ -215,129 +235,159 @@ var Select = function Select(_ref) {
   var native = selectProps == null ? void 0 : selectProps.get(_SelectProps.default.propNames.native);
   var onClose = selectProps == null ? void 0 : selectProps.get(_SelectProps.default.propNames.onClose);
   var inputProps = selectProps == null ? void 0 : selectProps.get(_SelectProps.default.propNames.inputProps);
-  var multiple = selectProps == null ? void 0 : selectProps.get(_SelectProps.default.propNames.multiple);
+  var multiple = (selectProps == null ? void 0 : selectProps.get(_SelectProps.default.propNames.multiple)) || false;
+  var renderValue = selectProps == null ? void 0 : selectProps.get(_SelectProps.default.propNames.renderValue);
+  var autoWidth = selectProps == null ? void 0 : selectProps.get(_SelectProps.default.propNames.autoWidth);
+  var autoFocus = selectProps == null ? void 0 : selectProps.get(_SelectProps.default.propNames.autoFocus);
+  var multipleSelectWidth = selectProps == null ? void 0 : selectProps.get(_SelectProps.default.propNames.multipleSelectWidth);
   var hasError = !!error;
-  if (sortType === _SelectProps.sortTypeEnum.numeric) {
-    options.sort(function (a, b) {
-      return a.sortOrder.localeCompare(b.sortOrder, undefined, {
-        numeric: true,
-        sensitivity: "base"
+  var windowSize = (0, _useWindowSize.default)();
+
+  // When too many elements are selected from the list, the component can be longer than the screen, not very convenient
+  // We need a fix length unfortunately, for large screen, we use 100% of the multipleSelectWidth, for medium length, 75%
+  // But for very small width, we use the inner width of the browser minus 150px (completely arbitrary value), otherwise
+  // the drop-down is too large and hard to read
+  var multipleSelectWidthFactor = windowSize.innerWidth > 1200 ? 1 : 0.75;
+  var multipleWidthSpacing = windowSize.innerWidth > 750 ? multipleSelectWidth / 10 * multipleSelectWidthFactor : (windowSize.innerWidth - 150) / 10;
+  var classes = useStyles({
+    multiple: multiple,
+    autoWidth: autoWidth,
+    multipleWidthSpacing: multipleWidthSpacing
+  });
+  var buildOptionsItems = function buildOptionsItems() {
+    var allOptions = [].concat(options);
+    if (sortType === _SelectProps.sortTypeEnum.numeric) {
+      allOptions.sort(function (a, b) {
+        return a.sortOrder.localeCompare(b.sortOrder, undefined, {
+          numeric: true,
+          sensitivity: "base"
+        });
       });
-    });
-  } else if (sortType === _SelectProps.sortTypeEnum.default) {
-    options.sort(function (a, b) {
-      return a.sortOrder > b.sortOrder ? 1 : -1;
-    });
-  } else if (sortType === _SelectProps.sortTypeEnum.alphabetical) {
-    options.sort(function (a, b) {
-      if (a.value === selectEmptyValue) {
-        return -1;
-      }
-      if (b.value === selectEmptyValue) {
-        return 1;
+    } else if (sortType === _SelectProps.sortTypeEnum.default) {
+      allOptions.sort(function (a, b) {
+        return a.sortOrder > b.sortOrder ? 1 : -1;
+      });
+    } else if (sortType === _SelectProps.sortTypeEnum.alphabetical) {
+      allOptions.sort(function (a, b) {
+        if (a.value === selectEmptyValue) {
+          return -1;
+        }
+        if (b.value === selectEmptyValue) {
+          return 1;
+        }
+        return a.label.localeCompare(b.label);
+      });
+    }
+    if (showAllValue && showAllLabel) {
+      allOptions.unshift({
+        value: showAllValue,
+        label: showAllLabel
+      });
+    }
+    return allOptions.map(function (option) {
+      var clss = option != null && option.level ? classes["level" + option.level] : "";
+      var appliedClasses = (0, _classnames.default)(classes.baseItem, clss);
+      var labelClss = (0, _classnames.default)(_defineProperty(_defineProperty({}, classes.label, true), classes.emptyLabel, option.value === "" || option.value === selectEmptyValue));
+      var disabled = !!option.disabled;
+      var groupHeader = !!option.isGroupHeader;
+      if (groupHeader) {
+        return /*#__PURE__*/_react.default.createElement(_core.ListSubheader, {
+          key: option.value,
+          className: appliedClasses
+        }, option.label);
+      } else {
+        return /*#__PURE__*/_react.default.createElement(_MenuItem.default, {
+          key: option.value,
+          value: option.value,
+          className: appliedClasses,
+          disabled: disabled
+        }, /*#__PURE__*/_react.default.createElement(_TooltippedTypography.default, {
+          noWrap: true,
+          className: labelClss,
+          children: option.label,
+          titleValue: option.label
+        }));
       }
-      return a.label.localeCompare(b.label);
     });
-  }
-  if (showAllValue && showAllLabel) {
-    options.unshift({
-      value: showAllValue,
-      label: showAllLabel
-    });
-  }
+  };
   var handleChange = function handleChange(event) {
     update(event.target.value);
   };
   var defaultMenuProps = _objectSpread(_objectSpread({
     classes: {
       paper: (0, _classnames.default)(classes.selectPaper, selectProps == null ? void 0 : selectProps.getStyle(_SelectProps.default.ruleNames.paper))
-    }
+    },
+    autoFocus: autoFocus
   }, MenuProps), positionOverride);
   var iconSelectMenuProps = _objectSpread(_objectSpread({
     classes: {
       paper: (0, _classnames.default)(classes.selectPaper, selectProps == null ? void 0 : selectProps.getStyle(_SelectProps.default.ruleNames.paper))
-    }
+    },
+    autoFocus: autoFocus
   }, positionOverride), getIconButtonMenuProps(ref.current));
-  var items = options == null ? void 0 : options.map(function (option) {
-    var clss = option != null && option.level ? classes["level" + option.level] : "";
-    var appliedClasses = (0, _classnames.default)(classes.baseItem, clss);
-    var labelClss = (0, _classnames.default)(_defineProperty(_defineProperty({}, classes.label, true), classes.emptyLabel, option.value === "" || option.value === selectEmptyValue));
-    var disabled = !!option.disabled;
-    var groupHeader = !!option.isGroupHeader;
-    if (groupHeader) {
-      return /*#__PURE__*/_react.default.createElement(_core.ListSubheader, {
-        key: option.value,
-        className: appliedClasses
-      }, option.label);
-    } else {
-      return /*#__PURE__*/_react.default.createElement(_MenuItem.default, {
-        key: option.value,
-        value: option.value,
-        className: appliedClasses,
-        disabled: disabled
-      }, /*#__PURE__*/_react.default.createElement(_TooltippedTypography.default, {
-        noWrap: true,
-        className: labelClss,
-        children: option.label,
-        titleValue: option.label
-      }));
-    }
-  });
-  var defaultSelect = /*#__PURE__*/_react.default.createElement(_Select.default, {
+  var items = native ? null : buildOptionsItems();
+  var iconSelect = isIconSelect && /*#__PURE__*/_react.default.createElement(_Select.default, {
+    open: open,
     value: value,
+    ref: ref,
     onChange: handleChange,
-    onClose: onClose,
     disableUnderline: true,
-    IconComponent: SelectIcon,
-    MenuProps: defaultMenuProps,
+    IconComponent: SelectIconButton,
+    MenuProps: iconSelectMenuProps,
     disabled: disabled,
     error: hasError,
     native: native,
     inputProps: inputProps,
     multiple: multiple,
-    renderValue: multiple ? renderMultipleValues : undefined,
     classes: {
       icon: classes.icon,
       root: selectProps == null ? void 0 : selectProps.getStyle(_SelectProps.default.ruleNames.root),
+      select: classes.displayNone,
       disabled: classes.disabled
+    },
+    onClick: function onClick() {
+      return setOpen(!open);
     }
-  }, native ? children : items);
-  var iconSelect = /*#__PURE__*/_react.default.createElement(_Select.default, {
-    open: open,
+  }, items != null ? items : children);
+
+  // Render the normal select is the icon one is NULL
+  var selectToRender = iconSelect || /*#__PURE__*/_react.default.createElement(_Select.default, {
     value: value,
-    ref: ref,
     onChange: handleChange,
+    onClose: onClose,
     disableUnderline: true,
-    IconComponent: SelectIconButton,
-    MenuProps: iconSelectMenuProps,
+    IconComponent: SelectIcon,
+    autoWidth: autoWidth,
+    MenuProps: defaultMenuProps,
     disabled: disabled,
     error: hasError,
     native: native,
     inputProps: inputProps,
     multiple: multiple,
-    renderValue: multiple ? renderMultipleValues : undefined,
+    renderValue: renderValue != null ? renderValue : multiple ? function (value) {
+      return renderMultipleValues(value, options);
+    } : undefined,
     classes: {
       icon: classes.icon,
       root: selectProps == null ? void 0 : selectProps.getStyle(_SelectProps.default.ruleNames.root),
-      select: classes.displayNone,
       disabled: classes.disabled
-    },
-    onClick: function onClick() {
-      return setOpen(!open);
     }
-  }, native ? children : items);
-  var select = isIconSelect ? iconSelect : defaultSelect;
-  return error && /*#__PURE__*/_react.default.createElement("div", {
+  }, items != null ? items : children);
+  var selectToRenderWithError = hasError && /*#__PURE__*/_react.default.createElement("div", {
     className: classes.container
-  }, select, /*#__PURE__*/_react.default.createElement("div", {
+  }, selectToRender, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(classes.errorText)
-  }, error)) || select;
+  }, error));
+  var selectControl = selectToRenderWithError || selectToRender;
+  return multiple === false ? selectControl : /*#__PURE__*/_react.default.createElement(_FormControl.default, {
+    className: classes.formControl
+  }, selectControl);
 };
-__signature__(Select, "useState{[open, setOpen](false)}\nuseRef{ref}\nuseStyles{classes}", function () {
-  return [useStyles];
+__signature__(Select, "useState{[open, setOpen](false)}\nuseRef{ref}\nuseWindowSize{windowSize}\nuseStyles{classes}", function () {
+  return [_useWindowSize.default, useStyles];
 });
-__signature__(Select, "useState{[open, setOpen](false)}\nuseRef{ref}\nuseStyles{classes}", function () {
-  return [useStyles];
+__signature__(Select, "useState{[open, setOpen](false)}\nuseRef{ref}\nuseWindowSize{windowSize}\nuseStyles{classes}", function () {
+  return [_useWindowSize.default, useStyles];
 });
 var _default = Select;
 var _default2 = _default;

package/dist/components/MaterialUI/Inputs/SelectProps.js

@@ -45,7 +45,11 @@ var SelectProps = /*#__PURE__*/function (_ComponentProps) {
     _this.componentProps.set(_this.constructor.propNames.onClose, null);
     _this.componentProps.set(_this.constructor.propNames.native, null);
     _this.componentProps.set(_this.constructor.propNames.inputProps, null);
-    _this.componentProps.set(_this.constructor.propNames.multiple, null);
+    _this.componentProps.set(_this.constructor.propNames.multiple, false);
+    _this.componentProps.set(_this.constructor.propNames.autoWidth, true);
+    _this.componentProps.set(_this.constructor.propNames.autoFocus, true);
+    _this.componentProps.set(_this.constructor.propNames.renderValue, null);
+    _this.componentProps.set(_this.constructor.propNames.multipleSelectWidth, 700);
     _this.componentClasses.set(_this.constructor.ruleNames.root, null);
     _this.componentClasses.set(_this.constructor.ruleNames.paper, null);
     _this._isSelectProps = true;
@@ -73,7 +77,11 @@ _defineProperty(SelectProps, "propNames", {
   onClose: "onClose",
   native: "native",
   inputProps: "inputProps",
-  multiple: "multiple"
+  multiple: "multiple",
+  autoWidth: "autoWidth",
+  autoFocus: "autoFocus",
+  renderValue: "renderValue",
+  multipleSelectWidth: "multipleSelectWidth"
 });
 _defineProperty(SelectProps, "ruleNames", {
   root: "root",

package/dist/hocs/withScrollBox.js

@@ -37,21 +37,16 @@ var withScrollBox = function withScrollBox(WrappedComp) {
     var onScroll = _ref.onScroll,
       otherProps = _objectWithoutProperties(_ref, _excluded);
     var classes = useStyles();
-    var mergeRef = function mergeRef(node, measureRef) {
-      measureRef(node);
-      if (externalRef) externalRef.current = node;
-    };
     return /*#__PURE__*/_react.default.createElement(_reactMeasure.default, {
-      bounds: true
+      bounds: true,
+      innerRef: externalRef
     }, function (_ref2) {
       var measureRef = _ref2.measureRef,
         contentRect = _ref2.contentRect;
       return /*#__PURE__*/_react.default.createElement("div", {
         className: classes.scrollbox,
         onScroll: onScroll,
-        ref: function ref(node) {
-          return mergeRef(node, measureRef);
-        }
+        ref: measureRef
       }, /*#__PURE__*/_react.default.createElement(WrappedComp, _extends({}, otherProps, {
         height: (0, _utils.safeGet)(contentRect, "bounds", "height"),
         width: (0, _utils.safeGet)(contentRect, "bounds", "width")