ods-component-lib 1.18.229 → 1.18.231

package/dist/index.js

@@ -46,6 +46,37 @@ var antdStyle = require('antd-style');
 var FileSaver = require('file-saver');
 require('devextreme/dist/css/dx.light.css');
 
+function _toPrimitive(t, r) {
+  if ("object" != typeof t || !t) return t;
+  var e = t[Symbol.toPrimitive];
+  if (void 0 !== e) {
+    var i = e.call(t, r || "default");
+    if ("object" != typeof i) return i;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return ("string" === r ? String : Number)(t);
+}
+function _toPropertyKey(t) {
+  var i = _toPrimitive(t, "string");
+  return "symbol" == typeof i ? i : i + "";
+}
+function _defineProperties(target, props) {
+  for (var i = 0; i < props.length; i++) {
+    var descriptor = props[i];
+    descriptor.enumerable = descriptor.enumerable || false;
+    descriptor.configurable = true;
+    if ("value" in descriptor) descriptor.writable = true;
+    Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
+  }
+}
+function _createClass(Constructor, protoProps, staticProps) {
+  if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+  if (staticProps) _defineProperties(Constructor, staticProps);
+  Object.defineProperty(Constructor, "prototype", {
+    writable: false
+  });
+  return Constructor;
+}
 function _extends() {
   _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
@@ -37729,12 +37760,12 @@ var CurrencySelect = function CurrencySelect(_ref) {
   }));
 };
 
-var _excluded$7 = ["currencySelectProps", "defaultValue", "locale", "dontFormatValue", "min"];
+var _excluded$7 = ["currencySelectProps", "defaultValue", "locale", "dontFormatValue", "min", "asPercentage", "isOnRight"];
 var _templateObject$z;
 var useStyles$9 = antdStyle.createStyles(function (_ref) {
   var css = _ref.css;
   return {
-    Wrapper: css(_templateObject$z || (_templateObject$z = _taggedTemplateLiteralLoose(["\n        width: 100%;\n    "])))
+    Wrapper: css(_templateObject$z || (_templateObject$z = _taggedTemplateLiteralLoose(["\n    width: 100%;\n  "])))
   };
 });
 var OdsCurrencyInput = function OdsCurrencyInput(_ref2) {
@@ -37742,10 +37773,12 @@ var OdsCurrencyInput = function OdsCurrencyInput(_ref2) {
     _ref2$defaultValue = _ref2.defaultValue,
     defaultValue = _ref2$defaultValue === void 0 ? "" : _ref2$defaultValue,
     _ref2$locale = _ref2.locale,
-    locale = _ref2$locale === void 0 ? 'tr-TR' : _ref2$locale,
+    locale = _ref2$locale === void 0 ? "tr-TR" : _ref2$locale,
     dontFormatValue = _ref2.dontFormatValue,
     _ref2$min = _ref2.min,
     min = _ref2$min === void 0 ? 0 : _ref2$min,
+    asPercentage = _ref2.asPercentage,
+    isOnRight = _ref2.isOnRight,
     props = _objectWithoutPropertiesLoose(_ref2, _excluded$7);
   var _useStyles = useStyles$9(),
     styles = _useStyles.styles;
@@ -37756,6 +37789,9 @@ var OdsCurrencyInput = function OdsCurrencyInput(_ref2) {
     });
   }, [currencySelectProps]);
   var currencySelector = React.useMemo(function () {
+    if (asPercentage) {
+      return "%";
+    }
     if (!currencySelectProps || !currencySelectProps.currencyOptions || currencySelectProps.currencyOptions.length === 0) {
       return undefined;
     } else if (currencySelectProps.fixedCurrency) {
@@ -37775,7 +37811,8 @@ var OdsCurrencyInput = function OdsCurrencyInput(_ref2) {
   }, React__default.createElement(antd.InputNumber, Object.assign({
     defaultValue: defaultValue,
     min: min,
-    addonBefore: currencySelector,
+    addonBefore: !isOnRight && currencySelector,
+    addonAfter: isOnRight && currencySelector,
     value: props.value,
     className: styles.Wrapper,
     onChange: function onChange(value) {
@@ -37795,9 +37832,1041 @@ var formatValue = function formatValue(value, locale) {
 };
 var parseValue = function parseValue(stringNumber, locale) {
   if (!stringNumber) return stringNumber;
-  var thousandSeparator = Intl.NumberFormat(locale).format(11111).replace(/(?:[0-9\xB2\xB3\xB9\xBC-\xBE\u0660-\u0669\u06F0-\u06F9\u07C0-\u07C9\u0966-\u096F\u09E6-\u09EF\u09F4-\u09F9\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F\u0B72-\u0B77\u0BE6-\u0BF2\u0C66-\u0C6F\u0C78-\u0C7E\u0CE6-\u0CEF\u0D58-\u0D5E\u0D66-\u0D78\u0DE6-\u0DEF\u0E50-\u0E59\u0ED0-\u0ED9\u0F20-\u0F33\u1040-\u1049\u1090-\u1099\u1369-\u137C\u16EE-\u16F0\u17E0-\u17E9\u17F0-\u17F9\u1810-\u1819\u1946-\u194F\u19D0-\u19DA\u1A80-\u1A89\u1A90-\u1A99\u1B50-\u1B59\u1BB0-\u1BB9\u1C40-\u1C49\u1C50-\u1C59\u2070\u2074-\u2079\u2080-\u2089\u2150-\u2182\u2185-\u2189\u2460-\u249B\u24EA-\u24FF\u2776-\u2793\u2CFD\u3007\u3021-\u3029\u3038-\u303A\u3192-\u3195\u3220-\u3229\u3248-\u324F\u3251-\u325F\u3280-\u3289\u32B1-\u32BF\uA620-\uA629\uA6E6-\uA6EF\uA830-\uA835\uA8D0-\uA8D9\uA900-\uA909\uA9D0-\uA9D9\uA9F0-\uA9F9\uAA50-\uAA59\uABF0-\uABF9\uFF10-\uFF19]|\uD800[\uDD07-\uDD33\uDD40-\uDD78\uDD8A\uDD8B\uDEE1-\uDEFB\uDF20-\uDF23\uDF41\uDF4A\uDFD1-\uDFD5]|\uD801[\uDCA0-\uDCA9]|\uD802[\uDC58-\uDC5F\uDC79-\uDC7F\uDCA7-\uDCAF\uDCFB-\uDCFF\uDD16-\uDD1B\uDDBC\uDDBD\uDDC0-\uDDCF\uDDD2-\uDDFF\uDE40-\uDE48\uDE7D\uDE7E\uDE9D-\uDE9F\uDEEB-\uDEEF\uDF58-\uDF5F\uDF78-\uDF7F\uDFA9-\uDFAF]|\uD803[\uDCFA-\uDCFF\uDD30-\uDD39\uDE60-\uDE7E\uDF1D-\uDF26\uDF51-\uDF54\uDFC5-\uDFCB]|\uD804[\uDC52-\uDC6F\uDCF0-\uDCF9\uDD36-\uDD3F\uDDD0-\uDDD9\uDDE1-\uDDF4\uDEF0-\uDEF9]|\uD805[\uDC50-\uDC59\uDCD0-\uDCD9\uDE50-\uDE59\uDEC0-\uDEC9\uDF30-\uDF3B]|\uD806[\uDCE0-\uDCF2\uDD50-\uDD59]|\uD807[\uDC50-\uDC6C\uDD50-\uDD59\uDDA0-\uDDA9\uDF50-\uDF59\uDFC0-\uDFD4]|\uD809[\uDC00-\uDC6E]|\uD81A[\uDE60-\uDE69\uDEC0-\uDEC9\uDF50-\uDF59\uDF5B-\uDF61]|\uD81B[\uDE80-\uDE96]|\uD834[\uDEC0-\uDED3\uDEE0-\uDEF3\uDF60-\uDF78]|\uD835[\uDFCE-\uDFFF]|\uD838[\uDD40-\uDD49\uDEF0-\uDEF9]|\uD839[\uDCF0-\uDCF9]|\uD83A[\uDCC7-\uDCCF\uDD50-\uDD59]|\uD83B[\uDC71-\uDCAB\uDCAD-\uDCAF\uDCB1-\uDCB4\uDD01-\uDD2D\uDD2F-\uDD3D]|\uD83C[\uDD00-\uDD0C]|\uD83E[\uDFF0-\uDFF9])/g, '');
-  var decimalSeparator = Intl.NumberFormat(locale).format(1.1).replace(/(?:[0-9\xB2\xB3\xB9\xBC-\xBE\u0660-\u0669\u06F0-\u06F9\u07C0-\u07C9\u0966-\u096F\u09E6-\u09EF\u09F4-\u09F9\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F\u0B72-\u0B77\u0BE6-\u0BF2\u0C66-\u0C6F\u0C78-\u0C7E\u0CE6-\u0CEF\u0D58-\u0D5E\u0D66-\u0D78\u0DE6-\u0DEF\u0E50-\u0E59\u0ED0-\u0ED9\u0F20-\u0F33\u1040-\u1049\u1090-\u1099\u1369-\u137C\u16EE-\u16F0\u17E0-\u17E9\u17F0-\u17F9\u1810-\u1819\u1946-\u194F\u19D0-\u19DA\u1A80-\u1A89\u1A90-\u1A99\u1B50-\u1B59\u1BB0-\u1BB9\u1C40-\u1C49\u1C50-\u1C59\u2070\u2074-\u2079\u2080-\u2089\u2150-\u2182\u2185-\u2189\u2460-\u249B\u24EA-\u24FF\u2776-\u2793\u2CFD\u3007\u3021-\u3029\u3038-\u303A\u3192-\u3195\u3220-\u3229\u3248-\u324F\u3251-\u325F\u3280-\u3289\u32B1-\u32BF\uA620-\uA629\uA6E6-\uA6EF\uA830-\uA835\uA8D0-\uA8D9\uA900-\uA909\uA9D0-\uA9D9\uA9F0-\uA9F9\uAA50-\uAA59\uABF0-\uABF9\uFF10-\uFF19]|\uD800[\uDD07-\uDD33\uDD40-\uDD78\uDD8A\uDD8B\uDEE1-\uDEFB\uDF20-\uDF23\uDF41\uDF4A\uDFD1-\uDFD5]|\uD801[\uDCA0-\uDCA9]|\uD802[\uDC58-\uDC5F\uDC79-\uDC7F\uDCA7-\uDCAF\uDCFB-\uDCFF\uDD16-\uDD1B\uDDBC\uDDBD\uDDC0-\uDDCF\uDDD2-\uDDFF\uDE40-\uDE48\uDE7D\uDE7E\uDE9D-\uDE9F\uDEEB-\uDEEF\uDF58-\uDF5F\uDF78-\uDF7F\uDFA9-\uDFAF]|\uD803[\uDCFA-\uDCFF\uDD30-\uDD39\uDE60-\uDE7E\uDF1D-\uDF26\uDF51-\uDF54\uDFC5-\uDFCB]|\uD804[\uDC52-\uDC6F\uDCF0-\uDCF9\uDD36-\uDD3F\uDDD0-\uDDD9\uDDE1-\uDDF4\uDEF0-\uDEF9]|\uD805[\uDC50-\uDC59\uDCD0-\uDCD9\uDE50-\uDE59\uDEC0-\uDEC9\uDF30-\uDF3B]|\uD806[\uDCE0-\uDCF2\uDD50-\uDD59]|\uD807[\uDC50-\uDC6C\uDD50-\uDD59\uDDA0-\uDDA9\uDF50-\uDF59\uDFC0-\uDFD4]|\uD809[\uDC00-\uDC6E]|\uD81A[\uDE60-\uDE69\uDEC0-\uDEC9\uDF50-\uDF59\uDF5B-\uDF61]|\uD81B[\uDE80-\uDE96]|\uD834[\uDEC0-\uDED3\uDEE0-\uDEF3\uDF60-\uDF78]|\uD835[\uDFCE-\uDFFF]|\uD838[\uDD40-\uDD49\uDEF0-\uDEF9]|\uD839[\uDCF0-\uDCF9]|\uD83A[\uDCC7-\uDCCF\uDD50-\uDD59]|\uD83B[\uDC71-\uDCAB\uDCAD-\uDCAF\uDCB1-\uDCB4\uDD01-\uDD2D\uDD2F-\uDD3D]|\uD83C[\uDD00-\uDD0C]|\uD83E[\uDFF0-\uDFF9])/g, '');
-  return parseFloat(stringNumber.replace(new RegExp('\\' + thousandSeparator, 'g'), '').replace(new RegExp('\\' + decimalSeparator), '.'));
+  var thousandSeparator = Intl.NumberFormat(locale).format(11111).replace(/(?:[0-9\xB2\xB3\xB9\xBC-\xBE\u0660-\u0669\u06F0-\u06F9\u07C0-\u07C9\u0966-\u096F\u09E6-\u09EF\u09F4-\u09F9\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F\u0B72-\u0B77\u0BE6-\u0BF2\u0C66-\u0C6F\u0C78-\u0C7E\u0CE6-\u0CEF\u0D58-\u0D5E\u0D66-\u0D78\u0DE6-\u0DEF\u0E50-\u0E59\u0ED0-\u0ED9\u0F20-\u0F33\u1040-\u1049\u1090-\u1099\u1369-\u137C\u16EE-\u16F0\u17E0-\u17E9\u17F0-\u17F9\u1810-\u1819\u1946-\u194F\u19D0-\u19DA\u1A80-\u1A89\u1A90-\u1A99\u1B50-\u1B59\u1BB0-\u1BB9\u1C40-\u1C49\u1C50-\u1C59\u2070\u2074-\u2079\u2080-\u2089\u2150-\u2182\u2185-\u2189\u2460-\u249B\u24EA-\u24FF\u2776-\u2793\u2CFD\u3007\u3021-\u3029\u3038-\u303A\u3192-\u3195\u3220-\u3229\u3248-\u324F\u3251-\u325F\u3280-\u3289\u32B1-\u32BF\uA620-\uA629\uA6E6-\uA6EF\uA830-\uA835\uA8D0-\uA8D9\uA900-\uA909\uA9D0-\uA9D9\uA9F0-\uA9F9\uAA50-\uAA59\uABF0-\uABF9\uFF10-\uFF19]|\uD800[\uDD07-\uDD33\uDD40-\uDD78\uDD8A\uDD8B\uDEE1-\uDEFB\uDF20-\uDF23\uDF41\uDF4A\uDFD1-\uDFD5]|\uD801[\uDCA0-\uDCA9]|\uD802[\uDC58-\uDC5F\uDC79-\uDC7F\uDCA7-\uDCAF\uDCFB-\uDCFF\uDD16-\uDD1B\uDDBC\uDDBD\uDDC0-\uDDCF\uDDD2-\uDDFF\uDE40-\uDE48\uDE7D\uDE7E\uDE9D-\uDE9F\uDEEB-\uDEEF\uDF58-\uDF5F\uDF78-\uDF7F\uDFA9-\uDFAF]|\uD803[\uDCFA-\uDCFF\uDD30-\uDD39\uDE60-\uDE7E\uDF1D-\uDF26\uDF51-\uDF54\uDFC5-\uDFCB]|\uD804[\uDC52-\uDC6F\uDCF0-\uDCF9\uDD36-\uDD3F\uDDD0-\uDDD9\uDDE1-\uDDF4\uDEF0-\uDEF9]|\uD805[\uDC50-\uDC59\uDCD0-\uDCD9\uDE50-\uDE59\uDEC0-\uDEC9\uDF30-\uDF3B]|\uD806[\uDCE0-\uDCF2\uDD50-\uDD59]|\uD807[\uDC50-\uDC6C\uDD50-\uDD59\uDDA0-\uDDA9\uDF50-\uDF59\uDFC0-\uDFD4]|\uD809[\uDC00-\uDC6E]|\uD81A[\uDE60-\uDE69\uDEC0-\uDEC9\uDF50-\uDF59\uDF5B-\uDF61]|\uD81B[\uDE80-\uDE96]|\uD834[\uDEC0-\uDED3\uDEE0-\uDEF3\uDF60-\uDF78]|\uD835[\uDFCE-\uDFFF]|\uD838[\uDD40-\uDD49\uDEF0-\uDEF9]|\uD839[\uDCF0-\uDCF9]|\uD83A[\uDCC7-\uDCCF\uDD50-\uDD59]|\uD83B[\uDC71-\uDCAB\uDCAD-\uDCAF\uDCB1-\uDCB4\uDD01-\uDD2D\uDD2F-\uDD3D]|\uD83C[\uDD00-\uDD0C]|\uD83E[\uDFF0-\uDFF9])/g, "");
+  var decimalSeparator = Intl.NumberFormat(locale).format(1.1).replace(/(?:[0-9\xB2\xB3\xB9\xBC-\xBE\u0660-\u0669\u06F0-\u06F9\u07C0-\u07C9\u0966-\u096F\u09E6-\u09EF\u09F4-\u09F9\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F\u0B72-\u0B77\u0BE6-\u0BF2\u0C66-\u0C6F\u0C78-\u0C7E\u0CE6-\u0CEF\u0D58-\u0D5E\u0D66-\u0D78\u0DE6-\u0DEF\u0E50-\u0E59\u0ED0-\u0ED9\u0F20-\u0F33\u1040-\u1049\u1090-\u1099\u1369-\u137C\u16EE-\u16F0\u17E0-\u17E9\u17F0-\u17F9\u1810-\u1819\u1946-\u194F\u19D0-\u19DA\u1A80-\u1A89\u1A90-\u1A99\u1B50-\u1B59\u1BB0-\u1BB9\u1C40-\u1C49\u1C50-\u1C59\u2070\u2074-\u2079\u2080-\u2089\u2150-\u2182\u2185-\u2189\u2460-\u249B\u24EA-\u24FF\u2776-\u2793\u2CFD\u3007\u3021-\u3029\u3038-\u303A\u3192-\u3195\u3220-\u3229\u3248-\u324F\u3251-\u325F\u3280-\u3289\u32B1-\u32BF\uA620-\uA629\uA6E6-\uA6EF\uA830-\uA835\uA8D0-\uA8D9\uA900-\uA909\uA9D0-\uA9D9\uA9F0-\uA9F9\uAA50-\uAA59\uABF0-\uABF9\uFF10-\uFF19]|\uD800[\uDD07-\uDD33\uDD40-\uDD78\uDD8A\uDD8B\uDEE1-\uDEFB\uDF20-\uDF23\uDF41\uDF4A\uDFD1-\uDFD5]|\uD801[\uDCA0-\uDCA9]|\uD802[\uDC58-\uDC5F\uDC79-\uDC7F\uDCA7-\uDCAF\uDCFB-\uDCFF\uDD16-\uDD1B\uDDBC\uDDBD\uDDC0-\uDDCF\uDDD2-\uDDFF\uDE40-\uDE48\uDE7D\uDE7E\uDE9D-\uDE9F\uDEEB-\uDEEF\uDF58-\uDF5F\uDF78-\uDF7F\uDFA9-\uDFAF]|\uD803[\uDCFA-\uDCFF\uDD30-\uDD39\uDE60-\uDE7E\uDF1D-\uDF26\uDF51-\uDF54\uDFC5-\uDFCB]|\uD804[\uDC52-\uDC6F\uDCF0-\uDCF9\uDD36-\uDD3F\uDDD0-\uDDD9\uDDE1-\uDDF4\uDEF0-\uDEF9]|\uD805[\uDC50-\uDC59\uDCD0-\uDCD9\uDE50-\uDE59\uDEC0-\uDEC9\uDF30-\uDF3B]|\uD806[\uDCE0-\uDCF2\uDD50-\uDD59]|\uD807[\uDC50-\uDC6C\uDD50-\uDD59\uDDA0-\uDDA9\uDF50-\uDF59\uDFC0-\uDFD4]|\uD809[\uDC00-\uDC6E]|\uD81A[\uDE60-\uDE69\uDEC0-\uDEC9\uDF50-\uDF59\uDF5B-\uDF61]|\uD81B[\uDE80-\uDE96]|\uD834[\uDEC0-\uDED3\uDEE0-\uDEF3\uDF60-\uDF78]|\uD835[\uDFCE-\uDFFF]|\uD838[\uDD40-\uDD49\uDEF0-\uDEF9]|\uD839[\uDCF0-\uDCF9]|\uD83A[\uDCC7-\uDCCF\uDD50-\uDD59]|\uD83B[\uDC71-\uDCAB\uDCAD-\uDCAF\uDCB1-\uDCB4\uDD01-\uDD2D\uDD2F-\uDD3D]|\uD83C[\uDD00-\uDD0C]|\uD83E[\uDFF0-\uDFF9])/g, "");
+  return parseFloat(stringNumber.replace(new RegExp("\\" + thousandSeparator, "g"), "").replace(new RegExp("\\" + decimalSeparator), "."));
+};
+
+var _templateObject$A, _templateObject2$8, _templateObject3$5, _templateObject4$4;
+var useStyles$a = antdStyle.createStyles(function (_ref) {
+  var css = _ref.css;
+  return {
+    grid: css(_templateObject$A || (_templateObject$A = _taggedTemplateLiteralLoose(["\n    & .grid-cell-selected {\n      background-color: lightgreen;\n    }\n    & .grid-cell-disable-text-selection {\n      -webkit-touch-callout: none;\n      -webkit-user-select: none;\n      -khtml-user-select: none;\n      -moz-user-select: none;\n      -ms-user-select: none;\n      user-select: none;\n    }\n    & .grid-cell-disable-colored {\n      background-color: lightgray;\n    }\n    & .grid-summary-row-label {\n      font-weight: 900;\n      /* border-bottom: 1px solid lightgray; */\n    }\n    & .grid-summary-row-data {\n      /* border-bottom: 1px solid lightgray; */\n    }\n    & .grid-toolbar-button-item {\n      padding: 0 !important;\n    }\n  "]))),
+    gridCustomSummary: css(_templateObject2$8 || (_templateObject2$8 = _taggedTemplateLiteralLoose(["\n    background-color: rgb(255, 255, 255);\n    border-radius: 0px 0px 16px 16px;\n    font-size: 13px;\n    text-align: unset;\n    padding: 17px 16px 3px 15px;\n    font-weight: 600;\n    border-top: 1px solid #ededed;\n  "]))),
+    mergeCellChild: css(_templateObject3$5 || (_templateObject3$5 = _taggedTemplateLiteralLoose(["\n    display: none;\n  "]))),
+    mergeCellRoot: css(_templateObject4$4 || (_templateObject4$4 = _taggedTemplateLiteralLoose(["\n    text-align: left;\n    vertical-align: middle;\n  "])))
+  };
+});
+
+var checkCellSelectionConstraints$1 = function checkCellSelectionConstraints(e) {
+  return e.rowType == "data" && e.columnIndex > -1 && e.rowIndex > -1;
+};
+var cellAlreadySelected$1 = function cellAlreadySelected(pkValue, dataField, cellInfos) {
+  return cellInfos.some(function (cell) {
+    return cell.pkValue == pkValue && cell.dataField == dataField;
+  });
+};
+var getMultiLevelColumns$1 = function getMultiLevelColumns(col) {
+  return col.multiLevelColumns && col.multiLevelColumns.map(function (colItem) {
+    return React__default.createElement(DataGrid.Column, Object.assign({
+      width: 80
+    }, colItem), getMultiLevelColumns(colItem));
+  });
+};
+
+var constants$2 = {
+  totalPageCount: 1,
+  loadedPageCount: 1,
+  totalRecordCount: 0,
+  exportFormats: ["xlsx"],
+  selectedCellBgColor: "#c1f9b8",
+  allowedDataTypesForMultiCellEditing: ["number"]
+};
+var onCancelEditEvent$1 = new CustomEvent("cancelEdit", {
+  bubbles: true,
+  detail: {
+    rowData: null
+  }
+});
+var dataFieldNameActions = "Actions";
+
+var OdsMergeCellDataGridHelper = /*#__PURE__*/function () {
+  function OdsMergeCellDataGridHelper() {
+    var _this = this;
+    this.sortDataSource = function () {
+      var _this$_dataSource;
+      if (_this._mergeDataFields && _this._mergeDataFields.length > 0 && ((_this$_dataSource = _this._dataSource) === null || _this$_dataSource === void 0 ? void 0 : _this$_dataSource.length) > 0) {
+        var compareResults = [];
+        var conditionString = "";
+        _this._dataSource = _this._dataSource.sort(function (a, b) {
+          compareResults = _this._mergeDataFields.map(function (dataField) {
+            return _this.compareData(a[dataField], b[dataField], _this.getDataType(dataField));
+          });
+          conditionString = compareResults.join("||");
+          return eval(conditionString);
+        });
+      }
+      return _this._dataSource;
+    };
+    this.compareData = function (value1, value2, dataType) {
+      switch (dataType) {
+        case "string":
+          return String(value1).localeCompare(String(value2));
+        case "number":
+          return Number(value2) - Number(value1);
+        default:
+          return 0;
+      }
+    };
+    this.getDataType = function (dataField) {
+      var column = _this._columns.find(function (x) {
+        return x.dataField == dataField;
+      });
+      return column === null || column === void 0 ? void 0 : column.dataType;
+    };
+    this.mergeDataSource = function (keyExpr) {
+      var _this$_dataSource2;
+      var mergedCells = [];
+      if (_this._mergeDataFields && _this._mergeDataFields.length > 0 && ((_this$_dataSource2 = _this._dataSource) === null || _this$_dataSource2 === void 0 ? void 0 : _this$_dataSource2.length) > 0) {
+        var keyName = Array.isArray(keyExpr) ? keyExpr[0] : keyExpr;
+        var rowCurrent;
+        var rowPrev;
+        var dataFieldCurrent;
+        var dataFieldNext;
+        var _loop = function _loop(index) {
+          rowCurrent = _this._dataSource[index];
+          rowPrev = _this._dataSource[index - 1];
+          for (var index1 = 0; index1 < _this._mergeDataFields.length; index1++) {
+            dataFieldCurrent = _this._mergeDataFields[index1];
+            if (rowCurrent[dataFieldCurrent] == rowPrev[dataFieldCurrent]) {
+              if (mergedCells.some(function (x) {
+                return x.FieldName == dataFieldCurrent && x.EndRowIndex == index - 1;
+              })) {
+                var cell = mergedCells.find(function (x) {
+                  return x.FieldName == dataFieldCurrent && x.EndRowIndex == index - 1;
+                });
+                cell.EndRowIndex = index;
+              } else {
+                mergedCells.push({
+                  FieldName: dataFieldCurrent,
+                  StartRowIndex: index - 1,
+                  EndRowIndex: index,
+                  StartKey: rowPrev[keyName],
+                  Type: "Original"
+                });
+              }
+            }
+          }
+        };
+        for (var index = 1; index < _this._dataSource.length; index++) {
+          _loop(index);
+        }
+        var newStartRowIndex = 0,
+          newEndRowIndex = 0,
+          keyValue;
+        for (var _index = 0; _index < _this._mergeDataFields.length - 1; _index++) {
+          dataFieldCurrent = _this._mergeDataFields[_index];
+          dataFieldNext = _this._mergeDataFields[_index + 1];
+          if (!mergedCells.some(function (item) {
+            return item.FieldName == dataFieldCurrent;
+          }) || !mergedCells.some(function (item) {
+            return item.FieldName == dataFieldCurrent && item.Type != "OutOfScope";
+          })) {
+            mergedCells.filter(function (item) {
+              return item.FieldName == dataFieldNext;
+            }).map(function (item) {
+              item.Type = "OutOfScope";
+              return item;
+            });
+          } else {
+            mergedCells.filter(function (x) {
+              return x.FieldName == dataFieldCurrent && x.Type != "OutOfScope";
+            }).map(function (item) {
+              mergedCells.filter(function (x) {
+                return x.FieldName == dataFieldNext && x.Type != "New" && x.Type != "Placed";
+              }).map(function (item1) {
+                newStartRowIndex = 0;
+                newEndRowIndex = 0;
+                if (item1.StartRowIndex < item.EndRowIndex && item1.EndRowIndex > item.StartRowIndex) {
+                  if (item1.StartRowIndex < item.StartRowIndex) {
+                    newStartRowIndex = item.StartRowIndex;
+                    item1.Type = "Dirty";
+                    keyValue = item.StartKey;
+                  } else {
+                    newStartRowIndex = item1.StartRowIndex;
+                    keyValue = item1.StartKey;
+                  }
+                  if (item1.EndRowIndex > item.EndRowIndex) {
+                    newEndRowIndex = item.EndRowIndex;
+                    item1.Type = "Dirty";
+                  } else {
+                    newEndRowIndex = item1.EndRowIndex;
+                  }
+                  if (item1.Type == "Dirty") {
+                    mergedCells.push({
+                      FieldName: dataFieldNext,
+                      StartRowIndex: newStartRowIndex,
+                      EndRowIndex: newEndRowIndex,
+                      StartKey: keyValue,
+                      Type: "New"
+                    });
+                  } else {
+                    item1.Type = "Placed";
+                  }
+                } else {
+                  item1.Type = "OutOfScope";
+                }
+              });
+            });
+          }
+        }
+        var _mergedCell = mergedCells.filter(function (x) {
+          return x.Type != "Dirty" && x.Type != "OutOfScope";
+        });
+        return _mergedCell;
+      }
+      return mergedCells;
+    };
+  }
+  return _createClass(OdsMergeCellDataGridHelper, [{
+    key: "mergeDataFields",
+    get: function get() {
+      return this._mergeDataFields;
+    },
+    set: function set(val) {
+      this._mergeDataFields = val;
+    }
+  }, {
+    key: "dataSource",
+    get: function get() {
+      return this._dataSource;
+    },
+    set: function set(val) {
+      this._dataSource = val;
+    }
+  }, {
+    key: "columns",
+    get: function get() {
+      return this._columns;
+    },
+    set: function set(val) {
+      this._columns = val;
+    }
+  }]);
+}();
+OdsMergeCellDataGridHelper.getInstance = function () {
+  if (OdsMergeCellDataGridHelper._instance === null || OdsMergeCellDataGridHelper._instance === undefined) {
+    return new OdsMergeCellDataGridHelper();
+  }
+  return OdsMergeCellDataGridHelper._instance;
+};
+
+var useToken$2 = antd.theme.useToken;
+var OdsMergeCellDataGrid = function OdsMergeCellDataGrid(props) {
+  var _props$columnResizing, _props$className, _props$selection, _props$selectOptions, _props$selectOptions$, _props$selectOptions2, _props$selectOptions$2, _props$selectOptions3;
+  var ref = props.ref,
+    keyExpr = props.keyExpr,
+    hasFastUpdate = props.hasFastUpdate,
+    fastUpdateButtonText = props.fastUpdateButtonText,
+    fastUpdateModalTitle = props.fastUpdateModalTitle,
+    fastUpdateModalCancelText = props.fastUpdateModalCancelText,
+    fastUpdateModalSaveText = props.fastUpdateModalSaveText,
+    fastUpdateFormRequiredFieldMessage = props.fastUpdateFormRequiredFieldMessage,
+    onCellClick = props.onCellClick,
+    onCellHoverChanged = props.onCellHoverChanged,
+    onFastUpdateButtonClick = props.onFastUpdateButtonClick,
+    onFastUpdateFinish = props.onFastUpdateFinish,
+    onFastUpdateCancel = props.onFastUpdateCancel,
+    onFastUpdateFailed = props.onFastUpdateFailed,
+    onCellPrepared = props.onCellPrepared,
+    detailGridColumns = props.detailGridColumns,
+    detailData = props.detailData,
+    masterDetailFeatures = props.masterDetailFeatures;
+  var _useToken = useToken$2(),
+    token = _useToken.token;
+  var _AntForm$useForm = antd.Form.useForm(),
+    fastUpdateForm = _AntForm$useForm[0];
+  var gridRef = ref != null ? ref : React.useRef(null);
+  var helper = OdsMergeCellDataGridHelper.getInstance();
+  var pkName = keyExpr && keyExpr.toString();
+  var _useState = React.useState(false),
+    render = _useState[0],
+    rerender = _useState[1];
+  var _useState2 = React.useState(props.columns),
+    gridColumns = _useState2[0],
+    setGridColumns = _useState2[1];
+  var _useState3 = React.useState([]),
+    data = _useState3[0],
+    setData = _useState3[1];
+  var _useState4 = React.useState(false),
+    isFastUpdateModalOpen = _useState4[0],
+    setIsFastUpdateModalOpen = _useState4[1];
+  var _useState5 = React.useState([]),
+    selectedCells = _useState5[0],
+    setSelectedCells = _useState5[1];
+  var _useState6 = React.useState([]),
+    hoveredCells = _useState6[0],
+    setHoveredCells = _useState6[1];
+  var _useState7 = React.useState([]),
+    ctrlSelectedCells = _useState7[0],
+    setCtrlSelectedCells = _useState7[1];
+  var _useState8 = React.useState(false),
+    ctrlSelection = _useState8[0],
+    setCtrlSelection = _useState8[1];
+  var _useState9 = React.useState([]),
+    mergedCellInfo = _useState9[0],
+    setMergedCellInfo = _useState9[1];
+  var _useStyles = useStyles$a(),
+    gridStyle = _useStyles.styles;
+  React.useEffect(function () {
+    helper.columns = props.columns;
+    helper.dataSource = props.dataSource;
+    helper.mergeDataFields = props.mergeDataFields;
+    helper.sortDataSource();
+    setMergedCellInfo(helper.mergeDataSource(props.keyExpr));
+    setData(helper.dataSource);
+  }, [props.dataSource]);
+  React.useEffect(function () {
+    constants$2.totalPageCount = 1;
+    constants$2.loadedPageCount = 1;
+    constants$2.totalRecordCount = 0;
+  }, [props.dataGridPageName]);
+  React.useEffect(function () {
+    if (props.columns !== undefined && props.columns.length > 0) {
+      var newColumns = props.columns.map(function (colItem) {
+        if (colItem.tooltip !== undefined && colItem.tooltip.enable) {
+          var headerCellRenderr = function headerCellRenderr() {
+            return React__default.createElement("div", null, React__default.createElement("span", null, colItem.caption), React__default.createElement(antd.Tooltip, {
+              title: colItem.tooltip.title
+            }, React__default.createElement(icons.InfoCircleOutlined, {
+              style: {
+                marginLeft: 5
+              }
+            })));
+          };
+          colItem.headerCellRender = headerCellRenderr;
+        }
+        if (props.isServerSide) colItem.calculateSortValue = String("dummyFieldForPreventClientSideSorting");
+        return colItem;
+      });
+      setGridColumns(newColumns);
+    }
+  }, [props.columns]);
+  React.useEffect(function () {
+    rerender(!render);
+  }, [gridColumns]);
+  React.useEffect(function () {
+    localization.locale(localStorage.getItem("locale"));
+    localization.loadMessages(JSON.parse(localStorage.getItem("localTranslation")));
+    if (gridRef.current) {
+      gridRef.current.instance.updateDimensions();
+    }
+    hasFastUpdate && document.addEventListener("keydown", keydownEvent);
+    return function () {
+      hasFastUpdate && document.removeEventListener("keydown", keydownEvent);
+    };
+  }, []);
+  var keydownEvent = function keydownEvent(e) {
+    switch (e.key) {
+      case "Escape":
+        {
+          clearSelectedCells();
+        }
+        break;
+    }
+  };
+  var clearSelectedCells = function clearSelectedCells() {
+    setSelectedCells([]);
+  };
+  var singleSelect = function singleSelect(pkValue, dataField) {
+    runSetSelectedCells([{
+      dataField: dataField,
+      pkValue: pkValue
+    }]);
+  };
+  var multipleSelect = function multipleSelect(cells) {
+    if (cells.length == 0) {
+      return;
+    }
+    var _cells = [];
+    var _loop = function _loop() {
+      var element = cells[index];
+      if (!_cells.some(function (cell) {
+        return cell.colIndex == element.colIndex && cell.rowIndex == element.rowIndex;
+      })) {
+        _cells.push({
+          colIndex: element.colIndex,
+          rowIndex: element.rowIndex
+        });
+      }
+    };
+    for (var index = 0; index < cells.length; index++) {
+      _loop();
+    }
+    var result = [];
+    var maxColIndex = Math.max.apply(null, _cells.map(function (item) {
+      return item.colIndex;
+    }));
+    var minColIndex = Math.min.apply(null, _cells.map(function (item) {
+      return item.colIndex;
+    }));
+    var maxRowIndex = Math.max.apply(null, _cells.map(function (item) {
+      return item.rowIndex;
+    }));
+    var minRowIndex = Math.min.apply(null, _cells.map(function (item) {
+      return item.rowIndex;
+    }));
+    for (var rowIndex = minRowIndex; rowIndex <= maxRowIndex; rowIndex++) {
+      var _loop2 = function _loop2() {
+        var _column = gridRef.current.instance.columnOption(colIndex);
+        if (constants$2.allowedDataTypesForMultiCellEditing.some(function (item) {
+          return item.toLocaleLowerCase() == _column.dataType.toLocaleLowerCase();
+        })) {
+          result.push({
+            dataField: _column.dataField,
+            pkValue: gridRef.current.instance.cellValue(rowIndex, pkName)
+          });
+        }
+      };
+      for (var colIndex = minColIndex; colIndex <= maxColIndex; colIndex++) {
+        _loop2();
+      }
+    }
+    runSetSelectedCells(result);
+    setHoveredCells([]);
+    setCtrlSelectedCells([]);
+  };
+  var runSetSelectedCells = function runSetSelectedCells(value) {
+    var removeDuplicates = function removeDuplicates(oldValues) {
+      var result = [];
+      var _loop3 = function _loop3() {
+        var element = value[index];
+        if (element.pkValue && !oldValues.some(function (cell) {
+          return cell.dataField == element.dataField && cell.pkValue == element.pkValue;
+        })) {
+          result.push({
+            dataField: element.dataField,
+            pkValue: element.pkValue
+          });
+        }
+      };
+      for (var index = 0; index < value.length; index++) {
+        _loop3();
+      }
+      return result;
+    };
+    setSelectedCells(function (prev) {
+      return [].concat(prev, removeDuplicates(prev));
+    });
+  };
+  var removeSelectedCell = function removeSelectedCell(rowIndex, colIndex) {
+    var dataField = gridRef.current.instance.columnOption(colIndex).dataField;
+    var pkValue = gridRef.current.instance.cellValue(rowIndex, pkName);
+    setSelectedCells(function (prev) {
+      return prev.filter(function (cell) {
+        return !(cell.dataField == dataField && cell.pkValue == pkValue);
+      });
+    });
+  };
+  var closeModal = function closeModal() {
+    setIsFastUpdateModalOpen(false);
+    clearSelectedCells();
+    fastUpdateForm.resetFields();
+  };
+  var actionButtons = React.useMemo(function () {
+    if (props.actionButtonGroup) {
+      if (props.actionButtonGroup.length > 3 && !props.edit) {
+        return props.actionButtonGroup.slice(0, 2);
+      } else {
+        return props.actionButtonGroup;
+      }
+    } else {
+      return [];
+    }
+  }, [props.actionButtonGroup]);
+  var onEditorPreparing = React.useCallback(function (e) {
+    if (e.row !== undefined && e.parentType === "dataRow") {
+      if (props.handleEditorPreparing) {
+        props.handleEditorPreparing(e);
+      }
+    }
+    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$1);
+      };
+    }
+  }, [props.isServerSide]);
+  var customLoad = React.useCallback(function () {
+    var state = JSON.parse(localStorage.getItem(props.exportFileName + "Storage"));
+    if (localStorage.getItem(props.exportFileName + "Storage")) {
+      state.selectedRowKeys = [];
+      if (props.filterEnabledShow) state.filterPanel = {
+        filterEnabled: false
+      };else state.filterPanel = {
+        filterEnabled: true
+      };
+    }
+    return state;
+  }, [props.filterEnabledShow]);
+  var customSave = React.useCallback(function (state) {
+    state.selectedRowKeys = [];
+    if (props.filterEnabledShow) state.filterPanel = {
+      filterEnabled: false
+    };else state.filterPanel = {
+      filterEnabled: true
+    };
+    if (data.length === 0) {
+      if (!state.filterValue && state.filterValue !== null) {
+        state.filterValue = null;
+      }
+    }
+    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" || info.dataField === "isActive")) {
+      if (info.dataSource != null && info.dataSource.length > 0) {
+        info.showAllText = info.dataSource.find(function (i) {
+          return i.value === null;
+        }).label;
+        info.trueText = info.dataSource.find(function (i) {
+          return i.value === true;
+        }).label;
+        info.falseText = info.dataSource.find(function (i) {
+          return i.value === false;
+        }).label;
+      }
+    }
+  }, []);
+  function actionCellRender(cellData, props) {
+    var kebabMenuButtons = props.actionButtonGroup && props.actionButtonGroup.length > 3 && !props.edit ? props.actionButtonGroup.slice(2).map(function (button) {
+      return {
+        icon: button.icon,
+        onClick: function onClick(event) {
+          var customEvent = {
+            column: cellData.column,
+            component: cellData.component,
+            element: cellData.element,
+            event: event,
+            model: cellData.data,
+            row: cellData.row
+          };
+          button.onClick(customEvent);
+        }
+      };
+    }) : [];
+    var buttonElements = [];
+    {
+      !props.edit && actionButtons.forEach(function (buttonItem, index) {
+        var isVisible = typeof buttonItem.visible === "function" ? buttonItem.visible({
+          column: cellData.column,
+          component: cellData.component,
+          row: cellData.row
+        }) : buttonItem.visible;
+        buttonElements.push(React__default.createElement(OdsDataGrdiRowButton, Object.assign({
+          key: "action-button-" + index,
+          hint: buttonItem.hint,
+          visible: isVisible,
+          size: "small",
+          type: "text",
+          disabled: buttonItem.actionPermission === undefined ? false : !buttonItem.actionPermission,
+          icon: buttonItem.icon
+        }, props.actionButtonsTooltipType === "styled" && {
+          tooltip: buttonItem.hint
+        }, {
+          onClick: function onClick(event) {
+            var customEvent = {
+              column: cellData.column,
+              component: cellData.component,
+              element: cellData.element,
+              event: event,
+              model: cellData.data,
+              row: cellData.row
+            };
+            buttonItem.onClick(customEvent);
+          }
+        })));
+      });
+    }
+    {
+      props.edit && actionButtons.forEach(function (buttonItem, index) {
+        var isVisible = typeof buttonItem.visible === "function" ? buttonItem.visible({
+          column: cellData.column,
+          component: cellData.component,
+          row: cellData.row
+        }) : buttonItem.visible;
+        buttonElements.push(React__default.createElement(OdsDataGrdiRowButton, Object.assign({
+          key: "action-button-" + index,
+          name: buttonItem.name,
+          hint: buttonItem.hint,
+          visible: isVisible,
+          size: "small",
+          type: "text",
+          disabled: buttonItem.actionPermission === undefined ? false : !buttonItem.actionPermission,
+          icon: buttonItem.icon
+        }, props.actionButtonsTooltipType === "styled" && {
+          tooltip: buttonItem.hint
+        }, {
+          onClick: function onClick(event) {
+            if (buttonItem.onClick) {
+              var customEvent = {
+                column: cellData.column,
+                component: cellData.component,
+                element: cellData.element,
+                event: event,
+                model: cellData.data,
+                row: cellData.row
+              };
+              buttonItem.onClick(customEvent);
+            }
+          }
+        })));
+      });
+    }
+    if (kebabMenuButtons.length > 0) {
+      buttonElements.push(React__default.createElement(OdsDropdown, {
+        key: "dropdown-" + (cellData.rowIndex || cellData.data.ID),
+        menuItems: kebabMenuButtons
+      }, React__default.createElement(OdsDataGrdiRowButton, {
+        type: "text",
+        icon: React__default.createElement(outline.KebabMenuIcon, null)
+      })));
+    }
+    return React__default.createElement(React__default.Fragment, null, buttonElements);
+  }
+  var onCustomCellClick = function onCustomCellClick(e) {
+    if (hasFastUpdate) {
+      if (checkCellSelectionConstraints$1(e) && constants$2.allowedDataTypesForMultiCellEditing.some(function (item) {
+        return item.toLocaleLowerCase() == e.column.dataType.toLocaleLowerCase();
+      })) {
+        if (!e.event.ctrlKey) {
+          if (cellAlreadySelected$1(e.data[pkName], e.column.dataField, selectedCells)) {
+            removeSelectedCell(e.rowIndex, e.columnIndex);
+          } else {
+            singleSelect(e.data[pkName], e.column.dataField);
+          }
+        } else {
+          var selectedCell = {
+            colIndex: e.columnIndex,
+            rowIndex: e.rowIndex
+          };
+          if (ctrlSelection) {
+            multipleSelect([].concat(ctrlSelectedCells, [selectedCell]));
+          } else {
+            setCtrlSelectedCells(function (prev) {
+              return [].concat(prev, [selectedCell]);
+            });
+          }
+          setCtrlSelection(function (prev) {
+            return !prev;
+          });
+        }
+      }
+    }
+    onCellClick && onCellClick(e);
+  };
+  var onCustomCellHoverChanged = function onCustomCellHoverChanged(e) {
+    if (hasFastUpdate) {
+      if (!e.event.ctrlKey && !ctrlSelection) {
+        if (checkCellSelectionConstraints$1(e)) {
+          if (e.event.buttons === 1) {
+            setHoveredCells(function (prev) {
+              return [].concat(prev, [{
+                colIndex: e.columnIndex,
+                rowIndex: e.rowIndex
+              }]);
+            });
+          } else {
+            multipleSelect(hoveredCells);
+          }
+        } else if (e.rowType != "data") {
+          multipleSelect(hoveredCells);
+        }
+      }
+    }
+    onCellHoverChanged && onCellHoverChanged(e);
+  };
+  var onCustomFastUpdateButtonClick = function onCustomFastUpdateButtonClick(e) {
+    if (selectedCells.length > 0) {
+      setIsFastUpdateModalOpen(true);
+    }
+    onFastUpdateButtonClick && onFastUpdateButtonClick(e);
+  };
+  var onFastUpdateModalCancel = function onFastUpdateModalCancel(_e) {
+    closeModal();
+    onFastUpdateCancel && onFastUpdateCancel();
+  };
+  var onFastUpdateFormFinish = function onFastUpdateFormFinish(values) {
+    onFastUpdateFinish && onFastUpdateFinish(values, selectedCells);
+    closeModal();
+  };
+  var onFastUpdateFormFinishFailed = function onFastUpdateFormFinishFailed(errorInfo) {
+    onFastUpdateFailed && onFastUpdateFailed(errorInfo);
+  };
+  var onClickFastUpdateFormCancel = function onClickFastUpdateFormCancel(_e) {
+    closeModal();
+    onFastUpdateCancel && onFastUpdateCancel();
+  };
+  var onCustomCellPrepared = function onCustomCellPrepared(e) {
+    var _props$edit, _props$edit2;
+    if (hasFastUpdate) {
+      if (e.rowType === "data" && e.column.allowEditing && constants$2.allowedDataTypesForMultiCellEditing.some(function (item) {
+        return item.toLocaleLowerCase() == e.column.dataType.toLocaleLowerCase();
+      })) {
+        if (selectedCells.some(function (cell) {
+          return cell.pkValue == e.data[pkName] && cell.dataField == e.column.dataField;
+        })) {
+          e.cellElement.classList.add("grid-cell-selected");
+        }
+      }
+    }
+    if (((_props$edit = props.edit) === null || _props$edit === void 0 ? void 0 : _props$edit.mode) == "cell" && (_props$edit2 = props.edit) !== null && _props$edit2 !== void 0 && _props$edit2.allowUpdating && e.rowType == "data" && !e.column.allowEditing) {
+      e.cellElement.classList.add("grid-cell-disable-colored");
+    }
+    var isDifferentDataField = e.column.type == "selection" || e.column.dataField == dataFieldNameActions;
+    if (e.rowType === "data" && e.columnIndex >= 0 && e.rowIndex >= 0 && (props.mergeDataFields.some(function (x) {
+      return x == e.column.dataField;
+    }) || isDifferentDataField)) {
+      var dataIndex = e.component.getVisibleRows()[e.rowIndex].dataIndex;
+      var dataField = isDifferentDataField ? props.mergeDataFields[0] : e.column.dataField;
+      var mergedCells = mergedCellInfo.filter(function (x) {
+        return x.FieldName == dataField;
+      });
+      if (mergedCells.length > 0) {
+        var mergedCell = mergedCells.find(function (x) {
+          return x.StartRowIndex == dataIndex;
+        });
+        if (mergedCell !== undefined) {
+          e.cellElement.rowSpan = mergedCell.EndRowIndex - mergedCell.StartRowIndex + 1;
+          e.cellElement.classList.add(gridStyle.mergeCellRoot);
+        } else if (mergedCells.some(function (x) {
+          return x.StartRowIndex < dataIndex && x.EndRowIndex >= dataIndex;
+        })) {
+          e.cellElement.classList.add(gridStyle.mergeCellChild);
+        }
+      }
+    }
+    onCellPrepared && onCellPrepared(e);
+  };
+  var onToolbarPreparing = function onToolbarPreparing(e) {
+    if (props.toolbarButtonGroup && props.toolbarButtonGroup.length > 0) {
+      e.toolbarOptions.items.unshift({
+        location: "before",
+        template: function template(_, __, container) {
+          var wrapper = document.createElement("div");
+          container.appendChild(wrapper);
+          reactDom.render(React__default.createElement(React__default.StrictMode, null, props.toolbarButtonGroup && Array.isArray(props.toolbarButtonGroup) && props.toolbarButtonGroup.map(function (buttonGroupItem, index) {
+            return React__default.createElement(OdsButton, {
+              key: index,
+              style: {
+                marginLeft: token.margin
+              },
+              type: buttonGroupItem.type,
+              onClick: buttonGroupItem.onClick
+            }, buttonGroupItem.label);
+          })), wrapper);
+        }
+      });
+    }
+    e.toolbarOptions.items.unshift({
+      location: "before",
+      cssClass: "toolbarTitleItem",
+      template: function template(_, __, container) {
+        var wrapper = document.createElement("div");
+        container.appendChild(wrapper);
+        reactDom.render(React__default.createElement(React__default.StrictMode, null, React__default.createElement(OdsTitle, {
+          level: 5,
+          style: {
+            display: "flex",
+            alignItems: "center",
+            alignSelf: "stretch",
+            margin: 0
+          }
+        }, props.pageTitle)), wrapper);
+      }
+    });
+  };
+  var handleSelectionChanged = function handleSelectionChanged(e) {
+    var triggerEvent = true;
+    if (props.mergeDataFields.length > 0) {
+      var currentSelectedKey = e.currentSelectedRowKeys.length == 1 ? e.currentSelectedRowKeys[0] : undefined;
+      var currentDeselectedKey = e.currentDeselectedRowKeys.length == 1 ? e.currentDeselectedRowKeys[0] : undefined;
+      var currentRowIndex,
+        isRowSelected = false,
+        isRowDeselected = false;
+      if (currentSelectedKey != undefined) {
+        currentRowIndex = e.component.getRowIndexByKey(currentSelectedKey);
+        isRowSelected = true;
+      } else if (currentDeselectedKey != undefined) {
+        currentRowIndex = e.component.getRowIndexByKey(currentDeselectedKey);
+        isRowDeselected = true;
+      }
+      if (currentRowIndex != undefined) {
+        var dataIndex = e.component.getVisibleRows()[currentRowIndex].dataIndex;
+        var mergedCell = mergedCellInfo.find(function (x) {
+          return x.FieldName == props.mergeDataFields[0] && x.StartRowIndex <= dataIndex && x.EndRowIndex >= dataIndex;
+        });
+        if (mergedCell) {
+          var distanceToStart = dataIndex - mergedCell.StartRowIndex;
+          var distanceToEnd = mergedCell.EndRowIndex - dataIndex;
+          var keys = [];
+          var visibleRow;
+          for (var index = currentRowIndex - distanceToStart; index <= currentRowIndex + distanceToEnd; index++) {
+            visibleRow = e.component.getVisibleRows()[index];
+            if (visibleRow) {
+              keys.push(visibleRow.key);
+            }
+          }
+          if (isRowSelected) {
+            e.component.selectRows(keys, true);
+            triggerEvent = false;
+          } else if (isRowDeselected) {
+            e.component.deselectRows(keys);
+            triggerEvent = false;
+          }
+        }
+      }
+    }
+    if (triggerEvent) {
+      props.onSelectionChanged && props.onSelectionChanged(e);
+    }
+  };
+  var handleExporting = function handleExporting(e) {
+    if (!props.closeGridHeader) {
+      var _props$exportProps$ac, _props$exportProps$pa;
+      ExportDataGridToExcel({
+        gridComponent: e.component,
+        baseFileName: props.exportProps.fileName,
+        selectedText: props.exportProps.selectedText,
+        getSummary: function getSummary() {
+          return "";
+        },
+        selectedRowsOnly: e.selectedRowsOnly,
+        activeText: (_props$exportProps$ac = props.exportProps.activeText) != null ? _props$exportProps$ac : "Active",
+        passiveText: (_props$exportProps$pa = props.exportProps.passiveText) != null ? _props$exportProps$pa : "Passive"
+      });
+    }
+  };
+  var renderMasterDetailGrid = React.useCallback(function (_ref) {
+    var _dataSource$data;
+    var dataSource = _ref.data;
+    var detailID = dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$data = dataSource.data) === null || _dataSource$data === void 0 ? void 0 : _dataSource$data.ID;
+    if (!detailID || !(detailData !== null && detailData !== void 0 && detailData[detailID])) {
+      return null;
+    }
+    return React__default.createElement(MasterDetailDataGrid, {
+      columns: detailGridColumns,
+      dataSource: detailData[detailID],
+      masterDetailFeatures: masterDetailFeatures
+    });
+  }, [detailGridColumns, detailData, masterDetailFeatures]);
+  var checkIsPropArray = function checkIsPropArray(prop) {
+    return prop && Array.isArray(prop);
+  };
+  return React__default.createElement(React__default.Fragment, null, React__default.createElement(antd.Modal, {
+    title: fastUpdateModalTitle != null ? fastUpdateModalTitle : "Fast Update",
+    open: isFastUpdateModalOpen,
+    onCancel: onFastUpdateModalCancel,
+    footer: [],
+    maskClosable: true,
+    width: 300
+  }, React__default.createElement(antd.Form, {
+    key: "form-fastupdate",
+    form: fastUpdateForm,
+    style: {
+      maxWidth: "100%"
+    },
+    layout: "vertical",
+    onFinish: onFastUpdateFormFinish,
+    onFinishFailed: onFastUpdateFormFinishFailed
+  }, constants$2.allowedDataTypesForMultiCellEditing.map(function (item) {
+    switch (item) {
+      case "number":
+        return React__default.createElement(antd.Form.Item, {
+          name: "number",
+          label: "",
+          rules: [{
+            required: true,
+            message: fastUpdateFormRequiredFieldMessage != null ? fastUpdateFormRequiredFieldMessage : "Required field"
+          }]
+        }, React__default.createElement(OdsInputNumber, {
+          key: "odsinputnumber-fastupdate",
+          style: {
+            width: "100%"
+          },
+          min: 0
+        }));
+      default:
+        return React__default.createElement("div", null);
+    }
+  }), React__default.createElement(antd.Row, {
+    style: {
+      justifyContent: "end",
+      gap: token.marginSM
+    }
+  }, React__default.createElement(antd.Col, null, React__default.createElement(OdsButton, {
+    key: "back",
+    onClick: onClickFastUpdateFormCancel
+  }, " ", fastUpdateModalCancelText != null ? fastUpdateModalCancelText : "Cancel")), React__default.createElement(antd.Col, null, React__default.createElement(OdsButton, {
+    htmlType: "submit",
+    type: "primary"
+  }, " ", fastUpdateModalSaveText != null ? fastUpdateModalSaveText : "Save"))))), React__default.createElement(DataGrid__default, Object.assign({
+    keyExpr: keyExpr,
+    dataSource: data,
+    showBorders: true,
+    columnAutoWidth: false,
+    ref: gridRef,
+    height: props.height == undefined ? window.innerHeight - 164 : props.height,
+    allowColumnResizing: true,
+    columnResizingMode: (_props$columnResizing = props.columnResizingMode) != null ? _props$columnResizing : "widget",
+    showRowLines: true,
+    allowColumnReordering: true,
+    remoteOperations: false,
+    paging: {
+      enabled: false
+    },
+    width: "100%",
+    repaintChangesOnly: true,
+    focusedRowEnabled: false,
+    filterSyncEnabled: true
+  }, checkIsPropArray(props.selectedRowKeys) && {
+    selectedRowKeys: props.selectedRowKeys
+  }, {
+    wordWrapEnabled: props.wordWrapEnabled ? props.wordWrapEnabled : false,
+    columnFixing: {
+      enabled: true
+    },
+    noDataText: props.noDataText,
+    className: gridStyle.grid + " " + ((_props$className = props.className) != null ? _props$className : ""),
+    selection: (_props$selection = props.selection) != null ? _props$selection : {
+      mode: "multiple",
+      selectAllMode: "page"
+    },
+    sorting: {
+      mode: "none"
+    },
+    onEditorPreparing: onEditorPreparing,
+    onExporting: handleExporting,
+    onRowClick: props.onRowClick,
+    onEditorPrepared: onEditorPrepared,
+    onSaved: props.onSaved,
+    onSaving: props.onSaving,
+    onEditCanceling: props.onEditCanceling,
+    onCellClick: onCustomCellClick,
+    onCellHoverChanged: onCustomCellHoverChanged,
+    onCellPrepared: onCustomCellPrepared,
+    onOptionChanged: props.onOptionChanged,
+    onToolbarPreparing: !props.closeGridHeader && (props.onToolbarPreparing || onToolbarPreparing),
+    onSelectionChanged: handleSelectionChanged
+  }), gridColumns.map(function (col) {
+    return React__default.createElement(DataGrid.Column, Object.assign({
+      key: col.dataField
+    }, col, {
+      minWidth: 50,
+      width: props.isColumnWidthFixed === true ? 160 : undefined,
+      cssClass: col.cssClass + " " + (hasFastUpdate ? "grid-cell-disable-text-selection" : "")
+    }), col.lookUp && React__default.createElement(devextremeReact.Lookup, Object.assign({}, col.lookUp)), (col.dataField === "IsActive" || col.dataField === "isActive") && React__default.createElement(DataGrid.HeaderFilter, {
+      dataSource: [{
+        text: "Active",
+        value: true
+      }, {
+        text: "Passive",
+        value: false
+      }]
+    }), col.useDynamicHeaderFilter && React__default.createElement(DataGrid.HeaderFilter, {
+      allowSearch: true,
+      dataSource: [{
+        text: "(Blanks)",
+        value: null
+      }].concat(data && data.length > 0 ? data.filter(function (item) {
+        return item[col.dataField] !== null && item[col.dataField] !== undefined && item[col.dataField] !== "";
+      }).map(function (item) {
+        return {
+          text: item[col.dataField].toString(),
+          value: item[col.dataField]
+        };
+      }) : [])
+    }), getMultiLevelColumns$1(col));
+  }), props.actionColumnEnable !== undefined && props.actionColumnEnable === true && React__default.createElement(DataGrid.Column, {
+    dataField: "Actions",
+    fixed: true,
+    allowSorting: false,
+    caption: props.actionButtonGroupCaption,
+    type: "buttons",
+    showInColumnChooser: false,
+    cellRender: function cellRender(cellData) {
+      return actionCellRender(cellData, props);
+    }
+  }), props.showMasterDetail && React__default.createElement(DataGrid.MasterDetail, {
+    enabled: true,
+    component: renderMasterDetailGrid
+  }), props.edit && React__default.createElement(DataGrid.Editing, {
+    mode: props.edit.mode,
+    allowUpdating: props.edit.allowUpdating,
+    allowDeleting: props.edit.allowDeleting,
+    allowAdding: props.edit.allowAdding,
+    useIcons: true
+  }, props.edit.mode === "popup" && React__default.createElement("div", null, React__default.createElement(DataGrid.Popup, {
+    showTitle: true,
+    width: 700,
+    height: 300,
+    showCloseButton: false
+  }), React__default.createElement(DataGrid.Form, null, props.edit.formItems && props.edit.formItems.map(function (formItem) {
+    return React__default.createElement(form.Item, {
+      itemType: formItem.itemType,
+      colCount: formItem.colCount,
+      colSpan: formItem.colSpan
+    }, formItem.items.map(function (subItem) {
+      return React__default.createElement(form.Item, {
+        key: subItem.dataField,
+        dataField: subItem.dataField
+      });
+    }));
+  })))), React__default.createElement(DataGrid.Paging, {
+    enabled: false
+  }), React__default.createElement(DataGrid.Pager, {
+    visible: false
+  }), React__default.createElement(DataGrid.Scrolling, {
+    mode: "standard"
+  }), !props.closeGridHeader && React__default.createElement(DataGrid.SearchPanel, {
+    visible: true
+  }), React__default.createElement(DataGrid.FilterRow, {
+    visible: props.isFilterRow != undefined ? props.isFilterRow : true
+  }), React__default.createElement(DataGrid.FilterPanel, {
+    visible: true
+  }), React__default.createElement(DataGrid.HeaderFilter, {
+    visible: true
+  }), React__default.createElement(DataGrid.Sorting, {
+    mode: "none"
+  }), !props.closeGridHeader && React__default.createElement(DataGrid.Export, {
+    enabled: true,
+    allowExportSelectedData: true,
+    formats: constants$2.exportFormats
+  }), ((_props$selectOptions = props.selectOptions) === null || _props$selectOptions === void 0 ? void 0 : _props$selectOptions.selectEnable) && React__default.createElement(DataGrid.Selection, {
+    mode: (_props$selectOptions$ = (_props$selectOptions2 = props.selectOptions) === null || _props$selectOptions2 === void 0 ? void 0 : _props$selectOptions2.mode) != null ? _props$selectOptions$ : "multiple",
+    deferred: (_props$selectOptions$2 = (_props$selectOptions3 = props.selectOptions) === null || _props$selectOptions3 === void 0 ? void 0 : _props$selectOptions3.deferred) != null ? _props$selectOptions$2 : true
+  }), !props.closeGridHeader && React__default.createElement(DataGrid.ColumnChooser, {
+    enabled: true,
+    mode: "select"
+  }, !props.columnChooserPositionDisabled && React__default.createElement(DataGrid.Position, {
+    my: "right top",
+    at: "right bottom",
+    of: document.querySelector("." + props.dataGridPageName) ? "." + props.dataGridPageName + " .dx-datagrid-column-chooser-button" : ".dx-datagrid-column-chooser-button"
+  }), React__default.createElement(DataGrid.ColumnChooserSearch, {
+    enabled: true,
+    editorOptions: {
+      placeholder: ""
+    }
+  }), React__default.createElement(DataGrid.ColumnChooserSelection, {
+    allowSelectAll: true,
+    selectByClick: true,
+    recursive: true
+  })), !props.closeGridHeader && React__default.createElement(DataGrid.Toolbar, null, React__default.createElement(DataGrid.Item, {
+    name: "searchPanel"
+  }), React__default.createElement(DataGrid.Item, {
+    name: "columnChooserButton",
+    cssClass: "toolbarPanelItems"
+  }), React__default.createElement(DataGrid.Item, {
+    name: "exportButton",
+    cssClass: "toolbarPanelItems"
+  }), hasFastUpdate && React__default.createElement(DataGrid.Item, null, React__default.createElement(OdsButton, {
+    key: "odsbutton-fastupdate",
+    onClick: onCustomFastUpdateButtonClick
+  }, fastUpdateButtonText != null ? fastUpdateButtonText : "Fast Update"))), React__default.createElement(DataGrid.StateStoring, {
+    enabled: true,
+    type: "custom",
+    customLoad: customLoad,
+    customSave: customSave
+  })));
 };
 
 /**
@@ -38309,10 +39378,10 @@ function debounce(func, wait, options) {
 
 var debounce_1 = debounce;
 
-var checkCellSelectionConstraints$1 = function checkCellSelectionConstraints(e) {
+var checkCellSelectionConstraints$2 = function checkCellSelectionConstraints(e) {
   return e.rowType == "data" && e.columnIndex > -1 && e.rowIndex > -1;
 };
-var cellAlreadySelected$1 = function cellAlreadySelected(pkValue, dataField, cellInfos) {
+var cellAlreadySelected$2 = function cellAlreadySelected(pkValue, dataField, cellInfos) {
   return cellInfos.some(function (cell) {
     return cell.pkValue == pkValue && cell.dataField == dataField;
   });
@@ -38382,7 +39451,7 @@ var getSummaryItem = function getSummaryItem(col, visibleIndex, summaryType, isM
     }
   });
 };
-var getMultiLevelColumns$1 = function getMultiLevelColumns(col) {
+var getMultiLevelColumns$2 = function getMultiLevelColumns(col) {
   return col.multiLevelColumns && col.multiLevelColumns.map(function (colItem) {
     return React__default.createElement(DataGrid.Column, Object.assign({
       width: 80
@@ -38390,7 +39459,7 @@ var getMultiLevelColumns$1 = function getMultiLevelColumns(col) {
   });
 };
 
-var constants$2 = {
+var constants$3 = {
   totalPageCount: 1,
   loadedPageCount: 1,
   totalRecordCount: 0,
@@ -38398,14 +39467,14 @@ var constants$2 = {
   selectedCellBgColor: "#c1f9b8",
   allowedDataTypesForMultiCellEditing: ["number"]
 };
-var onCancelEditEvent$1 = new CustomEvent("cancelEdit", {
+var onCancelEditEvent$2 = new CustomEvent("cancelEdit", {
   bubbles: true,
   detail: {
     rowData: null
   }
 });
 
-var useToken$2 = antd.theme.useToken;
+var useToken$3 = 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 keyExpr = props.keyExpr,
@@ -38421,7 +39490,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     onFastUpdateFinish = props.onFastUpdateFinish,
     onFastUpdateCancel = props.onFastUpdateCancel,
     onFastUpdateFailed = props.onFastUpdateFailed;
-  var _useToken = useToken$2(),
+  var _useToken = useToken$3(),
     token = _useToken.token;
   var _AntForm$useForm = antd.Form.useForm(),
     fastUpdateForm = _AntForm$useForm[0];
@@ -38466,16 +39535,16 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     scrollPosition = _useState12[0],
     setScrollPosition = _useState12[1];
   React.useEffect(function () {
-    constants$2.totalPageCount = 1;
-    constants$2.loadedPageCount = 1;
-    constants$2.totalRecordCount = 0;
+    constants$3.totalPageCount = 1;
+    constants$3.loadedPageCount = 1;
+    constants$3.totalRecordCount = 0;
   }, [props.dataGridPageName]);
   React.useEffect(function () {
     var _props$axiosRequest, _props$axiosRequest2, _props$axiosRequest3;
     if (props.axiosRequest !== undefined && ((_props$axiosRequest = props.axiosRequest) !== null && _props$axiosRequest !== void 0 && _props$axiosRequest.requestData && Object.keys((_props$axiosRequest2 = props.axiosRequest) === null || _props$axiosRequest2 === void 0 ? void 0 : _props$axiosRequest2.requestData).length > 0 || (_props$axiosRequest3 = props.axiosRequest) !== null && _props$axiosRequest3 !== void 0 && _props$axiosRequest3.requestQueryString)) {
-      constants$2.totalPageCount = 1;
-      constants$2.loadedPageCount = 1;
-      constants$2.totalRecordCount = 0;
+      constants$3.totalPageCount = 1;
+      constants$3.loadedPageCount = 1;
+      constants$3.totalRecordCount = 0;
       setData([]);
       fetchData();
     }
@@ -38651,7 +39720,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     for (var rowIndex = minRowIndex; rowIndex <= maxRowIndex; rowIndex++) {
       var _loop2 = function _loop2() {
         var _column = gridRef.current.instance.columnOption(colIndex);
-        if (constants$2.allowedDataTypesForMultiCellEditing.some(function (item) {
+        if (constants$3.allowedDataTypesForMultiCellEditing.some(function (item) {
           return item.toLocaleLowerCase() == _column.dataType.toLocaleLowerCase();
         })) {
           result.push({
@@ -38725,13 +39794,13 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
           if (props.axiosRequest.requestData && checkRequestDataHasOnlySortingProperty(props.axiosRequest.requestData)) return;
           var apiUrl = props.axiosRequest.environmentUrl + "" + props.axiosRequest.apiUrl;
           if (((_props$axiosRequest$r = props.axiosRequest.requestData) === null || _props$axiosRequest$r === void 0 ? void 0 : _props$axiosRequest$r.PaginatedRequest) !== undefined) {
-            props.axiosRequest.requestData.PaginatedRequest.PageNumber = constants$2.loadedPageCount;
+            props.axiosRequest.requestData.PaginatedRequest.PageNumber = constants$3.loadedPageCount;
             props.axiosRequest.requestData.PaginatedRequest.PageSize = props.pageSize;
           }
           if (props.axiosRequest.requestQueryString !== undefined) {
             props.axiosRequest.requestQueryString.maxResultCount = props.pageSize;
-            if (constants$2.loadedPageCount > 1 && constants$2.totalPageCount >= constants$2.loadedPageCount) {
-              props.axiosRequest.requestQueryString.skipCount = ((constants$2.loadedPageCount - 1) * props.pageSize).toString();
+            if (constants$3.loadedPageCount > 1 && constants$3.totalPageCount >= constants$3.loadedPageCount) {
+              props.axiosRequest.requestQueryString.skipCount = ((constants$3.loadedPageCount - 1) * props.pageSize).toString();
             }
             var query = queryString.stringify(props.axiosRequest.requestQueryString);
             apiUrl = apiUrl + "?" + query;
@@ -38746,10 +39815,10 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
               setLoading(true);
               return Promise.resolve(fetch(apiUrl, requestOptions)).then(function (response) {
                 return Promise.resolve(response.json()).then(function (newData) {
-                  if (constants$2.loadedPageCount == 1) {
+                  if (constants$3.loadedPageCount == 1) {
                     setData(newData.Data ? newData.Data : newData);
-                    constants$2.loadedPageCount = 1;
-                  } else if (constants$2.totalPageCount >= constants$2.loadedPageCount) {
+                    constants$3.loadedPageCount = 1;
+                  } else if (constants$3.totalPageCount >= constants$3.loadedPageCount) {
                     var newArray = newData.Data ? newData.Data : newData;
                     setData(function (prevData) {
                       return [].concat(prevData, newArray);
@@ -38775,15 +39844,15 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   }, [(_props$axiosRequest6 = props.axiosRequest) === null || _props$axiosRequest6 === void 0 ? void 0 : _props$axiosRequest6.requestData, (_props$axiosRequest7 = props.axiosRequest) === null || _props$axiosRequest7 === void 0 ? void 0 : _props$axiosRequest7.apiUrl, (_props$axiosRequest8 = props.axiosRequest) === null || _props$axiosRequest8 === void 0 ? void 0 : _props$axiosRequest8.environmentUrl, (_props$axiosRequest9 = props.axiosRequest) === null || _props$axiosRequest9 === void 0 ? void 0 : _props$axiosRequest9.requestQueryString, (_props$axiosRequest10 = props.axiosRequest) === null || _props$axiosRequest10 === void 0 ? void 0 : _props$axiosRequest10.requestType, props.pageSize, props.isServerSide]);
   var getTotalCount = function getTotalCount(response, data) {
     if (data !== null && data !== void 0 && data.PageCount || data !== null && data !== void 0 && data.RowCount) {
-      constants$2.totalPageCount = data.PageCount;
-      constants$2.totalRecordCount = data.RowCount;
+      constants$3.totalPageCount = data.PageCount;
+      constants$3.totalRecordCount = data.RowCount;
     } else {
       var totalCount;
       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;
-      constants$2.totalRecordCount = parseInt(totalCount, 10) || 0;
-      constants$2.totalPageCount = Math.ceil(constants$2.totalRecordCount / props.pageSize);
+      constants$3.totalRecordCount = parseInt(totalCount, 10) || 0;
+      constants$3.totalPageCount = Math.ceil(constants$3.totalRecordCount / props.pageSize);
     }
     setLoading(false);
   };
@@ -38795,7 +39864,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     }
     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$1);
+        if (args.event && args.event.type === "cancel") e.cellElement.dispatchEvent(onCancelEditEvent$2);
       };
     }
   }, [props.isServerSide]);
@@ -38804,8 +39873,8 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
       return Promise.resolve(function () {
         if (type === "reachedBottom") {
           return function () {
-            if (constants$2.totalPageCount <= constants$2.loadedPageCount) {} else {
-              constants$2.loadedPageCount = constants$2.loadedPageCount + 1;
+            if (constants$3.totalPageCount <= constants$3.loadedPageCount) {} else {
+              constants$3.loadedPageCount = constants$3.loadedPageCount + 1;
               return Promise.resolve(fetchData()).then(function () {});
             }
           }();
@@ -38814,7 +39883,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [constants$2.totalPageCount]);
+  }, [constants$3.totalPageCount]);
   var onExporting = React.useCallback(function (e) {
     if (e.format === "xlsx") {
       var workbook = new exceljs.Workbook();
@@ -38922,26 +39991,26 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     var _props$customSummary3;
     var result = "";
     var totalloaded = 0;
-    if (data.length < 50 || !props.isServerSide || constants$2.loadedPageCount == constants$2.totalPageCount) {
+    if (data.length < 50 || !props.isServerSide || constants$3.loadedPageCount == constants$3.totalPageCount) {
       totalloaded = data.length;
     } else {
-      totalloaded = constants$2.loadedPageCount * props.pageSize;
+      totalloaded = constants$3.loadedPageCount * props.pageSize;
     }
     if (props.isServerSide) {
       var _props$customSummary, _props$customSummary2;
-      result = constants$2.totalRecordCount > 0 ? totalloaded + " " + ((_props$customSummary = props.customSummary) === null || _props$customSummary === void 0 ? void 0 : _props$customSummary.summaryLoadedDataLabel) + ("- " + constants$2.totalRecordCount) + ((_props$customSummary2 = props.customSummary) === null || _props$customSummary2 === void 0 ? void 0 : _props$customSummary2.summaryTotalDataLabel) : "";
+      result = constants$3.totalRecordCount > 0 ? totalloaded + " " + ((_props$customSummary = props.customSummary) === null || _props$customSummary === void 0 ? void 0 : _props$customSummary.summaryLoadedDataLabel) + ("- " + constants$3.totalRecordCount) + ((_props$customSummary2 = props.customSummary) === null || _props$customSummary2 === void 0 ? void 0 : _props$customSummary2.summaryTotalDataLabel) : "";
       result = concatFilteredLabel$1(result, totalloaded, filteredRowCount, filterApplied.current, props);
     }
     if (((_props$customSummary3 = props.customSummary) === null || _props$customSummary3 === void 0 ? void 0 : _props$customSummary3.summaryTotalCount) !== undefined && !props.isServerSide) {
       result = props.customSummary.summaryTotalDataLabel + " : " + props.customSummary.summaryTotalCount;
       result = concatFilteredLabel$1(result, totalloaded, filteredRowCount, filterApplied.current, props);
     }
-    if (constants$2.totalPageCount > 1) {
+    if (constants$3.totalPageCount > 1) {
       var _props$customSummary4;
-      result = result + " - " + ((_props$customSummary4 = props.customSummary) === null || _props$customSummary4 === void 0 ? void 0 : _props$customSummary4.summaryTotalPageCountLabel) + "  " + constants$2.loadedPageCount + " / " + constants$2.totalPageCount;
+      result = result + " - " + ((_props$customSummary4 = props.customSummary) === null || _props$customSummary4 === void 0 ? void 0 : _props$customSummary4.summaryTotalPageCountLabel) + "  " + constants$3.loadedPageCount + " / " + constants$3.totalPageCount;
     }
     return result;
-  }, [data, filteredRowCount, constants$2.loadedPageCount, props.pageSize, constants$2.totalRecordCount, filterApplied.current]);
+  }, [data, filteredRowCount, constants$3.loadedPageCount, props.pageSize, constants$3.totalRecordCount, filterApplied.current]);
   function actionCellRender(cellData, props) {
     var kebabMenuButtons = props.actionButtonGroup && props.actionButtonGroup.length >= 2 && !props.edit ? props.actionButtonGroup.slice(2).map(function (button) {
       if (button.elementType === "element" && button.element) {
@@ -39094,11 +40163,11 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   var onCustomCellClick = function onCustomCellClick(e) {
     e.cellElement.style.backgroundColor = "transparent";
     if (hasFastUpdate) {
-      if (checkCellSelectionConstraints$1(e) && constants$2.allowedDataTypesForMultiCellEditing.some(function (item) {
+      if (checkCellSelectionConstraints$2(e) && constants$3.allowedDataTypesForMultiCellEditing.some(function (item) {
         return item.toLocaleLowerCase() == e.column.dataType.toLocaleLowerCase();
       })) {
         if (!e.event.ctrlKey) {
-          if (cellAlreadySelected$1(e.data[pkName], e.column.dataField, selectedCells)) {
+          if (cellAlreadySelected$2(e.data[pkName], e.column.dataField, selectedCells)) {
             removeSelectedCell(e.rowIndex, e.columnIndex);
           } else {
             singleSelect(e.data[pkName], e.column.dataField);
@@ -39126,7 +40195,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   var onCustomCellHoverChanged = function onCustomCellHoverChanged(e) {
     if (hasFastUpdate) {
       if (!e.event.ctrlKey && !ctrlSelection) {
-        if (checkCellSelectionConstraints$1(e)) {
+        if (checkCellSelectionConstraints$2(e)) {
           if (e.event.buttons === 1) {
             setHoveredCells(function (prev) {
               return [].concat(prev, [{
@@ -39168,7 +40237,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   var onCustomCellPrepared = function onCustomCellPrepared(e) {
     var _props$edit, _props$edit2;
     if (hasFastUpdate) {
-      if (e.rowType === "data" && e.column.allowEditing && constants$2.allowedDataTypesForMultiCellEditing.some(function (item) {
+      if (e.rowType === "data" && e.column.allowEditing && constants$3.allowedDataTypesForMultiCellEditing.some(function (item) {
         return item.toLocaleLowerCase() == e.column.dataType.toLocaleLowerCase();
       })) {
         if (selectedCells.some(function (cell) {
@@ -39244,7 +40313,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     layout: "vertical",
     onFinish: onFastUpdateFormFinish,
     onFinishFailed: onFastUpdateFormFinishFailed
-  }, constants$2.allowedDataTypesForMultiCellEditing.map(function (item) {
+  }, constants$3.allowedDataTypesForMultiCellEditing.map(function (item) {
     switch (item) {
       case "number":
         return React__default.createElement(antd.Form.Item, {
@@ -39343,7 +40412,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
           value: item[col.dataField]
         };
       }) : [])
-    }), getMultiLevelColumns$1(col));
+    }), getMultiLevelColumns$2(col));
   }), props.actionColumnEnable !== undefined && props.actionColumnEnable === true && React__default.createElement(DataGrid.Column, {
     dataField: "Actions",
     fixed: true,
@@ -39409,7 +40478,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   }), React__default.createElement(DataGrid.Export, {
     enabled: true,
     allowExportSelectedData: true,
-    formats: constants$2.exportFormats
+    formats: constants$3.exportFormats
   }), ((_props$selectOptions = props.selectOptions) === null || _props$selectOptions === void 0 ? void 0 : _props$selectOptions.selectEnable) && React__default.createElement(DataGrid.Selection, {
     mode: (_props$selectOptions$ = (_props$selectOptions2 = props.selectOptions) === null || _props$selectOptions2 === void 0 ? void 0 : _props$selectOptions2.mode) != null ? _props$selectOptions$ : "multiple",
     deferred: (_props$selectOptions$2 = (_props$selectOptions3 = props.selectOptions) === null || _props$selectOptions3 === void 0 ? void 0 : _props$selectOptions3.deferred) != null ? _props$selectOptions$2 : true
@@ -39492,6 +40561,7 @@ exports.OdsInputNumber = OdsInputNumber;
 exports.OdsLink = OdsLink;
 exports.OdsList = OdsList;
 exports.OdsMasterDetailDataGrid = MasterDetailDataGrid;
+exports.OdsMergeCellDataGrid = OdsMergeCellDataGrid;
 exports.OdsModal = OdsModal;
 exports.OdsModalOld = OdsModalOld;
 exports.OdsMultiSelect = OdsMultiSelect;