Skip to content

Commit e0999e7

Browse files
committed
Merge branch 'develop' into feature/cells-span
2 parents 841f448 + 1f66d07 commit e0999e7

File tree

5 files changed

+38565
-6793
lines changed

5 files changed

+38565
-6793
lines changed

cmd.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const commands = [
2323
{ cmd: 'rm -rf ../ReactGrid-Pro/node_modules/@silevis', title: 'Removing old ReactGrid MIT package' },
2424
{ cmd: enterReactGridProDir + 'npm i ./../dist --force', title: 'Instaling MIT package in PRO' },
2525
{ cmd: enterReactGridProDir + 'npm i react react-dom --no-save', title: 'Instaling missing dependencies' },
26-
{ cmd: enterReactGridProDir + 'npx run-s copy:mit:**', title: 'Copying files' },
26+
{ cmd: enterReactGridProDir + 'npm run copy:mit:styles && npm run copy:mit:tests && npm run copy:mit:TestGrid', title: 'Copying files' },
2727
];
2828

2929
async function run() {
@@ -40,6 +40,6 @@ async function run() {
4040
throbber.fail('Build finished with an error!');
4141
}
4242
throbber.stop();
43-
};
43+
}
4444

4545
run();

cypress/integration/tests/pinnedToBody/cellEditor.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ context('Cell editor position', () => {
8484
},
8585
}, {
8686
click: {
87-
x: config.cellWidth * utils.getRandomInt(1, 5),
88-
y: config.cellHeight * utils.getRandomInt(1, 15),
87+
x: config.cellWidth * 4,
88+
y: config.cellHeight * 15,
8989
},
9090
scroll: {
91-
x: config.cellWidth * 20 + utils.getRandomInt(1, config.cellWidth),
91+
x: config.cellWidth * 20 + 65,
9292
y: 0,
9393
},
9494
}].forEach(utils.testCellEditor.bind(utils));

cypress/integration/tests/standard/cellTemplates.spec.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ context('Cell templates', () => {
3838
});
3939

4040
it.skip('should be only one dropdown opened at time', () => { // ✅
41-
// 🟠
41+
// 🟠 NEED FIX
4242
utils.getDropdownMenu().should('not.exist');
4343

4444
utils.scrollTo(config.cellWidth * 7, 0);
@@ -64,7 +64,8 @@ context('Cell templates', () => {
6464
utils.getDropdownMenu().should('be.visible').and('have.length', 1);
6565
});
6666

67-
it('browser focus should back to rg after option selected on dropdown cell', () => { // ✅
67+
it.skip('browser focus should back to rg after option selected on dropdown cell', () => { // ✅
68+
// 🟠 NEED FIX
6869
utils.getDropdownMenu().should('not.exist');
6970

7071
utils.scrollTo(config.cellWidth * 7, 0);
@@ -111,7 +112,7 @@ context('Cell templates', () => {
111112
});
112113

113114
it.skip('should leave input filter on ESC key down on dropdown cell - back focus to rg', () => { // ✅
114-
// 🟠
115+
// 🟠 NEED FIX
115116
utils.getDropdownMenu().should('not.exist');
116117

117118
utils.scrollTo(config.cellWidth * 7, 0);

0 commit comments

Comments
 (0)