Merge branch 'main' into am-draggable

package.json

@@ -65,7 +65,7 @@
     "@microsoft/api-extractor": "^7.23.0",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-node-resolve": "^15.1.0",
-    "@testing-library/jest-dom": "^5.16.4",
+    "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.1.1",
     "@types/lodash-es": "^4.17.7",

test/column/colSpan.test.ts

@@ -1,5 +1,4 @@
 import userEvent from '@testing-library/user-event';
-import { vi } from 'vitest';
 
 import type { Column } from '../../src';
 import { getCellsAtRowIndex, getHeaderCells, setup, validateCellPosition } from '../utils';

test/column/renderCell.test.tsx

@@ -1,7 +1,6 @@
 import { useState } from 'react';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { expect, test, vi } from 'vitest';
 
 import DataGrid from '../../src';
 import type { Column } from '../../src';

test/column/renderEditCell.test.tsx

@@ -2,7 +2,6 @@ import { useMemo, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { act, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { vi } from 'vitest';
 
 import DataGrid from '../../src';
 import type { Column, DataGridProps } from '../../src';

test/column/resizable.test.tsx

@@ -1,5 +1,4 @@
 import { fireEvent } from '@testing-library/react';
-import { expect, test } from 'vitest';
 
 import type { Column } from '../../src';
 import { getGrid, getHeaderCells, setup } from '../utils';

test/copyPaste.test.tsx

@@ -1,6 +1,5 @@
 import { useState } from 'react';
 import userEvent from '@testing-library/user-event';
-import { vi } from 'vitest';
 
 import DataGrid from '../src';
 import type { Column, PasteEvent } from '../src';

test/rowHeight.test.ts

@@ -1,6 +1,5 @@
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { vi } from 'vitest';
 
 import type { Column, DataGridProps } from '../src';
 import { getRows, setup } from './utils';

test/scrollToCell.test.tsx

@@ -1,7 +1,6 @@
 import { useRef } from 'react';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { vi } from 'vitest';
 
 import type { Column, DataGridHandle } from '../src';
 import DataGrid from '../src';

test/setup.ts

@@ -4,7 +4,8 @@ import { act } from 'react-dom/test-utils';
 // as @testing-library/jest-dom may polyfill some DOM APIs like `window.CSS`
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 if (globalThis.window !== undefined) {
-  await import('@testing-library/jest-dom');
+  // @ts-expect-error
+  await import('@testing-library/jest-dom/vitest');
 }
 
 if (typeof window !== 'undefined') {

tsconfig.json

@@ -1,7 +1,8 @@
 {
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
-    "noEmit": true
+    "noEmit": true,
+    "types": ["vitest/globals"]
   },
   "include": ["rollup.config.js", "vite.config.ts", "src/**/*", "test/**/*", "website/**/*"]
 }