@carbon/ibm-products 2.42.1-canary.7 → 2.42.1-canary.8

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

@@ -6,17 +6,23 @@ declare function ConditionBlock(props: any): import("react/jsx-runtime").JSX.Ele
 declare namespace ConditionBlock {
     namespace propTypes {
         let addConditionHandler: PropTypes.Requireable<(...args: any[]) => any>;
+        let addConditionSubGroupHandler: PropTypes.Requireable<(...args: any[]) => any>;
         let aria: PropTypes.Requireable<object>;
         let condition: PropTypes.Requireable<object>;
         let conditionIndex: PropTypes.Requireable<number>;
         let conjunction: PropTypes.Requireable<string>;
         let group: PropTypes.Requireable<object>;
+        let hideConditionPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
+        let hideConditionSubGroupPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
         let isLastCondition: PropTypes.Requireable<(...args: any[]) => any>;
         let isStatement: PropTypes.Requireable<boolean>;
         let onChange: PropTypes.Requireable<(...args: any[]) => any>;
         let onConnectorOperatorChange: PropTypes.Requireable<(...args: any[]) => any>;
         let onRemove: PropTypes.Requireable<(...args: any[]) => any>;
         let onStatementChange: PropTypes.Requireable<(...args: any[]) => any>;
+        let showConditionPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
+        let showConditionSubGroupPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
+        let state: PropTypes.Requireable<object>;
     }
 }
 import PropTypes from 'prop-types';

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

@@ -17,7 +17,7 @@ var index = require('../../../node_modules/prop-types/index.js');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
 var ConditionBuilderItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.js');
 var cx = require('classnames');
-var ConditionConnector = require('../ConditionConnector/ConditionConnector.js');
+var ConditionConnector = require('../ConditionBuilderConnector/ConditionConnector.js');
 var ConditionBuilderItemNumber = require('../ConditionBuilderItem/ConditionBuilderItemNumber/ConditionBuilderItemNumber.js');
 var ConditionBuilderItemText = require('../ConditionBuilderItem/ConditionBuilderItemText/ConditionBuilderItemText.js');
 var ConditionBuilderItemDate = require('../ConditionBuilderItem/ConditionBuilderItemDate/ConditionBuilderItemDate.js');
@@ -32,6 +32,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
+var _div;
 /**
  * This component build each block of condition consisting of property, operator value and close button.
  */
@@ -49,11 +50,19 @@ var ConditionBlock = function ConditionBlock(props) {
     isStatement = props.isStatement,
     group = props.group,
     onStatementChange = props.onStatementChange,
-    addConditionHandler = props.addConditionHandler,
     conditionIndex = props.conditionIndex,
+    addConditionHandler = props.addConditionHandler,
+    _addConditionSubGroupHandler = props.addConditionSubGroupHandler,
+    aria = props.aria,
+    hideConditionSubGroupPreviewHandler = props.hideConditionSubGroupPreviewHandler,
+    showConditionSubGroupPreviewHandler = props.showConditionSubGroupPreviewHandler,
+    hideConditionPreviewHandler = props.hideConditionPreviewHandler,
+    showConditionPreviewHandler = props.showConditionPreviewHandler,
     isLastCondition = props.isLastCondition;
   var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
-    inputConfig = _useContext.inputConfig;
+    inputConfig = _useContext.inputConfig,
+    variant = _useContext.variant;
+  //Below possible input types expected for value field.
   var itemComponents = {
     option: ConditionBuilderItemOption.ConditionBuilderItemOption,
     text: ConditionBuilderItemText.ConditionBuilderItemText,
@@ -78,14 +87,17 @@ var ConditionBlock = function ConditionBlock(props) {
     type = _getCurrentConfig.type,
     config = _getCurrentConfig.config,
     label = _getCurrentConfig.label;
-  var ItemComponent = property ? itemComponents[type] : null;
+  var ItemComponent;
+  //   if (type == 'custom') {
+  //     ItemComponent = config.component;
+  //   } else {
+  ItemComponent = property ? itemComponents[type] : null;
+  //}
+
   var onStatementChangeHandler = function onStatementChangeHandler(v, evt) {
     util.focusThisField(evt);
     onStatementChange(v);
   };
-  var onConnectorOperatorChangeHandler = function onConnectorOperatorChangeHandler(op) {
-    onConnectorOperatorChange(op);
-  };
   var onPropertyChangeHandler = function onPropertyChangeHandler(newProperty) {
     onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, condition), {}, {
       property: newProperty,
@@ -118,21 +130,32 @@ var ConditionBlock = function ConditionBlock(props) {
       return operator.type.indexOf(type) != -1 || operator.type == 'all';
     });
   };
-  return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: cx__default["default"]("".concat(DataConfigs.blockClass, "__condition-block conditionBlockWrapper ").concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-bottom"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__condition__deletion-preview"), showDeletionPreview)),
-    key: conditionIndex,
+  var getAriaAttributes = function getAriaAttributes() {
+    return variant == 'tree' ? {
+      'aria-level': aria.level,
+      'aria-posinset': aria.posinset,
+      'aria-setsize': aria.setsize
+    } : {};
+  };
+  return /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({
+    className: cx__default["default"]("".concat(DataConfigs.blockClass, "__condition-block"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__condition__deletion-preview"), showDeletionPreview), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__gap-bottom"), variant == 'tree' && !(conditionIndex + 1 >= group.conditions.length)), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-bottom"), variant == 'sentence')),
     role: "row",
     "aria-label": DataConfigs.translateWithId('condition_row'),
     tabIndex: -1
-  }, isStatement && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem
-  //   open={false}
-  , {
+  }, getAriaAttributes()), conjunction ? /*#__PURE__*/React__default["default"].createElement(ConditionConnector["default"], {
+    className: "".concat(DataConfigs.blockClass, "__gap"),
+    operator: conjunction,
+    onChange: function onChange(op) {
+      return onConnectorOperatorChange(op);
+    }
+  }) : _div || (_div = /*#__PURE__*/React__default["default"].createElement("div", {
+    role: "gridcell"
+  })), isStatement && /*#__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"),
-    tabIndex: 0
+    className: "".concat(DataConfigs.blockClass, "__statement-button")
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
     conditionState: {
       value: group.statement,
@@ -142,11 +165,7 @@ var ConditionBlock = function ConditionBlock(props) {
     config: {
       options: DataConfigs.statementConfig
     }
-  })), conjunction && /*#__PURE__*/React__default["default"].createElement(ConditionConnector["default"], {
-    className: "".concat(DataConfigs.blockClass, "__gap"),
-    operator: conjunction,
-    onChange: onConnectorOperatorChangeHandler
-  }), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+  })), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     label: label,
     title: DataConfigs.translateWithId('property'),
     renderIcon: icon !== null && icon !== void 0 ? icon : null,
@@ -193,7 +212,8 @@ var ConditionBlock = function ConditionBlock(props) {
       value: value
     },
     onChange: onValueChangeHandler,
-    config: config
+    config: config,
+    "data-name": "valueField"
   })), /*#__PURE__*/React__default["default"].createElement("span", {
     role: "gridcell",
     "aria-label": DataConfigs.translateWithId('remove_condition')
@@ -211,9 +231,15 @@ var ConditionBlock = function ConditionBlock(props) {
   })), isLastCondition(conditionIndex, group.conditions) && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderAdd["default"], {
     onClick: function onClick() {
       addConditionHandler(conditionIndex);
-    }
-    //addConditionSubGroupHandler={()=>{addConditionSubGroupHandler(conditionIndex)}}
-    ,
+    },
+    addConditionSubGroupHandler: function addConditionSubGroupHandler() {
+      _addConditionSubGroupHandler(conditionIndex);
+    },
+    showConditionSubGroupPreviewHandler: showConditionSubGroupPreviewHandler,
+    hideConditionSubGroupPreviewHandler: hideConditionSubGroupPreviewHandler,
+    enableSubGroup: variant == 'tree',
+    showConditionPreviewHandler: showConditionPreviewHandler,
+    hideConditionPreviewHandler: hideConditionPreviewHandler,
     className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-left")
   }));
 };
@@ -224,16 +250,14 @@ ConditionBlock.propTypes = {
    */
   addConditionHandler: index["default"].func,
   /**
-   * object hold aria attributes
+   * callback to add a new condition subgroup
    */
-  aria: index["default"].object,
+  addConditionSubGroupHandler: index["default"].func,
   /**
-   * object that hold the current condition
+   * object hold aria attributes
    */
+  aria: index["default"].object,
   condition: index["default"].object,
-  /**
-   * index of the current condition
-   */
   conditionIndex: index["default"].number,
   /**
    * string that decides to show the condition connector
@@ -244,8 +268,13 @@ ConditionBlock.propTypes = {
    */
   group: index["default"].object,
   /**
-   * callback to add a new condition
+   * handler for hiding sub group preview
+   */
+  hideConditionPreviewHandler: index["default"].func,
+  /**
+   * handler for hiding sub group preview
    */
+  hideConditionSubGroupPreviewHandler: index["default"].func,
   isLastCondition: index["default"].func,
   /**
    *  boolean that decides to show the statement(if/ excl.if)
@@ -266,7 +295,19 @@ ConditionBlock.propTypes = {
   /**
    * callback to handle the statement(if/ excl.if) change
    */
-  onStatementChange: index["default"].func
+  onStatementChange: index["default"].func,
+  /**
+   * handler for showing add condition preview
+   */
+  showConditionPreviewHandler: index["default"].func,
+  /**
+   * handler for showing sub group preview
+   */
+  showConditionSubGroupPreviewHandler: index["default"].func,
+  /**
+   * object that hold the current condition
+   */
+  state: index["default"].object
 };
 
 exports["default"] = ConditionBlock$1;

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

@@ -1,12 +1,26 @@
 export default ConditionBuilderAdd;
-declare function ConditionBuilderAdd({ className, onClick }: {
+declare function ConditionBuilderAdd({ className, onClick, addConditionSubGroupHandler, showConditionSubGroupPreviewHandler, hideConditionSubGroupPreviewHandler, showConditionPreviewHandler, hideConditionPreviewHandler, enableSubGroup, buttonLabel, }: {
     className: any;
     onClick: any;
+    addConditionSubGroupHandler: any;
+    showConditionSubGroupPreviewHandler: any;
+    hideConditionSubGroupPreviewHandler: any;
+    showConditionPreviewHandler: any;
+    hideConditionPreviewHandler: any;
+    enableSubGroup: any;
+    buttonLabel: any;
 }): import("react/jsx-runtime").JSX.Element;
 declare namespace ConditionBuilderAdd {
     namespace propTypes {
+        let addConditionSubGroupHandler: PropTypes.Requireable<(...args: any[]) => any>;
+        let buttonLabel: PropTypes.Requireable<string>;
         let className: PropTypes.Requireable<string>;
+        let enableSubGroup: PropTypes.Requireable<boolean>;
+        let hideConditionPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
+        let hideConditionSubGroupPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
         let onClick: PropTypes.Requireable<(...args: any[]) => any>;
+        let showConditionPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
+        let showConditionSubGroupPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
     }
 }
 import PropTypes from 'prop-types';

package/lib/components/ConditionBuilder/ConditionBuilderAdd/ConditionBuilderAdd.js

@@ -9,6 +9,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var icons = require('@carbon/react/icons');
 var ConditionBuilderButton = require('../ConditionBuilderButton/ConditionBuilderButton.js');
@@ -21,28 +22,110 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
   var className = _ref.className,
-    onClick = _ref.onClick;
+    onClick = _ref.onClick,
+    addConditionSubGroupHandler = _ref.addConditionSubGroupHandler,
+    showConditionSubGroupPreviewHandler = _ref.showConditionSubGroupPreviewHandler,
+    hideConditionSubGroupPreviewHandler = _ref.hideConditionSubGroupPreviewHandler,
+    showConditionPreviewHandler = _ref.showConditionPreviewHandler,
+    hideConditionPreviewHandler = _ref.hideConditionPreviewHandler,
+    enableSubGroup = _ref.enableSubGroup,
+    buttonLabel = _ref.buttonLabel;
+  var _useState = React.useState(false),
+    _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
+    isAddSubgroup = _useState2[0],
+    setIsAddSubgroup = _useState2[1];
+  var showAddSubGroup = function showAddSubGroup() {
+    setIsAddSubgroup(true);
+  };
+  var hideAddSubGroup = function hideAddSubGroup() {
+    setIsAddSubgroup(false);
+  };
+  var onClickHandler = function onClickHandler() {
+    hideConditionPreviewHandler === null || hideConditionPreviewHandler === void 0 || hideConditionPreviewHandler();
+    onClick();
+  };
+  var previewHandlers = function previewHandlers() {
+    return enableSubGroup ? {
+      onMouseEnter: showConditionPreviewHandler,
+      onMouseLeave: hideConditionPreviewHandler,
+      onFocus: showConditionPreviewHandler,
+      onBlur: hideConditionPreviewHandler
+    } : {};
+  };
+  var previewHandlersForSubgroup = function previewHandlersForSubgroup() {
+    return {
+      onMouseEnter: showConditionSubGroupPreviewHandler,
+      onMouseLeave: hideConditionSubGroupPreviewHandler,
+      onFocus: showConditionSubGroupPreviewHandler,
+      onBlur: hideConditionSubGroupPreviewHandler
+    };
+  };
+  var wrapperProps = enableSubGroup ? {
+    role: 'gridcell',
+    'aria-label': DataConfigs.translateWithId('add-condition')
+  } : {};
   return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: className,
-    role: "gridcell"
-  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, {
+    className: "".concat(className, " ").concat(DataConfigs.blockClass, "__add-button-wrapper"),
+    role: !enableSubGroup ? 'gridcell' : 'none',
+    "aria-label": !enableSubGroup ? DataConfigs.translateWithId('add_condition_row') : undefined,
+    onMouseEnter: showAddSubGroup,
+    onMouseLeave: hideAddSubGroup,
+    onFocus: showAddSubGroup,
+    onBlur: hideAddSubGroup
+  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, _rollupPluginBabelHelpers["extends"]({
     renderIcon: icons.AddAlt,
-    onClick: onClick,
+    onClick: onClickHandler
+  }, previewHandlers(), {
     className: "".concat(DataConfigs.blockClass, "__add-button"),
     hideLabel: true,
-    label: DataConfigs.translateWithId('add-condition')
-  }));
+    "data-name": "addButton",
+    label: buttonLabel !== null && buttonLabel !== void 0 ? buttonLabel : DataConfigs.translateWithId('add-condition'),
+    wrapperProps: wrapperProps
+  })), isAddSubgroup && enableSubGroup && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, _rollupPluginBabelHelpers["extends"]({
+    renderIcon: icons.TextNewLine,
+    onClick: addConditionSubGroupHandler,
+    className: "".concat(DataConfigs.blockClass, "__add-condition-group ").concat(DataConfigs.blockClass, "__gap-left"),
+    hideLabel: true,
+    label: DataConfigs.translateWithId('add-condition'),
+    wrapperProps: wrapperProps
+  }, previewHandlersForSubgroup())));
 };
 var ConditionBuilderAdd$1 = ConditionBuilderAdd;
 ConditionBuilderAdd.propTypes = {
+  /**
+   * handler for hiding sub group preview
+   */
+  addConditionSubGroupHandler: index["default"].func,
+  /**
+   * handler for hiding sub group preview
+   */ /**
+      * tooltip label for plus button
+      */
+  buttonLabel: index["default"].string,
   /**
    * Provide an optional class to be applied to the containing node.
    */
   className: index["default"].string,
   /**
-   * callback triggered on click of add button
+   * boolean to enable sub groups for the tree variant
+   */
+  enableSubGroup: index["default"].bool,
+  /**
+   * handler for hiding sub group preview
+   */
+  hideConditionPreviewHandler: index["default"].func,
+  hideConditionSubGroupPreviewHandler: index["default"].func,
+  /**
+   * handler for hiding sub group preview
+   */ /**
+      * callback triggered on click of add button
+      */
+  onClick: index["default"].func,
+  showConditionPreviewHandler: index["default"].func,
+  showConditionSubGroupPreviewHandler: index["default"].func
+  /**
+   * handler for hiding sub group preview
    */
-  onClick: index["default"].func
 };
 
 exports["default"] = ConditionBuilderAdd$1;

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

@@ -1,5 +1,4 @@
-export function ConditionBuilderButton({ className, label, hideLabel, tooltipAlign, renderIcon: Icon, onClick, showToolTip, ...rest }: {
-    [x: string]: any;
+export function ConditionBuilderButton({ className, label, hideLabel, tooltipAlign, renderIcon: Icon, onClick, showToolTip, wrapperProps, onBlur, onFocus, onMouseEnter, onMouseLeave, }: {
     className: any;
     label: any;
     hideLabel: any;
@@ -7,16 +6,26 @@ export function ConditionBuilderButton({ className, label, hideLabel, tooltipAli
     renderIcon: any;
     onClick: any;
     showToolTip: any;
+    wrapperProps: any;
+    onBlur: any;
+    onFocus: any;
+    onMouseEnter: any;
+    onMouseLeave: any;
 }): import("react/jsx-runtime").JSX.Element;
 export namespace ConditionBuilderButton {
     namespace propTypes {
         let className: PropTypes.Requireable<string>;
         let hideLabel: PropTypes.Requireable<boolean>;
         let label: PropTypes.Requireable<string>;
+        let onBlur: PropTypes.Requireable<(...args: any[]) => any>;
         let onClick: PropTypes.Requireable<(...args: any[]) => any>;
+        let onFocus: PropTypes.Requireable<(...args: any[]) => any>;
+        let onMouseEnter: PropTypes.Requireable<(...args: any[]) => any>;
+        let onMouseLeave: PropTypes.Requireable<(...args: any[]) => any>;
         let renderIcon: PropTypes.Requireable<object>;
         let showToolTip: PropTypes.Requireable<boolean>;
         let tooltipAlign: PropTypes.Requireable<string>;
+        let wrapperProps: PropTypes.Requireable<object>;
     }
 }
 import PropTypes from 'prop-types';

package/lib/components/ConditionBuilder/ConditionBuilderButton/ConditionBuilderButton.js

@@ -21,9 +21,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
-var _excluded = ["className", "label", "hideLabel", "tooltipAlign", "renderIcon", "onClick", "showToolTip"];
 var ConditionBuilderButton = function ConditionBuilderButton(_ref) {
-  var _Icon;
+  var _Icon, _span;
   var className = _ref.className,
     label = _ref.label,
     hideLabel = _ref.hideLabel,
@@ -31,21 +30,29 @@ var ConditionBuilderButton = function ConditionBuilderButton(_ref) {
     Icon = _ref.renderIcon,
     onClick = _ref.onClick,
     showToolTip = _ref.showToolTip,
-    rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
+    wrapperProps = _ref.wrapperProps,
+    onBlur = _ref.onBlur,
+    onFocus = _ref.onFocus,
+    onMouseEnter = _ref.onMouseEnter,
+    onMouseLeave = _ref.onMouseLeave;
   var Button = function Button() {
-    return /*#__PURE__*/React__default["default"].createElement("button", _rollupPluginBabelHelpers["extends"]({
+    return /*#__PURE__*/React__default["default"].createElement("button", {
       // role={'gridcell'}
       tabIndex: -1,
       className: cx__default["default"]([className, "".concat(DataConfigs.blockClass, "__button"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__text-ellipsis"), showToolTip && !hideLabel)]),
       type: "button",
-      onClick: onClick
-    }, rest), Icon && (_Icon || (_Icon = /*#__PURE__*/React__default["default"].createElement(Icon, null))), !hideLabel && label);
+      onClick: onClick,
+      onBlur: onBlur,
+      onFocus: onFocus,
+      onMouseEnter: onMouseEnter,
+      onMouseLeave: onMouseLeave
+    }, Icon && (_Icon || (_Icon = /*#__PURE__*/React__default["default"].createElement(Icon, null))), !hideLabel && (_span || (_span = /*#__PURE__*/React__default["default"].createElement("span", null, label))));
   };
   return hideLabel || showToolTip ? /*#__PURE__*/React__default["default"].createElement(react.Tooltip, _rollupPluginBabelHelpers["extends"]({
     label: label,
     align: tooltipAlign,
     className: "".concat(DataConfigs.blockClass, "__con-tooltip")
-  }, rest.wrapperProps), Button()) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, Button());
+  }, wrapperProps), Button()) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, Button());
 };
 ConditionBuilderButton.propTypes = {
   /**
@@ -60,10 +67,17 @@ ConditionBuilderButton.propTypes = {
    * label of the button
    */
   label: index["default"].string,
+  /**
+   * mouse events callbacks
+   */
+  onBlur: index["default"].func,
   /**
    * callback triggered on click of add button
    */
   onClick: index["default"].func,
+  onFocus: index["default"].func,
+  onMouseEnter: index["default"].func,
+  onMouseLeave: index["default"].func,
   /**
    * Optional prop to allow overriding the icon rendering.
    */
@@ -77,7 +91,11 @@ ConditionBuilderButton.propTypes = {
   /**
    * tooltip position
    */
-  tooltipAlign: index["default"].string
+  tooltipAlign: index["default"].string,
+  /**
+   * optional props for tree grid to add role and aria-label to wrapper span
+   */
+  wrapperProps: index["default"].object
 };
 
 exports.ConditionBuilderButton = ConditionBuilderButton;

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

@@ -14,21 +14,22 @@ 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 blockClass = "".concat(settings.pkg.prefix, "--condition-builder");
-function ConditionConnector(_ref) {
+var ConditionConnector = 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');
@@ -48,33 +49,37 @@ function ConditionConnector(_ref) {
     onChange(op);
     util.focusThisField(evt);
   };
-  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>
-  );
-}
+  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;
 ConditionConnector.propTypes = {
   /**
    * Provide an optional class to be applied to the containing node.
@@ -90,4 +95,4 @@ ConditionConnector.propTypes = {
   operator: index["default"].string
 };
 
-exports["default"] = ConditionConnector;
+exports["default"] = ConditionConnector$1;

package/lib/components/ConditionBuilder/ConditionBuilderConnector/GroupConnector.d.ts

@@ -0,0 +1,2 @@
+export default GroupConnector;
+declare function GroupConnector(): import("react/jsx-runtime").JSX.Element;

package/lib/components/ConditionBuilder/ConditionBuilderConnector/GroupConnector.js

@@ -0,0 +1,52 @@
+/**
+ * Copyright IBM Corp. 2020, 2024
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
+var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
+var ConditionBuilderItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.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 GroupConnector = function GroupConnector() {
+  var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
+    rootState = _useContext.rootState;
+  return /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(DataConfigs.blockClass, "__group-separator"),
+    role: "row",
+    tabIndex: -1,
+    "aria-level": 1
+  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+    label: rootState.operator,
+    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: rootState.operator,
+      label: DataConfigs.translateWithId('condition')
+    },
+    onChange: function onChange(v, e) {
+      util.focusThisField(e);
+    },
+    config: {
+      options: DataConfigs.connectorConfig
+    }
+  })));
+};
+var GroupConnector$1 = GroupConnector;
+
+exports["default"] = GroupConnector$1;