Skip to content

Commit

Permalink
Fix lint problems with the previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
The-Firexx committed Oct 4, 2024
1 parent 3b49d5e commit fa939a6
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 11 deletions.
13 changes: 9 additions & 4 deletions packages/desktop-client/src/components/common/Button2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import {

import { css } from 'glamor';

import { useMergedRefs } from '../../hooks/useMergedRefs';
import { useProperFocus } from '../../hooks/useProperFocus';
import { AnimatedLoading } from '../../icons/AnimatedLoading';
import { type CSSProperties, styles, theme } from '../../style';

import { View } from './View';
import { useProperFocus } from '../../hooks/useProperFocus';
import { useMergedRefs } from '../../hooks/useMergedRefs';

const backgroundColor: {
[key in ButtonVariant | `${ButtonVariant}Disabled`]?: string;
Expand Down Expand Up @@ -144,11 +144,16 @@ type ButtonVariant = 'normal' | 'primary' | 'bare' | 'menu' | 'menuSelected';

export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
(props, buttonRef) => {
const { children, variant = 'normal', bounce = true, focused = false, ...restProps } = props;
const {
children,
variant = 'normal',
bounce = true,
focused = false,
...restProps
} = props;

const ref = useRef<HTMLButtonElement>(null);
useProperFocus(ref, focused);

const mergedRef = useMergedRefs<HTMLButtonElement>(ref, buttonRef);

const variantWithDisabled: ButtonVariant | `${ButtonVariant}Disabled` =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2110,7 +2110,11 @@ export const TransactionTable = forwardRef((props, ref) => {
}
}, [prevSplitsExpanded.current]);

const newNavigator = useTableNavigator(newTransactions, getFieldsNewTransaction);
const newNavigator = useTableNavigator(
newTransactions,
getFieldsNewTransaction,
);

const tableNavigator = useTableNavigator(
transactionsWithExpandedSplits,
getFieldsTableTransaction,
Expand Down Expand Up @@ -2178,9 +2182,8 @@ export const TransactionTable = forwardRef((props, ref) => {
savePending.current = false;
}, [newTransactions, props.transactions]);


function getFieldsNewTransaction(item){
let fields = [
function getFieldsNewTransaction(item) {
const fields = [
'select',
'date',
'account',
Expand All @@ -2191,14 +2194,14 @@ export const TransactionTable = forwardRef((props, ref) => {
'credit',
'cleared',
'cancel',
'add'
'add',
];

return getFields(item, fields);
}

function getFieldsTableTransaction(item){
let fields = [
function getFieldsTableTransaction(item) {
const fields = [
'select',
'date',
'account',
Expand Down

0 comments on commit fa939a6

Please sign in to comment.