diff --git a/src/utils/attribution-manager-helpers.js b/src/utils/attribution-manager-helpers.js index fc9d44ee..816074f5 100644 --- a/src/utils/attribution-manager-helpers.js +++ b/src/utils/attribution-manager-helpers.js @@ -4,9 +4,9 @@ import { ObservableV2 } from 'lib0/observable' export const attributionJsonSchema = s.$object({ insert: s.$array(s.$string).optional, - insertedAt: s.$number.optional, + insertAt: s.$number.optional, delete: s.$array(s.$string).optional, - deletedAt: s.$number.optional, + deleteAt: s.$number.optional, format: s.$record(s.$string, s.$array(s.$string)).optional, formatAt: s.$number.optional }) diff --git a/src/ytype.js b/src/ytype.js index 143a83b8..ab79c2fe 100644 --- a/src/ytype.js +++ b/src/ytype.js @@ -1036,13 +1036,13 @@ export class YType { } else { const by = changedAttributedAttributes[key] = (changedAttributedAttributes[key]?.slice() ?? []) by.push(...((c.deleted ? attribution.delete : attribution.insert) ?? [])) - const attributedAt = (c.deleted ? attribution.deletedAt : attribution.insertedAt) + const attributedAt = (c.deleted ? attribution.deleteAt : attribution.insertAt) if (attributedAt) formattingAttribution.formatAt = attributedAt } if (object.isEmpty(changedAttributedAttributes)) { d.useAttribution(null) } else if (attribution != null) { - const attributedAt = (c.deleted ? attribution.deletedAt : attribution.insertedAt) + const attributedAt = (c.deleted ? attribution.deleteAt : attribution.insertAt) if (attributedAt != null) formattingAttribution.formatAt = attributedAt d.useAttribution(formattingAttribution) } diff --git a/tests/y-array.tests.js b/tests/y-array.tests.js index 30e94b80..dc87491e 100644 --- a/tests/y-array.tests.js +++ b/tests/y-array.tests.js @@ -470,7 +470,7 @@ export const testAttributedContent = _tc => { let attributionManager = Y.noAttributionsManager ydoc.on('afterTransaction', tr => { - // attributionManager = new TwosetAttributionManager(createIdMapFromIdSet(tr.insertSet, [new Y.Attribution('insertedAt', 42), new Y.Attribution('insert', 'kevin')]), createIdMapFromIdSet(tr.deleteSet, [new Y.Attribution('delete', 'kevin')])) + // attributionManager = new TwosetAttributionManager(createIdMapFromIdSet(tr.insertSet, [new Y.Attribution('insertAt', 42), new Y.Attribution('insert', 'kevin')]), createIdMapFromIdSet(tr.deleteSet, [new Y.Attribution('delete', 'kevin')])) attributionManager = new Y.TwosetAttributionManager(Y.createIdMapFromIdSet(tr.insertSet, []), Y.createIdMapFromIdSet(tr.deleteSet, [])) }) t.group('insert / delete', () => { diff --git a/tests/y-map.tests.js b/tests/y-map.tests.js index cb97105d..06c76ead 100644 --- a/tests/y-map.tests.js +++ b/tests/y-map.tests.js @@ -553,7 +553,7 @@ export const testAttributedContent = _tc => { let attributionManager = noAttributionsManager ydoc.on('afterTransaction', tr => { - // attributionManager = new TwosetAttributionManager(createIdMapFromIdSet(tr.insertSet, [new Y.Attribution('insertedAt', 42), new Y.Attribution('insert', 'kevin')]), createIdMapFromIdSet(tr.deleteSet, [new Y.Attribution('delete', 'kevin')])) + // attributionManager = new TwosetAttributionManager(createIdMapFromIdSet(tr.insertSet, [new Y.Attribution('insertAt', 42), new Y.Attribution('insert', 'kevin')]), createIdMapFromIdSet(tr.deleteSet, [new Y.Attribution('delete', 'kevin')])) attributionManager = new TwosetAttributionManager(createIdMapFromIdSet(tr.insertSet, []), createIdMapFromIdSet(tr.deleteSet, [])) }) t.group('initial value', () => { diff --git a/tests/y-text.tests.js b/tests/y-text.tests.js index b7c073a1..20dffe12 100644 --- a/tests/y-text.tests.js +++ b/tests/y-text.tests.js @@ -1903,7 +1903,7 @@ export const testAttributedContent = _tc => { let attributionManager = noAttributionsManager ydoc.on('afterTransaction', tr => { - // attributionManager = new TwosetAttributionManager(createIdMapFromIdSet(tr.insertSet, [new Y.Attribution('insertedAt', 42), new Y.Attribution('insert', 'kevin')]), createIdMapFromIdSet(tr.deleteSet, [new Y.Attribution('delete', 'kevin')])) + // attributionManager = new TwosetAttributionManager(createIdMapFromIdSet(tr.insertSet, [new Y.Attribution('insertAt', 42), new Y.Attribution('insert', 'kevin')]), createIdMapFromIdSet(tr.deleteSet, [new Y.Attribution('delete', 'kevin')])) attributionManager = new TwosetAttributionManager(createIdMapFromIdSet(tr.insertSet, []), createIdMapFromIdSet(tr.deleteSet, [])) }) t.group('insert / delete / format', () => { diff --git a/tests/y-xml.tests.js b/tests/y-xml.tests.js index 5cfaa94a..4cdbb936 100644 --- a/tests/y-xml.tests.js +++ b/tests/y-xml.tests.js @@ -141,7 +141,7 @@ export const testFragmentAttributedContent = _tc => { ydoc.get().insert(0, [yfragment]) let attributionManager = Y.noAttributionsManager ydoc.on('afterTransaction', tr => { - // attributionManager = new TwosetAttributionManager(createIdMapFromIdSet(tr.insertSet, [new Y.Attribution('insertedAt', 42), new Y.Attribution('insert', 'kevin')]), createIdMapFromIdSet(tr.deleteSet, [new Y.Attribution('delete', 'kevin')])) + // attributionManager = new TwosetAttributionManager(createIdMapFromIdSet(tr.insertSet, [new Y.Attribution('insertAt', 42), new Y.Attribution('insert', 'kevin')]), createIdMapFromIdSet(tr.deleteSet, [new Y.Attribution('delete', 'kevin')])) attributionManager = new Y.TwosetAttributionManager(Y.createIdMapFromIdSet(tr.insertSet, []), Y.createIdMapFromIdSet(tr.deleteSet, [])) }) t.group('insert / delete', () => { @@ -169,7 +169,7 @@ export const testElementAttributedContent = _tc => { yelement.insert(0, [elem1, elem2]) let attributionManager = Y.noAttributionsManager ydoc.on('afterTransaction', tr => { - // attributionManager = new TwosetAttributionManager(createIdMapFromIdSet(tr.insertSet, [new Y.Attribution('insertedAt', 42), new Y.Attribution('insert', 'kevin')]), createIdMapFromIdSet(tr.deleteSet, [new Y.Attribution('delete', 'kevin')])) + // attributionManager = new TwosetAttributionManager(createIdMapFromIdSet(tr.insertSet, [new Y.Attribution('insertAt', 42), new Y.Attribution('insert', 'kevin')]), createIdMapFromIdSet(tr.deleteSet, [new Y.Attribution('delete', 'kevin')])) attributionManager = new Y.TwosetAttributionManager(Y.createIdMapFromIdSet(tr.insertSet, []), Y.createIdMapFromIdSet(tr.deleteSet, [])) }) t.group('insert / delete', () => {