@canonical/react-ds-app-launchpad 0.9.0-experimental.16 → 0.9.0-experimental.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/ui/GitDiffViewer/common/CodeDiffViewer/CodeDiffViewer.js +10 -17
- package/dist/esm/ui/GitDiffViewer/common/CodeDiffViewer/CodeDiffViewer.js.map +1 -1
- package/dist/esm/ui/GitDiffViewer/common/CodeDiffViewer/common/AnnotatedDiffLine/AnnotatedDiffLine.js +15 -10
- package/dist/esm/ui/GitDiffViewer/common/CodeDiffViewer/common/AnnotatedDiffLine/AnnotatedDiffLine.js.map +1 -1
- package/dist/esm/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/DiffLine.js +1 -1
- package/dist/esm/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/DiffLine.js.map +1 -1
- package/dist/esm/ui/GitDiffViewer/utils/parseGitDiff.js +25 -5
- package/dist/esm/ui/GitDiffViewer/utils/parseGitDiff.js.map +1 -1
- package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/CodeDiffViewer.d.ts.map +1 -1
- package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/common/AnnotatedDiffLine/AnnotatedDiffLine.d.ts +2 -2
- package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/common/AnnotatedDiffLine/AnnotatedDiffLine.d.ts.map +1 -1
- package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/common/AnnotatedDiffLine/types.d.ts +14 -3
- package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/common/AnnotatedDiffLine/types.d.ts.map +1 -1
- package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/DiffLine.d.ts.map +1 -1
- package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/types.d.ts +11 -4
- package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/types.d.ts.map +1 -1
- package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/types.d.ts +1 -1
- package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/types.d.ts.map +1 -1
- package/dist/types/ui/GitDiffViewer/types.d.ts +9 -5
- package/dist/types/ui/GitDiffViewer/types.d.ts.map +1 -1
- package/dist/types/ui/GitDiffViewer/utils/parseGitDiff.d.ts.map +1 -1
- package/package.json +2 -2
@@ -1,7 +1,7 @@
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
2
2
|
import { Fragment, forwardRef, useEffect, useImperativeHandle, useMemo, useRef, } from "react";
|
3
|
-
import { highlightDiffHunkLines } from "ui/GitDiffViewer/utils/index.js";
|
4
3
|
import { useGitDiffViewer } from "../../hooks/index.js";
|
4
|
+
import { highlightDiffHunkLines } from "../../utils/index.js";
|
5
5
|
import { DiffLine } from "./common/index.js";
|
6
6
|
import "./HighlighTheme.css";
|
7
7
|
import "./styles.css";
|
@@ -49,29 +49,22 @@ const CodeDiffViewer = ({ id, AddComment, onLineClick, className, style, disable
|
|
49
49
|
.join(" "), children: _jsx("div", { className: "diff-hunk", children: _jsx("table", { className: "diff-table", ref: tableRef, tabIndex: -1, children: _jsx("tbody", { children: diff.hunks.map((hunk, hunkIndex) => {
|
50
50
|
// We'll track the counters for old and new lines
|
51
51
|
// as we iterate through each hunk.
|
52
|
-
let oldLineCounter = hunk.
|
53
|
-
let newLineCounter = hunk.
|
52
|
+
let oldLineCounter = hunk.positions.old.start;
|
53
|
+
let newLineCounter = hunk.positions.new.start;
|
54
54
|
return (_jsxs(Fragment, { children: [_jsx(DiffLine, { type: "hunk", hunkHeader: hunk.header, hunkIndex: hunkIndex }), hunk.lines.map((line, lineIndex) => {
|
55
|
-
|
56
|
-
|
55
|
+
const newLineNumber = newLineCounter;
|
56
|
+
const oldLineNumber = oldLineCounter;
|
57
57
|
if (line.type === "remove") {
|
58
|
-
|
59
|
-
lineNum1 = oldLineCounter++;
|
58
|
+
oldLineCounter++;
|
60
59
|
}
|
61
60
|
else if (line.type === "add") {
|
62
|
-
|
63
|
-
lineNum2 = newLineCounter++;
|
61
|
+
newLineCounter++;
|
64
62
|
}
|
65
63
|
else {
|
66
|
-
|
67
|
-
|
68
|
-
lineNum2 = newLineCounter++;
|
64
|
+
oldLineCounter++;
|
65
|
+
newLineCounter++;
|
69
66
|
}
|
70
|
-
|
71
|
-
// you can display e.g. '+' or '-' or an empty cell.
|
72
|
-
return (
|
73
|
-
// Normal diff line
|
74
|
-
_jsx(AnnotatedDiffLine, { lineNum1: lineNum1, lineNum2: lineNum2, content: highlightedLines[hunkIndex][lineIndex], type: line.type, diffLineNumber: hunk.diffStart + lineIndex, onLineClick: onLineClick, AddComment: AddComment }, `${diff.oldPath}-${hunkIndex}-${lineIndex}`));
|
67
|
+
return (_jsx(AnnotatedDiffLine, { newLineNumber: newLineNumber, oldLineNumber: oldLineNumber, diffLineNumber: hunk.positions.diff.start + lineIndex, content: highlightedLines[hunkIndex][lineIndex], type: line.type, onLineClick: onLineClick, AddComment: AddComment }, `${diff.oldPath}-${hunkIndex}-${lineIndex}`));
|
75
68
|
})] }, `${diff.oldPath}-${hunkIndex}`));
|
76
69
|
}) }) }) }) }));
|
77
70
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"CodeDiffViewer.js","sourceRoot":"","sources":["../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/CodeDiffViewer.tsx"],"names":[],"mappings":";AAEA,OAAO,EACL,QAAQ,EACR,UAAU,EACV,SAAS,EACT,mBAAmB,EACnB,OAAO,EACP,MAAM,GACP,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,
|
1
|
+
{"version":3,"file":"CodeDiffViewer.js","sourceRoot":"","sources":["../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/CodeDiffViewer.tsx"],"names":[],"mappings":"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"}
|
@@ -1,33 +1,38 @@
|
|
1
1
|
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
2
|
-
import "
|
3
|
-
import { useCallback } from "react";
|
2
|
+
import { useCallback, useMemo } from "react";
|
4
3
|
import { useGitDiffViewer } from "../../../../hooks/index.js";
|
5
4
|
import DiffLine from "../DiffLine/DiffLine.js";
|
5
|
+
import "./styles.css";
|
6
6
|
const componentCssClassName = "ds annotated-diff-line";
|
7
7
|
/**
|
8
8
|
* A component that displays a diff line content, line decorations and AddComment component.
|
9
9
|
* @returns {React.ReactElement} - Rendered AnnotatedDiffLine
|
10
10
|
*/
|
11
|
-
const AnnotatedDiffLine = ({
|
11
|
+
const AnnotatedDiffLine = ({ newLineNumber, oldLineNumber, diffLineNumber, AddComment, onLineClick, type, ...rest }) => {
|
12
12
|
const { addCommentOpenLocations, toggleAddCommentLocation, lineDecorations } = useGitDiffViewer();
|
13
|
-
const lineNumber = Number(lineNum2 || lineNum1 || 0);
|
14
13
|
const diffLineIsInteractive = Boolean(onLineClick || AddComment);
|
14
|
+
const hunkLineNumber = useMemo(() => {
|
15
|
+
return type === "add" ? newLineNumber : oldLineNumber;
|
16
|
+
}, [type, newLineNumber, oldLineNumber]);
|
15
17
|
const handleLineClick = useCallback(() => {
|
16
18
|
if (diffLineIsInteractive) {
|
17
|
-
onLineClick?.({
|
18
|
-
|
19
|
+
onLineClick?.({
|
20
|
+
hunkLineNumber,
|
21
|
+
diffLineNumber,
|
22
|
+
});
|
23
|
+
toggleAddCommentLocation(diffLineNumber);
|
19
24
|
}
|
20
25
|
}, [
|
21
26
|
onLineClick,
|
22
|
-
lineNumber,
|
23
27
|
diffLineNumber,
|
28
|
+
hunkLineNumber,
|
24
29
|
toggleAddCommentLocation,
|
25
30
|
diffLineIsInteractive,
|
26
31
|
]);
|
27
32
|
const handleCloseComment = useCallback(() => {
|
28
|
-
toggleAddCommentLocation(
|
29
|
-
}, [toggleAddCommentLocation,
|
30
|
-
return (_jsxs(_Fragment, { children: [_jsx(DiffLine, { ...rest,
|
33
|
+
toggleAddCommentLocation(diffLineNumber);
|
34
|
+
}, [toggleAddCommentLocation, diffLineNumber]);
|
35
|
+
return (_jsxs(_Fragment, { children: [_jsx(DiffLine, { ...rest, type: type, addLineNumber: newLineNumber, removeLineNumber: oldLineNumber, onLineClick: diffLineIsInteractive ? handleLineClick : undefined }), lineDecorations?.[diffLineNumber] && (_jsx("tr", { className: componentCssClassName, children: _jsx("td", { className: "container", children: lineDecorations[diffLineNumber] }) })), AddComment && addCommentOpenLocations.has(diffLineNumber) && (_jsx("tr", { className: componentCssClassName, children: _jsx("td", { className: "container", children: _jsx(AddComment, { hunkLineNumber: hunkLineNumber, diffLineNumber: diffLineNumber, onClose: handleCloseComment }) }) }))] }));
|
31
36
|
};
|
32
37
|
export default AnnotatedDiffLine;
|
33
38
|
//# sourceMappingURL=AnnotatedDiffLine.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"AnnotatedDiffLine.js","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/AnnotatedDiffLine/AnnotatedDiffLine.tsx"],"names":[],"mappings":";
|
1
|
+
{"version":3,"file":"AnnotatedDiffLine.js","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/AnnotatedDiffLine/AnnotatedDiffLine.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAC/C,OAAO,cAAc,CAAC;AAGtB,MAAM,qBAAqB,GAAG,wBAAwB,CAAC;AAEvD;;;GAGG;AACH,MAAM,iBAAiB,GAAG,CAAC,EACzB,aAAa,EACb,aAAa,EACb,cAAc,EACd,UAAU,EACV,WAAW,EACX,IAAI,EACJ,GAAG,IAAI,EACgB,EAAsB,EAAE;IAC/C,MAAM,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,eAAe,EAAE,GAC1E,gBAAgB,EAAE,CAAC;IAErB,MAAM,qBAAqB,GAAG,OAAO,CAAC,WAAW,IAAI,UAAU,CAAC,CAAC;IAEjE,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,EAAE;QAClC,OAAO,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC;IACxD,CAAC,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC;IAEzC,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE;QACvC,IAAI,qBAAqB,EAAE,CAAC;YAC1B,WAAW,EAAE,CAAC;gBACZ,cAAc;gBACd,cAAc;aACf,CAAC,CAAC;YACH,wBAAwB,CAAC,cAAc,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC,EAAE;QACD,WAAW;QACX,cAAc;QACd,cAAc;QACd,wBAAwB;QACxB,qBAAqB;KACtB,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC1C,wBAAwB,CAAC,cAAc,CAAC,CAAC;IAC3C,CAAC,EAAE,CAAC,wBAAwB,EAAE,cAAc,CAAC,CAAC,CAAC;IAE/C,OAAO,CACL,8BACE,KAAC,QAAQ,OACH,IAAI,EACR,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,aAAa,EAC/B,WAAW,EAAE,qBAAqB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,GAChE,EACD,eAAe,EAAE,CAAC,cAAc,CAAC,IAAI,CACpC,aAAI,SAAS,EAAE,qBAAqB,YAClC,aAAI,SAAS,EAAC,WAAW,YAAE,eAAe,CAAC,cAAc,CAAC,GAAM,GAC7D,CACN,EAEA,UAAU,IAAI,uBAAuB,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAC5D,aAAI,SAAS,EAAE,qBAAqB,YAClC,aAAI,SAAS,EAAC,WAAW,YACvB,KAAC,UAAU,IACT,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,kBAAkB,GAC3B,GACC,GACF,CACN,IACA,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
|
@@ -26,7 +26,7 @@ const DiffLine = ({ id, className, style, onLineClick, ...props }) => {
|
|
26
26
|
if (e.key === "Enter") {
|
27
27
|
onLineClick?.();
|
28
28
|
}
|
29
|
-
}, onKeyDown: undefined, children: props.type === "hunk" ? ("\u00A0") : (_jsxs("div", { className: "diff-line-numbers", children: [_jsx("span", { className: "line-num", children: props.
|
29
|
+
}, onKeyDown: undefined, children: props.type === "hunk" ? ("\u00A0") : (_jsxs("div", { className: "diff-line-numbers", children: [_jsx("span", { className: "line-num", children: props.type === "add" ? "+" : props.removeLineNumber }), _jsx("span", { className: "line-num", children: props.type === "remove" ? "-" : props.addLineNumber })] })) }), _jsx("td", { className: `diff-content ${wrapLines ? "wrap" : ""}`, children: props.type === "hunk" ? (_jsx("pre", { children: props.hunkHeader })) : (_jsx("pre", {
|
30
30
|
// biome-ignore lint/security/noDangerouslySetInnerHtml: syntax highlighting requires adding generated HTML
|
31
31
|
dangerouslySetInnerHTML: {
|
32
32
|
__html: props.content ? props.content : "\u00A0",
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"DiffLine.js","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/DiffLine.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,cAAc,CAAC;AAGtB,MAAM,qBAAqB,GAAG,cAAc,CAAC;AAC7C,MAAM,yBAAyB,GAAG,eAAe,CAAC;AAElD;;;;GAIG;AACH,MAAM,QAAQ,GAAG,CAAC,EAChB,EAAE,EACF,SAAS,EACT,KAAK,EACL,WAAW,EACX,GAAG,KAAK,EACM,EAAsB,EAAE;IACtC,MAAM,EAAE,SAAS,EAAE,GAAG,gBAAgB,EAAE,CAAC;IACzC,MAAM,SAAS,GAAG,aAAa,KAAK,CAAC,IAAI,EAAE,CAAC;IAC5C,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3C,OAAO,CACL,cACE,EAAE,EAAE,EAAE,EACN,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE;YACT,qBAAqB;YACrB,SAAS;YACT,aAAa,IAAI,aAAa;YAC9B,SAAS;YACT,KAAK,CAAC,IAAI,KAAK,MAAM;gBACnB,KAAK,CAAC,SAAS,KAAK,CAAC;gBACrB,yBAAyB;SAC5B;aACE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,GAAG,CAAC,aAEZ,aACE,SAAS,EAAE,eAAe,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,CAAC,IAAI,EAAE,EACjE,QAAQ,EAAE,aAAa,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAChE,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACb,IAAI,CAAC,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC;wBACtB,WAAW,EAAE,EAAE,CAAC;oBAClB,CAAC;gBACH,CAAC,EACD,SAAS,EAAE,SAAS,YAEnB,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CACvB,QAAQ,CACT,CAAC,CAAC,CAAC,CACF,eAAK,SAAS,EAAC,mBAAmB,aAChC,eAAM,SAAS,EAAC,UAAU,
|
1
|
+
{"version":3,"file":"DiffLine.js","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/DiffLine.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,cAAc,CAAC;AAGtB,MAAM,qBAAqB,GAAG,cAAc,CAAC;AAC7C,MAAM,yBAAyB,GAAG,eAAe,CAAC;AAElD;;;;GAIG;AACH,MAAM,QAAQ,GAAG,CAAC,EAChB,EAAE,EACF,SAAS,EACT,KAAK,EACL,WAAW,EACX,GAAG,KAAK,EACM,EAAsB,EAAE;IACtC,MAAM,EAAE,SAAS,EAAE,GAAG,gBAAgB,EAAE,CAAC;IACzC,MAAM,SAAS,GAAG,aAAa,KAAK,CAAC,IAAI,EAAE,CAAC;IAC5C,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3C,OAAO,CACL,cACE,EAAE,EAAE,EAAE,EACN,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE;YACT,qBAAqB;YACrB,SAAS;YACT,aAAa,IAAI,aAAa;YAC9B,SAAS;YACT,KAAK,CAAC,IAAI,KAAK,MAAM;gBACnB,KAAK,CAAC,SAAS,KAAK,CAAC;gBACrB,yBAAyB;SAC5B;aACE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,GAAG,CAAC,aAEZ,aACE,SAAS,EAAE,eAAe,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,CAAC,IAAI,EAAE,EACjE,QAAQ,EAAE,aAAa,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAChE,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACb,IAAI,CAAC,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC;wBACtB,WAAW,EAAE,EAAE,CAAC;oBAClB,CAAC;gBACH,CAAC,EACD,SAAS,EAAE,SAAS,YAEnB,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CACvB,QAAQ,CACT,CAAC,CAAC,CAAC,CACF,eAAK,SAAS,EAAC,mBAAmB,aAChC,eAAM,SAAS,EAAC,UAAU,YACvB,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,GAC/C,EACP,eAAM,SAAS,EAAC,UAAU,YACvB,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,GAC/C,IACH,CACP,GACE,EACL,aAAI,SAAS,EAAE,gBAAgB,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,YACrD,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CACvB,wBAAM,KAAK,CAAC,UAAU,GAAO,CAC9B,CAAC,CAAC,CAAC,CACF;oBACE,2GAA2G;oBAC3G,uBAAuB,EAAE;wBACvB,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;qBACjD,GACD,CACH,GACE,IACF,CACN,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
@@ -44,14 +44,33 @@ function parseGitDiff(diffText) {
|
|
44
44
|
}
|
45
45
|
const hunkMatch = line.match(hunkRegex);
|
46
46
|
if (hunkMatch && currentFile) {
|
47
|
+
const hunkPositions = [
|
48
|
+
Number.parseInt(hunkMatch[1]),
|
49
|
+
hunkMatch[2] ? Number.parseInt(hunkMatch[2]) : 1,
|
50
|
+
Number.parseInt(hunkMatch[3]),
|
51
|
+
hunkMatch[4] ? Number.parseInt(hunkMatch[4]) : 1,
|
52
|
+
];
|
53
|
+
const oldPos = {
|
54
|
+
start: hunkPositions[0],
|
55
|
+
end: hunkPositions[0] + hunkPositions[1],
|
56
|
+
};
|
57
|
+
const newPos = {
|
58
|
+
start: hunkPositions[2],
|
59
|
+
end: hunkPositions[2] + hunkPositions[3],
|
60
|
+
};
|
61
|
+
const diffPos = {
|
62
|
+
// +1 because the first line is the hunk header
|
63
|
+
start: currentDiffStart + 1,
|
64
|
+
end: currentDiffStart + 1,
|
65
|
+
};
|
47
66
|
// New hunk start
|
48
67
|
currentHunk = {
|
49
68
|
header: line,
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
69
|
+
positions: {
|
70
|
+
old: oldPos,
|
71
|
+
new: newPos,
|
72
|
+
diff: diffPos,
|
73
|
+
},
|
55
74
|
lines: [],
|
56
75
|
};
|
57
76
|
currentFile.hunks.push(currentHunk);
|
@@ -66,6 +85,7 @@ function parseGitDiff(diffText) {
|
|
66
85
|
: "context";
|
67
86
|
const content = line.slice(1); // Remove the leading +, - or space
|
68
87
|
currentHunk.lines.push({ type, content });
|
88
|
+
currentHunk.positions.diff.end++;
|
69
89
|
}
|
70
90
|
}
|
71
91
|
if (currentFile)
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"parseGitDiff.js","sourceRoot":"","sources":["../../../../../src/ui/GitDiffViewer/utils/parseGitDiff.ts"],"names":[],"mappings":"AAEA,SAAS,YAAY,CAAC,QAAgB;IACpC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,KAAK,GAAe,EAAE,CAAC;IAC7B,IAAI,WAAW,GAAoB,IAAI,CAAC;IACxC,IAAI,WAAW,GAAgB,IAAI,CAAC;IACpC,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,qDAAqD;IACrD,MAAM,SAAS,GAAG,8BAA8B,CAAC;IACjD,MAAM,SAAS,GAAG,qCAAqC,CAAC;IACxD,MAAM,YAAY,GAAG,YAAY,CAAC;IAClC,MAAM,YAAY,GAAG,eAAe,CAAC;IAErC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,gBAAgB,EAAE,CAAC;QACnB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,SAAS,EAAE,CAAC;YACd,sBAAsB;YACtB,IAAI,WAAW;gBAAE,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzC,WAAW,GAAG;gBACZ,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;gBACrB,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;gBACrB,eAAe,EAAE,MAAM;gBACvB,KAAK,EAAE,EAAE;aACV,CAAC;YACF,WAAW,GAAG,IAAI,CAAC;YACnB,SAAS;QACX,CAAC;QAED,IAAI,CAAC,WAAW;YAAE,SAAS,CAAC,qCAAqC;QAEjE,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC9C,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC9C,IAAI,YAAY,IAAI,YAAY,EAAE,CAAC;YACjC,mEAAmE;YACnE,IAAI,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC5C,WAAW,CAAC,eAAe,GAAG,OAAO,CAAC,CAAC,cAAc;YACvD,CAAC;iBAAM,IAAI,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;gBACnD,WAAW,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC,kBAAkB;YAC7D,CAAC;iBAAM,IAAI,WAAW,CAAC,eAAe,KAAK,MAAM,EAAE,CAAC;gBAClD,WAAW,CAAC,eAAe,GAAG,UAAU,CAAC,CAAC,0BAA0B;YACtE,CAAC;YACD,SAAS;QACX,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;YAC7B,
|
1
|
+
{"version":3,"file":"parseGitDiff.js","sourceRoot":"","sources":["../../../../../src/ui/GitDiffViewer/utils/parseGitDiff.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"CodeDiffViewer.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/CodeDiffViewer.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAY/B,OAAO,qBAAqB,CAAC;AAC7B,OAAO,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;;
|
1
|
+
{"version":3,"file":"CodeDiffViewer.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/CodeDiffViewer.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAY/B,OAAO,qBAAqB,CAAC;AAC7B,OAAO,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;;AA0HtD,wBAA0C"}
|
@@ -1,10 +1,10 @@
|
|
1
1
|
import type React from "react";
|
2
|
-
import type { AnnotatedDiffLineProps } from "./types.js";
|
3
2
|
import "./styles.css";
|
3
|
+
import type { AnnotatedDiffLineProps } from "./types.js";
|
4
4
|
/**
|
5
5
|
* A component that displays a diff line content, line decorations and AddComment component.
|
6
6
|
* @returns {React.ReactElement} - Rendered AnnotatedDiffLine
|
7
7
|
*/
|
8
|
-
declare const AnnotatedDiffLine: ({
|
8
|
+
declare const AnnotatedDiffLine: ({ newLineNumber, oldLineNumber, diffLineNumber, AddComment, onLineClick, type, ...rest }: AnnotatedDiffLineProps) => React.ReactElement;
|
9
9
|
export default AnnotatedDiffLine;
|
10
10
|
//# sourceMappingURL=AnnotatedDiffLine.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"AnnotatedDiffLine.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/AnnotatedDiffLine/AnnotatedDiffLine.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
1
|
+
{"version":3,"file":"AnnotatedDiffLine.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/AnnotatedDiffLine/AnnotatedDiffLine.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAIzD;;;GAGG;AACH,QAAA,MAAM,iBAAiB,GAAI,0FAQxB,sBAAsB,KAAG,KAAK,CAAC,YA0DjC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
|
package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/common/AnnotatedDiffLine/types.d.ts
CHANGED
@@ -1,10 +1,21 @@
|
|
1
1
|
import type { CodeDiffViewerAddComment, CodeDiffViewerLineSelectOptions } from "../../types.js";
|
2
2
|
import type { DiffContentLineProps } from "../DiffLine/types.js";
|
3
|
-
export type
|
4
|
-
|
5
|
-
|
3
|
+
export type AnnotationOptions = {
|
4
|
+
/**
|
5
|
+
* The current line number in the new file.
|
6
|
+
*/
|
7
|
+
newLineNumber: number;
|
8
|
+
/**
|
9
|
+
* The current line number in the old file.
|
10
|
+
*/
|
11
|
+
oldLineNumber: number;
|
12
|
+
/**
|
13
|
+
* The current line number in the diff file.
|
14
|
+
* This is the line number that will be used to match the line decorations.
|
15
|
+
*/
|
6
16
|
diffLineNumber: number;
|
7
17
|
AddComment?: CodeDiffViewerAddComment;
|
8
18
|
onLineClick?: (options: CodeDiffViewerLineSelectOptions) => void;
|
9
19
|
};
|
20
|
+
export type AnnotatedDiffLineProps = Omit<DiffContentLineProps, "onLineClick"> & AnnotationOptions;
|
10
21
|
//# sourceMappingURL=types.d.ts.map
|
package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/common/AnnotatedDiffLine/types.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/AnnotatedDiffLine/types.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,wBAAwB,EACxB,+BAA+B,EAChC,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,MAAM,MAAM,
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/AnnotatedDiffLine/types.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,wBAAwB,EACxB,+BAA+B,EAChC,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,wBAAwB,CAAC;IACtC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,+BAA+B,KAAK,IAAI,CAAC;CAClE,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,oBAAoB,EAAE,aAAa,CAAC,GAC5E,iBAAiB,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"DiffLine.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/DiffLine.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAKhD;;;;GAIG;AACH,QAAA,MAAM,QAAQ,GAAI,iDAMf,aAAa,KAAG,KAAK,CAAC,
|
1
|
+
{"version":3,"file":"DiffLine.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/DiffLine.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAKhD;;;;GAIG;AACH,QAAA,MAAM,QAAQ,GAAI,iDAMf,aAAa,KAAG,KAAK,CAAC,YA2DxB,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
@@ -1,10 +1,17 @@
|
|
1
1
|
import type React from "react";
|
2
2
|
export type DiffContentLine = {
|
3
|
-
type: "add" | "remove" | "context";
|
4
|
-
lineNum1: number | string | null;
|
5
|
-
lineNum2: number | string | null;
|
6
3
|
content: string;
|
7
|
-
}
|
4
|
+
} & ({
|
5
|
+
type: "add";
|
6
|
+
addLineNumber: number;
|
7
|
+
} | {
|
8
|
+
type: "remove";
|
9
|
+
removeLineNumber: number;
|
10
|
+
} | {
|
11
|
+
type: "context";
|
12
|
+
addLineNumber: number;
|
13
|
+
removeLineNumber: number;
|
14
|
+
});
|
8
15
|
export type DiffHunkLine = {
|
9
16
|
type: "hunk";
|
10
17
|
hunkHeader: string;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,MAAM,MAAM,eAAe,GAAG;IAC5B,
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,CACA;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,aAAa,EAAE,MAAM,CAAC;CACvB,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GACD;IACE,IAAI,EAAE,SAAS,CAAC;IAEhB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CACJ,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,2CAA2C;IAC3C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,6BAA6B;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oBAAoB;IACpB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,oDAAoD;IACpD,WAAW,CAAC,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,GAAG,eAAe,CAAC;AACzE,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,GAAG,YAAY,CAAC;AACnE,MAAM,MAAM,aAAa,GAAG,oBAAoB,GAAG,iBAAiB,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,MAAM,MAAM,+BAA+B,GAAG;IAC5C,
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,MAAM,MAAM,+BAA+B,GAAG;IAC5C,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,CACrC,KAAK,EAAE;IACL,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,GAAG,+BAA+B,KAChC,KAAK,CAAC,SAAS,CAAC;AAErB,MAAM,MAAM,mBAAmB,GAAG;IAChC,iDAAiD;IACjD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,6BAA6B;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,UAAU,CAAC,EAAE,wBAAwB,CAAC;IACtC;;OAEG;IACH,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,+BAA+B,KAAK,IAAI,CAAC;IACjE,oBAAoB;IACpB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAE5B;;;;;;;OAOG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC"}
|
@@ -50,13 +50,17 @@ export type ProviderOptions = {
|
|
50
50
|
*/
|
51
51
|
children?: React.ReactNode;
|
52
52
|
} & UserContextOptions;
|
53
|
+
export type Position = {
|
54
|
+
start: number;
|
55
|
+
end: number;
|
56
|
+
};
|
53
57
|
export type Hunk = {
|
54
58
|
header: string;
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
59
|
+
positions: {
|
60
|
+
old: Position;
|
61
|
+
new: Position;
|
62
|
+
diff: Position;
|
63
|
+
};
|
60
64
|
lines: {
|
61
65
|
type: "add" | "remove" | "context";
|
62
66
|
content: string;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/ui/GitDiffViewer/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAE9E;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,gBAAgB,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB;;;;;OAKG;IACH,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;CACtD,CAAC;AAEF,KAAK,kBAAkB,GAAG,qBAAqB,GAC7C,WAAW,GACX,eAAe,GACf,SAAS,CAAC,cAAc,CAAC,CAAC;AAE5B,KAAK,qBAAqB,GAAG;IAC3B,uBAAuB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACrC,wBAAwB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;CACxD,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,kBAAkB,GAAG,qBAAqB,CAAC;AAExE,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B;;OAEG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,GAAG,kBAAkB,CAAC;AAEvB,MAAM,MAAM,
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/ui/GitDiffViewer/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAE9E;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,gBAAgB,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB;;;;;OAKG;IACH,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;CACtD,CAAC;AAEF,KAAK,kBAAkB,GAAG,qBAAqB,GAC7C,WAAW,GACX,eAAe,GACf,SAAS,CAAC,cAAc,CAAC,CAAC;AAE5B,KAAK,qBAAqB,GAAG;IAC3B,uBAAuB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACrC,wBAAwB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;CACxD,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,kBAAkB,GAAG,qBAAqB,CAAC;AAExE,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B;;OAEG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,GAAG,kBAAkB,CAAC;AAEvB,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE;QACT,GAAG,EAAE,QAAQ,CAAC;QACd,GAAG,EAAE,QAAQ,CAAC;QACd,IAAI,EAAE,QAAQ,CAAC;KAChB,CAAC;IACF,KAAK,EAAE;QACL,IAAI,EAAE,KAAK,GAAG,QAAQ,GAAG,SAAS,CAAC;QACnC,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,eAAe,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,UAAU,CAAC;CAC5D,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,CAAC,CACpC,KAAK,EAAE,eAAe,KACnB,KAAK,CAAC,YAAY,CAAC,GAAG;IACzB,UAAU,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;IAClE,cAAc,EAAE,KAAK,CAAC,yBAAyB,CAC7C,mBAAmB,GAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAC5D,CAAC;CACH,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"parseGitDiff.d.ts","sourceRoot":"","sources":["../../../../../src/ui/GitDiffViewer/utils/parseGitDiff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,
|
1
|
+
{"version":3,"file":"parseGitDiff.d.ts","sourceRoot":"","sources":["../../../../../src/ui/GitDiffViewer/utils/parseGitDiff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,aAAa,CAAC;AAE5D,iBAAS,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,EAAE,CA+FlD;AAED,eAAe,YAAY,CAAC"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@canonical/react-ds-app-launchpad",
|
3
|
-
"version": "0.9.0-experimental.
|
3
|
+
"version": "0.9.0-experimental.18",
|
4
4
|
"type": "module",
|
5
5
|
"module": "dist/esm/index.js",
|
6
6
|
"types": "dist/types/index.d.ts",
|
@@ -73,5 +73,5 @@
|
|
73
73
|
"vite-tsconfig-paths": "^5.1.4",
|
74
74
|
"vitest": "^3.0.9"
|
75
75
|
},
|
76
|
-
"gitHead": "
|
76
|
+
"gitHead": "8485045674b2b0eba4b05aa2edae618240959421"
|
77
77
|
}
|