@carbon/ibm-products 2.42.1-canary.26 → 2.42.1-canary.3

package/lib/components/ConditionBuilder/ConditionBuilderContent/ConditionBuilderContent.js

@@ -17,37 +17,24 @@ var icons = require('@carbon/react/icons');
 var ConditionGroupBuilder = require('../ConditionGroupBuilder/ConditionGroupBuilder.js');
 var ConditionBuilderProvider = require('../ConditionBuilderContext/ConditionBuilderProvider.js');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
-var ConditionBuilderButton = require('../ConditionBuilderButton/ConditionBuilderButton.js');
-var uuidv4 = require('../../../global/js/utils/uuidv4.js');
-var ConditionPreview = require('../ConditionPreview/ConditionPreview.js');
-var GroupConnector = require('../ConditionBuilderConnector/GroupConnector.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var _Heading, _GroupConnector, _ConditionPreview;
 var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
   var _rootState$groups2;
   var startConditionLabel = _ref.startConditionLabel,
     conditionBuilderRef = _ref.conditionBuilderRef,
     getConditionState = _ref.getConditionState,
     initialState = _ref.initialState;
-  // const { rootState, setRootState, variant, actionState } = useContext(
-  //   ConditionBuilderContext
-  // );
   var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
     rootState = _useContext.rootState,
-    setRootState = _useContext.setRootState,
-    variant = _useContext.variant;
+    setRootState = _useContext.setRootState;
   var _useState = React.useState(false),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     isConditionBuilderActive = _useState2[0],
     setIsConditionBuilderActive = _useState2[1];
-  var _useState3 = React.useState(false),
-    _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
-    showConditionGroupPreview = _useState4[0],
-    setShowConditionGroupPreview = _useState4[1];
   React.useEffect(function () {
     var _rootState$groups;
     if (rootState !== null && rootState !== void 0 && (_rootState$groups = rootState.groups) !== null && _rootState$groups !== void 0 && _rootState$groups.length) {
@@ -60,12 +47,7 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     }
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [rootState]);
-
-  // useEffect(() => {
-  //   getActionsState?.(actionState);
-  //   // eslint-disable-next-line react-hooks/exhaustive-deps
-  // }, [actionState]);
+  }, [rootState, conditionBuilderRef]);
   var onStartConditionBuilder = function onStartConditionBuilder() {
     //when add condition button is clicked.
     setIsConditionBuilderActive(true);
@@ -89,28 +71,10 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
       groups: groups
     }));
   };
-  var addConditionGroupHandler = function addConditionGroupHandler() {
-    var newGroup = {
-      groupSeparateOperator: 'and',
-      // 'or'|'and'|'null',
-      groupOperator: 'and',
-      //'and|or',
-      statement: 'if',
-      // 'if|exclude if',
-      id: uuidv4["default"](),
-      conditions: [{
-        property: undefined,
-        operator: '',
-        value: '',
-        popoverToOpen: 'propertyField',
-        id: uuidv4["default"]()
-      }]
-    };
-    setRootState(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, rootState), {}, {
-      groups: [].concat(_rollupPluginBabelHelpers.toConsumableArray(rootState.groups), [newGroup])
-    }));
-  };
-  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, !isConditionBuilderActive && /*#__PURE__*/React__default["default"].createElement(react.Button, {
+  return /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(DataConfigs.blockClass, "__content-container"),
+    tabIndex: -1
+  }, !isConditionBuilderActive && /*#__PURE__*/React__default["default"].createElement(react.Button, {
     className: "".concat(DataConfigs.blockClass, "__add-condition-button"),
     renderIcon: function renderIcon(props) {
       return /*#__PURE__*/React__default["default"].createElement(icons.Add, _rollupPluginBabelHelpers["extends"]({
@@ -121,22 +85,10 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     kind: "ghost",
     size: "sm",
     onClick: onStartConditionBuilder
-  }, startConditionLabel), isConditionBuilderActive &&
-  /*#__PURE__*/
-  // <h5 >Condition</h5>
-  React__default["default"].createElement(react.Section, {
-    className: "".concat(DataConfigs.blockClass, "__heading"),
-    level: 4
-  }, _Heading || (_Heading = /*#__PURE__*/React__default["default"].createElement(react.Heading, null, "Condition"))), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(DataConfigs.blockClass, "__content-container"),
-    role: "treegrid",
-    "aria-label": "condition builder tree"
-  }, rootState && (rootState === null || rootState === void 0 || (_rootState$groups2 = rootState.groups) === null || _rootState$groups2 === void 0 ? void 0 : _rootState$groups2.map(function (eachGroup, groupIndex) {
-    return /*#__PURE__*/React__default["default"].createElement("div", {
-      key: eachGroup.id,
-      className: "".concat(DataConfigs.blockClass, "__group-wrapper")
-    }, /*#__PURE__*/React__default["default"].createElement(ConditionGroupBuilder["default"], {
+  }, startConditionLabel), rootState && (rootState === null || rootState === void 0 || (_rootState$groups2 = rootState.groups) === null || _rootState$groups2 === void 0 ? void 0 : _rootState$groups2.map(function (eachGroup, groupIndex) {
+    return /*#__PURE__*/React__default["default"].createElement(ConditionGroupBuilder["default"], {
       className: "".concat(DataConfigs.blockClass, "__group"),
+      key: groupIndex,
       aria: {
         level: 1,
         posinset: groupIndex * 2 + 1,
@@ -150,48 +102,15 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
         onChangeHandler(updatedGroup, groupIndex);
       },
       conditionBuilderRef: conditionBuilderRef
-    }), groupIndex < rootState.groups.length - 1 && (_GroupConnector || (_GroupConnector = /*#__PURE__*/React__default["default"].createElement(GroupConnector["default"], null))));
-  })), isConditionBuilderActive && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, variant == 'tree' && /*#__PURE__*/React__default["default"].createElement("div", {
-    role: "row",
-    tabIndex: -1,
-    "aria-level": 1
-  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, {
-    renderIcon: icons.TextNewLine,
-    onClick: addConditionGroupHandler,
-    onMouseEnter: function onMouseEnter() {
-      setShowConditionGroupPreview(true);
-    },
-    onMouseLeave: function onMouseLeave() {
-      setShowConditionGroupPreview(false);
-    },
-    className: "".concat(DataConfigs.blockClass, "__add-condition-group "),
-    hideLabel: true,
-    label: DataConfigs.translateWithId('add-condition-sub-group'),
-    wrapperProps: {
-      role: 'gridcell',
-      'aria-label': DataConfigs.translateWithId('add-condition-sub-group')
-    }
-  })), showConditionGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
-    previewType: "newGroup"
-  }))))));
+    });
+  })));
 };
 var ConditionBuilderContent$1 = ConditionBuilderContent;
 ConditionBuilderContent.propTypes = {
-  /**
-   * optional array of object that give the list of actions.
-   */
-  actions: index["default"].arrayOf(index["default"].shape({
-    id: index["default"].number,
-    label: index["default"].string
-  })),
   /**
    * ref of condition builder
    */
   conditionBuilderRef: index["default"].object,
-  /**
-   * callback functions that will provide the updated action state back.
-   */
-  getActionsState: index["default"].func,
   /**
    * This is a callback function that returns the updated state
    */

package/lib/components/ConditionBuilder/ConditionBuilderContext/ConditionBuilderProvider.d.ts

@@ -1,5 +1,4 @@
 export namespace emptyState {
-    let operator: string;
     let groups: {
         groupSeparateOperator: null;
         groupOperator: string;

package/lib/components/ConditionBuilder/ConditionBuilderContext/ConditionBuilderProvider.js

@@ -19,7 +19,6 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 var emptyState = {
-  operator: 'or',
   groups: [{
     groupSeparateOperator: null,
     groupOperator: 'and',

package/lib/components/ConditionBuilder/ConditionBuilderContext/translationObject.d.ts

@@ -17,12 +17,9 @@ export namespace translationsObject {
         after: string;
         between: string;
         'add-condition': string;
-        'add-condition-group': string;
-        'add-condition-sub-group': string;
         condition: string;
         property: string;
         operator: string;
-        value: string;
         connector: string;
         condition_row: string;
         remove_condition: string;
@@ -30,9 +27,5 @@ export namespace translationsObject {
         start: string;
         end: string;
         clear_search: string;
-        actions: string;
-        then: string;
-        remove_action: string;
-        add_action: string;
     };
 }

package/lib/components/ConditionBuilder/ConditionBuilderContext/translationObject.js

@@ -28,23 +28,16 @@ var translationsObject = {
     after: 'is after',
     between: 'is between',
     'add-condition': 'Add Condition',
-    'add-condition-group': 'Add Condition Group',
-    'add-condition-sub-group': 'Add Condition sub group',
     condition: 'Condition',
     property: 'Property',
     operator: 'Operator',
-    value: 'Value',
     connector: 'Connector',
     condition_row: 'Condition row',
     remove_condition: 'Remove condition',
     add_condition_row: 'Add condition row',
     start: 'Start',
     end: 'End',
-    clear_search: 'Clear search input',
-    actions: 'Actions',
-    then: 'then',
-    remove_action: 'Remove Action',
-    add_action: 'Add action'
+    clear_search: 'Clear search input'
   }
 };
 

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

@@ -95,7 +95,7 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
     label: propertyLabel !== null && propertyLabel !== void 0 ? propertyLabel : DataConfigs.translateWithId('add-condition'),
     hideLabel: !label ? true : false,
     onClick: function onClick() {
-      children ? setOpen(!open) : null;
+      setOpen(!open);
     },
     className: className,
     "aria-haspopup": true,

package/lib/components/ConditionBuilder/{ConditionBuilderConnector → ConditionConnector}/ConditionConnector.js

@@ -14,22 +14,21 @@ var React = require('react');
 var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
 var ConditionBuilderItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.js');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
+var settings = require('../../../settings.js');
 var index = require('../../../node_modules/prop-types/index.js');
 var util = require('../utils/util.js');
-var ConditionBuilderProvider = require('../ConditionBuilderContext/ConditionBuilderProvider.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 var _excluded = ["operator", "className", "onChange"];
-var ConditionConnector = function ConditionConnector(_ref) {
+var blockClass = "".concat(settings.pkg.prefix, "--condition-builder");
+function ConditionConnector(_ref) {
   var operator = _ref.operator,
     className = _ref.className,
     onChange = _ref.onChange,
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
-  var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
-    variant = _useContext.variant;
   var handleConnectorHover = React.useCallback(function (parentGroup, isHover) {
     if (isHover) {
       parentGroup.classList.add('hoveredConnector');
@@ -49,37 +48,33 @@ var ConditionConnector = function ConditionConnector(_ref) {
     onChange(op);
     util.focusThisField(evt);
   };
-  return variant == 'tree' ? /*#__PURE__*/React__default["default"].createElement("span", {
-    className: "".concat(className, " ").concat(DataConfigs.blockClass, "__connector-disabled")
-  }, operator) :
-  /*#__PURE__*/
-  // <div className={className} {...rest}>
-  React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, _rollupPluginBabelHelpers["extends"]({
-    label: operator,
-    title: DataConfigs.translateWithId('connector'),
-    "data-name": "connectorField",
-    onMouseEnter: activeConnectorHandler,
-    onMouseLeave: inActiveConnectorHandler,
-    onFocus: activeConnectorHandler,
-    onBlur: inActiveConnectorHandler
-  }, rest, {
-    popOverClassName: className,
-    className: "".concat(DataConfigs.blockClass, "__connector-button ")
-  }), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
-    config: {
-      options: DataConfigs.connectorConfig
-    },
-    conditionState: {
-      value: operator,
-      label: DataConfigs.translateWithId('connector')
-    },
-    onChange: onChangeHandler
-  }))
-
-  // </div>
-  ;
-};
-var ConditionConnector$1 = ConditionConnector;
+  return (
+    /*#__PURE__*/
+    // <div className={className} {...rest}>
+    React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, _rollupPluginBabelHelpers["extends"]({
+      label: operator,
+      title: DataConfigs.translateWithId('connector'),
+      "data-name": "connectorField",
+      onMouseEnter: activeConnectorHandler,
+      onMouseLeave: inActiveConnectorHandler,
+      onFocus: activeConnectorHandler,
+      onBlur: inActiveConnectorHandler
+    }, rest, {
+      popOverClassName: className,
+      className: "".concat(blockClass, "__connector-button ")
+    }), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
+      config: {
+        options: DataConfigs.connectorConfig
+      },
+      conditionState: {
+        value: operator,
+        label: DataConfigs.translateWithId('connector')
+      },
+      onChange: onChangeHandler
+    }))
+    // </div>
+  );
+}
 ConditionConnector.propTypes = {
   /**
    * Provide an optional class to be applied to the containing node.
@@ -95,4 +90,4 @@ ConditionConnector.propTypes = {
   operator: index["default"].string
 };
 
-exports["default"] = ConditionConnector$1;
+exports["default"] = ConditionConnector;

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

@@ -13,22 +13,12 @@ var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHel
 var React = require('react');
 var ConditionBlock = require('../ConditionBlock/ConditionBlock.js');
 var index = require('../../../node_modules/prop-types/index.js');
-var cx = require('classnames');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
-var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
-var ConditionBuilderItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.js');
-var util = require('../utils/util.js');
-var ConditionConnector = require('../ConditionBuilderConnector/ConditionConnector.js');
-var ConditionBuilderProvider = require('../ConditionBuilderContext/ConditionBuilderProvider.js');
 var uuidv4 = require('../../../global/js/utils/uuidv4.js');
-var ConditionPreview = require('../ConditionPreview/ConditionPreview.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-
-var _ConditionPreview, _ConditionPreview2;
 
 /**
  *
@@ -36,24 +26,14 @@ var _ConditionPreview, _ConditionPreview2;
  * All the inner components of group are called from here.
  * @returns
  */
-
 var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
+  var _group$conditions;
   var group = _ref.group,
     aria = _ref.aria,
     onRemove = _ref.onRemove,
     onChange = _ref.onChange,
     conditionBuilderRef = _ref.conditionBuilderRef,
     className = _ref.className;
-  var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
-    variant = _useContext.variant;
-  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];
   var onRemoveHandler = function onRemoveHandler(conditionId, evt) {
     if (group.conditions.length > 1) {
       onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
@@ -84,183 +64,72 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       conditions: [].concat(_rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(0, conditionIndex + 1)), [newCondition], _rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(conditionIndex + 1)))
     }));
   };
-  var handleFocusOnClose = function handleFocusOnClose(e) {
-    var _e$currentTarget;
-    var previousClose = (_e$currentTarget = e.currentTarget) === null || _e$currentTarget === void 0 || (_e$currentTarget = _e$currentTarget.closest('[role="row"]')) === null || _e$currentTarget === void 0 || (_e$currentTarget = _e$currentTarget.previousSibling) === null || _e$currentTarget === void 0 ? void 0 : _e$currentTarget.querySelector('[data-name="closeCondition"]');
-    if (previousClose) {
-      previousClose.focus();
-    }
-  };
-  var addConditionSubGroupHandler = function addConditionSubGroupHandler(conditionIndex) {
-    onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
-      conditions: [].concat(_rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(0, conditionIndex + 1)), [{
-        groupSeparateOperator: null,
-        groupOperator: 'and',
-        statement: 'if',
-        conditions: [{
-          property: undefined,
-          operator: '',
-          value: '',
-          popoverToOpen: 'propertyField',
-          id: uuidv4["default"]()
-        }],
-        id: uuidv4["default"]()
-      }], _rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(conditionIndex + 1)))
-    }));
-  };
   var isLastCondition = function isLastCondition(conditionIndex, conditionArr) {
     return conditionIndex + 1 >= conditionArr.length || conditionArr.length - 1 != conditionIndex && conditionArr[conditionIndex + 1].conditions;
   };
-  var _showConditionSubGroupPreviewHandler = function showConditionSubGroupPreviewHandler(conditionIndex) {
-    setShowConditionSubGroupPreview(conditionIndex);
-  };
-  var hideConditionSubGroupPreviewHandler = function hideConditionSubGroupPreviewHandler() {
-    setShowConditionSubGroupPreview(-1);
-  };
-  var _showConditionPreviewHandler = function showConditionPreviewHandler(conditionIndex) {
-    setShowConditionPreview(conditionIndex);
-  };
-  var hideConditionPreviewHandler = function hideConditionPreviewHandler() {
-    setShowConditionPreview(-1);
-  };
-  var onStatementChangeHandler = function onStatementChangeHandler(updatedStatement) {
-    onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
-      statement: updatedStatement
-    }));
-  };
-  var onConnectorOperatorChange = function onConnectorOperatorChange(op) {
-    onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
-      groupOperator: op
-    }));
-  };
-  var getSentenceVariant = function getSentenceVariant() {
-    var _group$conditions;
-    return /*#__PURE__*/React__default["default"].createElement("div", {
-      className: "".concat(className, "  eachGroup")
-    }, /*#__PURE__*/React__default["default"].createElement("div", {
-      className: "".concat(DataConfigs.blockClass, "__condition-wrapper"),
-      role: "grid",
-      "aria-label": DataConfigs.translateWithId('condition_builder_group')
-    }, group === null || group === void 0 || (_group$conditions = group.conditions) === null || _group$conditions === void 0 ? void 0 : _group$conditions.map(function (eachCondition, conditionIndex) {
-      return /*#__PURE__*/React__default["default"].createElement("div", {
-        key: eachCondition.id,
-        className: "".concat(DataConfigs.blockClass, "__group-wrapper")
-      }, /*#__PURE__*/React__default["default"].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: function onChange(updatedConditions) {
-          onChangeHandler(updatedConditions, conditionIndex);
-        },
-        addConditionHandler: addConditionHandler,
-        onRemove: function onRemove(e) {
-          onRemoveHandler(eachCondition.id, e);
-        },
-        onConnectorOperatorChange: onConnectorOperatorChange,
-        onStatementChange: onStatementChangeHandler,
-        isLastCondition: isLastCondition
-      }));
-    })));
+  var handleFocusOnClose = function handleFocusOnClose(evt) {
+    var _evt$currentTarget;
+    var previousClose = (_evt$currentTarget = evt.currentTarget) === null || _evt$currentTarget === void 0 || (_evt$currentTarget = _evt$currentTarget.closest('[role="row"]')) === null || _evt$currentTarget === void 0 || (_evt$currentTarget = _evt$currentTarget.parentElement) === null || _evt$currentTarget === void 0 || (_evt$currentTarget = _evt$currentTarget.previousSibling) === null || _evt$currentTarget === void 0 ? void 0 : _evt$currentTarget.querySelector('[data-name="closeCondition"]');
+    if (previousClose) {
+      previousClose.focus();
+    }
   };
-  var getTreeVariant = function getTreeVariant() {
-    var _group$conditions2;
+  return /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(className, "  eachGroup")
+  }, /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(DataConfigs.blockClass, "__condition-wrapper"),
+    role: "grid",
+    "aria-label": DataConfigs.translateWithId('condition_builder_group')
+  }, group === null || group === void 0 || (_group$conditions = group.conditions) === null || _group$conditions === void 0 ? void 0 : _group$conditions.map(function (eachCondition, conditionIndex) {
     return /*#__PURE__*/React__default["default"].createElement("div", {
-      className: "".concat(className, " ").concat(DataConfigs.blockClass, "__condition-wrapper"),
-      role: aria.level === 1 ? 'rowgroup' : undefined,
-      "aria-label": aria.level == 1 ? DataConfigs.translateWithId('condition_builder_group') : undefined
-    }, /*#__PURE__*/React__default["default"].createElement("div", {
-      tabIndex: 0,
-      role: "row",
-      "aria-level": aria.level,
-      "aria-posinset": aria.posinset,
-      "aria-setsize": aria.setsize
-    }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
-      label: group.statement,
-      title: DataConfigs.translateWithId('condition'),
-      "data-name": "connectorField",
-      popOverClassName: "".concat(DataConfigs.blockClass, "__gap"),
-      className: "".concat(DataConfigs.blockClass, "__statement-button")
-    }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
-      conditionState: {
-        value: group.statement,
-        label: DataConfigs.translateWithId('condition')
+      key: eachCondition.id
+    }, eachCondition.conditions && /*#__PURE__*/React__default["default"].createElement(ConditionGroupBuilder, {
+      className: "".concat(DataConfigs.blockClass, "__group"),
+      aria: {
+        level: aria.level + 1,
+        posinset: conditionIndex + 1,
+        setsize: group.conditions.length
+      },
+      group: eachCondition,
+      onChange: function onChange(updatedCondition) {
+        onChangeHandler(updatedCondition, conditionIndex);
+      },
+      onRemove: function onRemove(evt) {
+        onRemoveHandler(eachCondition.id, evt);
+      },
+      conditionBuilderRef: conditionBuilderRef
+    }), !eachCondition.conditions && /*#__PURE__*/React__default["default"].createElement(ConditionBlock["default"], {
+      conjunction: conditionIndex > 0 ? group.groupOperator : undefined,
+      aria: {
+        level: aria.level + 1,
+        posinset: conditionIndex + 1,
+        setsize: group.conditions.length
       },
-      onChange: function onChange(v, evt) {
-        util.focusThisField(evt);
-        onStatementChangeHandler(v);
+      isStatement: conditionIndex == 0,
+      condition: eachCondition,
+      group: group,
+      conditionIndex: conditionIndex,
+      className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-bottom"),
+      onChange: function onChange(updatedConditions) {
+        onChangeHandler(updatedConditions, conditionIndex);
       },
-      config: {
-        options: DataConfigs.statementConfig
-      }
-    }))), group === null || group === void 0 || (_group$conditions2 = group.conditions) === null || _group$conditions2 === void 0 ? void 0 : _group$conditions2.map(function (eachCondition, conditionIndex) {
-      return /*#__PURE__*/React__default["default"].createElement(React.Fragment, {
-        key: eachCondition.id
-      }, eachCondition.conditions ? /*#__PURE__*/React__default["default"].createElement("div", {
-        className: cx__default["default"]("".concat(DataConfigs.blockClass, "__condition-block subgroup  ").concat(DataConfigs.blockClass, "__gap"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__gap-bottom"), group.conditions.length < conditionIndex + 1))
-      }, /*#__PURE__*/React__default["default"].createElement(ConditionConnector["default"], {
-        className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__groupConnector"),
-        operator: group.groupOperator,
-        "aria-hidden": true
-      }), /*#__PURE__*/React__default["default"].createElement(ConditionGroupBuilder, {
-        aria: {
-          level: aria.level + 1,
-          posinset: conditionIndex + 1,
-          setsize: group.conditions.length
-        },
-        className: "".concat(DataConfigs.blockClass, "__group"),
-        group: eachCondition,
-        onChange: function onChange(updatedConditions) {
-          onChangeHandler(updatedConditions, conditionIndex);
-        },
-        onRemove: function onRemove(e) {
-          onRemoveHandler(eachCondition.id, e);
-        },
-        conditionBuilderRef: conditionBuilderRef
-      })) : /*#__PURE__*/React__default["default"].createElement(ConditionBlock["default"], {
-        conjunction: conditionIndex > 0 ? group.groupOperator : undefined,
-        aria: {
-          level: aria.level + 1,
-          posinset: conditionIndex + 1,
-          setsize: group.conditions.length
-        },
-        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);
-        },
-        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__default["default"].createElement(ConditionPreview["default"], {
-        previewType: "subGroup"
-      }))), conditionIndex == showConditionPreview && (_ConditionPreview2 || (_ConditionPreview2 = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
-        previewType: "condition"
-      }))));
+      addConditionHandler: addConditionHandler,
+      onRemove: function onRemove(evt) {
+        onRemoveHandler(eachCondition.id, evt);
+      },
+      onConnectorOperatorChange: function onConnectorOperatorChange(op) {
+        onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+          groupOperator: op
+        }));
+      },
+      onStatementChange: function onStatementChange(updatedStatement) {
+        onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+          statement: updatedStatement
+        }));
+      },
+      isLastCondition: isLastCondition
     }));
-  };
-  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, variant == 'tree' && getTreeVariant(), variant == 'sentence' && getSentenceVariant());
+  })));
 };
 var ConditionGroupBuilder$1 = ConditionGroupBuilder;
 ConditionGroupBuilder.propTypes = {
@@ -269,19 +138,19 @@ ConditionGroupBuilder.propTypes = {
    */
   aria: index["default"].object,
   /**
-   * state defines the current group
-   */
-  /**
-   * Provide an optional class to be applied to the containing node.
+   * Provide an  class to be applied to the containing node.
    */
   className: index["default"].string,
   /**
-  className: PropTypes.string,
    * ref of condition builder
    */
   conditionBuilderRef: index["default"].object,
+  /**
+   * group defines the current group
+   */
   group: index["default"].object,
   /**
+  
    * callback to update the current condition of the state tree
    */
   onChange: index["default"].func,