@elliemae/ds-controlled-form 2.3.0-next.8 → 2.3.0-rc.3

package/cjs/controlled-combobox/parts/menu-list/useItemRenderer.js

@@ -12,7 +12,7 @@ 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 Grid = require('@elliemae/ds-grid');
+var dsGrid = require('@elliemae/ds-grid');
 var dsForm = require('@elliemae/ds-form');
 var ComboBoxCTX = require('../../ComboBoxCTX.js');
 var styled = require('./styled.js');
@@ -45,9 +45,6 @@ const useItemRenderer = () => {
     focusOptionIdx,
     virtualListHelpers
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
-  const {
-    virtualItems
-  } = virtualListHelpers;
   const multiple = Array.isArray(selectedValues);
   const CBItem = multiple ? dsForm.MultiMenuItem : dsForm.SingleMenuItem;
   const handleClick = React.useCallback((option, e) => {
@@ -75,7 +72,7 @@ const useItemRenderer = () => {
   const handleOnMouseDown = React.useCallback(e => {
     e.preventDefault();
   }, []);
-  const ItemRenderer = React.useMemo(() => virtualItems.map(vItem => {
+  const ItemRenderer = React.useMemo(() => virtualListHelpers === null || virtualListHelpers === void 0 ? void 0 : virtualListHelpers.virtualItems.map(vItem => {
     const option = options[vItem.index];
     const generalProps = {
       wrapperStyles: {
@@ -121,7 +118,7 @@ const useItemRenderer = () => {
           let {
             label
           } = _ref;
-          return /*#__PURE__*/_jsx__default["default"](Grid.Grid, {
+          return /*#__PURE__*/_jsx__default["default"](dsGrid.Grid, {
             cols: ['min-content', 'auto'],
             height: "16px",
             gutter: "xxs",
@@ -134,7 +131,7 @@ const useItemRenderer = () => {
     }
 
     return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {});
-  }), [options, focusOptionIdx, selectedValues, innerRef, virtualItems]);
+  }), [options, focusOptionIdx, selectedValues, innerRef, virtualListHelpers === null || virtualListHelpers === void 0 ? void 0 : virtualListHelpers.virtualItems]);
   return ItemRenderer;
 };
 

package/cjs/controlled-combobox/parts/multi-selected-values-container/MultiSelectedValuesContainer.js

@@ -6,7 +6,6 @@ var _jsx = require('@babel/runtime/helpers/jsx');
 require('core-js/modules/esnext.async-iterator.map.js');
 require('core-js/modules/esnext.iterator.map.js');
 var React = require('react');
-var Grid = require('@elliemae/ds-grid');
 var dsPills = require('@elliemae/ds-pills');
 var ComboBoxCTX = require('../../ComboBoxCTX.js');
 var useGroupPills = require('./useGroupPills.js');
@@ -16,7 +15,6 @@ 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 Grid__default = /*#__PURE__*/_interopDefaultLegacy(Grid);
 
 const MultiSelectedValuesContainer = () => {
   const {
@@ -25,17 +23,29 @@ const MultiSelectedValuesContainer = () => {
       onChange,
       innerRef
     },
-    pillGroupRef
+    pillGroupRef,
+    showPopover,
+    setShowPopover
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
   const multiSelectedValue = selectedValues;
   const correctPillsToShow = useGroupPills.useGroupPills() || 1;
-  const pills = React.useMemo(() => /*#__PURE__*/_jsx__default["default"](Grid__default["default"], {
+  const handleClickOnPills = React.useCallback(e => {
+    if (!showPopover) {
+      var _innerRef$current;
+
+      setShowPopover(true);
+      (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.focus();
+    }
+
+    e.stopPropagation();
+  }, [setShowPopover, innerRef, showPopover]);
+  const pills = React.useMemo(() => /*#__PURE__*/_jsx__default["default"]("div", {
     style: {
       width: 'max-content'
     },
-    onClick: e => e.stopPropagation(),
     "data-testid": ComboboxDataTestids.ComboboxDataTestid.SELECTED_VALUES
   }, void 0, /*#__PURE__*/_jsx__default["default"](dsPills.DSPillGroupV2, {
+    onClick: handleClickOnPills,
     innerRef: pillGroupRef
   }, void 0, multiSelectedValue.length > 0 && multiSelectedValue.slice(0, correctPillsToShow).map(option => /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
     size: "s",
@@ -43,17 +53,17 @@ const MultiSelectedValuesContainer = () => {
     type: "removable",
     tabIndex: -1,
     onRemove: () => {
-      var _innerRef$current;
+      var _innerRef$current2;
 
       onChange(option);
-      (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.focus();
+      (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.focus();
     }
   }, option.value)), multiSelectedValue.length > 0 && correctPillsToShow !== multiSelectedValue.length && /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
     size: "s",
     labelTruncated: false,
     label: "+".concat(multiSelectedValue.length - correctPillsToShow),
     type: "value"
-  }, "grouped"))), [pillGroupRef, innerRef, onChange, multiSelectedValue, correctPillsToShow]);
+  }, "grouped"))), [pillGroupRef, innerRef, onChange, handleClickOnPills, multiSelectedValue, correctPillsToShow]);
   return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
     children: pills
   });

package/cjs/controlled-combobox/react-desc-prop-types.js

@@ -19,7 +19,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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) { _defineProperty__default["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; }
 const ComboboxPropTypes = _objectSpread(_objectSpread({}, dsPropsHelpers.globalAttributesPropTypes), {}, {
   placeholder: dsPropsHelpers.PropTypes.string.description('input s placeholder value').defaultValue(''),
-  options: dsPropsHelpers.PropTypes.oneOfType([dsPropsHelpers.PropTypes.array, dsPropsHelpers.PropTypes.object]).description('List of options').defaultValue([]),
+  options: dsPropsHelpers.PropTypes.oneOfType([dsPropsHelpers.PropTypes.array, dsPropsHelpers.PropTypes.object]).isRequired.description('List of options').defaultValue([]),
   selectedValues: dsPropsHelpers.PropTypes.oneOfType([dsPropsHelpers.PropTypes.arrayOf(dsPropsHelpers.PropTypes.object), dsPropsHelpers.PropTypes.object]).description('Array of option or single option selected'),
   disabled: dsPropsHelpers.PropTypes.bool.description('wheter or not the input is disabled').defaultValue('false'),
   autoFocus: dsPropsHelpers.PropTypes.bool.description('Whether the combo box uses auto focus or not').defaultValue('false'),

package/cjs/controlled-combobox/utils/hooks/useKeyboardNavigation.js

@@ -28,7 +28,6 @@ const useKeyboardNavigation = () => {
     },
     setShowPopover,
     showPopover,
-    setShowSelectedValue,
     focusOptionIdx,
     setCurrentOption,
     scrollOptionIntoView,
@@ -44,13 +43,12 @@ const useKeyboardNavigation = () => {
     } else {
       onFilter('');
       if (innerRef.current) innerRef.current.value = '';
-      setShowSelectedValue(true);
     }
 
     const selectedOption = options.find(item => item.dsId === focusOptionIdx);
     onChange(selectedOption);
     if (!selectedOption.disabled && !multiple) setShowPopover(false);
-  }, [multiple, options, focusOptionIdx, setShowPopover, onFilter, innerRef, setShowSelectedValue, onChange]);
+  }, [multiple, options, focusOptionIdx, setShowPopover, onFilter, innerRef, onChange]);
   const onInputKeyDown = React.useCallback(e => {
     const targetElement = e.target; // =============================================================================
     // CUSTOM KEYS
@@ -150,7 +148,6 @@ const useKeyboardNavigation = () => {
       }
 
       onFilter('');
-      setShowSelectedValue(true);
     }
 
     if (e.key === 'Tab' && !inline && !withoutPortal) {
@@ -165,7 +162,7 @@ const useKeyboardNavigation = () => {
     } // if (e.key === 'Tab' && multiple) {
     // }
 
-  }, [currentItemIndex, options, currentItem, innerRef, multiple, showPopover, selectedValues, inline, scrollOptionIntoView, onKeyDown, onSelectAll, onChange, onCreate, onFilter, setCurrentOption, setShowPopover, setShowSelectedValue, selectOption, onCancel, selectAllCheckboxRef, toggleSelectionButtonRef, withoutPortal]);
+  }, [currentItemIndex, options, currentItem, innerRef, multiple, showPopover, selectedValues, inline, scrollOptionIntoView, onKeyDown, onSelectAll, onChange, onCreate, onFilter, setCurrentOption, setShowPopover, selectOption, onCancel, selectAllCheckboxRef, toggleSelectionButtonRef, withoutPortal]);
   return {
     onInputKeyDown
   };

package/cjs/controlled-date-time-picker/parts/ControlledDateTimePickerContent.js

@@ -10,7 +10,7 @@ require('core-js/modules/esnext.iterator.for-each.js');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _jsx = require('@babel/runtime/helpers/jsx');
 var React = require('react');
-var Grid = require('@elliemae/ds-grid');
+var dsGrid = require('@elliemae/ds-grid');
 var ControlledDateTimePickerCTX = require('../ControlledDateTimePickerCTX.js');
 var Styleds = require('./Styleds.js');
 var DateInputs = require('./DateInputs/DateInputs.js');
@@ -72,7 +72,7 @@ const ControlledDateTimePickerContent = () => {
       isControllerOnly: isControllerOnly,
       disabled: disabled
     }, dataAttrs), {}, {
-      children: [hideDate ? null : _DateInputs || (_DateInputs = /*#__PURE__*/_jsx__default["default"](DateInputs.DateInputs, {})), hideTime ? null : _TimeInputs || (_TimeInputs = /*#__PURE__*/_jsx__default["default"](TimeInputs.TimeInputs, {})), withAnyRightController ? /*#__PURE__*/_jsx__default["default"](Grid.Grid, {
+      children: [hideDate ? null : _DateInputs || (_DateInputs = /*#__PURE__*/_jsx__default["default"](DateInputs.DateInputs, {})), hideTime ? null : _TimeInputs || (_TimeInputs = /*#__PURE__*/_jsx__default["default"](TimeInputs.TimeInputs, {})), withAnyRightController ? /*#__PURE__*/_jsx__default["default"](dsGrid.Grid, {
         cols: rightControlCols
       }, void 0, shouldPreserveClearableSpace ? _ClearButton || (_ClearButton = /*#__PURE__*/_jsx__default["default"](ClearButton.ClearButton, {})) : null, withAnyPicker ? _PickersIcons || (_PickersIcons = /*#__PURE__*/_jsx__default["default"](PickersIcons.PickersIcons, {})) : null) : null]
     }))

package/cjs/controlled-date-time-picker/parts/DateInputs/DateInputs.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _jsx = require('@babel/runtime/helpers/jsx');
 var React = require('react');
-var Grid = require('@elliemae/ds-grid');
+var dsGrid = require('@elliemae/ds-grid');
 var ControlledDateTimePickerCTX = require('../../ControlledDateTimePickerCTX.js');
 var MMInput = require('./MMInput.js');
 var DDInput = require('./DDInput.js');
@@ -45,7 +45,7 @@ const DateInputs = () => {
     yearInputRef,
     ariaCurrentValueForInputs
   } = React.useContext(ControlledDateTimePickerCTX.ControlledDateTimePickerContext);
-  return /*#__PURE__*/_jsx__default["default"](Grid.Grid, {
+  return /*#__PURE__*/_jsx__default["default"](dsGrid.Grid, {
     cols: [config.fixedValues.smallInputWidth, config.fixedValues.separatorWidth, config.fixedValues.smallInputWidth, config.fixedValues.separatorWidth, config.fixedValues.largeInputWidth]
   }, void 0, /*#__PURE__*/_jsx__default["default"](Styleds.StyledFocusWithIn, {}, void 0, /*#__PURE__*/_jsx__default["default"](MMInput.MMInput, {
     onChange: onMonthChange,

package/cjs/controlled-date-time-picker/parts/Pickers/Calendar/Styleds.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _taggedTemplateLiteral = require('@babel/runtime/helpers/taggedTemplateLiteral');
 var styled = require('styled-components');
 var dsSystem = require('@elliemae/ds-system');
-var Grid = require('@elliemae/ds-grid');
+var dsGrid = require('@elliemae/ds-grid');
 var DSButton = require('@elliemae/ds-button');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -127,7 +127,7 @@ const StyledDayBtn = /*#__PURE__*/styled__default["default"](DSButton.DSButtonV2
   } = _ref17;
   return theme.colors.brand[200];
 }, focusBorder);
-const StyledWeekDaysListWrapper = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledWeekDaysListWrapper = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-18gg4kd-7"
 })(["font-size:", ";text-align:center;", ";", ";.dayWrapper.selectedDay,.dayWrapper.startRangeDay,.dayWrapper.endRangeDay{", "{color:", ";font-weight:", ";}&:not(.disabledDay),&:not(.outOfRangeDay){", "{background-color:", ";}}&.disabledDay,&.outOfRangeDay{", "{color:", ";background-color:", ";&:before{background-color:", ";}}}&.focusedDay{", "{color:", ";border-color:", ";}}&.outOfRangeDay.focusedDay{", "{color:", ";&:before{background-color:", ";}}}}.dayWrapper.disabledDay,.dayWrapper.outOfRangeDay{", "{color:", ";", " &:before{background-color:", ";}}&.focusedDay{", "{&:after{border:2px solid ", ";}}}}.dayWrapper.focusedDay{", "{", " color:", ";&:after{border:2px solid ", ";}}&.disabledDay,&.outOfRangeDay{", "{color:", ";&:before{background-color:", ";}}}}.dayWrapper.notCurrentMonth{", "{color:", ";}&.focusedDay{", "{color:", ";}&.disabledDay,&.outOfRangeDay{", "{color:", ";}&.inRangeDay,&.startRangeDay,&.endRangeDay{", "{color:", ";}}}}&.selectedDay,&.startRangeDay,&.endRangeDay{", "{color:", ";}}}.dayWrapper.inRangeDay{", " &.disabledDay,&.outOfRangeDay{", "{color:", ";background-color:", ";&:before{background-color:", ";}}&.focusedDay{", "{border-color:", ";}}}}.dayWrapper.startRangeDay{", " &.focusedDay{", "{color:", ";}}&.disabledDay,&.outOfRangeDay{", "{color:", ";&:before{background-color:", ";}}}}.dayWrapper.endRangeDay{", " &.focusedDay{", "{color:", ";}}&.disabledDay,&.outOfRangeDay{", "{color:", ";&:before{background-color:", ";}}}}.dayWrapper.endRangeDay.startRangeDay{background-color:transparent;box-shadow:none;}"], _ref18 => {
   let {

package/cjs/controlled-date-time-picker/parts/Pickers/TimeWheel/Styleds.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _taggedTemplateLiteral = require('@babel/runtime/helpers/taggedTemplateLiteral');
 var styled = require('styled-components');
 var dsSystem = require('@elliemae/ds-system');
-var Grid = require('@elliemae/ds-grid');
+var dsGrid = require('@elliemae/ds-grid');
 var DSButton = require('@elliemae/ds-button');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -84,7 +84,7 @@ const StyledTimePickerContainer = /*#__PURE__*/styled__default["default"].div.wi
   } = _ref8;
   return showShadow && !isControllerOnly ? "\n  box-shadow: 0 6px 20px 0 rgb(0 0 0 / 24%), 0 8px 17px 0 rgb(0 0 0 / 19%);\n  " : '';
 });
-const StyledTimePickerHead = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledTimePickerHead = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-1nsw31l-3"
 })(["width:100%;grid-area:TimePickerHead;justify-content:center;align-items:center;background:", ";"], _ref9 => {
   let {

package/cjs/controlled-date-time-picker/parts/Styleds.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var styled = require('styled-components');
-var Grid = require('@elliemae/ds-grid');
+var dsGrid = require('@elliemae/ds-grid');
 var DSButton = require('@elliemae/ds-button');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -14,10 +14,10 @@ var styled__default = /*#__PURE__*/_interopDefaultLegacy(styled);
 const ResettedInput = /*#__PURE__*/styled__default["default"].input.withConfig({
   componentId: "sc-1t4k08s-0"
 })(["border:none;box-shadow:none;background:none;text-align:center;height:100%;display:flex;align-items:center;:focus{outline:none;}padding-top:2px;"]);
-const StyledSeparator = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledSeparator = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-1t4k08s-1"
 })(["padding-top:2px;margin:auto;"]);
-const StyledColonSeparator = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledColonSeparator = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-1t4k08s-2"
 })(["padding-bottom:1px;margin:auto;"]);
 const Styled2DigitsInput = /*#__PURE__*/styled__default["default"](ResettedInput).withConfig({
@@ -36,7 +36,7 @@ const StyledMin4DigitsInput = /*#__PURE__*/styled__default["default"](ResettedIn
   } = _ref2;
   return disabled ? "color: #616b7f;" : "";
 });
-const StyledInputsWrapperGrid = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledInputsWrapperGrid = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-1t4k08s-5"
 })(["width:max-content;align-items:center;", " border-color:", ";border-radius:2px;padding-left:", ";padding-right:", ";position:relative;", ""], _ref3 => {
   let {
@@ -75,7 +75,7 @@ const StyledDateInputsWrapperGrid = /*#__PURE__*/styled__default["default"].div.
 const StyledTimeInputsWrapperGrid = /*#__PURE__*/styled__default["default"].div.withConfig({
   componentId: "sc-1t4k08s-7"
 })(["display:grid;grid-template-columns:24px min-content 24px min-content 24px min-content 24px;grid-template-rows:min-content;padding:6px 0;gap:0px 0px;align-items:center;input,p{margin:0;}"]);
-const StyledPickersIconsWrapperGrid = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledPickersIconsWrapperGrid = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-1t4k08s-8"
 })(["position:relative;", ":before{content:'';position:absolute;top:0px;left:-1px;width:100%;height:100%;border-radius:2px;z-index:-1;", "}"], _ref8 => {
   let {
@@ -90,7 +90,7 @@ const StyledPickersIconsWrapperGrid = /*#__PURE__*/styled__default["default"](Gr
   } = _ref9;
   return isControllerOnly ? "" : "\n    border-left: 1px solid ".concat(hasError ? theme.colors.danger[900] : theme.colors.neutral[200], "\n    ");
 });
-const StyledFocusWithIn = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledFocusWithIn = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-1t4k08s-9"
 })(["position:relative;&:focus-within{&:after{display:block;content:' ';position:absolute;top:-5px;left:-2px;width:calc(100% + 4px);height:calc(100% + 10px);border:2px solid ", ";border-radius:2px;pointer-events:none;}}"], _ref10 => {
   let {

package/cjs/controlled-date-time-picker/parts/TimeInputs/TimeInputs.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _jsx = require('@babel/runtime/helpers/jsx');
 var React = require('react');
-var Grid = require('@elliemae/ds-grid');
+var dsGrid = require('@elliemae/ds-grid');
 var ControlledDateTimePickerCTX = require('../../ControlledDateTimePickerCTX.js');
 var HHInput = require('./HHInput.js');
 var MinutesInput = require('./MinutesInput.js');
@@ -49,7 +49,7 @@ const TimeInputs = () => {
     meridiemInputRef,
     ariaCurrentValueForInputs
   } = React.useContext(ControlledDateTimePickerCTX.ControlledDateTimePickerContext);
-  return /*#__PURE__*/_jsx__default["default"](Grid.Grid, {
+  return /*#__PURE__*/_jsx__default["default"](dsGrid.Grid, {
     cols: [config.fixedValues.smallInputWidth, config.fixedValues.separatorWidth, config.fixedValues.smallInputWidth, config.fixedValues.separatorWidth, config.fixedValues.smallInputWidth]
   }, void 0, /*#__PURE__*/_jsx__default["default"](Styleds.StyledFocusWithIn, {}, void 0, /*#__PURE__*/_jsx__default["default"](HHInput.HHInput, {
     value: hours,

package/esm/controlled-checkbox/ControlledCheckbox.js

@@ -1,68 +1,80 @@
+import 'core-js/modules/esnext.async-iterator.filter.js';
+import 'core-js/modules/esnext.iterator.constructor.js';
+import 'core-js/modules/esnext.iterator.filter.js';
+import 'core-js/modules/esnext.async-iterator.for-each.js';
+import 'core-js/modules/esnext.iterator.for-each.js';
 import _jsx from '@babel/runtime/helpers/esm/jsx';
+import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
+import _objectWithoutProperties from '@babel/runtime/helpers/esm/objectWithoutProperties';
 import { useRef, useCallback } from 'react';
-import { describe } from 'react-desc';
+import { describe, useMemoMergePropsWithDefault, useGetGlobalAttributes } from '@elliemae/ds-props-helpers';
 import { SimpleTruncatedTooltipText } from '@elliemae/ds-truncated-tooltip-text';
-import { propTypes } from './propTypes.js';
 import { StyledContainer, StyledCheckBox, StyledInput, StyledLabel } from './styles.js';
-import { useValidateProps } from './config/useValidateProps.js';
+import { propTypes, defaultProps } from './react-desc-prop-types.js';
 import { setMultipleRefs } from './utils/setMultipleRefs.js';
+import { useValidateProps } from './config/useValidateProps.js';
 import { jsx } from 'react/jsx-runtime';
 
+const _excluded = ["id", "disabled", "readOnly", "label", "aria-label", "aria-controls", "onKeyDown", "className"];
+
+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) { _defineProperty(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; }
+
 const DSControlledCheckbox = props => {
+  const propsWithDefault = useMemoMergePropsWithDefault(props, defaultProps);
   useValidateProps(props, propTypes);
-  const checkboxRef = useRef();
+  const checkboxRef = useRef(null);
   const {
-    autoFocus,
     checked,
-    ariaControls,
-    ariaLabel,
-    disabled,
-    id,
     label,
     hasError,
-    onChange,
-    onFocus,
-    onBlur,
-    value,
-    readOnly,
-    name,
     innerRef,
-    tabIndex
-  } = props;
+    tabIndex,
+    ariaLabel: legacyAriaLabel,
+    ariaControls: legacyAriaControls,
+    'data-testid': dataTestid = 'ds-checkbox-container'
+  } = propsWithDefault;
   const handleOnKeyDown = useCallback(e => {
     if (checkboxRef.current && e.key === 'Enter') {
       checkboxRef.current.click();
     }
   }, []);
+
+  const _useGetGlobalAttribut = useGetGlobalAttributes(propsWithDefault, {
+    onKeyDown: handleOnKeyDown
+  }),
+        {
+    id,
+    disabled,
+    readOnly,
+    label: globalLabel,
+    'aria-label': ariaLabel,
+    'aria-controls': ariaControls,
+    onKeyDown,
+    className
+  } = _useGetGlobalAttribut,
+        restGlobals = _objectWithoutProperties(_useGetGlobalAttribut, _excluded);
+
   return /*#__PURE__*/_jsx(StyledContainer, {
-    "data-testid": "ds-checkbox-container"
+    "data-testid": dataTestid,
+    className: className
   }, void 0, /*#__PURE__*/_jsx(StyledCheckBox, {
-    checked: props.checked,
+    checked: checked,
     hasError: hasError,
     disabled: disabled,
     readOnly: readOnly
-  }, void 0, /*#__PURE__*/jsx(StyledInput, {
-    disabled: disabled,
+  }, void 0, /*#__PURE__*/jsx(StyledInput, _objectSpread(_objectSpread({}, restGlobals), {}, {
+    "data-testid": "ds-checkbox",
+    id: id,
     ref: ref => setMultipleRefs([checkboxRef, innerRef])(ref),
     onKeyDown: handleOnKeyDown,
     type: "checkbox",
     checked: checked !== 'mixed' ? checked : undefined,
-    "aria-controls": ariaControls,
-    "aria-checked": checked,
-    "aria-disabled": disabled,
-    "aria-invalid": hasError,
-    "aria-readonly": readOnly,
-    "aria-label": ariaLabel || label,
-    onFocus: onFocus,
-    onBlur: onBlur,
-    name: name,
-    value: value,
-    onChange: onChange,
-    id: id,
-    "data-testid": "ds-checkbox",
-    autoFocus: autoFocus,
-    tabIndex: tabIndex || 0
-  })), label && /*#__PURE__*/_jsx(StyledLabel, {
+    "aria-label": ariaLabel || legacyAriaLabel || label,
+    "aria-controls": ariaControls || legacyAriaControls,
+    tabIndex: tabIndex
+  }))), label && /*#__PURE__*/_jsx(StyledLabel, {
     htmlFor: id,
     disabled: disabled,
     readOnly: readOnly,

package/esm/controlled-checkbox/config/useValidateProps.js

@@ -7,11 +7,11 @@ const throwError = message => {
 const useValidateProps = (props, propTypes) => {
   useValidateTypescriptPropTypes(props, propTypes);
 
-  if (typeof props.label === 'undefined' && typeof props.ariaLabel === 'undefined') {
+  if (typeof props.label === 'undefined' && typeof props['aria-label'] === 'undefined') {
     throwError("Please provide a label or ariaLabel property to use this component.");
   }
 
-  if (props.checked === 'mixed' && typeof props.ariaControls === 'undefined') {
+  if (props.checked === 'mixed' && typeof props['aria-controls'] === 'undefined') {
     throwError("Please provide an ariaControls property to use a checkbox mixed state. \n      This property must be a string containing all the ids that this mixed checkbox is controlling.");
   }
 };

package/esm/controlled-checkbox/react-desc-prop-types.js

@@ -0,0 +1,23 @@
+import 'core-js/modules/esnext.async-iterator.filter.js';
+import 'core-js/modules/esnext.iterator.constructor.js';
+import 'core-js/modules/esnext.iterator.filter.js';
+import 'core-js/modules/esnext.async-iterator.for-each.js';
+import 'core-js/modules/esnext.iterator.for-each.js';
+import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
+import { PropTypes, globalAttributesPropTypes } from '@elliemae/ds-props-helpers';
+
+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) { _defineProperty(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; }
+const defaultProps = {
+  hasError: false,
+  tabIndex: undefined,
+  checked: false
+};
+const propTypes = _objectSpread(_objectSpread({}, globalAttributesPropTypes), {}, {
+  label: PropTypes.string.description('Checkbox Label property. This label is also going to be used as an aria-label for screen readers.'),
+  hasError: PropTypes.bool.description('Whether the checkbox has error or not.'),
+  innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).description('Checkbox input ref.')
+});
+
+export { defaultProps, propTypes };

package/esm/controlled-checkbox/utils/styleHelpers.js

@@ -1,5 +1,5 @@
 /* eslint-disable max-params */
-const handleCheckMarkColor = (_ref, disabled, readOnly, hasError, checked, isHovering) => {
+const handleCheckMarkColor = (_ref, checked, isHovering, disabled, readOnly, hasError) => {
   let {
     colors
   } = _ref;
@@ -22,14 +22,14 @@ const handleCheckmark = function (theme, checked, disabled, readOnly, hasError)
   let isHovering = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
 
   if (checked === 'mixed') {
-    return "&:before {\n      position: absolute;\n    content: '';\n    top: 6px;\n    left: 3px;\n    background: ".concat(handleCheckMarkColor(theme, disabled, readOnly, hasError, checked, isHovering), ";\n    width: ").concat(theme.space.xxs, ";\n    height: 2px;\n    }");
+    return "&:before {\n      position: absolute;\n    content: '';\n    top: 6px;\n    left: 3px;\n    background: ".concat(handleCheckMarkColor(theme, checked, isHovering, disabled, readOnly, hasError), ";\n    width: ").concat(theme.space.xxs, ";\n    height: 2px;\n    }");
   }
 
   if (checked) {
-    return "&:before {\n      position: absolute;\n      content: '';\n          top: 3px;\n          left: 2px;\n          border-left: 2px solid ".concat(handleCheckMarkColor(theme, disabled, readOnly, hasError, checked, isHovering), ";\n          border-bottom: 2px solid ").concat(handleCheckMarkColor(theme, disabled, readOnly, hasError, checked, isHovering), ";\n          height: 5px;\n          width: 10px;\n          transform: rotate(-45deg);\n    }");
+    return "&:before {\n      position: absolute;\n      content: '';\n          top: 3px;\n          left: 2px;\n          border-left: 2px solid ".concat(handleCheckMarkColor(theme, checked, isHovering, disabled, readOnly, hasError), ";\n          border-bottom: 2px solid ").concat(handleCheckMarkColor(theme, checked, isHovering, disabled, readOnly, hasError), ";\n          height: 5px;\n          width: 10px;\n          transform: rotate(-45deg);\n    }");
   }
 
-  return undefined;
+  return '';
 };
 const handleBackgroundColor = (_ref2, disabled) => {
   let {

package/esm/controlled-combobox/ComboBoxCTX.js

@@ -1,4 +1,4 @@
-import { createRef, createContext } from 'react';
+import { createContext, createRef } from 'react';
 import { noop } from 'lodash';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -20,8 +20,7 @@ const defaultProps = {
   onChange: noop,
   onKeyDown: noop,
   onFilter: noop,
-  onMenuOpen: noop,
-  innerRef: /*#__PURE__*/createRef()
+  onMenuOpen: noop
 };
 const defaultContext = {
   props: defaultProps,
@@ -39,8 +38,6 @@ const defaultContext = {
   selectedOptionsRef: /*#__PURE__*/createRef(),
   selectAllCheckboxRef: /*#__PURE__*/createRef(),
   toggleSelectionButtonRef: /*#__PURE__*/createRef(),
-  showSelectedValue: false,
-  setShowSelectedValue: noop,
   focusOptionIdx: '',
   setCurrentOption: noop,
   showSelectedOptions: false,

package/esm/controlled-combobox/config/useComboBox.js

@@ -5,7 +5,7 @@ import 'core-js/modules/esnext.async-iterator.for-each.js';
 import 'core-js/modules/esnext.iterator.for-each.js';
 import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 import 'core-js/modules/web.dom-collections.iterator.js';
-import { useState, useRef, useCallback, useMemo } from 'react';
+import { useRef, useState, useCallback, useMemo } from 'react';
 import { useVirtual } from 'react-virtual';
 import { useMemoMergePropsWithDefault, useValidateTypescriptPropTypes } from '@elliemae/ds-props-helpers';
 import { defaultProps } from '../ComboBoxCTX.js';
@@ -16,11 +16,14 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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) { _defineProperty(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; }
 const useComboBox = props => {
-  const propsWithDefaults = useMemoMergePropsWithDefault(props, defaultProps);
+  const defaultPropsWithInnerRef = _objectSpread(_objectSpread({}, defaultProps), {}, {
+    innerRef: useRef(null)
+  });
+
+  const propsWithDefaults = useMemoMergePropsWithDefault(props, defaultPropsWithInnerRef);
   useValidateTypescriptPropTypes(propsWithDefaults, ComboboxPropTypes);
   const [showPopover, setShowPopover] = useState(false);
   const [referenceElement, setReferenceElement] = useState(null);
-  const [showSelectedValue, setShowSelectedValue] = useState(false);
   const [showSelectedOptions, setShowSelectedOptions] = useState(false);
   const [hasFocus, setHasFocus] = useState(false);
   const [focusOptionIdx, setCurrentOption] = useState('');
@@ -59,7 +62,6 @@ const useComboBox = props => {
     virtualListHelpers,
     showPopover,
     referenceElement,
-    showSelectedValue,
     listRef,
     focusOptionIdx,
     selectedOptionsRef,
@@ -74,10 +76,9 @@ const useComboBox = props => {
     setHasFocus,
     setCurrentOption,
     scrollOptionIntoView,
-    setShowSelectedValue,
     setReferenceElement,
     setShowPopover
-  }), [scrollOptionIntoView, correctOptions, propsWithDefaults, virtualListHelpers, focusOptionIdx, showSelectedValue, wrapperListRef, showSelectedOptions, showPopover, pillGroupRef, referenceElement, selectedOptionsRef, controlsWrapperRef, selectAllCheckboxRef, toggleSelectionButtonRef, hasFocus, listRef]);
+  }), [scrollOptionIntoView, correctOptions, propsWithDefaults, virtualListHelpers, focusOptionIdx, wrapperListRef, showSelectedOptions, showPopover, pillGroupRef, referenceElement, selectedOptionsRef, controlsWrapperRef, selectAllCheckboxRef, toggleSelectionButtonRef, hasFocus, listRef]);
   return ctx;
 };
 

package/esm/controlled-combobox/parts/a11y-messages/SelectedValuesAllyMsg.js

@@ -14,16 +14,21 @@ const SelectedValuesAllyMsg = () => {
   } = useContext(ComboBoxContext);
   const msg = useMemo(() => {
     if (Array.isArray(selectedValues)) {
-      return "Options selected: ".concat(selectedValues.map(item => item.label).join(', '));
+      if (selectedValues.length > 0) {
+        return "Options selected: ".concat(selectedValues.map(item => item.label).join(', '));
+      }
+
+      return 'No Options Selected';
     }
 
     if (selectedValues) {
       return "Option selected: ".concat(selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.label);
     }
 
-    return '';
+    return 'No Option Selected';
   }, [selectedValues]);
   return /*#__PURE__*/_jsx(StyledA11ySelectedValues, {
+    id: "combobox-selected-items",
     "data-testid": ComboboxDataTestid.ALLY_SELECTED_VALUES,
     "aria-live": "polite",
     "aria-atomic": "false",