Skip to content

Commit ad698d5

Browse files
MrWangJustToDoMrWangJustToDo
committed
update
1 parent 925fc30 commit ad698d5

File tree

6 files changed

+69
-54
lines changed

6 files changed

+69
-54
lines changed

‎packages/react/src/components/DiffSplitExtendLineNormal.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ const _DiffSplitExtendLine = ({
4949
selector: `div[data-line="${lineNumber}-extend-content"]`,
5050
wrapper: `tr[data-line="${lineNumber}-extend"]`,
5151
side: SplitSide[side],
52-
enable: !!currentExtendRendered && typeof renderExtendLine === "function",
52+
enable: !!currentExtend?.data && typeof renderExtendLine === "function",
5353
});
5454

5555
const width = useDomWidth({
5656
selector: side === SplitSide.old ? ".old-diff-table-wrapper" : ".new-diff-table-wrapper",
57-
enable: !!currentExtendRendered && typeof renderExtendLine === "function",
57+
enable: !!currentExtend?.data && typeof renderExtendLine === "function",
5858
});
5959

6060
if (!renderExtendLine) return null;
@@ -66,7 +66,7 @@ const _DiffSplitExtendLine = ({
6666
data-side={SplitSide[side]}
6767
className="diff-line diff-line-extend"
6868
>
69-
{currentExtend ? (
69+
{currentExtend?.data ? (
7070
<td className={`diff-line-extend-${SplitSide[side]}-content p-0`} colSpan={2}>
7171
<div
7272
data-line={`${lineNumber}-extend-content`}

‎packages/react/src/components/DiffSplitWidgetLineNormal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ const _DiffSplitWidgetLine = ({
4242
selector: `div[data-line="${lineNumber}-widget-content"]`,
4343
wrapper: `tr[data-line="${lineNumber}-widget"]`,
4444
side: SplitSide[side],
45-
enable: currentWidgetRendered && typeof renderWidgetLine === "function",
45+
enable: !!currentWidget && typeof renderWidgetLine === "function",
4646
});
4747

4848
const width = useDomWidth({
4949
selector: side === SplitSide.old ? ".old-diff-table-wrapper" : ".new-diff-table-wrapper",
50-
enable: !!currentWidgetRendered && typeof renderWidgetLine === "function",
50+
enable: !!currentWidget && typeof renderWidgetLine === "function",
5151
});
5252

5353
if (!renderWidgetLine) return null;

‎packages/react/src/components/v2/DiffSplitExtendLineWrap_v2.tsx‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,49 +30,51 @@ const _DiffSplitExtendLine = ({
3030

3131
if (!renderExtendLine) return null;
3232

33+
const oldExtendRendered =
34+
oldLineExtend?.data &&
35+
renderExtendLine?.({
36+
diffFile,
37+
side: SplitSide.old,
38+
lineNumber: oldLine.lineNumber,
39+
data: oldLineExtend.data,
40+
onUpdate: diffFile.notifyAll,
41+
});
42+
43+
const newExtendRendered =
44+
newLineExtend?.data &&
45+
renderExtendLine?.({
46+
diffFile,
47+
side: SplitSide.new,
48+
lineNumber: newLine.lineNumber,
49+
data: newLineExtend.data,
50+
onUpdate: diffFile.notifyAll,
51+
});
52+
3353
return (
3454
<div data-line={`${lineNumber}-extend`} data-state="extend" className="diff-line diff-line-extend flex">
35-
{oldLineExtend ? (
55+
{oldExtendRendered ? (
3656
<div className="diff-line-extend-old-content w-[50%] p-0">
37-
<div className="diff-line-extend-wrapper">
38-
{oldLineExtend?.data &&
39-
renderExtendLine?.({
40-
diffFile,
41-
side: SplitSide.old,
42-
lineNumber: oldLine.lineNumber,
43-
data: oldLineExtend.data,
44-
onUpdate: diffFile.notifyAll,
45-
})}
46-
</div>
57+
<div className="diff-line-extend-wrapper">{oldExtendRendered}</div>
4758
</div>
4859
) : (
4960
<div
5061
className="diff-line-extend-old-placeholder w-[50%] select-none p-0"
5162
style={{ backgroundColor: `var(${emptyBGName})` }}
5263
>
53-
<span>&ensp;</span>
64+
{newExtendRendered && <span>&ensp;</span>}
5465
</div>
5566
)}
5667
<div className="diff-split-line w-[1px]" style={{ backgroundColor: `var(${borderColorName})` }} />
57-
{newLineExtend ? (
68+
{newExtendRendered ? (
5869
<div className="diff-line-extend-new-content w-[50%] p-0">
59-
<div className="diff-line-extend-wrapper">
60-
{newLineExtend?.data &&
61-
renderExtendLine?.({
62-
diffFile,
63-
side: SplitSide.new,
64-
lineNumber: newLine.lineNumber,
65-
data: newLineExtend.data,
66-
onUpdate: diffFile.notifyAll,
67-
})}
68-
</div>
70+
<div className="diff-line-extend-wrapper">{newExtendRendered}</div>
6971
</div>
7072
) : (
7173
<div
7274
className="diff-line-extend-new-placeholder w-[50%] select-none p-0"
7375
style={{ backgroundColor: `var(${emptyBGName})` }}
7476
>
75-
<span>&ensp;</span>
77+
{oldExtendRendered && <span>&ensp;</span>}
7678
</div>
7779
)}
7880
</div>

‎packages/react/src/components/v2/DiffSplitWidgetLineWrap_v2.tsx‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,45 +34,49 @@ const _DiffSplitWidgetLine = ({
3434

3535
if (!renderWidgetLine) return null;
3636

37+
const oldWidgetRendered =
38+
oldLineWidget &&
39+
renderWidgetLine?.({
40+
diffFile,
41+
side: SplitSide.old,
42+
lineNumber: oldLine.lineNumber,
43+
onClose: () => setWidget({}),
44+
});
45+
46+
const newWidgetRendered =
47+
newLineWidget &&
48+
renderWidgetLine?.({
49+
diffFile,
50+
side: SplitSide.new,
51+
lineNumber: newLine.lineNumber,
52+
onClose: () => setWidget({}),
53+
});
54+
3755
return (
3856
<div data-line={`${lineNumber}-widget`} data-state="widget" className="diff-line diff-line-widget flex">
39-
{oldLineWidget ? (
57+
{oldWidgetRendered ? (
4058
<div className="diff-line-widget-old-content w-[50%] p-0">
41-
<div className="diff-line-widget-wrapper">
42-
{renderWidgetLine?.({
43-
diffFile,
44-
side: SplitSide.old,
45-
lineNumber: oldLine.lineNumber,
46-
onClose: () => setWidget({}),
47-
})}
48-
</div>
59+
<div className="diff-line-widget-wrapper">{oldWidgetRendered}</div>
4960
</div>
5061
) : (
5162
<div
5263
className="diff-line-widget-old-placeholder w-[50%] select-none p-0"
5364
style={{ backgroundColor: `var(${emptyBGName})` }}
5465
>
55-
<span>&ensp;</span>
66+
{newWidgetRendered && <span>&ensp;</span>}
5667
</div>
5768
)}
5869
<div className="diff-split-line w-[1px] flex-shrink-0" style={{ backgroundColor: `var(${borderColorName})` }} />
59-
{newLineWidget ? (
70+
{newWidgetRendered ? (
6071
<div className="diff-line-widget-new-content w-[50%] p-0">
61-
<div className="diff-line-widget-wrapper">
62-
{renderWidgetLine?.({
63-
diffFile,
64-
side: SplitSide.new,
65-
lineNumber: newLine.lineNumber,
66-
onClose: () => setWidget({}),
67-
})}
68-
</div>
72+
<div className="diff-line-widget-wrapper">{newWidgetRendered}</div>
6973
</div>
7074
) : (
7175
<div
7276
className="diff-line-widget-new-placeholder w-[50%] select-none p-0"
7377
style={{ backgroundColor: `var(${emptyBGName})` }}
7478
>
75-
<span>&ensp;</span>
79+
{oldWidgetRendered && <span>&ensp;</span>}
7680
</div>
7781
)}
7882
</div>

‎packages/vue/postcss.config.js‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,24 @@ export default {
33
tailwindcss: { config: "./tailwind.config.js" },
44
"postcss-prefix-selector": {
55
prefix: ".diff-tailwindcss-wrapper",
6-
transform: function (prefix, selector, prefixedSelector, filePath, rule) {
6+
transform: function (prefix, selector, prefixedSelector, _filePath, rule) {
7+
const filePath = rule.source?.input?.file;
8+
// ignore base css
9+
// TODO next release update
10+
if (rule.source?.start?.line === 1 && rule.source?.start?.column === 1) {
11+
return selector;
12+
}
13+
if (selector.includes("diff-line-extend-wrapper") || selector.includes("diff-line-widget-wrapper")) {
14+
return selector;
15+
}
716
if (selector.includes("[data-theme")) {
817
return prefix + selector;
918
}
1019
if (filePath.includes("node_modules")) {
11-
if (filePath.includes("github.css")) {
12-
return `${prefix}[data-theme="light"] .diff-line-syntax-raw ${selector}`;
13-
} else if (filePath.includes("github-dark.css")) {
20+
if (filePath.includes("dark.css")) {
1421
return `${prefix}[data-theme="dark"] .diff-line-syntax-raw ${selector}`;
22+
} else {
23+
return `${prefix}[data-theme="light"] .diff-line-syntax-raw ${selector}`;
1524
}
1625
} else {
1726
return prefixedSelector;

‎ui/react-example/src/components/MainContent.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export const MainContent = () => {
133133
</Button>
134134
</Tooltip>
135135
) : (
136-
<Tooltip label="platform">
136+
<Tooltip label="switch the platform">
137137
<Button
138138
variant="light"
139139
size="compact-sm"

0 commit comments

Comments
 (0)