override navigator-file

eclipse-theia · May 24, 2021 · 0388a2b · 0388a2b
2 parents 3fd4b4f + 7ebcb33
commit 0388a2b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 27 deletions.
diff --git a/packages/core/src/browser/tree/tree-widget.tsx b/packages/core/src/browser/tree/tree-widget.tsx
@@ -768,20 +768,32 @@ export class TreeWidget extends ReactWidget implements StatefulWidget {
      * @param props the node properties.
      */
     protected renderTailDecorations(node: TreeNode, props: NodeProps): React.ReactNode {
-        return <div>{ }</div>;
-    }
-
-    protected renderTailDecorationsForCompositeNode(node: TreeNode, props: NodeProps, tailDecorations:
-        (TreeDecoration.TailDecoration | TreeDecoration.TailDecorationIcon | TreeDecoration.TailDecorationIconClass)[]): React.ReactNode {
-        return <div>{ }</div>;
+        const tailDecorations = this.getDecorationData(node, 'tailDecorations').filter(notEmpty).reduce((acc, current) => acc.concat(current), []);
+        if (tailDecorations.length === 0) {
+            return;
+        }
+        return this.renderTailDecorationsForNode(node, props, tailDecorations);
     }
 
     /**
      * Render the tree node tail decorations if the node is not a `CompositeTreeNode`.
      */
     protected renderTailDecorationsForNode(node: TreeNode, props: NodeProps, tailDecorations:
         (TreeDecoration.TailDecoration | TreeDecoration.TailDecorationIcon | TreeDecoration.TailDecorationIconClass)[]): React.ReactNode {
-        return <div>{ }</div>;
+        return <React.Fragment>
+            {tailDecorations.map((decoration, index) => {
+                const { tooltip } = decoration;
+                const { data, fontData } = decoration as TreeDecoration.TailDecoration;
+                const color = (decoration as TreeDecoration.TailDecorationIcon).color;
+                const className = [TREE_NODE_SEGMENT_CLASS, TREE_NODE_TAIL_CLASS].join(' ');
+                const style = fontData ? this.applyFontStyles({}, fontData) : color ? { color } : undefined;
+                const icon = (decoration as TreeDecoration.TailDecorationIcon).icon || (decoration as TreeDecoration.TailDecorationIconClass).iconClass;
+                const content = data ? data : icon ? <span key={node.id + 'icon' + index} className={this.getIconClass(icon)}></span> : '';
+                return <div key={node.id + className + index} className={className} style={style} title={tooltip}>
+                    {content}
+                </div>;
+            })}
+        </React.Fragment>;
     }
 
     /**

diff --git a/packages/navigator/src/browser/navigator-widget.tsx b/packages/navigator/src/browser/navigator-widget.tsx
@@ -37,7 +37,6 @@ import * as React from '@theia/core/shared/react';
 import { NavigatorContextKeyService } from './navigator-context-key-service';
 import { FileNavigatorCommands } from './navigator-contribution';
 
-
 export const FILE_NAVIGATOR_ID = 'files';
 export const LABEL = 'No folder opened';
 export const CLASS = 'theia-Files';
@@ -174,25 +173,6 @@ export class FileNavigatorWidget extends FileTreeWidget {
         </div>;
     }
 
-    protected renderTailDecorationsForNode(node: TreeNode, props: NodeProps, tailDecorations:
-        (TreeDecoration.TailDecoration | TreeDecoration.TailDecorationIcon | TreeDecoration.TailDecorationIconClass)[]): React.ReactNode {
-
-        return <React.Fragment>
-            {tailDecorations.map((decoration, index) => {
-                const { tooltip } = decoration;
-                const { data, fontData } = decoration as TreeDecoration.TailDecoration;
-                const color = (decoration as TreeDecoration.TailDecorationIcon).color;
-                const className = [TREE_NODE_SEGMENT_CLASS, TREE_NODE_TAIL_CLASS].join(' ');
-                const style = fontData ? this.applyFontStyles({}, fontData) : color ? { color } : undefined;
-                const icon = (decoration as TreeDecoration.TailDecorationIcon).icon || (decoration as TreeDecoration.TailDecorationIconClass).iconClass;
-                const content = data ? data : icon ? <span key={node.id + 'icon' + index} className={this.getIconClass(icon)}></span> : '';
-                return <div key={node.id + className + index} className={className} style={style} title={tooltip}>
-                    {content}
-                </div>;
-            })}
-        </React.Fragment>;
-    }
-
     protected shouldShowWelcomeView(): boolean {
         return this.model.root === undefined;
     }