diff --git a/src/component/handlers/edit/__tests__/__snapshots__/editOnBeforeInput-test.js.snap b/src/component/handlers/edit/__tests__/__snapshots__/editOnBeforeInput-test.js.snap index 52693c2c15..3e56568d91 100644 --- a/src/component/handlers/edit/__tests__/__snapshots__/editOnBeforeInput-test.js.snap +++ b/src/component/handlers/edit/__tests__/__snapshots__/editOnBeforeInput-test.js.snap @@ -6,7 +6,9 @@ Immutable.Record { "__add": [Function], "__create": [Function], "__get": [Function], + "__getAll": [Function], "__getLastCreatedEntityKey": [Function], + "__loadWithEntities": [Function], "__mergeData": [Function], "__replaceData": [Function], "add": [Function], diff --git a/src/model/encoding/__tests__/__snapshots__/convertFromDraftStateToRaw-test.js.snap b/src/model/encoding/__tests__/__snapshots__/convertFromDraftStateToRaw-test.js.snap index 6dd517e194..bf76dff7d1 100644 --- a/src/model/encoding/__tests__/__snapshots__/convertFromDraftStateToRaw-test.js.snap +++ b/src/model/encoding/__tests__/__snapshots__/convertFromDraftStateToRaw-test.js.snap @@ -163,12 +163,12 @@ Object { "offset": 0, }, Object { - "key": 0, + "key": 1, "length": 5, "offset": 6, }, Object { - "key": 1, + "key": 2, "length": 5, "offset": 12, }, @@ -207,28 +207,28 @@ Object { "entityMap": Object { "0": Object { "data": Object { - "url": "www.2.com", + "url": "www.3.com", }, "mutability": "IMMUTABLE", "type": "LINK", }, "1": Object { "data": Object { - "url": "www.3.com", + "url": "www.4.com", }, "mutability": "IMMUTABLE", "type": "LINK", }, "2": Object { "data": Object { - "url": "www.4.com", + "url": "www.5.com", }, "mutability": "IMMUTABLE", "type": "LINK", }, "3": Object { "data": Object { - "url": "www.5.com", + "url": "www.6.com", }, "mutability": "IMMUTABLE", "type": "LINK", diff --git a/src/model/encoding/__tests__/__snapshots__/convertFromHTMLToContentBlocks-test.js.snap b/src/model/encoding/__tests__/__snapshots__/convertFromHTMLToContentBlocks-test.js.snap index b1540ac35c..1ea59dd0ce 100644 --- a/src/model/encoding/__tests__/__snapshots__/convertFromHTMLToContentBlocks-test.js.snap +++ b/src/model/encoding/__tests__/__snapshots__/convertFromHTMLToContentBlocks-test.js.snap @@ -808,81 +808,81 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, ], diff --git a/src/model/encoding/__tests__/__snapshots__/convertFromRawToDraftState-test.js.snap b/src/model/encoding/__tests__/__snapshots__/convertFromRawToDraftState-test.js.snap index afc25b8a64..a521e9717a 100644 --- a/src/model/encoding/__tests__/__snapshots__/convertFromRawToDraftState-test.js.snap +++ b/src/model/encoding/__tests__/__snapshots__/convertFromRawToDraftState-test.js.snap @@ -715,31 +715,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], diff --git a/src/model/encoding/__tests__/convertFromDraftStateToRaw-test.js b/src/model/encoding/__tests__/convertFromDraftStateToRaw-test.js index 3a7e419b32..683361421a 100644 --- a/src/model/encoding/__tests__/convertFromDraftStateToRaw-test.js +++ b/src/model/encoding/__tests__/convertFromDraftStateToRaw-test.js @@ -11,6 +11,9 @@ 'use strict'; +const mockUUID = require('mockUUID'); +jest.mock('uuid', () => jest.fn(mockUUID)); + const BlockMapBuilder = require('BlockMapBuilder'); const CharacterMetadata = require('CharacterMetadata'); const ContentBlock = require('ContentBlock'); @@ -69,38 +72,38 @@ const getLink = entityKey => url: `www.${entityKey}.com`, }, }); -// We start numbering our entities with '2' because getSampleStateForTesting -// already created an entity with key '1'. +// We start numbering our entities with '3' because getSampleStateForTesting +// already created an entity with key '2'. const contentStateWithNonContiguousEntities = ContentState.createFromBlockArray( [ new ContentBlock({ key: 'a', type: 'unstyled', text: 'link2 link2 link3', - characterList: getMetadata('2') + characterList: getMetadata('3') .toList() .push(CharacterMetadata.EMPTY) - .concat(getMetadata('2')) + .concat(getMetadata('4')) .push(CharacterMetadata.EMPTY) - .concat(getMetadata('3')), + .concat(getMetadata('5')), }), new ContentBlock({ key: 'b', type: 'unstyled', text: 'link4 link2 link5', - characterList: getMetadata('4') + characterList: getMetadata('5') .toList() .push(CharacterMetadata.EMPTY) - .concat(getMetadata('2')) + .concat(getMetadata('3')) .push(CharacterMetadata.EMPTY) - .concat(getMetadata('5')), + .concat(getMetadata('6')), }), ], ) - .addEntity(getLink('2')) .addEntity(getLink('3')) .addEntity(getLink('4')) - .addEntity(getLink('5')); + .addEntity(getLink('5')) + .addEntity(getLink('6')); const assertConvertFromDraftStateToRaw = content => { expect(convertFromDraftStateToRaw(content)).toMatchSnapshot(); diff --git a/src/model/encoding/__tests__/convertFromHTMLToContentBlocks-test.js b/src/model/encoding/__tests__/convertFromHTMLToContentBlocks-test.js index 95b14118a1..1747b5a887 100644 --- a/src/model/encoding/__tests__/convertFromHTMLToContentBlocks-test.js +++ b/src/model/encoding/__tests__/convertFromHTMLToContentBlocks-test.js @@ -20,6 +20,7 @@ const DefaultDraftBlockRenderMap = require('DefaultDraftBlockRenderMap'); const convertFromHTMLToContentBlocks = require('convertFromHTMLToContentBlocks'); const cx = require('cx'); const getSafeBodyFromHTML = require('getSafeBodyFromHTML'); +const mockUUID = require('mockUUID'); const DEFAULT_CONFIG = { DOMBuilder: getSafeBodyFromHTML, @@ -71,6 +72,7 @@ const toggleExperimentalTreeDataSupport = enabled => { beforeEach(() => { jest.resetModules(); + jest.mock('uuid', () => mockUUID); }); const convertFromHTML = (html_string, config) => { diff --git a/src/model/encoding/__tests__/convertFromRawToDraftState-test.js b/src/model/encoding/__tests__/convertFromRawToDraftState-test.js index f0c9b50a57..1995dd56d0 100644 --- a/src/model/encoding/__tests__/convertFromRawToDraftState-test.js +++ b/src/model/encoding/__tests__/convertFromRawToDraftState-test.js @@ -13,6 +13,7 @@ jest.mock('generateRandomKey'); const convertFromRawToDraftState = require('convertFromRawToDraftState'); +const mockUUID = require('mockUUID'); const toggleExperimentalTreeDataSupport = enabled => { jest.doMock('gkx', () => name => { @@ -30,6 +31,7 @@ const assertDraftState = rawState => { beforeEach(() => { jest.resetModules(); + jest.mock('uuid', () => mockUUID); }); test('must map falsey block types to default value of unstyled', () => { diff --git a/src/model/entity/DraftEntity.js b/src/model/entity/DraftEntity.js index 460381555d..227423b409 100644 --- a/src/model/entity/DraftEntity.js +++ b/src/model/entity/DraftEntity.js @@ -16,11 +16,12 @@ const DraftEntityInstance = require('DraftEntityInstance'); const Immutable = require('immutable'); const invariant = require('invariant'); +const uuid = require('uuid'); const {Map} = Immutable; let instances: Map = Map(); -let instanceKey = 0; +let instanceKey: string = uuid(); /** * Temporary utility for generating the warnings @@ -52,6 +53,8 @@ export type DraftEntityMapObject = { key: string, newData: {[key: string]: any, ...}, ) => DraftEntityInstance, + __loadWithEntities: (entities: Map) => void, + __getAll: () => Map, __getLastCreatedEntityKey: () => string, __create: ( type: DraftEntityType, @@ -143,6 +146,21 @@ const DraftEntity: DraftEntityMapObject = { return DraftEntity.__get(key); }, + /** + * Get all the entities in the content state. + */ + __getAll(): Map { + return instances; + }, + + /** + * Load the entity map with the given set of entities. + */ + __loadWithEntities(entities: Map): void { + instances = entities; + instanceKey = uuid(); + }, + /** * WARNING: This method will be deprecated soon! * Please use 'contentState.mergeEntityData' instead. @@ -182,8 +200,8 @@ const DraftEntity: DraftEntityMapObject = { * We need this to support the new API, as part of transitioning to put Entity * storage in contentState. */ - __getLastCreatedEntityKey: function(): string { - return '' + instanceKey; + __getLastCreatedEntityKey(): string { + return instanceKey; }, /** @@ -207,10 +225,10 @@ const DraftEntity: DraftEntityMapObject = { * Add an existing DraftEntityInstance to the DraftEntity map. This is * useful when restoring instances from the server. */ - __add: function(instance: DraftEntityInstance): string { - const key = '' + ++instanceKey; - instances = instances.set(key, instance); - return key; + __add(instance: DraftEntityInstance): string { + instanceKey = uuid(); + instances = instances.set(instanceKey, instance); + return instanceKey; }, /** diff --git a/src/model/entity/__tests__/__snapshots__/getEntityKeyForSelection-test.js.snap b/src/model/entity/__tests__/__snapshots__/getEntityKeyForSelection-test.js.snap index 067619bd96..a1c8366571 100644 --- a/src/model/entity/__tests__/__snapshots__/getEntityKeyForSelection-test.js.snap +++ b/src/model/entity/__tests__/__snapshots__/getEntityKeyForSelection-test.js.snap @@ -10,9 +10,9 @@ exports[`must not return key if segmented 1`] = `null`; exports[`must not return key if segmented with collapsed selection 1`] = `null`; -exports[`must return key if mutable 1`] = `"1"`; +exports[`must return key if mutable 1`] = `"2"`; -exports[`must return key if mutable with collapsed selection 1`] = `"1"`; +exports[`must return key if mutable with collapsed selection 1`] = `"2"`; exports[`must return null at start of block with collapsed selection 1`] = `null`; diff --git a/src/model/immutable/ContentState.js b/src/model/immutable/ContentState.js index 650aa97f65..9075b9dcd6 100644 --- a/src/model/immutable/ContentState.js +++ b/src/model/immutable/ContentState.js @@ -16,6 +16,7 @@ import type {BlockNodeRecord} from 'BlockNodeRecord'; import type DraftEntityInstance from 'DraftEntityInstance'; import type {DraftEntityMutability} from 'DraftEntityMutability'; import type {DraftEntityType} from 'DraftEntityType'; +import type {Map} from 'immutable'; const BlockMapBuilder = require('BlockMapBuilder'); const CharacterMetadata = require('CharacterMetadata'); @@ -174,6 +175,14 @@ class ContentState extends ContentStateRecord { return DraftEntity.__get(key); } + getAllEntities(): Map { + return DraftEntity.__getAll(); + } + + loadWithEntities(entities: Map): void { + return DraftEntity.__loadWithEntities(entities); + } + static createFromBlockArray( // TODO: update flow type when we completely deprecate the old entity API blocks: diff --git a/src/model/keys/mockUUID.js b/src/model/keys/mockUUID.js new file mode 100644 index 0000000000..c6d40f93af --- /dev/null +++ b/src/model/keys/mockUUID.js @@ -0,0 +1,20 @@ +/** + * Copyright (c) Facebook, Inc. and its affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @format + * @emails oncall+draft_js + * @flow strict-local + */ + +'use strict'; + +let counter = 0; + +function mockUUID(): string { + return '' + ++counter; +} + +module.exports = mockUUID; diff --git a/src/model/modifier/__tests__/AtomicBlockUtils-test.js b/src/model/modifier/__tests__/AtomicBlockUtils-test.js index b0334eb918..484729fb76 100644 --- a/src/model/modifier/__tests__/AtomicBlockUtils-test.js +++ b/src/model/modifier/__tests__/AtomicBlockUtils-test.js @@ -13,6 +13,8 @@ jest.mock('generateRandomKey'); +const mockUUID = require('mockUUID'); +jest.mock('uuid', () => mockUUID); const AtomicBlockUtils = require('AtomicBlockUtils'); const BlockMapBuilder = require('BlockMapBuilder'); const ContentBlockNode = require('ContentBlockNode'); @@ -84,6 +86,7 @@ const assertMoveAtomicBlock = ( beforeEach(() => { jest.resetModules(); + jest.mock('uuid', () => mockUUID); }); test('must insert atomic at start of block with collapsed seletion', () => { diff --git a/src/model/modifier/__tests__/__snapshots__/AtomicBlockUtils-test.js.snap b/src/model/modifier/__tests__/__snapshots__/AtomicBlockUtils-test.js.snap index 3fcf6e285b..64c327c6a2 100644 --- a/src/model/modifier/__tests__/__snapshots__/AtomicBlockUtils-test.js.snap +++ b/src/model/modifier/__tests__/__snapshots__/AtomicBlockUtils-test.js.snap @@ -17,7 +17,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -108,7 +108,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -256,7 +256,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -307,7 +307,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -328,31 +328,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -485,7 +485,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -506,31 +506,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -650,7 +650,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -684,31 +684,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -828,7 +828,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -870,31 +870,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -1023,7 +1023,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -1138,7 +1138,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -1172,31 +1172,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -1325,7 +1325,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -1359,31 +1359,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -1503,7 +1503,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -1545,31 +1545,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -1718,31 +1718,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -1849,7 +1849,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -1875,7 +1875,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -1917,31 +1917,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -2090,31 +2090,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -2221,7 +2221,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -2247,7 +2247,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -2289,31 +2289,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -2462,31 +2462,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -2581,7 +2581,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -2607,7 +2607,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -2649,31 +2649,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -2822,31 +2822,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -2953,7 +2953,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -2979,7 +2979,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -3021,31 +3021,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -3194,31 +3194,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -3274,7 +3274,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -3339,7 +3339,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -3381,31 +3381,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -3517,7 +3517,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -3567,31 +3567,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -3711,7 +3711,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -3753,31 +3753,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -3889,7 +3889,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -3939,31 +3939,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -4083,7 +4083,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -4125,31 +4125,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -4261,7 +4261,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -4311,31 +4311,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -4455,7 +4455,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -4497,31 +4497,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -4654,7 +4654,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -4688,31 +4688,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -4832,7 +4832,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -4874,31 +4874,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -5035,7 +5035,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -5069,31 +5069,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -5234,7 +5234,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -5255,31 +5255,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -5420,7 +5420,7 @@ Array [ Object { "characterList": Array [ Object { - "entity": "2", + "entity": "3", "style": Array [], }, ], @@ -5441,31 +5441,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], diff --git a/src/model/paste/__tests__/DraftPasteProcessor-test.js b/src/model/paste/__tests__/DraftPasteProcessor-test.js index 7d48ccfb7f..7b5542882e 100644 --- a/src/model/paste/__tests__/DraftPasteProcessor-test.js +++ b/src/model/paste/__tests__/DraftPasteProcessor-test.js @@ -15,6 +15,7 @@ jest.mock('generateRandomKey'); const DraftPasteProcessor = require('DraftPasteProcessor'); const Immutable = require('immutable'); +const mockUUID = require('mockUUID'); const {OrderedSet, Map} = Immutable; @@ -81,6 +82,7 @@ const assertDraftPasteProcessorProcessHTML = ( beforeEach(() => { jest.resetModules(); + jest.mock('uuid', () => mockUUID); }); test('must identify italics text', () => { diff --git a/src/model/paste/__tests__/__snapshots__/DraftPasteProcessor-test.js.snap b/src/model/paste/__tests__/__snapshots__/DraftPasteProcessor-test.js.snap index 8cc186d90a..125e2aaa9e 100644 --- a/src/model/paste/__tests__/__snapshots__/DraftPasteProcessor-test.js.snap +++ b/src/model/paste/__tests__/__snapshots__/DraftPasteProcessor-test.js.snap @@ -786,19 +786,19 @@ Array [ "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { @@ -1670,19 +1670,19 @@ Array [ "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { @@ -1988,47 +1988,47 @@ Array [ "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "ITALIC", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "ITALIC", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "ITALIC", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "ITALIC", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { diff --git a/src/model/transaction/__tests__/__snapshots__/ContentStateInlineStyle-test.js.snap b/src/model/transaction/__tests__/__snapshots__/ContentStateInlineStyle-test.js.snap index 7de6eb2970..b9a2ea6263 100644 --- a/src/model/transaction/__tests__/__snapshots__/ContentStateInlineStyle-test.js.snap +++ b/src/model/transaction/__tests__/__snapshots__/ContentStateInlineStyle-test.js.snap @@ -44,31 +44,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -209,23 +209,23 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [], }, ], @@ -374,31 +374,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -551,31 +551,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -726,31 +726,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -906,31 +906,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -1081,31 +1081,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -1252,31 +1252,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], diff --git a/src/model/transaction/__tests__/__snapshots__/applyEntityToContentState-test.js.snap b/src/model/transaction/__tests__/__snapshots__/applyEntityToContentState-test.js.snap index 603efbfb89..b6c29259dc 100644 --- a/src/model/transaction/__tests__/__snapshots__/applyEntityToContentState-test.js.snap +++ b/src/model/transaction/__tests__/__snapshots__/applyEntityToContentState-test.js.snap @@ -34,31 +34,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -364,31 +364,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], diff --git a/src/model/transaction/__tests__/__snapshots__/insertFragmentIntoContentState-test.js.snap b/src/model/transaction/__tests__/__snapshots__/insertFragmentIntoContentState-test.js.snap index ec24f7a45d..a6d976714d 100644 --- a/src/model/transaction/__tests__/__snapshots__/insertFragmentIntoContentState-test.js.snap +++ b/src/model/transaction/__tests__/__snapshots__/insertFragmentIntoContentState-test.js.snap @@ -44,31 +44,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -219,31 +219,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -394,31 +394,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -588,31 +588,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], diff --git a/src/model/transaction/__tests__/__snapshots__/insertTextIntoContentState-test.js.snap b/src/model/transaction/__tests__/__snapshots__/insertTextIntoContentState-test.js.snap index 97add0a5c8..6e35fa3ffb 100644 --- a/src/model/transaction/__tests__/__snapshots__/insertTextIntoContentState-test.js.snap +++ b/src/model/transaction/__tests__/__snapshots__/insertTextIntoContentState-test.js.snap @@ -46,31 +46,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -223,31 +223,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -400,31 +400,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -565,31 +565,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], diff --git a/src/model/transaction/__tests__/__snapshots__/removeEntitiesAtEdges-test.js.snap b/src/model/transaction/__tests__/__snapshots__/removeEntitiesAtEdges-test.js.snap index d320306854..e4dc808a83 100644 --- a/src/model/transaction/__tests__/__snapshots__/removeEntitiesAtEdges-test.js.snap +++ b/src/model/transaction/__tests__/__snapshots__/removeEntitiesAtEdges-test.js.snap @@ -40,19 +40,19 @@ Object { ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -199,31 +199,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -364,31 +364,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -529,31 +529,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -694,31 +694,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], diff --git a/src/model/transaction/__tests__/__snapshots__/removeRangeFromContentState-test.js.snap b/src/model/transaction/__tests__/__snapshots__/removeRangeFromContentState-test.js.snap index c68271c26a..d3663e7656 100644 --- a/src/model/transaction/__tests__/__snapshots__/removeRangeFromContentState-test.js.snap +++ b/src/model/transaction/__tests__/__snapshots__/removeRangeFromContentState-test.js.snap @@ -706,31 +706,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -988,31 +988,31 @@ Object { "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -1144,13 +1144,13 @@ Object { "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -1367,31 +1367,31 @@ Object { "a": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -1503,13 +1503,13 @@ Object { "a": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -1751,31 +1751,31 @@ Object { "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -1899,13 +1899,13 @@ Object { "style": Array [], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -2038,31 +2038,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -2195,31 +2195,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -2478,31 +2478,31 @@ Object { "b": Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], diff --git a/src/model/transaction/__tests__/__snapshots__/splitBlockInContentState-test.js.snap b/src/model/transaction/__tests__/__snapshots__/splitBlockInContentState-test.js.snap index ce9eac7d0e..eb439889f4 100644 --- a/src/model/transaction/__tests__/__snapshots__/splitBlockInContentState-test.js.snap +++ b/src/model/transaction/__tests__/__snapshots__/splitBlockInContentState-test.js.snap @@ -266,31 +266,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -912,31 +912,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], @@ -1559,31 +1559,31 @@ Array [ Object { "characterList": Array [ Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], }, Object { - "entity": "1", + "entity": "2", "style": Array [ "BOLD", ], diff --git a/src/model/transaction/getSampleStateForTesting.js b/src/model/transaction/getSampleStateForTesting.js index a0728a11d3..76669891c2 100644 --- a/src/model/transaction/getSampleStateForTesting.js +++ b/src/model/transaction/getSampleStateForTesting.js @@ -22,7 +22,7 @@ const SelectionState = require('SelectionState'); const Immutable = require('immutable'); const {BOLD, ITALIC} = SampleDraftInlineStyle; -const ENTITY_KEY = '1'; +const ENTITY_KEY = '2'; const BLOCKS = [ new ContentBlock({