@rio-cloud/rio-uikit 0.15.0 → 0.16.0-beta-2

package/lib/components/dropdown/ButtonDropdown.js

@@ -7,33 +7,31 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = Container;
+exports.default = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _react = _interopRequireWildcard(require("react"));
 
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+var _reactDom = _interopRequireDefault(require("react-dom"));
 
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _reactPopper = require("react-popper");
 
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _classnames = _interopRequireDefault(require("classnames"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _isNil = _interopRequireDefault(require("lodash/fp/isNil"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _noop = _interopRequireDefault(require("lodash/fp/noop"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
+var _logDeprecatedWarnings = _interopRequireDefault(require("../../utils/logDeprecatedWarnings"));
 
-var _reactOnclickoutside = _interopRequireDefault(require("react-onclickoutside"));
+var _portalRoot = require("../../utils/portalRoot");
 
-var _isNil = _interopRequireDefault(require("lodash/fp/isNil"));
+var _useClickOutside = _interopRequireDefault(require("../../hooks/useClickOutside"));
 
 var _getMenuItems = _interopRequireDefault(require("../menuItems/getMenuItems"));
 
@@ -41,8 +39,6 @@ var _MenuItems = _interopRequireDefault(require("../menuItems/MenuItems"));
 
 var _menuItemsPropTypes = _interopRequireDefault(require("./menuItemsPropTypes"));
 
-var _getDropDirection = _interopRequireDefault(require("../../utils/getDropDirection"));
-
 var _DropdownToggleButton = _interopRequireDefault(require("./DropdownToggleButton"));
 
 var _SplitCaretButton = _interopRequireDefault(require("./SplitCaretButton"));
@@ -53,170 +49,145 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+var getPlacement = function getPlacement(pullRight, dropup) {
+  if (pullRight && dropup) {
+    return 'top-end';
+  }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  if (!pullRight && dropup) {
+    return 'top-start';
+  }
 
-var ButtonDropdown = /*#__PURE__*/function (_PureComponent) {
-  (0, _inherits2.default)(ButtonDropdown, _PureComponent);
+  if (pullRight && !dropup) {
+    return 'bottom-end';
+  }
 
-  var _super = _createSuper(ButtonDropdown);
+  return 'bottom-start';
+};
 
-  function ButtonDropdown(props) {
-    var _this;
+var ButtonDropdown = function ButtonDropdown(props) {
+  var id = props.id,
+      items = props.items,
+      bsSize = props.bsSize,
+      bsStyle = props.bsStyle,
+      disabled = props.disabled,
+      iconOnly = props.iconOnly,
+      title = props.title,
+      splitButton = props.splitButton,
+      customDropdown = props.customDropdown,
+      toggleClassName = props.toggleClassName,
+      dropdownClassName = props.dropdownClassName,
+      className = props.className,
+      open = props.open,
+      dropup = props.dropup,
+      pullRight = props.pullRight,
+      noCaret = props.noCaret,
+      onOpen = props.onOpen,
+      onClose = props.onClose,
+      onLabelButtonClick = props.onLabelButtonClick,
+      usePortal = props.usePortal,
+      popperConfig = props.popperConfig;
+
+  var _useState = (0, _react.useState)(open),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      internalOpen = _useState2[0],
+      setInternalOpen = _useState2[1];
+
+  var _React$useState = _react.default.useState(null),
+      _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
+      refDropdownToggle = _React$useState2[0],
+      setRefDropdownToggle = _React$useState2[1];
+
+  var _React$useState3 = _react.default.useState(null),
+      _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
+      refDropdownMenu = _React$useState4[0],
+      setRefDropdownMenu = _React$useState4[1];
+
+  var defaultPopperConfig = {
+    placement: getPlacement(pullRight, dropup),
+    modifiers: []
+  };
+
+  var _usePopper = (0, _reactPopper.usePopper)(refDropdownToggle, refDropdownMenu, popperConfig || defaultPopperConfig),
+      styles = _usePopper.styles,
+      attributes = _usePopper.attributes;
+
+  var wrapperRef = (0, _useClickOutside.default)(function () {
+    return closeMenu();
+  });
+  var dropdownRoot = (0, _portalRoot.getOrCreatePortalRoot)();
+  var isUncontrolled = (0, _isNil.default)(open);
+  var shouldShowCaret = !noCaret && !splitButton && !iconOnly;
+  (0, _react.useEffect)(function () {
+    if (!isUncontrolled) {
+      // console.log('update open from outside: ' + open);
+      setInternalOpen(open);
+    }
+  }, [isUncontrolled, open]);
 
-    (0, _classCallCheck2.default)(this, ButtonDropdown);
-    _this = _super.call(this, props);
-    _this.isUncontrolled = (0, _isNil.default)(props.open);
-    _this.state = {
-      open: _this.isUncontrolled && props.open,
-      dropup: props.dropup,
-      pullRight: props.pullRight
-    };
-    _this.toggleOpen = _this.toggleOpen.bind((0, _assertThisInitialized2.default)(_this));
-    _this.handleSplitLabelButtonClick = _this.handleSplitLabelButtonClick.bind((0, _assertThisInitialized2.default)(_this));
-    _this.refDropdownMenu = /*#__PURE__*/_react.default.createRef();
-    _this.refDropdownToggle = /*#__PURE__*/_react.default.createRef();
-    return _this;
-  }
+  var toggleOpen = function toggleOpen(event) {
+    var isOpen = isUncontrolled ? internalOpen : open;
 
-  (0, _createClass2.default)(ButtonDropdown, [{
-    key: "isAutoDropActive",
-    value: function isAutoDropActive() {
-      return !(!this.props.autoDropDirection || this.props.dropup || this.props.pullRight);
-    }
-  }, {
-    key: "toggleOpen",
-    value: function toggleOpen(event) {
-      var _ref = this.isUncontrolled ? this.state : this.props,
-          open = _ref.open;
-
-      if (open) {
-        this.closeMenu();
-      } else {
-        this.openMenu(event);
-      }
-    }
-  }, {
-    key: "openMenu",
-    value: function openMenu(event) {
-      var toggleNode = this.refDropdownToggle.current;
-      var menuNode = this.refDropdownMenu.current;
-      var dropDirection = this.isAutoDropActive() ? (0, _getDropDirection.default)(toggleNode, menuNode) : {};
-
-      if (this.isUncontrolled) {
-        this.setState(_objectSpread({
-          open: true
-        }, dropDirection));
-      } else {
-        this.setState(_objectSpread({}, dropDirection));
-      }
-
-      this.props.enableOnClickOutside();
-      this.props.onOpen(event);
-    }
-  }, {
-    key: "closeMenu",
-    value: function closeMenu() {
-      if (this.isUncontrolled) {
-        this.setState({
-          open: false
-        });
-      }
-
-      this.props.disableOnClickOutside();
-      this.props.onClose();
-    }
-  }, {
-    key: "handleClickOutside",
-    value: function handleClickOutside() {
-      this.closeMenu();
-    }
-  }, {
-    key: "handleSplitLabelButtonClick",
-    value: function handleSplitLabelButtonClick() {
-      this.closeMenu();
-
-      if (this.props.onLabelButtonClick) {
-        this.props.onLabelButtonClick();
-      }
-    }
-  }, {
-    key: "isDropUp",
-    value: function isDropUp() {
-      return this.isAutoDropActive() ? this.state.dropup : this.props.dropup;
+    if (isOpen) {
+      closeMenu();
+    } else {
+      openMenu(event);
     }
-  }, {
-    key: "isPullRight",
-    value: function isPullRight() {
-      return this.isAutoDropActive() ? this.state.pullRight : this.props.pullRight;
-    }
-  }, {
-    key: "shouldShowCaret",
-    value: function shouldShowCaret() {
-      var _this$props = this.props,
-          iconOnly = _this$props.iconOnly,
-          noCaret = _this$props.noCaret,
-          splitButton = _this$props.splitButton;
-      return !noCaret && !splitButton && !iconOnly;
-    }
-  }, {
-    key: "isOpen",
-    value: function isOpen() {
-      var _ref2 = this.isUncontrolled ? this.state : this.props,
-          open = _ref2.open;
+  };
 
-      return open;
+  var openMenu = function openMenu(event) {
+    if (isUncontrolled) {
+      setInternalOpen(true);
     }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$props2 = this.props,
-          id = _this$props2.id,
-          items = _this$props2.items,
-          bsSize = _this$props2.bsSize,
-          bsStyle = _this$props2.bsStyle,
-          disabled = _this$props2.disabled,
-          iconOnly = _this$props2.iconOnly,
-          title = _this$props2.title,
-          splitButton = _this$props2.splitButton,
-          customDropdown = _this$props2.customDropdown,
-          toggleClassName = _this$props2.toggleClassName,
-          dropdownClassName = _this$props2.dropdownClassName,
-          className = _this$props2.className;
-      var wrapperClasses = (0, _classnames.default)('dropdown', 'btn-group', this.isOpen() && 'open', this.isDropUp() && 'dropup', className);
-      var handleDropdownButtonClick = splitButton ? this.handleSplitLabelButtonClick : this.toggleOpen;
-      return /*#__PURE__*/_react.default.createElement("div", {
-        className: wrapperClasses
-      }, /*#__PURE__*/_react.default.createElement(_DropdownToggleButton.default, {
-        id: id,
-        splitButton: splitButton,
-        bsStyle: bsStyle,
-        bsSize: bsSize,
-        iconOnly: iconOnly,
-        disabled: disabled,
-        ref: this.refDropdownToggle,
-        onClick: handleDropdownButtonClick,
-        className: toggleClassName
-      }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, title, this.shouldShowCaret() && /*#__PURE__*/_react.default.createElement(_Caret.default, null))), splitButton && /*#__PURE__*/_react.default.createElement(_SplitCaretButton.default, {
-        id: id,
-        bsStyle: bsStyle,
-        disabled: disabled,
-        className: toggleClassName,
-        onClick: this.toggleOpen
-      }), /*#__PURE__*/_react.default.createElement(_MenuItems.default, {
-        className: dropdownClassName,
-        pullRight: this.isPullRight(),
-        ref: this.refDropdownMenu
-      }, customDropdown ? customDropdown : (0, _getMenuItems.default)(items, this.toggleOpen)));
+
+    onOpen(event);
+  };
+
+  var closeMenu = function closeMenu() {
+    if (isUncontrolled) {
+      setInternalOpen(false);
     }
-  }]);
-  return ButtonDropdown;
-}(_react.PureComponent);
+
+    onClose();
+  };
+
+  var handleSplitLabelButtonClick = function handleSplitLabelButtonClick() {
+    closeMenu();
+    onLabelButtonClick();
+  };
+
+  var handleDropdownButtonClick = splitButton ? handleSplitLabelButtonClick : toggleOpen;
+  var isOpen = isUncontrolled ? internalOpen : open;
+  var wrapperClasses = (0, _classnames.default)('dropdown', 'btn-group', isOpen && 'open', className);
+  var dropdownClasses = (0, _classnames.default)(usePortal && 'dropdown-portal', dropdownClassName);
+
+  var dropdownMenu = /*#__PURE__*/_react.default.createElement(_MenuItems.default, (0, _extends2.default)({
+    className: dropdownClasses,
+    ref: setRefDropdownMenu,
+    style: styles.popper
+  }, attributes.popper), customDropdown ? customDropdown : (0, _getMenuItems.default)(items, toggleOpen));
+
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: wrapperClasses,
+    ref: wrapperRef
+  }, /*#__PURE__*/_react.default.createElement(_DropdownToggleButton.default, {
+    id: id,
+    splitButton: splitButton,
+    bsStyle: bsStyle,
+    bsSize: bsSize,
+    iconOnly: iconOnly,
+    disabled: disabled,
+    ref: setRefDropdownToggle,
+    onClick: handleDropdownButtonClick,
+    className: toggleClassName
+  }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, title, shouldShowCaret && /*#__PURE__*/_react.default.createElement(_Caret.default, null))), splitButton && /*#__PURE__*/_react.default.createElement(_SplitCaretButton.default, {
+    id: id,
+    bsStyle: bsStyle,
+    disabled: disabled,
+    className: toggleClassName,
+    onClick: toggleOpen
+  }), isOpen && usePortal && /*#__PURE__*/_reactDom.default.createPortal(dropdownMenu, dropdownRoot), isOpen && !usePortal && dropdownMenu);
+};
 
 ButtonDropdown.defaultProps = {
   id: Math.random().toString(36).substr(2, 16),
@@ -226,12 +197,13 @@ ButtonDropdown.defaultProps = {
   pullRight: false,
   splitButton: false,
   dropup: false,
-  autoDropDirection: true,
   bsStyle: 'default',
   disabled: false,
-  onOpen: function onOpen() {},
-  onClose: function onClose() {},
+  onOpen: _noop.default,
+  onClose: _noop.default,
+  onLabelButtonClick: _noop.default,
   toggleClassName: '',
+  usePortal: false,
   className: ''
 };
 ButtonDropdown.propTypes = {
@@ -245,7 +217,7 @@ ButtonDropdown.propTypes = {
   iconOnly: _propTypes.default.bool,
   noCaret: _propTypes.default.bool,
   splitButton: _propTypes.default.bool,
-  autoDropDirection: _propTypes.default.bool,
+  usePortal: _propTypes.default.bool,
   items: _menuItemsPropTypes.default.isRequired,
   disabled: _propTypes.default.bool,
   className: _propTypes.default.string,
@@ -253,15 +225,11 @@ ButtonDropdown.propTypes = {
   toggleClassName: _propTypes.default.string,
   onLabelButtonClick: _propTypes.default.func,
   customDropdown: _propTypes.default.node,
+  popperConfig: _propTypes.default.object,
   enableOnClickOutside: _propTypes.default.func,
   disableOnClickOutside: _propTypes.default.func,
   onOpen: _propTypes.default.func,
   onClose: _propTypes.default.func
 };
-var EnhancedComponent = (0, _reactOnclickoutside.default)(ButtonDropdown);
-
-function Container(props) {
-  return /*#__PURE__*/_react.default.createElement(EnhancedComponent, (0, _extends2.default)({}, props, {
-    disableOnClickOutside: true
-  }));
-}
+var _default = ButtonDropdown;
+exports.default = _default;

package/lib/components/listMenu/ListMenu.js

@@ -9,8 +9,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -29,6 +33,8 @@ var _ClearableInput = _interopRequireDefault(require("../clearableInput/Clearabl
 
 var _ExpanderPanel = _interopRequireDefault(require("../expander/ExpanderPanel"));
 
+var _excluded = ["menuItems", "focusFilter", "enableFilter", "filterPlaceholder", "notFoundMessage", "className", "groupClassName", "responsive", "autoClose", "filterKey"];
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -42,11 +48,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var RESIZE_THROTTELING = 10;
 var MOBILE_MAX_WIDTH = 580;
 
-var filterMenuItems = function filterMenuItems(items, value) {
+var filterMenuItems = function filterMenuItems(items, value, filterKey) {
   return items.map(function (menuGroupItem) {
     var groupItems = menuGroupItem.navItems;
     var navItems = groupItems.filter(function (item) {
-      return item.key.toLowerCase().includes(value.toLowerCase());
+      var _item$filterKey;
+
+      return (_item$filterKey = item[filterKey]) === null || _item$filterKey === void 0 ? void 0 : _item$filterKey.toLowerCase().includes(value.toLowerCase());
     });
     return _objectSpread(_objectSpread({}, menuGroupItem), {}, {
       navItems: navItems
@@ -65,7 +73,7 @@ var ListMenuHeader = function ListMenuHeader(_ref) {
   }
 
   return /*#__PURE__*/_react.default.createElement("li", {
-    className: 'ListMenuHeader'
+    className: "ListMenuHeader"
   }, groupNavItem ? groupNavItem : /*#__PURE__*/_react.default.createElement("span", {
     className: className
   }, group));
@@ -73,9 +81,12 @@ var ListMenuHeader = function ListMenuHeader(_ref) {
 
 var ListMenuItem = function ListMenuItem(_ref2) {
   var disabled = _ref2.disabled,
+      _ref2$isSubItem = _ref2.isSubItem,
+      isSubItem = _ref2$isSubItem === void 0 ? false : _ref2$isSubItem,
       children = _ref2.children;
+  var classes = (0, _classnames.default)(disabled && 'disabled', isSubItem && 'subitem');
   return /*#__PURE__*/_react.default.createElement("li", {
-    className: disabled ? 'disabled' : ''
+    className: classes
   }, children);
 };
 
@@ -92,7 +103,8 @@ var ListMenuGroup = function ListMenuGroup(_ref3) {
   }, /*#__PURE__*/_react.default.createElement(ListMenuHeader, menuGroup), menuGroup.navItems.map(function (item) {
     return /*#__PURE__*/_react.default.createElement(ListMenuItem, {
       key: item.key,
-      disabled: item.disabled
+      disabled: item.disabled,
+      isSubItem: item.isSubItem
     }, item.item);
   }));
 };
@@ -100,7 +112,7 @@ var ListMenuGroup = function ListMenuGroup(_ref3) {
 var NotFoundMessage = function NotFoundMessage(_ref4) {
   var notFoundMessage = _ref4.notFoundMessage;
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: 'padding-top-25 text-center text-color-gray'
+    className: "padding-top-25 text-center text-color-gray"
   }, notFoundMessage);
 };
 
@@ -113,7 +125,9 @@ var ListMenu = function ListMenu(props) {
       className = props.className,
       groupClassName = props.groupClassName,
       responsive = props.responsive,
-      autoClose = props.autoClose;
+      autoClose = props.autoClose,
+      filterKey = props.filterKey,
+      remainingProps = (0, _objectWithoutProperties2.default)(props, _excluded);
 
   var _useState = (0, _react.useState)(''),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -145,9 +159,9 @@ var ListMenu = function ListMenu(props) {
           activeElement = _listRef$current$getE2[0];
 
       setMobileHeader( /*#__PURE__*/_react.default.createElement("div", {
-        className: 'display-flex align-items-center'
+        className: "display-flex align-items-center"
       }, /*#__PURE__*/_react.default.createElement("span", {
-        className: 'rioglyph rioglyph-menu-hamburger margin-right-10'
+        className: "rioglyph rioglyph-menu-hamburger margin-right-10"
       }), /*#__PURE__*/_react.default.createElement("span", null, activeElement && activeElement.innerText)));
     }
   };
@@ -201,27 +215,27 @@ var ListMenu = function ListMenu(props) {
     });
   };
 
-  var filteredMenuItems = filterMenuItems(menuItems, filterValue);
+  var filteredMenuItems = filterMenuItems(menuItems, filterValue, filterKey);
 
   var handleExpanderBodyClick = function handleExpanderBodyClick(event) {
     var isListItem = event.target.parentElement.tagName.toLowerCase() === 'li';
     autoClose && isListItem && setIsExpanderOpen(false);
   };
 
-  var formClassNames = (0, _classnames.default)('from-group', 'padding-left-15', 'padding-right-15', 'padding-bottom-15', 'position-sticky', 'top-0');
+  var formClassNames = (0, _classnames.default)('form-group margin-bottom-5', 'padding-left-15', 'padding-right-15', 'padding-bottom-15', 'position-sticky', 'top-0');
 
-  var listMenu = /*#__PURE__*/_react.default.createElement("div", {
+  var listMenu = /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, remainingProps, {
     className: "ListMenu ".concat(className),
     ref: listRef
-  }, enableFilter && /*#__PURE__*/_react.default.createElement("div", {
+  }), enableFilter && /*#__PURE__*/_react.default.createElement("div", {
     className: formClassNames
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: 'input-group width-100pct'
+    className: "input-group width-100pct"
   }, /*#__PURE__*/_react.default.createElement("span", {
-    className: 'input-group-addon'
+    className: "input-group-addon"
   }, /*#__PURE__*/_react.default.createElement("span", {
-    className: 'rioglyph rioglyph-search',
-    "aria-hidden": 'true'
+    className: "rioglyph rioglyph-search",
+    "aria-hidden": "true"
   })), /*#__PURE__*/_react.default.createElement(_ClearableInput.default, {
     value: filterValue,
     inputRef: inputRef,
@@ -232,23 +246,23 @@ var ListMenu = function ListMenu(props) {
     notFoundMessage: notFoundMessage
   }), filteredMenuItems.map(function (menuGroup, index) {
     return /*#__PURE__*/_react.default.createElement(ListMenuGroup, {
+      key: index,
       className: groupClassName,
-      menuGroup: menuGroup,
-      key: index
+      menuGroup: menuGroup
     });
   }));
 
   if (responsive && isMobileMode) {
     return /*#__PURE__*/_react.default.createElement(_ExpanderPanel.default, {
       title: mobileHeader,
-      bsStyle: 'default',
+      bsStyle: "default",
       open: isExpanderOpen,
       onToggle: function onToggle() {
         return setIsExpanderOpen(!isExpanderOpen);
       },
       mountOnEnter: false,
       unmountOnExit: false,
-      className: 'shadow-default'
+      className: "shadow-default"
     }, /*#__PURE__*/_react.default.createElement("div", {
       onClick: handleExpanderBodyClick
     }, listMenu));
@@ -264,7 +278,8 @@ ListMenu.defaultProps = {
   className: '',
   groupClassName: '',
   responsive: true,
-  autoClose: true
+  autoClose: true,
+  filterKey: 'key'
 };
 ListMenu.propTypes = {
   menuItems: _propTypes.default.arrayOf(_propTypes.default.shape({
@@ -274,10 +289,12 @@ ListMenu.propTypes = {
       key: _propTypes.default.string.isRequired,
       item: _propTypes.default.node.isRequired,
       disabled: _propTypes.default.bool
-    })).isRequired
+    })).isRequired,
+    isSubItem: _propTypes.default.bool
   })).isRequired,
   enableFilter: _propTypes.default.bool,
   focusFilter: _propTypes.default.bool,
+  filterKey: _propTypes.default.string,
   filterPlaceholder: _propTypes.default.string,
   notFoundMessage: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
   groupClassName: _propTypes.default.string,

package/lib/components/map/components/features/old/MapSettings.js

@@ -29,9 +29,9 @@ var _isString = _interopRequireDefault(require("lodash/fp/isString"));
 
 var _map = _interopRequireDefault(require("lodash/fp/map"));
 
-var _icon_map_settings_active = _interopRequireDefault(require("./assets/icon_map_settings_active.svg"));
+var _icon_map_settings_active = require("./assets/icon_map_settings_active.svg");
 
-var _icon_map_settings_inactive = _interopRequireDefault(require("./assets/icon_map_settings_inactive.svg"));
+var _icon_map_settings_inactive = require("./assets/icon_map_settings_inactive.svg");
 
 var _MapTypeSettings = _interopRequireDefault(require("./settings/MapTypeSettings"));
 
@@ -90,12 +90,12 @@ var MapSettings = /*#__PURE__*/function (_React$Component) {
 
       var getMapSettingsTile = function getMapSettingsTile() {
         var mapSettingsTile = /*#__PURE__*/_react.default.createElement("div", {
-          className: 'MapSettingsTile MapSettingsToggle bg-white padding-5 shadow-smooth cursor-pointer',
+          className: "MapSettingsTile MapSettingsToggle bg-white padding-5 shadow-smooth cursor-pointer",
           onClick: _this2.handleToggleSettingsMenu,
           title: (0, _isString.default)(mapSettingsTooltip) ? mapSettingsTooltip : null
-        }, /*#__PURE__*/_react.default.createElement(_icon_map_settings_active.default, {
+        }, /*#__PURE__*/_react.default.createElement(_icon_map_settings_active.ReactComponent, {
           className: mapSettingsIconClasses
-        }), /*#__PURE__*/_react.default.createElement(_icon_map_settings_inactive.default, {
+        }), /*#__PURE__*/_react.default.createElement(_icon_map_settings_inactive.ReactComponent, {
           className: mapSettingsIconInactiveClasses
         }));