Skip to content

fix: create treeNode by default id #522

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

Merged
wewoor merged 1 commit into from
Nov 29, 2021
Merged

fix: create treeNode by default id #522

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
29 changes: 18 additions & 11 deletions src/controller/explorer/folderTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
import type { UniqueId } from 'mo/common/types';

export interface IFolderTreeController extends Partial<Controller> {
readonly createTreeNode?: (type: FileType) => void;
readonly createTreeNode?: (type: FileType, id?: UniqueId) => void;
readonly onClickContextMenu?: (
contextMenu: IMenuItemProps,
treeNode?: IFolderTreeNodeProps
Expand Down Expand Up @@ -102,14 +102,19 @@ export class FolderTreeController
});
}

public createTreeNode = (type: FileType) => {
const folderTreeState = this.folderTreeService.getState();
const { data, current } = folderTreeState?.folderTree || {};
// The current selected node id or the first root node
const nodeId =
typeof current?.id === 'undefined' ? data?.[0]?.id : current?.id;

this.emit(FolderTreeEvent.onCreate, type, nodeId);
public createTreeNode = (type: FileType, id?: UniqueId) => {
if (typeof id === 'undefined') {
const folderTreeState = this.folderTreeService.getState();
const { data, current } = folderTreeState?.folderTree || {};
// The current selected node id or the first root node
const nodeId =
typeof current?.id === 'undefined'
? data?.[0]?.id
: current?.id;
this.emit(FolderTreeEvent.onCreate, type, nodeId);
} else {
this.emit(FolderTreeEvent.onCreate, type, id);
}
};

public readonly onClickContextMenu = (
Expand All @@ -136,11 +141,13 @@ export class FolderTreeController
break;
}
case NEW_FILE_COMMAND_ID: {
this.createTreeNode(FileTypes.File);
const { id } = treeNode!;
this.createTreeNode(FileTypes.File, id);
break;
}
case NEW_FOLDER_COMMAND_ID: {
this.createTreeNode(FileTypes.Folder);
const { id } = treeNode!;
this.createTreeNode(FileTypes.Folder, id);
break;
}
case OPEN_TO_SIDE_COMMAND_ID: {
Expand Down