@carbon/ibm-products 2.42.1-canary.27 → 2.42.1-canary.4

package/es/components/Datagrid/useColumnOrder.d.ts

@@ -1,8 +1,2 @@
-/**
- * Copyright IBM Corp. 2022, 2022
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import { useColumnOrder } from 'react-table';
 export default useColumnOrder;
+import { useColumnOrder } from 'react-table';

package/es/components/Datagrid/useFiltering.d.ts

@@ -1,9 +1,2 @@
-/**
- * Copyright IBM Corp. 2022, 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.
- */
-import { Hooks } from 'react-table';
-declare const useFiltering: (hooks: Hooks) => void;
 export default useFiltering;
+declare function useFiltering(hooks: any): void;

package/es/components/Datagrid/useFiltering.js

@@ -63,13 +63,12 @@ var useFiltering = function useFiltering(hooks) {
     });
   }, []);
   hooks.useInstance.push(function (instance) {
-    var _ref4 = instance,
-      filterProps = _ref4.filterProps,
-      setAllFilters = _ref4.setAllFilters,
-      setFilter = _ref4.setFilter,
-      headers = _ref4.headers,
-      data = _ref4.data,
-      state = _ref4.state;
+    var filterProps = instance.filterProps,
+      setAllFilters = instance.setAllFilters,
+      setFilter = instance.setFilter,
+      headers = instance.headers,
+      data = instance.data,
+      state = instance.state;
     var defaultProps = {
       variation: 'flyout',
       updateMethod: BATCH,
@@ -85,7 +84,7 @@ var useFiltering = function useFiltering(hooks) {
       });
     };
     Object.assign(instance, {
-      filterProps: _objectSpread2(_objectSpread2({}, defaultProps), instance === null || instance === void 0 ? void 0 : instance.filterProps),
+      filterProps: _objectSpread2(_objectSpread2({}, defaultProps), instance.filterProps),
       filterTypes: filterTypes,
       getFilterFlyoutProps: getFilterFlyoutProps,
       FilterFlyout: FilterFlyout

package/es/components/Datagrid/useFlexResize.d.ts

@@ -1,6 +1,6 @@
 export default useFlexResize;
 /**
- * Copyright IBM Corp. 2020, 2024
+ * Copyright IBM Corp. 2020, 2023
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.

package/es/components/Datagrid/useFlexResize.js

@@ -7,31 +7,31 @@
 
 import { toConsumableArray as _toConsumableArray } from '../../_virtual/_rollupPluginBabelHelpers.js';
 
-/* eslint-disable no-unreachable */
 /**
- * Copyright IBM Corp. 2020, 2024
+ * Copyright IBM Corp. 2020, 2023
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
 var useFlexResize = function useFlexResize(hooks) {
+  var spacer = {
+    id: 'spacer',
+    width: 0,
+    disableSortBy: true,
+    disableResizing: true
+  };
   hooks.visibleColumns.push(function (columns) {
-    // always move actions to the end
+    // always move actions and spacer to the end
     var actionsIdx = columns.findIndex(function (col) {
       return col.isAction;
     });
     if (actionsIdx === -1) {
-      var _lastCol = columns.at(-1);
-      _lastCol.isFlexCol = true;
-      return _toConsumableArray(columns);
+      return [].concat(_toConsumableArray(columns), [spacer]);
     }
     var cols = _toConsumableArray(columns);
     var actions = cols.splice(actionsIdx, 1)[0];
-    cols.splice(columns.length, 0, actions);
-    // the last non-action action column should flex remaining space
-    var lastCol = columns.at(-2);
-    lastCol.isFlexCol = true;
+    cols.splice(columns.length, 0, spacer, actions);
     return cols;
   });
   var changeProps = function changeProps(props, data) {
@@ -39,7 +39,7 @@ var useFlexResize = function useFlexResize(hooks) {
     if (!column && data.cell) {
       column = data.cell.column;
     }
-    if (column.isFlexCol) {
+    if (column.id === spacer.id) {
       return [props, {
         style: {
           flex: '1 1 0'

package/es/components/Datagrid/useNestedRows.js

@@ -15,23 +15,6 @@ var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useNestedRows = function useNestedRows(hooks) {
   useNestedRowExpander(hooks);
   var useInstance = function useInstance(instance) {
-    useEffect(function () {
-      var rows = instance.rows;
-      var defaultExpandedRows = rows.filter(function (row) {
-        var _row$original;
-        return row === null || row === void 0 || (_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.defaultExpanded;
-      });
-      if (defaultExpandedRows !== null && defaultExpandedRows !== void 0 && defaultExpandedRows.length) {
-        defaultExpandedRows.map(function (defaultExpandedRow) {
-          if (!defaultExpandedRow.isExpanded && !defaultExpandedRow.hasExpanded) {
-            var _defaultExpandedRow$t;
-            defaultExpandedRow === null || defaultExpandedRow === void 0 || (_defaultExpandedRow$t = defaultExpandedRow.toggleRowExpanded) === null || _defaultExpandedRow$t === void 0 || _defaultExpandedRow$t.call(defaultExpandedRow);
-            defaultExpandedRow.hasExpanded = true;
-            return;
-          }
-        });
-      }
-    }, [instance, instance.rows]);
     // This useEffect will expand rows if they exist in the initialState obj
     useEffect(function () {
       var rows = instance.rows,
@@ -63,21 +46,16 @@ var useNestedRows = function useNestedRows(hooks) {
         }
       }];
     };
-    var getIndentation = function getIndentation(depth) {
-      return 32 * depth + 16;
-    }; // row indentation padding
     var getCellProps = function getCellProps(props, _ref3) {
       var cell = _ref3.cell,
         instance = _ref3.instance;
-      // we add a dynamic -ve margin right only if the cell is resized below minimum width i.e 50px, else we set the width based on indentation at different levels
+      // reduce the "first cell"s width to compensate added (left) margin
       var isFirstCell = instance.columns.findIndex(function (c) {
         return c.id === cell.column.id;
       }) === 0;
       return [props, {
         style: {
-          marginRight: isFirstCell && cell.row.depth > 0 && parseInt(props.style.width, 10) <= getIndentation(cell.row.depth) + 50 // indentation padding + expander cell or empty cell width
-          ? "".concat(parseInt(props.style.width, 10) - (getIndentation(cell.row.depth) + 50), "px") : '',
-          width: isFirstCell && cell.row.depth > 0 ? parseInt(props.style.width, 10) - getIndentation(cell.row.depth) : props.style.width
+          marginRight: "".concat(isFirstCell && cell.row.depth > 0 ? "".concat(-32 * cell.row.depth - 18, "px") : '')
         }
       }];
     };

package/es/components/Datagrid/useOnRowClick.d.ts

@@ -1,9 +1,2 @@
-/**
- * Copyright IBM Corp. 2020, 2023
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import { Hooks } from 'react-table';
-declare const useOnRowClick: (hooks: Hooks) => void;
 export default useOnRowClick;
+declare function useOnRowClick(hooks: any): void;

package/es/components/Datagrid/useOnRowClick.js

@@ -9,8 +9,7 @@ import { pkg, carbon } from '../../settings.js';
 
 var useOnRowClick = function useOnRowClick(hooks) {
   var useInstance = function useInstance(rowInstance) {
-    var _ref = rowInstance,
-      onRowClick = _ref.onRowClick;
+    var onRowClick = rowInstance.onRowClick;
     var getRowProps = function getRowProps(props, datagridState) {
       var isFetching = datagridState.isFetching,
         row = datagridState.row,

package/es/components/Datagrid/useRowIsMouseOver.d.ts

@@ -1,3 +1,2 @@
-import { Hooks } from 'react-table';
-declare const useRowIsMouseOver: (hooks: Hooks) => void;
 export default useRowIsMouseOver;
+declare function useRowIsMouseOver(hooks: any): void;

package/es/components/Datagrid/useRowIsMouseOver.js

@@ -17,7 +17,7 @@ var useRowIsMouseOver = function useRowIsMouseOver(hooks) {
       setMouseOverRowIndex = _useState2[1];
     var onMouseChange = useDebounce(function (datagridState) {
       var row = datagridState.row;
-      setMouseOverRowIndex(row === null || row === void 0 ? void 0 : row.index);
+      setMouseOverRowIndex(row.index);
     }, 100);
     var getRowProps = function getRowProps(props, datagridState) {
       var onMouseOver = function onMouseOver() {

package/es/components/Datagrid/useSelectRows.d.ts

@@ -1,9 +1,2 @@
-/**
- * Copyright IBM Corp. 2020, 2023
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import { Hooks } from 'react-table';
-declare const useSelectRows: (hooks: Hooks) => void;
 export default useSelectRows;
+declare function useSelectRows(hooks: any): void;

package/es/components/Datagrid/useSelectRows.js

@@ -108,8 +108,7 @@ var SelectRow = function SelectRow(datagridState) {
       dispatch: dispatch,
       rowData: row,
       isChecked: event.target.checked,
-      getRowId: getRowId,
-      selectAll: null
+      getRowId: getRowId
     });
   };
   var selectDisabled = isFetching || row.getRowProps().disabled;
@@ -129,7 +128,7 @@ var SelectRow = function SelectRow(datagridState) {
     onSelect: onSelectHandler,
     id: rowId,
     name: "".concat(rowId, "-name"),
-    className: cx([checkboxClass, cellProps.className, _defineProperty({}, "".concat(checkboxClass, "-sticky-left"), isFirstColumnStickyLeft && Number(windowSize) > 671)]),
+    className: cx([checkboxClass, cellProps.className, _defineProperty({}, "".concat(checkboxClass, "-sticky-left"), isFirstColumnStickyLeft && windowSize > 671)]),
     ariaLabel: title,
     disabled: selectDisabled
   }));

package/es/components/Datagrid/useSortableColumns.d.ts

@@ -1,13 +1,6 @@
-/**
- * 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.
- */
-import { Hooks } from 'react-table';
-export declare const getNewSortOrder: (sortOrder?: boolean | string) => {
-    newSortDesc: boolean;
+export function getNewSortOrder(sortOrder: any): {
+    newSortDesc: undefined;
     newOrder: string;
 };
-declare const useSortableColumns: (hooks: Hooks) => void;
 export default useSortableColumns;
+declare function useSortableColumns(hooks: any): void;

package/es/components/Datagrid/useSortableColumns.js

@@ -22,7 +22,7 @@ var ordering = {
 };
 var getNewSortOrder = function getNewSortOrder(sortOrder) {
   var order = {
-    newSortDesc: false,
+    newSortDesc: undefined,
     newOrder: ordering.NONE
   };
   if (sortOrder === false || sortOrder === ordering.DESC) {
@@ -137,8 +137,7 @@ var useSortableColumns = function useSortableColumns(hooks) {
     return (_instance$customizeCo = instance.customizeColumnsProps) !== null && _instance$customizeCo !== void 0 && _instance$customizeCo.isTearsheetOpen ? visibleColumns : _toConsumableArray(sortableColumns);
   };
   var sortInstanceProps = function sortInstanceProps(instance) {
-    var _ref3 = instance,
-      onSort = _ref3.onSort;
+    var onSort = instance.onSort;
     Object.assign(instance, {
       manualSortBy: !!onSort,
       isTableSortable: true

package/es/components/Datagrid/utils/getAutoSizedColumnWidth.d.ts

@@ -1,8 +1 @@
-/**
- * Copyright IBM Corp. 2023, 2023
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import { Row } from 'react-table';
-export declare const getAutoSizedColumnWidth: (rows: Array<Row<object>>, accessor: string, headerText: string) => number;
+export function getAutoSizedColumnWidth(rows: Array<object>, accessor: string, headerText: string): number;

package/es/components/Datagrid/utils/getAutoSizedColumnWidth.js

@@ -14,6 +14,13 @@ import { toConsumableArray as _toConsumableArray } from '../../../_virtual/_roll
  * LICENSE file in the root directory of this source tree.
  */
 
+/**
+ * Calculates the auto sized width of a column
+ * @param {Array<object>} rows - The datagrid rows
+ * @param {string} accessor - The accessor for the column
+ * @param {string} headerText - The header text for the column
+ */
+
 var getAutoSizedColumnWidth = function getAutoSizedColumnWidth(rows, accessor, headerText) {
   var maxWidth = 400;
   var minWidth = 58;

package/es/components/SidePanel/SidePanel.d.ts

@@ -11,7 +11,7 @@ type SidePanelBaseProps = {
     /**
      * Sets the action toolbar buttons
      */
-    actionToolbarButtons?: ButtonProps<any>[];
+    actionToolbarButtons?: ButtonProps[];
     /**
      * The primary actions to be shown in the side panel. Each action is
      * specified as an object that will render expressive Buttons. Any Button
@@ -20,7 +20,7 @@ type SidePanelBaseProps = {
      *
      * See https://react.carbondesignsystem.com/?path=/docs/components-button--default#component-api
      */
-    actions?: ButtonProps<any>[];
+    actions?: ButtonProps[];
     /**
      * Determines if the title will animate on scroll
      */

package/es/components/SidePanel/SidePanel.js

@@ -95,8 +95,7 @@ var SidePanel = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
   var subtitleRef = useRef(null);
   var previousState = usePreviousValue({
     size: size,
-    open: open,
-    currentStep: currentStep
+    open: open
   });
   var _useState3 = useState(-1),
     _useState4 = _slicedToArray(_useState3, 2),
@@ -163,10 +162,9 @@ var SidePanel = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
     if (sidePanelRef && panelRefValue) {
       var _animatedScrollRef$cu;
       var scrollableSection = (_animatedScrollRef$cu = animatedScrollRef.current) !== null && _animatedScrollRef$cu !== void 0 ? _animatedScrollRef$cu : innerContentRef.current;
-      if (previousState && previousState['currentStep'] !== currentStep && scrollableSection) {
+      if (scrollableSection) {
         scrollableSection.scrollTop = 0;
       }
-
       // The size of the panel has changed while it is still opened
       // so we need to scroll it to the top and reset the header
       // height css custom property
@@ -325,12 +323,12 @@ var SidePanel = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
           if (primeFocusEl) {
             primeFocusEl === null || primeFocusEl === void 0 || primeFocusEl.focus();
           }
-        } else if (!slideIn) {
+        } else {
           firstElement === null || firstElement === void 0 || firstElement.focus();
         }
       }, 0);
     }
-  }, [animationComplete, firstElement, open, selectorPrimaryFocus, slideIn]);
+  }, [animationComplete, firstElement, open, selectorPrimaryFocus]);
   var primaryActionContainerClassNames = cx(["".concat(blockClass, "__actions-container"), _defineProperty({}, "".concat(blockClass, "__actions-container--condensed"), condensedActions)]);
   var mainPanelClassNames = cx([blockClass, className, "".concat(blockClass), "".concat(blockClass, "--").concat(size), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(blockClass, "--right-placement"), placement === 'right'), "".concat(blockClass, "--left-placement"), placement === 'left'), "".concat(blockClass, "--slide-in"), slideIn), "".concat(blockClass, "--has-slug"), slug), "".concat(blockClass, "--condensed-actions"), condensedActions), "".concat(blockClass, "--has-overlay"), includeOverlay)]);
   var renderTitle = function renderTitle() {
@@ -450,7 +448,7 @@ var SidePanel = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
       placement: placement,
       shouldReduceMotion: shouldReduceMotion
     },
-    onKeyDown: slideIn ? undefined : keyDownListener
+    onKeyDown: keyDownListener
   }), /*#__PURE__*/React__default.createElement(React__default.Fragment, null, renderHeader(), renderMain()), /*#__PURE__*/React__default.createElement(MotionActionSet, {
     actions: actions !== null && actions !== void 0 ? actions : [],
     className: primaryActionContainerClassNames,
@@ -473,7 +471,6 @@ SidePanel.propTypes = {
   /**
    * Sets the action toolbar buttons
    */
-  /**@ts-ignore */
   actionToolbarButtons: PropTypes.arrayOf(PropTypes.shape({
     label: PropTypes.string,
     leading: PropTypes.bool,
@@ -507,7 +504,6 @@ SidePanel.propTypes = {
     label: PropTypes.string,
     loading: PropTypes.bool,
     // we duplicate this Button prop to improve the DocGen here
-    /**@ts-ignore */
     onClick: Button.propTypes.onClick
   })))]),
   /**

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

@@ -6,23 +6,17 @@ 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('../ConditionBuilderConnector/ConditionConnector.js');
+var ConditionConnector = require('../ConditionConnector/ConditionConnector.js');
 var ConditionBuilderItemNumber = require('../ConditionBuilderItem/ConditionBuilderItemNumber/ConditionBuilderItemNumber.js');
 var ConditionBuilderItemText = require('../ConditionBuilderItem/ConditionBuilderItemText/ConditionBuilderItemText.js');
 var ConditionBuilderItemDate = require('../ConditionBuilderItem/ConditionBuilderItemDate/ConditionBuilderItemDate.js');
@@ -32,7 +32,6 @@ 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.
  */
@@ -50,19 +49,11 @@ var ConditionBlock = function ConditionBlock(props) {
     isStatement = props.isStatement,
     group = props.group,
     onStatementChange = props.onStatementChange,
-    conditionIndex = props.conditionIndex,
     addConditionHandler = props.addConditionHandler,
-    _addConditionSubGroupHandler = props.addConditionSubGroupHandler,
-    aria = props.aria,
-    hideConditionSubGroupPreviewHandler = props.hideConditionSubGroupPreviewHandler,
-    showConditionSubGroupPreviewHandler = props.showConditionSubGroupPreviewHandler,
-    hideConditionPreviewHandler = props.hideConditionPreviewHandler,
-    showConditionPreviewHandler = props.showConditionPreviewHandler,
+    conditionIndex = props.conditionIndex,
     isLastCondition = props.isLastCondition;
   var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
-    inputConfig = _useContext.inputConfig,
-    variant = _useContext.variant;
-  //Below possible input types expected for value field.
+    inputConfig = _useContext.inputConfig;
   var itemComponents = {
     option: ConditionBuilderItemOption.ConditionBuilderItemOption,
     text: ConditionBuilderItemText.ConditionBuilderItemText,
@@ -87,17 +78,14 @@ var ConditionBlock = function ConditionBlock(props) {
     type = _getCurrentConfig.type,
     config = _getCurrentConfig.config,
     label = _getCurrentConfig.label;
-  var ItemComponent;
-  //   if (type == 'custom') {
-  //     ItemComponent = config.component;
-  //   } else {
-  ItemComponent = property ? itemComponents[type] : null;
-  //}
-
+  var 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,
@@ -130,32 +118,21 @@ var ConditionBlock = function ConditionBlock(props) {
       return operator.type.indexOf(type) != -1 || operator.type == 'all';
     });
   };
-  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')),
+  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,
     role: "row",
     "aria-label": DataConfigs.translateWithId('condition_row'),
     tabIndex: -1
-  }, 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, {
+  }, isStatement && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem
+  //   open={false}
+  , {
     label: group.statement,
     title: DataConfigs.translateWithId('condition'),
     "data-name": "connectorField",
     popOverClassName: "".concat(DataConfigs.blockClass, "__gap"),
-    className: "".concat(DataConfigs.blockClass, "__statement-button")
+    className: "".concat(DataConfigs.blockClass, "__statement-button"),
+    tabIndex: 0
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
     conditionState: {
       value: group.statement,
@@ -165,7 +142,11 @@ var ConditionBlock = function ConditionBlock(props) {
     config: {
       options: DataConfigs.statementConfig
     }
-  })), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+  })), conjunction && /*#__PURE__*/React__default["default"].createElement(ConditionConnector["default"], {
+    className: "".concat(DataConfigs.blockClass, "__gap"),
+    operator: conjunction,
+    onChange: onConnectorOperatorChangeHandler
+  }), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     label: label,
     title: DataConfigs.translateWithId('property'),
     renderIcon: icon !== null && icon !== void 0 ? icon : null,
@@ -212,8 +193,7 @@ var ConditionBlock = function ConditionBlock(props) {
       value: value
     },
     onChange: onValueChangeHandler,
-    config: config,
-    "data-name": "valueField"
+    config: config
   })), /*#__PURE__*/React__default["default"].createElement("span", {
     role: "gridcell",
     "aria-label": DataConfigs.translateWithId('remove_condition')
@@ -231,15 +211,9 @@ var ConditionBlock = function ConditionBlock(props) {
   })), isLastCondition(conditionIndex, group.conditions) && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderAdd["default"], {
     onClick: function onClick() {
       addConditionHandler(conditionIndex);
-    },
-    addConditionSubGroupHandler: function addConditionSubGroupHandler() {
-      _addConditionSubGroupHandler(conditionIndex);
-    },
-    showConditionSubGroupPreviewHandler: showConditionSubGroupPreviewHandler,
-    hideConditionSubGroupPreviewHandler: hideConditionSubGroupPreviewHandler,
-    enableSubGroup: variant == 'tree',
-    showConditionPreviewHandler: showConditionPreviewHandler,
-    hideConditionPreviewHandler: hideConditionPreviewHandler,
+    }
+    //addConditionSubGroupHandler={()=>{addConditionSubGroupHandler(conditionIndex)}}
+    ,
     className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-left")
   }));
 };
@@ -249,15 +223,17 @@ ConditionBlock.propTypes = {
    * callback to add a new condition
    */
   addConditionHandler: index["default"].func,
-  /**
-   * callback to add a new condition subgroup
-   */
-  addConditionSubGroupHandler: index["default"].func,
   /**
    * object hold aria attributes
    */
   aria: index["default"].object,
+  /**
+   * object that hold the current condition
+   */
   condition: index["default"].object,
+  /**
+   * index of the current condition
+   */
   conditionIndex: index["default"].number,
   /**
    * string that decides to show the condition connector
@@ -268,13 +244,8 @@ ConditionBlock.propTypes = {
    */
   group: index["default"].object,
   /**
-   * handler for hiding sub group preview
-   */
-  hideConditionPreviewHandler: index["default"].func,
-  /**
-   * handler for hiding sub group preview
+   * callback to add a new condition
    */
-  hideConditionSubGroupPreviewHandler: index["default"].func,
   isLastCondition: index["default"].func,
   /**
    *  boolean that decides to show the statement(if/ excl.if)
@@ -295,19 +266,7 @@ ConditionBlock.propTypes = {
   /**
    * callback to handle the statement(if/ excl.if) change
    */
-  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
+  onStatementChange: index["default"].func
 };
 
 exports["default"] = ConditionBlock$1;

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

@@ -1,26 +1,12 @@
 export default ConditionBuilderAdd;
-declare function ConditionBuilderAdd({ className, onClick, addConditionSubGroupHandler, showConditionSubGroupPreviewHandler, hideConditionSubGroupPreviewHandler, showConditionPreviewHandler, hideConditionPreviewHandler, enableSubGroup, buttonLabel, }: {
+declare function ConditionBuilderAdd({ className, onClick }: {
     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';