ods-component-lib 1.18.81 → 1.18.83

package/dist/components/antd/collapse/OdsCollapse.d.ts

@@ -1,4 +1,12 @@
-import { CollapseProps } from "antd";
 import React from "react";
+import { CollapseProps, CollapsePanelProps } from "antd";
+export interface ICollapseProps extends CollapseProps {
+    Panel: React.FC<ICollapsePanelProps>;
+}
+export interface ICollapsePanelProps extends CollapsePanelProps {
+}
 declare function OdsCollapse(props: CollapseProps): React.JSX.Element;
+declare namespace OdsCollapse {
+    var Panel: React.ForwardRefExoticComponent<CollapsePanelProps & React.RefAttributes<HTMLDivElement>>;
+}
 export default OdsCollapse;

package/dist/components/antd/input/OdsCurrencyInput.d.ts

@@ -0,0 +1,14 @@
+import React from "react";
+export interface Currency {
+    Id: number;
+    Name: string;
+    Code: string;
+    [key: string]: any;
+}
+export interface CurrencyInputProps {
+    initialCurrency?: string;
+    initialAmount?: number;
+    allCurrencies?: Currency[];
+}
+declare const CurrencyInput: React.FC<CurrencyInputProps>;
+export default CurrencyInput;

package/dist/components/antd/list/OdsList.d.ts

@@ -7,5 +7,5 @@ export interface IListProps extends ListProps<any> {
     showHeader: boolean;
     showFooter: boolean;
 }
-declare function OdsList(props: IListProps): React.JSX.Element;
+declare const OdsList: (props: IListProps) => React.JSX.Element;
 export default OdsList;

package/dist/components/devextreme/OdsRemoteDataGrid.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
-import { IDataGridOptions, IButtonProps, ISelectionProps, IEditingProps, ISummaryProps } from 'devextreme-react/data-grid';
+import React from "react";
+import { IDataGridOptions, IButtonProps, ISelectionProps, IEditingProps, ISummaryProps } from "devextreme-react/data-grid";
 import { ButtonType } from 'antd/es/button/buttonHelpers';
 export interface IOdsDataGridProps extends IDataGridOptions {
     dataGridPageName?: string;
@@ -23,6 +23,7 @@ export interface IOdsDataGridProps extends IDataGridOptions {
     handleEditorPreparing?: any;
     isFilterRow?: boolean;
     filterData?: any[];
+    showKebabMenu?: boolean;
 }
 interface ISummaryRowOptions {
     summaryLoadedDataLabel?: string;

package/dist/index.d.ts

@@ -10,7 +10,7 @@ import OdsCheckboxGroup from "./components/antd/checkbox/OdsCheckboxGroup";
 import OdsDateRangePicker from "./components/antd/datepicker/OdsDateRangepicker";
 import OdsDatepicker from "./components/antd/datepicker/OdsDatepicker";
 import OdsDivider from "./components/antd/divider/OdsDivider";
-import OdsCollapse from "./components/antd/dropdown/OdsDropdown";
+import OdsCollapse from "./components/antd/collapse/OdsCollapse";
 import OdsDropdown from "./components/antd/dropdown/OdsDropdown";
 import OdsImage from "./components/antd/image/OdsImage";
 import OdsInput from "./components/antd/input/OdsInput.";

package/dist/index.js

@@ -510,7 +510,17 @@ function OdsDivider(props) {
 }
 
 var _templateObject$8;
-var StyledDropdown = styled__default(antd.Dropdown)(_templateObject$8 || (_templateObject$8 = _taggedTemplateLiteralLoose(["\n //\n"])));
+var StyledCollapse = styled__default(antd.Collapse)(_templateObject$8 || (_templateObject$8 = _taggedTemplateLiteralLoose(["\n //\n"])));
+
+function OdsCollapse(props) {
+  return React__default.createElement(React__default.Fragment, null, React__default.createElement(styled.ThemeProvider, {
+    theme: lightTheme
+  }, React__default.createElement(StyledCollapse, Object.assign({}, props))));
+}
+OdsCollapse.Panel = StyledCollapse.Panel;
+
+var _templateObject$9;
+var StyledDropdown = styled__default(antd.Dropdown)(_templateObject$9 || (_templateObject$9 = _taggedTemplateLiteralLoose(["\n //\n"])));
 
 var handleMenuClick = function handleMenuClick(e) {
   console.log('click', e);
@@ -531,8 +541,8 @@ function OdsImage(props) {
   return React__default.createElement(antd.Image, Object.assign({}, props));
 }
 
-var _templateObject$9;
-var StyledInput = styled__default(antd.Input)(_templateObject$9 || (_templateObject$9 = _taggedTemplateLiteralLoose(["\n //\n"])));
+var _templateObject$a;
+var StyledInput = styled__default(antd.Input)(_templateObject$a || (_templateObject$a = _taggedTemplateLiteralLoose(["\n //\n"])));
 
 function OdsInput(props) {
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(styled.ThemeProvider, {
@@ -577,8 +587,8 @@ function OdsTextArea(props) {
   }, React__default.createElement(StyledInput.TextArea, Object.assign({}, props), props === null || props === void 0 ? void 0 : props.children)));
 }
 
-var _templateObject$a;
-var StyledInputNumber = styled__default(antd.InputNumber)(_templateObject$a || (_templateObject$a = _taggedTemplateLiteralLoose(["\n //\n"])));
+var _templateObject$b;
+var StyledInputNumber = styled__default(antd.InputNumber)(_templateObject$b || (_templateObject$b = _taggedTemplateLiteralLoose(["\n //\n"])));
 
 function OdsInputNumber(props) {
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(styled.ThemeProvider, {
@@ -586,15 +596,15 @@ function OdsInputNumber(props) {
   }, React__default.createElement(StyledInputNumber, Object.assign({}, props))));
 }
 
-var _templateObject$b;
-var StyledList = styled__default(antd.List)(_templateObject$b || (_templateObject$b = _taggedTemplateLiteralLoose(["\n //\n"])));
+var _templateObject$c;
+var StyledList = styled__default(antd.List)(_templateObject$c || (_templateObject$c = _taggedTemplateLiteralLoose(["\n //\n"])));
 
-function OdsList(props) {
-  props.size = "default";
+function _OdsList(props) {
+  var _props$size;
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(styled.ThemeProvider, {
     theme: lightTheme
-  }, React__default.createElement(StyledList, {
-    size: props.size,
+  }, React__default.createElement(StyledList, Object.assign({
+    size: (_props$size = props.size) != null ? _props$size : "default",
     header: props.showHeader && React__default.createElement("div", null, props.headerText),
     footer: props.showFooter && React__default.createElement("div", null, props.footerText),
     bordered: true,
@@ -602,8 +612,11 @@ function OdsList(props) {
     renderItem: function renderItem(item) {
       return React__default.createElement(antd.List.Item, null, item);
     }
-  }, props.children)));
+  }, props), props.children)));
 }
+var OdsList = function OdsList(props) {
+  return _OdsList(props);
+};
 
 function OdsModalOld(props) {
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(antd.Modal, Object.assign({}, props, {
@@ -637,8 +650,8 @@ var OdsNotification = function OdsNotification(props) {
   return null;
 };
 
-var _templateObject$c;
-var StyledRadio = styled__default(antd.Radio)(_templateObject$c || (_templateObject$c = _taggedTemplateLiteralLoose(["\n //\n"])));
+var _templateObject$d;
+var StyledRadio = styled__default(antd.Radio)(_templateObject$d || (_templateObject$d = _taggedTemplateLiteralLoose(["\n //\n"])));
 
 var darkTheme = {
   token: {
@@ -887,8 +900,8 @@ function OdsRadioGroup(props) {
   }, props), props.children));
 }
 
-var _templateObject$d;
-var StyledRate = styled__default(antd.Rate)(_templateObject$d || (_templateObject$d = _taggedTemplateLiteralLoose(["\n //\n"])));
+var _templateObject$e;
+var StyledRate = styled__default(antd.Rate)(_templateObject$e || (_templateObject$e = _taggedTemplateLiteralLoose(["\n //\n"])));
 
 var customIcons = {
   1: React__default.createElement(icons.FrownOutlined, null),
@@ -904,8 +917,8 @@ function OdsRate(props) {
   }, React__default.createElement(StyledRate, Object.assign({}, props))));
 }
 
-var _templateObject$e;
-var StyledSelect = styled__default(antd.Select)(_templateObject$e || (_templateObject$e = _taggedTemplateLiteralLoose(["\n  width: 100%;\n"])));
+var _templateObject$f;
+var StyledSelect = styled__default(antd.Select)(_templateObject$f || (_templateObject$f = _taggedTemplateLiteralLoose(["\n  width: 100%;\n"])));
 
 var OdsMultiSelect = function OdsMultiSelect(props) {
   var options = props.options,
@@ -987,8 +1000,8 @@ function OdsSelect(props) {
   }, React__default.createElement(StyledSelect, Object.assign({}, props))));
 }
 
-var _templateObject$f;
-var StyledSpin = styled__default(antd.Spin)(_templateObject$f || (_templateObject$f = _taggedTemplateLiteralLoose(["\n //\n"])));
+var _templateObject$g;
+var StyledSpin = styled__default(antd.Spin)(_templateObject$g || (_templateObject$g = _taggedTemplateLiteralLoose(["\n //\n"])));
 
 function OdsSpin(props) {
   var _useState = React.useState(true),
@@ -998,8 +1011,8 @@ function OdsSpin(props) {
   }), props.children));
 }
 
-var _templateObject$g;
-var StyledSwitch = styled__default(antd.Switch)(_templateObject$g || (_templateObject$g = _taggedTemplateLiteralLoose(["\n //\n"])));
+var _templateObject$h;
+var StyledSwitch = styled__default(antd.Switch)(_templateObject$h || (_templateObject$h = _taggedTemplateLiteralLoose(["\n //\n"])));
 
 function OdsSwitch(props) {
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(styled.ThemeProvider, {
@@ -1007,8 +1020,8 @@ function OdsSwitch(props) {
   }, React__default.createElement(StyledSwitch, Object.assign({}, props))));
 }
 
-var _templateObject$h;
-var StyledTabs = styled__default(antd.Tabs)(_templateObject$h || (_templateObject$h = _taggedTemplateLiteralLoose(["\n //\n"])));
+var _templateObject$i;
+var StyledTabs = styled__default(antd.Tabs)(_templateObject$i || (_templateObject$i = _taggedTemplateLiteralLoose(["\n //\n"])));
 
 function OdsTab(props) {
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(styled.ThemeProvider, {
@@ -1016,8 +1029,8 @@ function OdsTab(props) {
   }, React__default.createElement(StyledTabs, Object.assign({}, props))));
 }
 
-var _templateObject$i;
-var StyledTable = styled__default(antd.Table)(_templateObject$i || (_templateObject$i = _taggedTemplateLiteralLoose(["\n  //\n"])));
+var _templateObject$j;
+var StyledTable = styled__default(antd.Table)(_templateObject$j || (_templateObject$j = _taggedTemplateLiteralLoose(["\n  //\n"])));
 
 function OdsBasicTable(props) {
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(StyledTable, Object.assign({}, props)));
@@ -1037,8 +1050,8 @@ function OdsSelectableTable(props) {
   })));
 }
 
-var _templateObject$j;
-var StyledTag = styled__default(antd.Tag)(_templateObject$j || (_templateObject$j = _taggedTemplateLiteralLoose(["\n //\n"])));
+var _templateObject$k;
+var StyledTag = styled__default(antd.Tag)(_templateObject$k || (_templateObject$k = _taggedTemplateLiteralLoose(["\n //\n"])));
 
 function OdsTag(props) {
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(styled.ThemeProvider, {
@@ -1046,15 +1059,15 @@ function OdsTag(props) {
   }, React__default.createElement(StyledTag, Object.assign({}, props), props.children)));
 }
 
-var _templateObject$k;
-var StyledtTimeline = styled__default(antd.Timeline)(_templateObject$k || (_templateObject$k = _taggedTemplateLiteralLoose(["\n //\n"])));
+var _templateObject$l;
+var StyledtTimeline = styled__default(antd.Timeline)(_templateObject$l || (_templateObject$l = _taggedTemplateLiteralLoose(["\n //\n"])));
 
 function OdsTimeline(props) {
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(StyledtTimeline, Object.assign({}, props), props.children));
 }
 
-var _templateObject$l;
-var StyledTimepicker = styled__default(antd.TimePicker)(_templateObject$l || (_templateObject$l = _taggedTemplateLiteralLoose(["\n  width:100%;\n"])));
+var _templateObject$m;
+var StyledTimepicker = styled__default(antd.TimePicker)(_templateObject$m || (_templateObject$m = _taggedTemplateLiteralLoose(["\n  width:100%;\n"])));
 
 var _excluded = ["enableSeconds"];
 function OdsRangeTimepicker(props) {
@@ -1089,8 +1102,8 @@ var OdsTimepicker = function OdsTimepicker(props) {
   }));
 };
 
-var _templateObject$m, _templateObject2, _templateObject3;
-var StyledtTypography = styled__default(antd.Typography)(_templateObject$m || (_templateObject$m = _taggedTemplateLiteralLoose(["\n //\n"])));
+var _templateObject$n, _templateObject2, _templateObject3;
+var StyledtTypography = styled__default(antd.Typography)(_templateObject$n || (_templateObject$n = _taggedTemplateLiteralLoose(["\n //\n"])));
 var StyledtTypographyParagraph = styled__default(antd.Typography.Paragraph)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteralLoose(["\n //\n"])));
 var StyledtTypographyLink = styled__default(antd.Typography.Link)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteralLoose(["\n  // \n"])));
 
@@ -47469,13 +47482,15 @@ if (process.env.NODE_ENV === 'production') {
 }
 });
 
-var exportFormats$2 = ['xlsx'];
+var exportFormats$2 = ["xlsx"];
 var totalPageCount = 1;
 var loadedPageCount = 1;
 var totalRecordCount = 0;
 var useToken$1 = antd.theme.useToken;
 var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   var _props$axiosRequest4, _props$axiosRequest5, _props$axiosRequest6, _props$axiosRequest7, _props$axiosRequest8, _props$axiosRequest9, _props$axiosRequest10, _props$axiosRequest11, _props$selectOptions, _props$selectOptions$, _props$selectOptions2, _props$selectOptions$2, _props$selectOptions3;
+  var _props$showKebabMenu = props.showKebabMenu,
+    showKebabMenu = _props$showKebabMenu === void 0 ? false : _props$showKebabMenu;
   var _useToken = useToken$1(),
     token = _useToken.token;
   var _useState = React.useState([]),
@@ -47497,16 +47512,16 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   var _useState5 = React.useState(0),
     scrollPosition = _useState5[0],
     setScrollPosition = _useState5[1];
-  var onCancelEditEvent = new CustomEvent('cancelEdit', {
+  var onCancelEditEvent = new CustomEvent("cancelEdit", {
     bubbles: true,
     detail: {
       rowData: null
     }
   });
   var headers = new Headers({
-    'Content-Type': 'application/json',
-    'Authorization': 'Bearer ' + (props.axiosRequest ? props.axiosRequest.token : ""),
-    "Accept-Language": props.language != "" ? props.language : 'EN'
+    "Content-Type": "application/json",
+    Authorization: "Bearer " + (props.axiosRequest ? props.axiosRequest.token : ""),
+    "Accept-Language": props.language != "" ? props.language : "EN"
   });
   React.useEffect(function () {
     totalPageCount = 1;
@@ -47568,7 +47583,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     var checkData = function checkData() {
       if (gridRef.current) {
         var _dataGridInstance = gridRef.current.instance;
-        var dataExists = data.length > 0;
+        var dataExists = data.length >= 15;
         var gridElement = _dataGridInstance.element();
         if (dataExists) {
           gridElement.classList.add('data-exists');
@@ -47601,7 +47616,6 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
       var sortedColumn = sortingState.find(function (column) {
         return column.sortOrder !== undefined;
       });
-      console.log("sorted column", sortedColumn);
       if (sortedColumn) {
         if (sortedColumn.sortOrder) {
           dataGridInstance.option("columns[" + sortedColumn.index + "].sortOrder", sortedColumn.sortOrder);
@@ -47609,7 +47623,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
           var gridEvent = {
             component: dataGridInstance,
             fullName: fullName,
-            name: 'optionChanged',
+            name: "optionChanged",
             value: sortedColumn.sortOrder,
             previousValue: null,
             element: null
@@ -47621,11 +47635,11 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   };
   var checkRequestDataHasOnlySortingProperty = function checkRequestDataHasOnlySortingProperty(obj) {
     var keys = Object.keys(obj);
-    return keys.length === 1 && keys[0] === 'Sorting';
+    return keys.length === 1 && keys[0] === "Sorting";
   };
   var actionButtons = React.useMemo(function () {
     if (props.actionButtonGroup) {
-      if (props.actionButtonGroup.length >= 2 && !props.edit) {
+      if (showKebabMenu && props.actionButtonGroup.length >= 2 && !props.edit) {
         return props.actionButtonGroup.slice(0, 2);
       } else {
         return props.actionButtonGroup;
@@ -47688,7 +47702,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
                 });
               });
             }, function (error) {
-              console.error('Error fetching data:', error);
+              console.error("Error fetching data:", error);
               setLoading(false);
             });
           }, function (_wasThrown, _result) {
@@ -47708,7 +47722,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
       totalRecordCount = data.RowCount;
     } else {
       var totalCount;
-      if (response) totalCount = response.headers.get('x-total-count');
+      if (response) totalCount = response.headers.get("x-total-count");
       if (totalCount == null) totalCount = data === null || data === void 0 ? void 0 : data.rowCount;
       if (totalCount == null) totalCount = data === null || data === void 0 ? void 0 : data.length;
       totalRecordCount = parseInt(totalCount, 10) || 0;
@@ -47717,14 +47731,14 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     setLoading(false);
   };
   var onEditorPreparing = React.useCallback(function (e) {
-    if (e.row !== undefined && e.parentType === 'dataRow') {
+    if (e.row !== undefined && e.parentType === "dataRow") {
       if (props.handleEditorPreparing) {
         props.handleEditorPreparing(e);
       }
     }
-    if (e.editorOptions && e.rowType === 'data' && e.parentType === 'dataRow') {
+    if (e.editorOptions && e.rowType === "data" && e.parentType === "dataRow") {
       e.editorOptions.onValueChanged = function (args) {
-        if (args.event && args.event.type === 'cancel') e.cellElement.dispatchEvent(onCancelEditEvent);
+        if (args.event && args.event.type === "cancel") e.cellElement.dispatchEvent(onCancelEditEvent);
       };
     }
   }, [props.isServerSide]);
@@ -47745,7 +47759,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     }
   }, [totalPageCount]);
   var onExporting = React.useCallback(function (e) {
-    if (e.format === 'xlsx') {
+    if (e.format === "xlsx") {
       var workbook = new exceljs.Workbook();
       if (props.filterData != null) {
         var newColumnFromFilterData = props.filterData.map(function (filterItem) {
@@ -47761,21 +47775,21 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
       }
       excel_exporter.exportDataGrid({
         component: e.component,
-        worksheet: workbook.addWorksheet('Main sheet'),
+        worksheet: workbook.addWorksheet("Main sheet"),
         autoFilterEnabled: true,
         customizeCell: function customizeCell(options) {
           var gridCell = options.gridCell,
             excelCell = options.excelCell;
           if (gridCell.column.dataType === "datetime" && gridCell.value) {
             var _gridCell$column$calc, _gridCell$column$meta;
-            if (((_gridCell$column$calc = gridCell.column.calculateFilterExpression) === null || _gridCell$column$calc === void 0 ? void 0 : _gridCell$column$calc.name) === "calculateFilterExpressionForColumn" && (_gridCell$column$meta = gridCell.column['meta']) !== null && _gridCell$column$meta !== void 0 && _gridCell$column$meta.hasCustomCellRenderer) {
+            if (((_gridCell$column$calc = gridCell.column.calculateFilterExpression) === null || _gridCell$column$calc === void 0 ? void 0 : _gridCell$column$calc.name) === "calculateFilterExpressionForColumn" && (_gridCell$column$meta = gridCell.column["meta"]) !== null && _gridCell$column$meta !== void 0 && _gridCell$column$meta.hasCustomCellRenderer) {
               var date = moment(gridCell.value);
               var offsetMinutes = date.utcOffset();
-              var sign = offsetMinutes >= 0 ? '+' : '-';
+              var sign = offsetMinutes >= 0 ? "+" : "-";
               var hours = Math.floor(Math.abs(offsetMinutes) / 60);
               var minutes = Math.abs(offsetMinutes) % 60;
-              var formattedOffset = "(UTC" + sign + hours.toString().padStart(2, '0') + ":" + minutes.toString().padStart(2, '0') + ")";
-              var formattedDate = date.format('DD.MM.YYYY HH:mm') + " " + formattedOffset;
+              var formattedOffset = "(UTC" + sign + hours.toString().padStart(2, "0") + ":" + minutes.toString().padStart(2, "0") + ")";
+              var formattedDate = date.format("DD.MM.YYYY HH:mm") + " " + formattedOffset;
               excelCell.value = formattedDate;
             }
           }
@@ -47833,7 +47847,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     localStorage.setItem(props.exportFileName + "Storage", JSON.stringify(state));
   }, [props.filterEnabledShow]);
   var onEditorPrepared = React.useCallback(function (info) {
-    if (info.parentType === 'filterRow' && info.editorName === "dxSelectBox" && info.dataField === "IsActive") {
+    if (info.parentType === "filterRow" && info.editorName === "dxSelectBox" && info.dataField === "IsActive") {
       if (info.dataSource != null && info.dataSource.length > 0) {
         info.showAllText = info.dataSource.find(function (i) {
           return i.value === null;
@@ -47878,7 +47892,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   var actionCellRender = React.useMemo(function () {
     return React__default.createElement(devextremeReact.DropDownButton, {
       icon: server_browser.renderToString(React__default.createElement(DynamicIcon, {
-        iconName: 'kebabMenu'
+        iconName: "kebabMenu"
       })),
       dataSource: kebabMenuButtons,
       onItemClick: function onItemClick(e) {
@@ -47912,12 +47926,12 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     gridElement.scrollTop = scrollPosition;
   }, [data.length]);
   React.useEffect(function () {
-    document.querySelectorAll('.dx-scrollable-container').forEach(function (container) {
-      container.addEventListener('scrollend', handleScroll);
+    document.querySelectorAll(".dx-scrollable-container").forEach(function (container) {
+      container.addEventListener("scrollend", handleScroll);
     });
     return function () {
-      document.querySelectorAll('.dx-scrollable-container').forEach(function (container) {
-        container.removeEventListener('scrollend', handleScroll);
+      document.querySelectorAll(".dx-scrollable-container").forEach(function (container) {
+        container.removeEventListener("scrollend", handleScroll);
       });
     };
   }, [data.length]);
@@ -48008,7 +48022,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     onContentReady: handleContentReady,
     onFilterValueChange: onFilterValueChange,
     onOptionChanged: props.onOptionChanged,
-    onToolbarPreparing: onToolbarPreparing
+    onToolbarPreparing: props.onToolbarPreparing || onToolbarPreparing
   }, columns.current.map(function (col) {
     return React__default.createElement(DataGrid.Column, Object.assign({
       key: col.dataField
@@ -48025,10 +48039,10 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     }), col.useDynamicHeaderFilter && React__default.createElement(DataGrid.HeaderFilter, {
       allowSearch: true,
       dataSource: [{
-        text: '(Blanks)',
+        text: "(Blanks)",
         value: null
       }].concat(data.filter(function (item) {
-        return item[col.dataField] !== null && item[col.dataField] !== undefined && item[col.dataField] !== '';
+        return item[col.dataField] !== null && item[col.dataField] !== undefined && item[col.dataField] !== "";
       }).map(function (item) {
         return {
           text: item[col.dataField].toString(),
@@ -48072,7 +48086,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
       })),
       onClick: buttonItem.onClick
     });
-  })), kebabMenuButtons.length > 0 && React__default.createElement(DataGrid.Column, {
+  })), showKebabMenu && kebabMenuButtons.length > 0 && React__default.createElement(DataGrid.Column, {
     dataField: "Actionss",
     fixed: true,
     allowSorting: false,
@@ -48176,8 +48190,8 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   })));
 };
 
-var _templateObject$n;
-var StyledBadge = styled__default(antd.Badge)(_templateObject$n || (_templateObject$n = _taggedTemplateLiteralLoose(["\n //\n"])));
+var _templateObject$o;
+var StyledBadge = styled__default(antd.Badge)(_templateObject$o || (_templateObject$o = _taggedTemplateLiteralLoose(["\n //\n"])));
 
 function OdsBadge(props) {
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(styled.ThemeProvider, {
@@ -48211,7 +48225,7 @@ exports.OdsCalendar = OdsCalendar;
 exports.OdsCard = OdsCard;
 exports.OdsCheckbox = OdsCheckbox;
 exports.OdsCheckboxGroup = OdsCheckboxGroup;
-exports.OdsCollapse = OdsDropdown;
+exports.OdsCollapse = OdsCollapse;
 exports.OdsDataGrid = OdsDataGrid;
 exports.OdsDateRangePicker = OdsDateRangePicker;
 exports.OdsDatepicker = OdsDatepicker;