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

Implement icon reference rendering for plugin tree view tooltips #10899

Merged
merged 1 commit into from
Mar 23, 2022
+25 −3
Merged

Implement icon reference rendering for plugin tree view tooltips #10899

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
4 changes: 4 additions & 0 deletions packages/plugin-ext/src/main/browser/style/tree.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,7 @@
.theia-tree-view .theia-TreeNode:not(:hover):not(.theia-mod-selected) .theia-tree-view-inline-action {
display: none;
}

.codicon.icon-inline {
font-size: var(--theia-ui-font-size1);
}
24 changes: 21 additions & 3 deletions packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,15 @@ import {
import { MenuPath, MenuModelRegistry, ActionMenuNode } from '@theia/core/lib/common/menu';
import * as React from '@theia/core/shared/react';
import { PluginSharedStyle } from '../plugin-shared-style';
import { ACTION_ITEM, Widget } from '@theia/core/lib/browser/widgets/widget';
import { ACTION_ITEM, codicon, Widget } from '@theia/core/lib/browser/widgets/widget';
import { Emitter, Event } from '@theia/core/lib/common/event';
import { MessageService } from '@theia/core/lib/common/message-service';
import { View } from '../../../common/plugin-protocol';
import CoreURI from '@theia/core/lib/common/uri';
import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
import * as markdownit from '@theia/core/shared/markdown-it';
import { isMarkdownString } from '../../../plugin/markdown-string';
import { LabelParser } from '@theia/core/lib/browser/label-parser';

export const TREE_NODE_HYPERLINK = 'theia-TreeNodeHyperlink';
export const VIEW_ITEM_CONTEXT_MENU: MenuPath = ['view-item-context-menu'];
Expand Down Expand Up @@ -250,18 +251,35 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
@inject(TooltipService)
protected readonly tooltipService: TooltipService;

@inject(LabelParser)
protected readonly labelParser: LabelParser;

protected readonly markdownIt = markdownit();

@postConstruct()
protected override init(): void {
super.init();
this.id = this.identifier.id;
this.addClass('theia-tree-view');
this.node.style.height = '100%';

this.markdownItPlugin();
this.model.onDidChangeWelcomeState(this.update, this);
this.toDispose.push(this.model.onDidChangeWelcomeState(this.update, this));
this.toDispose.push(this.onDidChangeVisibilityEmitter);
}

protected markdownItPlugin(): void {
this.markdownIt.renderer.rules.text = (tokens, idx) => {
const content = tokens[idx].content;
return this.labelParser.parse(content).map(chunk => {
if (typeof chunk === 'string') {
return chunk;
}
return `<i class="${codicon(chunk.name)} ${chunk.animation ? `fa-${chunk.animation}` : ''} icon-inline"></i>`;
}).join('');
};
}

protected override renderIcon(node: TreeNode, props: NodeProps): React.ReactNode {
const icon = this.toNodeIcon(node);
if (icon) {
Expand All @@ -285,7 +303,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {

if (node.tooltip && isMarkdownString(node.tooltip)) {
// Render markdown in custom tooltip
const tooltip = markdownit().render(node.tooltip.value);
const tooltip = this.markdownIt.render(node.tooltip.value);

attrs = {
...attrs,
Expand Down