Merge branch '25_1' into 25_1_ng_nested_fix

Author: GoodDayForSurf

apps/demos/testing/widgets/scheduler/etalons/scheduler_contextMenu_click (fluent.blue.light).png

@@ -0,0 +1,66 @@
+import { CutEvent } from 'devextreme/js/ui/color_box';
+import { EVENT_PROPERTIES } from 'devextreme/js/__internal/events/core/m_consts';
+
+type NATIVE_EVENT_ARGS = KeyboardEvent
+  & PointerEvent
+  & TouchEvent
+  & FocusEvent
+  & WheelEvent
+  & ClipboardEvent;
+
+type NATIVE_EVENT_ARG_NON_PROPS = Pick<KeyboardEvent,
+    'getModifierState'
+    | 'initKeyboardEvent'
+    | 'DOM_KEY_LOCATION_STANDARD'
+    | 'DOM_KEY_LOCATION_LEFT'
+    | 'DOM_KEY_LOCATION_RIGHT'
+    | 'DOM_KEY_LOCATION_NUMPAD'>
+  & Pick<UIEvent, 'initUIEvent'>
+  & Pick<Event,
+    'composedPath'
+    | 'initEvent'
+    | 'preventDefault'
+    | 'stopImmediatePropagation'
+    | 'stopPropagation'
+    | 'NONE'
+    | 'CAPTURING_PHASE'
+    | 'AT_TARGET'
+    | 'BUBBLING_PHASE'>
+  & Pick<PointerEvent, 'getCoalescedEvents' | 'getPredictedEvents'>
+  & Pick<MouseEvent, 'initMouseEvent'>
+  & Pick<WheelEvent, 'DOM_DELTA_PIXEL' | 'DOM_DELTA_LINE' | 'DOM_DELTA_PAGE'>;
+
+type PROPS_ASSIGNED_ELSEWHERE = {
+  type: string;
+  isTrusted: boolean;
+  timeStamp: number;
+  which: number;
+  currentTarget: EventTarget | null;
+
+  // touch hooks
+  clientX: number;
+  clientY: number;
+  pageX: number;
+  pageY: number;
+  screenX: number;
+  screenY: number;
+}
+
+type IGNORED_MEMBERS = NATIVE_EVENT_ARG_NON_PROPS & PROPS_ASSIGNED_ELSEWHERE;
+
+type ASSIGNED_EVENT_ARG_GETTERS = {
+  [Property in typeof EVENT_PROPERTIES[number]]
+};
+
+function fn(): void {
+  let e: CutEvent = undefined as unknown as CutEvent;
+
+  e.event?.originalEvent.clipboardData?.clearData();
+
+  let dxGetters = undefined as unknown as ASSIGNED_EVENT_ARG_GETTERS & IGNORED_MEMBERS;
+  let nativeArgs = undefined as unknown as NATIVE_EVENT_ARGS;
+
+  nativeArgs = dxGetters;
+}
+
+

apps/demos/testing/widgets/scheduler/etalons/scheduler_contextMenu_click (material.blue.light).png

@@ -1825,6 +1825,32 @@ test('DataGrid - Scrolling position is reset to far right on an attempt to scrol
   },
 }));
 
+// T1280020
+test('DataGrid - The "row" parameter in the FocusedRowChanged event refers to a non-focused row if the grid height is small', async (t) => {
+  const dataGrid = new DataGrid('#container');
+  const otherContainer = Selector('#otherContainer');
+
+  await dataGrid.apiOption('focusedRowKey', '2');
+  await t.expect(otherContainer.innerText).eql('2');
+
+  await dataGrid.apiOption('focusedRowKey', '0');
+  await t.expect(otherContainer.innerText).eql('0');
+}).before(async () => createWidget('dxDataGrid', {
+  height: 70,
+  dataSource: [
+    { id: '0' },
+    { id: '1' },
+    { id: '2' },
+  ],
+  scrolling: { mode: 'virtual' },
+  keyExpr: 'id',
+  focusedRowEnabled: true,
+  onFocusedRowChanged(e) {
+    const data = e.row?.data;
+    $('#otherContainer').text(data.id);
+  },
+}));
+
 [true, false].forEach((nativeScroll) => {
   type TestCaseWindow = typeof window & { dataGridScrollableEventValues?: number[] };
 

apps/demos/testing/widgets/scheduler/etalons/scheduler_contextMenu_click.png

@@ -113,7 +113,7 @@ test('Basic drag-n-drop movements from tooltip in month view', async (t) => {
     .ok();
 
   await t
-    .click(scheduler.collectors.find('1').element)
+    .click(scheduler.collectors.find('1', 1).element)
     .expect(scheduler.appointmentTooltip.isVisible()).ok()
     .drag(scheduler.appointmentTooltip.getListItem('Appointment 4').element, 320, 150)
     .expect(await takeScreenshot('drag-n-drop-\'Appointment 4\'-from-tooltip-in-month.png', scheduler.workSpace))

e2e/compilation-cases/T1282141.ts

@@ -8,7 +8,6 @@ fixture.disablePageReloads`Re-render on resize`
   .page(url(__dirname, '../../container.html'));
 
 const createScheduler = async (container, options?): Promise<void> => createWidget('dxScheduler', {
-  ...options,
   currentDate: new Date(2020, 8, 7),
   startDayHour: 8,
   endDayHour: 20,
@@ -27,24 +26,34 @@ const createScheduler = async (container, options?): Promise<void> => createWidg
     endDate: new Date(2020, 8, 7, 9),
     text: 'test',
   }],
+  ...options,
 }, container);
 
-safeSizeTest('Appointment should re-rendered on window resize when width and height not set (T1139566)', async (t) => {
+safeSizeTest('Appointment should re-rendered on window resize-up (T1139566)', async (t) => {
+  const scheduler = new Scheduler('#container');
+  const { element } = scheduler.getAppointment('test');
+
+  await setStyleAttribute(element, 'background-color: red;');
+  await t.resizeWindow(800, 400);
+  await t.expect(await getStyleAttribute(element)).match(/transform: translate\(0px, 0px\); width: 10\d\.\d\d\dpx; height: 50px;/);
+}, [400, 400]).before(async () => createScheduler('#container', { currentView: 'workWeek' }));
+
+safeSizeTest('Appointment should not re-rendered on window resize when width and height not set (T1139566)', async (t) => {
   const scheduler = new Scheduler('#container');
   const { element } = scheduler.getAppointment('test');
 
   await setStyleAttribute(element, 'background-color: red;');
   await t.resizeWindow(300, 300);
-  await t.expect(await getStyleAttribute(element)).eql('transform: translate(0px, 26px); width: 200px; height: 74px;');
+  await t.expect(await getStyleAttribute(element)).eql('transform: translate(0px, 26px); width: 200px; height: 74px; background-color: red;');
 }).before(async () => createScheduler('#container'));
 
-safeSizeTest('Appointment should re-rendered on window resize when width and height have percent value (T1139566)', async (t) => {
+safeSizeTest('Appointment should not re-rendered on window resize when width and height have percent value (T1139566)', async (t) => {
   const scheduler = new Scheduler('#container');
   const { element } = scheduler.getAppointment('test');
 
   await setStyleAttribute(element, 'background-color: red;');
   await t.resizeWindow(300, 400);
-  await t.expect(await getStyleAttribute(element)).eql('transform: translate(0px, 26px); width: 200px; height: 74px;');
+  await t.expect(await getStyleAttribute(element)).eql('transform: translate(0px, 26px); width: 200px; height: 74px; background-color: red;');
 }).before(async () => createScheduler('#container', { width: '100%', height: '100%' }));
 
 safeSizeTest('Appointment should not re-rendered on window resize when width and height have static value (T1139566)', async (t) => {

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

@@ -7,6 +7,7 @@
     "type": "git",
     "url": "https://github.com/DevExpress/devextreme-react.git"
   },
+  "sideEffects": false,
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
   "types": "./cjs/index.d.ts",

e2e/testcafe-devextreme/tests/scheduler/common/dragAndDrop/outlookDragging/base.ts

@@ -238,7 +238,6 @@ type IDropDownOptionsProps = React.PropsWithChildren<{
     hide?: AnimationConfig;
     show?: AnimationConfig;
   };
-  bindingOptions?: Record<string, any>;
   container?: any | string | undefined;
   contentTemplate?: ((contentElement: any) => string | any) | template;
   deferRendering?: boolean;
@@ -461,7 +460,6 @@ const Offset = Object.assign<typeof _componentOffset, NestedComponentMeta>(_comp
 type IOptionsProps = React.PropsWithChildren<{
   accessKey?: string | undefined;
   activeStateEnabled?: boolean;
-  bindingOptions?: Record<string, any>;
   disabled?: boolean;
   elementAttr?: Record<string, any>;
   focusStateEnabled?: boolean;

e2e/testcafe-devextreme/tests/scheduler/common/rerenderOnResize.ts

@@ -290,7 +290,6 @@ const ButtonItem = Object.assign<typeof _componentButtonItem, NestedComponentMet
 type IButtonOptionsProps = React.PropsWithChildren<{
   accessKey?: string | undefined;
   activeStateEnabled?: boolean;
-  bindingOptions?: Record<string, any>;
   disabled?: boolean;
   elementAttr?: Record<string, any>;
   focusStateEnabled?: boolean;
@@ -1118,7 +1117,6 @@ type IFilterBuilderProps = React.PropsWithChildren<{
   accessKey?: string | undefined;
   activeStateEnabled?: boolean;
   allowHierarchicalFields?: boolean;
-  bindingOptions?: Record<string, any>;
   customOperations?: Array<dxFilterBuilderCustomOperation>;
   disabled?: boolean;
   elementAttr?: Record<string, any>;
@@ -1274,7 +1272,6 @@ type IFormProps = React.PropsWithChildren<{
   activeStateEnabled?: boolean;
   alignItemLabels?: boolean;
   alignItemLabelsInAllGroups?: boolean;
-  bindingOptions?: Record<string, any>;
   colCount?: Mode | number;
   colCountByScreen?: Record<string, any> | {
     lg?: number | undefined;
@@ -1802,7 +1799,6 @@ type ILoadPanelProps = React.PropsWithChildren<{
     hide?: AnimationConfig;
     show?: AnimationConfig;
   };
-  bindingOptions?: Record<string, any>;
   container?: any | string | undefined;
   deferRendering?: boolean;
   delay?: number;
@@ -2497,7 +2493,6 @@ type ITabPanelOptionsProps = React.PropsWithChildren<{
   accessKey?: string | undefined;
   activeStateEnabled?: boolean;
   animationEnabled?: boolean;
-  bindingOptions?: Record<string, any>;
   dataSource?: Array<any | dxTabPanelItem | string> | DataSource | DataSourceOptions | null | Store | string;
   deferRendering?: boolean;
   disabled?: boolean;