refactor: break out types

carbon-design-system · May 16, 2024 · 0198282 · 0198282
1 parent d4c4395
commit 0198282
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/packages/ibm-products/src/components/DataSpreadsheet/DataSpreadsheet.tsx b/packages/ibm-products/src/components/DataSpreadsheet/DataSpreadsheet.tsx
@@ -48,13 +48,7 @@ import { removeCellSelections } from './utils/removeCellSelections';
 import { selectAllCells } from './utils/selectAllCells';
 import { handleEditSubmit } from './utils/handleEditSubmit';
 import { handleKeyPress } from './utils/commonEventHandlers';
-import {
-  ActiveCellCoordinates,
-  Column,
-  PrevStateType,
-  Size,
-  Theme,
-} from './types';
+import { ActiveCellCoordinates, Column, PrevState, Size, Theme } from './types';
 
 // The block part of our conventional BEM class names (blockClass__E--M).
 const blockClass = `${pkg.prefix}--data-spreadsheet`;
@@ -185,7 +179,7 @@ export let DataSpreadsheet = React.forwardRef(
       useState<boolean>(false);
     const [activeCellInsideSelectionArea, setActiveCellInsideSelectionArea] =
       useState(false);
-    const previousState: PrevStateType =
+    const previousState: PrevState =
       usePreviousValue({
         activeCellCoordinates,
         isEditing,

diff --git a/packages/ibm-products/src/components/DataSpreadsheet/DataSpreadsheetHeader.tsx b/packages/ibm-products/src/components/DataSpreadsheet/DataSpreadsheetHeader.tsx
@@ -27,7 +27,13 @@ import { getSpreadsheetWidth } from './utils/getSpreadsheetWidth';
 import { useSpreadsheetMouseMove } from './hooks';
 import { checkForHoldingKey } from './utils/checkForHoldingKey';
 import { prepareProps } from '../../global/js/utils/props-helper';
-import { ActiveCellCoordinates, Column, ItemType, Size } from './types';
+import {
+  ActiveCellCoordinates,
+  Column,
+  ItemType,
+  PrevState,
+  Size,
+} from './types';
 
 const blockClass = `${pkg.prefix}--data-spreadsheet`;
 
@@ -131,10 +137,6 @@ interface DataSpreadsheetHeaderProps {
   visibleColumns?: [];
 }
 
-type PrevState = {
-  cellSize?: Size;
-};
-
 export const DataSpreadsheetHeader = forwardRef(
   (
     {

diff --git a/packages/ibm-products/src/components/DataSpreadsheet/types/index.ts b/packages/ibm-products/src/components/DataSpreadsheet/types/index.ts
@@ -1,3 +1,5 @@
+export type Size = 'xs' | 'sm' | 'md' | 'lg';
+export type Theme = 'light' | 'dark';
 export interface Column {
   Header?: string;
   accessor?: string | (() => void);
@@ -18,6 +20,7 @@ export interface PrevState {
   selectionAreaData?: object[];
   clickAndHoldActive?: boolean;
   rowHeight?: number;
+  cellSize?: Size;
 }
 
 export interface Point {
@@ -29,6 +32,3 @@ export interface ItemType {
   point1?: Point;
   point2?: Point;
 }
-
-export type Size = 'xs' | 'sm' | 'md' | 'lg';
-export type Theme = 'light' | 'dark';