fix: expose DrawCellInfo type (#458)

ota-meshi · web-flow · commit 81a5c13155d1 · 2025-08-15T10:04:42.000+09:00
* fix: expose DrawCellInfo type

* update
diff --git a/packages/cheetah-grid/package-lock.json b/packages/cheetah-grid/package-lock.json
diff --git a/packages/cheetah-grid/package.json b/packages/cheetah-grid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cheetah-grid",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Cheetah Grid is a high performance grid engine that works on canvas",
   "keywords": [
     "spreadsheet",
diff --git a/packages/cheetah-grid/src/js/ListGrid.ts b/packages/cheetah-grid/src/js/ListGrid.ts
@@ -11,6 +11,7 @@ import type {
   ColumnIconOption,
   ColumnStyleOption,
   ColumnTypeAPI,
+  DrawCellInfo,
   DrawGridAPI,
   EventListenerId,
   FieldData,
@@ -55,7 +56,6 @@ import {
 import type { BaseColumn } from "./columns/type/BaseColumn";
 import { BaseStyle } from "./columns/style";
 import type { ColumnData } from "./list-grid/layout-map/api";
-import type { DrawCellInfo } from "./ts-types-internal";
 import { DrawGrid } from "./core/DrawGrid";
 import { GridCanvasHelper } from "./GridCanvasHelper";
 import { BaseStyle as HeaderBaseStyle } from "./header/style";
diff --git a/packages/cheetah-grid/src/js/columns/indicator/type.ts b/packages/cheetah-grid/src/js/columns/indicator/type.ts
@@ -1,10 +1,10 @@
 import type {
   CellContext,
+  DrawCellInfo,
   GridCanvasHelperAPI,
   IndicatorObject,
   ListGridAPI,
 } from "../../ts-types";
-import type { DrawCellInfo } from "../../ts-types-internal";
 
 export const enum DrawIndicatorKind {
   topLeft,
diff --git a/packages/cheetah-grid/src/js/columns/message/BaseMessage.ts b/packages/cheetah-grid/src/js/columns/message/BaseMessage.ts
@@ -1,11 +1,11 @@
 import type {
   CellContext,
   ColumnStyle,
+  DrawCellInfo,
   GridCanvasHelperAPI,
   ListGridAPI,
   MessageObject,
 } from "../../ts-types";
-import type { DrawCellInfo } from "../../ts-types-internal";
 import type { MessageElement } from "./internal/MessageElement";
 
 export abstract class BaseMessage<T> {
diff --git a/packages/cheetah-grid/src/js/columns/message/ErrorMessage.ts b/packages/cheetah-grid/src/js/columns/message/ErrorMessage.ts
@@ -2,12 +2,12 @@ import * as messageUtils from "./messageUtils";
 import type {
   CellContext,
   ColumnStyle,
+  DrawCellInfo,
   GridCanvasHelperAPI,
   ListGridAPI,
   MessageObject,
 } from "../../ts-types";
 import { BaseMessage } from "./BaseMessage";
-import type { DrawCellInfo } from "../../ts-types-internal";
 import { ErrorMessageElement } from "./internal/ErrorMessageElement";
 import { cellInRange } from "../../internal/utils";
 
diff --git a/packages/cheetah-grid/src/js/columns/message/InfoMessage.ts b/packages/cheetah-grid/src/js/columns/message/InfoMessage.ts
@@ -2,12 +2,12 @@ import * as messageUtils from "./messageUtils";
 import type {
   CellContext,
   ColumnStyle,
+  DrawCellInfo,
   GridCanvasHelperAPI,
   ListGridAPI,
   MessageObject,
 } from "../../ts-types";
 import { BaseMessage } from "./BaseMessage";
-import type { DrawCellInfo } from "../../ts-types-internal";
 import { MessageElement } from "./internal/MessageElement";
 import { cellInRange } from "../../internal/utils";
 const GREY_L2 = "#e0e0e0";
diff --git a/packages/cheetah-grid/src/js/columns/message/MessageHandler.ts b/packages/cheetah-grid/src/js/columns/message/MessageHandler.ts
@@ -1,7 +1,7 @@
 import type {
   MessageHandler as Base,
   DrawCellInfo,
-} from "../../ts-types-internal";
+} from "../../ts-types/grid-engine";
 import type {
   CellContext,
   ColumnStyle,
diff --git a/packages/cheetah-grid/src/js/columns/message/WarningMessage.ts b/packages/cheetah-grid/src/js/columns/message/WarningMessage.ts
@@ -2,12 +2,12 @@ import * as messageUtils from "./messageUtils";
 import type {
   CellContext,
   ColumnStyle,
+  DrawCellInfo,
   GridCanvasHelperAPI,
   ListGridAPI,
   MessageObject,
 } from "../../ts-types";
 import { BaseMessage } from "./BaseMessage";
-import type { DrawCellInfo } from "../../ts-types-internal";
 import { WarningMessageElement } from "./internal/WarningMessageElement";
 import { cellInRange } from "../../internal/utils";
 
diff --git a/packages/cheetah-grid/src/js/columns/type/BaseColumn.ts b/packages/cheetah-grid/src/js/columns/type/BaseColumn.ts
@@ -4,18 +4,15 @@ import type {
   CellAddress,
   CellContext,
   ColumnTypeAPI,
+  DrawCellInfo,
   EventListenerId,
   GridCanvasHelperAPI,
   LayoutObjectId,
   ListGridAPI,
   MaybePromise,
   Message,
 } from "../../ts-types";
-import type {
-  ColumnFadeinState,
-  DrawCellInfo,
-  GridInternal,
-} from "../../ts-types-internal";
+import type { ColumnFadeinState, GridInternal } from "../../ts-types-internal";
 import { isPromise, obj } from "../../internal/utils";
 import { BaseStyle } from "../style/BaseStyle";
 import { DrawIndicatorKind } from "../indicator/type";
diff --git a/packages/cheetah-grid/src/js/columns/type/BranchGraphColumn.ts b/packages/cheetah-grid/src/js/columns/type/BranchGraphColumn.ts
@@ -3,13 +3,14 @@ import type {
   BranchGraphCommandValue,
   CellContext,
   ColorDef,
+  DrawCellInfo,
   FieldDef,
   GridCanvasHelperAPI,
   ListGridAPI,
   MaybePromise,
   MaybePromiseOrUndef,
 } from "../../ts-types";
-import type { DrawCellInfo, GridInternal } from "../../ts-types-internal";
+import type { GridInternal } from "../../ts-types-internal";
 import { getOrApply, isPromise, obj } from "../../internal/utils";
 import { BaseColumn } from "./BaseColumn";
 import { BranchGraphStyle } from "../style/BranchGraphStyle";
diff --git a/packages/cheetah-grid/src/js/columns/type/ButtonColumn.ts b/packages/cheetah-grid/src/js/columns/type/ButtonColumn.ts
@@ -2,10 +2,11 @@ import * as utils from "./columnUtils";
 import type {
   ButtonColumnOption,
   CellContext,
+  DrawCellInfo,
   GridCanvasHelperAPI,
   MaybePromise,
 } from "../../ts-types";
-import type { DrawCellInfo, GridInternal } from "../../ts-types-internal";
+import type { GridInternal } from "../../ts-types-internal";
 import { ButtonStyle } from "../style/ButtonStyle";
 import { Column } from "./Column";
 import { cellInRange } from "../../internal/utils";
diff --git a/packages/cheetah-grid/src/js/columns/type/CheckColumn.ts b/packages/cheetah-grid/src/js/columns/type/CheckColumn.ts
@@ -1,5 +1,9 @@
-import type { CellContext, GridCanvasHelperAPI } from "../../ts-types";
-import type { DrawCellInfo, GridInternal } from "../../ts-types-internal";
+import type {
+  CellContext,
+  DrawCellInfo,
+  GridCanvasHelperAPI,
+} from "../../ts-types";
+import type { GridInternal } from "../../ts-types-internal";
 import { BaseColumn } from "./BaseColumn";
 import { CheckStyle } from "../style/CheckStyle";
 import { CHECK_COLUMN_STATE_ID } from "../../internal/symbolManager";
diff --git a/packages/cheetah-grid/src/js/columns/type/Column.ts b/packages/cheetah-grid/src/js/columns/type/Column.ts
@@ -1,11 +1,11 @@
 import * as utils from "./columnUtils";
 import type {
   CellContext,
+  DrawCellInfo,
   GridCanvasHelperAPI,
   ListGridAPI,
 } from "../../ts-types";
 import { BaseColumn } from "./BaseColumn";
-import type { DrawCellInfo } from "../../ts-types-internal";
 import { Style } from "../style/Style";
 
 export class Column<T> extends BaseColumn<T> {
diff --git a/packages/cheetah-grid/src/js/columns/type/IconColumn.ts b/packages/cheetah-grid/src/js/columns/type/IconColumn.ts
@@ -2,12 +2,12 @@ import * as icons from "../../internal/icons";
 import type {
   CellContext,
   ColumnIconOption,
+  DrawCellInfo,
   GridCanvasHelperAPI,
   IconColumnOption,
   ListGridAPI,
 } from "../../ts-types";
 import { Column } from "./Column";
-import type { DrawCellInfo } from "../../ts-types-internal";
 import { IconStyle } from "../style/IconStyle";
 
 function repeatArray(
diff --git a/packages/cheetah-grid/src/js/columns/type/ImageColumn.ts b/packages/cheetah-grid/src/js/columns/type/ImageColumn.ts
@@ -1,11 +1,11 @@
 import type {
   CellContext,
+  DrawCellInfo,
   GridCanvasHelperAPI,
   ListGridAPI,
   MaybePromise,
 } from "../../ts-types";
 import { BaseColumn } from "./BaseColumn";
-import type { DrawCellInfo } from "../../ts-types-internal";
 import { ImageStyle } from "../style/ImageStyle";
 import { Rect } from "../../internal/Rect";
 import { calcStartPosition } from "../../internal/canvases";
diff --git a/packages/cheetah-grid/src/js/columns/type/MenuColumn.ts b/packages/cheetah-grid/src/js/columns/type/MenuColumn.ts
@@ -2,13 +2,13 @@ import * as utils from "./columnUtils";
 import type {
   CellContext,
   ColumnMenuItemOptions,
+  DrawCellInfo,
   GridCanvasHelperAPI,
   ListGridAPI,
   MenuColumnOption,
   SimpleColumnMenuItemOption,
 } from "../../ts-types";
 import { BaseColumn } from "./BaseColumn";
-import type { DrawCellInfo } from "../../ts-types-internal";
 import { MenuStyle } from "../style/MenuStyle";
 import { normalize } from "../../internal/menu-items";
 
diff --git a/packages/cheetah-grid/src/js/columns/type/MultilineTextColumn.ts b/packages/cheetah-grid/src/js/columns/type/MultilineTextColumn.ts
@@ -1,11 +1,11 @@
 import * as utils from "./columnUtils";
 import type {
   CellContext,
+  DrawCellInfo,
   GridCanvasHelperAPI,
   ListGridAPI,
 } from "../../ts-types";
 import { BaseColumn } from "./BaseColumn";
-import type { DrawCellInfo } from "../../ts-types-internal";
 import { MultilineTextStyle } from "../style/MultilineTextStyle";
 
 export class MultilineTextColumn<T> extends BaseColumn<T> {
diff --git a/packages/cheetah-grid/src/js/columns/type/PercentCompleteBarColumn.ts b/packages/cheetah-grid/src/js/columns/type/PercentCompleteBarColumn.ts
@@ -1,12 +1,12 @@
 import type {
   CellContext,
+  DrawCellInfo,
   GridCanvasHelperAPI,
   ListGridAPI,
   PercentCompleteBarColumnOption,
 } from "../../ts-types";
 import { getOrApply, str } from "../../internal/utils";
 import { Column } from "./Column";
-import type { DrawCellInfo } from "../../ts-types-internal";
 import { PercentCompleteBarStyle } from "../style/PercentCompleteBarStyle";
 
 const MARGIN = 2;
diff --git a/packages/cheetah-grid/src/js/columns/type/RadioColumn.ts b/packages/cheetah-grid/src/js/columns/type/RadioColumn.ts
@@ -1,5 +1,9 @@
-import type { CellContext, GridCanvasHelperAPI } from "../../ts-types";
-import type { DrawCellInfo, GridInternal } from "../../ts-types-internal";
+import type {
+  CellContext,
+  DrawCellInfo,
+  GridCanvasHelperAPI,
+} from "../../ts-types";
+import type { GridInternal } from "../../ts-types-internal";
 import { BaseColumn } from "./BaseColumn";
 import { RadioStyle } from "../style/RadioStyle";
 import { RADIO_COLUMN_STATE_ID } from "../../internal/symbolManager";
diff --git a/packages/cheetah-grid/src/js/columns/type/TreeColumn.ts b/packages/cheetah-grid/src/js/columns/type/TreeColumn.ts
@@ -5,6 +5,7 @@ import type {
   CellAddress,
   CellContext,
   DataSourceAPI,
+  DrawCellInfo,
   FieldDef,
   GridCanvasHelperAPI,
   ListGridAPI,
@@ -13,7 +14,7 @@ import type {
   TreeColumnOption,
   TreeDataValue,
 } from "../../ts-types";
-import type { DrawCellInfo, GridInternal } from "../../ts-types-internal";
+import type { GridInternal } from "../../ts-types-internal";
 import { Column } from "./Column";
 import { Rect } from "../../internal/Rect";
 import { TreeLineKind } from "../../ts-types-internal";
diff --git a/packages/cheetah-grid/src/js/header/type/BaseHeader.ts b/packages/cheetah-grid/src/js/header/type/BaseHeader.ts
@@ -2,13 +2,13 @@ import * as styleContents from "../style";
 import type {
   CellAddress,
   CellContext,
+  DrawCellInfo,
   EventListenerId,
   HeaderStyleOption,
   LayoutObjectId,
   ListGridAPI,
 } from "../../ts-types";
 import { BaseStyle } from "../style/BaseStyle";
-import type { DrawCellInfo } from "../../ts-types-internal";
 import type { GridCanvasHelper } from "../../GridCanvasHelper";
 
 export abstract class BaseHeader<T> {
diff --git a/packages/cheetah-grid/src/js/header/type/CheckHeader.ts b/packages/cheetah-grid/src/js/header/type/CheckHeader.ts
@@ -1,11 +1,11 @@
 import * as inlineUtils from "../../element/inlines";
 import * as utils from "../../columns/type/columnUtils";
-import type { CellContext, ColorPropertyDefine } from "../../ts-types";
 import type {
-  CheckHeaderState,
+  CellContext,
+  ColorPropertyDefine,
   DrawCellInfo,
-  GridInternal,
-} from "../../ts-types-internal";
+} from "../../ts-types";
+import type { CheckHeaderState, GridInternal } from "../../ts-types-internal";
 import { BaseHeader } from "./BaseHeader";
 import { CheckHeaderStyle } from "../style/CheckHeaderStyle";
 import type { GridCanvasHelper } from "../../GridCanvasHelper";
diff --git a/packages/cheetah-grid/src/js/header/type/Header.ts b/packages/cheetah-grid/src/js/header/type/Header.ts
@@ -1,7 +1,6 @@
 import * as utils from "../../columns/type/columnUtils";
-import type { CellContext, ListGridAPI } from "../../ts-types";
+import type { CellContext, DrawCellInfo, ListGridAPI } from "../../ts-types";
 import { BaseHeader } from "./BaseHeader";
-import type { DrawCellInfo } from "../../ts-types-internal";
 import type { GridCanvasHelper } from "../../GridCanvasHelper";
 import { Style } from "../style/Style";
 
diff --git a/packages/cheetah-grid/src/js/header/type/MultilineTextHeader.ts b/packages/cheetah-grid/src/js/header/type/MultilineTextHeader.ts
@@ -1,7 +1,7 @@
 import * as utils from "../../columns/type/columnUtils";
-import type { DrawCellInfo, GridInternal } from "../../ts-types-internal";
+import type { GridInternal } from "../../ts-types-internal";
 import { BaseHeader } from "./BaseHeader";
-import type { CellContext } from "../../ts-types";
+import type { CellContext, DrawCellInfo } from "../../ts-types";
 import type { GridCanvasHelper } from "../../GridCanvasHelper";
 import { MultilineTextHeaderStyle } from "../style/MultilineTextHeaderStyle";
 
diff --git a/packages/cheetah-grid/src/js/header/type/SortHeader.ts b/packages/cheetah-grid/src/js/header/type/SortHeader.ts
@@ -1,7 +1,11 @@
 import * as utils from "../../columns/type/columnUtils";
-import type { CellContext, ListGridAPI, SortState } from "../../ts-types";
+import type {
+  CellContext,
+  DrawCellInfo,
+  ListGridAPI,
+  SortState,
+} from "../../ts-types";
 import { BaseHeader } from "./BaseHeader";
-import type { DrawCellInfo } from "../../ts-types-internal";
 import type { GridCanvasHelper } from "../../GridCanvasHelper";
 import { SortHeaderStyle } from "../style/SortHeaderStyle";
 import { cellInRange } from "../../internal/utils";
diff --git a/packages/cheetah-grid/src/js/ts-types-internal/grid-engine.ts b/packages/cheetah-grid/src/js/ts-types-internal/grid-engine.ts
@@ -1,16 +1,5 @@
 import type { CellAddress, FieldDef } from "../ts-types/grid";
-import type {
-  CellContext,
-  GridCanvasHelperAPI,
-  ListGridAPI,
-} from "../ts-types/grid-engine";
-import type { ColorPropertyDefine, ColumnIconOption } from "../ts-types/define";
-import type {
-  ColumnStyle,
-  ColumnStyleOption,
-  HeaderStyleOption,
-} from "../ts-types/column";
-import type { Message } from "../ts-types/data";
+import type { ListGridAPI } from "../ts-types/grid-engine";
 import type {
   BRANCH_GRAPH_COLUMN_STATE_ID,
   BUTTON_COLUMN_STATE_ID,
@@ -24,28 +13,6 @@ import type {
   TREE_COLUMN_STATE_ID,
 } from "../internal/symbolManager";
 
-export interface MessageHandler<T> {
-  drawCellMessage(
-    message: Message,
-    context: CellContext,
-    style: ColumnStyle,
-    helper: GridCanvasHelperAPI,
-    grid: ListGridAPI<T>,
-    info: DrawCellInfo<T>
-  ): void;
-}
-
-export interface DrawCellInfo<T> {
-  getRecord(): unknown;
-  getIcon(): ColumnIconOption<never> | ColumnIconOption<never>[] | null;
-  getMessage(): Message;
-  messageHandler: MessageHandler<T>;
-  style: ColumnStyleOption | HeaderStyleOption | null | undefined;
-  drawCellBase(arg?: { bgColor?: ColorPropertyDefine }): void;
-  drawCellBg(arg?: { bgColor?: ColorPropertyDefine }): void;
-  drawCellBorder(): void;
-}
-
 export type ColumnFadeinState = {
   activeFadeins?: ((point: number) => void)[];
   cells: {
diff --git a/packages/cheetah-grid/src/js/ts-types/grid-engine.ts b/packages/cheetah-grid/src/js/ts-types/grid-engine.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cheetah-grid",`
`3`		`- "version": "2.0.3",`
	`3`	`+ "version": "2.0.4",`
`4`	`4`	`"description": "Cheetah Grid is a high performance grid engine that works on canvas",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"spreadsheet",`