Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix navigation conflict with SelectRange and Edit #4516

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix navigation conflict with SelectRange and Edit #4516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/js/modules/Edit/Edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ export default class Edit extends Module{

if(cell){

if(cell.column.modules.edit.navigationBlocked){
return false;
}

if(e){
e.preventDefault();
}
Expand Down Expand Up @@ -208,6 +212,10 @@ export default class Edit extends Module{

if(cell){

if(cell.column.modules.edit.navigationBlocked){
return false;
}

if(e){
e.preventDefault();
}
Expand Down Expand Up @@ -238,6 +246,10 @@ export default class Edit extends Module{

if(cell){

if(cell.column.modules.edit.navigationBlocked){
return false;
}

if(e){
e.preventDefault();
}
Expand All @@ -259,6 +271,10 @@ export default class Edit extends Module{

if(cell){

if(cell.column.modules.edit.navigationBlocked){
return false;
}

if(e){
e.preventDefault();
}
Expand All @@ -280,6 +296,10 @@ export default class Edit extends Module{

if(cell){

if(cell.column.modules.edit.navigationBlocked){
return false;
}

if(e){
e.preventDefault();
}
Expand All @@ -301,6 +321,10 @@ export default class Edit extends Module{

if(cell){

if(cell.column.modules.edit.navigationBlocked){
return false;
}

if(e){
e.preventDefault();
}
Expand Down Expand Up @@ -401,6 +425,7 @@ export default class Edit extends Module{
convertEmptyValues:convertEmpty,
editorEmptyValue:column.definition.editorEmptyValue,
editorEmptyValueFunc:column.definition.editorEmptyValueFunc,
navigationBlocked: false,
};

//set column editor
Expand Down
1 change: 1 addition & 0 deletions src/js/modules/SelectRange/SelectRange.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ export default class SelectRange extends Module {
// Block editor from taking action so we can trigger edit by
// double clicking.
// column.modules.edit.blocked = true;
column.modules.edit.navigationBlocked = true;
}
}

Expand Down
Loading