Skip to content

Commit 03791e7

Browse files
zhangtengjinwewoor
authored andcommitted
fix: manual pass Controller to View
manual pass Controller to View
1 parent cd6fa5b commit 03791e7

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/controller/explorer/explorer.tsx

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import * as React from 'react';
1010
import { IFolderTree } from 'mo/model';
1111
import { ExplorerView, FolderTreeView } from 'mo/workbench/sidebar/explore';
1212
import { IActionBarItem } from 'mo/components/actionBar';
13-
13+
// TODO: 自依赖问题 connect 失效,暂时手动引入 Controller 往 View 层传递
14+
import { folderTreeController, explorerController } from 'mo/controller';
1415
export interface IExplorerController {
1516
onHeaderToolbarClick?: (e: React.MouseEvent, item: IActionBarItem) => void;
1617
}
@@ -42,7 +43,7 @@ export class ExplorerController
4243
id: 'explore',
4344
title: 'EXPLORER',
4445
render() {
45-
return <ExplorerView />;
46+
return <ExplorerView {...explorerController} />;
4647
},
4748
};
4849

@@ -128,7 +129,7 @@ export class ExplorerController
128129
data: explorerState.folderTree?.data,
129130
contextMenu: explorerState.folderTree?.contextMenu,
130131
};
131-
return <FolderTreeView {...folderProps} />;
132+
return <FolderTreeView {...folderProps} {...folderTreeController} />;
132133
},
133134
};
134135

src/workbench/sidebar/explore/explore.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export const Explorer: React.FunctionComponent<IExplorer> = (
1212
props: IExplorer & IExplorerController
1313
) => {
1414
const { data = [], headerToolBar = [], onHeaderToolbarClick } = props;
15+
console.log('Explorer => ExplorerController', props)
1516
return (
1617
<div className={defaultExplorerClassName}>
1718
<Header

src/workbench/sidebar/explore/folderTree.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const FolderTree: React.FunctionComponent<IFolderTree> = (
2222
onClickContextMenu,
2323
...restProps
2424
} = props;
25-
25+
console.log('FolderTree => FolderTreeController', props)
2626
const inputRef = useRef<any>(null);
2727

2828
const contextView = useContextView();
@@ -87,8 +87,8 @@ const FolderTree: React.FunctionComponent<IFolderTree> = (
8787
onBlur={handleInputBlur}
8888
/>
8989
) : (
90-
name
91-
);
90+
name
91+
);
9292
};
9393

9494
const renderByData = (

0 commit comments

Comments
 (0)