QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 12:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: BIG-165 cashflow account context menu z-index issue.

Browse Source
This commit is contained in:
a.bouhuolia
2021-10-30 16:17:39 +02:00
parent 0b5c5d83a4
commit e9964f1ac9
3 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/containers/CashFlow/CashFlowAccounts/CashflowAccountsGrid.js
View File

@@ -3,12 +3,11 @@ import { isNull, isEmpty } from 'lodash';
import { compose, curry } from 'lodash/fp';
import styled from 'styled-components';
import { Link } from 'react-router-dom';
import { ContextMenu2 } from '@blueprintjs/popover2';
import { Menu, MenuItem, MenuDivider, Intent } from '@blueprintjs/core';
import intl from 'react-intl-universal';
import useContextMenu from 'react-use-context-menu';
import {
ContextMenu,
BankAccountsList,
BankAccount,
If,
@@ -58,20 +57,20 @@ function CashflowBankAccount({
account,
}) {
const [
bindMenu,
bindMenuItem,
useContextTrigger,
{ coords, setVisible, isVisible },
] = useContextMenu();
// const [
// bindMenu,
// bindMenuItem,
// useContextTrigger,
// { coords, setVisible, isVisible },
// ] = useContextMenu();
const [bindTrigger] = useContextTrigger({
collect: () => 'Title',
});
// const [bindTrigger] = useContextTrigger({
// collect: () => 'Title',
// });
const handleClose = React.useCallback(() => {
setVisible(false);
}, [setVisible]);
// const handleClose = React.useCallback(() => {
// setVisible(false);
// }, [setVisible]);
// Handle view detail account.
const handleViewClick = () => {
@@ -109,26 +108,8 @@ function CashflowBankAccount({
};
return (
<CashflowBankAccountWrap>
<CashflowAccountAnchor
to={`/cashflow-accounts/${account.id}/transactions`}
>
<BankAccount
{...bindTrigger}
title={account.name}
code={account.code}
balance={!isNull(account.amount) ? account.formatted_amount : '-'}
type={account.account_type}
updatedBeforeText={getUpdatedBeforeText(account.createdAt)}
/>
</CashflowAccountAnchor>
<ContextMenu
bindMenu={bindMenu}
isOpen={isVisible}
coords={coords}
onClosed={handleClose}
>
<ContextMenu2
content={
<CashflowAccountContextMenu
account={account}
onViewClick={handleViewClick}
@@ -139,8 +120,21 @@ function CashflowBankAccount({
onMoneyInClick={handleMoneyInClick}
onMoneyOutClick={handleMoneyOutClick}
/>
</ContextMenu>
</CashflowBankAccountWrap>
}
>
<CashflowAccountAnchor
to={`/cashflow-accounts/${account.id}/transactions`}
>
<BankAccount
// {...bindTrigger}
title={account.name}
code={account.code}
balance={!isNull(account.amount) ? account.formatted_amount : '-'}
type={account.account_type}
updatedBeforeText={getUpdatedBeforeText(account.createdAt)}
/>
</CashflowAccountAnchor>
</ContextMenu2>
);
}