Merge branch 'olifolkerd:master' into Fix-header-and-footer-height-calculation-issue-with-CSS-transform-scale

Author: plc-dev

src/js/core/ColumnManager.js

@@ -93,7 +93,6 @@ export default class ColumnManager extends CoreFeature {
 		var el = document.createElement("div");
 
 		el.classList.add("tabulator-header-contents");
-		el.setAttribute("role", "rowgroup");
 
 		return el;
 	}
@@ -787,4 +786,4 @@ export default class ColumnManager extends CoreFeature {
 
 		this.table.footerManager.redraw();
 	}
-}
+}

src/js/core/RowManager.js

@@ -61,6 +61,7 @@ export default class RowManager extends CoreFeature{
 
 		el.classList.add("tabulator-table");
 		el.setAttribute("role", "rowgroup");
+		el.setAttribute("id", "tabulator-table-body");
 
 		return el;
 	}

src/js/core/Tabulator.js

@@ -232,6 +232,7 @@ class Tabulator extends ModuleBinder{
 
 		element.classList.add("tabulator");
 		element.setAttribute("role", "grid");
+		element.setAttribute("aria-owns", "tabulator-table-body");
 
 		//empty element
 		while(element.firstChild) element.removeChild(element.firstChild);

src/js/modules/Edit/Edit.js

@@ -69,13 +69,19 @@ export default class Edit extends Module{
 		this.subscribe("data-refreshing", this.cancelEdit.bind(this));
 		this.subscribe("clipboard-paste", this.pasteBlocker.bind(this));
 
-		this.subscribe("keybinding-nav-prev", this.navigatePrev.bind(this, undefined));
-		this.subscribe("keybinding-nav-next", this.keybindingNavigateNext.bind(this));
-		
-		// this.subscribe("keybinding-nav-left", this.navigateLeft.bind(this, undefined));
-		// this.subscribe("keybinding-nav-right", this.navigateRight.bind(this, undefined));
-		this.subscribe("keybinding-nav-up", this.navigateUp.bind(this, undefined));
-		this.subscribe("keybinding-nav-down", this.navigateDown.bind(this, undefined));
+		if (!this.confirm("edit-nav-disabled")) {
+			this.subscribe("keybinding-nav-prev", this.navigatePrev.bind(this, undefined));
+			this.subscribe("keybinding-nav-next", this.keybindingNavigateNext.bind(this));
+			
+			// this.subscribe("keybinding-nav-left", this.navigateLeft.bind(this, undefined));
+			// this.subscribe("keybinding-nav-right", this.navigateRight.bind(this, undefined));
+			this.subscribe("keybinding-nav-up", this.navigateUp.bind(this, undefined));
+			this.subscribe("keybinding-nav-down", this.navigateDown.bind(this, undefined));
+		}
+    
+    // Add event handlers for other modules to access editing state and functionality
+		this.subscribe("edit-check-editing", this.checkEditing.bind(this));
+		this.subscribe("edit-cancel-cell", this.cancelEditEvent.bind(this));
 
 		if(Object.keys(this.table.options).includes("editorEmptyValue")){
 			this.convertEmptyValues = true;
@@ -449,6 +455,19 @@ export default class Edit extends Module{
 		return this.currentCell ? this.currentCell.getComponent() : false;
 	}
 
+	checkEditing(){
+		return !!this.currentCell;
+	}
+	
+	cancelEditEvent(){
+		if(this.currentCell){
+			this.cancelEdit();
+			return true;
+		}
+		return false;
+	}
+	
+	
 	clearEditor(cancel){
 		var cell = this.currentCell,
 		cellEl;

src/js/modules/SelectRange/SelectRange.js

@@ -33,6 +33,7 @@ export default class SelectRange extends Module {
 		this.registerTableOption("selectableRangeClearCells", false); //allow clearing of active range
 		this.registerTableOption("selectableRangeClearCellsValue", undefined); //value for cleared active range
 		this.registerTableOption("selectableRangeAutoFocus", true); //focus on a cell after resetRanges
+		this.registerTableOption("selectableRangeBlurEditOnNavigate", undefined); //prevent editing on navigation
 
 		this.registerTableFunction("getRangesData", this.getRangesData.bind(this));
 		this.registerTableFunction("getRanges", this.getRanges.bind(this));
@@ -66,6 +67,10 @@ export default class SelectRange extends Module {
 				console.warn("Having multiple frozen columns with selectRange option may result in unpredictable behavior.");
 			}
 		}
+		
+		this.subscribe("edit-nav-disabled", () => {
+			return true; // Disable navigation in edit module
+		});
 	}
 
 
@@ -128,8 +133,8 @@ export default class SelectRange extends Module {
 		this.subscribe("edit-editor-clear", this.finishEditingCell.bind(this));
 		this.subscribe("edit-blur", this.restoreFocus.bind(this));
 
-		this.subscribe("keybinding-nav-prev", this.keyNavigate.bind(this, "left"));
-		this.subscribe("keybinding-nav-next", this.keyNavigate.bind(this, "right"));
+		this.subscribe("keybinding-nav-prev", this.keyNavigate.bind(this, "prev"));
+		this.subscribe("keybinding-nav-next", this.keyNavigate.bind(this, "next"));
 		this.subscribe("keybinding-nav-left", this.keyNavigate.bind(this, "left"));
 		this.subscribe("keybinding-nav-right", this.keyNavigate.bind(this, "right"));
 		this.subscribe("keybinding-nav-up", this.keyNavigate.bind(this, "up"));
@@ -142,12 +147,6 @@ export default class SelectRange extends Module {
 		if(this.columnSelection && column.definition.headerSort && this.options("headerSortClickElement") !== "icon"){
 			console.warn("Using column headerSort with selectableRangeColumns option may result in unpredictable behavior. Consider using headerSortClickElement: 'icon'.");
 		}
-		
-		if (column.modules.edit) {
-			// Block editor from taking action so we can trigger edit by
-			// double clicking.
-			// column.modules.edit.blocked = true;
-		}
 	}
 
 	updateHeaderColumn(){
@@ -403,6 +402,25 @@ export default class SelectRange extends Module {
 	///////////////////////////////////
 
 	keyNavigate(dir, e){
+		if(this.options("selectableRangeBlurEditOnNavigate")){
+			const isEditing = this.chain("edit-check-editing");
+			
+			if(isEditing){
+				if(dir === 'next' || dir === 'prev'){
+					this.dispatch("edit-cancel-cell");
+				}else{
+					// Prevent navigating while editing except for next/prev
+					return false;
+				}
+			}
+		}
+
+		if (dir === 'prev') {
+			dir = 'left';
+		} else if (dir === 'next') {
+			dir = 'right';
+		}
+
 		if(this.navigate(false, false, dir)){
 			e.preventDefault();
 		}