@hanzo/ui 5.3.35 → 5.3.36
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/bin/create-registry.js +0 -0
- package/bin/npx-registry-mcp.js +0 -0
- package/bin/registry-mcp-wrapper.sh +0 -0
- package/bin/registry-mcp.js +0 -0
- package/bin/start-mcp-server.sh +0 -0
- package/bin/test-mcp.sh +0 -0
- package/dist/3d/button.js +1 -297
- package/dist/3d/button.mjs +1 -272
- package/dist/3d/card.js +1 -233
- package/dist/3d/card.mjs +1 -206
- package/dist/3d/carousel.js +1 -370
- package/dist/3d/carousel.mjs +1 -343
- package/dist/3d/grid.js +1 -361
- package/dist/3d/grid.mjs +1 -336
- package/dist/3d/index.js +1 -1517
- package/dist/3d/index.mjs +1 -1471
- package/dist/3d/marquee.js +1 -351
- package/dist/3d/marquee.mjs +1 -326
- package/dist/3d/pin.js +1 -45
- package/dist/3d/pin.mjs +1 -23
- package/dist/accordion.js +1 -79
- package/dist/accordion.mjs +1 -54
- package/dist/alert-dialog.js +1 -224
- package/dist/alert-dialog.mjs +1 -191
- package/dist/alert.js +1 -97
- package/dist/alert.mjs +1 -91
- package/dist/animation/animated-background.js +1 -423
- package/dist/animation/animated-background.mjs +1 -417
- package/dist/animation/animated-beam.js +1 -118
- package/dist/animation/animated-beam.mjs +1 -96
- package/dist/animation/animated-cursor.js +1 -274
- package/dist/animation/animated-cursor.mjs +1 -269
- package/dist/animation/animated-icon.js +2 -356
- package/dist/animation/animated-icon.mjs +2 -350
- package/dist/animation/animated-list.js +1 -338
- package/dist/animation/animated-list.mjs +1 -332
- package/dist/animation/animated-number.js +1 -282
- package/dist/animation/animated-number.mjs +1 -276
- package/dist/animation/animated-testimonials.js +1 -96
- package/dist/animation/animated-testimonials.mjs +1 -74
- package/dist/animation/animated-tooltip.js +1 -66
- package/dist/animation/animated-tooltip.mjs +1 -44
- package/dist/animation/apple-cards-carousel.js +1 -307
- package/dist/animation/apple-cards-carousel.mjs +1 -284
- package/dist/animation/apple-hello-effect.js +1 -59
- package/dist/animation/apple-hello-effect.mjs +1 -37
- package/dist/animation/index.js +2 -1951
- package/dist/animation/index.mjs +2 -1920
- package/dist/avatar.js +1 -70
- package/dist/avatar.mjs +1 -46
- package/dist/badge.js +1 -60
- package/dist/badge.mjs +1 -54
- package/dist/blocks/index.js +2 -1684
- package/dist/blocks/index.mjs +2 -1645
- package/dist/breadcrumb.js +1 -106
- package/dist/breadcrumb.mjs +1 -98
- package/dist/calendar-ext/index.js +1 -207
- package/dist/calendar-ext/index.mjs +1 -169
- package/dist/calendar.js +1 -193
- package/dist/calendar.mjs +1 -168
- package/dist/carousel.js +1 -282
- package/dist/carousel.mjs +1 -253
- package/dist/charts/index.js +6 -5840
- package/dist/charts/index.mjs +6 -5749
- package/dist/checkbox.js +1 -59
- package/dist/checkbox.mjs +1 -34
- package/dist/code/block.js +2 -225
- package/dist/code/block.mjs +2 -202
- package/dist/code/compare.js +5 -444
- package/dist/code/compare.mjs +5 -421
- package/dist/code/diff.js +12 -429
- package/dist/code/diff.mjs +11 -405
- package/dist/code/editor.js +1 -242
- package/dist/code/editor.mjs +1 -217
- package/dist/code/explorer.js +1 -290
- package/dist/code/explorer.mjs +1 -267
- package/dist/code/index.js +26 -2514
- package/dist/code/index.mjs +24 -2471
- package/dist/code/preview.js +6 -363
- package/dist/code/preview.mjs +6 -340
- package/dist/code/snippet.js +2 -273
- package/dist/code/snippet.mjs +2 -249
- package/dist/code/tabs.js +1 -74
- package/dist/code/tabs.mjs +1 -52
- package/dist/code/terminal.js +3 -436
- package/dist/code/terminal.mjs +3 -413
- package/dist/collapsible.js +1 -32
- package/dist/collapsible.mjs +1 -8
- package/dist/command.js +1 -282
- package/dist/command.mjs +1 -251
- package/dist/context-menu.js +1 -206
- package/dist/context-menu.mjs +1 -170
- package/dist/desktop/hooks.js +1 -223
- package/dist/desktop/hooks.mjs +1 -198
- package/dist/desktop/index.js +1 -685
- package/dist/desktop/index.mjs +1 -657
- package/dist/desktop/spotlight.js +1 -260
- package/dist/desktop/spotlight.mjs +1 -235
- package/dist/desktop/window.js +1 -273
- package/dist/desktop/window.mjs +1 -247
- package/dist/device/index.js +1 -2
- package/dist/device/index.mjs +0 -1
- package/dist/dialog.js +1 -245
- package/dist/dialog.mjs +1 -213
- package/dist/dock/basic.js +1 -173
- package/dist/dock/basic.mjs +1 -150
- package/dist/dock/index.js +1 -647
- package/dist/dock/index.mjs +1 -620
- package/dist/dock/limelight-nav.js +1 -314
- package/dist/dock/limelight-nav.mjs +1 -293
- package/dist/dock/macos.js +1 -140
- package/dist/dock/macos.mjs +1 -117
- package/dist/dock/menu.js +1 -69
- package/dist/dock/menu.mjs +1 -47
- package/dist/dock/message.js +1 -148
- package/dist/dock/message.mjs +1 -126
- package/dist/drawer.js +1 -114
- package/dist/drawer.mjs +1 -102
- package/dist/dropdown-menu.js +1 -201
- package/dist/dropdown-menu.mjs +1 -165
- package/dist/finance/AdvancedChart.js +2 -47
- package/dist/finance/AdvancedChart.mjs +2 -45
- package/dist/finance/CompanyProfile.js +2 -47
- package/dist/finance/CompanyProfile.mjs +2 -45
- package/dist/finance/CryptoScreener.js +2 -44
- package/dist/finance/CryptoScreener.mjs +2 -42
- package/dist/finance/Financials.js +2 -51
- package/dist/finance/Financials.mjs +2 -49
- package/dist/finance/ForexScreener.js +2 -45
- package/dist/finance/ForexScreener.mjs +2 -43
- package/dist/finance/MarketOverview.js +2 -103
- package/dist/finance/MarketOverview.mjs +2 -101
- package/dist/finance/NewsTimeline.js +2 -43
- package/dist/finance/NewsTimeline.mjs +2 -41
- package/dist/finance/OrderEntry.js +1 -130
- package/dist/finance/OrderEntry.mjs +1 -128
- package/dist/finance/OrdersHistory.js +1 -63
- package/dist/finance/OrdersHistory.mjs +1 -61
- package/dist/finance/PositionsList.js +1 -79
- package/dist/finance/PositionsList.mjs +1 -77
- package/dist/finance/StockScreener.js +2 -45
- package/dist/finance/StockScreener.mjs +2 -43
- package/dist/finance/SymbolInfo.js +2 -45
- package/dist/finance/SymbolInfo.mjs +2 -43
- package/dist/finance/TechnicalAnalysis.js +2 -53
- package/dist/finance/TechnicalAnalysis.mjs +2 -51
- package/dist/finance/TickerTape.js +2 -55
- package/dist/finance/TickerTape.mjs +2 -53
- package/dist/finance/TradingPanel.js +1 -190
- package/dist/finance/TradingPanel.mjs +1 -188
- package/dist/finance/index.js +2 -929
- package/dist/finance/index.mjs +2 -913
- package/dist/form/index.js +1 -153
- package/dist/form/index.mjs +1 -123
- package/dist/form.js +1 -171
- package/dist/form.mjs +1 -141
- package/dist/hover-card.js +1 -57
- package/dist/hover-card.mjs +1 -33
- package/dist/index.js +192 -9618
- package/dist/index.mjs +192 -9202
- package/dist/input-otp.js +1 -78
- package/dist/input-otp.mjs +1 -53
- package/dist/kanban/index.js +1 -593
- package/dist/kanban/index.mjs +1 -571
- package/dist/lib/utils.js +1 -28
- package/dist/lib/utils.mjs +1 -24
- package/dist/mermaid/index.js +1 -280
- package/dist/mermaid/index.mjs +1 -253
- package/dist/navigation/index.js +1 -97
- package/dist/navigation/index.mjs +1 -78
- package/dist/navigation-menu.js +1 -148
- package/dist/navigation-menu.mjs +1 -115
- package/dist/pattern/grid-pattern.js +3 -325
- package/dist/pattern/grid-pattern.mjs +3 -302
- package/dist/pattern/index.js +3 -325
- package/dist/pattern/index.mjs +3 -302
- package/dist/popover.js +1 -62
- package/dist/popover.mjs +1 -36
- package/dist/progress.js +1 -61
- package/dist/progress.mjs +1 -36
- package/dist/project/gantt.js +1 -64
- package/dist/project/gantt.mjs +1 -42
- package/dist/project/index.js +1 -635
- package/dist/project/index.mjs +1 -610
- package/dist/project/kanban.js +1 -596
- package/dist/project/kanban.mjs +1 -571
- package/dist/project/list.js +1 -34
- package/dist/project/list.mjs +1 -11
- package/dist/radio-group.js +1 -67
- package/dist/radio-group.mjs +1 -44
- package/dist/resizable.js +1 -71
- package/dist/resizable.mjs +1 -47
- package/dist/scroll-area.js +1 -88
- package/dist/scroll-area.mjs +1 -65
- package/dist/select.js +1 -139
- package/dist/select.mjs +1 -110
- package/dist/separator.js +1 -58
- package/dist/separator.mjs +1 -33
- package/dist/sheet.js +1 -147
- package/dist/sheet.mjs +1 -116
- package/dist/skeleton.js +1 -31
- package/dist/skeleton.mjs +1 -26
- package/dist/slider.js +1 -98
- package/dist/slider.mjs +1 -72
- package/dist/sonner.js +1 -33
- package/dist/sonner.mjs +1 -28
- package/dist/spline/index.js +1 -210
- package/dist/spline/index.mjs +1 -201
- package/dist/spline/media-stack.js +1 -192
- package/dist/spline/media-stack.mjs +1 -184
- package/dist/spline/player.js +1 -36
- package/dist/spline/player.mjs +1 -30
- package/dist/switch.js +1 -61
- package/dist/switch.mjs +1 -36
- package/dist/table.js +1 -109
- package/dist/table.mjs +1 -100
- package/dist/tabs.js +1 -127
- package/dist/tabs.mjs +1 -101
- package/dist/tailwind/index.mjs +1 -2011
- package/dist/textarea.js +1 -77
- package/dist/textarea.mjs +1 -55
- package/dist/toggle-group.js +1 -117
- package/dist/toggle-group.mjs +1 -92
- package/dist/toggle.js +1 -70
- package/dist/toggle.mjs +1 -47
- package/dist/tooltip.js +1 -66
- package/dist/tooltip.mjs +1 -39
- package/dist/types/index.mjs +1 -51
- package/dist/ui/announcement.js +1 -133
- package/dist/ui/announcement.mjs +1 -111
- package/dist/ui/avatar-group.js +1 -87
- package/dist/ui/avatar-group.mjs +1 -64
- package/dist/ui/banner.js +1 -84
- package/dist/ui/banner.mjs +1 -61
- package/dist/ui/cursor.js +1 -77
- package/dist/ui/cursor.mjs +1 -55
- package/dist/ui/index.js +1 -494
- package/dist/ui/index.mjs +1 -461
- package/dist/ui/marquee.js +1 -73
- package/dist/ui/marquee.mjs +1 -51
- package/dist/ui/pill.js +1 -84
- package/dist/ui/pill.mjs +1 -61
- package/dist/ui/spinner.js +1 -27
- package/dist/ui/spinner.mjs +1 -25
- package/dist/ui/tags.js +1 -116
- package/dist/ui/tags.mjs +1 -94
- package/dist/ui/ticker.js +1 -72
- package/dist/ui/ticker.mjs +1 -50
- package/dist/util/index.mjs +1 -404
- package/package.json +28 -27
- package/dist/primitives/index.js +0 -9619
- package/dist/primitives/index.mjs +0 -9203
- package/dist/primitives-export.js +0 -9619
- package/dist/primitives-export.mjs +0 -9203
package/dist/code/compare.js
CHANGED
|
@@ -1,446 +1,7 @@
|
|
|
1
1
|
"use client";
|
|
2
|
-
'use strict';
|
|
2
|
+
'use strict';var o=require('react'),classVarianceAuthority=require('class-variance-authority'),lucideReact=require('lucide-react'),utils=require('@hanzo/ui/lib/utils'),badge=require('@hanzo/ui/badge'),button=require('@hanzo/ui/button'),diff=require('@hanzo/ui/code/diff'),snippet=require('@hanzo/ui/code/snippet'),dropdownMenu=require('@hanzo/ui/dropdown-menu'),scrollArea=require('@hanzo/ui/scroll-area'),tabs=require('@hanzo/ui/tabs'),jsxRuntime=require('react/jsx-runtime');function _interopNamespace(e){if(e&&e.__esModule)return e;var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var o__namespace=/*#__PURE__*/_interopNamespace(o);var te=Object.defineProperty;var m=(v,x)=>te(v,"name",{value:x,configurable:true});var ge=classVarianceAuthority.cva("relative flex flex-col overflow-hidden rounded-lg border bg-background",{variants:{layout:{horizontal:"flex-col",vertical:"flex-row"},size:{sm:"text-xs",default:"text-sm",lg:"text-base"}},defaultVariants:{layout:"horizontal",size:"default"}}),pe=o__namespace.forwardRef(({className:v,layout:x,size:V,files:i,defaultView:j="side-by-side",showLineNumbers:u=true,showCopyButton:E=true,allowMerge:A=false,conflictMarkers:I=[],onMergeConflict:S,onFileSelect:P,height:$="600px",syncScroll:M=true,...U},q)=>{let[c,G]=o__namespace.useState(j),[d,b]=o__namespace.useState(()=>i.length>=2?[i[0].id,i[1].id]:i.length>0?[i[0].id]:[]),[h,K]=o__namespace.useState({resolved:{},conflicts:I}),[O,T]=o__namespace.useState(false),g=o__namespace.useRef({}),N=o__namespace.useCallback((e,n)=>{M&&Object.entries(g.current).forEach(([a,s])=>{a!==e&&s&&(s.scrollTop=n);});},[M]),W=o__namespace.useCallback(async()=>{let e=d.map(n=>{let a=i.find(s=>s.id===n);return a?`=== ${a.filename} ===
|
|
3
|
+
${a.content}`:""}).join(`
|
|
3
4
|
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
var utils = require('@hanzo/ui/lib/utils');
|
|
8
|
-
var badge = require('@hanzo/ui/badge');
|
|
9
|
-
var button = require('@hanzo/ui/button');
|
|
10
|
-
var diff = require('@hanzo/ui/code/diff');
|
|
11
|
-
var snippet = require('@hanzo/ui/code/snippet');
|
|
12
|
-
var dropdownMenu = require('@hanzo/ui/dropdown-menu');
|
|
13
|
-
var scrollArea = require('@hanzo/ui/scroll-area');
|
|
14
|
-
var tabs = require('@hanzo/ui/tabs');
|
|
15
|
-
var jsxRuntime = require('react/jsx-runtime');
|
|
16
|
-
|
|
17
|
-
function _interopNamespace(e) {
|
|
18
|
-
if (e && e.__esModule) return e;
|
|
19
|
-
var n = Object.create(null);
|
|
20
|
-
if (e) {
|
|
21
|
-
Object.keys(e).forEach(function (k) {
|
|
22
|
-
if (k !== 'default') {
|
|
23
|
-
var d = Object.getOwnPropertyDescriptor(e, k);
|
|
24
|
-
Object.defineProperty(n, k, d.get ? d : {
|
|
25
|
-
enumerable: true,
|
|
26
|
-
get: function () { return e[k]; }
|
|
27
|
-
});
|
|
28
|
-
}
|
|
29
|
-
});
|
|
30
|
-
}
|
|
31
|
-
n.default = e;
|
|
32
|
-
return Object.freeze(n);
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
var React__namespace = /*#__PURE__*/_interopNamespace(React);
|
|
36
|
-
|
|
37
|
-
var __defProp = Object.defineProperty;
|
|
38
|
-
var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
|
|
39
|
-
var codeCompareVariants = classVarianceAuthority.cva(
|
|
40
|
-
"relative flex flex-col overflow-hidden rounded-lg border bg-background",
|
|
41
|
-
{
|
|
42
|
-
variants: {
|
|
43
|
-
layout: {
|
|
44
|
-
horizontal: "flex-col",
|
|
45
|
-
vertical: "flex-row"
|
|
46
|
-
},
|
|
47
|
-
size: {
|
|
48
|
-
sm: "text-xs",
|
|
49
|
-
default: "text-sm",
|
|
50
|
-
lg: "text-base"
|
|
51
|
-
}
|
|
52
|
-
},
|
|
53
|
-
defaultVariants: {
|
|
54
|
-
layout: "horizontal",
|
|
55
|
-
size: "default"
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
);
|
|
59
|
-
var CodeCompare = React__namespace.forwardRef(
|
|
60
|
-
({
|
|
61
|
-
className,
|
|
62
|
-
layout,
|
|
63
|
-
size,
|
|
64
|
-
files,
|
|
65
|
-
defaultView = "side-by-side",
|
|
66
|
-
showLineNumbers = true,
|
|
67
|
-
showCopyButton = true,
|
|
68
|
-
allowMerge = false,
|
|
69
|
-
conflictMarkers = [],
|
|
70
|
-
onMergeConflict,
|
|
71
|
-
onFileSelect,
|
|
72
|
-
height = "600px",
|
|
73
|
-
syncScroll = true,
|
|
74
|
-
...props
|
|
75
|
-
}, ref) => {
|
|
76
|
-
const [view, setView] = React__namespace.useState(defaultView);
|
|
77
|
-
const [selectedFiles, setSelectedFiles] = React__namespace.useState(() => {
|
|
78
|
-
if (files.length >= 2) {
|
|
79
|
-
return [files[0].id, files[1].id];
|
|
80
|
-
}
|
|
81
|
-
return files.length > 0 ? [files[0].id] : [];
|
|
82
|
-
});
|
|
83
|
-
const [mergeState, setMergeState] = React__namespace.useState({
|
|
84
|
-
resolved: {},
|
|
85
|
-
conflicts: conflictMarkers
|
|
86
|
-
});
|
|
87
|
-
const [copied, setCopied] = React__namespace.useState(false);
|
|
88
|
-
const scrollRefs = React__namespace.useRef({});
|
|
89
|
-
const handleScroll = React__namespace.useCallback(
|
|
90
|
-
(sourceId, scrollTop) => {
|
|
91
|
-
if (!syncScroll) return;
|
|
92
|
-
Object.entries(scrollRefs.current).forEach(([id, ref2]) => {
|
|
93
|
-
if (id !== sourceId && ref2) {
|
|
94
|
-
ref2.scrollTop = scrollTop;
|
|
95
|
-
}
|
|
96
|
-
});
|
|
97
|
-
},
|
|
98
|
-
[syncScroll]
|
|
99
|
-
);
|
|
100
|
-
const copyComparison = React__namespace.useCallback(async () => {
|
|
101
|
-
const comparison = selectedFiles.map((fileId) => {
|
|
102
|
-
const file = files.find((f) => f.id === fileId);
|
|
103
|
-
return file ? `=== ${file.filename} ===
|
|
104
|
-
${file.content}` : "";
|
|
105
|
-
}).join("\n\n");
|
|
106
|
-
try {
|
|
107
|
-
await navigator.clipboard.writeText(comparison);
|
|
108
|
-
setCopied(true);
|
|
109
|
-
setTimeout(() => setCopied(false), 2e3);
|
|
110
|
-
} catch (error) {
|
|
111
|
-
console.error("Failed to copy comparison:", error);
|
|
112
|
-
}
|
|
113
|
-
}, [files, selectedFiles]);
|
|
114
|
-
const resolveConflict = React__namespace.useCallback(
|
|
115
|
-
(conflictIndex, resolution) => {
|
|
116
|
-
setMergeState((prev) => ({
|
|
117
|
-
...prev,
|
|
118
|
-
resolved: {
|
|
119
|
-
...prev.resolved,
|
|
120
|
-
[conflictIndex]: resolution
|
|
121
|
-
}
|
|
122
|
-
}));
|
|
123
|
-
onMergeConflict?.(resolution);
|
|
124
|
-
},
|
|
125
|
-
[onMergeConflict]
|
|
126
|
-
);
|
|
127
|
-
const getFileStats = React__namespace.useCallback(
|
|
128
|
-
(file1, file2) => {
|
|
129
|
-
const lines1 = file1.content.split("\n");
|
|
130
|
-
const lines2 = file2.content.split("\n");
|
|
131
|
-
let added = 0;
|
|
132
|
-
let removed = 0;
|
|
133
|
-
let modified = 0;
|
|
134
|
-
const maxLines = Math.max(lines1.length, lines2.length);
|
|
135
|
-
for (let i = 0; i < maxLines; i++) {
|
|
136
|
-
const line1 = lines1[i];
|
|
137
|
-
const line2 = lines2[i];
|
|
138
|
-
if (line1 === void 0) {
|
|
139
|
-
added++;
|
|
140
|
-
} else if (line2 === void 0) {
|
|
141
|
-
removed++;
|
|
142
|
-
} else if (line1 !== line2) {
|
|
143
|
-
modified++;
|
|
144
|
-
}
|
|
145
|
-
}
|
|
146
|
-
return { added, removed, modified };
|
|
147
|
-
},
|
|
148
|
-
[]
|
|
149
|
-
);
|
|
150
|
-
const renderFileSelector = /* @__PURE__ */ __name(() => /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center gap-2 flex-wrap", children: files.map((file, index) => /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
|
|
151
|
-
/* @__PURE__ */ jsxRuntime.jsxs(
|
|
152
|
-
button.Button,
|
|
153
|
-
{
|
|
154
|
-
variant: selectedFiles.includes(file.id) ? "default" : "outline",
|
|
155
|
-
size: "sm",
|
|
156
|
-
onClick: () => {
|
|
157
|
-
if (view === "three-way") {
|
|
158
|
-
setSelectedFiles((prev) => {
|
|
159
|
-
if (prev.includes(file.id)) {
|
|
160
|
-
return prev.filter((id) => id !== file.id);
|
|
161
|
-
}
|
|
162
|
-
return prev.length < 3 ? [...prev, file.id] : [prev[1], prev[2], file.id];
|
|
163
|
-
});
|
|
164
|
-
} else {
|
|
165
|
-
setSelectedFiles((prev) => {
|
|
166
|
-
if (prev.includes(file.id)) {
|
|
167
|
-
return prev.filter((id) => id !== file.id);
|
|
168
|
-
}
|
|
169
|
-
return prev.length < 2 ? [...prev, file.id] : [prev[1], file.id];
|
|
170
|
-
});
|
|
171
|
-
}
|
|
172
|
-
onFileSelect?.(file.id);
|
|
173
|
-
},
|
|
174
|
-
className: "gap-2",
|
|
175
|
-
children: [
|
|
176
|
-
file.label || file.filename,
|
|
177
|
-
file.version && /* @__PURE__ */ jsxRuntime.jsx(badge.Badge, { variant: "secondary", className: "text-xs", children: file.version })
|
|
178
|
-
]
|
|
179
|
-
}
|
|
180
|
-
),
|
|
181
|
-
index < files.length - 1 && view !== "three-way" && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-muted-foreground", children: "vs" })
|
|
182
|
-
] }, file.id)) }), "renderFileSelector");
|
|
183
|
-
const renderSideBySide = /* @__PURE__ */ __name(() => {
|
|
184
|
-
const [file1, file2] = selectedFiles.map((id) => files.find((f) => f.id === id)).filter(Boolean);
|
|
185
|
-
if (!file1 || !file2) {
|
|
186
|
-
return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-center h-32 text-muted-foreground", children: "Select two files to compare" });
|
|
187
|
-
}
|
|
188
|
-
const stats = getFileStats(file1, file2);
|
|
189
|
-
return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col h-full", children: [
|
|
190
|
-
/* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-between border-b px-4 py-2 bg-muted/30", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-4", children: [
|
|
191
|
-
/* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm font-medium", children: "Comparison" }),
|
|
192
|
-
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-3 text-xs", children: [
|
|
193
|
-
/* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-green-600", children: [
|
|
194
|
-
"+",
|
|
195
|
-
stats.added
|
|
196
|
-
] }),
|
|
197
|
-
/* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-red-600", children: [
|
|
198
|
-
"-",
|
|
199
|
-
stats.removed
|
|
200
|
-
] }),
|
|
201
|
-
/* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-yellow-600", children: [
|
|
202
|
-
"~",
|
|
203
|
-
stats.modified
|
|
204
|
-
] })
|
|
205
|
-
] })
|
|
206
|
-
] }) }),
|
|
207
|
-
/* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-1 min-h-0", children: /* @__PURE__ */ jsxRuntime.jsx(
|
|
208
|
-
diff.CodeDiff,
|
|
209
|
-
{
|
|
210
|
-
oldCode: file1.content,
|
|
211
|
-
newCode: file2.content,
|
|
212
|
-
language: file1.language,
|
|
213
|
-
oldFilename: file1.filename,
|
|
214
|
-
newFilename: file2.filename,
|
|
215
|
-
showLineNumbers,
|
|
216
|
-
showCopyButton: false,
|
|
217
|
-
maxHeight: "100%",
|
|
218
|
-
defaultView: "split",
|
|
219
|
-
className: "border-0 rounded-none h-full"
|
|
220
|
-
}
|
|
221
|
-
) })
|
|
222
|
-
] });
|
|
223
|
-
}, "renderSideBySide");
|
|
224
|
-
const renderUnified = /* @__PURE__ */ __name(() => {
|
|
225
|
-
const [file1, file2] = selectedFiles.map((id) => files.find((f) => f.id === id)).filter(Boolean);
|
|
226
|
-
if (!file1 || !file2) {
|
|
227
|
-
return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-center h-32 text-muted-foreground", children: "Select two files to compare" });
|
|
228
|
-
}
|
|
229
|
-
return /* @__PURE__ */ jsxRuntime.jsx(
|
|
230
|
-
diff.CodeDiff,
|
|
231
|
-
{
|
|
232
|
-
oldCode: file1.content,
|
|
233
|
-
newCode: file2.content,
|
|
234
|
-
language: file1.language,
|
|
235
|
-
filename: `${file1.filename} \u2192 ${file2.filename}`,
|
|
236
|
-
showLineNumbers,
|
|
237
|
-
showCopyButton: false,
|
|
238
|
-
maxHeight: "100%",
|
|
239
|
-
defaultView: "unified",
|
|
240
|
-
className: "border-0 rounded-none"
|
|
241
|
-
}
|
|
242
|
-
);
|
|
243
|
-
}, "renderUnified");
|
|
244
|
-
const renderThreeWay = /* @__PURE__ */ __name(() => {
|
|
245
|
-
const [base, current, incoming] = selectedFiles.map((id) => files.find((f) => f.id === id)).filter(Boolean);
|
|
246
|
-
if (!base || !current || !incoming) {
|
|
247
|
-
return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-center h-32 text-muted-foreground", children: "Select three files for three-way merge (base, current, incoming)" });
|
|
248
|
-
}
|
|
249
|
-
return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-3 gap-0 h-full", children: [
|
|
250
|
-
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "border-r", children: [
|
|
251
|
-
/* @__PURE__ */ jsxRuntime.jsx("div", { className: "border-b px-4 py-2 bg-muted/30", children: /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-sm font-medium", children: [
|
|
252
|
-
"Base (",
|
|
253
|
-
base.filename,
|
|
254
|
-
")"
|
|
255
|
-
] }) }),
|
|
256
|
-
/* @__PURE__ */ jsxRuntime.jsx(
|
|
257
|
-
scrollArea.ScrollArea,
|
|
258
|
-
{
|
|
259
|
-
className: "h-full",
|
|
260
|
-
ref: (ref2) => {
|
|
261
|
-
scrollRefs.current["base"] = ref2;
|
|
262
|
-
},
|
|
263
|
-
onScrollCapture: (e) => {
|
|
264
|
-
const target = e.target;
|
|
265
|
-
handleScroll("base", target.scrollTop);
|
|
266
|
-
},
|
|
267
|
-
children: /* @__PURE__ */ jsxRuntime.jsx(
|
|
268
|
-
snippet.CodeSnippet,
|
|
269
|
-
{
|
|
270
|
-
code: base.content,
|
|
271
|
-
language: base.language,
|
|
272
|
-
showLineNumbers,
|
|
273
|
-
showCopyButton: false,
|
|
274
|
-
showHeader: false,
|
|
275
|
-
className: "border-0 rounded-none"
|
|
276
|
-
}
|
|
277
|
-
)
|
|
278
|
-
}
|
|
279
|
-
)
|
|
280
|
-
] }),
|
|
281
|
-
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "border-r", children: [
|
|
282
|
-
/* @__PURE__ */ jsxRuntime.jsx("div", { className: "border-b px-4 py-2 bg-blue-500/10", children: /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-sm font-medium text-blue-600 dark:text-blue-400", children: [
|
|
283
|
-
"Current (",
|
|
284
|
-
current.filename,
|
|
285
|
-
")"
|
|
286
|
-
] }) }),
|
|
287
|
-
/* @__PURE__ */ jsxRuntime.jsx(
|
|
288
|
-
scrollArea.ScrollArea,
|
|
289
|
-
{
|
|
290
|
-
className: "h-full",
|
|
291
|
-
ref: (ref2) => {
|
|
292
|
-
scrollRefs.current["current"] = ref2;
|
|
293
|
-
},
|
|
294
|
-
onScrollCapture: (e) => {
|
|
295
|
-
const target = e.target;
|
|
296
|
-
handleScroll("current", target.scrollTop);
|
|
297
|
-
},
|
|
298
|
-
children: /* @__PURE__ */ jsxRuntime.jsx(
|
|
299
|
-
snippet.CodeSnippet,
|
|
300
|
-
{
|
|
301
|
-
code: current.content,
|
|
302
|
-
language: current.language,
|
|
303
|
-
showLineNumbers,
|
|
304
|
-
showCopyButton: false,
|
|
305
|
-
showHeader: false,
|
|
306
|
-
className: "border-0 rounded-none"
|
|
307
|
-
}
|
|
308
|
-
)
|
|
309
|
-
}
|
|
310
|
-
)
|
|
311
|
-
] }),
|
|
312
|
-
/* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
|
|
313
|
-
/* @__PURE__ */ jsxRuntime.jsx("div", { className: "border-b px-4 py-2 bg-green-500/10", children: /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-sm font-medium text-green-600 dark:text-green-400", children: [
|
|
314
|
-
"Incoming (",
|
|
315
|
-
incoming.filename,
|
|
316
|
-
")"
|
|
317
|
-
] }) }),
|
|
318
|
-
/* @__PURE__ */ jsxRuntime.jsx(
|
|
319
|
-
scrollArea.ScrollArea,
|
|
320
|
-
{
|
|
321
|
-
className: "h-full",
|
|
322
|
-
ref: (ref2) => {
|
|
323
|
-
scrollRefs.current["incoming"] = ref2;
|
|
324
|
-
},
|
|
325
|
-
onScrollCapture: (e) => {
|
|
326
|
-
const target = e.target;
|
|
327
|
-
handleScroll("incoming", target.scrollTop);
|
|
328
|
-
},
|
|
329
|
-
children: /* @__PURE__ */ jsxRuntime.jsx(
|
|
330
|
-
snippet.CodeSnippet,
|
|
331
|
-
{
|
|
332
|
-
code: incoming.content,
|
|
333
|
-
language: incoming.language,
|
|
334
|
-
showLineNumbers,
|
|
335
|
-
showCopyButton: false,
|
|
336
|
-
showHeader: false,
|
|
337
|
-
className: "border-0 rounded-none"
|
|
338
|
-
}
|
|
339
|
-
)
|
|
340
|
-
}
|
|
341
|
-
)
|
|
342
|
-
] })
|
|
343
|
-
] });
|
|
344
|
-
}, "renderThreeWay");
|
|
345
|
-
const renderMergeConflicts = /* @__PURE__ */ __name(() => {
|
|
346
|
-
if (!allowMerge || mergeState.conflicts.length === 0) return null;
|
|
347
|
-
return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "border-t bg-muted/30", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "px-4 py-2", children: [
|
|
348
|
-
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between", children: [
|
|
349
|
-
/* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm font-medium", children: "Merge Conflicts" }),
|
|
350
|
-
/* @__PURE__ */ jsxRuntime.jsx(badge.Badge, { variant: "destructive", className: "text-xs", children: mergeState.conflicts.length })
|
|
351
|
-
] }),
|
|
352
|
-
/* @__PURE__ */ jsxRuntime.jsx("div", { className: "mt-2 space-y-2", children: mergeState.conflicts.map((conflict, index) => /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2 text-xs", children: [
|
|
353
|
-
/* @__PURE__ */ jsxRuntime.jsxs("span", { children: [
|
|
354
|
-
"Lines ",
|
|
355
|
-
conflict.startLine,
|
|
356
|
-
"-",
|
|
357
|
-
conflict.endLine
|
|
358
|
-
] }),
|
|
359
|
-
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-1", children: [
|
|
360
|
-
/* @__PURE__ */ jsxRuntime.jsx(
|
|
361
|
-
button.Button,
|
|
362
|
-
{
|
|
363
|
-
variant: "outline",
|
|
364
|
-
size: "sm",
|
|
365
|
-
onClick: () => resolveConflict(index, "current"),
|
|
366
|
-
className: "h-6 text-xs",
|
|
367
|
-
children: "Keep Current"
|
|
368
|
-
}
|
|
369
|
-
),
|
|
370
|
-
/* @__PURE__ */ jsxRuntime.jsx(
|
|
371
|
-
button.Button,
|
|
372
|
-
{
|
|
373
|
-
variant: "outline",
|
|
374
|
-
size: "sm",
|
|
375
|
-
onClick: () => resolveConflict(index, "incoming"),
|
|
376
|
-
className: "h-6 text-xs",
|
|
377
|
-
children: "Accept Incoming"
|
|
378
|
-
}
|
|
379
|
-
)
|
|
380
|
-
] })
|
|
381
|
-
] }, index)) })
|
|
382
|
-
] }) });
|
|
383
|
-
}, "renderMergeConflicts");
|
|
384
|
-
return /* @__PURE__ */ jsxRuntime.jsxs(
|
|
385
|
-
"div",
|
|
386
|
-
{
|
|
387
|
-
ref,
|
|
388
|
-
className: utils.cn(codeCompareVariants({ layout, size }), className),
|
|
389
|
-
style: { height },
|
|
390
|
-
...props,
|
|
391
|
-
children: [
|
|
392
|
-
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between border-b px-4 py-2", children: [
|
|
393
|
-
/* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center gap-4", children: renderFileSelector() }),
|
|
394
|
-
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
|
|
395
|
-
/* @__PURE__ */ jsxRuntime.jsx(tabs.Tabs, { value: view, onValueChange: (value) => setView(value), children: /* @__PURE__ */ jsxRuntime.jsxs(tabs.TabsList, { className: "grid w-full grid-cols-3", children: [
|
|
396
|
-
/* @__PURE__ */ jsxRuntime.jsx(tabs.TabsTrigger, { value: "side-by-side", className: "text-xs", children: "Side by Side" }),
|
|
397
|
-
/* @__PURE__ */ jsxRuntime.jsx(tabs.TabsTrigger, { value: "unified", className: "text-xs", children: "Unified" }),
|
|
398
|
-
/* @__PURE__ */ jsxRuntime.jsx(tabs.TabsTrigger, { value: "three-way", className: "text-xs", children: "Three-way" })
|
|
399
|
-
] }) }),
|
|
400
|
-
showCopyButton && /* @__PURE__ */ jsxRuntime.jsx(
|
|
401
|
-
button.Button,
|
|
402
|
-
{
|
|
403
|
-
variant: "ghost",
|
|
404
|
-
size: "sm",
|
|
405
|
-
onClick: copyComparison,
|
|
406
|
-
className: "h-8 w-8 p-0",
|
|
407
|
-
children: copied ? /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Check, { className: "h-3.5 w-3.5 text-green-500" }) : /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Copy, { className: "h-3.5 w-3.5" })
|
|
408
|
-
}
|
|
409
|
-
),
|
|
410
|
-
/* @__PURE__ */ jsxRuntime.jsxs(dropdownMenu.DropdownMenu, { children: [
|
|
411
|
-
/* @__PURE__ */ jsxRuntime.jsx(dropdownMenu.DropdownMenuTrigger, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(button.Button, { variant: "ghost", size: "sm", className: "h-8 w-8 p-0", children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.MoreHorizontal, { className: "h-3.5 w-3.5" }) }) }),
|
|
412
|
-
/* @__PURE__ */ jsxRuntime.jsxs(dropdownMenu.DropdownMenuContent, { align: "end", children: [
|
|
413
|
-
/* @__PURE__ */ jsxRuntime.jsxs(
|
|
414
|
-
dropdownMenu.DropdownMenuItem,
|
|
415
|
-
{
|
|
416
|
-
onClick: () => setSelectedFiles([]),
|
|
417
|
-
className: "gap-2",
|
|
418
|
-
children: [
|
|
419
|
-
/* @__PURE__ */ jsxRuntime.jsx(lucideReact.RotateCcw, { className: "h-4 w-4" }),
|
|
420
|
-
"Reset Selection"
|
|
421
|
-
]
|
|
422
|
-
}
|
|
423
|
-
),
|
|
424
|
-
/* @__PURE__ */ jsxRuntime.jsxs(dropdownMenu.DropdownMenuItem, { className: "gap-2", children: [
|
|
425
|
-
/* @__PURE__ */ jsxRuntime.jsx(lucideReact.Settings, { className: "h-4 w-4" }),
|
|
426
|
-
"Settings"
|
|
427
|
-
] })
|
|
428
|
-
] })
|
|
429
|
-
] })
|
|
430
|
-
] })
|
|
431
|
-
] }),
|
|
432
|
-
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex-1 min-h-0", children: [
|
|
433
|
-
view === "side-by-side" && renderSideBySide(),
|
|
434
|
-
view === "unified" && renderUnified(),
|
|
435
|
-
view === "three-way" && renderThreeWay()
|
|
436
|
-
] }),
|
|
437
|
-
renderMergeConflicts()
|
|
438
|
-
]
|
|
439
|
-
}
|
|
440
|
-
);
|
|
441
|
-
}
|
|
442
|
-
);
|
|
443
|
-
CodeCompare.displayName = "CodeCompare";
|
|
444
|
-
|
|
445
|
-
exports.CodeCompare = CodeCompare;
|
|
446
|
-
exports.codeCompareVariants = codeCompareVariants;
|
|
5
|
+
`);try{await navigator.clipboard.writeText(e),T(!0),setTimeout(()=>T(!1),2e3);}catch(n){console.error("Failed to copy comparison:",n);}},[i,d]),B=o__namespace.useCallback((e,n)=>{K(a=>({...a,resolved:{...a.resolved,[e]:n}})),S?.(n);},[S]),J=o__namespace.useCallback((e,n)=>{let a=e.content.split(`
|
|
6
|
+
`),s=n.content.split(`
|
|
7
|
+
`),l=0,k=0,R=0,ee=Math.max(a.length,s.length);for(let p=0;p<ee;p++){let D=a[p],L=s[p];D===void 0?l++:L===void 0?k++:D!==L&&R++;}return {added:l,removed:k,modified:R}},[]),Q=m(()=>jsxRuntime.jsx("div",{className:"flex items-center gap-2 flex-wrap",children:i.map((e,n)=>jsxRuntime.jsxs("div",{className:"flex items-center gap-2",children:[jsxRuntime.jsxs(button.Button,{variant:d.includes(e.id)?"default":"outline",size:"sm",onClick:()=>{b(c==="three-way"?a=>a.includes(e.id)?a.filter(s=>s!==e.id):a.length<3?[...a,e.id]:[a[1],a[2],e.id]:a=>a.includes(e.id)?a.filter(s=>s!==e.id):a.length<2?[...a,e.id]:[a[1],e.id]),P?.(e.id);},className:"gap-2",children:[e.label||e.filename,e.version&&jsxRuntime.jsx(badge.Badge,{variant:"secondary",className:"text-xs",children:e.version})]}),n<i.length-1&&c!=="three-way"&&jsxRuntime.jsx("span",{className:"text-muted-foreground",children:"vs"})]},e.id))}),"renderFileSelector"),X=m(()=>{let[e,n]=d.map(s=>i.find(l=>l.id===s)).filter(Boolean);if(!e||!n)return jsxRuntime.jsx("div",{className:"flex items-center justify-center h-32 text-muted-foreground",children:"Select two files to compare"});let a=J(e,n);return jsxRuntime.jsxs("div",{className:"flex flex-col h-full",children:[jsxRuntime.jsx("div",{className:"flex items-center justify-between border-b px-4 py-2 bg-muted/30",children:jsxRuntime.jsxs("div",{className:"flex items-center gap-4",children:[jsxRuntime.jsx("span",{className:"text-sm font-medium",children:"Comparison"}),jsxRuntime.jsxs("div",{className:"flex items-center gap-3 text-xs",children:[jsxRuntime.jsxs("span",{className:"text-green-600",children:["+",a.added]}),jsxRuntime.jsxs("span",{className:"text-red-600",children:["-",a.removed]}),jsxRuntime.jsxs("span",{className:"text-yellow-600",children:["~",a.modified]})]})]})}),jsxRuntime.jsx("div",{className:"flex-1 min-h-0",children:jsxRuntime.jsx(diff.CodeDiff,{oldCode:e.content,newCode:n.content,language:e.language,oldFilename:e.filename,newFilename:n.filename,showLineNumbers:u,showCopyButton:false,maxHeight:"100%",defaultView:"split",className:"border-0 rounded-none h-full"})})]})},"renderSideBySide"),Y=m(()=>{let[e,n]=d.map(a=>i.find(s=>s.id===a)).filter(Boolean);return !e||!n?jsxRuntime.jsx("div",{className:"flex items-center justify-center h-32 text-muted-foreground",children:"Select two files to compare"}):jsxRuntime.jsx(diff.CodeDiff,{oldCode:e.content,newCode:n.content,language:e.language,filename:`${e.filename} \u2192 ${n.filename}`,showLineNumbers:u,showCopyButton:false,maxHeight:"100%",defaultView:"unified",className:"border-0 rounded-none"})},"renderUnified"),Z=m(()=>{let[e,n,a]=d.map(s=>i.find(l=>l.id===s)).filter(Boolean);return !e||!n||!a?jsxRuntime.jsx("div",{className:"flex items-center justify-center h-32 text-muted-foreground",children:"Select three files for three-way merge (base, current, incoming)"}):jsxRuntime.jsxs("div",{className:"grid grid-cols-3 gap-0 h-full",children:[jsxRuntime.jsxs("div",{className:"border-r",children:[jsxRuntime.jsx("div",{className:"border-b px-4 py-2 bg-muted/30",children:jsxRuntime.jsxs("span",{className:"text-sm font-medium",children:["Base (",e.filename,")"]})}),jsxRuntime.jsx(scrollArea.ScrollArea,{className:"h-full",ref:s=>{g.current.base=s;},onScrollCapture:s=>{let l=s.target;N("base",l.scrollTop);},children:jsxRuntime.jsx(snippet.CodeSnippet,{code:e.content,language:e.language,showLineNumbers:u,showCopyButton:false,showHeader:false,className:"border-0 rounded-none"})})]}),jsxRuntime.jsxs("div",{className:"border-r",children:[jsxRuntime.jsx("div",{className:"border-b px-4 py-2 bg-blue-500/10",children:jsxRuntime.jsxs("span",{className:"text-sm font-medium text-blue-600 dark:text-blue-400",children:["Current (",n.filename,")"]})}),jsxRuntime.jsx(scrollArea.ScrollArea,{className:"h-full",ref:s=>{g.current.current=s;},onScrollCapture:s=>{let l=s.target;N("current",l.scrollTop);},children:jsxRuntime.jsx(snippet.CodeSnippet,{code:n.content,language:n.language,showLineNumbers:u,showCopyButton:false,showHeader:false,className:"border-0 rounded-none"})})]}),jsxRuntime.jsxs("div",{children:[jsxRuntime.jsx("div",{className:"border-b px-4 py-2 bg-green-500/10",children:jsxRuntime.jsxs("span",{className:"text-sm font-medium text-green-600 dark:text-green-400",children:["Incoming (",a.filename,")"]})}),jsxRuntime.jsx(scrollArea.ScrollArea,{className:"h-full",ref:s=>{g.current.incoming=s;},onScrollCapture:s=>{let l=s.target;N("incoming",l.scrollTop);},children:jsxRuntime.jsx(snippet.CodeSnippet,{code:a.content,language:a.language,showLineNumbers:u,showCopyButton:false,showHeader:false,className:"border-0 rounded-none"})})]})]})},"renderThreeWay"),_=m(()=>!A||h.conflicts.length===0?null:jsxRuntime.jsx("div",{className:"border-t bg-muted/30",children:jsxRuntime.jsxs("div",{className:"px-4 py-2",children:[jsxRuntime.jsxs("div",{className:"flex items-center justify-between",children:[jsxRuntime.jsx("span",{className:"text-sm font-medium",children:"Merge Conflicts"}),jsxRuntime.jsx(badge.Badge,{variant:"destructive",className:"text-xs",children:h.conflicts.length})]}),jsxRuntime.jsx("div",{className:"mt-2 space-y-2",children:h.conflicts.map((e,n)=>jsxRuntime.jsxs("div",{className:"flex items-center gap-2 text-xs",children:[jsxRuntime.jsxs("span",{children:["Lines ",e.startLine,"-",e.endLine]}),jsxRuntime.jsxs("div",{className:"flex gap-1",children:[jsxRuntime.jsx(button.Button,{variant:"outline",size:"sm",onClick:()=>B(n,"current"),className:"h-6 text-xs",children:"Keep Current"}),jsxRuntime.jsx(button.Button,{variant:"outline",size:"sm",onClick:()=>B(n,"incoming"),className:"h-6 text-xs",children:"Accept Incoming"})]})]},n))})]})}),"renderMergeConflicts");return jsxRuntime.jsxs("div",{ref:q,className:utils.cn(ge({layout:x,size:V}),v),style:{height:$},...U,children:[jsxRuntime.jsxs("div",{className:"flex items-center justify-between border-b px-4 py-2",children:[jsxRuntime.jsx("div",{className:"flex items-center gap-4",children:Q()}),jsxRuntime.jsxs("div",{className:"flex items-center gap-2",children:[jsxRuntime.jsx(tabs.Tabs,{value:c,onValueChange:e=>G(e),children:jsxRuntime.jsxs(tabs.TabsList,{className:"grid w-full grid-cols-3",children:[jsxRuntime.jsx(tabs.TabsTrigger,{value:"side-by-side",className:"text-xs",children:"Side by Side"}),jsxRuntime.jsx(tabs.TabsTrigger,{value:"unified",className:"text-xs",children:"Unified"}),jsxRuntime.jsx(tabs.TabsTrigger,{value:"three-way",className:"text-xs",children:"Three-way"})]})}),E&&jsxRuntime.jsx(button.Button,{variant:"ghost",size:"sm",onClick:W,className:"h-8 w-8 p-0",children:O?jsxRuntime.jsx(lucideReact.Check,{className:"h-3.5 w-3.5 text-green-500"}):jsxRuntime.jsx(lucideReact.Copy,{className:"h-3.5 w-3.5"})}),jsxRuntime.jsxs(dropdownMenu.DropdownMenu,{children:[jsxRuntime.jsx(dropdownMenu.DropdownMenuTrigger,{asChild:true,children:jsxRuntime.jsx(button.Button,{variant:"ghost",size:"sm",className:"h-8 w-8 p-0",children:jsxRuntime.jsx(lucideReact.MoreHorizontal,{className:"h-3.5 w-3.5"})})}),jsxRuntime.jsxs(dropdownMenu.DropdownMenuContent,{align:"end",children:[jsxRuntime.jsxs(dropdownMenu.DropdownMenuItem,{onClick:()=>b([]),className:"gap-2",children:[jsxRuntime.jsx(lucideReact.RotateCcw,{className:"h-4 w-4"}),"Reset Selection"]}),jsxRuntime.jsxs(dropdownMenu.DropdownMenuItem,{className:"gap-2",children:[jsxRuntime.jsx(lucideReact.Settings,{className:"h-4 w-4"}),"Settings"]})]})]})]})]}),jsxRuntime.jsxs("div",{className:"flex-1 min-h-0",children:[c==="side-by-side"&&X(),c==="unified"&&Y(),c==="three-way"&&Z()]}),_()]})});pe.displayName="CodeCompare";exports.CodeCompare=pe;exports.codeCompareVariants=ge;
|