@elliemae/ds-date-time-recurrence-picker 2.0.0-alpha.11 → 2.0.0-alpha.12

package/cjs/DSDateTimeRecurrenceSelector.js

@@ -19,93 +19,96 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 
-const DSDateTimeRecurrenceSelector = ({
-  containerProps = {},
-  className = '',
-  preselectedOptions = dropdownPreselectedOptions.dropdownPreselectedOptions,
-  repeatOptions = dropdownRepeatOptions.dropdownRepeatOptions,
-  endTypesOptions: endTypesOptions$1 = endTypesOptions.endTypesOptions,
-  endTimesOptions = endTypesOptions.endTimesOptions,
-  dayOfWeekOptions = dropdownDayOfWeekOptions.dropdownDayOfWeekOptions,
-  dayOfWeekOptionsEnable = true,
-  dayOfMonthOptions = dropdownDayOfMonthOptions.dropdownDayOfMonthOptions,
-  dayOfMonthOptionsEnable = true,
-  dayOfYearOptions = dropdownDayOfYearOptions.dropdownDayOfYearOptions,
-  dayOfYearOptionsEnable = true,
-  displayMonthCustomOption = false,
-  displayYearCustomOption = false,
-  dayOfMonthAsCurrentDateOptions = ['numberOfMonth', 'dayOfTheWeekOfMonth'],
-  dayOfYearAsCurrentDateOptions = ['numberOfYear', 'dayOfTheMonthOfYear'],
-  onChange = () => null,
-  placeholder = 'Select Range',
-  modalSize = 'medium',
-  modalTitle = 'Report Scheduling',
-  confirmLabel = 'Apply',
-  rejectLabel = 'Cancel',
-  modalType = 'confirm',
-  onConfirmField = () => null,
-  onRejectField = () => null,
-  openModal = false,
-  appElement = '#root',
-  value = null,
-  customRange = null,
-  customOptionRender = CustomOptionRender,
-  displayCurrentMonthYear = true,
-  timeZoneOptions = dropdownTimeZoneOptions.dropdownTimeZoneOptions,
-  useTimezoneSelector = false,
-  allowMultipleDaysOfWeek = false,
-  advanceOption = {
-    label: 'Custom',
-    value: 'custom-range',
-    isAdvance: true
-  },
-  isValidRecurrence = () => true,
-  validationMessage = '',
-  endDayBlocked = () => false,
-  startDayBlocked = () => false,
-  repeatFrecuencyCustomProps = {}
-}) => /*#__PURE__*/_jsx__default["default"](DateTimeRecurenceSelectorImpl, {
-  advanceOption: advanceOption,
-  allowMultipleDaysOfWeek: allowMultipleDaysOfWeek,
-  appElement: appElement,
-  className: className,
-  confirmLabel: confirmLabel,
-  containerProps: containerProps,
-  customOptionRender: customOptionRender,
-  customRange: customRange,
-  dayOfMonthAsCurrentDateOptions: dayOfMonthAsCurrentDateOptions,
-  dayOfMonthOptionsEnable: dayOfMonthOptionsEnable,
-  dayOfWeekOptionsEnable: dayOfWeekOptionsEnable,
-  dayOfYearAsCurrentDateOptions: dayOfYearAsCurrentDateOptions,
-  dayOfYearOptionsEnable: dayOfYearOptionsEnable,
-  displayCurrentMonthYear: displayCurrentMonthYear,
-  displayMonthCustomOption: displayMonthCustomOption,
-  displayYearCustomOption: displayYearCustomOption,
-  dropdownDayOfMonthOptions: dayOfMonthOptions,
-  dropdownDayOfWeekOptions: dayOfWeekOptions,
-  dropdownDayOfYearOptions: dayOfYearOptions,
-  dropdownPreselectedOptions: preselectedOptions,
-  dropdownRepeatOptions: repeatOptions,
-  endDayBlocked: endDayBlocked,
-  endTimesOptions: endTimesOptions,
-  endTypesOptions: endTypesOptions$1,
-  isValidRecurrence: isValidRecurrence,
-  modalSize: modalSize,
-  modalTitle: modalTitle,
-  modalType: modalType,
-  onChange: onChange,
-  onConfirmField: onConfirmField,
-  onRejectField: onRejectField,
-  openModal: openModal,
-  placeholder: placeholder,
-  rejectLabel: rejectLabel,
-  repeatFrecuencyCustomProps: repeatFrecuencyCustomProps,
-  startDayBlocked: startDayBlocked,
-  timeZoneOptions: timeZoneOptions,
-  useTimezoneSelector: useTimezoneSelector,
-  validationMessage: validationMessage,
-  value: value
-});
+const DSDateTimeRecurrenceSelector = _ref => {
+  let {
+    containerProps = {},
+    className = '',
+    preselectedOptions = dropdownPreselectedOptions.dropdownPreselectedOptions,
+    repeatOptions = dropdownRepeatOptions.dropdownRepeatOptions,
+    endTypesOptions: endTypesOptions$1 = endTypesOptions.endTypesOptions,
+    endTimesOptions = endTypesOptions.endTimesOptions,
+    dayOfWeekOptions = dropdownDayOfWeekOptions.dropdownDayOfWeekOptions,
+    dayOfWeekOptionsEnable = true,
+    dayOfMonthOptions = dropdownDayOfMonthOptions.dropdownDayOfMonthOptions,
+    dayOfMonthOptionsEnable = true,
+    dayOfYearOptions = dropdownDayOfYearOptions.dropdownDayOfYearOptions,
+    dayOfYearOptionsEnable = true,
+    displayMonthCustomOption = false,
+    displayYearCustomOption = false,
+    dayOfMonthAsCurrentDateOptions = ['numberOfMonth', 'dayOfTheWeekOfMonth'],
+    dayOfYearAsCurrentDateOptions = ['numberOfYear', 'dayOfTheMonthOfYear'],
+    onChange = () => null,
+    placeholder = 'Select Range',
+    modalSize = 'medium',
+    modalTitle = 'Report Scheduling',
+    confirmLabel = 'Apply',
+    rejectLabel = 'Cancel',
+    modalType = 'confirm',
+    onConfirmField = () => null,
+    onRejectField = () => null,
+    openModal = false,
+    appElement = '#root',
+    value = null,
+    customRange = null,
+    customOptionRender = CustomOptionRender,
+    displayCurrentMonthYear = true,
+    timeZoneOptions = dropdownTimeZoneOptions.dropdownTimeZoneOptions,
+    useTimezoneSelector = false,
+    allowMultipleDaysOfWeek = false,
+    advanceOption = {
+      label: 'Custom',
+      value: 'custom-range',
+      isAdvance: true
+    },
+    isValidRecurrence = () => true,
+    validationMessage = '',
+    endDayBlocked = () => false,
+    startDayBlocked = () => false,
+    repeatFrecuencyCustomProps = {}
+  } = _ref;
+  return /*#__PURE__*/_jsx__default["default"](DateTimeRecurenceSelectorImpl, {
+    advanceOption: advanceOption,
+    allowMultipleDaysOfWeek: allowMultipleDaysOfWeek,
+    appElement: appElement,
+    className: className,
+    confirmLabel: confirmLabel,
+    containerProps: containerProps,
+    customOptionRender: customOptionRender,
+    customRange: customRange,
+    dayOfMonthAsCurrentDateOptions: dayOfMonthAsCurrentDateOptions,
+    dayOfMonthOptionsEnable: dayOfMonthOptionsEnable,
+    dayOfWeekOptionsEnable: dayOfWeekOptionsEnable,
+    dayOfYearAsCurrentDateOptions: dayOfYearAsCurrentDateOptions,
+    dayOfYearOptionsEnable: dayOfYearOptionsEnable,
+    displayCurrentMonthYear: displayCurrentMonthYear,
+    displayMonthCustomOption: displayMonthCustomOption,
+    displayYearCustomOption: displayYearCustomOption,
+    dropdownDayOfMonthOptions: dayOfMonthOptions,
+    dropdownDayOfWeekOptions: dayOfWeekOptions,
+    dropdownDayOfYearOptions: dayOfYearOptions,
+    dropdownPreselectedOptions: preselectedOptions,
+    dropdownRepeatOptions: repeatOptions,
+    endDayBlocked: endDayBlocked,
+    endTimesOptions: endTimesOptions,
+    endTypesOptions: endTypesOptions$1,
+    isValidRecurrence: isValidRecurrence,
+    modalSize: modalSize,
+    modalTitle: modalTitle,
+    modalType: modalType,
+    onChange: onChange,
+    onConfirmField: onConfirmField,
+    onRejectField: onRejectField,
+    openModal: openModal,
+    placeholder: placeholder,
+    rejectLabel: rejectLabel,
+    repeatFrecuencyCustomProps: repeatFrecuencyCustomProps,
+    startDayBlocked: startDayBlocked,
+    timeZoneOptions: timeZoneOptions,
+    useTimezoneSelector: useTimezoneSelector,
+    validationMessage: validationMessage,
+    value: value
+  });
+};
 const dateTimeRecurrenceSelectorProps = {
   containerProps: reactDesc.PropTypes.shape({}).description('Set of Properties attached to the main container'),
   className: reactDesc.PropTypes.string.description('html class attribute'),

package/cjs/components/AlertModal/DateTimeRangeModal.js

@@ -10,55 +10,58 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 var DSModal__default = /*#__PURE__*/_interopDefaultLegacy(DSModal);
 
-const DateTimeRangeModal = ({
-  isOpen = false,
-  onClose = () => null,
-  modalTitle = 'Report Scheduling',
-  modalSize = 'medium ',
-  confirmLabel = 'Apply',
-  rejectLabel = 'Cancel',
-  modalType = 'confirm',
-  onConfirmField = () => null,
-  onRejectField = () => null,
-  appElement = null,
-  onCustomDateTimeRange = () => null,
-  displayCurrentMonthYear = true,
-  dropdownDayOfMonthOptions = [],
-  dropdownDayOfWeekOptions = [],
-  dropdownDayOfYearOptions = [],
-  dropdownRepeatOptions = [],
-  rangeValue = {},
-  dayOfMonthOptionsEnable = true,
-  dayOfWeekOptionsEnable = true,
-  dayOfYearOptionsEnable = true,
-  timeZoneOptions = [],
-  useTimezoneSelector = false,
-  allowMultipleDaysOfWeek = false
-}) => /*#__PURE__*/_jsx__default["default"](DSModal__default["default"], {
-  appElement: appElement,
-  confirmLabel: confirmLabel,
-  isOpen: isOpen,
-  modalTitle: modalTitle,
-  modalType: modalType,
-  onClose: onClose,
-  onConfirm: onConfirmField,
-  onReject: onRejectField,
-  rejectLabel: rejectLabel,
-  size: modalSize
-}, void 0, /*#__PURE__*/_jsx__default["default"](DateTimeRangeModalImpl, {
-  allowMultipleDaysOfWeek: allowMultipleDaysOfWeek,
-  dayOfMonthOptionsEnable: dayOfMonthOptionsEnable,
-  dayOfWeekOptionsEnable: dayOfWeekOptionsEnable,
-  dayOfYearOptionsEnable: dayOfYearOptionsEnable,
-  displayCurrentMonthYear: displayCurrentMonthYear,
-  dropdownDayOfMonthOptions: dropdownDayOfMonthOptions,
-  dropdownDayOfWeekOptions: dropdownDayOfWeekOptions,
-  dropdownDayOfYearOptions: dropdownDayOfYearOptions,
-  dropdownRepeatOptions: dropdownRepeatOptions,
-  onCustomDateTimeRange: onCustomDateTimeRange,
-  rangeValue: rangeValue,
-  timeZoneOptions: timeZoneOptions,
-  useTimezoneSelector: useTimezoneSelector
-}));
+const DateTimeRangeModal = _ref => {
+  let {
+    isOpen = false,
+    onClose = () => null,
+    modalTitle = 'Report Scheduling',
+    modalSize = 'medium ',
+    confirmLabel = 'Apply',
+    rejectLabel = 'Cancel',
+    modalType = 'confirm',
+    onConfirmField = () => null,
+    onRejectField = () => null,
+    appElement = null,
+    onCustomDateTimeRange = () => null,
+    displayCurrentMonthYear = true,
+    dropdownDayOfMonthOptions = [],
+    dropdownDayOfWeekOptions = [],
+    dropdownDayOfYearOptions = [],
+    dropdownRepeatOptions = [],
+    rangeValue = {},
+    dayOfMonthOptionsEnable = true,
+    dayOfWeekOptionsEnable = true,
+    dayOfYearOptionsEnable = true,
+    timeZoneOptions = [],
+    useTimezoneSelector = false,
+    allowMultipleDaysOfWeek = false
+  } = _ref;
+  return /*#__PURE__*/_jsx__default["default"](DSModal__default["default"], {
+    appElement: appElement,
+    confirmLabel: confirmLabel,
+    isOpen: isOpen,
+    modalTitle: modalTitle,
+    modalType: modalType,
+    onClose: onClose,
+    onConfirm: onConfirmField,
+    onReject: onRejectField,
+    rejectLabel: rejectLabel,
+    size: modalSize
+  }, void 0, /*#__PURE__*/_jsx__default["default"](DateTimeRangeModalImpl, {
+    allowMultipleDaysOfWeek: allowMultipleDaysOfWeek,
+    dayOfMonthOptionsEnable: dayOfMonthOptionsEnable,
+    dayOfWeekOptionsEnable: dayOfWeekOptionsEnable,
+    dayOfYearOptionsEnable: dayOfYearOptionsEnable,
+    displayCurrentMonthYear: displayCurrentMonthYear,
+    dropdownDayOfMonthOptions: dropdownDayOfMonthOptions,
+    dropdownDayOfWeekOptions: dropdownDayOfWeekOptions,
+    dropdownDayOfYearOptions: dropdownDayOfYearOptions,
+    dropdownRepeatOptions: dropdownRepeatOptions,
+    onCustomDateTimeRange: onCustomDateTimeRange,
+    rangeValue: rangeValue,
+    timeZoneOptions: timeZoneOptions,
+    useTimezoneSelector: useTimezoneSelector
+  }));
+};
 
 module.exports = DateTimeRangeModal;

package/cjs/components/CustomOptionRender/CustomOptionRender.js

@@ -48,25 +48,26 @@ timezonePickerInput
 }
  */
 
-const CustomOptionRender = ({
-  customRange: {
-    startDateInput,
-    startTimeInput,
-    qtyRepeatPickerInput,
-    typeRepeatPickerInput,
-    dayWeekRepeatPickerInput,
-    endDateInput,
-    endTypeInput,
-    endTimesInput,
-    dayOfMonthRepeatPickerInput,
-    dayOfYearRepeatPickerInput,
-    timezonePickerInput
-  },
-  dayOfMonthOptionsEnable,
-  dayOfWeekOptionsEnable,
-  dayOfYearOptionsEnable,
-  useTimezoneSelector
-}) => {
+const CustomOptionRender = _ref => {
+  let {
+    customRange: {
+      startDateInput,
+      startTimeInput,
+      qtyRepeatPickerInput,
+      typeRepeatPickerInput,
+      dayWeekRepeatPickerInput,
+      endDateInput,
+      endTypeInput,
+      endTimesInput,
+      dayOfMonthRepeatPickerInput,
+      dayOfYearRepeatPickerInput,
+      timezonePickerInput
+    },
+    dayOfMonthOptionsEnable,
+    dayOfWeekOptionsEnable,
+    dayOfYearOptionsEnable,
+    useTimezoneSelector
+  } = _ref;
   let display = 'Custom'; // frequency
 
   if (qtyRepeatPickerInput === 1) display = typeRepeat[typeRepeatPickerInput];else display = "every ".concat(qtyRepeatPickerInput, " ").concat(typeRepeatPickerInput, "s"); // type

package/cjs/components/DateTimeRangeModal/DateTimeRangeModal.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var _jsx = require('@babel/runtime/helpers/jsx');
-var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 require('core-js/modules/web.dom-collections.iterator.js');
 var React = require('react');
 var DSModal = require('@elliemae/ds-modal');
@@ -10,28 +9,30 @@ var DateTimeRangeModalImpl = require('../DateTimeRangeModalImpl/DateTimeRangeMod
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
-var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var DSModal__default = /*#__PURE__*/_interopDefaultLegacy(DSModal);
 
 class DateTimeRangeModal extends React__default["default"].Component {
-  constructor(...args) {
-    super(...args);
+  constructor() {
+    var _this;
 
-    _defineProperty__default["default"](this, "state", {
+    super(...arguments);
+    _this = this;
+    this.state = {
       isValid: true
-    });
+    };
 
-    _defineProperty__default["default"](this, "updateIsValid", (...data) => {
+    this.updateIsValid = function () {
       const {
         onCustomDateTimeRange = () => null,
         isValidRecurrence
-      } = this.props;
-      onCustomDateTimeRange(...data);
-      this.setState({
-        isValid: isValidRecurrence(...data)
+      } = _this.props;
+      onCustomDateTimeRange(...arguments);
+
+      _this.setState({
+        isValid: isValidRecurrence(...arguments)
       });
-    });
+    };
   }
 
   render() {

package/cjs/components/DateTimeRangeModalImpl/DateTimeRangeModalImpl.js

@@ -3,6 +3,11 @@
 var _jsx = require('@babel/runtime/helpers/jsx');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 require('core-js/modules/es.string.replace.js');
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.filter.js');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
 var React = require('react');
 var moment = require('moment');
 var dsClassnames = require('@elliemae/ds-classnames');
@@ -38,20 +43,20 @@ class DateTimePredefinedRangeSelectorImpl extends React.Component {
   constructor(props) {
     super(props);
 
-    _defineProperty__default["default"](this, "onChange", () => {
+    this.onChange = () => {
       const {
         onCustomDateTimeRange
       } = this.props;
       onCustomDateTimeRange(this.state);
-    });
+    };
 
-    _defineProperty__default["default"](this, "onQtyRepeatPickerInput", value => {
+    this.onQtyRepeatPickerInput = value => {
       this.setState({
         qtyRepeatPickerInput: value.replace(/[^0-9]/g, '')
       }, () => {
         this.onChange();
       });
-    });
+    };
 
     const {
       dropdownDayOfMonthOptions,

package/cjs/components/DateTimeRecurenceSelectorImpl.js

@@ -1,22 +1,28 @@
 'use strict';
 
-var _jsx = require('@babel/runtime/helpers/jsx');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var _jsx = require('@babel/runtime/helpers/jsx');
+require('core-js/modules/esnext.async-iterator.find.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.find.js');
 require('core-js/modules/web.dom-collections.iterator.js');
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.filter.js');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
 var React = require('react');
 var lodash = require('lodash');
 require('react-dates/initialize');
 var reactSelect = require('react-select');
 var dsClassnames = require('@elliemae/ds-classnames');
-var DSComboBox = require('@elliemae/ds-basic/form/ComboBox');
+var dsForm = require('@elliemae/ds-form');
 var DateTimeRangeModal = require('./DateTimeRangeModal/DateTimeRangeModal.js');
 var jsxRuntime = require('react/jsx-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
-var DSComboBox__default = /*#__PURE__*/_interopDefaultLegacy(DSComboBox);
+var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -31,7 +37,7 @@ class DateTimeRecurenceSelectorImpl extends React.Component {
   constructor(props) {
     super(props);
 
-    _defineProperty__default["default"](this, "onChange", () => {
+    this.onChange = () => {
       const {
         onChange
       } = this.props;
@@ -40,15 +46,15 @@ class DateTimeRecurenceSelectorImpl extends React.Component {
         selected
       } = this.state;
       onChange(selected, customRange);
-    });
+    };
 
-    _defineProperty__default["default"](this, "onCustomDateTimeRange", customRange => {
+    this.onCustomDateTimeRange = customRange => {
       this.setState({
         customRange
       });
-    });
+    };
 
-    _defineProperty__default["default"](this, "onChangeDropdown", value => {
+    this.onChangeDropdown = value => {
       const {
         dropdownPreselectedOptions
       } = this.props;
@@ -70,9 +76,9 @@ class DateTimeRecurenceSelectorImpl extends React.Component {
           openModal: false
         });
       }
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleConfirm", () => {
+    this.handleConfirm = () => {
       const {
         onConfirmField,
         customOptionRender: CustomOptionRender,
@@ -96,33 +102,33 @@ class DateTimeRecurenceSelectorImpl extends React.Component {
       this.onChange();
       this.handleCloseModal();
       onConfirmField();
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleReject", () => {
+    this.handleReject = () => {
       const {
         onRejectField
       } = this.props;
       this.handleActionClose();
       onRejectField();
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleActionClose", () => {
+    this.handleActionClose = () => {
       this.setState(previousState => ({
         selected: previousState.previousSelection
       }));
       this.handleCloseModal();
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleOpenModal", () => this.setState({
+    this.handleOpenModal = () => this.setState({
       openModal: true
-    }));
+    });
 
-    _defineProperty__default["default"](this, "handleCloseModal", () => {
+    this.handleCloseModal = () => {
       this.setState({
         openModal: false
       });
       setTimeout(() => document.activeElement.blur(), 0); // https://github.com/reactjs/react-modal/issues/680
-    });
+    };
 
     this.initCustomRange = props.customRange;
     this.state = {
@@ -216,7 +222,7 @@ class DateTimeRecurenceSelectorImpl extends React.Component {
       className: "".concat(cssClassName, " ").concat(className),
       children: [/*#__PURE__*/_jsx__default["default"]("div", {
         className: "".concat(classNameBlock('container-selector'))
-      }, void 0, /*#__PURE__*/_jsx__default["default"](DSComboBox__default["default"], {
+      }, void 0, /*#__PURE__*/_jsx__default["default"](dsForm.DSComboBox, {
         className: "".concat(classNameElement('dropdown-field-selector')),
         components: {
           Option: props => /*#__PURE__*/jsxRuntime.jsx(reactSelect.components.Option, _objectSpread(_objectSpread({}, props), {}, {

package/cjs/components/DayOfMonthPicker/DayOfMonthPicker.js

@@ -2,8 +2,11 @@
 
 var _jsx = require('@babel/runtime/helpers/jsx');
 require('core-js/modules/web.dom-collections.iterator.js');
+require('core-js/modules/esnext.async-iterator.find.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.find.js');
 require('react');
-var DSComboBox = require('@elliemae/ds-basic/form/ComboBox');
+var dsForm = require('@elliemae/ds-form');
 var nthday = require('../helpers/nthday.js');
 var dropdownDayOfMonthOptions = require('../../options/dropdownDayOfMonthOptions.js');
 var FormLabel = require('../Forms/FormLabel.js');
@@ -13,18 +16,18 @@ var FormGroup = require('../Forms/FormGroup.js');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
-var DSComboBox__default = /*#__PURE__*/_interopDefaultLegacy(DSComboBox);
 
-const DaysOfMonthPicker = ({
-  onDayChange = () => null,
-  dayOfMonthValue = dropdownDayOfMonthOptions.dropdownDayOfMonthOptions[0].value,
-  dayOfMonthOptions = dropdownDayOfMonthOptions.dropdownDayOfMonthOptions,
-  displayOptionsAsCurrentDate = true,
-  currentDate = null,
-  inputLabel = 'On',
-  dayOfMonthAsCurrentDateOptions,
-  displayMonthCustomOption
-}) => {
+const DaysOfMonthPicker = _ref => {
+  let {
+    onDayChange = () => null,
+    dayOfMonthValue = dropdownDayOfMonthOptions.dropdownDayOfMonthOptions[0].value,
+    dayOfMonthOptions = dropdownDayOfMonthOptions.dropdownDayOfMonthOptions,
+    displayOptionsAsCurrentDate = true,
+    currentDate = null,
+    inputLabel = 'On',
+    dayOfMonthAsCurrentDateOptions,
+    displayMonthCustomOption
+  } = _ref;
   let options = dayOfMonthOptions;
 
   if (displayOptionsAsCurrentDate) {
@@ -61,7 +64,7 @@ const DaysOfMonthPicker = ({
     onDayChange(options[0].value, options[0]);
   }
 
-  return /*#__PURE__*/_jsx__default["default"](FormGroup, {}, void 0, /*#__PURE__*/_jsx__default["default"](FormLabel, {}, void 0, inputLabel), /*#__PURE__*/_jsx__default["default"](FormFieldGroup, {}, void 0, /*#__PURE__*/_jsx__default["default"](DSComboBox__default["default"], {
+  return /*#__PURE__*/_jsx__default["default"](FormGroup, {}, void 0, /*#__PURE__*/_jsx__default["default"](FormLabel, {}, void 0, inputLabel), /*#__PURE__*/_jsx__default["default"](FormFieldGroup, {}, void 0, /*#__PURE__*/_jsx__default["default"](dsForm.DSComboBox, {
     onChange: value => onDayChange(value, options.find(o => o.value === value)),
     options: options,
     value: selected