@carbon/ibm-products 2.65.0 → 2.66.0

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

@@ -7,45 +7,36 @@
 
 'use strict';
 
-var _rollupPluginBabelHelpers = require('../../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var react = require('@carbon/react');
 var index = require('../../../../_virtual/index.js');
 var util = require('../../utils/util.js');
 
 var _SelectItem, _SelectItem2;
-var ConditionBuilderItemTime = function ConditionBuilderItemTime(_ref) {
-  var _config$timeZones, _config$timeZones2;
-  var onChange = _ref.onChange,
-    config = _ref.config;
-  var _useState = React.useState(''),
-    _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
-    timeValue = _useState2[0],
-    setTimeValue = _useState2[1];
-  var _useState3 = React.useState('AM'),
-    _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
-    dayZoneValue = _useState4[0],
-    setDayZoneValue = _useState4[1];
-  var _useState5 = React.useState(config === null || config === void 0 || (_config$timeZones = config.timeZones) === null || _config$timeZones === void 0 ? void 0 : _config$timeZones[0]),
-    _useState6 = _rollupPluginBabelHelpers.slicedToArray(_useState5, 2),
-    timeZoneValue = _useState6[0],
-    setTimeZoneValue = _useState6[1];
-  React.useEffect(function () {
-    var timeToUpdate = "".concat(timeValue !== null && timeValue !== void 0 ? timeValue : '', " ").concat(dayZoneValue !== null && dayZoneValue !== void 0 ? dayZoneValue : '', " ").concat(timeZoneValue !== null && timeZoneValue !== void 0 ? timeZoneValue : '');
+const ConditionBuilderItemTime = _ref => {
+  let {
+    onChange,
+    config
+  } = _ref;
+  const [timeValue, setTimeValue] = React.useState('');
+  const [dayZoneValue, setDayZoneValue] = React.useState('AM');
+  const [timeZoneValue, setTimeZoneValue] = React.useState(config?.timeZones?.[0]);
+  React.useEffect(() => {
+    const timeToUpdate = `${timeValue ?? ''} ${dayZoneValue ?? ''} ${timeZoneValue ?? ''}`;
     onChange(timeValue ? timeToUpdate : undefined);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [timeValue, dayZoneValue, timeZoneValue]);
-  var setTimeZone = function setTimeZone(evt) {
+  const setTimeZone = evt => {
     setTimeZoneValue(evt.target.value);
   };
-  var setDayZone = function setDayZone(evt) {
+  const setDayZone = evt => {
     setDayZoneValue(evt.target.value);
   };
-  var setTime = function setTime(evt) {
+  const setTime = evt => {
     setTimeValue(evt.target.value);
   };
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(util.blockClass, "__item-time")
+    className: `${util.blockClass}__item-time`
   }, /*#__PURE__*/React.createElement(react.TimePicker, {
     id: "time-picker",
     labelText: "Select a time",
@@ -62,13 +53,11 @@ var ConditionBuilderItemTime = function ConditionBuilderItemTime(_ref) {
   }))), /*#__PURE__*/React.createElement(react.TimePickerSelect, {
     id: "time-picker-time-zone",
     onChange: setTimeZone
-  }, config === null || config === void 0 || (_config$timeZones2 = config.timeZones) === null || _config$timeZones2 === void 0 ? void 0 : _config$timeZones2.map(function (timeZone, index) {
-    return /*#__PURE__*/React.createElement(react.SelectItem, {
-      key: index,
-      value: timeZone,
-      text: timeZone
-    });
-  }))));
+  }, config?.timeZones?.map((timeZone, index) => /*#__PURE__*/React.createElement(react.SelectItem, {
+    key: index,
+    value: timeZone,
+    text: timeZone
+  })))));
 };
 ConditionBuilderItemTime.propTypes = {
   /**

package/lib/components/ConditionBuilder/ConditionGroupBuilder/ConditionGroupBuilder.js

@@ -9,7 +9,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var ConditionBlock = require('../ConditionBlock/ConditionBlock.js');
 var index = require('../../../_virtual/index.js');
@@ -31,34 +30,28 @@ var useDataConfigs = require('../utils/useDataConfigs.js');
  * @returns
  */
 
-var _ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
+const ConditionGroupBuilder = _ref => {
   var _ConditionPreview, _ConditionPreview2;
-  var group = _ref.group,
-    aria = _ref.aria,
-    onRemove = _ref.onRemove,
-    onChange = _ref.onChange,
-    className = _ref.className;
-  var _useTranslations = useTranslations.useTranslations(['conditionBuilderGroupText', 'conditionText', 'conditionBuilderText']),
-    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 3),
-    conditionBuilderGroupText = _useTranslations2[0],
-    conditionText = _useTranslations2[1],
-    conditionBuilderText = _useTranslations2[2];
-  var _useDataConfigs = useDataConfigs.useDataConfigs(),
-    statementConfig = _useDataConfigs.statementConfig;
-  var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
-    variant = _useContext.variant,
-    conditionBuilderRef = _useContext.conditionBuilderRef;
-  var _useState = React.useState(-1),
-    _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
-    showConditionPreview = _useState2[0],
-    setShowConditionPreview = _useState2[1];
-  var _useState3 = React.useState(-1),
-    _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
-    showConditionSubGroupPreview = _useState4[0],
-    setShowConditionSubGroupPreview = _useState4[1];
+  let {
+    group,
+    aria,
+    onRemove,
+    onChange,
+    className
+  } = _ref;
+  const [conditionBuilderGroupText, conditionText, conditionBuilderText] = useTranslations.useTranslations(['conditionBuilderGroupText', 'conditionText', 'conditionBuilderText']);
+  const {
+    statementConfig
+  } = useDataConfigs.useDataConfigs();
+  const {
+    variant,
+    conditionBuilderRef
+  } = React.useContext(ConditionBuilderProvider.ConditionBuilderContext);
+  const [showConditionPreview, setShowConditionPreview] = React.useState(-1);
+  const [showConditionSubGroupPreview, setShowConditionSubGroupPreview] = React.useState(-1);
   React.useState(false);
-  var conditionBuilderContentRef = React.useRef(null);
-  var onRemoveHandler = function onRemoveHandler(conditionId, evt, conditionIndex) {
+  const conditionBuilderContentRef = React.useRef(null);
+  const onRemoveHandler = (conditionId, evt, conditionIndex) => {
     if (group && group.conditions && group.conditions.length > 1) {
       if (variant == util.HIERARCHICAL_VARIANT) {
         handleFocusOnCloseHierarchical(evt);
@@ -66,122 +59,118 @@ var _ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         handleFocusOnClose(evt, conditionIndex);
       }
       if (!checkGroupHaveCondition(group.conditions, conditionId)) {
-        var _group$conditions;
         //when we delete the last  condition of a group without deleting  the subgroup, we need to restructure the group.
         //we will shift the group one level up. The subgroups will open up as conditions.
 
         //spreading out the condition inside the subgroup
-        var allConditions = group === null || group === void 0 || (_group$conditions = group.conditions) === null || _group$conditions === void 0 ? void 0 : _group$conditions.reduce(function (acc, condition) {
-          var _condition = condition;
+        const allConditions = group?.conditions?.reduce((acc, condition) => {
+          const _condition = condition;
           if (_condition.conditions) {
             //this is a subgroup
             return acc.concat(_condition.conditions);
           }
           return acc;
         }, []);
-        onChange === null || onChange === void 0 || onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+        onChange?.({
+          ...group,
           conditions: allConditions
-        }));
-      } else {
-        var filteredConditions = group.conditions.filter(function (condition) {
-          return conditionId !== condition.id;
         });
+      } else {
+        const filteredConditions = group.conditions.filter(condition => conditionId !== condition.id);
         //This is to handle a edge case.
         //When a group has structure as 1 condition,1 subgroup, 1 condition and if we delete first condition,
         //the group will start with a subgroup. To avoid this,opening up that subgroup.
-        if ((filteredConditions === null || filteredConditions === void 0 ? void 0 : filteredConditions[0]).conditions) {
-          var firstFilteredConditions = filteredConditions[0];
-          filteredConditions.splice.apply(filteredConditions, [0, 1].concat(_rollupPluginBabelHelpers.toConsumableArray(firstFilteredConditions === null || firstFilteredConditions === void 0 ? void 0 : firstFilteredConditions.conditions)));
+        if ((filteredConditions?.[0]).conditions) {
+          const firstFilteredConditions = filteredConditions[0];
+          filteredConditions.splice(0, 1, ...firstFilteredConditions?.conditions);
         }
-        onChange === null || onChange === void 0 || onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+        onChange?.({
+          ...group,
           conditions: filteredConditions
-        }));
+        });
       }
     } else {
-      onRemove === null || onRemove === void 0 || onRemove(evt);
+      onRemove?.(evt);
     }
   };
   //check to identify a group without a plain condition
-  var checkGroupHaveCondition = function checkGroupHaveCondition(conditions, conditionId) {
-    return conditions.find(function (eachCondition) {
+  const checkGroupHaveCondition = (conditions, conditionId) => {
+    return conditions.find(eachCondition => {
       return !eachCondition.conditions && eachCondition.id !== conditionId;
     });
   };
-  var onChangeHandler = function onChangeHandler(updatedCondition, conditionIndex) {
-    var _group$id;
-    var updatedConditions = [].concat(_rollupPluginBabelHelpers.toConsumableArray(group !== null && group !== void 0 && group.conditions ? group.conditions.slice(0, conditionIndex) : []), [updatedCondition], _rollupPluginBabelHelpers.toConsumableArray(group !== null && group !== void 0 && group.conditions ? group.conditions.slice(conditionIndex + 1) : []));
-    onChange === null || onChange === void 0 || onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+  const onChangeHandler = (updatedCondition, conditionIndex) => {
+    const updatedConditions = [...(group?.conditions ? group.conditions.slice(0, conditionIndex) : []), updatedCondition, ...(group?.conditions ? group.conditions.slice(conditionIndex + 1) : [])];
+    onChange?.({
+      ...group,
       conditions: updatedConditions,
-      id: (_group$id = group === null || group === void 0 ? void 0 : group.id) !== null && _group$id !== void 0 ? _group$id : uuidv4.default()
-    }));
+      id: group?.id ?? uuidv4.default()
+    });
   };
-  var addConditionHandler = function addConditionHandler(conditionIndex) {
-    var newCondition = {
+  const addConditionHandler = conditionIndex => {
+    const newCondition = {
       property: undefined,
       operator: '',
       value: '',
       popoverToOpen: 'propertyField',
       id: uuidv4.default()
     };
-    onChange === null || onChange === void 0 || onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
-      conditions: [].concat(_rollupPluginBabelHelpers.toConsumableArray(group.conditions ? group.conditions.slice(0, conditionIndex + 1) : []), [newCondition], _rollupPluginBabelHelpers.toConsumableArray(group.conditions ? group.conditions.slice(conditionIndex + 1) : []))
-    }));
+    onChange?.({
+      ...group,
+      conditions: [...(group.conditions ? group.conditions.slice(0, conditionIndex + 1) : []), newCondition, ...(group.conditions ? group.conditions.slice(conditionIndex + 1) : [])]
+    });
   };
-  var handleFocusOnClose = function handleFocusOnClose(e, conditionIndex) {
-    var _e$currentTarget$clos;
+  const handleFocusOnClose = (e, conditionIndex) => {
     //get all close buttons.
     //if the last condition is closing, focus the second last one.
     //or focus the next one.
-    var currentGroupCloseButtons = (_e$currentTarget$clos = e.currentTarget.closest(".".concat(util.blockClass, "__group"))) === null || _e$currentTarget$clos === void 0 ? void 0 : _e$currentTarget$clos.querySelectorAll('[data-name="closeCondition"]');
+    const currentGroupCloseButtons = e.currentTarget.closest(`.${util.blockClass}__group`)?.querySelectorAll('[data-name="closeCondition"]');
     if (conditionIndex == currentGroupCloseButtons.length - 1) {
       util.manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex - 1], conditionBuilderRef);
     } else {
       util.manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex + 1], conditionBuilderRef);
     }
   };
-  var handleFocusOnCloseHierarchical = function handleFocusOnCloseHierarchical(evt) {
-    var _evt$currentTarget, _evt$currentTarget2, _conditionBuilderCont, _conditionBuilderCont2;
+  const handleFocusOnCloseHierarchical = evt => {
     //getting the current aria-level and aria-posinset.
-    var currentLevel = (_evt$currentTarget = evt.currentTarget) === null || _evt$currentTarget === void 0 || (_evt$currentTarget = _evt$currentTarget.closest('[role="row"]')) === null || _evt$currentTarget === void 0 ? void 0 : _evt$currentTarget.getAttribute('aria-level');
-    var currentPos = (_evt$currentTarget2 = evt.currentTarget) === null || _evt$currentTarget2 === void 0 || (_evt$currentTarget2 = _evt$currentTarget2.closest('[role="row"]')) === null || _evt$currentTarget2 === void 0 ? void 0 : _evt$currentTarget2.getAttribute('aria-posinset');
+    const currentLevel = evt.currentTarget?.closest('[role="row"]')?.getAttribute('aria-level');
+    const currentPos = evt.currentTarget?.closest('[role="row"]')?.getAttribute('aria-posinset');
 
     //finding the next and previous items in same level
-    var nextElement = (_conditionBuilderCont = conditionBuilderContentRef.current) === null || _conditionBuilderCont === void 0 ? void 0 : _conditionBuilderCont.querySelector("[aria-level=\"".concat(currentLevel, "\"][aria-posinset=\"").concat(Number(currentPos) + 1, "\"]"));
-    var prevElement = (_conditionBuilderCont2 = conditionBuilderContentRef.current) === null || _conditionBuilderCont2 === void 0 ? void 0 : _conditionBuilderCont2.querySelector("[aria-level=\"".concat(currentLevel, "\"][aria-posinset=\"").concat(Number(currentPos) - 1, "\"]"));
+    const nextElement = conditionBuilderContentRef.current?.querySelector(`[aria-level="${currentLevel}"][aria-posinset="${Number(currentPos) + 1}"]`);
+    const prevElement = conditionBuilderContentRef.current?.querySelector(`[aria-level="${currentLevel}"][aria-posinset="${Number(currentPos) - 1}"]`);
     //checking if next level is a valid condition. If then, focus the close button inside that condition
     //Otherwise , check the previous item is a valid condition
 
-    if (nextElement !== null && nextElement !== void 0 && nextElement.classList.contains("".concat(util.blockClass, "__condition-block"))) {
-      util.manageTabIndexAndFocus(nextElement === null || nextElement === void 0 ? void 0 : nextElement.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
-    } else if (prevElement !== null && prevElement !== void 0 && prevElement.classList.contains("".concat(util.blockClass, "__condition-block"))) {
-      util.manageTabIndexAndFocus(prevElement === null || prevElement === void 0 ? void 0 : prevElement.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
+    if (nextElement?.classList.contains(`${util.blockClass}__condition-block`)) {
+      util.manageTabIndexAndFocus(nextElement?.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
+    } else if (prevElement?.classList.contains(`${util.blockClass}__condition-block`)) {
+      util.manageTabIndexAndFocus(prevElement?.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
     }
     //If there are no valid condition in this group, focus next or previous row
     else {
-      var _conditionBuilderCont3, _conditionBuilderCont4;
-      var prevRows = (_conditionBuilderCont3 = conditionBuilderContentRef.current) === null || _conditionBuilderCont3 === void 0 ? void 0 : _conditionBuilderCont3.querySelectorAll("[aria-level=\"".concat(Number(currentLevel) - 1, "\"][role=\"row\"]"));
-      var nextRow = (_conditionBuilderCont4 = conditionBuilderContentRef.current) === null || _conditionBuilderCont4 === void 0 ? void 0 : _conditionBuilderCont4.querySelector("[aria-level=\"".concat(Number(currentLevel) + 1, "\"][role=\"row\"]"));
+      const prevRows = conditionBuilderContentRef.current?.querySelectorAll(`[aria-level="${Number(currentLevel) - 1}"][role="row"]`);
+      const nextRow = conditionBuilderContentRef.current?.querySelector(`[aria-level="${Number(currentLevel) + 1}"][role="row"]`);
       if (nextRow) {
         //since there are no condition in current group, this group will move one level up
 
-        var rowIdentity = {
+        const rowIdentity = {
           ariaLevel: Number(nextRow.ariaLevel) - 1,
           ariaPosInSet: nextRow.ariaPosInSet
         };
-        setTimeout(function () {
-          var _conditionBuilderCont5;
-          var currentRowToFocus = (_conditionBuilderCont5 = conditionBuilderContentRef.current) === null || _conditionBuilderCont5 === void 0 ? void 0 : _conditionBuilderCont5.querySelector("[role=\"row\"][aria-level=\"".concat(rowIdentity.ariaLevel, "\"][aria-posinset=\"").concat(rowIdentity.ariaPosInSet, "\"]"));
-          util.manageTabIndexAndFocus(currentRowToFocus === null || currentRowToFocus === void 0 ? void 0 : currentRowToFocus.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
+        setTimeout(() => {
+          const currentRowToFocus = conditionBuilderContentRef.current?.querySelector(`[role="row"][aria-level="${rowIdentity.ariaLevel}"][aria-posinset="${rowIdentity.ariaPosInSet}"]`);
+          util.manageTabIndexAndFocus(currentRowToFocus?.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
         }, 0);
-      } else if (prevRows !== null && prevRows !== void 0 && prevRows.length && prevRows.length > 1) {
-        var _prevRows;
-        util.manageTabIndexAndFocus((_prevRows = prevRows[prevRows.length - 2]) === null || _prevRows === void 0 ? void 0 : _prevRows.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
+      } else if (prevRows?.length && prevRows.length > 1) {
+        util.manageTabIndexAndFocus(prevRows[prevRows.length - 2]?.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
       }
     }
   };
-  var addConditionSubGroupHandler = function addConditionSubGroupHandler(conditionIndex) {
-    onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
-      conditions: [].concat(_rollupPluginBabelHelpers.toConsumableArray(group.conditions ? group.conditions.slice(0, conditionIndex + 1) : []), [{
+  const addConditionSubGroupHandler = conditionIndex => {
+    onChange({
+      ...group,
+      conditions: [...(group.conditions ? group.conditions.slice(0, conditionIndex + 1) : []), {
         statement: 'ifAll',
         groupOperator: 'and',
         conditions: [{
@@ -192,80 +181,74 @@ var _ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
           id: uuidv4.default()
         }],
         id: uuidv4.default()
-      }], _rollupPluginBabelHelpers.toConsumableArray(group.conditions ? group.conditions.slice(conditionIndex + 1) : []))
-    }));
+      }, ...(group.conditions ? group.conditions.slice(conditionIndex + 1) : [])]
+    });
   };
-  var isLastCondition = function isLastCondition(conditionIndex, conditionArr) {
+  const isLastCondition = (conditionIndex, conditionArr) => {
     return conditionIndex + 1 >= conditionArr.length || conditionArr.length - 1 != conditionIndex && conditionArr[conditionIndex + 1].conditions;
   };
-  var _showConditionSubGroupPreviewHandler = function showConditionSubGroupPreviewHandler(conditionIndex) {
+  const showConditionSubGroupPreviewHandler = conditionIndex => {
     setShowConditionSubGroupPreview(conditionIndex);
   };
-  var hideConditionSubGroupPreviewHandler = function hideConditionSubGroupPreviewHandler() {
+  const hideConditionSubGroupPreviewHandler = () => {
     setShowConditionSubGroupPreview(-1);
   };
-  var _showConditionPreviewHandler = function showConditionPreviewHandler(conditionIndex) {
+  const showConditionPreviewHandler = conditionIndex => {
     setShowConditionPreview(conditionIndex);
   };
-  var hideConditionPreviewHandler = function hideConditionPreviewHandler() {
+  const hideConditionPreviewHandler = () => {
     setShowConditionPreview(-1);
   };
-  var onStatementChangeHandler = function onStatementChangeHandler(updatedStatement) {
-    var _statementConfig$find;
-    var groupOperator = (_statementConfig$find = statementConfig.find(function (statement) {
-      return statement.id == updatedStatement;
-    })) === null || _statementConfig$find === void 0 ? void 0 : _statementConfig$find.connector;
-    onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+  const onStatementChangeHandler = updatedStatement => {
+    const groupOperator = statementConfig.find(statement => statement.id == updatedStatement)?.connector;
+    onChange({
+      ...group,
       groupOperator: groupOperator,
       statement: updatedStatement
-    }));
+    });
   };
-  var onConnectorOperatorChange = function onConnectorOperatorChange(op) {
-    onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+  const onConnectorOperatorChange = op => {
+    onChange({
+      ...group,
       groupOperator: op
-    }));
+    });
   };
-  var getNonHierarchicalVariant = function getNonHierarchicalVariant() {
-    var _group$conditions2;
+  const getNonHierarchicalVariant = () => {
     return /*#__PURE__*/React.createElement("div", {
-      className: "".concat(className, "  eachGroup")
+      className: `${className}  eachGroup`
     }, /*#__PURE__*/React.createElement("div", {
-      className: "".concat(util.blockClass, "__condition-wrapper"),
+      className: `${util.blockClass}__condition-wrapper`,
       role: "grid",
       "aria-label": conditionBuilderText
-    }, group === null || group === void 0 || (_group$conditions2 = group.conditions) === null || _group$conditions2 === void 0 ? void 0 : _group$conditions2.map(function (eachCondition, conditionIndex) {
-      var _group$conditions3;
-      return /*#__PURE__*/React.createElement("div", {
-        key: eachCondition.id,
-        className: "".concat(util.blockClass, "__group-wrapper")
-      }, /*#__PURE__*/React.createElement(ConditionBlock.default, {
-        conjunction: conditionIndex > 0 ? group.groupOperator : undefined,
-        aria: {
-          level: aria.level + 1,
-          posinset: conditionIndex + 1,
-          setsize: group === null || group === void 0 || (_group$conditions3 = group.conditions) === null || _group$conditions3 === void 0 ? void 0 : _group$conditions3.length
-        },
-        isStatement: conditionIndex == 0,
-        condition: eachCondition,
-        group: group,
-        conditionIndex: conditionIndex,
-        onChange: function onChange(updatedConditions) {
-          onChangeHandler(updatedConditions, conditionIndex);
-        },
-        addConditionHandler: addConditionHandler,
-        onRemove: function onRemove(e) {
-          onRemoveHandler(eachCondition.id, e, conditionIndex);
-        },
-        onConnectorOperatorChange: onConnectorOperatorChange,
-        onStatementChange: onStatementChangeHandler,
-        isLastCondition: isLastCondition
-      }));
-    })));
+    }, group?.conditions?.map((eachCondition, conditionIndex) => /*#__PURE__*/React.createElement("div", {
+      key: eachCondition.id,
+      className: `${util.blockClass}__group-wrapper`
+    }, /*#__PURE__*/React.createElement(ConditionBlock.default, {
+      conjunction: conditionIndex > 0 ? group.groupOperator : undefined,
+      aria: {
+        level: aria.level + 1,
+        posinset: conditionIndex + 1,
+        setsize: group?.conditions?.length
+      },
+      isStatement: conditionIndex == 0,
+      condition: eachCondition,
+      group: group,
+      conditionIndex: conditionIndex,
+      onChange: updatedConditions => {
+        onChangeHandler(updatedConditions, conditionIndex);
+      },
+      addConditionHandler: addConditionHandler,
+      onRemove: e => {
+        onRemoveHandler(eachCondition.id, e, conditionIndex);
+      },
+      onConnectorOperatorChange: onConnectorOperatorChange,
+      onStatementChange: onStatementChangeHandler,
+      isLastCondition: isLastCondition
+    })))));
   };
-  var getHierarchicalVariant = function getHierarchicalVariant() {
-    var _group$conditions4;
+  const getHierarchicalVariant = () => {
     return /*#__PURE__*/React.createElement("div", {
-      className: "".concat(className, " ").concat(util.blockClass, "__condition-wrapper"),
+      className: `${className} ${util.blockClass}__condition-wrapper`,
       role: aria.level === 1 ? 'rowgroup' : undefined,
       "aria-label": aria.level == 1 ? conditionBuilderGroupText : undefined,
       ref: conditionBuilderContentRef
@@ -279,14 +262,14 @@ var _ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       label: group.statement,
       title: conditionText,
       "data-name": "connectorField",
-      popOverClassName: "".concat(util.blockClass, "__gap"),
-      className: "".concat(util.blockClass, "__statement-button")
+      popOverClassName: `${util.blockClass}__gap`,
+      className: `${util.blockClass}__statement-button`
     }, /*#__PURE__*/React.createElement(ItemOption.ItemOption, {
       conditionState: {
         value: group.statement,
         label: conditionText
       },
-      onChange: function onChange(v, evt) {
+      onChange: (v, evt) => {
         util.focusThisField(evt, conditionBuilderRef);
         onStatementChangeHandler(v);
       },
@@ -294,72 +277,71 @@ var _ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         options: statementConfig,
         isStatement: true
       }
-    }))), group === null || group === void 0 || (_group$conditions4 = group.conditions) === null || _group$conditions4 === void 0 ? void 0 : _group$conditions4.map(function (eachCondition, conditionIndex) {
-      var _group$conditions$len, _group$conditions5, _group$conditions$len2, _group$conditions6;
-      return /*#__PURE__*/React.createElement(React.Fragment, {
-        key: eachCondition.id
-      }, eachCondition.conditions ? /*#__PURE__*/React.createElement("div", {
-        className: cx("".concat(util.blockClass, "__condition-block subgroup  ").concat(util.blockClass, "__gap"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(util.blockClass, "__gap-bottom"), group && group.conditions && group.conditions.length < conditionIndex + 1), {})
-      }, /*#__PURE__*/React.createElement(ConditionConnector.default, {
-        className: "".concat(util.blockClass, "__gap ").concat(util.blockClass, "__gap-bottom ").concat(util.blockClass, "__groupConnector"),
-        operator: group.groupOperator,
-        "aria-hidden": true
-      }), /*#__PURE__*/React.createElement(_ConditionGroupBuilder, {
-        aria: {
-          level: aria.level + 1,
-          posinset: conditionIndex + 1,
-          setsize: (_group$conditions$len = (_group$conditions5 = group.conditions) === null || _group$conditions5 === void 0 ? void 0 : _group$conditions5.length) !== null && _group$conditions$len !== void 0 ? _group$conditions$len : 0
-        },
-        className: "".concat(util.blockClass, "__group"),
-        group: eachCondition,
-        onChange: function onChange(updatedConditions) {
-          onChangeHandler(updatedConditions, conditionIndex);
-        },
-        onRemove: function onRemove(e) {
-          onRemoveHandler(eachCondition.id, e, conditionIndex);
-        }
-      })) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(ConditionBlock.default, {
-        conjunction: conditionIndex > 0 ? group.groupOperator : undefined,
-        aria: {
-          level: aria.level + 1,
-          posinset: conditionIndex + 1,
-          setsize: (_group$conditions$len2 = (_group$conditions6 = group.conditions) === null || _group$conditions6 === void 0 ? void 0 : _group$conditions6.length) !== null && _group$conditions$len2 !== void 0 ? _group$conditions$len2 : 0
-        },
-        isStatement: false,
-        condition: eachCondition,
-        group: group,
-        conditionIndex: conditionIndex,
-        addConditionHandler: addConditionHandler,
-        addConditionSubGroupHandler: addConditionSubGroupHandler,
-        onChange: function onChange(updatedConditions) {
-          onChangeHandler(updatedConditions, conditionIndex);
-        },
-        onRemove: function onRemove(e) {
-          onRemoveHandler(eachCondition.id, e, conditionIndex);
-        },
-        onConnectorOperatorChange: onConnectorOperatorChange,
-        onStatementChange: onStatementChangeHandler,
-        showConditionSubGroupPreviewHandler: function showConditionSubGroupPreviewHandler() {
-          _showConditionSubGroupPreviewHandler(conditionIndex);
-        },
-        hideConditionSubGroupPreviewHandler: hideConditionSubGroupPreviewHandler,
-        showConditionPreviewHandler: function showConditionPreviewHandler() {
-          _showConditionPreviewHandler(conditionIndex);
-        },
-        hideConditionPreviewHandler: hideConditionPreviewHandler,
-        isLastCondition: isLastCondition
-      })), conditionIndex == showConditionSubGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React.createElement(ConditionPreview.default, {
-        previewType: "subGroup",
-        group: group
-      }))), conditionIndex == showConditionPreview && (_ConditionPreview2 || (_ConditionPreview2 = /*#__PURE__*/React.createElement(ConditionPreview.default, {
-        previewType: "condition",
-        group: group
-      }))));
-    }));
+    }))), group?.conditions?.map((eachCondition, conditionIndex) => /*#__PURE__*/React.createElement(React.Fragment, {
+      key: eachCondition.id
+    }, eachCondition.conditions ? /*#__PURE__*/React.createElement("div", {
+      className: cx(`${util.blockClass}__condition-block subgroup  ${util.blockClass}__gap`, {
+        [`${util.blockClass}__gap-bottom`]: group && group.conditions && group.conditions.length < conditionIndex + 1
+      }, {})
+    }, /*#__PURE__*/React.createElement(ConditionConnector.default, {
+      className: `${util.blockClass}__gap ${util.blockClass}__gap-bottom ${util.blockClass}__groupConnector`,
+      operator: group.groupOperator,
+      "aria-hidden": true
+    }), /*#__PURE__*/React.createElement(ConditionGroupBuilder, {
+      aria: {
+        level: aria.level + 1,
+        posinset: conditionIndex + 1,
+        setsize: group.conditions?.length ?? 0
+      },
+      className: `${util.blockClass}__group`,
+      group: eachCondition,
+      onChange: updatedConditions => {
+        onChangeHandler(updatedConditions, conditionIndex);
+      },
+      onRemove: e => {
+        onRemoveHandler(eachCondition.id, e, conditionIndex);
+      }
+    })) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(ConditionBlock.default, {
+      conjunction: conditionIndex > 0 ? group.groupOperator : undefined,
+      aria: {
+        level: aria.level + 1,
+        posinset: conditionIndex + 1,
+        setsize: group.conditions?.length ?? 0
+      },
+      isStatement: false,
+      condition: eachCondition,
+      group: group,
+      conditionIndex: conditionIndex,
+      addConditionHandler: addConditionHandler,
+      addConditionSubGroupHandler: addConditionSubGroupHandler,
+      onChange: updatedConditions => {
+        onChangeHandler(updatedConditions, conditionIndex);
+      },
+      onRemove: e => {
+        onRemoveHandler(eachCondition.id, e, conditionIndex);
+      },
+      onConnectorOperatorChange: onConnectorOperatorChange,
+      onStatementChange: onStatementChangeHandler,
+      showConditionSubGroupPreviewHandler: () => {
+        showConditionSubGroupPreviewHandler(conditionIndex);
+      },
+      hideConditionSubGroupPreviewHandler: hideConditionSubGroupPreviewHandler,
+      showConditionPreviewHandler: () => {
+        showConditionPreviewHandler(conditionIndex);
+      },
+      hideConditionPreviewHandler: hideConditionPreviewHandler,
+      isLastCondition: isLastCondition
+    })), conditionIndex == showConditionSubGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React.createElement(ConditionPreview.default, {
+      previewType: "subGroup",
+      group: group
+    }))), conditionIndex == showConditionPreview && (_ConditionPreview2 || (_ConditionPreview2 = /*#__PURE__*/React.createElement(ConditionPreview.default, {
+      previewType: "condition",
+      group: group
+    }))))));
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, variant == util.HIERARCHICAL_VARIANT && getHierarchicalVariant(), variant == util.NON_HIERARCHICAL_VARIANT && getNonHierarchicalVariant());
 };
-_ConditionGroupBuilder.propTypes = {
+ConditionGroupBuilder.propTypes = {
   /**
    * object contains the aria attributes
    */
@@ -382,4 +364,4 @@ _ConditionGroupBuilder.propTypes = {
   onRemove: index.default.func
 };
 
-exports.default = _ConditionGroupBuilder;
+exports.default = ConditionGroupBuilder;