expensegroup to typescript

actualbudget · Nov 11, 2023 · 6628f66 · 6628f66
1 parent 22efe74
commit 6628f66
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/...ent/src/components/budget/ExpenseGroup.js → ...nt/src/components/budget/ExpenseGroup.tsx b/...ent/src/components/budget/ExpenseGroup.js → ...nt/src/components/budget/ExpenseGroup.tsx
@@ -1,13 +1,36 @@
-import React from 'react';
+import React, { type ComponentProps } from 'react';
 
 import { theme } from '../../style';
 import View from '../common/View';
-import { useDraggable, useDroppable, DropHighlight } from '../sort';
+import {
+  useDraggable,
+  useDroppable,
+  DropHighlight,
+  type OnDragChangeCallback,
+  type OnDropCallback,
+  type DragState,
+} from '../sort';
 import { Row, ROW_HEIGHT } from '../table';
 
 import RenderMonths from './RenderMonths';
 import SidebarGroup from './SidebarGroup';
 
+type ExpenseGroupProps = {
+  group: ComponentProps<typeof SidebarGroup>['group'];
+  collapsed: boolean;
+  editingCell: { id: string; cell: string } | null;
+  dragState: DragState;
+  MonthComponent: ComponentProps<typeof RenderMonths>['component'];
+  onEditName?: ComponentProps<typeof SidebarGroup>['onEdit'];
+  onSave?: ComponentProps<typeof SidebarGroup>['onSave'];
+  onDelete?: ComponentProps<typeof SidebarGroup>['onDelete'];
+  onDragChange: OnDragChangeCallback;
+  onReorderGroup: OnDropCallback;
+  onReorderCategory: OnDropCallback;
+  onToggleCollapse?: ComponentProps<typeof SidebarGroup>['onToggleCollapse'];
+  onShowNewCategory?: ComponentProps<typeof SidebarGroup>['onShowNewCategory'];
+};
+
 function ExpenseGroup({
   group,
   collapsed,
@@ -22,7 +45,7 @@ function ExpenseGroup({
   onReorderCategory,
   onToggleCollapse,
   onShowNewCategory,
-}) {
+}: ExpenseGroupProps) {
   let dragging = dragState && dragState.item === group;
 
   let { dragRef } = useDraggable({

diff --git a/packages/desktop-client/src/components/budget/SidebarGroup.tsx b/packages/desktop-client/src/components/budget/SidebarGroup.tsx
@@ -24,7 +24,7 @@ type SidebarGroupProps = {
   };
   editing?: boolean;
   collapsed: boolean;
-  dragPreview?: () => void;
+  dragPreview?: boolean;
   innerRef?: ConnectDragSource;
   borderColor?: string;
   style?: CSSProperties;

diff --git a/packages/desktop-client/src/components/sort.tsx b/packages/desktop-client/src/components/sort.tsx
@@ -14,10 +14,11 @@ import { theme } from '../style';
 
 import View from './common/View';
 
-type DragState = {
+export type DragState = {
   state: 'start-preview' | 'start' | 'end';
   type?: string;
   item?: unknown;
+  preview?: boolean;
 };
 
 export type DropPosition = 'top' | 'bottom';