CDB: Refacto separators

bin/cdb.css

@@ -183,7 +183,8 @@
   padding-bottom: 0px;
 }
 .cdb .cdb-sheet tr.filtered,
-.cdb .cdb-sheet tr.hidden {
+.cdb .cdb-sheet tr.hidden,
+.cdb .cdb-sheet tr.sep-hidden {
   display: none;
 }
 .cdb .cdb-sheet tr.clickable {

bin/cdb.less

@@ -189,7 +189,7 @@
 			padding-bottom : 0px;
 		}
 
-		tr.filtered, tr.hidden {
+		tr.filtered, tr.hidden, tr.sep-hidden {
 			display : none;
 		}
 

hide/comp/cdb/Cursor.hx

@@ -406,7 +406,7 @@ class Cursor {
 		}
 
 		updateSelection();
-		table.showSeparator(line);
+		table.revealLine(line.index);
 		update();
 	}
 

hide/comp/cdb/Separator.hx

@@ -0,0 +1,283 @@
+package hide.comp.cdb;
+
+@:access(hide.comp.cdb.Table)
+class Separator extends Component {
+	public static var SEPARATOR_KEY = "sep";
+
+	public var table : Table;
+	public var data : cdb.Data.Separator;
+	public var parent : Separator;
+	public var subs : Array<Separator> = [];
+
+	var visible(get, null) : Bool; // Is the separator visible (i.e. parent separators aren't collapsed )
+	var filtered : Bool = false;
+	var expanded : Bool = true;
+
+	public function new(root : Element, table: Table, data : cdb.Data.Separator) {
+		this.table = table;
+		this.data = data;
+		this.saveDisplayKey = SEPARATOR_KEY;
+
+		var e = new Element('<tr class="separator">
+			<td colspan="${table.columns.length + 1}">
+				<a href="#" class="toggle"></a>
+				<span></span>
+			</td>
+		</tr>');
+
+		super(root, e);
+
+		var toggleBtn = e.find("a");
+		var content = e.find("span");
+		if( data.title != null )
+			e.addClass(StringTools.replace('separator-${data.title}'.toLowerCase(), " ", "-"));
+
+		refresh();
+
+		element.contextmenu(function(e) {
+			var allowedParents : Array<Separator> = [];
+
+			var allowedParent = this.parent;
+			while (allowedParent != null) {
+				allowedParents.push(allowedParent);
+				allowedParent = allowedParent.parent;
+			}
+
+			allowedParents.push(null);
+			allowedParents.reverse();
+
+			if (this.parent != null && this.parent.subs.length > 1 && this.parent.subs[0] != this) {
+				var prevSibling = this.parent.subs[this.parent.subs.indexOf(this) - 1];
+				allowedParents.push(prevSibling);
+			}
+
+			var opts : Array<hide.comp.ContextMenu.MenuItem> = [
+				{ label : "Expand", click : function() expand() },
+				{ label : "Collapse", click : function() collapse() },
+				{
+					label : "Parent",
+					enabled : allowedParents.length > 1,
+					menu : [for( p in allowedParents ) {
+						var level = p == null ? 0 : p.data.level == null ? 0 : p.data.level;
+						{
+							label : p == null ? "(None)" : [for ( i in 0...(level + 1)) ""].join("  ")+p.data.title,
+							checked : p == this.parent,
+							click : function() {
+								table.editor.beginChanges();
+
+								function rec(s : Separator, newLevel : Int) {
+									s.data.level = newLevel;
+									for (sub in s.subs)
+										rec(sub, newLevel + 1);
+								}
+
+								var newLevel : Int = p == null ? 0 : p.data.level == null ? 1 : p.data.level + 1;
+								rec(this, newLevel);
+								table.editor.endChanges();
+								table.refresh();
+							},
+						}
+					}]
+				},
+				{ label : "", isSeparator : true },
+				{ label : "Expand All", click : function() {
+					for (s in table.separators)
+						s.expand();
+				}},
+				{ label : "Collapse All", click : function() {
+					for (s in table.separators)
+						s.collapse();
+				}},
+				{ label : "", isSeparator : true },
+				{ label : "Expand Children", click : function() {
+					function rec(s : Separator) {
+						s.expand();
+						for (sub in s.subs)
+							sub.expand();
+					}
+					rec(this);
+				}},
+				{ label : "Collapse Children", click : function() {
+					function rec(s : Separator) {
+						s.collapse();
+						for (sub in s.subs)
+							sub.collapse();
+					}
+					rec(this);
+				}},
+				{ label : "Collapse Others", click : function() {
+					var ignoreList = [this];
+					var parent = this.parent;
+					while(parent != null) {
+						ignoreList.push(parent);
+						parent = parent.parent;
+					}
+
+					for (s in table.separators)
+						if (!ignoreList.contains(s))
+							s.collapse();
+				}},
+				{ label : "", isSeparator : true },
+				{ label : "Remove", enabled : !table.sheet.props.hide, click : function() {
+					table.editor.beginChanges();
+					table.sheet.separators.splice(@:privateAccess table.separators.indexOf(this), 1);
+					table.editor.endChanges();
+					table.editor.refresh();
+				}}
+			];
+			#if js
+			if( data.path != null )
+				opts.unshift({
+					label : "Open",
+					click : function() {
+						ide.openFile(data.path);
+					},
+				});
+			#end
+			hide.comp.ContextMenu.createFromPoint(ide.mouseX, ide.mouseY, opts);
+		});
+
+		element.dblclick(function(e) {
+			if( !table.canInsert() ) return;
+			content.empty();
+			new Element("<input>").appendTo(content).focus().val(data.title == null ? "" : data.title).blur(function(e) {
+				var newTitle = Element.getVal(e.getThis());
+				var prevTitle = data.title;
+				e.getThis().remove();
+
+				table.editor.beginChanges();
+				if( newTitle == "" ) newTitle = null;
+				if( newTitle == null )
+					Reflect.deleteField(data, "title");
+				else
+					data.title = newTitle;
+
+				if (prevTitle != null && newTitle == null)
+					data.level = data.level == null ? data.level = 1 : data.level + 1;
+				else if (prevTitle == null && newTitle != null)
+					data.level = data.level == 1 ? null : data.level - 1;
+
+				if (data.level == null)
+					Reflect.deleteField(data, "level");
+
+				table.editor.endChanges();
+				table.refresh();
+
+				var l = getLines();
+				if( l.length > 0 ) {
+					if( l[0].cells.length > 0 )
+						l[0].cells[0].focus();
+				}
+			}).keypress(function(e) {
+				e.stopPropagation();
+			}).keydown(function(e) {
+				if( e.keyCode == 13 ) { e.getThis().blur(); e.preventDefault(); } else if( e.keyCode == 27 ) content.text(data.title);
+				e.stopPropagation();
+			});
+		});
+
+		toggleBtn.dblclick(function(e) e.stopPropagation());
+		toggleBtn.click((e) -> toggle());
+	}
+
+	public function refresh(refreshChildren : Bool = true) {
+		expanded = getDisplayState(getSeparatorKey());
+		if (expanded == null) expanded = true;
+
+		var content = element.find("span");
+		var toggle = element.find("a");
+
+		toggle.toggle(data.title != null);
+		toggle.text(expanded ? "🡇" : "🡆");
+
+		function getLineCountRec(s : Separator) : Int {
+			var count = s.getLines().length;
+			for (sub in s.subs)
+				count += getLineCountRec(sub);
+
+			return count;
+		}
+
+		content.text(data.title == null ? "" : data.title+(expanded ? "" : " ("+getLineCountRec(this)+")"));
+		element.toggleClass("sep-hidden", !visible);
+
+		var lines = getLines();
+		for (l in lines) {
+			l.hide();
+			if (getLinesVisiblity())
+				l.create();
+		}
+
+		element.attr("level", data.level == null ? 0 : data.level);
+		element.removeClass("seplevel-"+(data.level == null ? 0 : data.level));
+		element.addClass('seplevel-'+(data.level == null ? 0 : data.level));
+
+		if (refreshChildren) {
+			for (s in subs)
+				s.refresh();
+		}
+	}
+
+
+	public function toggle() {
+		if (this.expanded)
+			collapse();
+		else
+			expand();
+	}
+
+	public function expand() {
+		setState(true);
+	}
+
+	public function collapse() {
+		setState(false);
+	}
+
+	public function reveal() {
+		var s = this;
+		while (s != null) {
+			s.expand();
+			s = s.parent;
+		}
+	}
+
+	function setState(expand : Bool) {
+		if (expand == this.expanded)
+			return;
+
+		expanded = expand;
+		saveDisplayState(getSeparatorKey(), expanded);
+		refresh();
+	}
+
+
+	function get_visible() {
+		if (parent == null)
+			return true;
+		return parent.visible && parent.expanded && !filtered;
+	}
+
+	public function getLinesVisiblity() {
+		return visible && expanded && !filtered;
+	}
+
+	public function getLines() {
+		var sIdx = @:privateAccess table.separators.indexOf(this);
+		var startIdx = data.index;
+		var endIdx = sIdx < table.sheet.separators.length - 1 ? table.sheet.separators[sIdx + 1].index : table.sheet.lines.length;
+		return [for (idx in startIdx...endIdx) table.lines[idx]];
+	}
+
+	function getSeparatorKey() : String {
+		var key = this.data.title;
+
+		var parent = this.parent;
+		while(parent != null) {
+			key = '${parent.getSeparatorKey()}/$key';
+			parent = parent.parent;
+		}
+
+		return key;
+	}
+}

hide/comp/cdb/Table.hx

@@ -7,9 +7,6 @@ enum DisplayMode {
 	AllProperties;
 }
 
-private typedef SepTree = { sep : cdb.Data.Separator, index : Int, subs : Array<SepTree>, parent : SepTree };
-private typedef Separator = { index : Int, element : Element, toggle : Element, hidden : Null<Bool> };
-
 class Table extends Component {
 
 	public var editor : Editor;
@@ -297,29 +294,56 @@ class Table extends Component {
 
 		var tbody = J("<tbody>");
 
-		var groupClass : String = null;
-		var sepIndex = -1, sepNext = sheet.separators[++sepIndex], hidden = false;
+		var sepIndex = -1;
+		var sepNext = sheet.separators[++sepIndex];
 		separators = [];
-		for( i in 0...lines.length+1 ) {
+		for( i in 0...lines.length ) {
+			// Create the separator of this index if there is one
 			while( sepNext != null && sepNext.index == i ) {
-				var sep = makeSeparator(sepIndex, colCount);
+				var sep = new Separator(tbody, this, sepNext);
+
+				// Create children relation between separators
+				var prevSep = separators[separators.length - 1];
+				if (prevSep != null) {
+					var prevLevel = prevSep.data.level == null ? 0 : prevSep.data.level;
+					var curLevel = sep.data.level == null ? 0 : sep.data.level;
+					if (prevLevel < curLevel) {
+						prevSep.subs.push(sep);
+						sep.parent = prevSep;
+					}
+					else if (prevLevel == curLevel) {
+						prevSep?.parent?.subs?.push(sep);
+						sep.parent = prevSep?.parent;
+					}
+					else {
+						var parent = prevSep;
+						var level = prevLevel;
+						while (parent != null && level >= curLevel) {
+							parent = parent.parent;
+							level = parent?.data?.level;
+							if (level == null)
+								level = 0;
+						}
+
+						parent?.subs?.push(sep);
+						sep.parent = parent;
+					}
+				}
+
 				separators.push(sep);
 				sep.element.appendTo(tbody);
-				if( sep.hidden != null ) hidden = sep.hidden;
-				if( sepNext.title != null )
-					groupClass = "group-"+StringTools.replace(sepNext.title.toLowerCase(), " ", "-");
 				sepNext = sheet.separators[++sepIndex];
 			}
-			if( i == lines.length ) break;
+
+			// Create lines
+			var parentSep = separators.length > 0 ? separators[separators.length - 1] : null;
 			var line = lines[i];
-			if( hidden )
+			line.create();
+			if (parentSep != null && !parentSep.getLinesVisiblity())
 				line.hide();
-			else
-				line.create();
-			if( groupClass != null )
-				line.element.addClass(groupClass);
 			tbody.append(line.element);
 		}
+
 		element.append(tbody);
 
 		if( colCount == 0 ) {
@@ -369,404 +393,11 @@ class Table extends Component {
 		return pickedLine;
 	}
 
-	function makeSeparatorTree( ?root ) {
-		var parent : SepTree = { sep : null, index : -1, subs : [], parent : null };
-		var prev = parent;
-		var prevLevel = -1;
-
-		var stack = [];
-		var select = parent;
-
-		for( index => s in sheet.separators ) {
-			var lv = s.level;
-			if( lv == null ) lv = 0;
-
-			if( prevLevel > lv ) {
-				for (idx in 0...(prevLevel - lv))
-					stack.pop();
-
-				parent = stack[stack.length - 1];
-			}
-
-			if( prevLevel < lv ) {
-				stack.push(prev);
-				parent = prev;
-			}
-
-			var sep = { sep : s, index : index, subs : [], parent : parent };
-			parent.subs.push(sep);
-			prevLevel = lv;
-			prev = sep;
-
-			if( s == root ) select = sep;
-		}
-
-		return select;
-	}
-
-	function getSeparatorKey(index : Int) : String {
-		var key = sheet.separators[index].title;
-
-		function findPrevious(s : cdb.Data.Separator) : cdb.Data.Separator{
-			var idx = sheet.separators.indexOf(s) - 1;
-			var sepInfo = sheet.separators[idx + 1];
-			while(idx >= 0) {
-				var l1 = sheet.separators[idx].level;
-				var l2 = sepInfo.level;
-				if (l1 == null) l1 = 0;
-				if (l2 == null) l2 = 0;
-				if (l2 > l1)
-					break;
-				idx--;
-			}
-
-			if (idx != 0)
-				return sheet.separators[idx];
-
-			return null;
-		}
-
-		var prev = findPrevious(sheet.separators[index]);
-		while(prev != null) {
-			key = '${prev.title}/${key}';
-			prev = findPrevious(prev);
-		}
-
-		return 'seps/${key}';
-	}
-
-	function isSepHidden(index) {
-		return getDisplayState(getSeparatorKey(index)) == false;
-	}
-
-	function setSepHidden(sep : Separator, hidden : Bool) {
-		sep.hidden = hidden;
-		saveDisplayState(getSeparatorKey(sep.index), !hidden);
-	}
-
-	public function expandLine(line: Int) {
-		var sepIndex = -1;
-		for( i in 0...sheet.separators.length ) {
-			if( sheet.separators[i].index > line )
-				break;
-			sepIndex = i;
-		}
-		if( sepIndex < 0 )
-			return;
-		var subs = element.find("tr.separator");
-		var t = makeSeparatorTree(sheet.separators[sepIndex]);
-
-		// We need to open the separators starting from the first parent, else the columns get duplicated
-		var reverseParentList = [];
-
-		while( t.parent != null ) {
-			reverseParentList.unshift(t);
-			t = t.parent;
-		}
-
-		for (t in reverseParentList) {
-			if( isSepHidden(t.index) )
-				new Element(subs.get(t.index)).find("a.toggle").click();
-		}
-	}
-
-	function makeSeparator( sindex : Int, colCount : Int ) : Separator {
-		var sep = J("<tr>").addClass("separator").attr("sindex", sindex).append(J('<td colspan="${colCount+1}"><a href="#" class="toggle"></a><span></span></td>'));
-		var content = sep.find("span");
-		var toggle = sep.find("a");
-		var sepInfo = sheet.separators[sindex];
-		var title = sepInfo.title;
-		if( title != null )
-			sep.addClass(StringTools.replace('separator-$title'.toLowerCase(), " ", "-"));
-
-		var data = { hidden : false, element : sep, toggle : toggle, index : sindex };
-
-		var curLevel = sepInfo.level;
-		if( curLevel == null ) curLevel = 0;
-
-		function getLines( ?filter ) {
-			var snext = 0, sref = -1, scur = -1;
-			var out = [];
-			for( i in 0...lines.length ) {
-				while( true ) {
-					var sep = sheet.separators[snext];
-					if( sep == null || sep.index != i ) break;
-					if( sep.title != null ) {
-						scur = snext;
-						if( sep.level == null || sep.level <= curLevel )
-							sref = snext;
-					}
-					snext++;
-				}
-				if( sref == sindex && (filter == null || scur == filter) )
-					out.push(lines[i]);
-			}
-			return out;
-		}
-
-		var syncLevel : Int = -1;
-		function sync() {
-			setSepHidden(data, title == null ? false : isSepHidden(sindex));
-			toggle.toggle(title != null);
-			toggle.text(data.hidden ? "🡆" : "🡇");
-			content.text(title == null ? "" : title+(data.hidden ? " ("+getLines().length+")" : ""));
-			sep.toggleClass("sep-hidden", data.hidden == true);
-			var def = #if js null #else 0 #end;
-			if( syncLevel != sepInfo.level ) {
-				sep.removeClass("seplevel-"+(syncLevel == def ? 0 : syncLevel));
-				syncLevel = sepInfo.level;
-				sep.addClass('seplevel-'+(syncLevel == def ? 0 : syncLevel));
-			}
-			sep.attr("level", syncLevel == def ? 0 : sepInfo.level);
-		}
-
-		sync();
-
-		// Separator hide itself if parent is hidden
-		var level = curLevel - 1;
-		while( level >= 0 ) {
-			for( i in 0...sindex ) {
-				var s = sheet.separators[sindex - 1 - i];
-				if( s.title != null && (s.level == null || s.level == level) ) {
-					if( isSepHidden(sindex - 1 - i) ) {
-						sep.hide();
-						setSepHidden(data, true);
-					}
-					break;
-				}
-			}
-			level--;
-		}
-
-		sep.contextmenu(function(e) {
-
-			var parents = [];
-			var minLevel = -1;
-			for( i in 0...sindex ) {
-				var sep = sheet.separators[sindex - 1 - i];
-				var level = sep.level == null ? 0 : sep.level;
-				if( minLevel < 0 || level < minLevel ) {
-					parents.unshift(sep);
-					minLevel = level;
-				}
-			}
-			parents.unshift(null);
-
-			var hasChildren = makeSeparatorTree(sepInfo).subs.length > 0;
-
-			function expand(show) {
-				var subs = element.find("tr.separator");
-				function showRec(t:SepTree) {
-					if( !show ) {
-						for( s in t.subs )
-							showRec(s);
-					}
-					if( isSepHidden(t.index) == show )
-						new Element(subs.get(t.index)).find("a.toggle").click();
-					if( show ) {
-						for( s in t.subs )
-							showRec(s);
-					}
-				}
-				showRec(makeSeparatorTree(sepInfo));
-			}
-
-			var opts : Array<hide.comp.ContextMenu.MenuItem> = [
-
-				{ label : "Expand", click : function() expand(true) },
-				{ label : "Collapse", click : function() expand(false) },
-				{
-					label : "Parent",
-					enabled : parents.length > 0,
-					menu : [for( s in parents ) {
-						var level = s == null ? 0 : s.level == null ? 1 : s.level + 1;
-						{
-							label : s == null ? "(None)" : [for( i in 0...level ) ""].join("  ")+s.title,
-							checked : s == null ? sepInfo.level == null : sepInfo.level == level,
-							click : function() {
-								editor.beginChanges();
-								var delta = level - (sepInfo.level == null ? 0 : sepInfo.level);
-								function deltaRec( t : SepTree ) {
-									var level = t.sep.level;
-									if( level == null ) level = 0;
-									level += delta;
-									if( level == 0 )
-										Reflect.deleteField(t.sep,"level")
-									else
-										t.sep.level = level;
-									for( s in t.subs )
-										deltaRec(s);
-								}
-								deltaRec(makeSeparatorTree(sepInfo));
-								editor.endChanges();
-								refresh();
-							},
-						}
-					}]
-				},
-				{ label : "", isSeparator : true },
-				{ label : "Expand All", click : function() {
-					element.find("tr.separator.sep-hidden a.toggle").click();
-				}},
-				{ label : "Expand Children", click : function() {
-					function recExpand(s : SepTree) {
-						var sepEl = separators[s.index].element;
-						if (sepEl.hasClass("sep-hidden"))
-							sepEl.find("a.toggle").click();
-
-						for (sub in s.subs)
-							recExpand(sub);
-					}
-
-					var t = makeSeparatorTree(sepInfo);
-					recExpand(t);
-				}},
-				{ label : "Collapse All", click : function() {
-					element.find("tr.separator").not(".sep-hidden").find("a.toggle").click();
-				}},
-				{ label : "Collapse Children", click : function() {
-					function recExpand(s : SepTree) {
-						var sepEl = separators[s.index].element;
-						if (!sepEl.hasClass("sep-hidden"))
-							sepEl.find("a.toggle").click();
-
-						for (sub in s.subs)
-							recExpand(sub);
-					}
-
-					var t = makeSeparatorTree(sepInfo);
-					recExpand(t);
-				}},
-				{ label : "Collapse Others", click : function() {
-					var directParents = [];
-					var t = makeSeparatorTree(sepInfo);
-					while (t != null && t.index >= 0) {
-						directParents.push(t.index);
-						t = t.parent;
-					}
-					var selector = element.find("tr.separator").not(".sep-hidden").not((_, e) -> directParents.contains(Std.parseInt(e.getAttribute("sindex"))));
-					selector.find("a.toggle").click();
-					if (sep.hasClass("sep-hidden"))
-						sep.find("a.toggle").click();
-				}},
-				{ label : "", isSeparator : true },
-				{ label : "Remove", enabled : !sheet.props.hide, click : function() {
-					editor.beginChanges();
-					sheet.separators.splice(sindex, 1);
-					editor.endChanges();
-					editor.refresh();
-				}}
-			];
-			#if js
-			if( sepInfo.path != null )
-				opts.unshift({
-					label : "Open",
-					click : function() {
-						ide.openFile(sepInfo.path);
-					},
-				});
-			#end
-			hide.comp.ContextMenu.createFromPoint(ide.mouseX, ide.mouseY, opts);
-		});
-
-		sep.dblclick(function(e) {
-			if( !canInsert() ) return;
-			content.empty();
-			J("<input>").appendTo(content).focus().val(title == null ? "" : title).blur(function(e) {
-				title = Element.getVal(e.getThis());
-				e.getThis().remove();
-				if( title == "" ) title = null;
-				editor.beginChanges();
-				var sep = sheet.separators[sindex];
-				var prevTitle = sep.title;
-				if( title == null )
-					Reflect.deleteField(sep,"title");
-				else
-					sep.title = title;
-				if( prevTitle != null ) {
-					if( title == null ) {
-						if( sep.level == null ) sep.level = 0;
-						sep.level++;
-					}
-				} else if( title != null && sep.level > 0 ) {
-					sep.level--;
-					if( sep.level == 0 )
-						Reflect.deleteField(sep,"level");
-				}
-				editor.endChanges();
-				sync();
-				var l = getLines();
-				if( l.length > 0 ) {
-					if( l[0].cells.length > 0 )
-						l[0].cells[0].focus();
-				}
-			}).keypress(function(e) {
-				e.stopPropagation();
-			}).keydown(function(e) {
-				if( e.keyCode == 13 ) { e.getThis().blur(); e.preventDefault(); } else if( e.keyCode == 27 ) content.text(title);
-				e.stopPropagation();
-			});
-		});
-
-		toggle.dblclick(function(e) e.stopPropagation());
-
-		toggle.click(function(e) {
-			setSepHidden(data, !data.hidden);
-			var hidden = data.hidden;
-			sync();
-
-			for( l in getLines( hidden ? null : sindex ) ) {
-				l.hide();
-				if( !hidden ) {
-					l.create();
-				}
-			}
-
-			var subs = element.find("tr.separator");
-			function toggleRec( t : SepTree ) {
-				var sid = sheet.separators.indexOf(t.sep);
-				subs.eq(sid).toggle(!hidden);
-				if( !hidden ) {
-					if( isSepHidden(sid) ) return;
-					for( l in getLines(sid) )
-						l.create();
-				}
-				for( s in t.subs )
-					toggleRec(s);
-			}
-			for( s in makeSeparatorTree(sepInfo).subs )
-				toggleRec(s);
-
-			editor.updateFilter();
-		});
-
-		return data;
-	}
-
-	public function showSeparator( line : Line ) {
-		if( separators == null ) return;
-
-		// Find which separators needs to be open to show this line
-		var sepIndexes = [];
-		for( i in 0...sheet.separators.length ) {
-			var s = sheet.separators[i];
-			if( s.index > line.index )
-				break;
-
-			if( s.level == null )
-				sepIndexes = [];
-
-			var pos = s.level != null ? s.level : 0;
-			sepIndexes[pos] = i;
-			sepIndexes = sepIndexes.slice(0, pos + 1);
-		}
-
-		// Open concerned separators
-		for( sepIdx in sepIndexes ) {
-			var sep = separators[sepIdx];
-			if( sep != null && sep.hidden ) {
-				sep.toggle.click();
-			}
+	public function revealLine(line: Int) {
+		if (this.separators == null) return;
+		for (sIdx in 0...this.separators.length) {
+			if (this.separators[sIdx].data.index > line)
+				this.separators[sIdx - 1].reveal();
 		}
 	}
 

hide/view/CdbTable.hx

@@ -119,7 +119,7 @@ class CdbTable extends hide.ui.View<{}> {
 				editor.cursor.set(curTable, colNo, lineNo, i == path.length-1, true);
 				lastCell = editor.cursor.getCell();
 				if( editor.cursor.table != null) {
-					editor.cursor.table.expandLine(lineNo);
+					editor.cursor.table.revealLine(lineNo);
 					if (i < path.length-1) {
 						var sub = editor.cursor.getLine().subTable;
 						var cell = editor.cursor.getCell();
@@ -180,7 +180,7 @@ class CdbTable extends hide.ui.View<{}> {
 			if( column != null )
 				editor.cursor.setDefault(line, column);
 			if( editor.cursor.table != null )
-				editor.cursor.table.expandLine(line);
+				editor.cursor.table.revealLine(line);
 			if (scriptLine != null) {
 				var cell = editor.cursor.getCell();
 				if (cell != null) {