@kdcloudjs/kdesign 1.7.1 → 1.7.3

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.7.0
+ *   @kdcloudjs/kdesign v1.7.2
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -9078,13 +9078,13 @@ var colorTypes = [{
   value: '#b2b2b2'
 }, {
   type: 'HSB',
-  value: 'hsb(0,0%,70%)'
+  value: 'hsb(0, 0%, 70%)'
 }, {
   type: 'RGB',
-  value: 'rgb(178,178,178)'
+  value: 'rgb(178, 178, 178)'
 }, {
   type: 'HSL',
-  value: 'hsl(0,0%,70%)'
+  value: 'hsl(0, 0%, 70%)'
 }];
 
 /***/ }),
@@ -9936,6 +9936,7 @@ var compDefaultProps = {
     placeholder: '请输入需要搜索的内容',
     optionLabelProp: 'title',
     treeNodeFilterProp: 'title',
+    treeExpandOnClickNode: true,
     showSearch: true,
     switcherIcon: function switcherIcon() {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__["createElement"](_index__WEBPACK_IMPORTED_MODULE_2__["Icon"], {
@@ -15617,7 +15618,7 @@ var findItem = function findItem(element) {
   }
 };
 var Dropdown = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["forwardRef"](function (props, ref) {
-  var _menu$props, _menu$props2, _menu$props3, _menu$props4, _menu$props5, _menu$props5$children, _menu$props5$children2, _menu$props6, _menu$props6$children, _menu$props6$children2, _menu$props7, _menu$props7$children, _menu$props7$children2, _menu$props7$children3, _menu$props8;
+  var _menu$props, _menu$props2, _menu$props3;
   var _React$useContext = react__WEBPACK_IMPORTED_MODULE_11__["useContext"](_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_13__["default"]),
     getPrefixCls = _React$useContext.getPrefixCls,
     pkgPrefixCls = _React$useContext.prefixCls,
@@ -15677,12 +15678,7 @@ var Dropdown = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["forwardRef"](fu
     onClick: handleItemClick,
     selectable: menuSelectable
   });
-  var isItem = react__WEBPACK_IMPORTED_MODULE_11__["Children"].count((_menu$props4 = menu.props) === null || _menu$props4 === void 0 ? void 0 : _menu$props4.children) === 1 && ((_menu$props5 = menu.props) === null || _menu$props5 === void 0 ? void 0 : (_menu$props5$children = _menu$props5.children) === null || _menu$props5$children === void 0 ? void 0 : (_menu$props5$children2 = _menu$props5$children.type) === null || _menu$props5$children2 === void 0 ? void 0 : _menu$props5$children2.displayName) === 'DropdownMenuItem' || Array.isArray((_menu$props6 = menu.props) === null || _menu$props6 === void 0 ? void 0 : (_menu$props6$children = _menu$props6.children) === null || _menu$props6$children === void 0 ? void 0 : (_menu$props6$children2 = _menu$props6$children.props) === null || _menu$props6$children2 === void 0 ? void 0 : _menu$props6$children2.children) || ((_menu$props7 = menu.props) === null || _menu$props7 === void 0 ? void 0 : (_menu$props7$children = _menu$props7.children) === null || _menu$props7$children === void 0 ? void 0 : (_menu$props7$children2 = _menu$props7$children.props) === null || _menu$props7$children2 === void 0 ? void 0 : (_menu$props7$children3 = _menu$props7$children2.children.type) === null || _menu$props7$children3 === void 0 ? void 0 : _menu$props7$children3.displayName) === 'DropdownMenuItem';
-  var menuElement = isMenu ? Array.isArray((_menu$props8 = menu.props) === null || _menu$props8 === void 0 ? void 0 : _menu$props8.children) || isItem ? cloneObj : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["createElement"]("ul", {
-    className: "".concat(prefixCls, "-menu"),
-    onClick: handleItemClick,
-    role: "menu"
-  }, menu.props.children) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["createElement"]("ul", {
+  var menuElement = isMenu ? cloneObj : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["createElement"]("ul", {
     className: "".concat(prefixCls, "-menu"),
     onClick: handleItemClick,
     role: "menu"
@@ -15798,6 +15794,9 @@ var Menu = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["forwardRef"](functio
   // className前缀
   var prefixCls = getPrefixCls(pkgPrefixCls, 'dropdown-menu', customPrefixcls);
   var cloneItem = function cloneItem(item, index) {
+    if (! /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["isValidElement"](item)) {
+      return item;
+    }
     var key = item.key || index;
     var selected = selectable && String(selectedKey) === String(key);
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["cloneElement"](item, {
@@ -24007,30 +24006,34 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
 /* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.array.includes.js */ "./node_modules/core-js/modules/es.array.includes.js");
-/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../index */ "./components/index.tsx");
-/* harmony import */ var _button_button__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../button/button */ "./components/button/button.tsx");
-/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! react-dom */ "react-dom");
-/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(react_dom__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var _utils_type__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../_utils/type */ "./components/_utils/type.ts");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_10__);
-/* harmony import */ var _config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../config-provider/ConfigContext */ "./components/config-provider/ConfigContext.tsx");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
-/* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
-/* harmony import */ var react_draggable__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! react-draggable */ "./node_modules/react-draggable/build/cjs/cjs.js");
-/* harmony import */ var react_draggable__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(react_draggable__WEBPACK_IMPORTED_MODULE_14__);
-/* harmony import */ var _locale_locale__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../locale/locale */ "./components/locale/locale.tsx");
-/* harmony import */ var _utils_hooks__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../_utils/hooks */ "./components/_utils/hooks.tsx");
+/* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @babel/runtime/helpers/objectWithoutProperties */ "./node_modules/@babel/runtime/helpers/objectWithoutProperties.js");
+/* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.array.includes.js */ "./node_modules/core-js/modules/es.array.includes.js");
+/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../index */ "./components/index.tsx");
+/* harmony import */ var _button_button__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../button/button */ "./components/button/button.tsx");
+/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! react-dom */ "react-dom");
+/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(react_dom__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var _utils_type__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../_utils/type */ "./components/_utils/type.ts");
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var _config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../config-provider/ConfigContext */ "./components/config-provider/ConfigContext.tsx");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
+/* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
+/* harmony import */ var react_draggable__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! react-draggable */ "./node_modules/react-draggable/build/cjs/cjs.js");
+/* harmony import */ var react_draggable__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(react_draggable__WEBPACK_IMPORTED_MODULE_15__);
+/* harmony import */ var _locale_locale__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../locale/locale */ "./components/locale/locale.tsx");
+/* harmony import */ var _utils_hooks__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../_utils/hooks */ "./components/_utils/hooks.tsx");
 
 
 
 
+var _excluded = ["body", "bodyClassName", "bodyStyle", "cancelButtonProps", "cancelText", "className", "closable", "closeIcon", "destroyOnClose", "draggable", "focusTriggerAfterClose", "footer", "footerClassName", "footerStyle", "footerBtnOrder", "getContainer", "height", "keyboard", "mask", "maskClosable", "maskStyle", "okButtonProps", "okText", "onCancel", "onOk", "prefixCls", "title", "titleIcon", "type", "visible", "width", "showline", "onDragStart", "onDrag", "onDragStop", "bounds"];
+
 
 
 
@@ -24045,14 +24048,14 @@ __webpack_require__.r(__webpack_exports__);
 
 
 var ConfirmModalTypes = ['confirm', 'normal'];
-var ModalTypes = Object(_utils_type__WEBPACK_IMPORTED_MODULE_9__["tuple"])('confirm', 'warning', 'error', 'normal');
-var Modal = function Modal(props) {
+var ModalTypes = Object(_utils_type__WEBPACK_IMPORTED_MODULE_10__["tuple"])('confirm', 'warning', 'error', 'normal');
+var InternalModal = function InternalModal(props, ref) {
   var _classNames3, _classNames4;
-  var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_5__["useContext"])(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_11__["default"]),
+  var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_6__["useContext"])(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_12__["default"]),
     getPrefixCls = _useContext.getPrefixCls,
     prefixCls = _useContext.prefixCls,
     userDefaultProps = _useContext.compDefaultProps;
-  var modalProps = Object(_utils__WEBPACK_IMPORTED_MODULE_12__["getCompProps"])('Modal', userDefaultProps, props); // 属性需要合并一遍用户定义的默认属性
+  var modalProps = Object(_utils__WEBPACK_IMPORTED_MODULE_13__["getCompProps"])('Modal', userDefaultProps, props); // 属性需要合并一遍用户定义的默认属性
   var body = modalProps.body,
     bodyClassName = modalProps.bodyClassName,
     bodyStyle = modalProps.bodyStyle,
@@ -24084,43 +24087,49 @@ var Modal = function Modal(props) {
     type = modalProps.type,
     visible = modalProps.visible,
     width = modalProps.width,
-    showline = modalProps.showline;
+    showline = modalProps.showline,
+    onDragStart = modalProps.onDragStart,
+    onDrag = modalProps.onDrag,
+    onDragStop = modalProps.onDragStop,
+    bounds = modalProps.bounds,
+    others = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3___default()(modalProps, _excluded);
   var isForceController = visible !== undefined;
-  var _useState = Object(react__WEBPACK_IMPORTED_MODULE_5__["useState"])(isForceController ? visible : true),
+  var _useState = Object(react__WEBPACK_IMPORTED_MODULE_6__["useState"])(isForceController ? visible : true),
     _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useState, 2),
     innerVisible = _useState2[0],
     setInnerVisible = _useState2[1]; // 需要根据visible来判断，不能一开始为true再去设置false
-  var previousActiveElement = Object(react__WEBPACK_IMPORTED_MODULE_5__["useRef"])(null);
-  var containerRef = Object(react__WEBPACK_IMPORTED_MODULE_5__["useRef"])(null);
+  var previousActiveElement = Object(react__WEBPACK_IMPORTED_MODULE_6__["useRef"])(null);
+  var innerRef = Object(react__WEBPACK_IMPORTED_MODULE_6__["useRef"])(null);
+  var containerRef = ref || innerRef;
   var modalPrefixCls = getPrefixCls(prefixCls, 'modal', customPrefixcls);
-  Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_13__["default"])(ModalTypes.indexOf(type) === -1, 'modal', "cannot found modal type '".concat(type, "'"));
+  Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_14__["default"])(ModalTypes.indexOf(type) === -1, 'modal', "cannot found modal type '".concat(type, "'"));
   var modalContainer = typeof getContainer === 'function' ? getContainer() : getContainer;
   if (modalContainer !== false && !(modalContainer instanceof HTMLElement)) {
     try {
       modalContainer = document.querySelector(modalContainer);
     } catch (error) {
-      Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_13__["default"])(true, 'modal', 'getContainer"s returnValue/value is not a correct CSSSelector');
+      Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_14__["default"])(true, 'modal', 'getContainer"s returnValue/value is not a correct CSSSelector');
     }
     modalContainer = document.body;
   }
-  Object(_utils_hooks__WEBPACK_IMPORTED_MODULE_16__["useHideDocumentScrollBar"])(isForceController ? !!visible : !!innerVisible, modalContainer === document.body, !!mask);
-  var closeModal = Object(react__WEBPACK_IMPORTED_MODULE_5__["useCallback"])(function () {
+  Object(_utils_hooks__WEBPACK_IMPORTED_MODULE_17__["useHideDocumentScrollBar"])(isForceController ? !!visible : !!innerVisible, modalContainer === document.body, !!mask);
+  var closeModal = Object(react__WEBPACK_IMPORTED_MODULE_6__["useCallback"])(function () {
     setInnerVisible(false);
   }, []);
-  var proxyCloseModal = Object(react__WEBPACK_IMPORTED_MODULE_5__["useCallback"])(function (onDoingAction, event) {
+  var proxyCloseModal = Object(react__WEBPACK_IMPORTED_MODULE_6__["useCallback"])(function (onDoingAction, event) {
     onDoingAction && onDoingAction(event);
     if (isForceController) {
       return;
     }
     closeModal();
   }, [isForceController, closeModal]);
-  var escapeToCloseModal = Object(react__WEBPACK_IMPORTED_MODULE_5__["useCallback"])(function (evt) {
+  var escapeToCloseModal = Object(react__WEBPACK_IMPORTED_MODULE_6__["useCallback"])(function (evt) {
     // In Internet Explorer 9 and Firefox 36 and earlier, the Esc key returns "Esc" instead of "Escape"
     if (['Escape', 'Esc'].includes(evt.key)) {
       proxyCloseModal(onCancel);
     }
   }, [proxyCloseModal, onCancel]);
-  var enterToCloseModal = Object(react__WEBPACK_IMPORTED_MODULE_5__["useCallback"])(function (evt) {
+  var enterToCloseModal = Object(react__WEBPACK_IMPORTED_MODULE_6__["useCallback"])(function (evt) {
     if (evt.key === 'Enter' && evt.target === containerRef.current) {
       proxyCloseModal(onOk);
       // 无效
@@ -24130,42 +24139,42 @@ var Modal = function Modal(props) {
   var isConfirmType = ConfirmModalTypes.includes(type);
   var isNormalBtn = !footerBtnOrder || footerBtnOrder === 'normal';
   var finalCancelButtonProps = _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default()({
-    onClick: Object(react__WEBPACK_IMPORTED_MODULE_5__["useCallback"])(function (event) {
+    onClick: Object(react__WEBPACK_IMPORTED_MODULE_6__["useCallback"])(function (event) {
       proxyCloseModal(onCancel, event);
     }, [onCancel, proxyCloseModal]),
     type: 'second',
-    className: classnames__WEBPACK_IMPORTED_MODULE_10___default()("".concat(modalPrefixCls, "-cancel-btn"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, "".concat(modalPrefixCls, "-margin-btn"), isConfirmType && isNormalBtn))
+    className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(modalPrefixCls, "-cancel-btn"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, "".concat(modalPrefixCls, "-margin-btn"), isConfirmType && isNormalBtn))
   }, cancelButtonProps);
   var finalOkButtonProps = _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default()({
-    onClick: Object(react__WEBPACK_IMPORTED_MODULE_5__["useCallback"])(function (event) {
+    onClick: Object(react__WEBPACK_IMPORTED_MODULE_6__["useCallback"])(function (event) {
       proxyCloseModal(onOk, event);
     }, [onOk, proxyCloseModal]),
     type: ConfirmModalTypes.includes(type) ? 'primary' : 'second',
-    className: classnames__WEBPACK_IMPORTED_MODULE_10___default()("".concat(modalPrefixCls, "-ok-btn"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, "".concat(modalPrefixCls, "-margin-btn"), isConfirmType && !isNormalBtn))
+    className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(modalPrefixCls, "-ok-btn"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, "".concat(modalPrefixCls, "-margin-btn"), isConfirmType && !isNormalBtn))
   }, okButtonProps);
-  var generatorFooterByType = Object(react__WEBPACK_IMPORTED_MODULE_5__["useCallback"])(function () {
+  var generatorFooterByType = Object(react__WEBPACK_IMPORTED_MODULE_6__["useCallback"])(function () {
     var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'confirm';
     switch (type) {
       case 'error':
       case 'warning':
         {
-          return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
+          return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
             className: "".concat(modalPrefixCls, "-iknow-node")
-          }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement(_button_button__WEBPACK_IMPORTED_MODULE_7__["default"], finalOkButtonProps, okText || Object(_locale_locale__WEBPACK_IMPORTED_MODULE_15__["getLangMsg"])('Modal', 'iknowText')));
+          }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement(_button_button__WEBPACK_IMPORTED_MODULE_8__["default"], finalOkButtonProps, okText || Object(_locale_locale__WEBPACK_IMPORTED_MODULE_16__["getLangMsg"])('Modal', 'iknowText')));
         }
       case 'confirm':
       case 'normal':
       default:
         {
-          return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_5___default.a.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
+          return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_6___default.a.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
             className: "".concat(modalPrefixCls, "-cancel-node")
-          }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement(_button_button__WEBPACK_IMPORTED_MODULE_7__["default"], finalCancelButtonProps, cancelText || Object(_locale_locale__WEBPACK_IMPORTED_MODULE_15__["getLangMsg"])('Modal', 'cancelText'))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
+          }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement(_button_button__WEBPACK_IMPORTED_MODULE_8__["default"], finalCancelButtonProps, cancelText || Object(_locale_locale__WEBPACK_IMPORTED_MODULE_16__["getLangMsg"])('Modal', 'cancelText'))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
             className: "".concat(modalPrefixCls, "-ok-node")
-          }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement(_button_button__WEBPACK_IMPORTED_MODULE_7__["default"], finalOkButtonProps, okText || Object(_locale_locale__WEBPACK_IMPORTED_MODULE_15__["getLangMsg"])('Modal', 'okText'))));
+          }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement(_button_button__WEBPACK_IMPORTED_MODULE_8__["default"], finalOkButtonProps, okText || Object(_locale_locale__WEBPACK_IMPORTED_MODULE_16__["getLangMsg"])('Modal', 'okText'))));
         }
     }
   }, [modalPrefixCls, okText, cancelText, finalCancelButtonProps, finalOkButtonProps]);
-  Object(react__WEBPACK_IMPORTED_MODULE_5__["useEffect"])(function () {
+  Object(react__WEBPACK_IMPORTED_MODULE_6__["useEffect"])(function () {
     if (isForceController) {
       // 强控制下只有下面该条件成立获取焦点
       if (focusTriggerAfterClose && visible === true) {
@@ -24184,7 +24193,7 @@ var Modal = function Modal(props) {
       }
     };
   }, [focusTriggerAfterClose, visible, isForceController]);
-  Object(react__WEBPACK_IMPORTED_MODULE_5__["useEffect"])(function () {
+  Object(react__WEBPACK_IMPORTED_MODULE_6__["useEffect"])(function () {
     if (keyboard) {
       document.body.addEventListener('keydown', escapeToCloseModal);
     }
@@ -24192,16 +24201,16 @@ var Modal = function Modal(props) {
       document.body.removeEventListener('keydown', escapeToCloseModal);
     };
   }, [keyboard, escapeToCloseModal, proxyCloseModal, onCancel]);
-  var handleMaskClick = Object(react__WEBPACK_IMPORTED_MODULE_5__["useCallback"])(function () {
+  var handleMaskClick = Object(react__WEBPACK_IMPORTED_MODULE_6__["useCallback"])(function () {
     if (maskClosable) {
       proxyCloseModal(onCancel);
     }
   }, [proxyCloseModal, onCancel, maskClosable]);
   var isHidden = !destroyOnClose && !(isForceController ? visible : innerVisible);
-  var modalClasses = classnames__WEBPACK_IMPORTED_MODULE_10___default()(modalPrefixCls, className, (_classNames3 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames3, "".concat(modalPrefixCls, "-container"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames3, "".concat(modalPrefixCls, "-container-hidden"), isHidden), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames3, "".concat(modalPrefixCls, "-container-show"), !isHidden), _classNames3));
+  var modalClasses = classnames__WEBPACK_IMPORTED_MODULE_11___default()(modalPrefixCls, className, (_classNames3 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames3, "".concat(modalPrefixCls, "-container"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames3, "".concat(modalPrefixCls, "-container-hidden"), isHidden), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames3, "".concat(modalPrefixCls, "-container-show"), !isHidden), _classNames3));
   var headerClass = "".concat(modalPrefixCls, "-header");
-  var container = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
-    className: classnames__WEBPACK_IMPORTED_MODULE_10___default()((_classNames4 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(modalPrefixCls, "-container-box"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(modalPrefixCls, "-has-container-box"), modalContainer), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(modalPrefixCls, "-showline"), showline), _classNames4)),
+  var container = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
+    className: classnames__WEBPACK_IMPORTED_MODULE_11___default()((_classNames4 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(modalPrefixCls, "-container-box"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(modalPrefixCls, "-has-container-box"), modalContainer), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(modalPrefixCls, "-showline"), showline), _classNames4)),
     style: {
       width: width,
       height: height
@@ -24209,32 +24218,36 @@ var Modal = function Modal(props) {
     ref: containerRef,
     tabIndex: -1,
     onKeyDown: enterToCloseModal
-  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
+  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
     className: headerClass
-  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
+  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
     className: "".concat(modalPrefixCls, "-title-container")
-  }, titleIcon !== undefined ? titleIcon : type !== 'normal' && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
-    className: classnames__WEBPACK_IMPORTED_MODULE_10___default()("".concat(modalPrefixCls, "-title-icon"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, "modal-".concat(type, "-title-icon-bgcolor"), type))
-  }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
+  }, titleIcon !== undefined ? titleIcon : type !== 'normal' && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
+    className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(modalPrefixCls, "-title-icon"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, "modal-".concat(type, "-title-icon-bgcolor"), type))
+  }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
     className: "".concat(modalPrefixCls, "-title")
-  }, title)), closable && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
+  }, title)), closable && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
     className: "".concat(modalPrefixCls, "-close-icon"),
     onClick: function onClick() {
       return proxyCloseModal(onCancel);
     }
-  }, closeIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_6__["Icon"], {
+  }, closeIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_7__["Icon"], {
     type: "close"
-  }))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
-    className: classnames__WEBPACK_IMPORTED_MODULE_10___default()("".concat(modalPrefixCls, "-body"), bodyClassName),
+  }))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
+    className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(modalPrefixCls, "-body"), bodyClassName),
     style: bodyStyle
-  }, body), footer !== null && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
-    className: classnames__WEBPACK_IMPORTED_MODULE_10___default()("".concat(modalPrefixCls, "-footer"), "".concat(modalPrefixCls, "-").concat(type, "-footer"), footerClassName),
+  }, body), footer !== null && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
+    className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(modalPrefixCls, "-footer"), "".concat(modalPrefixCls, "-").concat(type, "-footer"), footerClassName),
     style: _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default()({
       flexDirection: !footer && (!footerBtnOrder || footerBtnOrder === 'normal') ? 'row' : 'row-reverse'
     }, footerStyle || {})
   }, footer || generatorFooterByType(type)));
   // 没有容器应该是不用居中的
   // 但仍可拖拽
+  var handleDragStart = function handleDragStart(e, data) {
+    e === null || e === void 0 ? void 0 : e.stopPropagation();
+    onDragStart === null || onDragStart === void 0 ? void 0 : onDragStart(e, data);
+  };
   var defaultPosition = modalContainer ? {
     x: -(width / 2),
     y: -(height / 2)
@@ -24242,22 +24255,27 @@ var Modal = function Modal(props) {
     x: 0,
     y: 0
   };
-  var comp = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
+  var comp = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default()({
     className: modalClasses
-  }, mask && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
+  }, others), mask && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
     onClick: handleMaskClick,
     className: "".concat(modalPrefixCls, "-mask"),
     style: maskStyle
-  }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement(react_draggable__WEBPACK_IMPORTED_MODULE_14___default.a, {
+  }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement(react_draggable__WEBPACK_IMPORTED_MODULE_15___default.a, {
     defaultPosition: defaultPosition,
     handle: ".".concat(headerClass),
     disabled: !draggable,
+    onStart: handleDragStart,
+    onDrag: onDrag,
+    onStop: onDragStop,
+    bounds: bounds,
     cancel: ".".concat(modalPrefixCls, "-title-container, .").concat(modalPrefixCls, "-close-icon")
   }, container));
   var renderComp = ((isForceController ? visible : innerVisible) || !destroyOnClose) && comp;
-  if (modalContainer && renderComp) return /*#__PURE__*/react_dom__WEBPACK_IMPORTED_MODULE_8___default.a.createPortal(renderComp, modalContainer);
+  if (modalContainer && renderComp) return /*#__PURE__*/react_dom__WEBPACK_IMPORTED_MODULE_9___default.a.createPortal(renderComp, modalContainer);
   return renderComp || null;
 };
+var Modal = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.forwardRef(InternalModal);
 Modal.displayName = 'Modal';
 /* harmony default export */ __webpack_exports__["default"] = (Modal);
 
@@ -28392,10 +28410,11 @@ var InternalSelect = function InternalSelect(props, ref) {
     _useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState3, 2),
     singleVal = _useState4[0],
     setSingleVal = _useState4[1];
-  var _useState5 = Object(react__WEBPACK_IMPORTED_MODULE_18__["useState"])(!!props.visible || defaultOpen),
+  var _useState5 = Object(react__WEBPACK_IMPORTED_MODULE_18__["useState"])(typeof props.visible === 'undefined' ? !!defaultOpen : !!props.visible),
     _useState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState5, 2),
     optionShow = _useState6[0],
-    setOptionShow = _useState6[1]; // 下拉列表是否展示
+    setOptionShow = _useState6[1];
+  // 下拉列表是否展示
   // const [searchInput, setSearchInput] = useState<string>('') // 搜索框值
   var _useState7 = Object(react__WEBPACK_IMPORTED_MODULE_18__["useState"])(''),
     _useState8 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState7, 2),
@@ -28426,7 +28445,9 @@ var InternalSelect = function InternalSelect(props, ref) {
   // 多选，单选公共样式
   var commCls = classnames__WEBPACK_IMPORTED_MODULE_21___default()((_classNames6 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames6, "".concat(selectPrefixCls, "-bordered"), borderType === 'bordered'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames6, "".concat(selectPrefixCls, "-underline"), borderType === 'underline'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames6, "".concat(selectPrefixCls, "-borderless"), borderType === 'none'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames6, "".concat(selectPrefixCls, "-size-").concat(size), size), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames6, "".concat(selectPrefixCls, "-wrapper"), true), _classNames6));
   Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
-    setOptionShow(!!props.visible);
+    if (typeof props.visible !== 'undefined') {
+      setOptionShow(props.visible);
+    }
   }, [props.visible]);
 
   // realchildren更新时数据处理---待解决
@@ -35063,6 +35084,7 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
       icon: treeIcon,
       showIcon: showTreeIcon,
       switcherIcon: switcherIcon,
+      onlyExpandOnClickIcon: true,
       notFoundContent: renderNotContent(),
       filterTreeNode: defFilterTreeNode,
       onSelect: handleSelect,
@@ -35440,6 +35462,8 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_13___default.a.fo
     filterTreeNode = TreeProps.filterTreeNode,
     filterValue = TreeProps.filterValue,
     expandOnClickNode = TreeProps.expandOnClickNode,
+    _TreeProps$onlyExpand = TreeProps.onlyExpandOnClickIcon,
+    onlyExpandOnClickIcon = _TreeProps$onlyExpand === void 0 ? false : _TreeProps$onlyExpand,
     loadData = TreeProps.loadData,
     notFoundContent = TreeProps.notFoundContent;
   var treePrefixCls = getPrefixCls(prefixCls, 'tree', customPrefixcls); // 树样式前缀
@@ -35777,6 +35801,7 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_13___default.a.fo
     item.dragOver = dragOverNodeKey === item.key && dropPosition === 0;
     item.dropPosition = dropPosition;
     item.expandOnClickNode = expandOnClickNode;
+    item.onlyExpandOnClickIcon = onlyExpandOnClickIcon;
     item.loading = loadingKeys.has(item.key) && !loadedKeys.has(item.key);
     item.loadData = loadData;
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_13___default.a.createElement(_treeNode__WEBPACK_IMPORTED_MODULE_18__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, item, {
@@ -35933,7 +35958,7 @@ var useSelect = function useSelect(selectedKeysProps, defaultSelectedKeys) {
     selectedKeys = _useState2[0],
     setSelectedKeys = _useState2[1];
   Object(react__WEBPACK_IMPORTED_MODULE_3__["useEffect"])(function () {
-    setSelectedKeys(selectedKeysProps);
+    selectedKeysProps && setSelectedKeys(selectedKeysProps);
   }, [selectedKeysProps]);
   return [selectedKeys, setSelectedKeys];
 };
@@ -35990,7 +36015,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _excluded = ["nodeKey", "prefixCls", "selectable", "checkable", "className", "icon", "switcherIcon", "disabled", "draggable", "pos", "checked", "level", "getDragNode", "hasChildNode", "expand", "title", "showLine", "showIcon", "selected", "setDragNode", "style", "indeterminate", "estimatedItemSize", "dragOver", "dropPosition", "expandOnClickNode", "loading", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect"];
+var _excluded = ["nodeKey", "prefixCls", "selectable", "checkable", "className", "icon", "switcherIcon", "disabled", "draggable", "pos", "checked", "level", "getDragNode", "hasChildNode", "expand", "title", "showLine", "showIcon", "selected", "setDragNode", "style", "indeterminate", "estimatedItemSize", "dragOver", "dropPosition", "expandOnClickNode", "onlyExpandOnClickIcon", "loading", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect"];
 
 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) { _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___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; }
@@ -36033,6 +36058,7 @@ var TreeNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwar
     dragOver = TreeNodeProps.dragOver,
     dropPosition = TreeNodeProps.dropPosition,
     expandOnClickNode = TreeNodeProps.expandOnClickNode,
+    onlyExpandOnClickIcon = TreeNodeProps.onlyExpandOnClickIcon,
     loading = TreeNodeProps.loading,
     onExpand = TreeNodeProps.onExpand,
     onCheck = TreeNodeProps.onCheck,
@@ -36152,12 +36178,12 @@ var TreeNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwar
       if (Array.isArray(switcherIcon) && switcherIcon.length === 2) {
         return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("span", {
           className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(treeNodePrefixCls, "-icon"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(treeNodePrefixCls, "-icon-hover"), !expandOnClickNode)),
-          onClick: expandOnClickNode ? undefined : handleExpandIconClick
+          onClick: expandOnClickNode ? onlyExpandOnClickIcon ? handleExpandIconClick : undefined : handleExpandIconClick
         }, expandState ? renderIcon(switcherIcon[1]) : renderIcon(switcherIcon[0]));
       }
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("span", {
         className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(treeNodePrefixCls, "-icon"), (_classNames3 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames3, "".concat(treeNodePrefixCls, "-animation-expand"), expandState), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames3, "".concat(treeNodePrefixCls, "-animation-collapse"), !expandState), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames3, "".concat(treeNodePrefixCls, "-icon-hover"), !expandOnClickNode), _classNames3)),
-        onClick: expandOnClickNode ? undefined : handleExpandIconClick
+        onClick: expandOnClickNode ? onlyExpandOnClickIcon ? handleExpandIconClick : undefined : handleExpandIconClick
       }, renderIcon(switcherIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement(_icon__WEBPACK_IMPORTED_MODULE_16__["default"], {
         type: "arrow-right-solid"
       })));
@@ -36225,9 +36251,11 @@ var TreeNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwar
   }, [expandState, nodeData, nodeKey, onExpand, setExpandState]);
   var handleClick = react__WEBPACK_IMPORTED_MODULE_11___default.a.useCallback(function (e) {
     e.stopPropagation();
-    expandOnClickNode && handleExpandIconClick();
+    if (expandOnClickNode) {
+      !onlyExpandOnClickIcon && handleExpandIconClick();
+    }
     handleSelect(e);
-  }, [expandOnClickNode, handleExpandIconClick, handleSelect]);
+  }, [expandOnClickNode, handleExpandIconClick, handleSelect, onlyExpandOnClickIcon]);
   var handleDragStart = react__WEBPACK_IMPORTED_MODULE_11___default.a.useCallback(function (e) {
     if (!draggable) return;
     setDragNode(nodeData);
@@ -58447,160 +58475,159 @@ function r(e){var t,f,n="";if("string"==typeof e||"number"==typeof e)n+=e;else i
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
-
-module.exports = {
-	"aliceblue": [240, 248, 255],
-	"antiquewhite": [250, 235, 215],
-	"aqua": [0, 255, 255],
-	"aquamarine": [127, 255, 212],
-	"azure": [240, 255, 255],
-	"beige": [245, 245, 220],
-	"bisque": [255, 228, 196],
-	"black": [0, 0, 0],
-	"blanchedalmond": [255, 235, 205],
-	"blue": [0, 0, 255],
-	"blueviolet": [138, 43, 226],
-	"brown": [165, 42, 42],
-	"burlywood": [222, 184, 135],
-	"cadetblue": [95, 158, 160],
-	"chartreuse": [127, 255, 0],
-	"chocolate": [210, 105, 30],
-	"coral": [255, 127, 80],
-	"cornflowerblue": [100, 149, 237],
-	"cornsilk": [255, 248, 220],
-	"crimson": [220, 20, 60],
-	"cyan": [0, 255, 255],
-	"darkblue": [0, 0, 139],
-	"darkcyan": [0, 139, 139],
-	"darkgoldenrod": [184, 134, 11],
-	"darkgray": [169, 169, 169],
-	"darkgreen": [0, 100, 0],
-	"darkgrey": [169, 169, 169],
-	"darkkhaki": [189, 183, 107],
-	"darkmagenta": [139, 0, 139],
-	"darkolivegreen": [85, 107, 47],
-	"darkorange": [255, 140, 0],
-	"darkorchid": [153, 50, 204],
-	"darkred": [139, 0, 0],
-	"darksalmon": [233, 150, 122],
-	"darkseagreen": [143, 188, 143],
-	"darkslateblue": [72, 61, 139],
-	"darkslategray": [47, 79, 79],
-	"darkslategrey": [47, 79, 79],
-	"darkturquoise": [0, 206, 209],
-	"darkviolet": [148, 0, 211],
-	"deeppink": [255, 20, 147],
-	"deepskyblue": [0, 191, 255],
-	"dimgray": [105, 105, 105],
-	"dimgrey": [105, 105, 105],
-	"dodgerblue": [30, 144, 255],
-	"firebrick": [178, 34, 34],
-	"floralwhite": [255, 250, 240],
-	"forestgreen": [34, 139, 34],
-	"fuchsia": [255, 0, 255],
-	"gainsboro": [220, 220, 220],
-	"ghostwhite": [248, 248, 255],
-	"gold": [255, 215, 0],
-	"goldenrod": [218, 165, 32],
-	"gray": [128, 128, 128],
-	"green": [0, 128, 0],
-	"greenyellow": [173, 255, 47],
-	"grey": [128, 128, 128],
-	"honeydew": [240, 255, 240],
-	"hotpink": [255, 105, 180],
-	"indianred": [205, 92, 92],
-	"indigo": [75, 0, 130],
-	"ivory": [255, 255, 240],
-	"khaki": [240, 230, 140],
-	"lavender": [230, 230, 250],
-	"lavenderblush": [255, 240, 245],
-	"lawngreen": [124, 252, 0],
-	"lemonchiffon": [255, 250, 205],
-	"lightblue": [173, 216, 230],
-	"lightcoral": [240, 128, 128],
-	"lightcyan": [224, 255, 255],
-	"lightgoldenrodyellow": [250, 250, 210],
-	"lightgray": [211, 211, 211],
-	"lightgreen": [144, 238, 144],
-	"lightgrey": [211, 211, 211],
-	"lightpink": [255, 182, 193],
-	"lightsalmon": [255, 160, 122],
-	"lightseagreen": [32, 178, 170],
-	"lightskyblue": [135, 206, 250],
-	"lightslategray": [119, 136, 153],
-	"lightslategrey": [119, 136, 153],
-	"lightsteelblue": [176, 196, 222],
-	"lightyellow": [255, 255, 224],
-	"lime": [0, 255, 0],
-	"limegreen": [50, 205, 50],
-	"linen": [250, 240, 230],
-	"magenta": [255, 0, 255],
-	"maroon": [128, 0, 0],
-	"mediumaquamarine": [102, 205, 170],
-	"mediumblue": [0, 0, 205],
-	"mediumorchid": [186, 85, 211],
-	"mediumpurple": [147, 112, 219],
-	"mediumseagreen": [60, 179, 113],
-	"mediumslateblue": [123, 104, 238],
-	"mediumspringgreen": [0, 250, 154],
-	"mediumturquoise": [72, 209, 204],
-	"mediumvioletred": [199, 21, 133],
-	"midnightblue": [25, 25, 112],
-	"mintcream": [245, 255, 250],
-	"mistyrose": [255, 228, 225],
-	"moccasin": [255, 228, 181],
-	"navajowhite": [255, 222, 173],
-	"navy": [0, 0, 128],
-	"oldlace": [253, 245, 230],
-	"olive": [128, 128, 0],
-	"olivedrab": [107, 142, 35],
-	"orange": [255, 165, 0],
-	"orangered": [255, 69, 0],
-	"orchid": [218, 112, 214],
-	"palegoldenrod": [238, 232, 170],
-	"palegreen": [152, 251, 152],
-	"paleturquoise": [175, 238, 238],
-	"palevioletred": [219, 112, 147],
-	"papayawhip": [255, 239, 213],
-	"peachpuff": [255, 218, 185],
-	"peru": [205, 133, 63],
-	"pink": [255, 192, 203],
-	"plum": [221, 160, 221],
-	"powderblue": [176, 224, 230],
-	"purple": [128, 0, 128],
-	"rebeccapurple": [102, 51, 153],
-	"red": [255, 0, 0],
-	"rosybrown": [188, 143, 143],
-	"royalblue": [65, 105, 225],
-	"saddlebrown": [139, 69, 19],
-	"salmon": [250, 128, 114],
-	"sandybrown": [244, 164, 96],
-	"seagreen": [46, 139, 87],
-	"seashell": [255, 245, 238],
-	"sienna": [160, 82, 45],
-	"silver": [192, 192, 192],
-	"skyblue": [135, 206, 235],
-	"slateblue": [106, 90, 205],
-	"slategray": [112, 128, 144],
-	"slategrey": [112, 128, 144],
-	"snow": [255, 250, 250],
-	"springgreen": [0, 255, 127],
-	"steelblue": [70, 130, 180],
-	"tan": [210, 180, 140],
-	"teal": [0, 128, 128],
-	"thistle": [216, 191, 216],
-	"tomato": [255, 99, 71],
-	"turquoise": [64, 224, 208],
-	"violet": [238, 130, 238],
-	"wheat": [245, 222, 179],
-	"white": [255, 255, 255],
-	"whitesmoke": [245, 245, 245],
-	"yellow": [255, 255, 0],
-	"yellowgreen": [154, 205, 50]
-};
 
 
+module.exports = {
+  "aliceblue": [240, 248, 255],
+  "antiquewhite": [250, 235, 215],
+  "aqua": [0, 255, 255],
+  "aquamarine": [127, 255, 212],
+  "azure": [240, 255, 255],
+  "beige": [245, 245, 220],
+  "bisque": [255, 228, 196],
+  "black": [0, 0, 0],
+  "blanchedalmond": [255, 235, 205],
+  "blue": [0, 0, 255],
+  "blueviolet": [138, 43, 226],
+  "brown": [165, 42, 42],
+  "burlywood": [222, 184, 135],
+  "cadetblue": [95, 158, 160],
+  "chartreuse": [127, 255, 0],
+  "chocolate": [210, 105, 30],
+  "coral": [255, 127, 80],
+  "cornflowerblue": [100, 149, 237],
+  "cornsilk": [255, 248, 220],
+  "crimson": [220, 20, 60],
+  "cyan": [0, 255, 255],
+  "darkblue": [0, 0, 139],
+  "darkcyan": [0, 139, 139],
+  "darkgoldenrod": [184, 134, 11],
+  "darkgray": [169, 169, 169],
+  "darkgreen": [0, 100, 0],
+  "darkgrey": [169, 169, 169],
+  "darkkhaki": [189, 183, 107],
+  "darkmagenta": [139, 0, 139],
+  "darkolivegreen": [85, 107, 47],
+  "darkorange": [255, 140, 0],
+  "darkorchid": [153, 50, 204],
+  "darkred": [139, 0, 0],
+  "darksalmon": [233, 150, 122],
+  "darkseagreen": [143, 188, 143],
+  "darkslateblue": [72, 61, 139],
+  "darkslategray": [47, 79, 79],
+  "darkslategrey": [47, 79, 79],
+  "darkturquoise": [0, 206, 209],
+  "darkviolet": [148, 0, 211],
+  "deeppink": [255, 20, 147],
+  "deepskyblue": [0, 191, 255],
+  "dimgray": [105, 105, 105],
+  "dimgrey": [105, 105, 105],
+  "dodgerblue": [30, 144, 255],
+  "firebrick": [178, 34, 34],
+  "floralwhite": [255, 250, 240],
+  "forestgreen": [34, 139, 34],
+  "fuchsia": [255, 0, 255],
+  "gainsboro": [220, 220, 220],
+  "ghostwhite": [248, 248, 255],
+  "gold": [255, 215, 0],
+  "goldenrod": [218, 165, 32],
+  "gray": [128, 128, 128],
+  "green": [0, 128, 0],
+  "greenyellow": [173, 255, 47],
+  "grey": [128, 128, 128],
+  "honeydew": [240, 255, 240],
+  "hotpink": [255, 105, 180],
+  "indianred": [205, 92, 92],
+  "indigo": [75, 0, 130],
+  "ivory": [255, 255, 240],
+  "khaki": [240, 230, 140],
+  "lavender": [230, 230, 250],
+  "lavenderblush": [255, 240, 245],
+  "lawngreen": [124, 252, 0],
+  "lemonchiffon": [255, 250, 205],
+  "lightblue": [173, 216, 230],
+  "lightcoral": [240, 128, 128],
+  "lightcyan": [224, 255, 255],
+  "lightgoldenrodyellow": [250, 250, 210],
+  "lightgray": [211, 211, 211],
+  "lightgreen": [144, 238, 144],
+  "lightgrey": [211, 211, 211],
+  "lightpink": [255, 182, 193],
+  "lightsalmon": [255, 160, 122],
+  "lightseagreen": [32, 178, 170],
+  "lightskyblue": [135, 206, 250],
+  "lightslategray": [119, 136, 153],
+  "lightslategrey": [119, 136, 153],
+  "lightsteelblue": [176, 196, 222],
+  "lightyellow": [255, 255, 224],
+  "lime": [0, 255, 0],
+  "limegreen": [50, 205, 50],
+  "linen": [250, 240, 230],
+  "magenta": [255, 0, 255],
+  "maroon": [128, 0, 0],
+  "mediumaquamarine": [102, 205, 170],
+  "mediumblue": [0, 0, 205],
+  "mediumorchid": [186, 85, 211],
+  "mediumpurple": [147, 112, 219],
+  "mediumseagreen": [60, 179, 113],
+  "mediumslateblue": [123, 104, 238],
+  "mediumspringgreen": [0, 250, 154],
+  "mediumturquoise": [72, 209, 204],
+  "mediumvioletred": [199, 21, 133],
+  "midnightblue": [25, 25, 112],
+  "mintcream": [245, 255, 250],
+  "mistyrose": [255, 228, 225],
+  "moccasin": [255, 228, 181],
+  "navajowhite": [255, 222, 173],
+  "navy": [0, 0, 128],
+  "oldlace": [253, 245, 230],
+  "olive": [128, 128, 0],
+  "olivedrab": [107, 142, 35],
+  "orange": [255, 165, 0],
+  "orangered": [255, 69, 0],
+  "orchid": [218, 112, 214],
+  "palegoldenrod": [238, 232, 170],
+  "palegreen": [152, 251, 152],
+  "paleturquoise": [175, 238, 238],
+  "palevioletred": [219, 112, 147],
+  "papayawhip": [255, 239, 213],
+  "peachpuff": [255, 218, 185],
+  "peru": [205, 133, 63],
+  "pink": [255, 192, 203],
+  "plum": [221, 160, 221],
+  "powderblue": [176, 224, 230],
+  "purple": [128, 0, 128],
+  "rebeccapurple": [102, 51, 153],
+  "red": [255, 0, 0],
+  "rosybrown": [188, 143, 143],
+  "royalblue": [65, 105, 225],
+  "saddlebrown": [139, 69, 19],
+  "salmon": [250, 128, 114],
+  "sandybrown": [244, 164, 96],
+  "seagreen": [46, 139, 87],
+  "seashell": [255, 245, 238],
+  "sienna": [160, 82, 45],
+  "silver": [192, 192, 192],
+  "skyblue": [135, 206, 235],
+  "slateblue": [106, 90, 205],
+  "slategray": [112, 128, 144],
+  "slategrey": [112, 128, 144],
+  "snow": [255, 250, 250],
+  "springgreen": [0, 255, 127],
+  "steelblue": [70, 130, 180],
+  "tan": [210, 180, 140],
+  "teal": [0, 128, 128],
+  "thistle": [216, 191, 216],
+  "tomato": [255, 99, 71],
+  "turquoise": [64, 224, 208],
+  "violet": [238, 130, 238],
+  "wheat": [245, 222, 179],
+  "white": [255, 255, 255],
+  "whitesmoke": [245, 245, 245],
+  "yellow": [255, 255, 0],
+  "yellowgreen": [154, 205, 50]
+};
+
 /***/ }),
 
 /***/ "./node_modules/color-string/index.js":
@@ -58614,246 +58641,193 @@ module.exports = {
 var colorNames = __webpack_require__(/*! color-name */ "./node_modules/color-name/index.js");
 var swizzle = __webpack_require__(/*! simple-swizzle */ "./node_modules/simple-swizzle/index.js");
 var hasOwnProperty = Object.hasOwnProperty;
-
 var reverseNames = Object.create(null);
 
 // create a list of reverse color names
 for (var name in colorNames) {
-	if (hasOwnProperty.call(colorNames, name)) {
-		reverseNames[colorNames[name]] = name;
-	}
+  if (hasOwnProperty.call(colorNames, name)) {
+    reverseNames[colorNames[name]] = name;
+  }
 }
-
 var cs = module.exports = {
-	to: {},
-	get: {}
+  to: {},
+  get: {}
 };
-
 cs.get = function (string) {
-	var prefix = string.substring(0, 3).toLowerCase();
-	var val;
-	var model;
-	switch (prefix) {
-		case 'hsl':
-			val = cs.get.hsl(string);
-			model = 'hsl';
-			break;
-		case 'hwb':
-			val = cs.get.hwb(string);
-			model = 'hwb';
-			break;
-		default:
-			val = cs.get.rgb(string);
-			model = 'rgb';
-			break;
-	}
-
-	if (!val) {
-		return null;
-	}
-
-	return {model: model, value: val};
+  var prefix = string.substring(0, 3).toLowerCase();
+  var val;
+  var model;
+  switch (prefix) {
+    case 'hsl':
+      val = cs.get.hsl(string);
+      model = 'hsl';
+      break;
+    case 'hwb':
+      val = cs.get.hwb(string);
+      model = 'hwb';
+      break;
+    default:
+      val = cs.get.rgb(string);
+      model = 'rgb';
+      break;
+  }
+  if (!val) {
+    return null;
+  }
+  return {
+    model: model,
+    value: val
+  };
 };
-
 cs.get.rgb = function (string) {
-	if (!string) {
-		return null;
-	}
-
-	var abbr = /^#([a-f0-9]{3,4})$/i;
-	var hex = /^#([a-f0-9]{6})([a-f0-9]{2})?$/i;
-	var rgba = /^rgba?\(\s*([+-]?\d+)(?=[\s,])\s*(?:,\s*)?([+-]?\d+)(?=[\s,])\s*(?:,\s*)?([+-]?\d+)\s*(?:[,|\/]\s*([+-]?[\d\.]+)(%?)\s*)?\)$/;
-	var per = /^rgba?\(\s*([+-]?[\d\.]+)\%\s*,?\s*([+-]?[\d\.]+)\%\s*,?\s*([+-]?[\d\.]+)\%\s*(?:[,|\/]\s*([+-]?[\d\.]+)(%?)\s*)?\)$/;
-	var keyword = /^(\w+)$/;
-
-	var rgb = [0, 0, 0, 1];
-	var match;
-	var i;
-	var hexAlpha;
-
-	if (match = string.match(hex)) {
-		hexAlpha = match[2];
-		match = match[1];
-
-		for (i = 0; i < 3; i++) {
-			// https://jsperf.com/slice-vs-substr-vs-substring-methods-long-string/19
-			var i2 = i * 2;
-			rgb[i] = parseInt(match.slice(i2, i2 + 2), 16);
-		}
-
-		if (hexAlpha) {
-			rgb[3] = parseInt(hexAlpha, 16) / 255;
-		}
-	} else if (match = string.match(abbr)) {
-		match = match[1];
-		hexAlpha = match[3];
-
-		for (i = 0; i < 3; i++) {
-			rgb[i] = parseInt(match[i] + match[i], 16);
-		}
-
-		if (hexAlpha) {
-			rgb[3] = parseInt(hexAlpha + hexAlpha, 16) / 255;
-		}
-	} else if (match = string.match(rgba)) {
-		for (i = 0; i < 3; i++) {
-			rgb[i] = parseInt(match[i + 1], 0);
-		}
-
-		if (match[4]) {
-			if (match[5]) {
-				rgb[3] = parseFloat(match[4]) * 0.01;
-			} else {
-				rgb[3] = parseFloat(match[4]);
-			}
-		}
-	} else if (match = string.match(per)) {
-		for (i = 0; i < 3; i++) {
-			rgb[i] = Math.round(parseFloat(match[i + 1]) * 2.55);
-		}
-
-		if (match[4]) {
-			if (match[5]) {
-				rgb[3] = parseFloat(match[4]) * 0.01;
-			} else {
-				rgb[3] = parseFloat(match[4]);
-			}
-		}
-	} else if (match = string.match(keyword)) {
-		if (match[1] === 'transparent') {
-			return [0, 0, 0, 0];
-		}
-
-		if (!hasOwnProperty.call(colorNames, match[1])) {
-			return null;
-		}
-
-		rgb = colorNames[match[1]];
-		rgb[3] = 1;
-
-		return rgb;
-	} else {
-		return null;
-	}
-
-	for (i = 0; i < 3; i++) {
-		rgb[i] = clamp(rgb[i], 0, 255);
-	}
-	rgb[3] = clamp(rgb[3], 0, 1);
-
-	return rgb;
+  if (!string) {
+    return null;
+  }
+  var abbr = /^#([a-f0-9]{3,4})$/i;
+  var hex = /^#([a-f0-9]{6})([a-f0-9]{2})?$/i;
+  var rgba = /^rgba?\(\s*([+-]?\d+)(?=[\s,])\s*(?:,\s*)?([+-]?\d+)(?=[\s,])\s*(?:,\s*)?([+-]?\d+)\s*(?:[,|\/]\s*([+-]?[\d\.]+)(%?)\s*)?\)$/;
+  var per = /^rgba?\(\s*([+-]?[\d\.]+)\%\s*,?\s*([+-]?[\d\.]+)\%\s*,?\s*([+-]?[\d\.]+)\%\s*(?:[,|\/]\s*([+-]?[\d\.]+)(%?)\s*)?\)$/;
+  var keyword = /^(\w+)$/;
+  var rgb = [0, 0, 0, 1];
+  var match;
+  var i;
+  var hexAlpha;
+  if (match = string.match(hex)) {
+    hexAlpha = match[2];
+    match = match[1];
+    for (i = 0; i < 3; i++) {
+      // https://jsperf.com/slice-vs-substr-vs-substring-methods-long-string/19
+      var i2 = i * 2;
+      rgb[i] = parseInt(match.slice(i2, i2 + 2), 16);
+    }
+    if (hexAlpha) {
+      rgb[3] = parseInt(hexAlpha, 16) / 255;
+    }
+  } else if (match = string.match(abbr)) {
+    match = match[1];
+    hexAlpha = match[3];
+    for (i = 0; i < 3; i++) {
+      rgb[i] = parseInt(match[i] + match[i], 16);
+    }
+    if (hexAlpha) {
+      rgb[3] = parseInt(hexAlpha + hexAlpha, 16) / 255;
+    }
+  } else if (match = string.match(rgba)) {
+    for (i = 0; i < 3; i++) {
+      rgb[i] = parseInt(match[i + 1], 0);
+    }
+    if (match[4]) {
+      if (match[5]) {
+        rgb[3] = parseFloat(match[4]) * 0.01;
+      } else {
+        rgb[3] = parseFloat(match[4]);
+      }
+    }
+  } else if (match = string.match(per)) {
+    for (i = 0; i < 3; i++) {
+      rgb[i] = Math.round(parseFloat(match[i + 1]) * 2.55);
+    }
+    if (match[4]) {
+      if (match[5]) {
+        rgb[3] = parseFloat(match[4]) * 0.01;
+      } else {
+        rgb[3] = parseFloat(match[4]);
+      }
+    }
+  } else if (match = string.match(keyword)) {
+    if (match[1] === 'transparent') {
+      return [0, 0, 0, 0];
+    }
+    if (!hasOwnProperty.call(colorNames, match[1])) {
+      return null;
+    }
+    rgb = colorNames[match[1]];
+    rgb[3] = 1;
+    return rgb;
+  } else {
+    return null;
+  }
+  for (i = 0; i < 3; i++) {
+    rgb[i] = clamp(rgb[i], 0, 255);
+  }
+  rgb[3] = clamp(rgb[3], 0, 1);
+  return rgb;
 };
-
 cs.get.hsl = function (string) {
-	if (!string) {
-		return null;
-	}
-
-	var hsl = /^hsla?\(\s*([+-]?(?:\d{0,3}\.)?\d+)(?:deg)?\s*,?\s*([+-]?[\d\.]+)%\s*,?\s*([+-]?[\d\.]+)%\s*(?:[,|\/]\s*([+-]?(?=\.\d|\d)(?:0|[1-9]\d*)?(?:\.\d*)?(?:[eE][+-]?\d+)?)\s*)?\)$/;
-	var match = string.match(hsl);
-
-	if (match) {
-		var alpha = parseFloat(match[4]);
-		var h = ((parseFloat(match[1]) % 360) + 360) % 360;
-		var s = clamp(parseFloat(match[2]), 0, 100);
-		var l = clamp(parseFloat(match[3]), 0, 100);
-		var a = clamp(isNaN(alpha) ? 1 : alpha, 0, 1);
-
-		return [h, s, l, a];
-	}
-
-	return null;
+  if (!string) {
+    return null;
+  }
+  var hsl = /^hsla?\(\s*([+-]?(?:\d{0,3}\.)?\d+)(?:deg)?\s*,?\s*([+-]?[\d\.]+)%\s*,?\s*([+-]?[\d\.]+)%\s*(?:[,|\/]\s*([+-]?(?=\.\d|\d)(?:0|[1-9]\d*)?(?:\.\d*)?(?:[eE][+-]?\d+)?)\s*)?\)$/;
+  var match = string.match(hsl);
+  if (match) {
+    var alpha = parseFloat(match[4]);
+    var h = (parseFloat(match[1]) % 360 + 360) % 360;
+    var s = clamp(parseFloat(match[2]), 0, 100);
+    var l = clamp(parseFloat(match[3]), 0, 100);
+    var a = clamp(isNaN(alpha) ? 1 : alpha, 0, 1);
+    return [h, s, l, a];
+  }
+  return null;
 };
-
 cs.get.hwb = function (string) {
-	if (!string) {
-		return null;
-	}
-
-	var hwb = /^hwb\(\s*([+-]?\d{0,3}(?:\.\d+)?)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?(?=\.\d|\d)(?:0|[1-9]\d*)?(?:\.\d*)?(?:[eE][+-]?\d+)?)\s*)?\)$/;
-	var match = string.match(hwb);
-
-	if (match) {
-		var alpha = parseFloat(match[4]);
-		var h = ((parseFloat(match[1]) % 360) + 360) % 360;
-		var w = clamp(parseFloat(match[2]), 0, 100);
-		var b = clamp(parseFloat(match[3]), 0, 100);
-		var a = clamp(isNaN(alpha) ? 1 : alpha, 0, 1);
-		return [h, w, b, a];
-	}
-
-	return null;
+  if (!string) {
+    return null;
+  }
+  var hwb = /^hwb\(\s*([+-]?\d{0,3}(?:\.\d+)?)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?(?=\.\d|\d)(?:0|[1-9]\d*)?(?:\.\d*)?(?:[eE][+-]?\d+)?)\s*)?\)$/;
+  var match = string.match(hwb);
+  if (match) {
+    var alpha = parseFloat(match[4]);
+    var h = (parseFloat(match[1]) % 360 + 360) % 360;
+    var w = clamp(parseFloat(match[2]), 0, 100);
+    var b = clamp(parseFloat(match[3]), 0, 100);
+    var a = clamp(isNaN(alpha) ? 1 : alpha, 0, 1);
+    return [h, w, b, a];
+  }
+  return null;
 };
-
 cs.to.hex = function () {
-	var rgba = swizzle(arguments);
-
-	return (
-		'#' +
-		hexDouble(rgba[0]) +
-		hexDouble(rgba[1]) +
-		hexDouble(rgba[2]) +
-		(rgba[3] < 1
-			? (hexDouble(Math.round(rgba[3] * 255)))
-			: '')
-	);
+  var rgba = swizzle(arguments);
+  return '#' + hexDouble(rgba[0]) + hexDouble(rgba[1]) + hexDouble(rgba[2]) + (rgba[3] < 1 ? hexDouble(Math.round(rgba[3] * 255)) : '');
 };
-
 cs.to.rgb = function () {
-	var rgba = swizzle(arguments);
-
-	return rgba.length < 4 || rgba[3] === 1
-		? 'rgb(' + Math.round(rgba[0]) + ', ' + Math.round(rgba[1]) + ', ' + Math.round(rgba[2]) + ')'
-		: 'rgba(' + Math.round(rgba[0]) + ', ' + Math.round(rgba[1]) + ', ' + Math.round(rgba[2]) + ', ' + rgba[3] + ')';
+  var rgba = swizzle(arguments);
+  return rgba.length < 4 || rgba[3] === 1 ? 'rgb(' + Math.round(rgba[0]) + ', ' + Math.round(rgba[1]) + ', ' + Math.round(rgba[2]) + ')' : 'rgba(' + Math.round(rgba[0]) + ', ' + Math.round(rgba[1]) + ', ' + Math.round(rgba[2]) + ', ' + rgba[3] + ')';
 };
-
 cs.to.rgb.percent = function () {
-	var rgba = swizzle(arguments);
-
-	var r = Math.round(rgba[0] / 255 * 100);
-	var g = Math.round(rgba[1] / 255 * 100);
-	var b = Math.round(rgba[2] / 255 * 100);
-
-	return rgba.length < 4 || rgba[3] === 1
-		? 'rgb(' + r + '%, ' + g + '%, ' + b + '%)'
-		: 'rgba(' + r + '%, ' + g + '%, ' + b + '%, ' + rgba[3] + ')';
+  var rgba = swizzle(arguments);
+  var r = Math.round(rgba[0] / 255 * 100);
+  var g = Math.round(rgba[1] / 255 * 100);
+  var b = Math.round(rgba[2] / 255 * 100);
+  return rgba.length < 4 || rgba[3] === 1 ? 'rgb(' + r + '%, ' + g + '%, ' + b + '%)' : 'rgba(' + r + '%, ' + g + '%, ' + b + '%, ' + rgba[3] + ')';
 };
-
 cs.to.hsl = function () {
-	var hsla = swizzle(arguments);
-	return hsla.length < 4 || hsla[3] === 1
-		? 'hsl(' + hsla[0] + ', ' + hsla[1] + '%, ' + hsla[2] + '%)'
-		: 'hsla(' + hsla[0] + ', ' + hsla[1] + '%, ' + hsla[2] + '%, ' + hsla[3] + ')';
+  var hsla = swizzle(arguments);
+  return hsla.length < 4 || hsla[3] === 1 ? 'hsl(' + hsla[0] + ', ' + hsla[1] + '%, ' + hsla[2] + '%)' : 'hsla(' + hsla[0] + ', ' + hsla[1] + '%, ' + hsla[2] + '%, ' + hsla[3] + ')';
 };
 
 // hwb is a bit different than rgb(a) & hsl(a) since there is no alpha specific syntax
 // (hwb have alpha optional & 1 is default value)
 cs.to.hwb = function () {
-	var hwba = swizzle(arguments);
-
-	var a = '';
-	if (hwba.length >= 4 && hwba[3] !== 1) {
-		a = ', ' + hwba[3];
-	}
-
-	return 'hwb(' + hwba[0] + ', ' + hwba[1] + '%, ' + hwba[2] + '%' + a + ')';
+  var hwba = swizzle(arguments);
+  var a = '';
+  if (hwba.length >= 4 && hwba[3] !== 1) {
+    a = ', ' + hwba[3];
+  }
+  return 'hwb(' + hwba[0] + ', ' + hwba[1] + '%, ' + hwba[2] + '%' + a + ')';
 };
-
 cs.to.keyword = function (rgb) {
-	return reverseNames[rgb.slice(0, 3)];
+  return reverseNames[rgb.slice(0, 3)];
 };
 
 // helpers
 function clamp(num, min, max) {
-	return Math.min(Math.max(min, num), max);
+  return Math.min(Math.max(min, num), max);
 }
-
 function hexDouble(num) {
-	var str = Math.round(num).toString(16).toUpperCase();
-	return (str.length < 2) ? '0' + str : str;
+  var str = Math.round(num).toString(16).toUpperCase();
+  return str.length < 2 ? '0' + str : str;
 }
 
-
 /***/ }),
 
 /***/ "./node_modules/color/index.js":
@@ -58863,504 +58837,435 @@ function hexDouble(num) {
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-const colorString = __webpack_require__(/*! color-string */ "./node_modules/color-string/index.js");
-const convert = __webpack_require__(/*! color-convert */ "./node_modules/color/node_modules/color-convert/index.js");
-
-const skippedModels = [
-	// To be honest, I don't really feel like keyword belongs in color convert, but eh.
-	'keyword',
-
-	// Gray conflicts with some method names, and has its own method defined.
-	'gray',
-
-	// Shouldn't really be in color-convert either...
-	'hex',
-];
-
-const hashedModelKeys = {};
-for (const model of Object.keys(convert)) {
-	hashedModelKeys[[...convert[model].labels].sort().join('')] = model;
-}
-
-const limiters = {};
-
+var _typeof = __webpack_require__(/*! @babel/runtime/helpers/typeof */ "./node_modules/@babel/runtime/helpers/typeof.js");
+var _slicedToArray = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
+var _toConsumableArray = __webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ "./node_modules/@babel/runtime/helpers/toConsumableArray.js");
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+var colorString = __webpack_require__(/*! color-string */ "./node_modules/color-string/index.js");
+var convert = __webpack_require__(/*! color-convert */ "./node_modules/color/node_modules/color-convert/index.js");
+var skippedModels = [
+// To be honest, I don't really feel like keyword belongs in color convert, but eh.
+'keyword',
+// Gray conflicts with some method names, and has its own method defined.
+'gray',
+// Shouldn't really be in color-convert either...
+'hex'];
+var hashedModelKeys = {};
+for (var _i = 0, _Object$keys = Object.keys(convert); _i < _Object$keys.length; _i++) {
+  var model = _Object$keys[_i];
+  hashedModelKeys[_toConsumableArray(convert[model].labels).sort().join('')] = model;
+}
+var limiters = {};
 function Color(object, model) {
-	if (!(this instanceof Color)) {
-		return new Color(object, model);
-	}
-
-	if (model && model in skippedModels) {
-		model = null;
-	}
-
-	if (model && !(model in convert)) {
-		throw new Error('Unknown model: ' + model);
-	}
-
-	let i;
-	let channels;
-
-	if (object == null) { // eslint-disable-line no-eq-null,eqeqeq
-		this.model = 'rgb';
-		this.color = [0, 0, 0];
-		this.valpha = 1;
-	} else if (object instanceof Color) {
-		this.model = object.model;
-		this.color = [...object.color];
-		this.valpha = object.valpha;
-	} else if (typeof object === 'string') {
-		const result = colorString.get(object);
-		if (result === null) {
-			throw new Error('Unable to parse color from string: ' + object);
-		}
-
-		this.model = result.model;
-		channels = convert[this.model].channels;
-		this.color = result.value.slice(0, channels);
-		this.valpha = typeof result.value[channels] === 'number' ? result.value[channels] : 1;
-	} else if (object.length > 0) {
-		this.model = model || 'rgb';
-		channels = convert[this.model].channels;
-		const newArray = Array.prototype.slice.call(object, 0, channels);
-		this.color = zeroArray(newArray, channels);
-		this.valpha = typeof object[channels] === 'number' ? object[channels] : 1;
-	} else if (typeof object === 'number') {
-		// This is always RGB - can be converted later on.
-		this.model = 'rgb';
-		this.color = [
-			(object >> 16) & 0xFF,
-			(object >> 8) & 0xFF,
-			object & 0xFF,
-		];
-		this.valpha = 1;
-	} else {
-		this.valpha = 1;
-
-		const keys = Object.keys(object);
-		if ('alpha' in object) {
-			keys.splice(keys.indexOf('alpha'), 1);
-			this.valpha = typeof object.alpha === 'number' ? object.alpha : 0;
-		}
-
-		const hashedKeys = keys.sort().join('');
-		if (!(hashedKeys in hashedModelKeys)) {
-			throw new Error('Unable to parse color from object: ' + JSON.stringify(object));
-		}
-
-		this.model = hashedModelKeys[hashedKeys];
-
-		const {labels} = convert[this.model];
-		const color = [];
-		for (i = 0; i < labels.length; i++) {
-			color.push(object[labels[i]]);
-		}
-
-		this.color = zeroArray(color);
-	}
-
-	// Perform limitations (clamping, etc.)
-	if (limiters[this.model]) {
-		channels = convert[this.model].channels;
-		for (i = 0; i < channels; i++) {
-			const limit = limiters[this.model][i];
-			if (limit) {
-				this.color[i] = limit(this.color[i]);
-			}
-		}
-	}
-
-	this.valpha = Math.max(0, Math.min(1, this.valpha));
+  if (!(this instanceof Color)) {
+    return new Color(object, model);
+  }
+  if (model && model in skippedModels) {
+    model = null;
+  }
+  if (model && !(model in convert)) {
+    throw new Error('Unknown model: ' + model);
+  }
+  var i;
+  var channels;
+  if (object == null) {
+    // eslint-disable-line no-eq-null,eqeqeq
+    this.model = 'rgb';
+    this.color = [0, 0, 0];
+    this.valpha = 1;
+  } else if (object instanceof Color) {
+    this.model = object.model;
+    this.color = _toConsumableArray(object.color);
+    this.valpha = object.valpha;
+  } else if (typeof object === 'string') {
+    var result = colorString.get(object);
+    if (result === null) {
+      throw new Error('Unable to parse color from string: ' + object);
+    }
+    this.model = result.model;
+    channels = convert[this.model].channels;
+    this.color = result.value.slice(0, channels);
+    this.valpha = typeof result.value[channels] === 'number' ? result.value[channels] : 1;
+  } else if (object.length > 0) {
+    this.model = model || 'rgb';
+    channels = convert[this.model].channels;
+    var newArray = Array.prototype.slice.call(object, 0, channels);
+    this.color = zeroArray(newArray, channels);
+    this.valpha = typeof object[channels] === 'number' ? object[channels] : 1;
+  } else if (typeof object === 'number') {
+    // This is always RGB - can be converted later on.
+    this.model = 'rgb';
+    this.color = [object >> 16 & 0xFF, object >> 8 & 0xFF, object & 0xFF];
+    this.valpha = 1;
+  } else {
+    this.valpha = 1;
+    var keys = Object.keys(object);
+    if ('alpha' in object) {
+      keys.splice(keys.indexOf('alpha'), 1);
+      this.valpha = typeof object.alpha === 'number' ? object.alpha : 0;
+    }
+    var hashedKeys = keys.sort().join('');
+    if (!(hashedKeys in hashedModelKeys)) {
+      throw new Error('Unable to parse color from object: ' + JSON.stringify(object));
+    }
+    this.model = hashedModelKeys[hashedKeys];
+    var labels = convert[this.model].labels;
+    var color = [];
+    for (i = 0; i < labels.length; i++) {
+      color.push(object[labels[i]]);
+    }
+    this.color = zeroArray(color);
+  }
 
-	if (Object.freeze) {
-		Object.freeze(this);
-	}
+  // Perform limitations (clamping, etc.)
+  if (limiters[this.model]) {
+    channels = convert[this.model].channels;
+    for (i = 0; i < channels; i++) {
+      var limit = limiters[this.model][i];
+      if (limit) {
+        this.color[i] = limit(this.color[i]);
+      }
+    }
+  }
+  this.valpha = Math.max(0, Math.min(1, this.valpha));
+  if (Object.freeze) {
+    Object.freeze(this);
+  }
 }
-
 Color.prototype = {
-	toString() {
-		return this.string();
-	},
-
-	toJSON() {
-		return this[this.model]();
-	},
-
-	string(places) {
-		let self = this.model in colorString.to ? this : this.rgb();
-		self = self.round(typeof places === 'number' ? places : 1);
-		const args = self.valpha === 1 ? self.color : [...self.color, this.valpha];
-		return colorString.to[self.model](args);
-	},
-
-	percentString(places) {
-		const self = this.rgb().round(typeof places === 'number' ? places : 1);
-		const args = self.valpha === 1 ? self.color : [...self.color, this.valpha];
-		return colorString.to.rgb.percent(args);
-	},
-
-	array() {
-		return this.valpha === 1 ? [...this.color] : [...this.color, this.valpha];
-	},
-
-	object() {
-		const result = {};
-		const {channels} = convert[this.model];
-		const {labels} = convert[this.model];
-
-		for (let i = 0; i < channels; i++) {
-			result[labels[i]] = this.color[i];
-		}
-
-		if (this.valpha !== 1) {
-			result.alpha = this.valpha;
-		}
-
-		return result;
-	},
-
-	unitArray() {
-		const rgb = this.rgb().color;
-		rgb[0] /= 255;
-		rgb[1] /= 255;
-		rgb[2] /= 255;
-
-		if (this.valpha !== 1) {
-			rgb.push(this.valpha);
-		}
-
-		return rgb;
-	},
-
-	unitObject() {
-		const rgb = this.rgb().object();
-		rgb.r /= 255;
-		rgb.g /= 255;
-		rgb.b /= 255;
-
-		if (this.valpha !== 1) {
-			rgb.alpha = this.valpha;
-		}
-
-		return rgb;
-	},
-
-	round(places) {
-		places = Math.max(places || 0, 0);
-		return new Color([...this.color.map(roundToPlace(places)), this.valpha], this.model);
-	},
-
-	alpha(value) {
-		if (value !== undefined) {
-			return new Color([...this.color, Math.max(0, Math.min(1, value))], this.model);
-		}
-
-		return this.valpha;
-	},
-
-	// Rgb
-	red: getset('rgb', 0, maxfn(255)),
-	green: getset('rgb', 1, maxfn(255)),
-	blue: getset('rgb', 2, maxfn(255)),
-
-	hue: getset(['hsl', 'hsv', 'hsl', 'hwb', 'hcg'], 0, value => ((value % 360) + 360) % 360),
-
-	saturationl: getset('hsl', 1, maxfn(100)),
-	lightness: getset('hsl', 2, maxfn(100)),
-
-	saturationv: getset('hsv', 1, maxfn(100)),
-	value: getset('hsv', 2, maxfn(100)),
-
-	chroma: getset('hcg', 1, maxfn(100)),
-	gray: getset('hcg', 2, maxfn(100)),
-
-	white: getset('hwb', 1, maxfn(100)),
-	wblack: getset('hwb', 2, maxfn(100)),
-
-	cyan: getset('cmyk', 0, maxfn(100)),
-	magenta: getset('cmyk', 1, maxfn(100)),
-	yellow: getset('cmyk', 2, maxfn(100)),
-	black: getset('cmyk', 3, maxfn(100)),
-
-	x: getset('xyz', 0, maxfn(95.047)),
-	y: getset('xyz', 1, maxfn(100)),
-	z: getset('xyz', 2, maxfn(108.833)),
-
-	l: getset('lab', 0, maxfn(100)),
-	a: getset('lab', 1),
-	b: getset('lab', 2),
-
-	keyword(value) {
-		if (value !== undefined) {
-			return new Color(value);
-		}
-
-		return convert[this.model].keyword(this.color);
-	},
-
-	hex(value) {
-		if (value !== undefined) {
-			return new Color(value);
-		}
-
-		return colorString.to.hex(this.rgb().round().color);
-	},
-
-	hexa(value) {
-		if (value !== undefined) {
-			return new Color(value);
-		}
-
-		const rgbArray = this.rgb().round().color;
-
-		let alphaHex = Math.round(this.valpha * 255).toString(16).toUpperCase();
-		if (alphaHex.length === 1) {
-			alphaHex = '0' + alphaHex;
-		}
-
-		return colorString.to.hex(rgbArray) + alphaHex;
-	},
-
-	rgbNumber() {
-		const rgb = this.rgb().color;
-		return ((rgb[0] & 0xFF) << 16) | ((rgb[1] & 0xFF) << 8) | (rgb[2] & 0xFF);
-	},
-
-	luminosity() {
-		// http://www.w3.org/TR/WCAG20/#relativeluminancedef
-		const rgb = this.rgb().color;
-
-		const lum = [];
-		for (const [i, element] of rgb.entries()) {
-			const chan = element / 255;
-			lum[i] = (chan <= 0.04045) ? chan / 12.92 : ((chan + 0.055) / 1.055) ** 2.4;
-		}
-
-		return 0.2126 * lum[0] + 0.7152 * lum[1] + 0.0722 * lum[2];
-	},
-
-	contrast(color2) {
-		// http://www.w3.org/TR/WCAG20/#contrast-ratiodef
-		const lum1 = this.luminosity();
-		const lum2 = color2.luminosity();
-
-		if (lum1 > lum2) {
-			return (lum1 + 0.05) / (lum2 + 0.05);
-		}
-
-		return (lum2 + 0.05) / (lum1 + 0.05);
-	},
-
-	level(color2) {
-		// https://www.w3.org/TR/WCAG/#contrast-enhanced
-		const contrastRatio = this.contrast(color2);
-		if (contrastRatio >= 7) {
-			return 'AAA';
-		}
-
-		return (contrastRatio >= 4.5) ? 'AA' : '';
-	},
-
-	isDark() {
-		// YIQ equation from http://24ways.org/2010/calculating-color-contrast
-		const rgb = this.rgb().color;
-		const yiq = (rgb[0] * 2126 + rgb[1] * 7152 + rgb[2] * 722) / 10000;
-		return yiq < 128;
-	},
-
-	isLight() {
-		return !this.isDark();
-	},
-
-	negate() {
-		const rgb = this.rgb();
-		for (let i = 0; i < 3; i++) {
-			rgb.color[i] = 255 - rgb.color[i];
-		}
-
-		return rgb;
-	},
-
-	lighten(ratio) {
-		const hsl = this.hsl();
-		hsl.color[2] += hsl.color[2] * ratio;
-		return hsl;
-	},
-
-	darken(ratio) {
-		const hsl = this.hsl();
-		hsl.color[2] -= hsl.color[2] * ratio;
-		return hsl;
-	},
-
-	saturate(ratio) {
-		const hsl = this.hsl();
-		hsl.color[1] += hsl.color[1] * ratio;
-		return hsl;
-	},
-
-	desaturate(ratio) {
-		const hsl = this.hsl();
-		hsl.color[1] -= hsl.color[1] * ratio;
-		return hsl;
-	},
-
-	whiten(ratio) {
-		const hwb = this.hwb();
-		hwb.color[1] += hwb.color[1] * ratio;
-		return hwb;
-	},
-
-	blacken(ratio) {
-		const hwb = this.hwb();
-		hwb.color[2] += hwb.color[2] * ratio;
-		return hwb;
-	},
-
-	grayscale() {
-		// http://en.wikipedia.org/wiki/Grayscale#Converting_color_to_grayscale
-		const rgb = this.rgb().color;
-		const value = rgb[0] * 0.3 + rgb[1] * 0.59 + rgb[2] * 0.11;
-		return Color.rgb(value, value, value);
-	},
-
-	fade(ratio) {
-		return this.alpha(this.valpha - (this.valpha * ratio));
-	},
-
-	opaquer(ratio) {
-		return this.alpha(this.valpha + (this.valpha * ratio));
-	},
-
-	rotate(degrees) {
-		const hsl = this.hsl();
-		let hue = hsl.color[0];
-		hue = (hue + degrees) % 360;
-		hue = hue < 0 ? 360 + hue : hue;
-		hsl.color[0] = hue;
-		return hsl;
-	},
-
-	mix(mixinColor, weight) {
-		// Ported from sass implementation in C
-		// https://github.com/sass/libsass/blob/0e6b4a2850092356aa3ece07c6b249f0221caced/functions.cpp#L209
-		if (!mixinColor || !mixinColor.rgb) {
-			throw new Error('Argument to "mix" was not a Color instance, but rather an instance of ' + typeof mixinColor);
-		}
-
-		const color1 = mixinColor.rgb();
-		const color2 = this.rgb();
-		const p = weight === undefined ? 0.5 : weight;
-
-		const w = 2 * p - 1;
-		const a = color1.alpha() - color2.alpha();
-
-		const w1 = (((w * a === -1) ? w : (w + a) / (1 + w * a)) + 1) / 2;
-		const w2 = 1 - w1;
-
-		return Color.rgb(
-			w1 * color1.red() + w2 * color2.red(),
-			w1 * color1.green() + w2 * color2.green(),
-			w1 * color1.blue() + w2 * color2.blue(),
-			color1.alpha() * p + color2.alpha() * (1 - p));
-	},
+  toString: function toString() {
+    return this.string();
+  },
+  toJSON: function toJSON() {
+    return this[this.model]();
+  },
+  string: function string(places) {
+    var self = this.model in colorString.to ? this : this.rgb();
+    self = self.round(typeof places === 'number' ? places : 1);
+    var args = self.valpha === 1 ? self.color : [].concat(_toConsumableArray(self.color), [this.valpha]);
+    return colorString.to[self.model](args);
+  },
+  percentString: function percentString(places) {
+    var self = this.rgb().round(typeof places === 'number' ? places : 1);
+    var args = self.valpha === 1 ? self.color : [].concat(_toConsumableArray(self.color), [this.valpha]);
+    return colorString.to.rgb.percent(args);
+  },
+  array: function array() {
+    return this.valpha === 1 ? _toConsumableArray(this.color) : [].concat(_toConsumableArray(this.color), [this.valpha]);
+  },
+  object: function object() {
+    var result = {};
+    var channels = convert[this.model].channels;
+    var labels = convert[this.model].labels;
+    for (var i = 0; i < channels; i++) {
+      result[labels[i]] = this.color[i];
+    }
+    if (this.valpha !== 1) {
+      result.alpha = this.valpha;
+    }
+    return result;
+  },
+  unitArray: function unitArray() {
+    var rgb = this.rgb().color;
+    rgb[0] /= 255;
+    rgb[1] /= 255;
+    rgb[2] /= 255;
+    if (this.valpha !== 1) {
+      rgb.push(this.valpha);
+    }
+    return rgb;
+  },
+  unitObject: function unitObject() {
+    var rgb = this.rgb().object();
+    rgb.r /= 255;
+    rgb.g /= 255;
+    rgb.b /= 255;
+    if (this.valpha !== 1) {
+      rgb.alpha = this.valpha;
+    }
+    return rgb;
+  },
+  round: function round(places) {
+    places = Math.max(places || 0, 0);
+    return new Color([].concat(_toConsumableArray(this.color.map(roundToPlace(places))), [this.valpha]), this.model);
+  },
+  alpha: function alpha(value) {
+    if (value !== undefined) {
+      return new Color([].concat(_toConsumableArray(this.color), [Math.max(0, Math.min(1, value))]), this.model);
+    }
+    return this.valpha;
+  },
+  // Rgb
+  red: getset('rgb', 0, maxfn(255)),
+  green: getset('rgb', 1, maxfn(255)),
+  blue: getset('rgb', 2, maxfn(255)),
+  hue: getset(['hsl', 'hsv', 'hsl', 'hwb', 'hcg'], 0, function (value) {
+    return (value % 360 + 360) % 360;
+  }),
+  saturationl: getset('hsl', 1, maxfn(100)),
+  lightness: getset('hsl', 2, maxfn(100)),
+  saturationv: getset('hsv', 1, maxfn(100)),
+  value: getset('hsv', 2, maxfn(100)),
+  chroma: getset('hcg', 1, maxfn(100)),
+  gray: getset('hcg', 2, maxfn(100)),
+  white: getset('hwb', 1, maxfn(100)),
+  wblack: getset('hwb', 2, maxfn(100)),
+  cyan: getset('cmyk', 0, maxfn(100)),
+  magenta: getset('cmyk', 1, maxfn(100)),
+  yellow: getset('cmyk', 2, maxfn(100)),
+  black: getset('cmyk', 3, maxfn(100)),
+  x: getset('xyz', 0, maxfn(95.047)),
+  y: getset('xyz', 1, maxfn(100)),
+  z: getset('xyz', 2, maxfn(108.833)),
+  l: getset('lab', 0, maxfn(100)),
+  a: getset('lab', 1),
+  b: getset('lab', 2),
+  keyword: function keyword(value) {
+    if (value !== undefined) {
+      return new Color(value);
+    }
+    return convert[this.model].keyword(this.color);
+  },
+  hex: function hex(value) {
+    if (value !== undefined) {
+      return new Color(value);
+    }
+    return colorString.to.hex(this.rgb().round().color);
+  },
+  hexa: function hexa(value) {
+    if (value !== undefined) {
+      return new Color(value);
+    }
+    var rgbArray = this.rgb().round().color;
+    var alphaHex = Math.round(this.valpha * 255).toString(16).toUpperCase();
+    if (alphaHex.length === 1) {
+      alphaHex = '0' + alphaHex;
+    }
+    return colorString.to.hex(rgbArray) + alphaHex;
+  },
+  rgbNumber: function rgbNumber() {
+    var rgb = this.rgb().color;
+    return (rgb[0] & 0xFF) << 16 | (rgb[1] & 0xFF) << 8 | rgb[2] & 0xFF;
+  },
+  luminosity: function luminosity() {
+    // http://www.w3.org/TR/WCAG20/#relativeluminancedef
+    var rgb = this.rgb().color;
+    var lum = [];
+    var _iterator = _createForOfIteratorHelper(rgb.entries()),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _step$value = _slicedToArray(_step.value, 2),
+          i = _step$value[0],
+          element = _step$value[1];
+        var chan = element / 255;
+        lum[i] = chan <= 0.04045 ? chan / 12.92 : Math.pow((chan + 0.055) / 1.055, 2.4);
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return 0.2126 * lum[0] + 0.7152 * lum[1] + 0.0722 * lum[2];
+  },
+  contrast: function contrast(color2) {
+    // http://www.w3.org/TR/WCAG20/#contrast-ratiodef
+    var lum1 = this.luminosity();
+    var lum2 = color2.luminosity();
+    if (lum1 > lum2) {
+      return (lum1 + 0.05) / (lum2 + 0.05);
+    }
+    return (lum2 + 0.05) / (lum1 + 0.05);
+  },
+  level: function level(color2) {
+    // https://www.w3.org/TR/WCAG/#contrast-enhanced
+    var contrastRatio = this.contrast(color2);
+    if (contrastRatio >= 7) {
+      return 'AAA';
+    }
+    return contrastRatio >= 4.5 ? 'AA' : '';
+  },
+  isDark: function isDark() {
+    // YIQ equation from http://24ways.org/2010/calculating-color-contrast
+    var rgb = this.rgb().color;
+    var yiq = (rgb[0] * 2126 + rgb[1] * 7152 + rgb[2] * 722) / 10000;
+    return yiq < 128;
+  },
+  isLight: function isLight() {
+    return !this.isDark();
+  },
+  negate: function negate() {
+    var rgb = this.rgb();
+    for (var i = 0; i < 3; i++) {
+      rgb.color[i] = 255 - rgb.color[i];
+    }
+    return rgb;
+  },
+  lighten: function lighten(ratio) {
+    var hsl = this.hsl();
+    hsl.color[2] += hsl.color[2] * ratio;
+    return hsl;
+  },
+  darken: function darken(ratio) {
+    var hsl = this.hsl();
+    hsl.color[2] -= hsl.color[2] * ratio;
+    return hsl;
+  },
+  saturate: function saturate(ratio) {
+    var hsl = this.hsl();
+    hsl.color[1] += hsl.color[1] * ratio;
+    return hsl;
+  },
+  desaturate: function desaturate(ratio) {
+    var hsl = this.hsl();
+    hsl.color[1] -= hsl.color[1] * ratio;
+    return hsl;
+  },
+  whiten: function whiten(ratio) {
+    var hwb = this.hwb();
+    hwb.color[1] += hwb.color[1] * ratio;
+    return hwb;
+  },
+  blacken: function blacken(ratio) {
+    var hwb = this.hwb();
+    hwb.color[2] += hwb.color[2] * ratio;
+    return hwb;
+  },
+  grayscale: function grayscale() {
+    // http://en.wikipedia.org/wiki/Grayscale#Converting_color_to_grayscale
+    var rgb = this.rgb().color;
+    var value = rgb[0] * 0.3 + rgb[1] * 0.59 + rgb[2] * 0.11;
+    return Color.rgb(value, value, value);
+  },
+  fade: function fade(ratio) {
+    return this.alpha(this.valpha - this.valpha * ratio);
+  },
+  opaquer: function opaquer(ratio) {
+    return this.alpha(this.valpha + this.valpha * ratio);
+  },
+  rotate: function rotate(degrees) {
+    var hsl = this.hsl();
+    var hue = hsl.color[0];
+    hue = (hue + degrees) % 360;
+    hue = hue < 0 ? 360 + hue : hue;
+    hsl.color[0] = hue;
+    return hsl;
+  },
+  mix: function mix(mixinColor, weight) {
+    // Ported from sass implementation in C
+    // https://github.com/sass/libsass/blob/0e6b4a2850092356aa3ece07c6b249f0221caced/functions.cpp#L209
+    if (!mixinColor || !mixinColor.rgb) {
+      throw new Error('Argument to "mix" was not a Color instance, but rather an instance of ' + _typeof(mixinColor));
+    }
+    var color1 = mixinColor.rgb();
+    var color2 = this.rgb();
+    var p = weight === undefined ? 0.5 : weight;
+    var w = 2 * p - 1;
+    var a = color1.alpha() - color2.alpha();
+    var w1 = ((w * a === -1 ? w : (w + a) / (1 + w * a)) + 1) / 2;
+    var w2 = 1 - w1;
+    return Color.rgb(w1 * color1.red() + w2 * color2.red(), w1 * color1.green() + w2 * color2.green(), w1 * color1.blue() + w2 * color2.blue(), color1.alpha() * p + color2.alpha() * (1 - p));
+  }
 };
 
 // Model conversion methods and static constructors
-for (const model of Object.keys(convert)) {
-	if (skippedModels.includes(model)) {
-		continue;
-	}
-
-	const {channels} = convert[model];
-
-	// Conversion methods
-	Color.prototype[model] = function (...args) {
-		if (this.model === model) {
-			return new Color(this);
-		}
-
-		if (args.length > 0) {
-			return new Color(args, model);
-		}
-
-		return new Color([...assertArray(convert[this.model][model].raw(this.color)), this.valpha], model);
-	};
+var _loop = function _loop() {
+  var model = _Object$keys2[_i2];
+  if (skippedModels.includes(model)) {
+    return "continue";
+  }
+  var channels = convert[model].channels;
 
-	// 'static' construction methods
-	Color[model] = function (...args) {
-		let color = args[0];
-		if (typeof color === 'number') {
-			color = zeroArray(args, channels);
-		}
+  // Conversion methods
+  Color.prototype[model] = function () {
+    if (this.model === model) {
+      return new Color(this);
+    }
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    if (args.length > 0) {
+      return new Color(args, model);
+    }
+    return new Color([].concat(_toConsumableArray(assertArray(convert[this.model][model].raw(this.color))), [this.valpha]), model);
+  };
 
-		return new Color(color, model);
-	};
+  // 'static' construction methods
+  Color[model] = function () {
+    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      args[_key2] = arguments[_key2];
+    }
+    var color = args[0];
+    if (typeof color === 'number') {
+      color = zeroArray(args, channels);
+    }
+    return new Color(color, model);
+  };
+};
+for (var _i2 = 0, _Object$keys2 = Object.keys(convert); _i2 < _Object$keys2.length; _i2++) {
+  var _ret = _loop();
+  if (_ret === "continue") continue;
 }
-
 function roundTo(number, places) {
-	return Number(number.toFixed(places));
+  return Number(number.toFixed(places));
 }
-
 function roundToPlace(places) {
-	return function (number) {
-		return roundTo(number, places);
-	};
+  return function (number) {
+    return roundTo(number, places);
+  };
 }
-
 function getset(model, channel, modifier) {
-	model = Array.isArray(model) ? model : [model];
-
-	for (const m of model) {
-		(limiters[m] || (limiters[m] = []))[channel] = modifier;
-	}
-
-	model = model[0];
-
-	return function (value) {
-		let result;
-
-		if (value !== undefined) {
-			if (modifier) {
-				value = modifier(value);
-			}
-
-			result = this[model]();
-			result.color[channel] = value;
-			return result;
-		}
-
-		result = this[model]().color[channel];
-		if (modifier) {
-			result = modifier(result);
-		}
-
-		return result;
-	};
+  model = Array.isArray(model) ? model : [model];
+  var _iterator2 = _createForOfIteratorHelper(model),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var m = _step2.value;
+      (limiters[m] || (limiters[m] = []))[channel] = modifier;
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  model = model[0];
+  return function (value) {
+    var result;
+    if (value !== undefined) {
+      if (modifier) {
+        value = modifier(value);
+      }
+      result = this[model]();
+      result.color[channel] = value;
+      return result;
+    }
+    result = this[model]().color[channel];
+    if (modifier) {
+      result = modifier(result);
+    }
+    return result;
+  };
 }
-
 function maxfn(max) {
-	return function (v) {
-		return Math.max(0, Math.min(max, v));
-	};
+  return function (v) {
+    return Math.max(0, Math.min(max, v));
+  };
 }
-
 function assertArray(value) {
-	return Array.isArray(value) ? value : [value];
+  return Array.isArray(value) ? value : [value];
 }
-
 function zeroArray(array, length) {
-	for (let i = 0; i < length; i++) {
-		if (typeof array[i] !== 'number') {
-			array[i] = 0;
-		}
-	}
-
-	return array;
+  for (var i = 0; i < length; i++) {
+    if (typeof array[i] !== 'number') {
+      array[i] = 0;
+    }
+  }
+  return array;
 }
-
 module.exports = Color;
 
-
 /***/ }),
 
 /***/ "./node_modules/color/node_modules/color-convert/conversions.js":
@@ -59370,847 +59275,764 @@ module.exports = Color;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
+var _slicedToArray = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
 /* MIT license */
 /* eslint-disable no-mixed-operators */
-const cssKeywords = __webpack_require__(/*! color-name */ "./node_modules/color-name/index.js");
+var cssKeywords = __webpack_require__(/*! color-name */ "./node_modules/color-name/index.js");
 
 // NOTE: conversions should only return primitive values (i.e. arrays, or
 //       values that give correct `typeof` results).
 //       do not use box values types (i.e. Number(), String(), etc.)
 
-const reverseKeywords = {};
-for (const key of Object.keys(cssKeywords)) {
-	reverseKeywords[cssKeywords[key]] = key;
-}
-
-const convert = {
-	rgb: {channels: 3, labels: 'rgb'},
-	hsl: {channels: 3, labels: 'hsl'},
-	hsv: {channels: 3, labels: 'hsv'},
-	hwb: {channels: 3, labels: 'hwb'},
-	cmyk: {channels: 4, labels: 'cmyk'},
-	xyz: {channels: 3, labels: 'xyz'},
-	lab: {channels: 3, labels: 'lab'},
-	lch: {channels: 3, labels: 'lch'},
-	hex: {channels: 1, labels: ['hex']},
-	keyword: {channels: 1, labels: ['keyword']},
-	ansi16: {channels: 1, labels: ['ansi16']},
-	ansi256: {channels: 1, labels: ['ansi256']},
-	hcg: {channels: 3, labels: ['h', 'c', 'g']},
-	apple: {channels: 3, labels: ['r16', 'g16', 'b16']},
-	gray: {channels: 1, labels: ['gray']}
+var reverseKeywords = {};
+for (var _i = 0, _Object$keys = Object.keys(cssKeywords); _i < _Object$keys.length; _i++) {
+  var key = _Object$keys[_i];
+  reverseKeywords[cssKeywords[key]] = key;
+}
+var convert = {
+  rgb: {
+    channels: 3,
+    labels: 'rgb'
+  },
+  hsl: {
+    channels: 3,
+    labels: 'hsl'
+  },
+  hsv: {
+    channels: 3,
+    labels: 'hsv'
+  },
+  hwb: {
+    channels: 3,
+    labels: 'hwb'
+  },
+  cmyk: {
+    channels: 4,
+    labels: 'cmyk'
+  },
+  xyz: {
+    channels: 3,
+    labels: 'xyz'
+  },
+  lab: {
+    channels: 3,
+    labels: 'lab'
+  },
+  lch: {
+    channels: 3,
+    labels: 'lch'
+  },
+  hex: {
+    channels: 1,
+    labels: ['hex']
+  },
+  keyword: {
+    channels: 1,
+    labels: ['keyword']
+  },
+  ansi16: {
+    channels: 1,
+    labels: ['ansi16']
+  },
+  ansi256: {
+    channels: 1,
+    labels: ['ansi256']
+  },
+  hcg: {
+    channels: 3,
+    labels: ['h', 'c', 'g']
+  },
+  apple: {
+    channels: 3,
+    labels: ['r16', 'g16', 'b16']
+  },
+  gray: {
+    channels: 1,
+    labels: ['gray']
+  }
 };
-
 module.exports = convert;
 
 // Hide .channels and .labels properties
-for (const model of Object.keys(convert)) {
-	if (!('channels' in convert[model])) {
-		throw new Error('missing channels property: ' + model);
-	}
-
-	if (!('labels' in convert[model])) {
-		throw new Error('missing channel labels property: ' + model);
-	}
-
-	if (convert[model].labels.length !== convert[model].channels) {
-		throw new Error('channel and label counts mismatch: ' + model);
-	}
-
-	const {channels, labels} = convert[model];
-	delete convert[model].channels;
-	delete convert[model].labels;
-	Object.defineProperty(convert[model], 'channels', {value: channels});
-	Object.defineProperty(convert[model], 'labels', {value: labels});
+for (var _i2 = 0, _Object$keys2 = Object.keys(convert); _i2 < _Object$keys2.length; _i2++) {
+  var model = _Object$keys2[_i2];
+  if (!('channels' in convert[model])) {
+    throw new Error('missing channels property: ' + model);
+  }
+  if (!('labels' in convert[model])) {
+    throw new Error('missing channel labels property: ' + model);
+  }
+  if (convert[model].labels.length !== convert[model].channels) {
+    throw new Error('channel and label counts mismatch: ' + model);
+  }
+  var _convert$model = convert[model],
+    channels = _convert$model.channels,
+    labels = _convert$model.labels;
+  delete convert[model].channels;
+  delete convert[model].labels;
+  Object.defineProperty(convert[model], 'channels', {
+    value: channels
+  });
+  Object.defineProperty(convert[model], 'labels', {
+    value: labels
+  });
 }
-
 convert.rgb.hsl = function (rgb) {
-	const r = rgb[0] / 255;
-	const g = rgb[1] / 255;
-	const b = rgb[2] / 255;
-	const min = Math.min(r, g, b);
-	const max = Math.max(r, g, b);
-	const delta = max - min;
-	let h;
-	let s;
-
-	if (max === min) {
-		h = 0;
-	} else if (r === max) {
-		h = (g - b) / delta;
-	} else if (g === max) {
-		h = 2 + (b - r) / delta;
-	} else if (b === max) {
-		h = 4 + (r - g) / delta;
-	}
-
-	h = Math.min(h * 60, 360);
-
-	if (h < 0) {
-		h += 360;
-	}
-
-	const l = (min + max) / 2;
-
-	if (max === min) {
-		s = 0;
-	} else if (l <= 0.5) {
-		s = delta / (max + min);
-	} else {
-		s = delta / (2 - max - min);
-	}
-
-	return [h, s * 100, l * 100];
+  var r = rgb[0] / 255;
+  var g = rgb[1] / 255;
+  var b = rgb[2] / 255;
+  var min = Math.min(r, g, b);
+  var max = Math.max(r, g, b);
+  var delta = max - min;
+  var h;
+  var s;
+  if (max === min) {
+    h = 0;
+  } else if (r === max) {
+    h = (g - b) / delta;
+  } else if (g === max) {
+    h = 2 + (b - r) / delta;
+  } else if (b === max) {
+    h = 4 + (r - g) / delta;
+  }
+  h = Math.min(h * 60, 360);
+  if (h < 0) {
+    h += 360;
+  }
+  var l = (min + max) / 2;
+  if (max === min) {
+    s = 0;
+  } else if (l <= 0.5) {
+    s = delta / (max + min);
+  } else {
+    s = delta / (2 - max - min);
+  }
+  return [h, s * 100, l * 100];
 };
-
 convert.rgb.hsv = function (rgb) {
-	let rdif;
-	let gdif;
-	let bdif;
-	let h;
-	let s;
-
-	const r = rgb[0] / 255;
-	const g = rgb[1] / 255;
-	const b = rgb[2] / 255;
-	const v = Math.max(r, g, b);
-	const diff = v - Math.min(r, g, b);
-	const diffc = function (c) {
-		return (v - c) / 6 / diff + 1 / 2;
-	};
-
-	if (diff === 0) {
-		h = 0;
-		s = 0;
-	} else {
-		s = diff / v;
-		rdif = diffc(r);
-		gdif = diffc(g);
-		bdif = diffc(b);
-
-		if (r === v) {
-			h = bdif - gdif;
-		} else if (g === v) {
-			h = (1 / 3) + rdif - bdif;
-		} else if (b === v) {
-			h = (2 / 3) + gdif - rdif;
-		}
-
-		if (h < 0) {
-			h += 1;
-		} else if (h > 1) {
-			h -= 1;
-		}
-	}
-
-	return [
-		h * 360,
-		s * 100,
-		v * 100
-	];
+  var rdif;
+  var gdif;
+  var bdif;
+  var h;
+  var s;
+  var r = rgb[0] / 255;
+  var g = rgb[1] / 255;
+  var b = rgb[2] / 255;
+  var v = Math.max(r, g, b);
+  var diff = v - Math.min(r, g, b);
+  var diffc = function diffc(c) {
+    return (v - c) / 6 / diff + 1 / 2;
+  };
+  if (diff === 0) {
+    h = 0;
+    s = 0;
+  } else {
+    s = diff / v;
+    rdif = diffc(r);
+    gdif = diffc(g);
+    bdif = diffc(b);
+    if (r === v) {
+      h = bdif - gdif;
+    } else if (g === v) {
+      h = 1 / 3 + rdif - bdif;
+    } else if (b === v) {
+      h = 2 / 3 + gdif - rdif;
+    }
+    if (h < 0) {
+      h += 1;
+    } else if (h > 1) {
+      h -= 1;
+    }
+  }
+  return [h * 360, s * 100, v * 100];
 };
-
 convert.rgb.hwb = function (rgb) {
-	const r = rgb[0];
-	const g = rgb[1];
-	let b = rgb[2];
-	const h = convert.rgb.hsl(rgb)[0];
-	const w = 1 / 255 * Math.min(r, Math.min(g, b));
-
-	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
-
-	return [h, w * 100, b * 100];
+  var r = rgb[0];
+  var g = rgb[1];
+  var b = rgb[2];
+  var h = convert.rgb.hsl(rgb)[0];
+  var w = 1 / 255 * Math.min(r, Math.min(g, b));
+  b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
+  return [h, w * 100, b * 100];
 };
-
 convert.rgb.cmyk = function (rgb) {
-	const r = rgb[0] / 255;
-	const g = rgb[1] / 255;
-	const b = rgb[2] / 255;
-
-	const k = Math.min(1 - r, 1 - g, 1 - b);
-	const c = (1 - r - k) / (1 - k) || 0;
-	const m = (1 - g - k) / (1 - k) || 0;
-	const y = (1 - b - k) / (1 - k) || 0;
-
-	return [c * 100, m * 100, y * 100, k * 100];
+  var r = rgb[0] / 255;
+  var g = rgb[1] / 255;
+  var b = rgb[2] / 255;
+  var k = Math.min(1 - r, 1 - g, 1 - b);
+  var c = (1 - r - k) / (1 - k) || 0;
+  var m = (1 - g - k) / (1 - k) || 0;
+  var y = (1 - b - k) / (1 - k) || 0;
+  return [c * 100, m * 100, y * 100, k * 100];
 };
-
 function comparativeDistance(x, y) {
-	/*
-		See https://en.m.wikipedia.org/wiki/Euclidean_distance#Squared_Euclidean_distance
-	*/
-	return (
-		((x[0] - y[0]) ** 2) +
-		((x[1] - y[1]) ** 2) +
-		((x[2] - y[2]) ** 2)
-	);
+  /*
+  	See https://en.m.wikipedia.org/wiki/Euclidean_distance#Squared_Euclidean_distance
+  */
+  return Math.pow(x[0] - y[0], 2) + Math.pow(x[1] - y[1], 2) + Math.pow(x[2] - y[2], 2);
 }
-
 convert.rgb.keyword = function (rgb) {
-	const reversed = reverseKeywords[rgb];
-	if (reversed) {
-		return reversed;
-	}
-
-	let currentClosestDistance = Infinity;
-	let currentClosestKeyword;
-
-	for (const keyword of Object.keys(cssKeywords)) {
-		const value = cssKeywords[keyword];
-
-		// Compute comparative distance
-		const distance = comparativeDistance(rgb, value);
+  var reversed = reverseKeywords[rgb];
+  if (reversed) {
+    return reversed;
+  }
+  var currentClosestDistance = Infinity;
+  var currentClosestKeyword;
+  for (var _i3 = 0, _Object$keys3 = Object.keys(cssKeywords); _i3 < _Object$keys3.length; _i3++) {
+    var keyword = _Object$keys3[_i3];
+    var value = cssKeywords[keyword];
 
-		// Check if its less, if so set as closest
-		if (distance < currentClosestDistance) {
-			currentClosestDistance = distance;
-			currentClosestKeyword = keyword;
-		}
-	}
+    // Compute comparative distance
+    var distance = comparativeDistance(rgb, value);
 
-	return currentClosestKeyword;
+    // Check if its less, if so set as closest
+    if (distance < currentClosestDistance) {
+      currentClosestDistance = distance;
+      currentClosestKeyword = keyword;
+    }
+  }
+  return currentClosestKeyword;
 };
-
 convert.keyword.rgb = function (keyword) {
-	return cssKeywords[keyword];
+  return cssKeywords[keyword];
 };
-
 convert.rgb.xyz = function (rgb) {
-	let r = rgb[0] / 255;
-	let g = rgb[1] / 255;
-	let b = rgb[2] / 255;
-
-	// Assume sRGB
-	r = r > 0.04045 ? (((r + 0.055) / 1.055) ** 2.4) : (r / 12.92);
-	g = g > 0.04045 ? (((g + 0.055) / 1.055) ** 2.4) : (g / 12.92);
-	b = b > 0.04045 ? (((b + 0.055) / 1.055) ** 2.4) : (b / 12.92);
-
-	const x = (r * 0.4124) + (g * 0.3576) + (b * 0.1805);
-	const y = (r * 0.2126) + (g * 0.7152) + (b * 0.0722);
-	const z = (r * 0.0193) + (g * 0.1192) + (b * 0.9505);
-
-	return [x * 100, y * 100, z * 100];
+  var r = rgb[0] / 255;
+  var g = rgb[1] / 255;
+  var b = rgb[2] / 255;
+
+  // Assume sRGB
+  r = r > 0.04045 ? Math.pow((r + 0.055) / 1.055, 2.4) : r / 12.92;
+  g = g > 0.04045 ? Math.pow((g + 0.055) / 1.055, 2.4) : g / 12.92;
+  b = b > 0.04045 ? Math.pow((b + 0.055) / 1.055, 2.4) : b / 12.92;
+  var x = r * 0.4124 + g * 0.3576 + b * 0.1805;
+  var y = r * 0.2126 + g * 0.7152 + b * 0.0722;
+  var z = r * 0.0193 + g * 0.1192 + b * 0.9505;
+  return [x * 100, y * 100, z * 100];
 };
-
 convert.rgb.lab = function (rgb) {
-	const xyz = convert.rgb.xyz(rgb);
-	let x = xyz[0];
-	let y = xyz[1];
-	let z = xyz[2];
-
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
-
-	x = x > 0.008856 ? (x ** (1 / 3)) : (7.787 * x) + (16 / 116);
-	y = y > 0.008856 ? (y ** (1 / 3)) : (7.787 * y) + (16 / 116);
-	z = z > 0.008856 ? (z ** (1 / 3)) : (7.787 * z) + (16 / 116);
-
-	const l = (116 * y) - 16;
-	const a = 500 * (x - y);
-	const b = 200 * (y - z);
-
-	return [l, a, b];
+  var xyz = convert.rgb.xyz(rgb);
+  var x = xyz[0];
+  var y = xyz[1];
+  var z = xyz[2];
+  x /= 95.047;
+  y /= 100;
+  z /= 108.883;
+  x = x > 0.008856 ? Math.pow(x, 1 / 3) : 7.787 * x + 16 / 116;
+  y = y > 0.008856 ? Math.pow(y, 1 / 3) : 7.787 * y + 16 / 116;
+  z = z > 0.008856 ? Math.pow(z, 1 / 3) : 7.787 * z + 16 / 116;
+  var l = 116 * y - 16;
+  var a = 500 * (x - y);
+  var b = 200 * (y - z);
+  return [l, a, b];
 };
-
 convert.hsl.rgb = function (hsl) {
-	const h = hsl[0] / 360;
-	const s = hsl[1] / 100;
-	const l = hsl[2] / 100;
-	let t2;
-	let t3;
-	let val;
-
-	if (s === 0) {
-		val = l * 255;
-		return [val, val, val];
-	}
-
-	if (l < 0.5) {
-		t2 = l * (1 + s);
-	} else {
-		t2 = l + s - l * s;
-	}
-
-	const t1 = 2 * l - t2;
-
-	const rgb = [0, 0, 0];
-	for (let i = 0; i < 3; i++) {
-		t3 = h + 1 / 3 * -(i - 1);
-		if (t3 < 0) {
-			t3++;
-		}
-
-		if (t3 > 1) {
-			t3--;
-		}
-
-		if (6 * t3 < 1) {
-			val = t1 + (t2 - t1) * 6 * t3;
-		} else if (2 * t3 < 1) {
-			val = t2;
-		} else if (3 * t3 < 2) {
-			val = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
-		} else {
-			val = t1;
-		}
-
-		rgb[i] = val * 255;
-	}
-
-	return rgb;
+  var h = hsl[0] / 360;
+  var s = hsl[1] / 100;
+  var l = hsl[2] / 100;
+  var t2;
+  var t3;
+  var val;
+  if (s === 0) {
+    val = l * 255;
+    return [val, val, val];
+  }
+  if (l < 0.5) {
+    t2 = l * (1 + s);
+  } else {
+    t2 = l + s - l * s;
+  }
+  var t1 = 2 * l - t2;
+  var rgb = [0, 0, 0];
+  for (var i = 0; i < 3; i++) {
+    t3 = h + 1 / 3 * -(i - 1);
+    if (t3 < 0) {
+      t3++;
+    }
+    if (t3 > 1) {
+      t3--;
+    }
+    if (6 * t3 < 1) {
+      val = t1 + (t2 - t1) * 6 * t3;
+    } else if (2 * t3 < 1) {
+      val = t2;
+    } else if (3 * t3 < 2) {
+      val = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
+    } else {
+      val = t1;
+    }
+    rgb[i] = val * 255;
+  }
+  return rgb;
 };
-
 convert.hsl.hsv = function (hsl) {
-	const h = hsl[0];
-	let s = hsl[1] / 100;
-	let l = hsl[2] / 100;
-	let smin = s;
-	const lmin = Math.max(l, 0.01);
-
-	l *= 2;
-	s *= (l <= 1) ? l : 2 - l;
-	smin *= lmin <= 1 ? lmin : 2 - lmin;
-	const v = (l + s) / 2;
-	const sv = l === 0 ? (2 * smin) / (lmin + smin) : (2 * s) / (l + s);
-
-	return [h, sv * 100, v * 100];
+  var h = hsl[0];
+  var s = hsl[1] / 100;
+  var l = hsl[2] / 100;
+  var smin = s;
+  var lmin = Math.max(l, 0.01);
+  l *= 2;
+  s *= l <= 1 ? l : 2 - l;
+  smin *= lmin <= 1 ? lmin : 2 - lmin;
+  var v = (l + s) / 2;
+  var sv = l === 0 ? 2 * smin / (lmin + smin) : 2 * s / (l + s);
+  return [h, sv * 100, v * 100];
 };
-
 convert.hsv.rgb = function (hsv) {
-	const h = hsv[0] / 60;
-	const s = hsv[1] / 100;
-	let v = hsv[2] / 100;
-	const hi = Math.floor(h) % 6;
-
-	const f = h - Math.floor(h);
-	const p = 255 * v * (1 - s);
-	const q = 255 * v * (1 - (s * f));
-	const t = 255 * v * (1 - (s * (1 - f)));
-	v *= 255;
-
-	switch (hi) {
-		case 0:
-			return [v, t, p];
-		case 1:
-			return [q, v, p];
-		case 2:
-			return [p, v, t];
-		case 3:
-			return [p, q, v];
-		case 4:
-			return [t, p, v];
-		case 5:
-			return [v, p, q];
-	}
+  var h = hsv[0] / 60;
+  var s = hsv[1] / 100;
+  var v = hsv[2] / 100;
+  var hi = Math.floor(h) % 6;
+  var f = h - Math.floor(h);
+  var p = 255 * v * (1 - s);
+  var q = 255 * v * (1 - s * f);
+  var t = 255 * v * (1 - s * (1 - f));
+  v *= 255;
+  switch (hi) {
+    case 0:
+      return [v, t, p];
+    case 1:
+      return [q, v, p];
+    case 2:
+      return [p, v, t];
+    case 3:
+      return [p, q, v];
+    case 4:
+      return [t, p, v];
+    case 5:
+      return [v, p, q];
+  }
 };
-
 convert.hsv.hsl = function (hsv) {
-	const h = hsv[0];
-	const s = hsv[1] / 100;
-	const v = hsv[2] / 100;
-	const vmin = Math.max(v, 0.01);
-	let sl;
-	let l;
-
-	l = (2 - s) * v;
-	const lmin = (2 - s) * vmin;
-	sl = s * vmin;
-	sl /= (lmin <= 1) ? lmin : 2 - lmin;
-	sl = sl || 0;
-	l /= 2;
-
-	return [h, sl * 100, l * 100];
+  var h = hsv[0];
+  var s = hsv[1] / 100;
+  var v = hsv[2] / 100;
+  var vmin = Math.max(v, 0.01);
+  var sl;
+  var l;
+  l = (2 - s) * v;
+  var lmin = (2 - s) * vmin;
+  sl = s * vmin;
+  sl /= lmin <= 1 ? lmin : 2 - lmin;
+  sl = sl || 0;
+  l /= 2;
+  return [h, sl * 100, l * 100];
 };
 
 // http://dev.w3.org/csswg/css-color/#hwb-to-rgb
 convert.hwb.rgb = function (hwb) {
-	const h = hwb[0] / 360;
-	let wh = hwb[1] / 100;
-	let bl = hwb[2] / 100;
-	const ratio = wh + bl;
-	let f;
-
-	// Wh + bl cant be > 1
-	if (ratio > 1) {
-		wh /= ratio;
-		bl /= ratio;
-	}
-
-	const i = Math.floor(6 * h);
-	const v = 1 - bl;
-	f = 6 * h - i;
-
-	if ((i & 0x01) !== 0) {
-		f = 1 - f;
-	}
-
-	const n = wh + f * (v - wh); // Linear interpolation
-
-	let r;
-	let g;
-	let b;
-	/* eslint-disable max-statements-per-line,no-multi-spaces */
-	switch (i) {
-		default:
-		case 6:
-		case 0: r = v;  g = n;  b = wh; break;
-		case 1: r = n;  g = v;  b = wh; break;
-		case 2: r = wh; g = v;  b = n; break;
-		case 3: r = wh; g = n;  b = v; break;
-		case 4: r = n;  g = wh; b = v; break;
-		case 5: r = v;  g = wh; b = n; break;
-	}
-	/* eslint-enable max-statements-per-line,no-multi-spaces */
+  var h = hwb[0] / 360;
+  var wh = hwb[1] / 100;
+  var bl = hwb[2] / 100;
+  var ratio = wh + bl;
+  var f;
+
+  // Wh + bl cant be > 1
+  if (ratio > 1) {
+    wh /= ratio;
+    bl /= ratio;
+  }
+  var i = Math.floor(6 * h);
+  var v = 1 - bl;
+  f = 6 * h - i;
+  if ((i & 0x01) !== 0) {
+    f = 1 - f;
+  }
+  var n = wh + f * (v - wh); // Linear interpolation
+
+  var r;
+  var g;
+  var b;
+  /* eslint-disable max-statements-per-line,no-multi-spaces */
+  switch (i) {
+    default:
+    case 6:
+    case 0:
+      r = v;
+      g = n;
+      b = wh;
+      break;
+    case 1:
+      r = n;
+      g = v;
+      b = wh;
+      break;
+    case 2:
+      r = wh;
+      g = v;
+      b = n;
+      break;
+    case 3:
+      r = wh;
+      g = n;
+      b = v;
+      break;
+    case 4:
+      r = n;
+      g = wh;
+      b = v;
+      break;
+    case 5:
+      r = v;
+      g = wh;
+      b = n;
+      break;
+  }
+  /* eslint-enable max-statements-per-line,no-multi-spaces */
 
-	return [r * 255, g * 255, b * 255];
+  return [r * 255, g * 255, b * 255];
 };
-
 convert.cmyk.rgb = function (cmyk) {
-	const c = cmyk[0] / 100;
-	const m = cmyk[1] / 100;
-	const y = cmyk[2] / 100;
-	const k = cmyk[3] / 100;
-
-	const r = 1 - Math.min(1, c * (1 - k) + k);
-	const g = 1 - Math.min(1, m * (1 - k) + k);
-	const b = 1 - Math.min(1, y * (1 - k) + k);
-
-	return [r * 255, g * 255, b * 255];
+  var c = cmyk[0] / 100;
+  var m = cmyk[1] / 100;
+  var y = cmyk[2] / 100;
+  var k = cmyk[3] / 100;
+  var r = 1 - Math.min(1, c * (1 - k) + k);
+  var g = 1 - Math.min(1, m * (1 - k) + k);
+  var b = 1 - Math.min(1, y * (1 - k) + k);
+  return [r * 255, g * 255, b * 255];
 };
-
 convert.xyz.rgb = function (xyz) {
-	const x = xyz[0] / 100;
-	const y = xyz[1] / 100;
-	const z = xyz[2] / 100;
-	let r;
-	let g;
-	let b;
-
-	r = (x * 3.2406) + (y * -1.5372) + (z * -0.4986);
-	g = (x * -0.9689) + (y * 1.8758) + (z * 0.0415);
-	b = (x * 0.0557) + (y * -0.2040) + (z * 1.0570);
-
-	// Assume sRGB
-	r = r > 0.0031308
-		? ((1.055 * (r ** (1.0 / 2.4))) - 0.055)
-		: r * 12.92;
-
-	g = g > 0.0031308
-		? ((1.055 * (g ** (1.0 / 2.4))) - 0.055)
-		: g * 12.92;
-
-	b = b > 0.0031308
-		? ((1.055 * (b ** (1.0 / 2.4))) - 0.055)
-		: b * 12.92;
-
-	r = Math.min(Math.max(0, r), 1);
-	g = Math.min(Math.max(0, g), 1);
-	b = Math.min(Math.max(0, b), 1);
-
-	return [r * 255, g * 255, b * 255];
+  var x = xyz[0] / 100;
+  var y = xyz[1] / 100;
+  var z = xyz[2] / 100;
+  var r;
+  var g;
+  var b;
+  r = x * 3.2406 + y * -1.5372 + z * -0.4986;
+  g = x * -0.9689 + y * 1.8758 + z * 0.0415;
+  b = x * 0.0557 + y * -0.2040 + z * 1.0570;
+
+  // Assume sRGB
+  r = r > 0.0031308 ? 1.055 * Math.pow(r, 1.0 / 2.4) - 0.055 : r * 12.92;
+  g = g > 0.0031308 ? 1.055 * Math.pow(g, 1.0 / 2.4) - 0.055 : g * 12.92;
+  b = b > 0.0031308 ? 1.055 * Math.pow(b, 1.0 / 2.4) - 0.055 : b * 12.92;
+  r = Math.min(Math.max(0, r), 1);
+  g = Math.min(Math.max(0, g), 1);
+  b = Math.min(Math.max(0, b), 1);
+  return [r * 255, g * 255, b * 255];
 };
-
 convert.xyz.lab = function (xyz) {
-	let x = xyz[0];
-	let y = xyz[1];
-	let z = xyz[2];
-
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
-
-	x = x > 0.008856 ? (x ** (1 / 3)) : (7.787 * x) + (16 / 116);
-	y = y > 0.008856 ? (y ** (1 / 3)) : (7.787 * y) + (16 / 116);
-	z = z > 0.008856 ? (z ** (1 / 3)) : (7.787 * z) + (16 / 116);
-
-	const l = (116 * y) - 16;
-	const a = 500 * (x - y);
-	const b = 200 * (y - z);
-
-	return [l, a, b];
+  var x = xyz[0];
+  var y = xyz[1];
+  var z = xyz[2];
+  x /= 95.047;
+  y /= 100;
+  z /= 108.883;
+  x = x > 0.008856 ? Math.pow(x, 1 / 3) : 7.787 * x + 16 / 116;
+  y = y > 0.008856 ? Math.pow(y, 1 / 3) : 7.787 * y + 16 / 116;
+  z = z > 0.008856 ? Math.pow(z, 1 / 3) : 7.787 * z + 16 / 116;
+  var l = 116 * y - 16;
+  var a = 500 * (x - y);
+  var b = 200 * (y - z);
+  return [l, a, b];
 };
-
 convert.lab.xyz = function (lab) {
-	const l = lab[0];
-	const a = lab[1];
-	const b = lab[2];
-	let x;
-	let y;
-	let z;
-
-	y = (l + 16) / 116;
-	x = a / 500 + y;
-	z = y - b / 200;
-
-	const y2 = y ** 3;
-	const x2 = x ** 3;
-	const z2 = z ** 3;
-	y = y2 > 0.008856 ? y2 : (y - 16 / 116) / 7.787;
-	x = x2 > 0.008856 ? x2 : (x - 16 / 116) / 7.787;
-	z = z2 > 0.008856 ? z2 : (z - 16 / 116) / 7.787;
-
-	x *= 95.047;
-	y *= 100;
-	z *= 108.883;
-
-	return [x, y, z];
+  var l = lab[0];
+  var a = lab[1];
+  var b = lab[2];
+  var x;
+  var y;
+  var z;
+  y = (l + 16) / 116;
+  x = a / 500 + y;
+  z = y - b / 200;
+  var y2 = Math.pow(y, 3);
+  var x2 = Math.pow(x, 3);
+  var z2 = Math.pow(z, 3);
+  y = y2 > 0.008856 ? y2 : (y - 16 / 116) / 7.787;
+  x = x2 > 0.008856 ? x2 : (x - 16 / 116) / 7.787;
+  z = z2 > 0.008856 ? z2 : (z - 16 / 116) / 7.787;
+  x *= 95.047;
+  y *= 100;
+  z *= 108.883;
+  return [x, y, z];
 };
-
 convert.lab.lch = function (lab) {
-	const l = lab[0];
-	const a = lab[1];
-	const b = lab[2];
-	let h;
-
-	const hr = Math.atan2(b, a);
-	h = hr * 360 / 2 / Math.PI;
-
-	if (h < 0) {
-		h += 360;
-	}
-
-	const c = Math.sqrt(a * a + b * b);
-
-	return [l, c, h];
+  var l = lab[0];
+  var a = lab[1];
+  var b = lab[2];
+  var h;
+  var hr = Math.atan2(b, a);
+  h = hr * 360 / 2 / Math.PI;
+  if (h < 0) {
+    h += 360;
+  }
+  var c = Math.sqrt(a * a + b * b);
+  return [l, c, h];
 };
-
 convert.lch.lab = function (lch) {
-	const l = lch[0];
-	const c = lch[1];
-	const h = lch[2];
-
-	const hr = h / 360 * 2 * Math.PI;
-	const a = c * Math.cos(hr);
-	const b = c * Math.sin(hr);
-
-	return [l, a, b];
-};
-
-convert.rgb.ansi16 = function (args, saturation = null) {
-	const [r, g, b] = args;
-	let value = saturation === null ? convert.rgb.hsv(args)[2] : saturation; // Hsv -> ansi16 optimization
-
-	value = Math.round(value / 50);
-
-	if (value === 0) {
-		return 30;
-	}
-
-	let ansi = 30
-		+ ((Math.round(b / 255) << 2)
-		| (Math.round(g / 255) << 1)
-		| Math.round(r / 255));
-
-	if (value === 2) {
-		ansi += 60;
-	}
-
-	return ansi;
+  var l = lch[0];
+  var c = lch[1];
+  var h = lch[2];
+  var hr = h / 360 * 2 * Math.PI;
+  var a = c * Math.cos(hr);
+  var b = c * Math.sin(hr);
+  return [l, a, b];
+};
+convert.rgb.ansi16 = function (args) {
+  var saturation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  var _args = _slicedToArray(args, 3),
+    r = _args[0],
+    g = _args[1],
+    b = _args[2];
+  var value = saturation === null ? convert.rgb.hsv(args)[2] : saturation; // Hsv -> ansi16 optimization
+
+  value = Math.round(value / 50);
+  if (value === 0) {
+    return 30;
+  }
+  var ansi = 30 + (Math.round(b / 255) << 2 | Math.round(g / 255) << 1 | Math.round(r / 255));
+  if (value === 2) {
+    ansi += 60;
+  }
+  return ansi;
 };
-
 convert.hsv.ansi16 = function (args) {
-	// Optimization here; we already know the value and don't need to get
-	// it converted for us.
-	return convert.rgb.ansi16(convert.hsv.rgb(args), args[2]);
+  // Optimization here; we already know the value and don't need to get
+  // it converted for us.
+  return convert.rgb.ansi16(convert.hsv.rgb(args), args[2]);
 };
-
 convert.rgb.ansi256 = function (args) {
-	const r = args[0];
-	const g = args[1];
-	const b = args[2];
-
-	// We use the extended greyscale palette here, with the exception of
-	// black and white. normal palette only has 4 greyscale shades.
-	if (r === g && g === b) {
-		if (r < 8) {
-			return 16;
-		}
-
-		if (r > 248) {
-			return 231;
-		}
+  var r = args[0];
+  var g = args[1];
+  var b = args[2];
 
-		return Math.round(((r - 8) / 247) * 24) + 232;
-	}
-
-	const ansi = 16
-		+ (36 * Math.round(r / 255 * 5))
-		+ (6 * Math.round(g / 255 * 5))
-		+ Math.round(b / 255 * 5);
-
-	return ansi;
+  // We use the extended greyscale palette here, with the exception of
+  // black and white. normal palette only has 4 greyscale shades.
+  if (r === g && g === b) {
+    if (r < 8) {
+      return 16;
+    }
+    if (r > 248) {
+      return 231;
+    }
+    return Math.round((r - 8) / 247 * 24) + 232;
+  }
+  var ansi = 16 + 36 * Math.round(r / 255 * 5) + 6 * Math.round(g / 255 * 5) + Math.round(b / 255 * 5);
+  return ansi;
 };
-
 convert.ansi16.rgb = function (args) {
-	let color = args % 10;
-
-	// Handle greyscale
-	if (color === 0 || color === 7) {
-		if (args > 50) {
-			color += 3.5;
-		}
-
-		color = color / 10.5 * 255;
-
-		return [color, color, color];
-	}
+  var color = args % 10;
 
-	const mult = (~~(args > 50) + 1) * 0.5;
-	const r = ((color & 1) * mult) * 255;
-	const g = (((color >> 1) & 1) * mult) * 255;
-	const b = (((color >> 2) & 1) * mult) * 255;
-
-	return [r, g, b];
+  // Handle greyscale
+  if (color === 0 || color === 7) {
+    if (args > 50) {
+      color += 3.5;
+    }
+    color = color / 10.5 * 255;
+    return [color, color, color];
+  }
+  var mult = (~~(args > 50) + 1) * 0.5;
+  var r = (color & 1) * mult * 255;
+  var g = (color >> 1 & 1) * mult * 255;
+  var b = (color >> 2 & 1) * mult * 255;
+  return [r, g, b];
 };
-
 convert.ansi256.rgb = function (args) {
-	// Handle greyscale
-	if (args >= 232) {
-		const c = (args - 232) * 10 + 8;
-		return [c, c, c];
-	}
-
-	args -= 16;
-
-	let rem;
-	const r = Math.floor(args / 36) / 5 * 255;
-	const g = Math.floor((rem = args % 36) / 6) / 5 * 255;
-	const b = (rem % 6) / 5 * 255;
-
-	return [r, g, b];
+  // Handle greyscale
+  if (args >= 232) {
+    var c = (args - 232) * 10 + 8;
+    return [c, c, c];
+  }
+  args -= 16;
+  var rem;
+  var r = Math.floor(args / 36) / 5 * 255;
+  var g = Math.floor((rem = args % 36) / 6) / 5 * 255;
+  var b = rem % 6 / 5 * 255;
+  return [r, g, b];
 };
-
 convert.rgb.hex = function (args) {
-	const integer = ((Math.round(args[0]) & 0xFF) << 16)
-		+ ((Math.round(args[1]) & 0xFF) << 8)
-		+ (Math.round(args[2]) & 0xFF);
-
-	const string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
+  var integer = ((Math.round(args[0]) & 0xFF) << 16) + ((Math.round(args[1]) & 0xFF) << 8) + (Math.round(args[2]) & 0xFF);
+  var string = integer.toString(16).toUpperCase();
+  return '000000'.substring(string.length) + string;
 };
-
 convert.hex.rgb = function (args) {
-	const match = args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
-	if (!match) {
-		return [0, 0, 0];
-	}
-
-	let colorString = match[0];
-
-	if (match[0].length === 3) {
-		colorString = colorString.split('').map(char => {
-			return char + char;
-		}).join('');
-	}
-
-	const integer = parseInt(colorString, 16);
-	const r = (integer >> 16) & 0xFF;
-	const g = (integer >> 8) & 0xFF;
-	const b = integer & 0xFF;
-
-	return [r, g, b];
+  var match = args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
+  if (!match) {
+    return [0, 0, 0];
+  }
+  var colorString = match[0];
+  if (match[0].length === 3) {
+    colorString = colorString.split('').map(function (char) {
+      return char + char;
+    }).join('');
+  }
+  var integer = parseInt(colorString, 16);
+  var r = integer >> 16 & 0xFF;
+  var g = integer >> 8 & 0xFF;
+  var b = integer & 0xFF;
+  return [r, g, b];
 };
-
 convert.rgb.hcg = function (rgb) {
-	const r = rgb[0] / 255;
-	const g = rgb[1] / 255;
-	const b = rgb[2] / 255;
-	const max = Math.max(Math.max(r, g), b);
-	const min = Math.min(Math.min(r, g), b);
-	const chroma = (max - min);
-	let grayscale;
-	let hue;
-
-	if (chroma < 1) {
-		grayscale = min / (1 - chroma);
-	} else {
-		grayscale = 0;
-	}
-
-	if (chroma <= 0) {
-		hue = 0;
-	} else
-	if (max === r) {
-		hue = ((g - b) / chroma) % 6;
-	} else
-	if (max === g) {
-		hue = 2 + (b - r) / chroma;
-	} else {
-		hue = 4 + (r - g) / chroma;
-	}
-
-	hue /= 6;
-	hue %= 1;
-
-	return [hue * 360, chroma * 100, grayscale * 100];
+  var r = rgb[0] / 255;
+  var g = rgb[1] / 255;
+  var b = rgb[2] / 255;
+  var max = Math.max(Math.max(r, g), b);
+  var min = Math.min(Math.min(r, g), b);
+  var chroma = max - min;
+  var grayscale;
+  var hue;
+  if (chroma < 1) {
+    grayscale = min / (1 - chroma);
+  } else {
+    grayscale = 0;
+  }
+  if (chroma <= 0) {
+    hue = 0;
+  } else if (max === r) {
+    hue = (g - b) / chroma % 6;
+  } else if (max === g) {
+    hue = 2 + (b - r) / chroma;
+  } else {
+    hue = 4 + (r - g) / chroma;
+  }
+  hue /= 6;
+  hue %= 1;
+  return [hue * 360, chroma * 100, grayscale * 100];
 };
-
 convert.hsl.hcg = function (hsl) {
-	const s = hsl[1] / 100;
-	const l = hsl[2] / 100;
-
-	const c = l < 0.5 ? (2.0 * s * l) : (2.0 * s * (1.0 - l));
-
-	let f = 0;
-	if (c < 1.0) {
-		f = (l - 0.5 * c) / (1.0 - c);
-	}
-
-	return [hsl[0], c * 100, f * 100];
+  var s = hsl[1] / 100;
+  var l = hsl[2] / 100;
+  var c = l < 0.5 ? 2.0 * s * l : 2.0 * s * (1.0 - l);
+  var f = 0;
+  if (c < 1.0) {
+    f = (l - 0.5 * c) / (1.0 - c);
+  }
+  return [hsl[0], c * 100, f * 100];
 };
-
 convert.hsv.hcg = function (hsv) {
-	const s = hsv[1] / 100;
-	const v = hsv[2] / 100;
-
-	const c = s * v;
-	let f = 0;
-
-	if (c < 1.0) {
-		f = (v - c) / (1 - c);
-	}
-
-	return [hsv[0], c * 100, f * 100];
+  var s = hsv[1] / 100;
+  var v = hsv[2] / 100;
+  var c = s * v;
+  var f = 0;
+  if (c < 1.0) {
+    f = (v - c) / (1 - c);
+  }
+  return [hsv[0], c * 100, f * 100];
 };
-
 convert.hcg.rgb = function (hcg) {
-	const h = hcg[0] / 360;
-	const c = hcg[1] / 100;
-	const g = hcg[2] / 100;
-
-	if (c === 0.0) {
-		return [g * 255, g * 255, g * 255];
-	}
-
-	const pure = [0, 0, 0];
-	const hi = (h % 1) * 6;
-	const v = hi % 1;
-	const w = 1 - v;
-	let mg = 0;
-
-	/* eslint-disable max-statements-per-line */
-	switch (Math.floor(hi)) {
-		case 0:
-			pure[0] = 1; pure[1] = v; pure[2] = 0; break;
-		case 1:
-			pure[0] = w; pure[1] = 1; pure[2] = 0; break;
-		case 2:
-			pure[0] = 0; pure[1] = 1; pure[2] = v; break;
-		case 3:
-			pure[0] = 0; pure[1] = w; pure[2] = 1; break;
-		case 4:
-			pure[0] = v; pure[1] = 0; pure[2] = 1; break;
-		default:
-			pure[0] = 1; pure[1] = 0; pure[2] = w;
-	}
-	/* eslint-enable max-statements-per-line */
-
-	mg = (1.0 - c) * g;
+  var h = hcg[0] / 360;
+  var c = hcg[1] / 100;
+  var g = hcg[2] / 100;
+  if (c === 0.0) {
+    return [g * 255, g * 255, g * 255];
+  }
+  var pure = [0, 0, 0];
+  var hi = h % 1 * 6;
+  var v = hi % 1;
+  var w = 1 - v;
+  var mg = 0;
+
+  /* eslint-disable max-statements-per-line */
+  switch (Math.floor(hi)) {
+    case 0:
+      pure[0] = 1;
+      pure[1] = v;
+      pure[2] = 0;
+      break;
+    case 1:
+      pure[0] = w;
+      pure[1] = 1;
+      pure[2] = 0;
+      break;
+    case 2:
+      pure[0] = 0;
+      pure[1] = 1;
+      pure[2] = v;
+      break;
+    case 3:
+      pure[0] = 0;
+      pure[1] = w;
+      pure[2] = 1;
+      break;
+    case 4:
+      pure[0] = v;
+      pure[1] = 0;
+      pure[2] = 1;
+      break;
+    default:
+      pure[0] = 1;
+      pure[1] = 0;
+      pure[2] = w;
+  }
+  /* eslint-enable max-statements-per-line */
 
-	return [
-		(c * pure[0] + mg) * 255,
-		(c * pure[1] + mg) * 255,
-		(c * pure[2] + mg) * 255
-	];
+  mg = (1.0 - c) * g;
+  return [(c * pure[0] + mg) * 255, (c * pure[1] + mg) * 255, (c * pure[2] + mg) * 255];
 };
-
 convert.hcg.hsv = function (hcg) {
-	const c = hcg[1] / 100;
-	const g = hcg[2] / 100;
-
-	const v = c + g * (1.0 - c);
-	let f = 0;
-
-	if (v > 0.0) {
-		f = c / v;
-	}
-
-	return [hcg[0], f * 100, v * 100];
+  var c = hcg[1] / 100;
+  var g = hcg[2] / 100;
+  var v = c + g * (1.0 - c);
+  var f = 0;
+  if (v > 0.0) {
+    f = c / v;
+  }
+  return [hcg[0], f * 100, v * 100];
 };
-
 convert.hcg.hsl = function (hcg) {
-	const c = hcg[1] / 100;
-	const g = hcg[2] / 100;
-
-	const l = g * (1.0 - c) + 0.5 * c;
-	let s = 0;
-
-	if (l > 0.0 && l < 0.5) {
-		s = c / (2 * l);
-	} else
-	if (l >= 0.5 && l < 1.0) {
-		s = c / (2 * (1 - l));
-	}
-
-	return [hcg[0], s * 100, l * 100];
+  var c = hcg[1] / 100;
+  var g = hcg[2] / 100;
+  var l = g * (1.0 - c) + 0.5 * c;
+  var s = 0;
+  if (l > 0.0 && l < 0.5) {
+    s = c / (2 * l);
+  } else if (l >= 0.5 && l < 1.0) {
+    s = c / (2 * (1 - l));
+  }
+  return [hcg[0], s * 100, l * 100];
 };
-
 convert.hcg.hwb = function (hcg) {
-	const c = hcg[1] / 100;
-	const g = hcg[2] / 100;
-	const v = c + g * (1.0 - c);
-	return [hcg[0], (v - c) * 100, (1 - v) * 100];
+  var c = hcg[1] / 100;
+  var g = hcg[2] / 100;
+  var v = c + g * (1.0 - c);
+  return [hcg[0], (v - c) * 100, (1 - v) * 100];
 };
-
 convert.hwb.hcg = function (hwb) {
-	const w = hwb[1] / 100;
-	const b = hwb[2] / 100;
-	const v = 1 - b;
-	const c = v - w;
-	let g = 0;
-
-	if (c < 1) {
-		g = (v - c) / (1 - c);
-	}
-
-	return [hwb[0], c * 100, g * 100];
+  var w = hwb[1] / 100;
+  var b = hwb[2] / 100;
+  var v = 1 - b;
+  var c = v - w;
+  var g = 0;
+  if (c < 1) {
+    g = (v - c) / (1 - c);
+  }
+  return [hwb[0], c * 100, g * 100];
 };
-
 convert.apple.rgb = function (apple) {
-	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
+  return [apple[0] / 65535 * 255, apple[1] / 65535 * 255, apple[2] / 65535 * 255];
 };
-
 convert.rgb.apple = function (rgb) {
-	return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535];
+  return [rgb[0] / 255 * 65535, rgb[1] / 255 * 65535, rgb[2] / 255 * 65535];
 };
-
 convert.gray.rgb = function (args) {
-	return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
+  return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
 };
-
 convert.gray.hsl = function (args) {
-	return [0, 0, args[0]];
+  return [0, 0, args[0]];
 };
-
 convert.gray.hsv = convert.gray.hsl;
-
 convert.gray.hwb = function (gray) {
-	return [0, 100, gray[0]];
+  return [0, 100, gray[0]];
 };
-
 convert.gray.cmyk = function (gray) {
-	return [0, 0, 0, gray[0]];
+  return [0, 0, 0, gray[0]];
 };
-
 convert.gray.lab = function (gray) {
-	return [gray[0], 0, 0];
+  return [gray[0], 0, 0];
 };
-
 convert.gray.hex = function (gray) {
-	const val = Math.round(gray[0] / 100 * 255) & 0xFF;
-	const integer = (val << 16) + (val << 8) + val;
-
-	const string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
+  var val = Math.round(gray[0] / 100 * 255) & 0xFF;
+  var integer = (val << 16) + (val << 8) + val;
+  var string = integer.toString(16).toUpperCase();
+  return '000000'.substring(string.length) + string;
 };
-
 convert.rgb.gray = function (rgb) {
-	const val = (rgb[0] + rgb[1] + rgb[2]) / 3;
-	return [val / 255 * 100];
+  var val = (rgb[0] + rgb[1] + rgb[2]) / 3;
+  return [val / 255 * 100];
 };
 
-
 /***/ }),
 
 /***/ "./node_modules/color/node_modules/color-convert/index.js":
@@ -60220,89 +60042,81 @@ convert.rgb.gray = function (rgb) {
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-const conversions = __webpack_require__(/*! ./conversions */ "./node_modules/color/node_modules/color-convert/conversions.js");
-const route = __webpack_require__(/*! ./route */ "./node_modules/color/node_modules/color-convert/route.js");
-
-const convert = {};
-
-const models = Object.keys(conversions);
-
+var _typeof = __webpack_require__(/*! @babel/runtime/helpers/typeof */ "./node_modules/@babel/runtime/helpers/typeof.js");
+var conversions = __webpack_require__(/*! ./conversions */ "./node_modules/color/node_modules/color-convert/conversions.js");
+var route = __webpack_require__(/*! ./route */ "./node_modules/color/node_modules/color-convert/route.js");
+var convert = {};
+var models = Object.keys(conversions);
 function wrapRaw(fn) {
-	const wrappedFn = function (...args) {
-		const arg0 = args[0];
-		if (arg0 === undefined || arg0 === null) {
-			return arg0;
-		}
-
-		if (arg0.length > 1) {
-			args = arg0;
-		}
-
-		return fn(args);
-	};
-
-	// Preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
+  var wrappedFn = function wrappedFn() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    var arg0 = args[0];
+    if (arg0 === undefined || arg0 === null) {
+      return arg0;
+    }
+    if (arg0.length > 1) {
+      args = arg0;
+    }
+    return fn(args);
+  };
 
-	return wrappedFn;
+  // Preserve .conversion property if there is one
+  if ('conversion' in fn) {
+    wrappedFn.conversion = fn.conversion;
+  }
+  return wrappedFn;
 }
-
 function wrapRounded(fn) {
-	const wrappedFn = function (...args) {
-		const arg0 = args[0];
-
-		if (arg0 === undefined || arg0 === null) {
-			return arg0;
-		}
-
-		if (arg0.length > 1) {
-			args = arg0;
-		}
-
-		const result = fn(args);
-
-		// We're assuming the result is an array here.
-		// see notice in conversions.js; don't use box types
-		// in conversion functions.
-		if (typeof result === 'object') {
-			for (let len = result.length, i = 0; i < len; i++) {
-				result[i] = Math.round(result[i]);
-			}
-		}
-
-		return result;
-	};
+  var wrappedFn = function wrappedFn() {
+    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      args[_key2] = arguments[_key2];
+    }
+    var arg0 = args[0];
+    if (arg0 === undefined || arg0 === null) {
+      return arg0;
+    }
+    if (arg0.length > 1) {
+      args = arg0;
+    }
+    var result = fn(args);
 
-	// Preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
+    // We're assuming the result is an array here.
+    // see notice in conversions.js; don't use box types
+    // in conversion functions.
+    if (_typeof(result) === 'object') {
+      for (var len = result.length, i = 0; i < len; i++) {
+        result[i] = Math.round(result[i]);
+      }
+    }
+    return result;
+  };
 
-	return wrappedFn;
+  // Preserve .conversion property if there is one
+  if ('conversion' in fn) {
+    wrappedFn.conversion = fn.conversion;
+  }
+  return wrappedFn;
 }
-
-models.forEach(fromModel => {
-	convert[fromModel] = {};
-
-	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
-	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
-
-	const routes = route(fromModel);
-	const routeModels = Object.keys(routes);
-
-	routeModels.forEach(toModel => {
-		const fn = routes[toModel];
-
-		convert[fromModel][toModel] = wrapRounded(fn);
-		convert[fromModel][toModel].raw = wrapRaw(fn);
-	});
+models.forEach(function (fromModel) {
+  convert[fromModel] = {};
+  Object.defineProperty(convert[fromModel], 'channels', {
+    value: conversions[fromModel].channels
+  });
+  Object.defineProperty(convert[fromModel], 'labels', {
+    value: conversions[fromModel].labels
+  });
+  var routes = route(fromModel);
+  var routeModels = Object.keys(routes);
+  routeModels.forEach(function (toModel) {
+    var fn = routes[toModel];
+    convert[fromModel][toModel] = wrapRounded(fn);
+    convert[fromModel][toModel].raw = wrapRaw(fn);
+  });
 });
-
 module.exports = convert;
 
-
 /***/ }),
 
 /***/ "./node_modules/color/node_modules/color-convert/route.js":
@@ -60312,7 +60126,7 @@ module.exports = convert;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-const conversions = __webpack_require__(/*! ./conversions */ "./node_modules/color/node_modules/color-convert/conversions.js");
+var conversions = __webpack_require__(/*! ./conversions */ "./node_modules/color/node_modules/color-convert/conversions.js");
 
 /*
 	This function routes a model to all other models.
@@ -60326,91 +60140,74 @@ const conversions = __webpack_require__(/*! ./conversions */ "./node_modules/col
 */
 
 function buildGraph() {
-	const graph = {};
-	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
-	const models = Object.keys(conversions);
-
-	for (let len = models.length, i = 0; i < len; i++) {
-		graph[models[i]] = {
-			// http://jsperf.com/1-vs-infinity
-			// micro-opt, but this is simple.
-			distance: -1,
-			parent: null
-		};
-	}
-
-	return graph;
+  var graph = {};
+  // https://jsperf.com/object-keys-vs-for-in-with-closure/3
+  var models = Object.keys(conversions);
+  for (var len = models.length, i = 0; i < len; i++) {
+    graph[models[i]] = {
+      // http://jsperf.com/1-vs-infinity
+      // micro-opt, but this is simple.
+      distance: -1,
+      parent: null
+    };
+  }
+  return graph;
 }
 
 // https://en.wikipedia.org/wiki/Breadth-first_search
 function deriveBFS(fromModel) {
-	const graph = buildGraph();
-	const queue = [fromModel]; // Unshift -> queue -> pop
-
-	graph[fromModel].distance = 0;
-
-	while (queue.length) {
-		const current = queue.pop();
-		const adjacents = Object.keys(conversions[current]);
-
-		for (let len = adjacents.length, i = 0; i < len; i++) {
-			const adjacent = adjacents[i];
-			const node = graph[adjacent];
-
-			if (node.distance === -1) {
-				node.distance = graph[current].distance + 1;
-				node.parent = current;
-				queue.unshift(adjacent);
-			}
-		}
-	}
+  var graph = buildGraph();
+  var queue = [fromModel]; // Unshift -> queue -> pop
 
-	return graph;
+  graph[fromModel].distance = 0;
+  while (queue.length) {
+    var current = queue.pop();
+    var adjacents = Object.keys(conversions[current]);
+    for (var len = adjacents.length, i = 0; i < len; i++) {
+      var adjacent = adjacents[i];
+      var node = graph[adjacent];
+      if (node.distance === -1) {
+        node.distance = graph[current].distance + 1;
+        node.parent = current;
+        queue.unshift(adjacent);
+      }
+    }
+  }
+  return graph;
 }
-
 function link(from, to) {
-	return function (args) {
-		return to(from(args));
-	};
+  return function (args) {
+    return to(from(args));
+  };
 }
-
 function wrapConversion(toModel, graph) {
-	const path = [graph[toModel].parent, toModel];
-	let fn = conversions[graph[toModel].parent][toModel];
-
-	let cur = graph[toModel].parent;
-	while (graph[cur].parent) {
-		path.unshift(graph[cur].parent);
-		fn = link(conversions[graph[cur].parent][cur], fn);
-		cur = graph[cur].parent;
-	}
-
-	fn.conversion = path;
-	return fn;
+  var path = [graph[toModel].parent, toModel];
+  var fn = conversions[graph[toModel].parent][toModel];
+  var cur = graph[toModel].parent;
+  while (graph[cur].parent) {
+    path.unshift(graph[cur].parent);
+    fn = link(conversions[graph[cur].parent][cur], fn);
+    cur = graph[cur].parent;
+  }
+  fn.conversion = path;
+  return fn;
 }
-
 module.exports = function (fromModel) {
-	const graph = deriveBFS(fromModel);
-	const conversion = {};
-
-	const models = Object.keys(graph);
-	for (let len = models.length, i = 0; i < len; i++) {
-		const toModel = models[i];
-		const node = graph[toModel];
-
-		if (node.parent === null) {
-			// No possible conversion, or this node is the source model.
-			continue;
-		}
-
-		conversion[toModel] = wrapConversion(toModel, graph);
-	}
-
-	return conversion;
+  var graph = deriveBFS(fromModel);
+  var conversion = {};
+  var models = Object.keys(graph);
+  for (var len = models.length, i = 0; i < len; i++) {
+    var toModel = models[i];
+    var node = graph[toModel];
+    if (node.parent === null) {
+      // No possible conversion, or this node is the source model.
+      continue;
+    }
+    conversion[toModel] = wrapConversion(toModel, graph);
+  }
+  return conversion;
 };
 
-
-
 /***/ }),
 
 /***/ "./node_modules/core-js-pure/actual/array/from.js":