Skip to content

Commit a95fb47

Browse files
authoredFeb 4, 2025··
fix: Pass diffConfig to options in CodeMirrorMerge component (#712)
1 parent 5fb6ebc commit a95fb47

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed
 

‎merge/src/Internal.tsx

+10-1
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,21 @@ export const Internal = React.forwardRef<InternalRef, CodeMirrorMergeProps>((pro
2424
collapseUnchanged,
2525
destroyRerender = true,
2626
renderRevertControl,
27+
diffConfig,
2728
...elmProps
2829
} = props;
2930
const { modified, modifiedExtension, original, originalExtension, theme, dispatch, ...otherStore } = useStore();
3031
const editor = useRef<HTMLDivElement>(null);
3132
const view = useRef<MergeView>();
32-
const opts = { orientation, revertControls, highlightChanges, gutter, collapseUnchanged, renderRevertControl };
33+
const opts = {
34+
orientation,
35+
revertControls,
36+
highlightChanges,
37+
gutter,
38+
collapseUnchanged,
39+
renderRevertControl,
40+
diffConfig,
41+
};
3342

3443
useImperativeHandle(
3544
ref,

0 commit comments

Comments
 (0)
Please sign in to comment.