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 compressed navigator indent highlight #13162

Merged
merged 2 commits into from
Dec 19, 2023
Merged

Fix compressed navigator indent highlight #13162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe8b405
Fix compressed navigator indent highlight
msujew Dec 10, 2023
e09a9f9
Update tree-widget.tsx
msujew Dec 19, 2023
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
34 changes: 27 additions & 7 deletions packages/core/src/browser/tree/tree-compression/compressed-tree-widget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ export class CompressedTreeWidget extends TreeViewWelcomeWidget {
}
}

protected override shouldRenderIndent(node: TreeNode): boolean {
return !this.compressionToggle.compress
|| !this.compressionService.isCompressionParticipant(node)
|| this.compressionService.getCompressionHead(node) === node;
}

protected override shouldDisplayNode(node: TreeNode): boolean {
if (this.compressionToggle.compress && this.compressionService.isCompressionParticipant(node) && !this.compressionService.isCompressionHead(node)) {
return false;
Expand All @@ -66,14 +72,18 @@ export class CompressedTreeWidget extends TreeViewWelcomeWidget {
}

protected override getDepthForNode(node: TreeNode, depths: Map<CompositeTreeNode | undefined, number>): number {
if (!this.compressionToggle.compress) { return super.getDepthForNode(node, depths); }
if (!this.compressionToggle.compress) {
return super.getDepthForNode(node, depths);
}
const parent = this.compressionService.getCompressionHead(node.parent) ?? node.parent;
const parentDepth = depths.get(parent);
return parentDepth === undefined ? 0 : TreeNode.isVisible(node.parent) ? parentDepth + 1 : parentDepth;
}

protected override toNodeRow(node: TreeNode, index: number, depth: number): CompressedNodeRow {
if (!this.compressionToggle.compress) { return super.toNodeRow(node, index, depth); }
if (!this.compressionToggle.compress) {
return super.toNodeRow(node, index, depth);
}
const row: CompressedNodeRow = { node, index, depth };
if (this.compressionService.isCompressionHead(node)) {
row.compressionChain = this.compressionService.getCompressionChain(node);
Expand Down Expand Up @@ -102,7 +112,9 @@ export class CompressedTreeWidget extends TreeViewWelcomeWidget {
}

protected override getCaptionChildren(node: TreeNode, props: CompressedNodeProps): React.ReactNode {
if (!this.compressionToggle.compress || !props.compressionChain) { return super.getCaptionChildren(node, props); }
if (!this.compressionToggle.compress || !props.compressionChain) {
return super.getCaptionChildren(node, props);
}
return props.compressionChain.map((subNode, index, self) => {
const classes = ['theia-tree-compressed-label-part'];
if (SelectableTreeNode.isSelected(subNode)) {
Expand All @@ -129,21 +141,27 @@ export class CompressedTreeWidget extends TreeViewWelcomeWidget {
}

protected override handleUp(event: KeyboardEvent): void {
if (!this.compressionToggle.compress) { return super.handleUp(event); }
if (!this.compressionToggle.compress) {
return super.handleUp(event);
}
const type = this.props.multiSelect && this.hasShiftMask(event) ? TreeSelection.SelectionType.RANGE : undefined;
this.model.selectPrevRow(type);
this.node.focus();
}

protected override handleDown(event: KeyboardEvent): void {
if (!this.compressionToggle.compress) { return super.handleDown(event); }
if (!this.compressionToggle.compress) {
return super.handleDown(event);
}
const type = this.props.multiSelect && this.hasShiftMask(event) ? TreeSelection.SelectionType.RANGE : undefined;
this.model.selectNextRow(type);
this.node.focus();
}

protected override async handleLeft(event: KeyboardEvent): Promise<void> {
if (!this.compressionToggle.compress) { return super.handleLeft(event); }
if (!this.compressionToggle.compress) {
return super.handleLeft(event);
}
if (Boolean(this.props.multiSelect) && (this.hasCtrlCmdMask(event) || this.hasShiftMask(event))) {
return;
}
Expand All @@ -160,7 +178,9 @@ export class CompressedTreeWidget extends TreeViewWelcomeWidget {
}

protected override async handleRight(event: KeyboardEvent): Promise<void> {
if (!this.compressionToggle.compress) { return super.handleRight(event); }
if (!this.compressionToggle.compress) {
return super.handleRight(event);
}
if (Boolean(this.props.multiSelect) && (this.hasCtrlCmdMask(event) || this.hasShiftMask(event))) {
return;
}
Expand Down
31 changes: 21 additions & 10 deletions packages/core/src/browser/tree/tree-widget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,22 +894,33 @@ export class TreeWidget extends ReactWidget implements StatefulWidget {
let current: TreeNode | undefined = node;
let depth = props.depth;
while (current && depth) {
const classNames: string[] = [TREE_NODE_INDENT_GUIDE_CLASS];
if (this.needsActiveIndentGuideline(current)) {
classNames.push('active');
} else {
classNames.push(renderIndentGuides === 'onHover' ? 'hover' : 'always');
if (this.shouldRenderIndent(current)) {
const classNames: string[] = [TREE_NODE_INDENT_GUIDE_CLASS];
if (this.needsActiveIndentGuideline(current)) {
classNames.push('active');
} else {
classNames.push(renderIndentGuides === 'onHover' ? 'hover' : 'always');
}
const paddingLeft = this.getDepthPadding(depth);
indentDivs.unshift(<div key={depth} className={classNames.join(' ')} style={{
paddingLeft: `${paddingLeft}px`
}} />);
depth--;
}
const paddingLeft = this.getDepthPadding(depth);
indentDivs.unshift(<div key={depth} className={classNames.join(' ')} style={{
paddingLeft: `${paddingLeft}px`
}} />);
current = current.parent;
depth--;
}
return indentDivs;
}

/**
* Determines whether an indentation div should be rendered for the specified tree node.
* If there are multiple tree nodes inside of a single rendered row,
* this method should only return true for the first node.
*/
protected shouldRenderIndent(node: TreeNode): boolean {
return true;
}

protected needsActiveIndentGuideline(node: TreeNode): boolean {
const parent = node.parent;
if (!parent || !this.isExpandable(parent)) {
Expand Down
Loading