Fix position calc

WordPress · Mar 28, 2019 · a55ce96 · a55ce96
1 parent 0f768b3
commit a55ce96
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/packages/rich-text/src/apply-format.js b/packages/rich-text/src/apply-format.js
@@ -69,20 +69,25 @@ export function applyFormat(
  };
  }
  } else {
+ // Determine the highest position the new format can be inserted at.
+ let position = +Infinity;
+
  for ( let index = startIndex; index < endIndex; index++ ) {
  if ( newFormats[ index ] ) {
  newFormats[ index ] = newFormats[ index ]
  .filter( ( { type } ) => type !== format.type );
+
+ const length = newFormats[ index ].length;
+
+ if ( length < position ) {
+ position = length;
+ }
  } else {
  newFormats[ index ] = [];
+ position = 0;
  }
  }
 
- const position = Math.min(
- newFormats[ startIndex ].length,
- newFormats[ endIndex - 1 ].length
- );
-
  for ( let index = startIndex; index < endIndex; index++ ) {
  newFormats[ index ].splice( position, 0, format );
  }

diff --git a/packages/rich-text/src/test/apply-format.js b/packages/rich-text/src/test/apply-format.js
@@ -112,6 +112,22 @@ describe( 'applyFormat', () => {
  expect( getSparseArrayLength( result.formats ) ).toBe( 3 );
  } );
 
+ it( 'should apply format around existing format with break', () => {
+ const record = {
+ formats: [ , [ em ], , [ em ] ],
+ text: 'test',
+ };
+ const expected = {
+ ...record,
+ formats: [ , [ strong, em ], [ strong ], [ strong, em ] ],
+ };
+ const result = applyFormat( deepFreeze( record ), strong, 1, 4 );
+
+ expect( result ).toEqual( expected );
+ expect( result ).not.toBe( record );
+ expect( getSparseArrayLength( result.formats ) ).toBe( 3 );
+ } );
+
  it( 'should apply format crossing existing format', () => {
  const record = {
  formats: [ , , , , [ em ], [ em ], [ em ], , , , , , , ],