Skip to content
Snippets Groups Projects
Commit ad4e9a41 authored by chris's avatar chris
Browse files

fix range

parent 9fd92d0d
No related branches found
No related tags found
1 merge request!543pass viewId
......@@ -28,12 +28,11 @@ const acceptTrackChange = (
tr,
selection: { from },
} = state;
let {
selection: { to },
} = state;
let { to } = activeTrackChange;
if (trackData?.node?.type?.name === 'figure') {
to = from + 3;
to = activeTrackChange.from + 3;
}
tr.setMeta('AcceptReject', true);
......
......@@ -33,18 +33,17 @@ const rejectTrackChange = (
tr,
selection: { from },
} = state;
let {
selection: { to },
} = state;
let { to } = activeTrackChange;
if (trackData?.node?.type?.name === 'figure') {
to = from + 3;
to = activeTrackChange.from + 3;
}
console.log('reject');
console.log(activeTrackChange, trackData);
tr.setMeta('AcceptReject', true);
const map = new Mapping();
state.doc.nodesBetween(from, to, (node, pos) => {
state.doc.nodesBetween(activeTrackChange.from, to, (node, pos) => {
if (node.marks && node.marks.find(mark => mark.type.name === 'deletion')) {
const deletionMark = node.marks.find(
mark => mark.type.name === 'deletion',
......@@ -59,15 +58,19 @@ const rejectTrackChange = (
deletionMark,
),
);
} else if (
}
if (
node.attrs.track &&
node.attrs.track.find(track => track.type === 'insertion')
) {
removeNode(tr, node, pos, map);
} else if (
node.marks &&
node.marks.find(mark => mark.type.name === 'insertion')
node.attrs.track &&
node.attrs.track.find(track => track.type === 'deletion')
) {
console.log('remove track attrs');
}
if (node.marks && node.marks.find(mark => mark.type.name === 'insertion')) {
const insertionMark = node.marks.find(
mark => mark.type.name === 'insertion',
);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment