diff --git a/packages/desktop-client/src/components/FixedSizeList.js b/packages/desktop-client/src/components/FixedSizeList.js index e811f651875113f0c177b9938c9749d0bcf48bb9..424560f36be5a7077ac2fce830f0b082386edd44 100644 --- a/packages/desktop-client/src/components/FixedSizeList.js +++ b/packages/desktop-client/src/components/FixedSizeList.js @@ -15,7 +15,7 @@ function ResizeObserver({ onResize, children }) { return children(ref); } -export class FixedSizeList extends PureComponent { +export default class FixedSizeList extends PureComponent { _outerRef; _resetIsScrollingTimeoutId = null; diff --git a/packages/desktop-client/src/components/KeyHandlers.tsx b/packages/desktop-client/src/components/KeyHandlers.tsx index fc58fc531538e14d748791d14a194c86f790de4c..1a38701b5dd1cb98680d35c26074e8490ea91624 100644 --- a/packages/desktop-client/src/components/KeyHandlers.tsx +++ b/packages/desktop-client/src/components/KeyHandlers.tsx @@ -29,7 +29,7 @@ type KeyHandlerProps = { eventType?: string; handler: HotKeyHandler; }; -export function KeyHandler({ +function KeyHandler({ keyName, eventType = 'keydown', handler, diff --git a/packages/desktop-client/src/components/ManageRules.js b/packages/desktop-client/src/components/ManageRules.js index 13d817aa9e52142f2c0c5c935fe719dc3947e169..486ababc0537be331ad1171eb33eaa32c0c0b32d 100644 --- a/packages/desktop-client/src/components/ManageRules.js +++ b/packages/desktop-client/src/components/ManageRules.js @@ -210,14 +210,7 @@ export function Value({ } } -export function ConditionExpression({ - field, - op, - value, - options, - prefix, - style, -}) { +function ConditionExpression({ field, op, value, options, prefix, style }) { return ( <View style={[ @@ -265,7 +258,7 @@ function ScheduleValue({ value }) { ); } -export function ActionExpression({ field, op, value, options, style }) { +function ActionExpression({ field, op, value, options, style }) { return ( <View style={[ diff --git a/packages/desktop-client/src/components/NotesButton.tsx b/packages/desktop-client/src/components/NotesButton.tsx index d840ef46ffd9a39745cc5a756f78b9bf069f9193..98c1c7988efc8cb9789d7b9c226551e615aa163f 100644 --- a/packages/desktop-client/src/components/NotesButton.tsx +++ b/packages/desktop-client/src/components/NotesButton.tsx @@ -17,7 +17,7 @@ type NotesTooltipProps = { position?: string; onClose?: (notes: string) => void; }; -export function NotesTooltip({ +function NotesTooltip({ editable, defaultNotes, position = 'bottom-left', diff --git a/packages/desktop-client/src/components/Titlebar.js b/packages/desktop-client/src/components/Titlebar.js index 407e4c64150a2272f45618158cbeaf90b5625b11..35093383ea2a790de0b9a1653e88825c3fa8e6d6 100644 --- a/packages/desktop-client/src/components/Titlebar.js +++ b/packages/desktop-client/src/components/Titlebar.js @@ -63,7 +63,7 @@ export function TitlebarProvider({ children }) { ); } -export function UncategorizedButton() { +function UncategorizedButton() { return ( <SheetValue binding={queries.uncategorizedCount()}> {node => { diff --git a/packages/desktop-client/src/components/accounts/MobileAccounts.js b/packages/desktop-client/src/components/accounts/MobileAccounts.js index 3f0946095aab30bd308fe82ee4c94cd9b6baab34..d76baefeeb9b97a034fe9652d4516b17d1ff5755 100644 --- a/packages/desktop-client/src/components/accounts/MobileAccounts.js +++ b/packages/desktop-client/src/components/accounts/MobileAccounts.js @@ -11,7 +11,7 @@ import { Button, Text, TextOneLine, View } from '../common'; import { Page } from '../Page'; import CellValue from '../spreadsheet/CellValue'; -export function AccountHeader({ name, amount }) { +function AccountHeader({ name, amount }) { return ( <View style={{ @@ -40,7 +40,7 @@ export function AccountHeader({ name, amount }) { ); } -export function AccountCard({ account, updated, getBalanceQuery, onSelect }) { +function AccountCard({ account, updated, getBalanceQuery, onSelect }) { return ( <View style={{ @@ -142,7 +142,7 @@ function EmptyMessage({ onAdd }) { ); } -export class AccountList extends Component { +class AccountList extends Component { isNewTransaction = id => { return this.props.newTransactions.includes(id); }; diff --git a/packages/desktop-client/src/components/accounts/MobileTransaction.js b/packages/desktop-client/src/components/accounts/MobileTransaction.js index 0615a6ffe31e0097fa7bbb2cd6dedcd79515e080..6a0a298da78e4362c4a510c73518d8a397d31457 100644 --- a/packages/desktop-client/src/components/accounts/MobileTransaction.js +++ b/packages/desktop-client/src/components/accounts/MobileTransaction.js @@ -31,7 +31,7 @@ const zIndices = { SECTION_HEADING: 10 }; let getPayeesById = memoizeOne(payees => groupById(payees)); let getAccountsById = memoizeOne(accounts => groupById(accounts)); -export function isPreviewId(id) { +function isPreviewId(id) { return id.indexOf('preview/') !== -1; } @@ -97,7 +97,7 @@ function Status({ status }) { ); } -export class Transaction extends PureComponent { +class Transaction extends PureComponent { render() { const { transaction, @@ -471,9 +471,9 @@ function Option({ isLast, item, state }) { ); } -export const ROW_HEIGHT = 50; +const ROW_HEIGHT = 50; -export const ListItem = forwardRef(({ children, style, ...props }, ref) => { +const ListItem = forwardRef(({ children, style, ...props }, ref) => { return ( <View style={[ diff --git a/packages/desktop-client/src/components/accounts/TransactionsTable.js b/packages/desktop-client/src/components/accounts/TransactionsTable.js index 2ececa01b885a0f1cc9448ba9195c69302053c4f..803decab474b946c01133fd2901d28120d3af16d 100644 --- a/packages/desktop-client/src/components/accounts/TransactionsTable.js +++ b/packages/desktop-client/src/components/accounts/TransactionsTable.js @@ -236,7 +236,7 @@ export function SplitsExpandedProvider({ children, initialMode = 'expand' }) { ); } -export const TransactionHeader = memo( +const TransactionHeader = memo( ({ hasSelected, showAccount, showCategory, showBalance, showCleared }) => { let dispatchSelected = useSelectedDispatch(); @@ -497,7 +497,7 @@ function CellWithScheduleIcon({ scheduleId, children }) { ); } -export const Transaction = memo(function Transaction(props) { +const Transaction = memo(function Transaction(props) { let { transaction: originalTransaction, editing, @@ -1067,7 +1067,7 @@ export const Transaction = memo(function Transaction(props) { ); }); -export function TransactionError({ error, isDeposit, onAddSplit, style }) { +function TransactionError({ error, isDeposit, onAddSplit, style }) { switch (error.type) { case 'SplitTransactionError': if (error.version === 1) { diff --git a/packages/desktop-client/src/components/alerts.tsx b/packages/desktop-client/src/components/alerts.tsx index bf04311da3a4314857460f549dd9a3dc112eb6fa..64849fe636f59c19e0d8964c77fce11a5f094f88 100644 --- a/packages/desktop-client/src/components/alerts.tsx +++ b/packages/desktop-client/src/components/alerts.tsx @@ -17,7 +17,7 @@ type AlertProps = { children?: ReactNode; }; -export const Alert = ({ +const Alert = ({ icon: Icon, color, backgroundColor, diff --git a/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.js b/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.js index d03ae01488405026db2b8e323b89a1f98d48dde2..ade0abc8f83a94b0ebf2f403b6e13e8cdcb47848 100644 --- a/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.js +++ b/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.js @@ -7,12 +7,7 @@ import { View } from '../common'; import Autocomplete from './Autocomplete'; -export function AccountList({ - items, - getItemProps, - highlightedIndex, - embedded, -}) { +function AccountList({ items, getItemProps, highlightedIndex, embedded }) { let lastItem = null; return ( diff --git a/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx b/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx index a56ac15d725891fd30bdfe6b0e58325cc62d974c..dd5d94a0bf08e31ab667e41866637cf3d06707e8 100644 --- a/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx +++ b/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx @@ -48,7 +48,7 @@ export function defaultFilterSuggestion(suggestion, value) { return getItemName(suggestion).toLowerCase().includes(value.toLowerCase()); } -export function defaultFilterSuggestions(suggestions, value) { +function defaultFilterSuggestions(suggestions, value) { return suggestions.filter(suggestion => defaultFilterSuggestion(suggestion, value), ); @@ -524,7 +524,7 @@ type MultiAutocompleteProps = Omit< value: unknown[]; onSelect: (ids: unknown[], id?: string) => void; }; -export function MultiAutocomplete({ +function MultiAutocomplete({ value: selectedItems, onSelect, suggestions, diff --git a/packages/desktop-client/src/components/autocomplete/CategorySelect.tsx b/packages/desktop-client/src/components/autocomplete/CategorySelect.tsx index 6a1824dfb8b68a60c0897f2c96d6304eb30ff38f..5f1b9b370cedc2cce9607b3a9505bf271e2d522a 100644 --- a/packages/desktop-client/src/components/autocomplete/CategorySelect.tsx +++ b/packages/desktop-client/src/components/autocomplete/CategorySelect.tsx @@ -55,7 +55,7 @@ type CategoryListProps = { embedded: boolean; footer?: ReactNode; }; -export function CategoryList({ +function CategoryList({ items, getItemProps, highlightedIndex, diff --git a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.js b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.js index 86904ff98563804e4b435680152975f965c8e8c1..fcb35b10bc2515480b10f1093fd30572d27a11de 100644 --- a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.js +++ b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.js @@ -42,7 +42,7 @@ function stripNew(value) { return value; } -export function PayeeList({ +function PayeeList({ items, getItemProps, highlightedIndex, diff --git a/packages/desktop-client/src/components/budget/BudgetMonthCountContext.js b/packages/desktop-client/src/components/budget/BudgetMonthCountContext.js index 489cb938ec4906f5c165b30ac40f967ee5d6cf5b..4fda12ed7b2e968c7b7a774f65ce69d180729eff 100644 --- a/packages/desktop-client/src/components/budget/BudgetMonthCountContext.js +++ b/packages/desktop-client/src/components/budget/BudgetMonthCountContext.js @@ -1,6 +1,6 @@ import React, { createContext, useContext, useState } from 'react'; -export let BudgetMonthCountContext = createContext(); +let BudgetMonthCountContext = createContext(); export function BudgetMonthCountProvider({ children }) { let [displayMax, setDisplayMax] = useState(1); diff --git a/packages/desktop-client/src/components/budget/MobileBudgetTable.js b/packages/desktop-client/src/components/budget/MobileBudgetTable.js index b2cf6ed06f4c2eb85dc98c62ef5b70a04411e9e3..58d70f683f4eb0d492095de9b8559f3e0640ab61 100644 --- a/packages/desktop-client/src/components/budget/MobileBudgetTable.js +++ b/packages/desktop-client/src/components/budget/MobileBudgetTable.js @@ -35,7 +35,7 @@ import { AmountInput } from '../util/AmountInput'; // import { DragDrop, Draggable, Droppable, DragDropHighlight } from './dragdrop'; import { ListItem, ROW_HEIGHT } from './MobileTable'; -export function ToBudget({ toBudget, onClick }) { +function ToBudget({ toBudget, onClick }) { return ( <SheetValue binding={toBudget}> {({ value: amount }) => { @@ -99,7 +99,7 @@ function Saved({ projected }) { ); } -export class BudgetCell extends PureComponent { +class BudgetCell extends PureComponent { render() { const { name, @@ -237,7 +237,7 @@ function BudgetCategoryPreview({ name, pending, style }) { ); } -export class BudgetCategory extends PureComponent { +class BudgetCategory extends PureComponent { constructor(props) { super(props); @@ -364,7 +364,7 @@ export class BudgetCategory extends PureComponent { } } -export class TotalsRow extends PureComponent { +class TotalsRow extends PureComponent { constructor(props) { super(props); @@ -483,7 +483,7 @@ export class TotalsRow extends PureComponent { } } -export class IncomeCategory extends PureComponent { +class IncomeCategory extends PureComponent { render() { const { name, budget, balance, style, nameTextStyle, amountTextStyle } = this.props; @@ -568,7 +568,7 @@ export class IncomeCategory extends PureComponent { // ); // } -export class BudgetGroup extends PureComponent { +class BudgetGroup extends PureComponent { render() { const { group, @@ -650,7 +650,7 @@ export class BudgetGroup extends PureComponent { } } -export class IncomeBudgetGroup extends Component { +class IncomeBudgetGroup extends Component { render() { const { type, group } = this.props; return ( @@ -713,7 +713,7 @@ export class IncomeBudgetGroup extends Component { } } -export class BudgetGroups extends Component { +class BudgetGroups extends Component { getGroups = memoizeOne(groups => { return { incomeGroup: groups.find(group => group.is_income), diff --git a/packages/desktop-client/src/components/budget/misc.js b/packages/desktop-client/src/components/budget/misc.js index 3a9c87ef1cba287e22e3951b0114c4e4f4ee9ed3..d32090b7aad1ab61dc04d31ea195d90329d31f69 100644 --- a/packages/desktop-client/src/components/budget/misc.js +++ b/packages/desktop-client/src/components/budget/misc.js @@ -317,7 +317,7 @@ const connected = connect( export { connected as BudgetTable }; -export function SidebarCategory({ +function SidebarCategory({ innerRef, category, dragPreview, @@ -470,7 +470,7 @@ export function SidebarCategory({ ); } -export function SidebarGroup({ +function SidebarGroup({ group, editing, collapsed, @@ -1381,7 +1381,7 @@ function getCurrentMonthName(startMonth, currentMonth) { : null; } -export const MonthPicker = ({ +const MonthPicker = ({ startMonth, numDisplayed, monthBounds, diff --git a/packages/desktop-client/src/components/common.tsx b/packages/desktop-client/src/components/common.tsx index d36b3b5a74e2f79141e0dcd6d1a99e6c77ca3bb8..10852738cb0387cec75f7061882a02492c06f7ce 100644 --- a/packages/desktop-client/src/components/common.tsx +++ b/packages/desktop-client/src/components/common.tsx @@ -467,7 +467,7 @@ type KeybindingProps = { keyName: ReactNode; }; -export function Keybinding({ keyName }: KeybindingProps) { +function Keybinding({ keyName }: KeybindingProps) { return <Text style={{ fontSize: 10, color: colors.n6 }}>{keyName}</Text>; } diff --git a/packages/desktop-client/src/components/common/Text.tsx b/packages/desktop-client/src/components/common/Text.tsx index 0d0acb82486f92d5436f32fd0ccaec27a2a3844b..8546e1e732c0c44d12529f52b23a7bc653783b8f 100644 --- a/packages/desktop-client/src/components/common/Text.tsx +++ b/packages/desktop-client/src/components/common/Text.tsx @@ -10,7 +10,7 @@ type TextProps = HTMLPropsWithStyle<HTMLSpanElement> & { children?: ReactNode; }; -export const Text = (props: TextProps) => { +const Text = (props: TextProps) => { const { style, innerRef, ...restProps } = props; return ( <span diff --git a/packages/desktop-client/src/components/modals/EditRule.js b/packages/desktop-client/src/components/modals/EditRule.js index 0e4b4a291879e23f302898e3306d0c8006070754..06cc775e64b3f024c51c2dc6a51d764ebae90ebb 100644 --- a/packages/desktop-client/src/components/modals/EditRule.js +++ b/packages/desktop-client/src/components/modals/EditRule.js @@ -78,7 +78,7 @@ function getTransactionFields(conditions, actions) { return fields; } -export function FieldSelect({ fields, style, value, onChange }) { +function FieldSelect({ fields, style, value, onChange }) { return ( <View style={style}> <CustomSelect @@ -175,7 +175,7 @@ function Editor({ error, style, children }) { ); } -export function ConditionEditor({ +function ConditionEditor({ ops, condition, editorStyle, @@ -402,7 +402,7 @@ function newInput(item) { return { ...item, inputKey: '' + Math.random() }; } -export function ConditionsList({ +function ConditionsList({ conditionsOp, conditions, editorStyle, diff --git a/packages/desktop-client/src/components/modals/ImportTransactions.js b/packages/desktop-client/src/components/modals/ImportTransactions.js index b98f8fe4b68ae001e72c26cf70e18f688de4ba0b..b954e5bba042ea13b50e25cfbaa226572c7bfd99 100644 --- a/packages/desktop-client/src/components/modals/ImportTransactions.js +++ b/packages/desktop-client/src/components/modals/ImportTransactions.js @@ -546,7 +546,7 @@ function MultipliersField({ multiplierCB, value, onChange }) { ); } -export function ImportTransactions({ +function ImportTransactions({ modalProps, options, dateFormat = 'MM/dd/yyyy', diff --git a/packages/desktop-client/src/components/select/DateSelect.js b/packages/desktop-client/src/components/select/DateSelect.js index ade52981b4621fdfd4fdb6beca60e3fd1a0c8168..8152c7877d4e5811767c4d3ac70646fc2f7fe89d 100644 --- a/packages/desktop-client/src/components/select/DateSelect.js +++ b/packages/desktop-client/src/components/select/DateSelect.js @@ -69,7 +69,7 @@ let pickerStyles = { }, }; -export let DatePicker = forwardRef( +let DatePicker = forwardRef( ({ value, firstDayOfWeekIdx, dateFormat, onUpdate, onSelect }, ref) => { let picker = useRef(null); let mountPoint = useRef(null); diff --git a/packages/desktop-client/src/components/sort.js b/packages/desktop-client/src/components/sort.js index c697f7f76bc40a453ab02ff64917bfa5cce89938..7ae7880542d920724fcb274dc6e8a5b130931c01 100644 --- a/packages/desktop-client/src/components/sort.js +++ b/packages/desktop-client/src/components/sort.js @@ -13,7 +13,7 @@ import { colors } from '../style'; import { View } from './common'; -export function useMergedRefs(ref1, ref2) { +function useMergedRefs(ref1, ref2) { return useMemo(() => { function ref(value) { [ref1, ref2].forEach(ref => { diff --git a/packages/desktop-client/src/components/table.tsx b/packages/desktop-client/src/components/table.tsx index 7d50ed73eb5b0f32968c168cdc5d15b111190027..5b8fe3edbef28c23bf12919cc988962bf37a2dcf 100644 --- a/packages/desktop-client/src/components/table.tsx +++ b/packages/desktop-client/src/components/table.tsx @@ -39,13 +39,13 @@ import { IntersectionBoundary, Menu, } from './common'; -import { FixedSizeList } from './FixedSizeList'; +import FixedSizeList from './FixedSizeList'; import { KeyHandlers } from './KeyHandlers'; import format from './spreadsheet/format'; import SheetValue from './spreadsheet/SheetValue'; export const ROW_HEIGHT = 32; -export const TABLE_BACKGROUND_COLOR = colors.n11; +const TABLE_BACKGROUND_COLOR = colors.n11; function fireBlur(onBlur, e) { if (document.hasFocus()) { @@ -448,7 +448,7 @@ export function InputCell({ ); } -export function shouldSaveFromKey(e) { +function shouldSaveFromKey(e) { switch (e.key) { case 'Tab': case 'Enter': diff --git a/packages/desktop-client/src/hooks/useProperFocus.js b/packages/desktop-client/src/hooks/useProperFocus.js index 780c4d7ca764827da70dd05b6c4580178039e9bc..6d8930fff13ab51d73e27e52f36a77fbb4d5ab35 100644 --- a/packages/desktop-client/src/hooks/useProperFocus.js +++ b/packages/desktop-client/src/hooks/useProperFocus.js @@ -20,7 +20,7 @@ function getFocusedKey(el) { return null; } -export function focusElement(el, refocusContext) { +function focusElement(el, refocusContext) { if (refocusContext) { let key = getFocusedKey(el); el.focus({ preventScroll: key && key === refocusContext.keyRef.current }); diff --git a/packages/desktop-client/src/util/versions.ts b/packages/desktop-client/src/util/versions.ts index c87e00b2ba6806c8f172ad6e297218352aa8bcd1..00dc03eab3d17ea06f9239ea4b8dff539dfb9dfb 100644 --- a/packages/desktop-client/src/util/versions.ts +++ b/packages/desktop-client/src/util/versions.ts @@ -5,7 +5,7 @@ function parseSemanticVersion(versionString): [number, number, number] { .map(n => parseInt(n)); } -export function cmpSemanticVersion( +function cmpSemanticVersion( versionStringA: string, versionStringB: string, ): number { diff --git a/upcoming-release-notes/1139.md b/upcoming-release-notes/1139.md new file mode 100644 index 0000000000000000000000000000000000000000..9f63e1f61f3ec80cb0adc4f0f09f4e8cc493c788 --- /dev/null +++ b/upcoming-release-notes/1139.md @@ -0,0 +1,6 @@ +--- +category: Bugfix +authors: [Shazib] +--- + +Remove redundant usage of 'export' keyword