Skip to content

Commit 172d57a

Browse files
update
1 parent d7af8b6 commit 172d57a

31 files changed

+383
-1112
lines changed

.eslintrc.cjs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,14 @@ module.exports = {
55
},
66
// eslint will auto add `eslint-config` for a no scope package(which not start with '@' chart), so here use absolute file path
77
extends: [require.resolve("project-tool/baseLint")],
8-
ignorePatterns: ["dist", "dev", "scripts", "node_modules", "next-app-example", "next-page-example", "packages/solid", "packages/svelte"],
8+
ignorePatterns: [
9+
"dist",
10+
"dev",
11+
"scripts",
12+
"node_modules",
13+
"next-app-example",
14+
"next-page-example",
15+
"packages/solid",
16+
"packages/svelte",
17+
],
918
};

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
**/next-page-example
44
**/dist
55
**/dev
6+
**/.svelte-kit
67
**/*.md
78
**/*.d.ts
89
package.json

packages/core/src/diff-file.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1579,7 +1579,7 @@ export class DiffFile {
15791579
}
15801580
};
15811581

1582-
_getHighlighterName = () => this.#highlighterName || '';
1582+
_getHighlighterName = () => this.#highlighterName || "";
15831583

15841584
_getIsPureDiffRender = () => this.#composeByDiff;
15851585

packages/react/src/components/DiffContent_v2.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
import {
2-
DiffLineType,
3-
type DiffFile,
4-
type DiffLine,
5-
type diffChanges,
6-
type SyntaxLine,
7-
} from "@git-diff-view/core";
1+
import { DiffLineType, type DiffFile, type DiffLine, type diffChanges, type SyntaxLine } from "@git-diff-view/core";
82
import {
93
addContentHighlightBGName,
104
delContentHighlightBGName,

packages/react/src/components/DiffSplitContentLineNormal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const InternalDiffSplitLine = ({
7878
{hasContent ? (
7979
<>
8080
<td
81-
className={`diff-line-${SplitSide[side]}-num sticky z-[1] left-0 w-[1%] min-w-[40px] select-none pl-[10px] pr-[10px] text-right align-top`}
81+
className={`diff-line-${SplitSide[side]}-num sticky left-0 z-[1] w-[1%] min-w-[40px] select-none pl-[10px] pr-[10px] text-right align-top`}
8282
style={{
8383
backgroundColor: lineNumberBG,
8484
color: `var(${hasDiff ? plainLineNumberColorName : expandLineNumberColorName})`,
@@ -109,7 +109,7 @@ const InternalDiffSplitLine = ({
109109
<DiffContent
110110
enableWrap={false}
111111
diffFile={diffFile}
112-
rawLine={currentLine?.value || ''}
112+
rawLine={currentLine?.value || ""}
113113
diffLine={currentLine?.diff}
114114
plainLine={plainLine}
115115
syntaxLine={syntaxLine}

packages/react/src/components/DiffSplitWidgetLineWrap.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const InternalDiffSplitWidgetLine = ({
2929

3030
const newLine = diffFile.getSplitRightLine(index);
3131

32-
const widgetSide = useWidget.useShallowStableSelector(s => s.widgetSide);
32+
const widgetSide = useWidget.useShallowStableSelector((s) => s.widgetSide);
3333

3434
const widgetLineNumber = useWidget.getReadonlyState().widgetLineNumber;
3535

packages/react/src/components/DiffUnifiedContentLine.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ const DiffUnifiedOldLine = ({
5353
return (
5454
<tr data-line={index} data-state="diff" className="diff-line group">
5555
<td
56-
className="diff-line-num sticky z-[1] left-0 w-[1%] min-w-[100px] select-none whitespace-nowrap pl-[10px] pr-[10px] text-right align-top"
56+
className="diff-line-num sticky left-0 z-[1] w-[1%] min-w-[100px] select-none whitespace-nowrap pl-[10px] pr-[10px] text-right align-top"
5757
style={{
5858
color: `var(${plainLineNumberColorName})`,
5959
backgroundColor: `var(${delLineNumberBGName})`,
@@ -125,7 +125,7 @@ const DiffUnifiedNewLine = ({
125125
return (
126126
<tr data-line={index} data-state="diff" className="diff-line group">
127127
<td
128-
className="diff-line-num sticky z-[1] left-0 w-[1%] min-w-[100px] select-none whitespace-nowrap pl-[10px] pr-[10px] text-right align-top"
128+
className="diff-line-num sticky left-0 z-[1] w-[1%] min-w-[100px] select-none whitespace-nowrap pl-[10px] pr-[10px] text-right align-top"
129129
style={{
130130
color: `var(${plainLineNumberColorName})`,
131131
backgroundColor: `var(${addLineNumberBGName})`,
@@ -257,7 +257,7 @@ const _DiffUnifiedLine = memo(
257257
return (
258258
<tr data-line={lineNumber} data-state={unifiedLine.diff ? "diff" : "plain"} className="diff-line group">
259259
<td
260-
className="diff-line-num sticky z-[1] left-0 w-[1%] min-w-[100px] select-none whitespace-nowrap pl-[10px] pr-[10px] text-right align-top"
260+
className="diff-line-num sticky left-0 z-[1] w-[1%] min-w-[100px] select-none whitespace-nowrap pl-[10px] pr-[10px] text-right align-top"
261261
style={{
262262
color: `var(${hasDiff ? plainLineNumberColorName : expandLineNumberColorName})`,
263263
width: `calc(calc(var(${diffAsideWidthName}) + 5px) * 2)`,

packages/react/src/components/DiffView.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,10 @@ type DiffViewProps_2<T> = Omit<DiffViewProps<T>, "data"> & {
8888
};
8989

9090
const InternalDiffView = <T extends unknown>(
91-
props: Omit<DiffViewProps<T>, "data" | "registerHighlighter"> & { isMounted: boolean, wrapperRef?: RefObject<HTMLDivElement> }
91+
props: Omit<DiffViewProps<T>, "data" | "registerHighlighter"> & {
92+
isMounted: boolean;
93+
wrapperRef?: RefObject<HTMLDivElement>;
94+
}
9295
) => {
9396
const {
9497
diffFile,

packages/react/src/components/v2/DiffSplitContentLineNormal_v2.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ const InternalDiffSplitLine = ({
7676
{hasContent ? (
7777
<>
7878
<div
79-
className={`diff-line-${SplitSide[side]}-num sticky z-[1] left-0 flex w-[1%] min-w-[40px] select-none items-center px-[10px] text-right`}
79+
className={`diff-line-${SplitSide[side]}-num sticky left-0 z-[1] flex w-[1%] min-w-[40px] select-none items-center px-[10px] text-right`}
8080
style={{
8181
backgroundColor: lineNumberBG,
8282
color: `var(${hasDiff ? plainLineNumberColorName : expandLineNumberColorName})`,

packages/solid/src/hooks/useDomWidth.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export const useDomWidth = ({ selector, enable }: { selector: Accessor<string>;
6868
}
6969
};
7070

71-
createEffect(observeWidth)
71+
createEffect(observeWidth);
7272

7373
return width;
7474
};

0 commit comments

Comments
 (0)