rsuite 5.0.0 → 5.1.0

package/esm/DatePicker/DatePicker.js

@@ -1,5 +1,5 @@
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import mapValues from 'lodash/mapValues';
@@ -11,33 +11,33 @@ import { Calendar, CalendarState } from '../Calendar';
 import useCalendarDate from '../Calendar/useCalendarDate';
 import Toolbar from './Toolbar';
 import { composeFunctions, createChainedFunction, DateUtils, mergeRefs, useClassNames, useControlled, useCustom } from '../utils';
-import { PickerOverlay, pickerDefaultProps, pickerPropTypes, PickerToggle, PickerToggleTrigger, pickTriggerPropKeys, omitTriggerPropKeys, usePickerClassName, usePublicMethods, useToggleKeyDownEvent } from '../Picker';
+import { PickerOverlay, pickerPropTypes, PickerToggle, PickerToggleTrigger, pickTriggerPropKeys, omitTriggerPropKeys, usePickerClassName, usePublicMethods, useToggleKeyDownEvent } from '../Picker';
 import { useCalendarState } from './utils';
-
-var defaultProps = _extends({}, pickerDefaultProps, {
-  as: 'div',
-  classPrefix: 'picker',
-  format: 'yyyy-MM-dd',
-  limitEndYear: 1000,
-  placeholder: ''
-});
-
 var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var Component = props.as,
+  var _props$as = props.as,
+      Component = _props$as === void 0 ? 'div' : _props$as,
       className = props.className,
-      classPrefix = props.classPrefix,
+      _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'picker' : _props$classPrefix,
       calendarDefaultDate = props.calendarDefaultDate,
-      cleanable = props.cleanable,
+      _props$cleanable = props.cleanable,
+      cleanable = _props$cleanable === void 0 ? true : _props$cleanable,
       defaultValue = props.defaultValue,
       disabled = props.disabled,
-      formatStr = props.format,
+      _props$format = props.format,
+      formatStr = _props$format === void 0 ? 'yyyy-MM-dd' : _props$format,
       isoWeek = props.isoWeek,
-      limitEndYear = props.limitEndYear,
+      _props$limitEndYear = props.limitEndYear,
+      limitEndYear = _props$limitEndYear === void 0 ? 1000 : _props$limitEndYear,
       overrideLocale = props.locale,
       menuClassName = props.menuClassName,
-      placement = props.placement,
+      _props$appearance = props.appearance,
+      appearance = _props$appearance === void 0 ? 'default' : _props$appearance,
+      _props$placement = props.placement,
+      placement = _props$placement === void 0 ? 'bottomStart' : _props$placement,
       oneTap = props.oneTap,
-      placeholder = props.placeholder,
+      _props$placeholder = props.placeholder,
+      placeholder = _props$placeholder === void 0 ? '' : _props$placeholder,
       ranges = props.ranges,
       valueProp = props.value,
       showMeridian = props.showMeridian,
@@ -59,7 +59,7 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onSelect = props.onSelect,
       onToggleMonthDropdown = props.onToggleMonthDropdown,
       onToggleTimeDropdown = props.onToggleTimeDropdown,
-      rest = _objectWithoutPropertiesLoose(props, ["as", "className", "classPrefix", "calendarDefaultDate", "cleanable", "defaultValue", "disabled", "format", "isoWeek", "limitEndYear", "locale", "menuClassName", "placement", "oneTap", "placeholder", "ranges", "value", "showMeridian", "showWeekNumbers", "style", "toggleAs", "disabledDate", "renderValue", "onChange", "onChangeCalendarDate", "onClean", "onClose", "onEntered", "onExited", "onNextMonth", "onOk", "onOpen", "onPrevMonth", "onSelect", "onToggleMonthDropdown", "onToggleTimeDropdown"]);
+      rest = _objectWithoutPropertiesLoose(props, ["as", "className", "classPrefix", "calendarDefaultDate", "cleanable", "defaultValue", "disabled", "format", "isoWeek", "limitEndYear", "locale", "menuClassName", "appearance", "placement", "oneTap", "placeholder", "ranges", "value", "showMeridian", "showWeekNumbers", "style", "toggleAs", "disabledDate", "renderValue", "onChange", "onChangeCalendarDate", "onClean", "onClose", "onEntered", "onExited", "onNextMonth", "onOk", "onOpen", "onPrevMonth", "onSelect", "onToggleMonthDropdown", "onToggleTimeDropdown"]);
 
   var _useCustom = useCustom('DatePicker', overrideLocale),
       locale = _useCustom.locale,
@@ -301,7 +301,7 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
    * The callback after the enter key is triggered on the input
    */
 
-  var handleInputBlur = useCallback(function (event) {
+  var handleInputPressEnd = useCallback(function (event) {
     if (inputState === 'Typing') {
       updateValue(event, calendarDate);
     }
@@ -385,8 +385,11 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var hasValue = !!value;
 
   var _usePickerClassName = usePickerClassName(_extends({}, props, {
+    classPrefix: classPrefix,
     name: 'date',
-    hasValue: hasValue
+    appearance: appearance,
+    hasValue: hasValue,
+    cleanable: cleanable
   })),
       classes = _usePickerClassName[0],
       usedClassNamePropKeys = _usePickerClassName[1];
@@ -421,12 +424,14 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }),
     as: toggleAs,
     ref: targetRef,
+    appearance: appearance,
     input: true,
     inputValue: value ? formatDate(value, formatStr) : '',
     inputPlaceholder: typeof placeholder === 'string' && placeholder ? placeholder : formatStr,
     inputMask: DateUtils.getDateMask(formatStr),
     onInputChange: handleInputChange,
-    onInputBlur: handleInputBlur,
+    onInputBlur: handleInputPressEnd,
+    onInputPressEnter: handleInputPressEnd,
     onKeyDown: onPickerKeyDown,
     onClean: createChainedFunction(handleClean, onClean),
     cleanable: cleanable && !disabled,
@@ -438,7 +443,6 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }), renderDate())));
 });
 DatePicker.displayName = 'DatePicker';
-DatePicker.defaultProps = defaultProps;
 DatePicker.propTypes = _extends({}, pickerPropTypes, {
   calendarDefaultDate: PropTypes.instanceOf(Date),
   defaultValue: PropTypes.instanceOf(Date),

package/esm/DatePicker/Toolbar.js

@@ -5,18 +5,16 @@ import PropTypes from 'prop-types';
 import Button from '../Button';
 import { useClassNames, useUpdateEffect } from '../utils';
 import { getDefaultRanges, getRanges } from './utils';
-var defaultProps = {
-  classPrefix: 'picker-toolbar',
-  as: 'div'
-};
+
 /**
  * Toolbar for DatePicker and DateRangePicker
  */
-
 var Toolbar = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var Component = props.as,
+  var _props$as = props.as,
+      Component = _props$as === void 0 ? 'div' : _props$as,
       className = props.className,
-      classPrefix = props.classPrefix,
+      _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'picker-toolbar' : _props$classPrefix,
       disabledOkBtn = props.disabledOkBtn,
       disabledShortcut = props.disabledShortcut,
       hideOkBtn = props.hideOkBtn,
@@ -108,5 +106,4 @@ Toolbar.propTypes = {
   disabledOkBtn: PropTypes.func,
   hideOkButton: PropTypes.bool
 };
-Toolbar.defaultProps = defaultProps;
 export default Toolbar;

package/esm/DateRangePicker/Calendar.js

@@ -5,24 +5,23 @@ import React, { useCallback, useState } from 'react';
 import { addMonths, isAfter, isSameMonth, setDate } from '../utils/dateUtils';
 import CalendarCore, { CalendarState } from '../Calendar/Calendar';
 import { DATERANGE_DISABLED_TARGET } from '../utils';
-var defaultProps = {
-  as: CalendarCore,
-  calendarDate: [new Date(), addMonths(new Date(), 1)],
-  format: 'yyyy-MM-dd',
-  index: 0,
-  value: []
-};
 var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var Component = props.as,
-      calendarDate = props.calendarDate,
+  var _props$as = props.as,
+      Component = _props$as === void 0 ? CalendarCore : _props$as,
+      _props$calendarDate = props.calendarDate,
+      calendarDate = _props$calendarDate === void 0 ? [new Date(), addMonths(new Date(), 1)] : _props$calendarDate,
+      _props$format = props.format,
+      format = _props$format === void 0 ? 'yyyy-MM-dd' : _props$format,
       disabledDate = props.disabledDate,
-      index = props.index,
+      _props$index = props.index,
+      index = _props$index === void 0 ? 0 : _props$index,
       limitEndYear = props.limitEndYear,
       onChangeCalendarDate = props.onChangeCalendarDate,
       onChangeCalendarTime = props.onChangeCalendarTime,
       showOneCalendar = props.showOneCalendar,
-      value = props.value,
-      rest = _objectWithoutPropertiesLoose(props, ["as", "calendarDate", "disabledDate", "index", "limitEndYear", "onChangeCalendarDate", "onChangeCalendarTime", "showOneCalendar", "value"]);
+      _props$value = props.value,
+      value = _props$value === void 0 ? [] : _props$value,
+      rest = _objectWithoutPropertiesLoose(props, ["as", "calendarDate", "format", "disabledDate", "index", "limitEndYear", "onChangeCalendarDate", "onChangeCalendarTime", "showOneCalendar", "value"]);
 
   var _useState = useState(),
       calendarState = _useState[0],
@@ -96,6 +95,7 @@ var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return !after;
   }, [calendarDate, disabledDate, index, showOneCalendar, value]);
   return /*#__PURE__*/React.createElement(Component, _extends({}, rest, {
+    format: format,
     calendarState: calendarState,
     dateRange: value,
     disabledBackward: disabledBackward(),
@@ -115,7 +115,6 @@ var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }));
 });
 Calendar.displayName = 'DateRangePicker.Calendar';
-Calendar.defaultProps = defaultProps;
 Calendar.propTypes = {
   value: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
   hoverValue: PropTypes.arrayOf(PropTypes.instanceOf(Date)),

package/esm/DateRangePicker/DateRangePicker.js

@@ -1,5 +1,5 @@
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import IconCalendar from '@rsuite/icons/legacy/Calendar';
 import isUndefined from 'lodash/isUndefined';
 import omit from 'lodash/omit';
@@ -9,51 +9,48 @@ import PropTypes from 'prop-types';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { FormattedDate } from '../CustomProvider';
 import Toolbar from '../DatePicker/Toolbar';
-import { omitTriggerPropKeys, pickerDefaultProps, PickerOverlay, pickerPropTypes, PickerToggle, PickerToggleTrigger, pickTriggerPropKeys, usePickerClassName, usePublicMethods, useToggleKeyDownEvent } from '../Picker';
+import { omitTriggerPropKeys, PickerOverlay, pickerPropTypes, PickerToggle, PickerToggleTrigger, pickTriggerPropKeys, usePickerClassName, usePublicMethods, useToggleKeyDownEvent } from '../Picker';
 import { createChainedFunction, DATERANGE_DISABLED_TARGET, DateUtils, mergeRefs, useClassNames, useControlled, useCustom } from '../utils';
 import { addMonths, compareAsc, isSameMonth } from '../utils/dateUtils';
 import Calendar from './Calendar';
 import * as disabledDateUtils from './disabledDateUtils';
 import { getCalendarDate, getMonthHoverRange, getWeekHoverRange, isSameRange, setTimingMargin } from './utils';
-
-var defaultProps = _extends({}, pickerDefaultProps, {
-  as: 'div',
-  classPrefix: 'picker',
-  cleanable: true,
-  placement: 'bottomStart',
-  appearance: 'default',
-  format: 'yyyy-MM-dd',
-  limitEndYear: 1000,
-  placeholder: '',
-  showOneCalendar: false,
-  character: ' ~ '
-});
-
 var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _ref, _merge;
 
-  var Component = props.as,
-      classPrefix = props.classPrefix,
+  var _props$as = props.as,
+      Component = _props$as === void 0 ? 'div' : _props$as,
+      _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'picker' : _props$classPrefix,
       className = props.className,
-      cleanable = props.cleanable,
-      character = props.character,
+      _props$appearance = props.appearance,
+      appearance = _props$appearance === void 0 ? 'default' : _props$appearance,
+      _props$cleanable = props.cleanable,
+      cleanable = _props$cleanable === void 0 ? true : _props$cleanable,
+      _props$character = props.character,
+      character = _props$character === void 0 ? ' ~ ' : _props$character,
       defaultCalendarValue = props.defaultCalendarValue,
       defaultValue = props.defaultValue,
       disabled = props.disabled,
       disabledDateProp = props.disabledDate,
-      formatStr = props.format,
+      _props$format = props.format,
+      formatStr = _props$format === void 0 ? 'yyyy-MM-dd' : _props$format,
       hoverRange = props.hoverRange,
       isoWeek = props.isoWeek,
-      limitEndYear = props.limitEndYear,
+      _props$limitEndYear = props.limitEndYear,
+      limitEndYear = _props$limitEndYear === void 0 ? 1000 : _props$limitEndYear,
       overrideLocale = props.locale,
       menuClassName = props.menuClassName,
       menuStyle = props.menuStyle,
       oneTap = props.oneTap,
-      placeholder = props.placeholder,
-      placement = props.placement,
+      _props$placeholder = props.placeholder,
+      placeholder = _props$placeholder === void 0 ? '' : _props$placeholder,
+      _props$placement = props.placement,
+      placement = _props$placement === void 0 ? 'bottomStart' : _props$placement,
       ranges = props.ranges,
       renderValue = props.renderValue,
-      showOneCalendar = props.showOneCalendar,
+      _props$showOneCalenda = props.showOneCalendar,
+      showOneCalendar = _props$showOneCalenda === void 0 ? false : _props$showOneCalenda,
       showWeekNumbers = props.showWeekNumbers,
       style = props.style,
       toggleAs = props.toggleAs,
@@ -67,7 +64,7 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onOk = props.onOk,
       onOpen = props.onOpen,
       onSelect = props.onSelect,
-      rest = _objectWithoutPropertiesLoose(props, ["as", "classPrefix", "className", "cleanable", "character", "defaultCalendarValue", "defaultValue", "disabled", "disabledDate", "format", "hoverRange", "isoWeek", "limitEndYear", "locale", "menuClassName", "menuStyle", "oneTap", "placeholder", "placement", "ranges", "renderValue", "showOneCalendar", "showWeekNumbers", "style", "toggleAs", "value", "onChange", "onClean", "onClose", "onEnter", "onEntered", "onExited", "onOk", "onOpen", "onSelect"]);
+      rest = _objectWithoutPropertiesLoose(props, ["as", "classPrefix", "className", "appearance", "cleanable", "character", "defaultCalendarValue", "defaultValue", "disabled", "disabledDate", "format", "hoverRange", "isoWeek", "limitEndYear", "locale", "menuClassName", "menuStyle", "oneTap", "placeholder", "placement", "ranges", "renderValue", "showOneCalendar", "showWeekNumbers", "style", "toggleAs", "value", "onChange", "onClean", "onClose", "onEnter", "onEntered", "onExited", "onOk", "onOpen", "onSelect"]);
 
   var _useClassNames = useClassNames(classPrefix),
       merge = _useClassNames.merge,
@@ -75,7 +72,8 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   var _useCustom = useCustom('DateRangePicker', overrideLocale),
       locale = _useCustom.locale,
-      formatDate = _useCustom.formatDate;
+      formatDate = _useCustom.formatDate,
+      parseDate = _useCustom.parseDate;
 
   var rangeFormatStr = "" + formatStr + character + formatStr;
 
@@ -370,13 +368,17 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var rangeValue = value.split(character); // isMatch('01/11/2020', 'MM/dd/yyyy') ==> true
     // isMatch('2020-11-01', 'MM/dd/yyyy') ==> false
 
-    if (!DateUtils.isMatch(rangeValue[0], formatStr) || !DateUtils.isMatch(rangeValue[1], formatStr)) {
+    if (!DateUtils.isMatch(rangeValue[0], formatStr, {
+      locale: locale.dateLocale
+    }) || !DateUtils.isMatch(rangeValue[1], formatStr, {
+      locale: locale.dateLocale
+    })) {
       setInputState('Error');
       return;
     }
 
-    var startDate = new Date(rangeValue[0]);
-    var endDate = new Date(rangeValue[1]);
+    var startDate = parseDate(rangeValue[0], formatStr);
+    var endDate = parseDate(rangeValue[1], formatStr);
     var selectValue = [startDate, endDate];
 
     if (!DateUtils.isValid(startDate) || !DateUtils.isValid(endDate)) {
@@ -398,7 +400,7 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
    * The callback after the enter key is triggered on the input
    */
 
-  var handleInputBlur = useCallback(function (event) {
+  var handleInputPressEnd = useCallback(function (event) {
     if (inputState === 'Typing') {
       handleValueUpdate(event, selectValue);
     }
@@ -546,8 +548,11 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var hasValue = value && value.length > 1;
 
   var _usePickerClassName = usePickerClassName(_extends({}, props, {
+    classPrefix: classPrefix,
     name: 'daterange',
-    hasValue: hasValue
+    appearance: appearance,
+    hasValue: hasValue,
+    cleanable: cleanable
   })),
       classes = _usePickerClassName[0],
       usedClassNamePropKeys = _usePickerClassName[1];
@@ -567,12 +572,14 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, /*#__PURE__*/React.createElement(PickerToggle, _extends({}, omit(rest, [].concat(omitTriggerPropKeys, usedClassNamePropKeys, DateUtils.calendarOnlyProps)), {
     as: toggleAs,
     ref: targetRef,
+    appearance: appearance,
     input: true,
     inputMask: DateUtils.getDateMask(rangeFormatStr),
     inputValue: value ? getDisplayString(value, true) : '',
     inputPlaceholder: typeof placeholder === 'string' && placeholder ? placeholder : rangeFormatStr,
     onInputChange: handleInputChange,
-    onInputBlur: handleInputBlur,
+    onInputBlur: handleInputPressEnd,
+    onInputPressEnter: handleInputPressEnd,
     onKeyDown: onPickerKeyDown,
     onClean: createChainedFunction(handleClean, onClean),
     cleanable: cleanable && !disabled,
@@ -592,7 +599,6 @@ DateRangePicker.before = disabledDateUtils.before;
 DateRangePicker.beforeToday = disabledDateUtils.beforeToday;
 DateRangePicker.combine = disabledDateUtils.combine;
 DateRangePicker.displayName = 'DateRangePicker';
-DateRangePicker.defaultProps = defaultProps;
 DateRangePicker.propTypes = _extends({}, pickerPropTypes, {
   ranges: PropTypes.array,
   value: PropTypes.arrayOf(PropTypes.instanceOf(Date)),

package/esm/Divider/Divider.js

@@ -3,14 +3,12 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useClassNames } from '../utils';
-var defaultProps = {
-  classPrefix: 'divider',
-  as: 'div'
-};
 var Divider = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var Component = props.as,
+  var _props$as = props.as,
+      Component = _props$as === void 0 ? 'div' : _props$as,
       className = props.className,
-      classPrefix = props.classPrefix,
+      _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'divider' : _props$classPrefix,
       children = props.children,
       vertical = props.vertical,
       rest = _objectWithoutPropertiesLoose(props, ["as", "className", "classPrefix", "children", "vertical"]);
@@ -34,7 +32,6 @@ var Divider = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, children));
 });
 Divider.displayName = 'Divider';
-Divider.defaultProps = defaultProps;
 Divider.propTypes = {
   as: PropTypes.elementType,
   className: PropTypes.string,

package/esm/Drawer/Drawer.js

@@ -6,11 +6,6 @@ import Slide from '../Animation/Slide';
 import Modal from '../Modal';
 import { useClassNames } from '../utils';
 import deprecateComponent from '../utils/deprecateComponent';
-var defaultProps = {
-  classPrefix: 'drawer',
-  placement: 'right',
-  animation: Slide
-};
 var DrawerBody = /*#__PURE__*/React.forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(Modal.Body, _extends({
     classPrefix: "drawer-body"
@@ -48,9 +43,13 @@ var DrawerTitle = /*#__PURE__*/React.forwardRef(function (props, ref) {
 });
 var Drawer = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var className = props.className,
-      placement = props.placement,
-      classPrefix = props.classPrefix,
-      rest = _objectWithoutPropertiesLoose(props, ["className", "placement", "classPrefix"]);
+      _props$placement = props.placement,
+      placement = _props$placement === void 0 ? 'right' : _props$placement,
+      _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'drawer' : _props$classPrefix,
+      _props$animation = props.animation,
+      animation = _props$animation === void 0 ? Slide : _props$animation,
+      rest = _objectWithoutPropertiesLoose(props, ["className", "placement", "classPrefix", "animation"]);
 
   var _useClassNames = useClassNames(classPrefix),
       merge = _useClassNames.merge,
@@ -65,6 +64,7 @@ var Drawer = /*#__PURE__*/React.forwardRef(function (props, ref) {
     drawer: true,
     classPrefix: classPrefix,
     className: classes,
+    animation: animation,
     animationProps: animationProps
   }));
 });
@@ -79,7 +79,6 @@ Drawer.Actions = DrawerActions;
 Drawer.Footer = deprecateComponent(DrawerFooter, '<Drawer.Footer> has been deprecated, use <Drawer.Actions> instead.');
 Drawer.Title = DrawerTitle;
 Drawer.displayName = 'Drawer';
-Drawer.defaultProps = defaultProps;
 Drawer.propTypes = {
   classPrefix: PropTypes.string,
   placement: PropTypes.oneOf(['top', 'right', 'bottom', 'left']),

package/esm/Dropdown/Dropdown.js

@@ -20,34 +20,32 @@ import Disclosure from '../Disclosure/Disclosure';
 import SidenavDropdown from '../Sidenav/SidenavDropdown';
 import NavContext from '../Nav/NavContext';
 import { initialState, reducer } from './DropdownState';
-var defaultProps = {
-  as: 'div',
-  classPrefix: 'dropdown',
-  placement: 'bottomStart',
-  trigger: 'click'
-};
+
 /**
  * The <Dropdown> API
  * When used inside <Sidenav>, renders a <TreeviewRootItem>;
  * Otherwise renders a <MenuRoot>
  */
-
 var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var activeKey = props.activeKey,
       onSelectProp = props.onSelect,
       rest = _objectWithoutPropertiesLoose(props, ["activeKey", "onSelect"]);
 
-  var Component = rest.as,
+  var _rest$as = rest.as,
+      Component = _rest$as === void 0 ? 'div' : _rest$as,
       title = rest.title,
       onClose = rest.onClose,
       onOpen = rest.onOpen,
       onToggle = rest.onToggle,
       eventKey = rest.eventKey,
-      trigger = rest.trigger,
-      placement = rest.placement,
+      _rest$trigger = rest.trigger,
+      trigger = _rest$trigger === void 0 ? 'click' : _rest$trigger,
+      _rest$placement = rest.placement,
+      placement = _rest$placement === void 0 ? 'bottomStart' : _rest$placement,
       toggleAs = rest.toggleAs,
       toggleClassName = rest.toggleClassName,
-      classPrefix = rest.classPrefix,
+      _rest$classPrefix = rest.classPrefix,
+      classPrefix = _rest$classPrefix === void 0 ? 'dropdown' : _rest$classPrefix,
       className = rest.className,
       disabled = rest.disabled,
       children = rest.children,
@@ -241,7 +239,6 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
 Dropdown.Item = DropdownItem;
 Dropdown.Menu = DropdownMenu;
 Dropdown.displayName = 'Dropdown';
-Dropdown.defaultProps = defaultProps;
 Dropdown.propTypes = {
   activeKey: PropTypes.any,
   classPrefix: PropTypes.string,

package/esm/Dropdown/DropdownItem.js

@@ -15,24 +15,27 @@ import SafeAnchor from '../SafeAnchor';
 import NavContext from '../Nav/NavContext';
 import useInternalId from '../utils/useInternalId';
 import { DropdownActionType } from './DropdownState';
-var defaultProps = {
-  as: 'li',
-  classPrefix: 'dropdown-item'
-};
+
 /**
  * The <Dropdown.Item> API
  * When used inside <Sidenav>, renders a <TreeviewItem>
  * Otherwise renders a <MenuItem>
  */
-
 var DropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var classPrefix = props.classPrefix,
+  var _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'dropdown-item' : _props$classPrefix,
       className = props.className,
       activeProp = props.active,
       eventKey = props.eventKey,
       onSelect = props.onSelect,
       icon = props.icon,
-      rest = _objectWithoutPropertiesLoose(props, ["classPrefix", "className", "active", "eventKey", "onSelect", "icon"]);
+      _props$as = props.as,
+      Component = _props$as === void 0 ? 'li' : _props$as,
+      divider = props.divider,
+      panel = props.panel,
+      children = props.children,
+      disabled = props.disabled,
+      restProps = _objectWithoutPropertiesLoose(props, ["classPrefix", "className", "active", "eventKey", "onSelect", "icon", "as", "divider", "panel", "children", "disabled"]);
 
   var internalId = useInternalId('DropdownItem');
   var nav = useContext(NavContext);
@@ -85,6 +88,15 @@ var DropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
       };
     }
   }, [internalId, selected, dispatch]);
+  var renderDropdownItem = useCallback(function (ui) {
+    if (Component === 'li') {
+      return ui;
+    }
+
+    return /*#__PURE__*/React.createElement("li", {
+      role: "none presentation"
+    }, ui);
+  }, [Component]);
 
   if (sidenav !== null && sidenav !== void 0 && sidenav.expanded) {
     return /*#__PURE__*/React.createElement(SidenavDropdownItem, _extends({
@@ -92,27 +104,19 @@ var DropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }, props));
   }
 
-  var Component = rest.as,
-      divider = rest.divider,
-      panel = rest.panel,
-      children = rest.children,
-      disabled = rest.disabled,
-      restProps = _objectWithoutPropertiesLoose(rest, ["as", "divider", "panel", "children", "disabled"]);
-
   if (divider) {
-    return /*#__PURE__*/React.createElement(Component, _extends({
+    return renderDropdownItem( /*#__PURE__*/React.createElement(Component, _extends({
       ref: ref,
       role: "separator",
       className: merge(prefix('divider'), className)
-    }, restProps));
+    }, restProps)));
   }
 
   if (panel) {
-    return /*#__PURE__*/React.createElement(Component, _extends({
+    return renderDropdownItem( /*#__PURE__*/React.createElement(Component, _extends({
       ref: ref,
-      role: "none presentation",
       className: merge(prefix('panel'), className)
-    }, restProps), children);
+    }, restProps), children));
   }
 
   if (navbar) {
@@ -136,6 +140,7 @@ var DropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
       className: classes,
       "aria-current": selected || undefined
     }, dataAttributes, restProps, {
+      as: Component,
       onClick: createChainedFunction(handleClickNavbarDropdownItem, restProps.onClick)
     }), icon && /*#__PURE__*/React.cloneElement(icon, {
       className: prefix('menu-icon')
@@ -167,16 +172,15 @@ var DropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
       dataAttributes['data-event-key-type'] = typeof eventKey;
     }
 
-    return /*#__PURE__*/React.createElement(Component, _extends({
+    return renderDropdownItem( /*#__PURE__*/React.createElement(Component, _extends({
       ref: mergeRefs(ref, menuitemRef),
       className: classes
     }, menuitem, dataAttributes, restProps), icon && /*#__PURE__*/React.cloneElement(icon, {
       className: prefix('menu-icon')
-    }), children);
+    }), children));
   });
 });
 DropdownItem.displayName = 'Dropdown.Item';
-DropdownItem.defaultProps = defaultProps;
 DropdownItem.propTypes = {
   as: PropTypes.elementType,
   divider: PropTypes.bool,

package/esm/Dropdown/DropdownMenu.js

@@ -17,9 +17,7 @@ import useCustom from '../utils/useCustom';
 import DropdownContext from './DropdownContext';
 import Menubar from '../Menu/Menubar';
 import SidenavDropdownMenu from '../Sidenav/SidenavDropdownMenu';
-var defaultProps = {
-  classPrefix: 'dropdown-menu'
-};
+
 /**
  * The <Dropdown.Menu> API
  *
@@ -38,14 +36,14 @@ var defaultProps = {
  *   </Dropdown.Menu>
  * </Dropdown>
  */
-
 var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var onToggle = props.onToggle,
       eventKey = props.eventKey,
       title = props.title,
       activeKey = props.activeKey,
       onSelect = props.onSelect,
-      classPrefix = props.classPrefix,
+      _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'dropdown-menu' : _props$classPrefix,
       children = props.children,
       rest = _objectWithoutPropertiesLoose(props, ["onToggle", "eventKey", "title", "activeKey", "onSelect", "classPrefix", "children"]);
 
@@ -175,7 +173,6 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
   });
 });
 DropdownMenu.displayName = 'Dropdown.Menu';
-DropdownMenu.defaultProps = defaultProps;
 DropdownMenu.propTypes = {
   active: PropTypes.bool,
   activeKey: PropTypes.any,

package/esm/Dropdown/DropdownToggle.js

@@ -6,14 +6,12 @@ import Button from '../Button';
 import { useClassNames } from '../utils';
 import useToggleCaret from '../utils/useToggleCaret';
 import { SidenavContext } from '../Sidenav/Sidenav';
-var defaultProps = {
-  as: Button,
-  classPrefix: 'dropdown-toggle'
-};
 var DropdownToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var Component = props.as,
+  var _props$as = props.as,
+      Component = _props$as === void 0 ? Button : _props$as,
       className = props.className,
-      classPrefix = props.classPrefix,
+      _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'dropdown-toggle' : _props$classPrefix,
       renderToggle = props.renderToggle,
       children = props.children,
       icon = props.icon,
@@ -45,7 +43,6 @@ var DropdownToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
   return renderToggle ? renderToggle(rest, ref) : toggle;
 });
 DropdownToggle.displayName = 'DropdownToggle';
-DropdownToggle.defaultProps = defaultProps;
 DropdownToggle.propTypes = {
   className: PropTypes.string,
   children: PropTypes.node,