FIXED: get cache under mouse right clicking on tab icon, fixes #96

warpdesign · Feb 8, 2020 · a5addb0 · a5addb0
1 parent a34121e
commit a5addb0
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/components/TabList.tsx b/src/components/TabList.tsx
@@ -138,16 +138,15 @@ class TabListClass extends React.Component<InjectedProps> {
         }
     };
 
-    onFolderContextMenu = (e: React.MouseEvent) => {
+    onFolderContextMenu = (index:number, e: React.MouseEvent) => {
         const { t } = this.injected;
         const { viewState } = this.injected;
 
         e.preventDefault();
         e.stopPropagation();
 
-        // TODO: get path entries
-        const cache = viewState.getVisibleCache();
-        const tree = cache.getAPI().getParentTree(cache.path);
+        const cacheUnderMouse = viewState.caches[index];
+        const tree = cacheUnderMouse.getAPI().getParentTree(cacheUnderMouse.path);
 
         const template: MenuItemConstructorOptions[] = tree.map((el: { dir: string, fullname: string, name: string }) => {
             return {
@@ -223,7 +222,7 @@ class TabListClass extends React.Component<InjectedProps> {
                         const tabInfo = cache.getFS() && cache.getFS().displaypath(path) || { fullPath: '', shortPath: '' };
 
                         return (
-                            <Button key={"" + viewId + index} onContextMenu={() => this.onContextMenu(index)} onClick={this.selectTab.bind(this, index)} title={tabInfo.fullPath} intent={cache.isVisible ? "primary" : "none"} rightIcon={closeIcon} className="tab"><Icon onContextMenu={this.onFolderContextMenu} className="folder" icon={tabIcon}></Icon>{tabInfo.shortPath}</Button>
+                            <Button key={"" + viewId + index} onContextMenu={() => this.onContextMenu(index)} onClick={this.selectTab.bind(this, index)} title={tabInfo.fullPath} intent={cache.isVisible ? "primary" : "none"} rightIcon={closeIcon} className="tab"><Icon onContextMenu={this.onFolderContextMenu.bind(this, index)} className="folder" icon={tabIcon}></Icon>{tabInfo.shortPath}</Button>
                         )
                     })
                 }