@carbon/ibm-products 2.63.0 → 2.64.0

package/es/global/js/hooks/useFocus.js

@@ -15,7 +15,7 @@ var getSpecificElement = function getSpecificElement(parentEl, elementId) {
   return elementId && !(element !== null && element !== void 0 && element.disabled) ? element : null;
 };
 var useFocus = function useFocus(modalRef, selectorPrimaryFocus) {
-  var _getFocusable2, _getFocusable3, _getFocusable4, _getFocusable5;
+  var _getFocusable3, _getFocusable4, _getFocusable5, _getFocusable6;
   var carbonPrefix = usePrefix();
   var tearsheetBaseClass = "".concat(pkg.prefix, "--tearsheet");
   var sidePanelBaseClass = "".concat(pkg.prefix, "--side-panel");
@@ -90,38 +90,30 @@ var useFocus = function useFocus(modalRef, selectorPrimaryFocus) {
       return _ref.apply(this, arguments);
     };
   }();
+  var claimFocus = useCallback(function () {
+    var _window2;
+    var _getFocusable2 = getFocusable(),
+      first = _getFocusable2.first,
+      specified = _getFocusable2.specified;
+    if (specified && ((_window2 = window) === null || _window2 === void 0 || (_window2 = _window2.getComputedStyle(specified)) === null || _window2 === void 0 ? void 0 : _window2.display) !== 'none' && (specified === null || specified === void 0 ? void 0 : specified.tabIndex) !== -1) {
+      setTimeout(function () {
+        return specified.focus();
+      }, 0);
+    } else {
+      setTimeout(function () {
+        return first === null || first === void 0 ? void 0 : first.focus();
+      }, 0);
+    }
+  }, [getFocusable]);
   return {
-    firstElement: (_getFocusable2 = getFocusable()) === null || _getFocusable2 === void 0 ? void 0 : _getFocusable2.first,
-    lastElement: (_getFocusable3 = getFocusable()) === null || _getFocusable3 === void 0 ? void 0 : _getFocusable3.last,
-    allElements: (_getFocusable4 = getFocusable()) === null || _getFocusable4 === void 0 ? void 0 : _getFocusable4.all,
-    specifiedElement: (_getFocusable5 = getFocusable()) === null || _getFocusable5 === void 0 ? void 0 : _getFocusable5.specified,
+    firstElement: (_getFocusable3 = getFocusable()) === null || _getFocusable3 === void 0 ? void 0 : _getFocusable3.first,
+    lastElement: (_getFocusable4 = getFocusable()) === null || _getFocusable4 === void 0 ? void 0 : _getFocusable4.last,
+    allElements: (_getFocusable5 = getFocusable()) === null || _getFocusable5 === void 0 ? void 0 : _getFocusable5.all,
+    specifiedElement: (_getFocusable6 = getFocusable()) === null || _getFocusable6 === void 0 ? void 0 : _getFocusable6.specified,
     keyDownListener: handleKeyDown,
-    getFocusable: getFocusable
+    getFocusable: getFocusable,
+    claimFocus: claimFocus
   };
 };
 
-/**
- *
- * @param {*} firstElement
- * @param {*} modalRef
- * @param {string | undefined} selectorPrimaryFocus
- */
-var claimFocus = function claimFocus(firstElement, modalRef) {
-  var _window2, _specifiedEl;
-  var selectorPrimaryFocus = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
-  var specifiedEl;
-  if (selectorPrimaryFocus) {
-    specifiedEl = getSpecificElement(modalRef === null || modalRef === void 0 ? void 0 : modalRef.current, selectorPrimaryFocus);
-  }
-  if (specifiedEl && ((_window2 = window) === null || _window2 === void 0 || (_window2 = _window2.getComputedStyle(specifiedEl)) === null || _window2 === void 0 ? void 0 : _window2.display) !== 'none' && ((_specifiedEl = specifiedEl) === null || _specifiedEl === void 0 ? void 0 : _specifiedEl.tabIndex) !== -1) {
-    setTimeout(function () {
-      return specifiedEl.focus();
-    }, 0);
-  } else {
-    setTimeout(function () {
-      return firstElement === null || firstElement === void 0 ? void 0 : firstElement.focus();
-    }, 0);
-  }
-};
-
-export { claimFocus, getSpecificElement, useFocus };
+export { getSpecificElement, useFocus };

package/es/node_modules/@carbon/icons-react/es/Icon.js

@@ -6,7 +6,7 @@
  */
 
 import { objectWithoutProperties as _objectWithoutProperties, objectSpread2 as _objectSpread2 } from '../../../../_virtual/_rollupPluginBabelHelpers.js';
-import { getAttributes } from '../../icon-helpers/es/index.js';
+import { getAttributes } from '../node_modules/@carbon/icon-helpers/es/index.js';
 import PropTypes from '../../../../_virtual/index.js';
 import React__default from 'react';
 

package/es/node_modules/@carbon/{icon-helpers → icons-react/node_modules/@carbon/icon-helpers}/es/index.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { typeof as _typeof } from '../../../../_virtual/_rollupPluginBabelHelpers.js';
+import { typeof as _typeof } from '../../../../../../../_virtual/_rollupPluginBabelHelpers.js';
 
 function _defineProperty(e, r, t) {
   return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {

package/lib/components/APIKeyModal/APIKeyModal.js

@@ -128,7 +128,8 @@ exports.APIKeyModal = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var modalRef = ref || localRef;
   var _useFocus = useFocus.useFocus(modalRef),
     firstElement = _useFocus.firstElement,
-    keyDownListener = _useFocus.keyDownListener;
+    keyDownListener = _useFocus.keyDownListener,
+    claimFocus = _useFocus.claimFocus;
   var prevOpen = usePreviousValue.usePreviousValue(open);
   React.useEffect(function () {
     if (copyRef.current && open && apiKeyLoaded) {
@@ -141,9 +142,10 @@ exports.APIKeyModal = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   React.useEffect(function () {
     if (open) {
       // Focusing the first element or selectorPrimaryFocus element
-      useFocus.claimFocus(firstElement, modalRef, "#".concat(CSS.escape(apiKeyInputId === null || apiKeyInputId === void 0 ? void 0 : apiKeyInputId.current)));
+      claimFocus();
     }
-  }, [firstElement, modalRef, open]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [modalRef, open, firstElement]);
   React.useEffect(function () {
     if (prevOpen && !open && launcherButtonRef) {
       setTimeout(function () {
@@ -595,11 +597,6 @@ exports.APIKeyModal.propTypes = _rollupPluginBabelHelpers.objectSpread2({
    * text that displays in the secondary button when using custom steps to indicate to the user that there is a previous step
    */
   previousStepButtonText: customStepsRequiredProps(index.default.string),
-  /**
-   * Specify a CSS selector that matches the DOM element that should be
-   * focused when the Modal opens.
-   */
-  selectorPrimaryFocus: index.default.string,
   /**
    * label text that's displayed when hovering over visibility toggler to show key
    */

package/lib/components/AboutModal/AboutModal.js

@@ -54,7 +54,7 @@ exports.AboutModal = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var contentId = uuidv4.default();
   var renderPortalUse = usePortalTarget.usePortalTarget(portalTargetIn);
   var _useFocus = useFocus.useFocus(modalRef),
-    firstElement = _useFocus.firstElement;
+    claimFocus = _useFocus.claimFocus;
 
   // We can't add a ref directly to the ModalBody, so track it in a ref
   // as the parent of the current bodyRef element
@@ -64,9 +64,10 @@ exports.AboutModal = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   }, [bodyRef]);
   React.useEffect(function () {
     if (open) {
-      useFocus.claimFocus(firstElement, modalRef);
+      claimFocus();
     }
-  }, [firstElement, modalRef, open]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [modalRef, open]);
   return renderPortalUse(/*#__PURE__*/React.createElement(react.unstable_FeatureFlags, {
     enableExperimentalFocusWrapWithoutSentinels: true
   }, /*#__PURE__*/React.createElement(react.ComposedModal, _rollupPluginBabelHelpers.extends({}, rest, {

package/lib/components/ConditionBuilder/ConditionBlock/ConditionBlock.js

@@ -148,10 +148,8 @@ var ConditionBlock = function ConditionBlock(props) {
     return isLastCondition(conditionIndex, conditions);
   };
   var getOperators = function getOperators() {
-    // @ts-ignore
     if (config !== null && config !== void 0 && config.operators) {
-      // @ts-ignore
-      return config.operators;
+      return config === null || config === void 0 ? void 0 : config.operators;
     }
     return operatorConfig.filter(function (operator) {
       return operator.type.indexOf(type) != -1 || operator.type == 'all';

package/lib/components/ConditionBuilder/ConditionBuilder.types.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { TextAreaProps, TextInputProps } from '@carbon/react';
+import { TextAreaProps, TextInputProps, type DatePickerProps } from '@carbon/react';
 import { CarbonIconType } from '@carbon/icons-react';
 import { NumberInputProps } from '@carbon/react/lib/components/NumberInput/NumberInput';
 import { Dispatch, ForwardedRef, PropsWithChildren, ReactNode, SetStateAction } from 'react';
@@ -46,13 +46,15 @@ export type PropertyConfigOption = {
 };
 export interface PropertyConfigText {
     type: 'text';
-    config: TextInputProps;
-    operators?: Item[];
+    config: TextInputProps & {
+        operators?: Item[];
+    };
 }
 export interface PropertyConfigTextArea {
     type: 'textarea';
-    config: TextAreaProps;
-    operators?: Item[];
+    config: TextAreaProps & {
+        operators?: Item[];
+    };
 }
 export interface PropertyConfigNumber {
     type: 'number';
@@ -66,8 +68,7 @@ export interface PropertyConfigNumber {
 }
 export type PropertyConfigDate = {
     type: 'date';
-    config: {
-        valueFormatter?: (value: string) => string;
+    config: DatePickerProps & {
         operators?: Item[];
     };
 };

package/lib/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItem.js

@@ -146,13 +146,11 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
   };
   var getCustomOperatorLabel = function getCustomOperatorLabel(propertyLabel) {
     var _config$operators;
-    return propertyLabel && (// @ts-ignore
-    config === null || config === void 0 || (_config$operators = config.operators) === null || _config$operators === void 0 ? void 0 : _config$operators.find(function (operator) {
+    return propertyLabel && (config === null || config === void 0 || (_config$operators = config.operators) === null || _config$operators === void 0 ? void 0 : _config$operators.find(function (operator) {
       return operator.id === propertyLabel;
     }));
   };
   var getLabel = function getLabel() {
-    // @ts-ignore
     if (config !== null && config !== void 0 && config.operators && rest['data-name'] === 'operatorField') {
       var _getCustomOperatorLab, _getCustomOperatorLab2;
       return (_getCustomOperatorLab = (_getCustomOperatorLab2 = getCustomOperatorLabel(propertyLabel)) === null || _getCustomOperatorLab2 === void 0 ? void 0 : _getCustomOperatorLab2.label) !== null && _getCustomOperatorLab !== void 0 ? _getCustomOperatorLab : addOperatorText;

package/lib/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItemDate/ConditionBuilderItemDate.d.ts

@@ -6,16 +6,18 @@
  */
 import React from 'react';
 export declare const ConditionBuilderItemDate: {
-    ({ conditionState, onChange, parentRef, }: {
+    ({ conditionState, onChange, parentRef, config, }: {
         conditionState: any;
         onChange: any;
         parentRef: any;
+        config: any;
     }): React.JSX.Element;
     propTypes: {
         /**
          * current condition object
          */
         conditionState: any;
+        config: any;
         /**
          * callback to update state oin date change
          */

package/lib/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItemDate/ConditionBuilderItemDate.js

@@ -18,39 +18,93 @@ var ConditionBuilderProvider = require('../../ConditionBuilderContext/ConditionB
 var ConditionBuilderItemDate = function ConditionBuilderItemDate(_ref) {
   var conditionState = _ref.conditionState,
     onChange = _ref.onChange,
-    parentRef = _ref.parentRef;
+    parentRef = _ref.parentRef,
+    config = _ref.config;
   var DatePickerInputRef = React.useRef(null);
   var _useTranslations = useTranslations.useTranslations(['startText', 'endText']),
     _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 2),
     startText = _useTranslations2[0],
     endText = _useTranslations2[1];
-  var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext);
-    _useContext.conditionBuilderRef;
-  var datePickerType = conditionState.operator == 'between' ? 'range' : 'single';
-  var onCloseHandler = function onCloseHandler(selectedDate) {
-    onChange(selectedDate && selectedDate.length > 0 ? selectedDate : 'INVALID');
+  var _useState = React.useState(),
+    _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
+    dateFromState = _useState2[0],
+    setDateFromState = _useState2[1];
+  var dateFormat = config.dateFormat || 'm/d/Y';
+  var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
+    conditionBuilderRef = _useContext.conditionBuilderRef;
+  var datePickerType = conditionState.operator == 'between' || util.checkForMultiSelectOperator(conditionState, config) ? 'range' : 'single';
+  React.useEffect(function () {
+    if (datePickerType === 'range') {
+      var _getParsedDate;
+      setDateFromState((_getParsedDate = getParsedDate(conditionState.value)) !== null && _getParsedDate !== void 0 ? _getParsedDate : undefined);
+    }
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  //This method will convert the date string from the condition state to date object based on the dateFormat
+  var getParsedDate = function getParsedDate(dateToParse) {
+    var _DatePickerInputRef$c;
+    // @ts-ignore
+    var calendarInstance = DatePickerInputRef === null || DatePickerInputRef === void 0 || (_DatePickerInputRef$c = DatePickerInputRef.current) === null || _DatePickerInputRef$c === void 0 ? void 0 : _DatePickerInputRef$c.calendar;
+    if (!calendarInstance || !dateToParse) {
+      return null;
+    }
+    var _dateToParse$split = dateToParse.split(' - '),
+      _dateToParse$split2 = _rollupPluginBabelHelpers.slicedToArray(_dateToParse$split, 2),
+      startDate = _dateToParse$split2[0],
+      endDate = _dateToParse$split2[1];
+    var parsedDates = [];
+    if (startDate && startDate !== 'INVALID') {
+      parsedDates.push(calendarInstance.parseDate(startDate, dateFormat));
+    }
+    if (endDate && endDate !== 'INVALID') {
+      parsedDates.push(calendarInstance.parseDate(endDate, dateFormat));
+    }
+    return parsedDates.length ? parsedDates : null;
+  };
+  var onCloseHandler = function onCloseHandler(selectedDate, selectedDateStr, instance) {
+    var formattedDate = selectedDateStr;
+    if (datePickerType === 'range' && selectedDate.length === 2) {
+      formattedDate = "".concat(instance.formatDate(selectedDate[0], dateFormat), " - ").concat(instance.formatDate(selectedDate[1], dateFormat));
+    }
+    onChange(formattedDate || 'INVALID');
+  };
+
+  // this will close the popover on enter key press
+  //Note: has to use onKeyPress instead of onKeyDown, since core is stop propagating for onKeydown(fixEventsPlugin.js)
+  var onKeyPressHandler = function onKeyPressHandler(evt) {
+    if (evt.key === 'Enter') {
+      var _DatePickerInputRef$c2;
+      // @ts-ignore
+      var calendarInstance = DatePickerInputRef === null || DatePickerInputRef === void 0 || (_DatePickerInputRef$c2 = DatePickerInputRef.current) === null || _DatePickerInputRef$c2 === void 0 ? void 0 : _DatePickerInputRef$c2.calendar;
+      if (calendarInstance) {
+        onCloseHandler(calendarInstance.selectedDates, evt.target.value, calendarInstance);
+      }
+      util.focusThisField(evt, conditionBuilderRef);
+    }
   };
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(util.blockClass, "__item-date ")
-  }, datePickerType == 'single' && /*#__PURE__*/React.createElement(react.DatePicker, {
+  }, datePickerType == 'single' && /*#__PURE__*/React.createElement(react.DatePicker, _rollupPluginBabelHelpers.extends({}, config, {
     ref: DatePickerInputRef,
-    dateFormat: "d/m/Y",
     datePickerType: "single",
     value: conditionState.value,
     onClose: onCloseHandler,
+    onKeyPress: onKeyPressHandler,
     appendTo: parentRef === null || parentRef === void 0 ? void 0 : parentRef.current
-  }, /*#__PURE__*/React.createElement(react.DatePickerInput, {
+  }), /*#__PURE__*/React.createElement(react.DatePickerInput, {
     id: "datePicker",
     placeholder: "dd/mm/yyyy",
     labelText: conditionState.property
-  })), datePickerType == 'range' && /*#__PURE__*/React.createElement(react.DatePicker, {
+  })), datePickerType == 'range' && /*#__PURE__*/React.createElement(react.DatePicker, _rollupPluginBabelHelpers.extends({}, config, {
     ref: DatePickerInputRef,
-    dateFormat: "d/m/Y",
     datePickerType: datePickerType,
     onClose: onCloseHandler,
-    value: conditionState.value,
+    onKeyPress: onKeyPressHandler,
+    value: dateFromState,
     appendTo: parentRef === null || parentRef === void 0 ? void 0 : parentRef.current
-  }, /*#__PURE__*/React.createElement(react.DatePickerInput, {
+  }), /*#__PURE__*/React.createElement(react.DatePickerInput, {
     id: "datePickerStart",
     placeholder: "dd/mm/yyyy",
     labelText: startText
@@ -65,6 +119,7 @@ ConditionBuilderItemDate.propTypes = {
    * current condition object
    */
   conditionState: index.default.object,
+  config: index.default.object,
   /**
    * callback to update state oin date change
    */

package/lib/components/ConditionBuilder/utils/handleKeyboardEvents.js

@@ -39,6 +39,7 @@ var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentCont
     //focus the corresponding field in which the popover is triggered from
     util.focusThisField(evt, conditionBuilderRef);
     evt.preventDefault();
+    evt.stopPropagation();
   }
   if (isOptionInput) {
     switch (key) {

package/lib/components/ConditionBuilder/utils/util.js

@@ -65,54 +65,19 @@ var manageTabIndexAndFocus = function manageTabIndexAndFocus(currentElement, con
   (_conditionBuilderRef$ = conditionBuilderRef.current) === null || _conditionBuilderRef$ === void 0 || (_conditionBuilderRef$ = _conditionBuilderRef$.querySelector(".".concat(blockClass, "__statement-button"))) === null || _conditionBuilderRef$ === void 0 || _conditionBuilderRef$.setAttribute('tabindex', '1');
   currentElement === null || currentElement === void 0 || currentElement.focus();
 };
-var formatDate = function formatDate(date) {
-  var day = String(date.getDate()).padStart(2, '0');
-  var month = String(date.getMonth() + 1).padStart(2, '0');
-  var year = date.getFullYear();
-  return "".concat(day, "/").concat(month, "/").concat(year);
-};
 var getValue = function getValue(type, value, config) {
-  if (config !== null && config !== void 0 && config.valueFormatter && ['date', 'custom'].includes(type)) {
+  if (config !== null && config !== void 0 && config.valueFormatter && ['custom'].includes(type)) {
     return config.valueFormatter(value);
+  } else if (type === 'option') {
+    if (value && typeof value !== 'string') {
+      var selectedValues = Array.isArray(value) ? value : [value];
+      return selectedValues.map(function (option) {
+        return option.label;
+      }).join(', ');
+    }
+    return value;
   } else {
-    var formatters = {
-      text: function text(value) {
-        return value;
-      },
-      textarea: function textarea(value) {
-        return value;
-      },
-      time: function time(value) {
-        return value;
-      },
-      number: function number(value) {
-        return value;
-      },
-      option: function option(value) {
-        if (value && typeof value !== 'string') {
-          var selectedValues = Array.isArray(value) ? value : [value];
-          return selectedValues.map(function (option) {
-            return option.label;
-          }).join(', ');
-        }
-        return value;
-      },
-      date: function date(value) {
-        if (Array.isArray(value) && value.length > 1) {
-          var start = value !== null && value !== void 0 && value[0] && !isNaN(new Date(value[0])) ? formatDate(new Date(value[0])) : '';
-          var end = value !== null && value !== void 0 && value[1] && !isNaN(new Date(value[1])) ? formatDate(new Date(value[1])) : '';
-          return "".concat(start, " To ").concat(end);
-        } else if (Array.isArray(value) && !isNaN(new Date(value[0]))) {
-          return formatDate(new Date(value[0]));
-        } else {
-          return value;
-        }
-      },
-      custom: function custom(value) {
-        return value;
-      }
-    };
-    return formatters[type](value, config);
+    return value;
   }
 };
 

package/lib/components/CreateFullPage/CreateFullPageStep.js

@@ -110,15 +110,15 @@ exports.CreateFullPageStep = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     }
     return null;
   };
-  return stepsContext ? /*#__PURE__*/React.createElement("section", _rollupPluginBabelHelpers.extends({}, rest, {
+  return stepsContext ? /*#__PURE__*/React.createElement(react.Section, _rollupPluginBabelHelpers.extends({}, rest, {
     className: cx(blockClass, className, _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__step--hidden-step"), stepNumber !== (stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.currentStep)), "".concat(blockClass, "__step--visible-step"), stepNumber === (stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.currentStep))),
     ref: ref
   }), /*#__PURE__*/React.createElement(react.Grid, null, /*#__PURE__*/React.createElement(react.Column, span, /*#__PURE__*/React.createElement(react.Grid, null, /*#__PURE__*/React.createElement(react.Column, _rollupPluginBabelHelpers.extends({
     className: "".concat(blockClass, "-title"),
-    as: "h5"
+    as: react.Heading
   }, span), title), subtitle && /*#__PURE__*/React.createElement(react.Column, _rollupPluginBabelHelpers.extends({
     className: "".concat(blockClass, "-subtitle"),
-    as: "h6"
+    as: "p"
   }, span), subtitle), renderDescription()))), hasFieldset ? /*#__PURE__*/React.createElement(react.FormGroup, {
     legendText: fieldsetLegendText,
     className: "".concat(blockClass, "-fieldset")

package/lib/components/CreateInfluencer/CreateInfluencer.js

@@ -50,9 +50,9 @@ var CreateInfluencer = function CreateInfluencer(_ref) {
     // we need to subtract the number of !shouldIncludeStep/s before the current step
     // which we get from `getNumberOfDynamicStepsBeforeCurrentStep()`
     var totalDynamicSteps = getNumberOfDynamicStepsBeforeCurrentStep(stepData, 'shouldIncludeStep') || 0;
-    return /*#__PURE__*/React.createElement("div", {
+    return /*#__PURE__*/React.createElement(react.Section, {
       className: "".concat(blockClass, "__left-nav")
-    }, title && /*#__PURE__*/React.createElement("h3", {
+    }, title && /*#__PURE__*/React.createElement(react.Heading, {
       className: "".concat(blockClass, "__title")
     }, title), currentStep === 1 && (_stepData$ = stepData[0]) !== null && _stepData$ !== void 0 && _stepData$.introStep ? null : /*#__PURE__*/React.createElement(react.ProgressIndicator, {
       currentIndex: (_stepData$2 = stepData[0]) !== null && _stepData$2 !== void 0 && _stepData$2.introStep ? currentStep - totalDynamicSteps - 2 // minus 2 because we need to account for the intro step in addition to `currentIndex` being 0 index based and our steps being 1 index based

package/lib/components/Datagrid/Datagrid/addons/Filtering/FilterPanel.js

@@ -120,9 +120,6 @@ var FilterPanel = function FilterPanel(_ref) {
     _useShouldDisableButt2 = _rollupPluginBabelHelpers.slicedToArray(_useShouldDisableButt, 2),
     shouldDisableButtons = _useShouldDisableButt2[0],
     setShouldDisableButtons = _useShouldDisableButt2[1];
-
-  // NOTE: In the future when we get rid of framer-motion we can use our own usePrefersReducedMotion hook
-  // using our own was causing an error
   var shouldReduceMotion = usePrefersReducedMotion.usePrefersReducedMotion();
   var exitAnimationName = shouldReduceMotion ? 'filter-panel-exit-reduced' : 'filter-panel-exit-left';
   var _usePresence = usePresence.usePresence(panelOpen, filterPanelRef, exitAnimationName),

package/lib/components/Datagrid/useSortableColumns.js

@@ -154,7 +154,7 @@ var useSortableColumns = function useSortableColumns(hooks) {
       };
       return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, column), {}, {
         Header: Header,
-        minWidth: column.disableSortBy ? 0 : (_column$minWidth = column.minWidth) !== null && _column$minWidth !== void 0 ? _column$minWidth : column.isAction ? 50 : 90
+        minWidth: (_column$minWidth = column.minWidth) !== null && _column$minWidth !== void 0 ? _column$minWidth : column.disableSortBy ? 50 : column.isAction ? 50 : 90
       });
     });
     return (_instance$customizeCo = instance.customizeColumnsProps) !== null && _instance$customizeCo !== void 0 && _instance$customizeCo.isTearsheetOpen ? visibleColumns : _rollupPluginBabelHelpers.toConsumableArray(sortableColumns);

package/lib/components/EmptyStates/EmptyState.d.ts

@@ -7,7 +7,6 @@
 import React, { ElementType, ReactNode } from 'react';
 import '../../global/js/utils/props-helper';
 import { ButtonProps } from '@carbon/react';
-import { CarbonIconType } from '@carbon/icons-react/lib/CarbonIcon';
 declare enum sizes {
     lg = "lg",
     sm = "sm"
@@ -17,16 +16,15 @@ export declare const defaults: {
     size: sizes;
     headingAs: string;
 };
+interface EmptyStateAction extends ButtonProps<React.ElementType> {
+    kind?: 'primary' | 'secondary' | 'tertiary';
+    text?: string;
+}
 export interface EmptyStateProps {
     /**
      * Empty state action button
      */
-    action?: {
-        kind?: 'primary' | 'secondary' | 'tertiary';
-        renderIcon?: CarbonIconType;
-        onClick?: ButtonProps<React.ElementType>['onClick'];
-        text?: string;
-    };
+    action?: EmptyStateAction;
     /**
      * Provide an optional class to be applied to the containing node.
      */
@@ -73,6 +71,7 @@ export interface EmptyStateProps {
      */
     v2?: boolean;
 }
+export type EmptyStatePresetProps = Omit<EmptyStateProps, 'illustration'>;
 /**
  * The `EmptyState` component follows the Carbon guidelines for empty states with some added specifications around illustration usage. For additional usage guidelines and documentation please refer to the links above.
  */

package/lib/components/EmptyStates/ErrorEmptyState/ErrorEmptyState.d.ts

@@ -4,31 +4,9 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React, { ElementType, ReactNode } from 'react';
-import { ButtonProps } from '@carbon/react';
-import { CarbonIconType } from '@carbon/icons-react/lib/CarbonIcon';
-export interface ErrorEmptyStateProps {
-    /**
-     * Empty state action button
-     */
-    action?: {
-        kind?: 'primary' | 'secondary' | 'tertiary';
-        renderIcon?: CarbonIconType;
-        onClick?: ButtonProps<React.ElementType>['onClick'];
-        text?: string;
-    };
-    /**
-     * Provide an optional class to be applied to the containing node.
-     */
-    className?: string;
-    /**
-     * The alt text for empty state svg images. If not provided , title will be used.
-     */
-    illustrationDescription?: string;
-    /**
-     * Designates the position of the illustration relative to the content
-     */
-    illustrationPosition?: 'top' | 'right' | 'bottom' | 'left';
+import React from 'react';
+import { EmptyStatePresetProps } from '../EmptyState';
+export interface ErrorEmptyStateProps extends EmptyStatePresetProps {
     /**
      * Empty state illustration theme variations.
      * To ensure you use the correct themed illustrations, you can conditionally specify light or dark
@@ -36,29 +14,6 @@ export interface ErrorEmptyStateProps {
      * `illustrationTheme={appTheme === ('carbon--g100' || 'carbon--g90') ? 'dark' : 'light'}`
      */
     illustrationTheme?: 'light' | 'dark';
-    /**
-     * Empty state link object
-     */
-    link?: {
-        text?: string | ReactNode;
-        href?: string;
-    };
-    /**
-     * Empty state headingAs allows you to customize the type of heading element
-     */
-    headingAs?: (() => ReactNode) | string | ElementType;
-    /**
-     * Empty state size
-     */
-    size?: 'lg' | 'sm';
-    /**
-     * Empty state subtitle
-     */
-    subtitle?: string | ReactNode;
-    /**
-     * Empty state title
-     */
-    title: string | ReactNode;
 }
 /**
  * The `EmptyState` component follows the Carbon guidelines for empty states with some added specifications around illustration usage. For additional usage guidelines and documentation please refer to the links above.

package/lib/components/EmptyStates/ErrorEmptyState/ErrorEmptyState.js

@@ -19,6 +19,7 @@ var ErrorIllustration = require('../assets/ErrorIllustration.js');
 var EmptyState = require('../EmptyState.js');
 
 var _excluded = ["action", "className", "illustrationPosition", "illustrationDescription", "illustrationTheme", "link", "size", "headingAs", "subtitle", "title"];
+
 // The block part of our conventional BEM class names (blockClass__E--M).
 var blockClass = "".concat(settings.pkg.prefix, "--empty-state");
 var componentName = 'ErrorEmptyState';