ods-component-lib 1.18.239 → 1.18.241

package/dist/index.modern.js

@@ -38048,7 +38048,6 @@ var OdsMergeCellDataGrid = function OdsMergeCellDataGrid(props) {
     helper.columns = props.columns;
     helper.dataSource = props.dataSource;
     helper.mergeDataFields = props.mergeDataFields;
-    helper.sortDataSource();
     setMergedCellInfo(helper.mergeDataSource(props.keyExpr));
     setData(helper.dataSource);
   }, [props.dataSource]);
@@ -56047,15 +56046,18 @@ var OdsTimelineTable = forwardRef(function (props, ref) {
   var _useState4 = useState([]),
     exportableTasks = _useState4[0],
     setExportableTasks = _useState4[1];
-  var _useState5 = useState([]),
-    sortedColumns = _useState5[0],
-    setSortedColumns = _useState5[1];
-  var _useState6 = useState(customSelectedKeys),
-    selectedKeys = _useState6[0],
-    setSelectedKeys = _useState6[1];
-  var _useState7 = useState(toolbarSettings === null || toolbarSettings === void 0 ? void 0 : (_toolbarSettings$sear = toolbarSettings.search) === null || _toolbarSettings$sear === void 0 ? void 0 : _toolbarSettings$sear.searchValue),
-    searchValue = _useState7[0],
-    setSearchValue = _useState7[1];
+  var _useState5 = useState(customSelectedKeys),
+    selectedKeys = _useState5[0],
+    setSelectedKeys = _useState5[1];
+  var _useState6 = useState(toolbarSettings === null || toolbarSettings === void 0 ? void 0 : (_toolbarSettings$sear = toolbarSettings.search) === null || _toolbarSettings$sear === void 0 ? void 0 : _toolbarSettings$sear.searchValue),
+    searchValue = _useState6[0],
+    setSearchValue = _useState6[1];
+  var _useState7 = useState({
+      sortedColumns: [],
+      columnHeaderProps: null
+    }),
+    sortingChangeEventProps = _useState7[0],
+    setSortingChangeEventProps = _useState7[1];
   var originalSortingMode = sorting.mode === undefined || sorting.mode === "" ? "none" : sorting.mode;
   var sortingMode = sortingProcess == "ServerSideSorting" ? "none" : originalSortingMode;
   var showSortIndexes = sortingProcess == "ServerSideSorting" ? false : sorting.showSortIndexes;
@@ -56066,6 +56068,11 @@ var OdsTimelineTable = forwardRef(function (props, ref) {
   useEffect(function () {
     updateExportableTasks();
   }, [timelineTasks]);
+  useEffect(function () {
+    if (sortingChangeEventProps.columnHeaderProps !== null) {
+      onSortingChanged && onSortingChanged(sortingChangeEventProps.sortedColumns, sortingChangeEventProps.columnHeaderProps);
+    }
+  }, [sortingChangeEventProps]);
   var actionButtons = useMemo(function () {
     if (actionColumnSettings.actionButtonGroup) {
       if (actionColumnSettings.actionButtonGroup.length > 3) {
@@ -56099,14 +56106,18 @@ var OdsTimelineTable = forwardRef(function (props, ref) {
   };
   var customClearSorting = function customClearSorting() {
     if (sortingProcess === "ServerSideSorting") {
-      setSortedColumns([]);
+      setSortingChangeEventProps(function (prev) {
+        return _extends({}, prev, {
+          sortedColumns: []
+        });
+      });
     } else {
       refGantt.current.instance.clearSorting();
     }
     onSortingChanged && onSortingChanged([], undefined);
   };
   var getSortedColumns = function getSortedColumns() {
-    return sortedColumns;
+    return sortingChangeEventProps.sortedColumns;
   };
   var updateSelectionData = function updateSelectionData(keyValue, isSelected) {
     var newSelectedKeys = [];
@@ -56158,7 +56169,7 @@ var OdsTimelineTable = forwardRef(function (props, ref) {
   };
   var getSortIcon = function getSortIcon(column) {
     var sortingFieldName = getSortingFieldName(column);
-    var sortedColumn = sortedColumns.find(function (item) {
+    var sortedColumn = sortingChangeEventProps.sortedColumns.find(function (item) {
       return item.sortingFieldName == sortingFieldName;
     });
     if (sortedColumn) {
@@ -56172,21 +56183,21 @@ var OdsTimelineTable = forwardRef(function (props, ref) {
   };
   var onSorting = function onSorting(headerCellProps, sortingMode) {
     var sortingFieldName = getSortingFieldName(headerCellProps.column);
-    var sortedColumn = sortedColumns.find(function (item) {
+    var sortedColumn = sortingChangeEventProps.sortedColumns.find(function (item) {
       return item.sortingFieldName == sortingFieldName;
     });
     var prevSortIndex = sortedColumn === null || sortedColumn === void 0 ? void 0 : sortedColumn.sortIndex;
     var newSortedColumn = {
       sortingFieldName: sortingFieldName,
       sortType: "ASC",
-      sortIndex: sortingMode == 2 ? sortedColumn === undefined ? sortedColumns.length : sortedColumns.length - 1 : 0,
+      sortIndex: sortingMode == 2 ? sortedColumn === undefined ? sortingChangeEventProps.sortedColumns.length : sortingChangeEventProps.sortedColumns.length - 1 : 0,
       sortingText: sortingFieldName + " ASC"
     };
     if (sortedColumn) {
       newSortedColumn.sortType = sortedColumn.sortType == "ASC" ? "DESC" : "ASC";
       newSortedColumn.sortingText = sortingFieldName + " " + newSortedColumn.sortType;
     }
-    var newSortedColumns = sortingMode == 2 ? [].concat(sortedColumns.filter(function (item) {
+    var newSortedColumns = sortingMode == 2 ? [].concat(sortingChangeEventProps.sortedColumns.filter(function (item) {
       return item.sortingFieldName != sortingFieldName;
     }), [newSortedColumn]) : [newSortedColumn];
     if (sortingMode == 2 && sortedColumn !== undefined) {
@@ -56197,19 +56208,21 @@ var OdsTimelineTable = forwardRef(function (props, ref) {
         return item;
       });
     }
-    setSortedColumns(newSortedColumns);
-    onSortingChanged && onSortingChanged(newSortedColumns, headerCellProps);
+    setSortingChangeEventProps({
+      sortedColumns: newSortedColumns,
+      columnHeaderProps: headerCellProps
+    });
   };
   var onRemoveSorting = function onRemoveSorting(headerCellProps) {
     var sortingFieldName = getSortingFieldName(headerCellProps.column);
-    var sortedColumn = sortedColumns.find(function (item) {
+    var sortedColumn = sortingChangeEventProps.sortedColumns.find(function (item) {
       return item.sortingFieldName == sortingFieldName;
     });
     if (sortedColumn === undefined) {
       return;
     }
     var prevSortIndex = sortedColumn.sortIndex;
-    var newSortedColumns = sortedColumns.filter(function (item) {
+    var newSortedColumns = sortingChangeEventProps.sortedColumns.filter(function (item) {
       return item.sortingFieldName != sortingFieldName;
     }).map(function (item) {
       if (item.sortIndex > prevSortIndex) {
@@ -56217,8 +56230,10 @@ var OdsTimelineTable = forwardRef(function (props, ref) {
       }
       return item;
     });
-    setSortedColumns(newSortedColumns);
-    onSortingChanged && onSortingChanged(newSortedColumns, headerCellProps);
+    setSortingChangeEventProps({
+      sortedColumns: newSortedColumns,
+      columnHeaderProps: headerCellProps
+    });
   };
   var onTimelineDateRangeChange = function onTimelineDateRangeChange(e) {
     setStartDate(e.startDate);