rsuite 5.0.0-beta.7 → 5.0.2

package/cjs/toaster/ToastContainer.js

@@ -23,12 +23,6 @@ var _Transition = _interopRequireDefault(require("../Animation/Transition"));
 
 var _utils = require("../utils");
 
-var defaultProps = {
-  as: 'div',
-  classPrefix: 'toast-container',
-  placement: 'topCenter'
-};
-
 var useMessages = function useMessages() {
   var _useState = (0, _react.useState)([]),
       messages = _useState[0],
@@ -89,10 +83,13 @@ var useMessages = function useMessages() {
 
 var ToastContainer = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var rootRef = (0, _react.useRef)();
-  var Component = props.as,
+  var _props$as = props.as,
+      Component = _props$as === void 0 ? 'div' : _props$as,
       className = props.className,
-      classPrefix = props.classPrefix,
-      placement = props.placement,
+      _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'toast-container' : _props$classPrefix,
+      _props$placement = props.placement,
+      placement = _props$placement === void 0 ? 'topCenter' : _props$placement,
       rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "className", "classPrefix", "placement"]);
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
@@ -171,7 +168,6 @@ ToastContainer.getInstance = function (props) {
 };
 
 ToastContainer.displayName = 'ToastContainer';
-ToastContainer.defaultProps = defaultProps;
 ToastContainer.propTypes = {
   className: _propTypes.default.string,
   classPrefix: _propTypes.default.string,

package/cjs/utils/createComponent.d.ts

@@ -8,7 +8,6 @@ interface Props extends React.HTMLAttributes<HTMLDivElement> {
 }
 /**
  * Create a component with `classPrefix` and `as` attributes.
- * @param defaultProps
  */
-declare function createComponent(defaultProps: Props): RsRefForwardingComponent<"div", ComponentProps>;
+declare function createComponent({ name, componentAs, componentClassPrefix, ...defaultProps }: Props): RsRefForwardingComponent<"div", ComponentProps>;
 export default createComponent;

package/cjs/utils/createComponent.js

@@ -19,17 +19,18 @@ var _utils = require("../utils");
 
 /**
  * Create a component with `classPrefix` and `as` attributes.
- * @param defaultProps
  */
-function createComponent(defaultProps) {
-  var name = defaultProps.name,
-      componentAs = defaultProps.componentAs,
-      componentClassPrefix = defaultProps.componentClassPrefix,
-      componentRestProps = (0, _objectWithoutPropertiesLoose2.default)(defaultProps, ["name", "componentAs", "componentClassPrefix"]);
+function createComponent(_ref) {
+  var name = _ref.name,
+      componentAs = _ref.componentAs,
+      componentClassPrefix = _ref.componentClassPrefix,
+      defaultProps = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["name", "componentAs", "componentClassPrefix"]);
 
   var Component = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
-    var Component = props.as,
-        classPrefix = props.classPrefix,
+    var _props$as = props.as,
+        Component = _props$as === void 0 ? componentAs || 'div' : _props$as,
+        _props$classPrefix = props.classPrefix,
+        classPrefix = _props$classPrefix === void 0 ? componentClassPrefix || (0, _kebabCase.default)(name) : _props$classPrefix,
         className = props.className,
         role = props.role,
         rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "classPrefix", "className", "role"]);
@@ -39,7 +40,7 @@ function createComponent(defaultProps) {
         merge = _useClassNames.merge;
 
     var classes = merge(className, withClassPrefix());
-    return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
+    return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, defaultProps, rest, {
       role: role,
       ref: ref,
       className: classes
@@ -53,10 +54,6 @@ function createComponent(defaultProps) {
     classPrefix: _propTypes.default.string,
     children: _propTypes.default.node
   };
-  Component.defaultProps = (0, _extends2.default)({}, componentRestProps, {
-    as: componentAs || 'div',
-    classPrefix: componentClassPrefix || (0, _kebabCase.default)(name)
-  });
   return Component;
 }
 

package/cjs/utils/dateUtils.d.ts

@@ -19,6 +19,7 @@ export { default as isBefore } from 'date-fns/isBefore';
 export { default as isEqual } from 'date-fns/isEqual';
 export { default as isSameDay } from 'date-fns/isSameDay';
 export { default as isSameMonth } from 'date-fns/isSameMonth';
+export { default as isSameSecond } from 'date-fns/isSameSecond';
 export { default as parse } from 'date-fns/parse';
 export { default as parseISO } from 'date-fns/parseISO';
 export { default as setDate } from 'date-fns/setDate';

package/cjs/utils/dateUtils.js

@@ -6,7 +6,7 @@ exports.__esModule = true;
 exports.disabledTime = disabledTime;
 exports.getMonthView = getMonthView;
 exports.getDateMask = getDateMask;
-exports.shouldOnlyTime = exports.shouldDate = exports.shouldMonth = exports.shouldTime = exports.omitHideDisabledProps = exports.calendarOnlyProps = exports.isValid = exports.isMatch = exports.subDays = exports.startOfWeek = exports.startOfMonth = exports.startOfISOWeek = exports.startOfDay = exports.setYear = exports.setSeconds = exports.setMonth = exports.setMinutes = exports.setHours = exports.setDate = exports.parseISO = exports.parse = exports.isSameMonth = exports.isSameDay = exports.isEqual = exports.isBefore = exports.isAfter = exports.getYear = exports.getSeconds = exports.getMonth = exports.getMinutes = exports.getHours = exports.getDaysInMonth = exports.getDay = exports.getDate = exports.format = exports.endOfWeek = exports.endOfMonth = exports.endOfISOWeek = exports.endOfDay = exports.compareAsc = exports.addMonths = exports.addDays = void 0;
+exports.shouldOnlyTime = exports.shouldDate = exports.shouldMonth = exports.shouldTime = exports.omitHideDisabledProps = exports.calendarOnlyProps = exports.isValid = exports.isMatch = exports.subDays = exports.startOfWeek = exports.startOfMonth = exports.startOfISOWeek = exports.startOfDay = exports.setYear = exports.setSeconds = exports.setMonth = exports.setMinutes = exports.setHours = exports.setDate = exports.parseISO = exports.parse = exports.isSameSecond = exports.isSameMonth = exports.isSameDay = exports.isEqual = exports.isBefore = exports.isAfter = exports.getYear = exports.getSeconds = exports.getMonth = exports.getMinutes = exports.getHours = exports.getDaysInMonth = exports.getDay = exports.getDate = exports.format = exports.endOfWeek = exports.endOfMonth = exports.endOfISOWeek = exports.endOfDay = exports.compareAsc = exports.addMonths = exports.addDays = void 0;
 
 var _pick = _interopRequireDefault(require("lodash/pick"));
 
@@ -96,6 +96,10 @@ var _isSameMonth = _interopRequireDefault(require("date-fns/isSameMonth"));
 
 exports.isSameMonth = _isSameMonth.default;
 
+var _isSameSecond = _interopRequireDefault(require("date-fns/isSameSecond"));
+
+exports.isSameSecond = _isSameSecond.default;
+
 var _parse = _interopRequireDefault(require("date-fns/parse"));
 
 exports.parse = _parse.default;

package/cjs/utils/previewFile.d.ts

@@ -1,2 +1,3 @@
+export declare function isImage(file: any): boolean;
 declare const _default: (file: File, callback: (result: string | ArrayBuffer) => void) => void;
 export default _default;

package/cjs/utils/previewFile.js

@@ -1,9 +1,20 @@
 "use strict";
 
 exports.__esModule = true;
+exports.isImage = isImage;
 exports.default = void 0;
+// https://developer.mozilla.org/en-US/docs/Web/Media/Formats/Image_types
+var MIME = ['image/apng', 'image/avif', 'image/gif', 'image/jpeg', 'image/png', 'image/svg+xml', 'image/webp'];
+
+function isImage(file) {
+  return MIME.includes(file === null || file === void 0 ? void 0 : file.type);
+}
 
 var _default = function _default(file, callback) {
+  if (!isImage(file)) {
+    return callback(null);
+  }
+
   var reader = new FileReader();
 
   reader.onloadend = function () {

package/cjs/utils/useInternalId.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Used for generating unique ID for DOM elements
+ */
+export default function useInternalId(prefix?: string): string;

package/cjs/utils/useInternalId.js

@@ -0,0 +1,24 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.default = useInternalId;
+
+var _react = require("react");
+
+var _uniqueId = _interopRequireDefault(require("lodash/uniqueId"));
+
+/**
+ * Used for generating unique ID for DOM elements
+ */
+function useInternalId(prefix) {
+  var idRef = (0, _react.useRef)();
+
+  if (!idRef.current) {
+    idRef.current = (0, _uniqueId.default)("internal://" + prefix);
+  }
+
+  (0, _react.useDebugValue)(idRef.current);
+  return idRef.current;
+}

package/cjs/utils/useUniqueId.d.ts

@@ -1,4 +1,6 @@
 /**
- * Used for generating unique ID for elements
+ * Used for generating unique ID for DOM elements
+ *
+ * @param idProp If id is provided, it will be used instead of generating a new one
  */
-export default function useUniqueId(prefix?: string): string;
+export default function useUniqueId(prefix: string, idProp?: string): string;

package/cjs/utils/useUniqueId.js

@@ -10,14 +10,16 @@ var _react = require("react");
 var _uniqueId = _interopRequireDefault(require("lodash/uniqueId"));
 
 /**
- * Used for generating unique ID for elements
+ * Used for generating unique ID for DOM elements
+ *
+ * @param idProp If id is provided, it will be used instead of generating a new one
  */
-function useUniqueId(prefix) {
+function useUniqueId(prefix, idProp) {
   var idRef = (0, _react.useRef)();
 
   if (!idRef.current) {
     idRef.current = (0, _uniqueId.default)(prefix);
   }
 
-  return idRef.current;
+  return idProp !== null && idProp !== void 0 ? idProp : idRef.current;
 }

package/dist/rsuite-rtl.css

@@ -224,6 +224,20 @@
   --rs-navbar-subtle-selected-text: #1675e0;
   --rs-navbar-subtle-hover-bg: #f7f7fa;
   --rs-navbar-subtle-hover-text: #575757;
+  --rs-sidenav-default-bg: #f7f7fa;
+  --rs-sidenav-default-text: #575757;
+  --rs-sidenav-default-selected-text: #1675e0;
+  --rs-sidenav-default-hover-bg: #e5e5ea;
+  --rs-sidenav-default-hover-text: #575757;
+  --rs-sidenav-inverse-bg: #3498ff;
+  --rs-sidenav-inverse-text: #fff;
+  --rs-sidenav-inverse-selected-bg: #1675e0;
+  --rs-sidenav-inverse-hover-bg: #2589f5;
+  --rs-sidenav-subtle-bg: #fff;
+  --rs-sidenav-subtle-text: #8e8e93;
+  --rs-sidenav-subtle-selected-text: #1675e0;
+  --rs-sidenav-subtle-hover-bg: #f7f7fa;
+  --rs-sidenav-subtle-hover-text: #575757;
   --rs-input-bg: #fff;
   --rs-input-focus-border: #3498ff;
   --rs-input-disabled-bg: #f7f7fa;
@@ -525,6 +539,20 @@
   --rs-navbar-subtle-selected-text: #34c3ff;
   --rs-navbar-subtle-hover-bg: #292d33;
   --rs-navbar-subtle-hover-text: #e9ebf0;
+  --rs-sidenav-default-bg: #1a1d24;
+  --rs-sidenav-default-text: #a4a9b3;
+  --rs-sidenav-default-selected-text: #34c3ff;
+  --rs-sidenav-default-hover-bg: #292d33;
+  --rs-sidenav-default-hover-text: #e9ebf0;
+  --rs-sidenav-inverse-bg: #169de0;
+  --rs-sidenav-inverse-text: #fff;
+  --rs-sidenav-inverse-selected-bg: #59d0ff;
+  --rs-sidenav-inverse-hover-bg: #25b3f5;
+  --rs-sidenav-subtle-bg: transparent;
+  --rs-sidenav-subtle-text: #a4a9b3;
+  --rs-sidenav-subtle-selected-text: #34c3ff;
+  --rs-sidenav-subtle-hover-bg: #292d33;
+  --rs-sidenav-subtle-hover-text: #e9ebf0;
   --rs-input-bg: #1a1d24;
   --rs-input-focus-border: #34c3ff;
   --rs-input-disabled-bg: #292d33;
@@ -834,6 +862,21 @@
   --rs-navbar-subtle-selected-text: #ffff00;
   --rs-navbar-subtle-hover-bg: transparent;
   --rs-navbar-subtle-hover-text: #ffff00;
+  --rs-sidenav-default-bg: #1a1d24;
+  --rs-sidenav-default-text: #e9ebf0;
+  --rs-sidenav-default-selected-text: #ffff00;
+  --rs-sidenav-default-hover-bg: transparent;
+  --rs-sidenav-default-hover-text: #ffff00;
+  --rs-sidenav-inverse-bg: #1a1d24;
+  --rs-sidenav-inverse-text: #e9ebf0;
+  --rs-sidenav-inverse-selected-bg: transparent;
+  --rs-sidenav-inverse-selected-text: #ffff00;
+  --rs-sidenav-inverse-hover-bg: transparent;
+  --rs-sidenav-subtle-bg: #1a1d24;
+  --rs-sidenav-subtle-text: #e9ebf0;
+  --rs-sidenav-subtle-selected-text: #ffff00;
+  --rs-sidenav-subtle-hover-bg: transparent;
+  --rs-sidenav-subtle-hover-text: #ffff00;
   --rs-input-bg: #1a1d24;
   --rs-input-focus-border: #ffff00;
   --rs-input-disabled-bg: #292d33;
@@ -4383,16 +4426,19 @@ label:hover .rs-checkbox-wrapper .rs-checkbox-inner::before {
   max-width: 100%;
 }
 .rs-picker-menu .rs-calendar {
-  width: 246px;
+  min-width: 246px;
   display: block;
   margin: 0 auto;
 }
 .rs-picker-menu .rs-calendar-show-week-numbers {
-  width: 278px;
+  min-width: 278px;
 }
 .rs-picker-menu .rs-calendar-header {
   width: 100%;
 }
+.rs-picker-menu .rs-calendar-table {
+  width: unset;
+}
 .rs-picker-menu .rs-calendar .rs-calendar-month-dropdown-cell-content,
 .rs-picker-menu .rs-calendar .rs-calendar-table-cell-content {
   width: 30px;
@@ -5892,7 +5938,7 @@ label:hover .rs-checkbox-wrapper .rs-checkbox-inner::before {
 .rs-grid-container-fluid::after {
   clear: both;
 }
-.col {
+.rs-col {
   float: right;
   position: relative;
   min-height: 1px;
@@ -12385,13 +12431,21 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
 }
 .rs-sidenav-nav > .rs-sidenav-item,
 .rs-sidenav-nav > .rs-dropdown .rs-dropdown-toggle,
-.rs-sidenav-nav .rs-dropdown-item {
+.rs-sidenav-nav .rs-dropdown-item,
+.rs-sidenav-nav .rs-dropdown-item-toggle {
   padding: 15px 20px;
   -webkit-transition: color 0.3s linear, background-color 0.3s linear;
   transition: color 0.3s linear, background-color 0.3s linear;
   border-radius: 0;
   color: inherit;
 }
+.rs-theme-high-contrast .rs-sidenav-nav > .rs-sidenav-item,
+.rs-theme-high-contrast .rs-sidenav-nav > .rs-dropdown .rs-dropdown-toggle,
+.rs-theme-high-contrast .rs-sidenav-nav .rs-dropdown-item,
+.rs-theme-high-contrast .rs-sidenav-nav .rs-dropdown-item-toggle {
+  -webkit-transition: none;
+  transition: none;
+}
 .rs-sidenav-nav > .rs-sidenav-item,
 .rs-sidenav-nav > .rs-dropdown {
   margin: 0 !important;
@@ -12726,22 +12780,39 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
 }
 .rs-sidenav-default {
   background-color: #f7f7fa;
-  background-color: var(--rs-navbar-default-bg);
+  background-color: var(--rs-sidenav-default-bg);
   color: #575757;
-  color: var(--rs-navbar-default-text);
+  color: var(--rs-sidenav-default-text);
+}
+.rs-sidenav-default .rs-sidenav-item,
+.rs-sidenav-default .rs-dropdown-toggle {
+  background-color: #f7f7fa;
+  background-color: var(--rs-sidenav-default-bg);
 }
-.rs-sidenav-default .rs-navbar-item:hover,
+.rs-sidenav-default .rs-sidenav-item:hover,
 .rs-sidenav-default .rs-dropdown .rs-dropdown-toggle:hover,
 .rs-sidenav-default .rs-dropdown.rs-dropdown-open .rs-dropdown-toggle {
   background-color: #e5e5ea;
-  background-color: var(--rs-navbar-default-hover-bg);
+  background-color: var(--rs-sidenav-default-hover-bg);
   color: #575757;
-  color: var(--rs-navbar-default-hover-text);
+  color: var(--rs-sidenav-default-hover-text);
 }
-.rs-sidenav-default .rs-navbar-item.rs-navbar-item-active,
-.rs-sidenav-default .rs-dropdown .rs-dropdown-menu-active ~ .rs-dropdown-toggle {
+.rs-sidenav-default .rs-sidenav-item.rs-sidenav-item-active,
+.rs-sidenav-default .rs-dropdown-item.rs-dropdown-item-active,
+.rs-sidenav-default .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle-icon {
   color: #1675e0;
-  color: var(--rs-navbar-default-selected-text);
+  color: var(--rs-sidenav-default-selected-text);
+}
+.rs-sidenav-default.rs-sidenav-collapse-out .rs-dropdown-item.rs-dropdown-item-active {
+  background-color: rgba(204, 233, 255, 0.5);
+  background-color: var(--rs-menuitem-active-bg);
+  color: #1675e0;
+  color: var(--rs-menuitem-active-text);
+}
+.rs-theme-high-contrast .rs-sidenav-default.rs-sidenav-collapse-out .rs-dropdown-item.rs-dropdown-item-active {
+  text-decoration: underline;
+  -webkit-box-shadow: inset 0 0 0 2px #fff;
+          box-shadow: inset 0 0 0 2px #fff;
 }
 .rs-sidenav-default.rs-sidenav-collapse-in .rs-dropdown-item:not(.rs-dropdown-item-submenu),
 .rs-sidenav-default.rs-sidenav-collapsing .rs-dropdown-item:not(.rs-dropdown-item-submenu),
@@ -12750,7 +12821,7 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
 .rs-sidenav-default.rs-sidenav-collapse-in .rs-dropdown-item > .rs-dropdown-item-toggle,
 .rs-sidenav-default.rs-sidenav-collapsing .rs-dropdown-item > .rs-dropdown-item-toggle {
   color: #575757;
-  color: var(--rs-navbar-default-text);
+  color: var(--rs-sidenav-default-text);
 }
 .rs-sidenav-default.rs-sidenav-collapse-in .rs-dropdown-item:not(.rs-dropdown-item-submenu):hover,
 .rs-sidenav-default.rs-sidenav-collapsing .rs-dropdown-item:not(.rs-dropdown-item-submenu):hover,
@@ -12771,16 +12842,16 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
 .rs-sidenav-default.rs-sidenav-collapse-in .rs-dropdown-item > .rs-dropdown-item-toggle.rs-dropdown-item-focus,
 .rs-sidenav-default.rs-sidenav-collapsing .rs-dropdown-item > .rs-dropdown-item-toggle.rs-dropdown-item-focus {
   background-color: #e5e5ea;
-  background-color: var(--rs-navbar-default-hover-bg);
+  background-color: var(--rs-sidenav-default-hover-bg);
   color: #575757;
-  color: var(--rs-navbar-default-hover-text);
+  color: var(--rs-sidenav-default-hover-text);
 }
 .rs-sidenav-default.rs-sidenav-collapse-in .rs-sidenav-item.rs-sidenav-item-active,
 .rs-sidenav-default.rs-sidenav-collapsing .rs-sidenav-item.rs-sidenav-item-active,
 .rs-sidenav-default.rs-sidenav-collapse-in .rs-dropdown-menu > .rs-dropdown-item.rs-dropdown-item-active,
 .rs-sidenav-default.rs-sidenav-collapsing .rs-dropdown-menu > .rs-dropdown-item.rs-dropdown-item-active {
   color: #1675e0;
-  color: var(--rs-navbar-default-selected-text);
+  color: var(--rs-sidenav-default-selected-text);
 }
 .rs-theme-high-contrast .rs-sidenav-default.rs-sidenav-collapse-in .rs-sidenav-item.rs-sidenav-item-active,
 .rs-theme-high-contrast .rs-sidenav-default.rs-sidenav-collapsing .rs-sidenav-item.rs-sidenav-item-active,
@@ -12788,56 +12859,59 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
 .rs-theme-high-contrast .rs-sidenav-default.rs-sidenav-collapsing .rs-dropdown-menu > .rs-dropdown-item.rs-dropdown-item-active {
   text-decoration: underline;
 }
-.rs-sidenav-default.rs-sidenav-collapse-in .rs-dropdown-menu.rs-dropdown-menu-active ~ .rs-dropdown-toggle > .rs-icon,
-.rs-sidenav-default.rs-sidenav-collapsing .rs-dropdown-menu.rs-dropdown-menu-active ~ .rs-dropdown-toggle > .rs-icon,
-.rs-sidenav-default.rs-sidenav-collapse-out .rs-dropdown-menu.rs-dropdown-menu-active ~ .rs-dropdown-toggle > .rs-icon {
+.rs-sidenav-default.rs-sidenav-collapse-in .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle-icon,
+.rs-sidenav-default.rs-sidenav-collapsing .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle-icon,
+.rs-sidenav-default.rs-sidenav-collapse-out .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle-icon {
   color: #1675e0;
-  color: var(--rs-navbar-default-selected-text);
+  color: var(--rs-sidenav-default-selected-text);
 }
 .rs-sidenav-inverse {
   background-color: #3498ff;
-  background-color: var(--rs-navbar-inverse-bg);
+  background-color: var(--rs-sidenav-inverse-bg);
   color: #fff;
-  color: var(--rs-navbar-inverse-text);
+  color: var(--rs-sidenav-inverse-text);
+}
+.rs-sidenav-inverse .rs-sidenav-item,
+.rs-sidenav-inverse .rs-dropdown .rs-dropdown-toggle,
+.rs-sidenav-inverse .rs-dropdown-item-submenu:hover > .rs-dropdown-item-toggle {
+  background-color: #3498ff;
+  background-color: var(--rs-sidenav-inverse-bg);
 }
-.rs-sidenav-inverse .rs-navbar-item:hover,
+.rs-sidenav-inverse .rs-sidenav-item:hover,
 .rs-sidenav-inverse .rs-dropdown .rs-dropdown-toggle:hover,
-.rs-sidenav-inverse .rs-navbar-item:focus,
-.rs-sidenav-inverse .rs-dropdown .rs-dropdown-toggle:focus {
+.rs-sidenav-inverse .rs-dropdown-item-submenu:hover > .rs-dropdown-item-toggle:hover,
+.rs-sidenav-inverse .rs-sidenav-item:focus,
+.rs-sidenav-inverse .rs-dropdown .rs-dropdown-toggle:focus,
+.rs-sidenav-inverse .rs-dropdown-item-submenu:hover > .rs-dropdown-item-toggle:focus {
   background-color: #2589f5;
-  background-color: var(--rs-navbar-inverse-hover-bg);
+  background-color: var(--rs-sidenav-inverse-hover-bg);
 }
-.rs-sidenav-inverse .rs-navbar-item.rs-navbar-item-active,
-.rs-sidenav-inverse .rs-dropdown .rs-dropdown-menu-active ~ .rs-dropdown-toggle {
-  background-color: #1675e0;
-  background-color: var(--rs-navbar-inverse-selected-bg);
+.rs-theme-high-contrast .rs-sidenav-inverse .rs-sidenav-item.rs-sidenav-item-active,
+.rs-theme-high-contrast .rs-sidenav-inverse .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle {
+  color: var(--rs-sidenav-inverse-selected-text);
 }
-.rs-theme-high-contrast .rs-sidenav-inverse .rs-navbar-item.rs-navbar-item-active,
-.rs-theme-high-contrast .rs-sidenav-inverse .rs-dropdown .rs-dropdown-menu-active ~ .rs-dropdown-toggle {
-  color: var(--rs-navbar-inverse-selected-text);
-}
-.rs-sidenav-inverse .rs-dropdown .rs-dropdown-menu-active ~ .rs-dropdown-toggle,
+.rs-sidenav-inverse .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle,
 .rs-sidenav-inverse .rs-sidenav-item,
 .rs-sidenav-inverse .rs-dropdown .rs-dropdown-toggle {
   color: #fff;
-  color: var(--rs-navbar-inverse-text);
+  color: var(--rs-sidenav-inverse-text);
 }
-.rs-sidenav-inverse .rs-dropdown .rs-dropdown-menu-active ~ .rs-dropdown-toggle:hover,
+.rs-sidenav-inverse .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle:hover,
 .rs-sidenav-inverse .rs-sidenav-item:hover,
 .rs-sidenav-inverse .rs-dropdown .rs-dropdown-toggle:hover,
-.rs-sidenav-inverse .rs-dropdown .rs-dropdown-menu-active ~ .rs-dropdown-toggle:focus,
+.rs-sidenav-inverse .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle:focus,
 .rs-sidenav-inverse .rs-sidenav-item:focus,
 .rs-sidenav-inverse .rs-dropdown .rs-dropdown-toggle:focus,
-.rs-sidenav-inverse .rs-dropdown .rs-dropdown-menu-active ~ .rs-dropdown-toggle.rs-dropdown-item-focus,
+.rs-sidenav-inverse .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle.rs-dropdown-item-focus,
 .rs-sidenav-inverse .rs-sidenav-item.rs-dropdown-item-focus,
 .rs-sidenav-inverse .rs-dropdown .rs-dropdown-toggle.rs-dropdown-item-focus {
   color: #fff;
-  color: var(--rs-navbar-inverse-text);
+  color: var(--rs-sidenav-inverse-text);
 }
-.rs-sidenav-inverse .rs-dropdown .rs-dropdown-menu-active ~ .rs-dropdown-toggle,
-.rs-sidenav-inverse .rs-sidenav-item.rs-sidenav-item-active {
+.rs-sidenav-inverse .rs-sidenav-item.rs-sidenav-item-active,
+.rs-sidenav-inverse .rs-dropdown-item.rs-dropdown-item-active {
   background-color: #1675e0;
-  background-color: var(--rs-navbar-inverse-selected-bg);
+  background-color: var(--rs-sidenav-inverse-selected-bg);
 }
 .rs-sidenav-inverse.rs-sidenav-collapse-in .rs-dropdown-item:not(.rs-dropdown-item-submenu),
 .rs-sidenav-inverse.rs-sidenav-collapsing .rs-dropdown-item:not(.rs-dropdown-item-submenu),
@@ -12846,7 +12920,7 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
 .rs-sidenav-inverse.rs-sidenav-collapse-in .rs-dropdown-item > .rs-dropdown-item-toggle,
 .rs-sidenav-inverse.rs-sidenav-collapsing .rs-dropdown-item > .rs-dropdown-item-toggle {
   color: #fff;
-  color: var(--rs-navbar-inverse-text);
+  color: var(--rs-sidenav-inverse-text);
 }
 .rs-sidenav-inverse.rs-sidenav-collapse-in .rs-dropdown-item:not(.rs-dropdown-item-submenu):hover,
 .rs-sidenav-inverse.rs-sidenav-collapsing .rs-dropdown-item:not(.rs-dropdown-item-submenu):hover,
@@ -12867,32 +12941,31 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
 .rs-sidenav-inverse.rs-sidenav-collapse-in .rs-dropdown-item > .rs-dropdown-item-toggle.rs-dropdown-item-focus,
 .rs-sidenav-inverse.rs-sidenav-collapsing .rs-dropdown-item > .rs-dropdown-item-toggle.rs-dropdown-item-focus {
   background-color: #2589f5;
-  background-color: var(--rs-navbar-inverse-hover-bg);
+  background-color: var(--rs-sidenav-inverse-hover-bg);
   color: #fff;
-  color: var(--rs-navbar-inverse-text);
-}
-.rs-sidenav-inverse.rs-sidenav-collapse-in .rs-dropdown-menu > .rs-dropdown-item.rs-dropdown-item-active:not(.rs-dropdown-item-submenu),
-.rs-sidenav-inverse.rs-sidenav-collapsing .rs-dropdown-menu > .rs-dropdown-item.rs-dropdown-item-active:not(.rs-dropdown-item-submenu) {
-  background-color: #2589f5;
-  background-color: var(--rs-navbar-inverse-hover-bg);
+  color: var(--rs-sidenav-inverse-text);
 }
 .rs-sidenav-subtle {
   background-color: transparent;
   color: #8e8e93;
-  color: var(--rs-navbar-subtle-text);
+  color: var(--rs-sidenav-subtle-text);
 }
-.rs-sidenav-subtle .rs-navbar-item:hover,
+.rs-sidenav-subtle .rs-sidenav-item,
+.rs-sidenav-subtle .rs-dropdown .rs-dropdown-toggle {
+  background-color: transparent;
+}
+.rs-sidenav-subtle .rs-sidenav-item:hover,
 .rs-sidenav-subtle .rs-dropdown .rs-dropdown-toggle:hover,
-.rs-sidenav-subtle .rs-navbar-item:focus,
+.rs-sidenav-subtle .rs-sidenav-item:focus,
 .rs-sidenav-subtle .rs-dropdown .rs-dropdown-toggle:focus {
   background-color: transparent;
   color: #575757;
-  color: var(--rs-navbar-subtle-hover-text);
+  color: var(--rs-sidenav-subtle-hover-text);
 }
-.rs-sidenav-subtle .rs-navbar-item.rs-navbar-item-active,
-.rs-sidenav-subtle .rs-dropdown .rs-dropdown-menu-active ~ .rs-dropdown-toggle {
+.rs-sidenav-subtle .rs-sidenav-item.rs-sidenav-item-active,
+.rs-sidenav-subtle .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle {
   color: #1675e0;
-  color: var(--rs-navbar-subtle-selected-text);
+  color: var(--rs-sidenav-subtle-selected-text);
 }
 .rs-sidenav-subtle .rs-dropdown-open > .rs-dropdown-toggle.btn {
   background-color: transparent;
@@ -12900,7 +12973,7 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
 .rs-sidenav-subtle .rs-dropdown-open > .rs-dropdown-toggle.btn:hover,
 .rs-sidenav-subtle .rs-dropdown-open > .rs-dropdown-toggle.btn:focus {
   background-color: #f7f7fa;
-  background-color: var(--rs-navbar-subtle-hover-bg);
+  background-color: var(--rs-sidenav-subtle-hover-bg);
 }
 .rs-sidenav-subtle.rs-sidenav-collapse-in .rs-dropdown-item:not(.rs-dropdown-item-submenu),
 .rs-sidenav-subtle.rs-sidenav-collapsing .rs-dropdown-item:not(.rs-dropdown-item-submenu),
@@ -12909,7 +12982,7 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
 .rs-sidenav-subtle.rs-sidenav-collapse-in .rs-dropdown-item > .rs-dropdown-item-toggle,
 .rs-sidenav-subtle.rs-sidenav-collapsing .rs-dropdown-item > .rs-dropdown-item-toggle {
   color: #8e8e93;
-  color: var(--rs-navbar-subtle-text);
+  color: var(--rs-sidenav-subtle-text);
 }
 .rs-sidenav-subtle.rs-sidenav-collapse-in .rs-dropdown-item:not(.rs-dropdown-item-submenu):hover,
 .rs-sidenav-subtle.rs-sidenav-collapsing .rs-dropdown-item:not(.rs-dropdown-item-submenu):hover,
@@ -12924,32 +12997,32 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
 .rs-sidenav-subtle.rs-sidenav-collapse-in .rs-dropdown-item > .rs-dropdown-item-toggle:focus,
 .rs-sidenav-subtle.rs-sidenav-collapsing .rs-dropdown-item > .rs-dropdown-item-toggle:focus {
   background-color: #f7f7fa;
-  background-color: var(--rs-navbar-subtle-hover-bg);
+  background-color: var(--rs-sidenav-subtle-hover-bg);
   color: #575757;
-  color: var(--rs-navbar-subtle-hover-text);
+  color: var(--rs-sidenav-subtle-hover-text);
 }
 .rs-sidenav-subtle.rs-sidenav-collapse-in .rs-dropdown-menu > .rs-dropdown-item.rs-dropdown-item-active,
 .rs-sidenav-subtle.rs-sidenav-collapsing .rs-dropdown-menu > .rs-dropdown-item.rs-dropdown-item-active {
   color: #1675e0;
-  color: var(--rs-navbar-subtle-selected-text);
+  color: var(--rs-sidenav-subtle-selected-text);
 }
-.rs-sidenav-subtle.rs-sidenav-collapse-in .rs-dropdown-menu.rs-dropdown-menu-active ~ .rs-dropdown-toggle,
-.rs-sidenav-subtle.rs-sidenav-collapsing .rs-dropdown-menu.rs-dropdown-menu-active ~ .rs-dropdown-toggle,
-.rs-sidenav-subtle.rs-sidenav-collapse-out .rs-dropdown-menu.rs-dropdown-menu-active ~ .rs-dropdown-toggle {
+.rs-sidenav-subtle.rs-sidenav-collapse-in .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle,
+.rs-sidenav-subtle.rs-sidenav-collapsing .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle,
+.rs-sidenav-subtle.rs-sidenav-collapse-out .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle {
   color: #8e8e93;
-  color: var(--rs-navbar-subtle-text);
+  color: var(--rs-sidenav-subtle-text);
 }
-.rs-sidenav-subtle.rs-sidenav-collapse-in .rs-dropdown-menu.rs-dropdown-menu-active ~ .rs-dropdown-toggle:hover,
-.rs-sidenav-subtle.rs-sidenav-collapsing .rs-dropdown-menu.rs-dropdown-menu-active ~ .rs-dropdown-toggle:hover,
-.rs-sidenav-subtle.rs-sidenav-collapse-out .rs-dropdown-menu.rs-dropdown-menu-active ~ .rs-dropdown-toggle:hover {
+.rs-sidenav-subtle.rs-sidenav-collapse-in .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle:hover,
+.rs-sidenav-subtle.rs-sidenav-collapsing .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle:hover,
+.rs-sidenav-subtle.rs-sidenav-collapse-out .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle:hover {
   background-color: #f7f7fa;
-  background-color: var(--rs-navbar-subtle-hover-bg);
+  background-color: var(--rs-sidenav-subtle-hover-bg);
 }
-.rs-sidenav-subtle.rs-sidenav-collapse-in .rs-dropdown-menu.rs-dropdown-menu-active ~ .rs-dropdown-toggle > .rs-icon,
-.rs-sidenav-subtle.rs-sidenav-collapsing .rs-dropdown-menu.rs-dropdown-menu-active ~ .rs-dropdown-toggle > .rs-icon,
-.rs-sidenav-subtle.rs-sidenav-collapse-out .rs-dropdown-menu.rs-dropdown-menu-active ~ .rs-dropdown-toggle > .rs-icon {
+.rs-sidenav-subtle.rs-sidenav-collapse-in .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle-icon,
+.rs-sidenav-subtle.rs-sidenav-collapsing .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle-icon,
+.rs-sidenav-subtle.rs-sidenav-collapse-out .rs-dropdown.rs-dropdown-selected-within .rs-dropdown-toggle-icon {
   color: #1675e0;
-  color: var(--rs-navbar-subtle-selected-text);
+  color: var(--rs-sidenav-subtle-selected-text);
 }
 @-webkit-keyframes sideNavFoldedText {
   0% {
@@ -13415,6 +13488,10 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
     visibility: hidden;
   }
 }
+.rs-table-row-rowspan + .rs-table-row {
+  border-top: 1px solid #f2f2f5;
+  border-top: 1px solid var(--rs-border-secondary);
+}
 .rs-table-row-expanded {
   position: absolute;
   height: 46px;
@@ -13613,6 +13690,10 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
   font-size: 16px;
   line-height: 1.66666667;
 }
+.rs-table-cell-rowspan {
+  border-bottom: 1px solid #f2f2f5 !important;
+  border-bottom: 1px solid var(--rs-border-secondary) !important;
+}
 .rs-table-cell-header-sortable .rs-table-cell-content {
   cursor: pointer;
 }
@@ -15263,6 +15344,10 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
        object-fit: cover;
   }
 }
+.rs-uploader-picture .rs-uploader-file-item-preview .rs-uploader-file-item-icon {
+  font-size: 22px;
+  margin: 22px;
+}
 .rs-uploader-picture .rs-uploader-file-item-status {
   position: absolute;
   top: 0;
@@ -15627,6 +15712,10 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
        object-fit: cover;
   }
 }
+.rs-uploader-picture-text .rs-uploader-file-item-preview .rs-uploader-file-item-icon {
+  font-size: 22px;
+  margin: 12px;
+}
 .rs-uploader-picture-text .rs-uploader-file-item-content {
   padding: 5px 12px;
 }