Skip to content

Commit

Permalink
fix: Pass diffConfig to options in CodeMirrorMerge component
Browse files Browse the repository at this point in the history
  • Loading branch information
snelsi committed Feb 3, 2025
1 parent 5fb6ebc commit 244a76d
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion merge/src/Internal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,21 @@ export const Internal = React.forwardRef<InternalRef, CodeMirrorMergeProps>((pro
collapseUnchanged,
destroyRerender = true,
renderRevertControl,
diffConfig,
...elmProps
} = props;
const { modified, modifiedExtension, original, originalExtension, theme, dispatch, ...otherStore } = useStore();
const editor = useRef<HTMLDivElement>(null);
const view = useRef<MergeView>();
const opts = { orientation, revertControls, highlightChanges, gutter, collapseUnchanged, renderRevertControl };
const opts = {
orientation,
revertControls,
highlightChanges,
gutter,
collapseUnchanged,
renderRevertControl,
diffConfig,
};

useImperativeHandle(
ref,
Expand Down

0 comments on commit 244a76d

Please sign in to comment.