{
- onOpenAddWidget(lineNumber, side);
- onWidgetClick?.("onAddWidgetClick", lineNumber, side);
+ props.onOpenAddWidget(props.lineNumber, props.side);
+ props.onWidgetClick?.("onAddWidgetClick", props.lineNumber, props.side);
}}
>
+
@@ -47,12 +40,7 @@ export const DiffSplitAddWidget = ({
);
};
-export const DiffUnifiedAddWidget = ({
- lineNumber,
- side,
- onWidgetClick,
- onOpenAddWidget,
-}: {
+export const DiffUnifiedAddWidget = (props: {
index: number;
diffFile: DiffFile;
lineNumber: number;
@@ -75,8 +63,8 @@ export const DiffUnifiedAddWidget = ({
"background-color": `var(${addWidgetBGName})`,
}}
onClick={() => {
- onOpenAddWidget(lineNumber, side);
- onWidgetClick?.("onAddWidgetClick", lineNumber, side);
+ props.onOpenAddWidget(props.lineNumber, props.side);
+ props.onWidgetClick?.("onAddWidgetClick", props.lineNumber, props.side);
}}
>
+
diff --git a/packages/solid/src/components/DiffContent.tsx b/packages/solid/src/components/DiffContent.tsx
new file mode 100644
index 0000000..973ff18
--- /dev/null
+++ b/packages/solid/src/components/DiffContent.tsx
@@ -0,0 +1,234 @@
+import { DiffLineType, NewLineSymbol, type DiffFile, type DiffLine, type SyntaxLine } from "@git-diff-view/core";
+import {
+ addContentHighlightBGName,
+ delContentHighlightBGName,
+ diffFontSizeName,
+ getSymbol,
+} from "@git-diff-view/utils";
+import { For, Show } from "solid-js";
+
+import { DiffNoNewLine } from "./DiffNoNewLine";
+
+const DiffString = (props: {
+ rawLine: string;
+ diffLine?: DiffLine;
+ operator?: "add" | "del";
+ enableWrap?: boolean;
+}) => {
+ const getRange = () => props.diffLine?.changes?.range;
+
+ const getStr1 = () => props.rawLine.slice(0, getRange?.()?.location);
+
+ const getStr2 = () =>
+ props.rawLine.slice(getRange?.()?.location, (getRange?.()?.location || 0) + (getRange?.()?.length || 0));
+
+ const getStr3 = () => props.rawLine.slice((getRange?.()?.location || 0) + (getRange?.()?.length || 0));
+
+ const getIsLast = () => getStr2().includes("\n");
+
+ const get_Str2 = () => (getIsLast() ? getStr2().replace("\n", "").replace("\r", "") : getStr2());
+
+ const getIsNewLineSymbolChanged = () => (getStr3() === "" ? props.diffLine?.changes?.newLineSymbol : null);
+
+ return (
+
{props.rawLine}}
+ >
+
+
+ {getStr1()}
+
+ {getIsLast() ? `${get_Str2()}${getSymbol(getIsNewLineSymbolChanged())}` : getStr2()}
+
+ {getStr3()}
+
+ {getIsNewLineSymbolChanged() === NewLineSymbol.NEWLINE && (
+
+
+
+ )}
+
+
+ );
+};
+
+const DiffSyntax = (props: {
+ rawLine: string;
+ diffLine?: DiffLine;
+ syntaxLine?: SyntaxLine;
+ operator?: "add" | "del";
+ enableWrap?: boolean;
+}) => {
+ const getRange = () => props.diffLine?.changes?.range;
+
+ const getIsNewLineSymbolChanged = () => props.diffLine?.changes?.newLineSymbol;
+
+ return (
+
}
+ >
+
+
+ {({ node, wrapper }) => (
+
+ {node.value}
+
+ )}
+
+
+ }
+ >
+
+
+
+ {({ node, wrapper }) => {
+ if (
+ node.endIndex < getRange()!.location ||
+ getRange()!.location + getRange()!.length < node.startIndex
+ ) {
+ return (
+
+ {node.value}
+
+ );
+ } else {
+ const index1 = getRange()!.location - node.startIndex;
+ const index2 = index1 < 0 ? 0 : index1;
+ const str1 = node.value.slice(0, index2);
+ const str2 = node.value.slice(index2, index1 + getRange()!.length);
+ const str3 = node.value.slice(index1 + getRange()!.length);
+ const isStart = str1.length || getRange()!.location === node.startIndex;
+ const isEnd = str3.length || node.endIndex === getRange()!.location + getRange()!.length - 1;
+ const isLast = str2.includes("\n");
+ const _str2 = isLast ? str2.replace("\n", "").replace("\r", "") : str2;
+ return (
+
+ {str1}
+
+ {isLast ? `${_str2}${getSymbol(getIsNewLineSymbolChanged())}` : str2}
+
+ {str3}
+
+ );
+ }
+ }}
+
+
+ {getIsNewLineSymbolChanged() === NewLineSymbol.NEWLINE && (
+
+
+
+ )}
+
+
+
+ );
+};
+
+export const DiffContent = (props: {
+ rawLine: string;
+ syntaxLine?: SyntaxLine;
+ diffLine?: DiffLine;
+ diffFile: DiffFile;
+ enableWrap: boolean;
+ enableHighlight: boolean;
+}) => {
+ const getIsAdded = () => props.diffLine?.type === DiffLineType.Add;
+
+ const getIsDelete = () => props.diffLine?.type === DiffLineType.Delete;
+
+ const getIsMaxLineLengthToIgnoreSyntax = () =>
+ props.syntaxLine?.nodeList ? props.syntaxLine?.nodeList?.length > 150 : false;
+
+ return (
+
+
+ {getIsAdded() ? "+" : getIsDelete() ? "-" : " "}
+
+ {props.enableHighlight && props.syntaxLine && !getIsMaxLineLengthToIgnoreSyntax() ? (
+
+ ) : (
+
+ )}
+
+ );
+};
diff --git a/packages/solid/src/components/DiffExpand.tsx b/packages/solid/src/components/DiffExpand.tsx
index 87aa105..b480b9a 100644
--- a/packages/solid/src/components/DiffExpand.tsx
+++ b/packages/solid/src/components/DiffExpand.tsx
@@ -1,23 +1,23 @@
-export const ExpandDown = ({ className }: { className: string }) => {
+export const ExpandDown = (props: { className: string }) => {
return (
-