improve code

Author: MrWangJustToDo

packages/react/src/components/DiffAddWidget.tsx

@@ -1,8 +1,6 @@
+import { addWidgetBGName, addWidgetColorName, diffFontSizeName } from "@git-diff-view/utils";
 import * as React from "react";
 
-import { addWidgetBGName, addWidgetColorName } from "./color";
-import { diffFontSizeName } from "./tools";
-
 import type { SplitSide } from "./DiffView";
 import type { DiffFile } from "@git-diff-view/core";
 

packages/react/src/components/DiffContent.tsx

@@ -1,9 +1,8 @@
 import { DiffLineType, NewLineSymbol, type DiffFile, type DiffLine, type SyntaxLine } from "@git-diff-view/core";
+import { memoFunc, addContentHighlightBGName, delContentHighlightBGName, diffFontSizeName } from "@git-diff-view/utils";
 import * as React from "react";
 
-import { addContentHighlightBGName, delContentHighlightBGName } from "./color";
 import { DiffNoNewLine } from "./DiffNoNewLine";
-import { diffFontSizeName, memoFunc } from "./tools";
 
 const temp = {};
 

packages/react/src/components/DiffContent_v2.tsx

@@ -6,12 +6,11 @@ import {
   type diffChanges,
   type SyntaxLine,
 } from "@git-diff-view/core";
+import { addContentHighlightBGName, delContentHighlightBGName, diffFontSizeName } from "@git-diff-view/utils";
 import * as React from "react";
 
-import { addContentHighlightBGName, delContentHighlightBGName } from "./color";
 import { getStyleObjectFromString, getSymbol } from "./DiffContent";
 import { DiffNoNewLine } from "./DiffNoNewLine";
-import { diffFontSizeName } from "./tools";
 
 const RenderRange = ({
   str,

packages/react/src/components/DiffSplitContentLineNormal.tsx

@@ -1,14 +1,19 @@
 import { DiffLineType, type DiffFile, checkDiffLineIncludeChange } from "@git-diff-view/core";
+import {
+  getContentBG,
+  getLineNumberBG,
+  plainLineNumberColorName,
+  diffAsideWidthName,
+  emptyBGName,
+} from "@git-diff-view/utils";
 import * as React from "react";
 
 import { useDiffViewContext, SplitSide } from "..";
 
-import { emptyBGName, getContentBG, getLineNumberBG, plainLineNumberColorName } from "./color";
 import { DiffSplitAddWidget } from "./DiffAddWidget";
 import { DiffContent } from "./DiffContent";
 // import { DiffContent_v2 } from "./DiffContent_v2";
 import { useDiffWidgetContext } from "./DiffWidgetContext";
-import { diffAsideWidthName } from "./tools";
 
 const _DiffSplitLine = ({
   index,

packages/react/src/components/DiffSplitContentLineWrap.tsx

@@ -1,9 +1,15 @@
 import { DiffLineType, type DiffFile, checkDiffLineIncludeChange } from "@git-diff-view/core";
+import {
+  getContentBG,
+  getLineNumberBG,
+  plainLineNumberColorName,
+  emptyBGName,
+  borderColorName,
+} from "@git-diff-view/utils";
 import * as React from "react";
 
 import { SplitSide, useDiffViewContext } from "..";
 
-import { borderColorName, emptyBGName, getContentBG, getLineNumberBG, plainLineNumberColorName } from "./color";
 import { DiffSplitAddWidget } from "./DiffAddWidget";
 import { DiffContent } from "./DiffContent";
 // import { DiffContent_v2 } from "./DiffContent_v2";

packages/react/src/components/DiffSplitExtendLineNormal.tsx

@@ -1,11 +1,10 @@
+import { emptyBGName } from "@git-diff-view/utils";
 import * as React from "react";
 
 import { useDiffViewContext, SplitSide } from "..";
 import { useDomWidth } from "../hooks/useDomWidth";
 import { useSyncHeight } from "../hooks/useSyncHeight";
 
-import { emptyBGName } from "./color";
-
 import type { DiffFile } from "@git-diff-view/core";
 
 const _DiffSplitExtendLine = ({

packages/react/src/components/DiffSplitExtendLineWrap.tsx

@@ -1,9 +1,8 @@
+import { emptyBGName, borderColorName } from "@git-diff-view/utils";
 import * as React from "react";
 
 import { useDiffViewContext, SplitSide } from "..";
 
-import { borderColorName, emptyBGName } from "./color";
-
 import type { DiffFile } from "@git-diff-view/core";
 
 const _DiffSplitExtendLine = ({

packages/react/src/components/DiffSplitHunkLineNormal.tsx

@@ -1,12 +1,17 @@
 import { composeLen, type DiffFile } from "@git-diff-view/core";
+import {
+  hunkLineNumberBGName,
+  plainLineNumberColorName,
+  diffAsideWidthName,
+  hunkContentBGName,
+  hunkContentColorName,
+} from "@git-diff-view/utils";
 import * as React from "react";
 
 import { DiffModeEnum, SplitSide, useDiffViewContext } from "..";
 import { useSyncHeight } from "../hooks/useSyncHeight";
 
-import { hunkContentBGName, hunkContentColorName, hunkLineNumberBGName, plainLineNumberColorName } from "./color";
 import { ExpandAll, ExpandDown, ExpandUp } from "./DiffExpand";
-import { diffAsideWidthName } from "./tools";
 
 const _DiffSplitHunkLineGitHub = ({
   index,

packages/react/src/components/DiffSplitHunkLineWrap.tsx

@@ -1,15 +1,15 @@
 import { composeLen, type DiffFile } from "@git-diff-view/core";
+import {
+  hunkLineNumberBGName,
+  plainLineNumberColorName,
+  hunkContentBGName,
+  hunkContentColorName,
+  borderColorName,
+} from "@git-diff-view/utils";
 import * as React from "react";
 
 import { DiffModeEnum, useDiffViewContext } from "..";
 
-import {
-  borderColorName,
-  hunkContentBGName,
-  hunkContentColorName,
-  hunkLineNumberBGName,
-  plainLineNumberColorName,
-} from "./color";
 import { ExpandAll, ExpandDown, ExpandUp } from "./DiffExpand";
 
 const DiffSplitHunkLineGitHub = ({

packages/react/src/components/DiffSplitViewNormal.tsx

@@ -1,19 +1,18 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { getSplitContentLines, type DiffFile } from "@git-diff-view/core";
+import { removeAllSelection, syncScroll, diffFontSizeName, borderColorName, diffAsideWidthName } from "@git-diff-view/utils";
 import { Fragment, memo, useEffect, useRef } from "react";
 import * as React from "react";
 import { useSyncExternalStore } from "use-sync-external-store/shim/index.js";
 
 import { useDiffViewContext } from "..";
 import { useTextWidth } from "../hooks/useTextWidth";
 
-import { borderColorName } from "./color";
 import { DiffSplitContentLine } from "./DiffSplitContentLineNormal";
 import { DiffSplitExtendLine } from "./DiffSplitExtendLineNormal";
 import { DiffSplitHunkLine } from "./DiffSplitHunkLineNormal";
 import { DiffSplitWidgetLine } from "./DiffSplitWidgetLineNormal";
 import { SplitSide } from "./DiffView";
-import { diffAsideWidthName, diffFontSizeName, removeAllSelection, syncScroll } from "./tools";
 
 import type { MouseEventHandler } from "react";