|
@@ -44,7 +44,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
|
|
|
const [codeMirrorRef, setCodeMirrorRef] = useState<HTMLDivElement | null>(null);
|
|
const [codeMirrorRef, setCodeMirrorRef] = useState<HTMLDivElement | null>(null);
|
|
|
const [uncontrolledCodeMirror, setUncontrolledCodeMirror] = useState<Ref<UncontrolledCodeMirrorCore>>(null);
|
|
const [uncontrolledCodeMirror, setUncontrolledCodeMirror] = useState<Ref<UncontrolledCodeMirrorCore>>(null);
|
|
|
|
|
|
|
|
- const uncontrolledRef = useCallback((cm) => { setUncontrolledCodeMirror(cm) }, []);
|
|
|
|
|
|
|
+ // const uncontrolledRef = useCallback((cm) => { setUncontrolledCodeMirror(cm) }, []);
|
|
|
|
|
|
|
|
const { pageContainer, editorContainer, appContainer } = props;
|
|
const { pageContainer, editorContainer, appContainer } = props;
|
|
|
|
|
|
|
@@ -95,7 +95,8 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
|
|
|
const onResolveConflict = async() : Promise<void> => {
|
|
const onResolveConflict = async() : Promise<void> => {
|
|
|
// disable button after clicked
|
|
// disable button after clicked
|
|
|
setIsRevisionSelected(false);
|
|
setIsRevisionSelected(false);
|
|
|
- console.log(uncontrolledCodeMirror);
|
|
|
|
|
|
|
+ console.log(uncontrolledCodeMirror.editor.doc.getValue());
|
|
|
|
|
+ // console.log(uncontrolledCodeMirror.editor.doc.getValue());
|
|
|
editorContainer.disableUnsavedWarning();
|
|
editorContainer.disableUnsavedWarning();
|
|
|
try {
|
|
try {
|
|
|
await pageContainer.resolveConflictAndReload(
|
|
await pageContainer.resolveConflictAndReload(
|