Skip to content

Commit

Permalink
Merge pull request #658 from bigcapitalhq/banking-layout-breaking
Browse files Browse the repository at this point in the history
feat: Bank pages layout breaking
  • Loading branch information
abouolia authored Sep 4, 2024
2 parents 3dd8274 + 4ef00ab commit b6783eb
Show file tree
Hide file tree
Showing 3 changed files with 142 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,23 @@ import {
} from '@/constants/cashflowOptions';
import { useRefreshCashflowTransactions } from '@/hooks/query';
import { useAccountTransactionsContext } from './AccountTransactionsProvider';
import { useMediaQuery } from '@/hooks/useMediaQuery';
import { useAppShellContext } from '@/components/AppShell/AppContentShell/AppContentShellProvider';

import withDialogActions from '@/containers/Dialog/withDialogActions';
import withSettings from '@/containers/Settings/withSettings';
import withSettingsActions from '@/containers/Settings/withSettingsActions';

import { compose } from '@/utils';
import { withBankingActions } from '../withBankingActions';
import { withBanking } from '../withBanking';
import withAlertActions from '@/containers/Alert/withAlertActions';
import {
useUpdateBankAccount,
useExcludeUncategorizedTransactions,
useUnexcludeUncategorizedTransactions,
} from '@/hooks/query/bank-rules';
import { withBankingActions } from '../withBankingActions';
import { withBanking } from '../withBanking';
import withAlertActions from '@/containers/Alert/withAlertActions';

import { DialogsName } from '@/constants/dialogs';
import { compose } from '@/utils';

function AccountTransactionsActionsBar({
// #withDialogActions
Expand Down Expand Up @@ -221,6 +223,13 @@ function AccountTransactionsActionsBar({
});
};

const { hideAside } = useAppShellContext();
const isMin1350Query = useMediaQuery('(min-width: 1350px)');

// Shrink actions to dropdown if the aside is open and matched the media query,
// To avoid actions overflow in small screens.
const shrinkActions = !hideAside && !isMin1350Query;

return (
<DashboardActionsBar>
<NavbarGroup>
Expand All @@ -241,23 +250,27 @@ function AccountTransactionsActionsBar({
}}
/>
<NavbarDivider />
<Button
className={Classes.MINIMAL}
icon={<Icon icon="print-16" iconSize={16} />}
text={<T id={'print'} />}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon="file-export-16" iconSize={16} />}
text={<T id={'export'} />}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon="file-import-16" iconSize={16} />}
text={<T id={'import'} />}
onClick={handleImportBtnClick}
/>
<NavbarDivider />

<If condition={!shrinkActions}>
<Button
className={Classes.MINIMAL}
icon={<Icon icon="print-16" iconSize={16} />}
text={<T id={'print'} />}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon="file-export-16" iconSize={16} />}
text={<T id={'export'} />}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon="file-import-16" iconSize={16} />}
text={<T id={'import'} />}
onClick={handleImportBtnClick}
/>
<NavbarDivider />
</If>

<DashboardRowsHeightButton
initialValue={cashflowTansactionsTableSize}
onChange={handleTableRowSizeChange}
Expand Down Expand Up @@ -290,6 +303,40 @@ function AccountTransactionsActionsBar({
</Tooltip>
</If>

<If condition={shrinkActions}>
<NavbarDivider />
<Popover
minimal={true}
interactionKind={PopoverInteractionKind.CLICK}
position={Position.BOTTOM_LEFT}
modifiers={{
offset: { offset: '0, 4' },
}}
content={
<Menu>
<MenuItem
icon={<Icon icon="print-16" iconSize={16} />}
text={<T id={'print'} />}
/>
<MenuItem
icon={<Icon icon="file-export-16" iconSize={16} />}
text={<T id={'export'} />}
/>
<MenuItem
icon={<Icon icon="file-import-16" iconSize={16} />}
text={<T id={'import'} />}
onClick={handleImportBtnClick}
/>
</Menu>
}
>
<Button
icon={<Icon icon="more-h-16" iconSize={16} />}
minimal={true}
/>
</Popover>
</If>

{!isEmpty(uncategorizedTransationsIdsSelected) && (
<Button
icon={<Icon icon="disable" iconSize={16} />}
Expand Down Expand Up @@ -368,7 +415,6 @@ function AccountTransactionsActionsBar({
</If>

<MenuItem onClick={handleBankRulesClick} text={'Bank rules'} />

<MenuDivider />
<If condition={isSyncingOwner && isFeedsActive}>
<MenuItem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
import React from 'react';
import intl from 'react-intl-universal';
import styled from 'styled-components';
import { curry } from 'lodash/fp';
import { useHistory } from 'react-router-dom';
import {
Popover,
Menu,
Expand All @@ -11,18 +13,17 @@ import {
Classes,
} from '@blueprintjs/core';
import { Icon } from '@/components';
import { useHistory } from 'react-router-dom';
import { curry } from 'lodash/fp';

import { useAccountTransactionsContext } from './AccountTransactionsProvider';
import { useAppShellContext } from '@/components/AppShell/AppContentShell/AppContentShellProvider';

function AccountSwitchButton() {
const { currentAccount } = useAccountTransactionsContext();

return (
<AccountSwitchButtonBase
minimal={true}
rightIcon={<Icon icon={'arrow-drop-down'} iconSize={24} />}
rightIcon={<Icon icon={'caret-down-16'} iconSize={16} />}
>
<AccountSwitchText>{currentAccount.name}</AccountSwitchText>
</AccountSwitchButtonBase>
Expand Down Expand Up @@ -110,12 +111,16 @@ function AccountTransactionsDetailsBarSkeleton() {
}

function AccountTransactionsDetailsContent() {
const { hideAside } = useAppShellContext();

return (
<React.Fragment>
<AccountSwitchItem />
<AccountNumberItem />

{/** Hide some details once the aside opens to preserve space on details bar. */}
{hideAside && <AccountNumberItem />}
<AccountBalanceItem />
<AccountBankBalanceItem />
{hideAside && <AccountBankBalanceItem />}
</React.Fragment>
);
}
Expand Down
63 changes: 63 additions & 0 deletions packages/webapp/src/hooks/useMediaQuery.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import { useEffect, useRef, useState } from 'react';

export interface UseMediaQueryOptions {
getInitialValueInEffect: boolean;
}

type MediaQueryCallback = (event: { matches: boolean; media: string }) => void;

/**
* Older versions of Safari (shipped withCatalina and before) do not support addEventListener on matchMedia
* https://stackoverflow.com/questions/56466261/matchmedia-addlistener-marked-as-deprecated-addeventlistener-equivalent
* */
function attachMediaListener(
query: MediaQueryList,
callback: MediaQueryCallback,
) {
try {
query.addEventListener('change', callback);
return () => query.removeEventListener('change', callback);
} catch (e) {
query.addListener(callback);
return () => query.removeListener(callback);
}
}

function getInitialValue(query: string, initialValue?: boolean) {
if (typeof initialValue === 'boolean') {
return initialValue;
}

if (typeof window !== 'undefined' && 'matchMedia' in window) {
return window.matchMedia(query).matches;
}

return false;
}

export function useMediaQuery(
query: string,
initialValue?: boolean,
{ getInitialValueInEffect }: UseMediaQueryOptions = {
getInitialValueInEffect: true,
},
) {
const [matches, setMatches] = useState(
getInitialValueInEffect ? initialValue : getInitialValue(query),
);
const queryRef = useRef<MediaQueryList>();

useEffect(() => {
if ('matchMedia' in window) {
queryRef.current = window.matchMedia(query);
setMatches(queryRef.current.matches);
return attachMediaListener(queryRef.current, (event) =>
setMatches(event.matches),
);
}

return undefined;
}, [query]);

return matches;
}

0 comments on commit b6783eb

Please sign in to comment.