react-monaco-json-merge 1.1.16 → 1.2.0

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.
Files changed (11) hide show
  1. package/dist/components/editor.d.ts.map +1 -1
  2. package/dist/index.cjs +30 -30
  3. package/dist/index.cjs.map +1 -1
  4. package/dist/index.d.ts +1 -1
  5. package/dist/index.d.ts.map +1 -1
  6. package/dist/index.mjs +1041 -998
  7. package/dist/index.mjs.map +1 -1
  8. package/dist/style.css +1 -1
  9. package/dist/types/index.d.ts +7 -1
  10. package/dist/types/index.d.ts.map +1 -1
  11. package/package.json +1 -1
package/dist/style.css CHANGED
@@ -1 +1 @@
1
- .monaco-diff-editor .monaco-editor .codicon-diff-insert,.monaco-diff-editor .monaco-editor .codicon-diff-remove{left:44px!important;right:initial!important}.monaco-diff-editor.side-by-side .monaco-editor .codicon-diff-remove{left:62px!important}.monaco-diff-editor .lightbulb-glyph,.monaco-diff-editor .codicon-lightbulb,.monaco-diff-editor .lightBulbWidget{display:none!important}.monaco-editor .conflict-issue-line.conflict-issue-error{background-color:#ff00001a}.monaco-editor .conflict-issue-line.conflict-issue-warning{background-color:#ffaa001a}.monaco-editor .conflict-issue-line.conflict-issue-smart-merge{background-color:#0096ff1a}.monaco-editor.vs .conflict-issue-line.conflict-issue-error{background-color:#ff00000d}.monaco-editor.vs .conflict-issue-line.conflict-issue-warning{background-color:#ff88000d}.monaco-editor.vs .conflict-issue-line.conflict-issue-smart-merge{background-color:#0078d40d}
1
+ .monaco-diff-editor .monaco-editor .codicon-diff-insert,.monaco-diff-editor .monaco-editor .codicon-diff-remove{left:44px!important;right:initial!important}.monaco-diff-editor.side-by-side .monaco-editor .codicon-diff-remove{left:62px!important}.monaco-diff-editor .lightbulb-glyph,.monaco-diff-editor .codicon-lightbulb,.monaco-diff-editor .lightBulbWidget{display:none!important}.monaco-editor .conflict-issue-line.conflict-issue-error{background-color:#ff00001a}.monaco-editor .conflict-issue-line.conflict-issue-warning{background-color:#ffaa001a}.monaco-editor .conflict-issue-line.conflict-issue-smart-merge{background-color:#0096ff1a}.monaco-editor.vs .conflict-issue-line.conflict-issue-error{background-color:#ff00000d}.monaco-editor.vs .conflict-issue-line.conflict-issue-warning{background-color:#ff88000d}.monaco-editor.vs .conflict-issue-line.conflict-issue-smart-merge{background-color:#0078d40d}.column-collapse-icon{display:flex;align-items:center;justify-content:center;width:16px;height:16px;min-width:16px;min-height:16px;flex-shrink:0;border-radius:2px;cursor:pointer;-webkit-user-select:none;user-select:none;color:inherit;opacity:.6;transition:opacity .15s,background-color .15s,transform .2s ease;writing-mode:horizontal-tb!important;text-orientation:initial!important}.column-collapse-icon:hover{opacity:1;background-color:#80808040}.column-collapse-icon--disabled{opacity:.15;pointer-events:none;cursor:default}
package/dist/types/index.d.ts CHANGED
@@ -51,6 +51,12 @@ export interface ResolutionInfo {
51
51
  warnings?: string[];
52
52
  conflictIssues?: ConflictIssue[];
53
53
  }
54
+ export interface EditorRefs {
55
+ input1: monaco.editor.IStandaloneCodeEditor;
56
+ input2: monaco.editor.IStandaloneCodeEditor;
57
+ base: monaco.editor.IStandaloneCodeEditor | null;
58
+ result: monaco.editor.IStandaloneCodeEditor | null;
59
+ }
54
60
  export interface EditorDiffMergeProps {
55
61
  original?: string;
56
62
  modified?: string;
@@ -61,7 +67,7 @@ export interface EditorDiffMergeProps {
61
67
  className?: string;
62
68
  loading?: React.ReactNode;
63
69
  options?: monaco.editor.IStandaloneEditorConstructionOptions;
64
- onMount?: (editor: monaco.editor.IStandaloneDiffEditor, monaco: typeof import("monaco-editor")) => void;
70
+ onMount?: (editors: EditorRefs, monaco: typeof import("monaco-editor")) => void;
65
71
  onMergeResolve?: (content: string, resolution?: ResolutionInfo) => void;
66
72
  showResultColumn?: boolean;
67
73
  baseIndex?: 0 | 1 | 2;
package/dist/types/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-monaco-json-merge",
3
- "version": "1.1.16",
3
+ "version": "1.2.0",
4
4
  "description": "A powerful React component for 3-way JSON merging with semantic comparison, built on Monaco Editor. Features schema-aware conflict detection, interactive resolution, and real-time validation.",
5
5
  "type": "module",
6
6
  "author": "Kirill Ivanov <v.b.ingram@gmail.com>",