Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@
text-align: center;
font-size: 12px;
padding-right: 0;
line-height: 1;
display: inline-flex;
justify-items: center;
align-items: center;
flex-direction: column;
}

.file_tree_node_segment {
Expand Down
17 changes: 15 additions & 2 deletions packages/file-tree-next/src/browser/file-tree-node.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import {
NewPromptHandle,
} from '@opensumi/ide-components';
import { Loading } from '@opensumi/ide-components';
import { getIcon, URI, path } from '@opensumi/ide-core-browser';
import { getIcon, URI, path, transformLabelWithCodicon } from '@opensumi/ide-core-browser';
import { LabelService } from '@opensumi/ide-core-browser/lib/services';
import { IIconService } from '@opensumi/ide-theme/lib/common/index';

import { Directory, File } from '../common/file-tree-node.define';

Expand All @@ -28,6 +29,7 @@ export interface IFileTreeNodeProps {
defaultLeftPadding?: number;
leftPadding?: number;
decorationService: FileTreeDecorationService;
iconService: IIconService;
labelService: LabelService;
decorations?: ClasslistComposite;
dndService: DragAndDropService;
Expand Down Expand Up @@ -76,6 +78,7 @@ export const FileTreeNode: React.FC<FileTreeNodeRenderedProps> = ({
hasFileIcons,
hidesExplorerArrows,
hasPrompt,
iconService,
}: FileTreeNodeRenderedProps) => {
const [activeIndex, setActiveIndex] = React.useState<number>(-1);
const isRenamePrompt = itemType === TreeNodeType.RenamePrompt;
Expand Down Expand Up @@ -375,7 +378,17 @@ export const FileTreeNode: React.FC<FileTreeNodeRenderedProps> = ({
if (!decoration) {
return null;
}
return <div className={styles.file_tree_node_status}>{decoration.badge.slice()}</div>;
return (
<div className={styles.file_tree_node_status}>
{transformLabelWithCodicon(
decoration.badge.slice(),
{
color: 'inherit',
},
iconService.fromString.bind(iconService),
)}
</div>
);
};

const renderTwice = (item) => {
Expand Down
4 changes: 4 additions & 0 deletions packages/file-tree-next/src/browser/file-tree.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
} from '@opensumi/ide-core-browser';
import { Progress } from '@opensumi/ide-core-browser/lib/progress/progress-bar';
import { WelcomeView } from '@opensumi/ide-main-layout/lib/browser/welcome.view';
import { IIconService } from '@opensumi/ide-theme/lib/common/index';

import { FILE_EXPLORER_WELCOME_ID, IFileTreeService } from '../common';
import { Directory, File } from '../common/file-tree-node.define';
Expand Down Expand Up @@ -419,6 +420,8 @@ const FileTreeView = memo(
onTwistierClick,
}: FileTreeViewProps) => {
const filetreeService = useInjectable<FileTreeService>(IFileTreeService);
const iconService = useInjectable<IIconService>(IIconService);

const { decorationService, labelService, locationToCurrentFile } = filetreeService;
const fileTreeModelService = useInjectable<FileTreeModelService>(FileTreeModelService);

Expand All @@ -433,6 +436,7 @@ const FileTreeView = memo(
template={(props as any).template}
decorationService={decorationService}
labelService={labelService}
iconService={iconService}
dndService={fileTreeModelService.dndService}
decorations={fileTreeModelService.decorations.getDecorations(props.item as any)}
onClick={onItemClick}
Expand Down