Merge branch '25_1_ng_nested_fix' of https://github.com/GoodDayForSurf/DevExtreme into 25_1_ng_nested_fix

Author: GoodDayForSurf

apps/demos/Demos/Charts/SmallValueGroups/description.md

@@ -1,2 +1,4 @@
-In this example, the PieChart component combines all values below the **threshold** property in one category called _«others»_.
-<!--split-->
+DevExtreme PieChart supports small value grouping. To enable this functionality, configure the [smallValuesGrouping](/Documentation/ApiReference/UI_Components/dxPieChart/Configuration/series/smallValuesGrouping/) object in [series](/Documentation/ApiReference/UI_Components/dxPieChart/Configuration/series/) or [commonSeriesSettings](/Documentation/ApiReference/UI_Components/dxPieChart/Configuration/commonSeriesSettings/). This demo sets **smallValuesGrouping**.[mode](/Documentation/ApiReference/UI_Components/dxPieChart/Configuration/series/smallValuesGrouping/) to *"smallValueThreshold"* and specifies the [threshold](/Documentation/ApiReference/UI_Components/dxPieChart/Configuration/series/smallValuesGrouping/#threshold) property.
+<!--split-->
+
+You can also set **smallValuesGrouping**.**mode** to *"topN"*. In this mode, PieChart displays a predefined number of the largest data points (specified with [topCount](/Documentation/ApiReference/UI_Components/dxPieChart/Configuration/series/smallValuesGrouping/#topCount)) and groups the rest.

e2e/testcafe-devextreme/tests/dataGrid/common/scrolling.ts

@@ -20,12 +20,12 @@ async function getRightScrollOffset(dataGrid: DataGrid): Promise<number> {
   return maxHorizontalOffset - scrollLeft;
 }
 
-function getData(rowCount, colCount): Record<string, string>[] {
+function getData(rowCount: number, colCount: number): Record<string, string>[] {
   const items: Record<string, string>[] = [];
   for (let i = 0; i < rowCount; i += 1) {
     const item: Record<string, string> = {};
     for (let j = 0; j < colCount; j += 1) {
-      item[`field_${i}_${j}`] = `val_${i}_${j}`;
+      item[`field_${j}`] = `val_${i}_${j}`;
     }
     items.push(item);
   }
@@ -1824,3 +1824,62 @@ test('DataGrid - Scrolling position is reset to far right on an attempt to scrol
     enabled: false,
   },
 }));
+
+[true, false].forEach((nativeScroll) => {
+  type TestCaseWindow = typeof window & { dataGridScrollableEventValues?: number[] };
+
+  test(
+    `Should not scroll back on top with virtual scrolling and adaptive master detail (nativeScroll: ${nativeScroll}) [T1278804]`,
+    async (t) => {
+    // NOTE: idx + 1 logic inside POM
+      const adaptiveCellIdx = 101;
+      const scrollValuesThreshold = 100;
+
+      const dataGrid = new DataGrid('#container');
+      const firstRow = dataGrid.getDataRow(0);
+      const firstDataCell = firstRow.getDataCell(0);
+      const adaptiveCell = firstRow.getCommandCell(adaptiveCellIdx);
+      const scrollContainer = dataGrid.getScrollContainer();
+
+      await t
+        .click(firstDataCell.element)
+        .click(adaptiveCell.element);
+
+      await t
+        .scroll(scrollContainer, 0, 1000)
+        .scroll(scrollContainer, 0, 1000);
+
+      const scrollOffsets = await t
+        .eval(() => (window as TestCaseWindow).dataGridScrollableEventValues) as number[];
+
+      const hasSmallScrollValues = scrollOffsets.some((offset) => offset < scrollValuesThreshold);
+      await t.expect(hasSmallScrollValues).notOk();
+    },
+  ).before(async () => {
+    await createWidget('dxDataGrid', {
+      dataSource: getData(3, 100).map((item, idx) => ({ ...item, id: idx })),
+      keyExpr: 'id',
+      columnHidingEnabled: true,
+      focusedRowEnabled: true,
+      scrolling: {
+        mode: 'virtual',
+        useNative: nativeScroll,
+      },
+      onContentReady: ({ component }) => {
+        const testWindow = window as TestCaseWindow;
+
+        component.getScrollable().on('scroll', ({ scrollOffset: { top } }) => {
+          if (!Array.isArray(testWindow.dataGridScrollableEventValues)) {
+            testWindow.dataGridScrollableEventValues = [];
+          }
+
+          testWindow.dataGridScrollableEventValues.push(top);
+        });
+      },
+      width: 400,
+      height: 400,
+    });
+  }).after(async (t) => t.eval(() => {
+    delete (window as TestCaseWindow).dataGridScrollableEventValues;
+  }));
+});

packages/devextreme/js/__internal/core/utils/m_date.ts

@@ -425,33 +425,37 @@ function getDateIntervalByString(intervalString) {
   return result;
 }
 
-function sameDate(date1, date2) {
+function sameDate(date1, date2): boolean {
   return sameMonthAndYear(date1, date2) && date1.getDate() === date2.getDate();
 }
 
-function sameMonthAndYear(date1, date2) {
+function sameMonthAndYear(date1, date2): boolean {
   return sameYear(date1, date2) && date1.getMonth() === date2.getMonth();
 }
 
-function sameYear(date1, date2) {
+function sameYear(date1, date2): boolean {
   return date1 && date2 && date1.getFullYear() === date2.getFullYear();
 }
 
-function sameHoursAndMinutes(date1, date2) {
+function sameHoursAndMinutes(date1, date2): boolean {
   return date1 && date2 && date1.getHours() === date2.getHours() && date1.getMinutes() === date2.getMinutes();
 }
 
-const sameDecade = function (date1, date2) {
-  if (!isDefined(date1) || !isDefined(date2)) return;
+const sameDecade = function (date1, date2): boolean {
+  if (!isDefined(date1) || !isDefined(date2)) {
+    return false;
+  }
 
   const startDecadeDate1 = date1.getFullYear() - date1.getFullYear() % 10;
   const startDecadeDate2 = date2.getFullYear() - date2.getFullYear() % 10;
 
   return date1 && date2 && startDecadeDate1 === startDecadeDate2;
 };
 
-const sameCentury = function (date1, date2) {
-  if (!isDefined(date1) || !isDefined(date2)) return;
+const sameCentury = function (date1, date2): boolean {
+  if (!isDefined(date1) || !isDefined(date2)) {
+    return false;
+  }
 
   const startCenturyDate1 = date1.getFullYear() - date1.getFullYear() % 100;
   const startCenturyDate2 = date2.getFullYear() - date2.getFullYear() % 100;
@@ -540,41 +544,56 @@ function getLastDateInYear(year) {
 
 function getDayWeekNumber(date, firstDayOfWeek) {
   let day = date.getDay() - firstDayOfWeek + 1;
-  if (day <= 0) { day += DAYS_IN_WEEK; }
+  if (day <= 0) {
+    day += DAYS_IN_WEEK;
+  }
 
   return day;
 }
 
-function getWeekNumber(date, firstDayOfWeek, rule) {
-  const firstWeekDayInYear = getDayWeekNumber(getFirstDateInYear(date.getFullYear()), firstDayOfWeek);
+function getWeekNumber(date, firstDayOfWeek, rule): number {
+  const firstWeekDayInYear = getDayWeekNumber(
+    getFirstDateInYear(date.getFullYear()),
+    firstDayOfWeek,
+  );
   const lastWeekDayInYear = getDayWeekNumber(getLastDateInYear(date.getFullYear()), firstDayOfWeek);
   const daysInFirstWeek = DAYS_IN_WEEK - firstWeekDayInYear + 1;
 
   let weekNumber = Math.ceil((getDayNumber(date) - daysInFirstWeek) / 7);
   switch (rule) {
     case 'fullWeek': {
-      if (daysInFirstWeek === DAYS_IN_WEEK) { weekNumber++; }
+      if (daysInFirstWeek === DAYS_IN_WEEK) {
+        weekNumber += 1;
+      }
       if (weekNumber === 0) {
         const lastDateInPreviousYear = getLastDateInYear(date.getFullYear() - 1);
         return getWeekNumber(lastDateInPreviousYear, firstDayOfWeek, rule);
       }
       return weekNumber;
     }
     case 'firstDay': {
-      if (daysInFirstWeek > 0) { weekNumber++; }
+      if (daysInFirstWeek > 0) {
+        weekNumber += 1;
+      }
 
       const isSunday = firstWeekDayInYear === SUNDAY_WEEK_NUMBER
                 || lastWeekDayInYear === SUNDAY_WEEK_NUMBER;
-      if ((weekNumber > USUAL_WEEK_COUNT_IN_YEAR && !isSunday) || weekNumber === 54) { weekNumber = 1; }
+      if ((weekNumber > USUAL_WEEK_COUNT_IN_YEAR && !isSunday) || weekNumber === 54) {
+        weekNumber = 1;
+      }
 
       return weekNumber;
     }
     case 'firstFourDays': {
-      if (daysInFirstWeek > 3) { weekNumber++; }
+      if (daysInFirstWeek > 3) {
+        weekNumber += 1;
+      }
 
       const isThursday = firstWeekDayInYear === THURSDAY_WEEK_NUMBER
                 || lastWeekDayInYear === THURSDAY_WEEK_NUMBER;
-      if (weekNumber > USUAL_WEEK_COUNT_IN_YEAR && !isThursday) { weekNumber = 1; }
+      if (weekNumber > USUAL_WEEK_COUNT_IN_YEAR && !isThursday) {
+        weekNumber = 1;
+      }
 
       if (weekNumber === 0) {
         const lastDateInPreviousYear = getLastDateInYear(date.getFullYear() - 1);
@@ -583,6 +602,7 @@ function getWeekNumber(date, firstDayOfWeek, rule) {
       return weekNumber;
     }
     default:
+      return weekNumber;
       break;
   }
 }
@@ -699,7 +719,7 @@ const makeDate = function (date) {
 };
 
 const getDatesOfInterval = function (startDate, endDate, step) {
-  const result: any[] = [];
+  const result: Date[] = [];
   let currentDate = new Date(startDate.getTime());
 
   while (currentDate < endDate) {

packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts

@@ -3006,7 +3006,9 @@ const adaptiveColumns = (Base: ModuleType<AdaptiveColumnsController>) => class A
   protected _hideVisibleColumnInView({ view, isCommandColumn, visibleIndex }) {
     super._hideVisibleColumnInView({ view, isCommandColumn, visibleIndex });
     if (view.name === ROWS_VIEW) {
-      this._rowsView.renderFocusState(null);
+      this._rowsView.renderFocusState({
+        preventScroll: shouldPreventScroll(this),
+      });
     }
   }
 };