Skip to content

Commit 89951ec

Browse files
update
1 parent 9798f74 commit 89951ec

23 files changed

Lines changed: 81 additions & 63 deletions

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ pnpm add @git-diff-view/vue
108108
```tsx
109109
import { DiffView, DiffModeEnum } from "@git-diff-view/react";
110110
import "@git-diff-view/react/styles/diff-view.css";
111+
// if you have your own tailwindcss config, you can use the `diff-view-pure.css` to avoid CSS conflicts
112+
import "@git-diff-view/react/styles/diff-view-pure.css";
111113

112114
<DiffView<string>
113115
// use data

packages/cli/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
"use-sync-external-store": "^1.4.0"
6060
},
6161
"devDependencies": {
62-
"@my-react/react": "^0.3.16",
63-
"@my-react/react-terminal": "^0.0.10",
62+
"@my-react/react": "^0.3.17",
63+
"@my-react/react-terminal": "^0.0.11",
6464
"@types/react": "^19.1.8"
6565
},
6666
"peerDependencies": {

packages/react/src/_com.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ td {
7171
text-align: left;
7272
}
7373

74+
td {
75+
padding: 0;
76+
}
77+
7478
.diff-line-old-num,
7579
.diff-line-new-num,
7680
.diff-line-num {

packages/react/src/components/DiffSplitViewNormal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const DiffSplitViewTable = ({
5151
<th scope="col">{SplitSide[side]} line content</th>
5252
</tr>
5353
</thead>
54-
<tbody className="diff-table-body leading-[1.4]" onMouseDownCapture={onMouseDown}>
54+
<tbody className="diff-table-body leading-[1.6]" onMouseDownCapture={onMouseDown}>
5555
{lines.map((line) => (
5656
<Fragment key={line.index}>
5757
<DiffSplitHunkLine index={line.index} side={side} lineNumber={line.lineNumber} diffFile={diffFile} />

packages/react/src/components/DiffSplitViewWrap.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export const DiffSplitViewWrap = memo(({ diffFile }: { diffFile: DiffFile }) =>
119119
<th scope="col">new line content</th>
120120
</tr>
121121
</thead>
122-
<tbody className="diff-table-body leading-[1.4]" onMouseDownCapture={onMouseDown}>
122+
<tbody className="diff-table-body leading-[1.6]" onMouseDownCapture={onMouseDown}>
123123
{lines.map((line) => (
124124
<Fragment key={line.index}>
125125
<DiffSplitHunkLine index={line.index} lineNumber={line.lineNumber} diffFile={diffFile} />

packages/react/src/components/DiffUnifiedView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ export const DiffUnifiedView = memo(({ diffFile }: { diffFile: DiffFile }) => {
135135
<th scope="col">line content</th>
136136
</tr>
137137
</thead>
138-
<tbody className="diff-table-body leading-[1.4]" onMouseDownCapture={onMouseDown}>
138+
<tbody className="diff-table-body leading-[1.6]" onMouseDownCapture={onMouseDown}>
139139
{lines.map((item) => (
140140
<Fragment key={item.index}>
141141
<DiffUnifiedHunkLine index={item.index} lineNumber={item.lineNumber} diffFile={diffFile} />

packages/solid/src/_com.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ td {
7171
text-align: left;
7272
}
7373

74+
td {
75+
padding: 0;
76+
}
77+
7478
.diff-line-old-num,
7579
.diff-line-new-num,
7680
.diff-line-num {

packages/solid/src/components/DiffSplitViewNormal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const DiffSplitViewTable = (props: {
8383
<th scope="col">{SplitSide[props.side]} line content</th>
8484
</tr>
8585
</thead>
86-
<tbody class="diff-table-body leading-[1.4]" onMouseDown={onMouseDown}>
86+
<tbody class="diff-table-body leading-[1.6]" onMouseDown={onMouseDown}>
8787
<For each={lines()}>
8888
{(item) => (
8989
<>

packages/solid/src/components/DiffSplitViewWrap.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export const DiffSplitViewWrap = (props: { diffFile: DiffFile }) => {
119119
<th scope="col">new line content</th>
120120
</tr>
121121
</thead>
122-
<tbody class="diff-table-body leading-[1.4]" onMouseDown={onMouseDown}>
122+
<tbody class="diff-table-body leading-[1.6]" onMouseDown={onMouseDown}>
123123
<For each={lines()}>
124124
{(item) => (
125125
<>

packages/solid/src/components/DiffUnifiedView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export const DiffUnifiedView = (props: { diffFile: DiffFile }) => {
110110
<th scope="col">line content</th>
111111
</tr>
112112
</thead>
113-
<tbody class="diff-table-body leading-[1.4]" onMouseDown={onMouseDown}>
113+
<tbody class="diff-table-body leading-[1.6]" onMouseDown={onMouseDown}>
114114
<For each={lines()}>
115115
{(item) => (
116116
<>

0 commit comments

Comments
 (0)