8000 refactor: folderTree'input support default contextmenu by mortalYoung · Pull Request #839 · DTStack/molecule · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

refactor: folderTree'input support default contextmenu #839

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.

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
merged 2 commits into from
Jan 11, 2023
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
19 changes: 11 additions & 8 deletions src/components/contextMenu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,17 @@ export function useContextMenu(
});

const MouseEvent) => {
e.preventDefault();
contextView!.show(
{
x: e.clientX,
y: e.clientY,
},
render
);
// ONLY works over the anchor ele
if (e.target === e.currentTarget) {
e.preventDefault();
contextView!.show(
{
x: e.clientX,
y: e.clientY,
},
render
);
}
};

anchor.addEventListener('contextmenu', onContextMenu);
Expand Down
1 change: 0 additions & 1 deletion src/components/tree/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ const TreeView = ({
e: React.MouseEvent<HTMLDivElement, MouseEvent>,
info: ITreeNodeItemProps
) => {
e.preventDefault();
e.stopPropagation();
onRightClick?.(e, info);
};
Expand Down
23 changes: 22 additions & 1 deletion src/workbench/problems/__tests__/paneView.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import React from 'react';
import { cleanup, fireEvent, render } from '@testing-library/react';
import {
cleanup,
createEvent,
fireEvent,
render,
} from '@testing-library/react';
import '@testing-library/jest-dom';
import ProblemsPaneView from '../paneView';
import { MarkerSeverity } from 'mo/model';
Expand Down Expand Up @@ -113,4 +118,20 @@ describe('The PaneView Component', () => {
);
expect(tips).toBeInTheDocument();
});

test('Should prevent default on contextMenu', () => {
const { container } = render(<ProblemsPaneView {...mockRootData} />);

const dom = container.querySelector(
`div[data-key="${mockProblemFile.id}"]`
);
expect(dom).toBeInTheDocument();

const myEvent = createEvent.contextMenu(dom!);
myEvent.preventDefault = jest.fn();

fireEvent(dom!, myEvent);

expect(myEvent.preventDefault as jest.Mock).toBeCalled();
});
});
1 change: 1 addition & 0 deletions src/workbench/problems/paneView/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ function ProblemsPaneView(props: IProblems) {
);
}}
>
=> e.preventDefault()}
/>
</div>
</Scrollbar>
Expand Down
29 changes: 28 additions & 1 deletion src/workbench/sidebar/__tests__/searchPanel.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import React from 'react';
import { cleanup, fireEvent, render } from '@testing-library/react';
import {
cleanup,
createEvent,
fireEvent,
render,
} from '@testing-library/react';
import '@testing-library/jest-dom';
import { expectFnCalled } from '@test/utils';
import { SearchPanel } from '../search';
Expand Down Expand Up @@ -219,4 +224,26 @@ describe('The SearchPanel Component', () => {

expect(getByTitle(resultTree[0].name)).toBeInTheDocument();
});

test("Should prevent default on tree's contextMenu event handler", () => {
expectFnCalled((mockFn) => {
const { container } = render(
<SearchPanel
value="test"
result={mockResult}
getSearchIndex={() => 0}
/>
);

const target = mockResult[1];
const dom = container.querySelector(
`.${defaultTreeNodeClassName}[data-key="${target.id}"]`
)!;

const myEvent = createEvent.contextMenu(dom!);
myEvent.preventDefault = mockFn;

fireEvent(dom!, myEvent);
});
});
});
25 changes: 14 additions & 11 deletions src/workbench/sidebar/explore/folderTree.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'reflect-metadata';
import React, { memo, useRef, useEffect, useLayoutEffect } from 'react';
import { IFolderTree, IFolderTreeNodeProps } from 'mo/model';
import { select, getEventPosition } from 'mo/common/dom';
import Tree from 'mo/components/tree';
import Tree, { ITreeProps } from 'mo/components/tree';
import { IMenuItemProps, Menu } from 'mo/components/menu';
import { Button } from 'mo/components/button';
import type { IFolderTreeController } from 'mo/controller/explorer/folderTree';
Expand Down Expand Up @@ -126,17 +126,20 @@ const FolderTree: React.FunctionComponent<IFolderTreeProps> = (props) => {
contextView?.hide();
};

const handleRightClick = (event, data) => {
const menuItems = onRightClick?.(data) || [];
const handleRightClick: ITreeProps['onRightClick'] = (event, data) => {
if ((event.target as HTMLElement).nodeName !== 'INPUT') {
event.preventDefault();
const menuItems = onRightClick?.(data) || [];

menuItems.length &&
contextView?.show(getEventPosition(event), () => (
<Menu
role="menu"
item) => handleMenuClick(item!, data)}
data={menuItems}
/>
));
menuItems.length &&
contextView?.show(getEventPosition(event), () => (
<Menu
role="menu"
item) => handleMenuClick(item!, data)}
data={menuItems}
/>
));
}
};

const handleUpdateFile = (
Expand Down
1 change: 1 addition & 0 deletions src/workbench/sidebar/search/searchTree.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const SearchTree = (props: SearchTreeProps) => {
data={data}
renderTitle={renderTitle}
>
=> e.preventDefault()}
/>
);
};
Expand Down
0