@wordpress/core-data 7.52.0 → 7.53.0

package/src/utils/test/crdt-user-selections.ts

@@ -1,19 +1,11 @@
-/**
- * External dependencies
- */
 import { Y } from '@wordpress/sync';
 import { select } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
 import {
 	areSelectionsStatesEqual,
 	getSelectionState,
 	SelectionType,
 } from '../crdt-user-selections';
 import { CRDT_RECORD_MAP_KEY } from '../../sync';
-
 jest.mock( '@wordpress/data', () => ( {
 	select: jest.fn(),
 	// Needed because @wordpress/rich-text initialises its store at import time.
@@ -22,7 +14,6 @@ jest.mock( '@wordpress/data', () => ( {
 	register: jest.fn(),
 	createSelector: ( selector: Function ) => selector,
 } ) );
-
 jest.mock( '@wordpress/block-editor', () => ( {
 	store: 'core/block-editor',
 } ) );
@@ -269,21 +260,49 @@ describe( 'areSelectionsStatesEqual', () => {
 	} );
 
 	describe( 'SelectionType.SelectionInMultipleBlocks', () => {
-		test( 'returns true when selections in multiple blocks are identical', () => {
-			const cursorStartPosition = createCursorPosition(
-				'first block',
-				5
+		test( 'returns true when both endpoints are identical cursor endpoints', () => {
+			const startEndpoint: SelectionCursor = {
+				type: SelectionType.Cursor,
+				cursorPosition: createCursorPosition( 'first block', 5 ),
+			};
+			const endEndpoint: SelectionCursor = {
+				type: SelectionType.Cursor,
+				cursorPosition: createCursorPosition( 'second block', 3 ),
+			};
+			const selection1: SelectionInMultipleBlocks = {
+				type: SelectionType.SelectionInMultipleBlocks,
+				startEndpoint,
+				endEndpoint,
+			};
+			const selection2: SelectionInMultipleBlocks = {
+				type: SelectionType.SelectionInMultipleBlocks,
+				startEndpoint,
+				endEndpoint,
+			};
+
+			expect( areSelectionsStatesEqual( selection1, selection2 ) ).toBe(
+				true
 			);
-			const cursorEndPosition = createCursorPosition( 'second block', 3 );
+		} );
+
+		test( 'returns true when both endpoints are identical whole-block endpoints', () => {
+			const startEndpoint: SelectionWholeBlock = {
+				type: SelectionType.WholeBlock,
+				blockPosition: createBlockPosition( 0 ),
+			};
+			const endEndpoint: SelectionWholeBlock = {
+				type: SelectionType.WholeBlock,
+				blockPosition: createBlockPosition( 1 ),
+			};
 			const selection1: SelectionInMultipleBlocks = {
 				type: SelectionType.SelectionInMultipleBlocks,
-				cursorStartPosition,
-				cursorEndPosition,
+				startEndpoint,
+				endEndpoint,
 			};
 			const selection2: SelectionInMultipleBlocks = {
 				type: SelectionType.SelectionInMultipleBlocks,
-				cursorStartPosition,
-				cursorEndPosition,
+				startEndpoint,
+				endEndpoint,
 			};
 
 			expect( areSelectionsStatesEqual( selection1, selection2 ) ).toBe(
@@ -291,16 +310,28 @@ describe( 'areSelectionsStatesEqual', () => {
 			);
 		} );
 
-		test( 'returns false when start cursor position differs', () => {
+		test( 'returns false when start cursor endpoint position differs', () => {
 			const selection1: SelectionInMultipleBlocks = {
 				type: SelectionType.SelectionInMultipleBlocks,
-				cursorStartPosition: createCursorPosition( 'first block', 5 ),
-				cursorEndPosition: createCursorPosition( 'second block', 3 ),
+				startEndpoint: {
+					type: SelectionType.Cursor,
+					cursorPosition: createCursorPosition( 'first block', 5 ),
+				},
+				endEndpoint: {
+					type: SelectionType.Cursor,
+					cursorPosition: createCursorPosition( 'second block', 3 ),
+				},
 			};
 			const selection2: SelectionInMultipleBlocks = {
 				type: SelectionType.SelectionInMultipleBlocks,
-				cursorStartPosition: createCursorPosition( 'first block', 6 ),
-				cursorEndPosition: createCursorPosition( 'second block', 3 ),
+				startEndpoint: {
+					type: SelectionType.Cursor,
+					cursorPosition: createCursorPosition( 'first block', 6 ),
+				},
+				endEndpoint: {
+					type: SelectionType.Cursor,
+					cursorPosition: createCursorPosition( 'second block', 3 ),
+				},
 			};
 
 			expect( areSelectionsStatesEqual( selection1, selection2 ) ).toBe(
@@ -308,16 +339,57 @@ describe( 'areSelectionsStatesEqual', () => {
 			);
 		} );
 
-		test( 'returns false when end cursor position differs', () => {
+		test( 'returns false when end cursor endpoint position differs', () => {
 			const selection1: SelectionInMultipleBlocks = {
 				type: SelectionType.SelectionInMultipleBlocks,
-				cursorStartPosition: createCursorPosition( 'first block', 5 ),
-				cursorEndPosition: createCursorPosition( 'second block', 3 ),
+				startEndpoint: {
+					type: SelectionType.Cursor,
+					cursorPosition: createCursorPosition( 'first block', 5 ),
+				},
+				endEndpoint: {
+					type: SelectionType.Cursor,
+					cursorPosition: createCursorPosition( 'second block', 3 ),
+				},
 			};
 			const selection2: SelectionInMultipleBlocks = {
 				type: SelectionType.SelectionInMultipleBlocks,
-				cursorStartPosition: createCursorPosition( 'first block', 5 ),
-				cursorEndPosition: createCursorPosition( 'second block', 4 ),
+				startEndpoint: {
+					type: SelectionType.Cursor,
+					cursorPosition: createCursorPosition( 'first block', 5 ),
+				},
+				endEndpoint: {
+					type: SelectionType.Cursor,
+					cursorPosition: createCursorPosition( 'second block', 4 ),
+				},
+			};
+
+			expect( areSelectionsStatesEqual( selection1, selection2 ) ).toBe(
+				false
+			);
+		} );
+
+		test( 'returns false when endpoint types differ (text vs block)', () => {
+			const selection1: SelectionInMultipleBlocks = {
+				type: SelectionType.SelectionInMultipleBlocks,
+				startEndpoint: {
+					type: SelectionType.Cursor,
+					cursorPosition: createCursorPosition( 'first block', 5 ),
+				},
+				endEndpoint: {
+					type: SelectionType.Cursor,
+					cursorPosition: createCursorPosition( 'second block', 3 ),
+				},
+			};
+			const selection2: SelectionInMultipleBlocks = {
+				type: SelectionType.SelectionInMultipleBlocks,
+				startEndpoint: {
+					type: SelectionType.WholeBlock,
+					blockPosition: createBlockPosition( 0 ),
+				},
+				endEndpoint: {
+					type: SelectionType.Cursor,
+					cursorPosition: createCursorPosition( 'second block', 3 ),
+				},
 			};
 
 			expect( areSelectionsStatesEqual( selection1, selection2 ) ).toBe(
@@ -732,12 +804,17 @@ describe( 'getSelectionState', () => {
 			expect( result.type ).toBe(
 				SelectionType.SelectionInMultipleBlocks
 			);
+			const multiBlock = result as SelectionInMultipleBlocks;
+			expect( multiBlock.startEndpoint.type ).toBe(
+				SelectionType.Cursor
+			);
+			expect( multiBlock.endEndpoint.type ).toBe( SelectionType.Cursor );
 			expect(
-				( result as SelectionInMultipleBlocks ).cursorStartPosition
+				( multiBlock.startEndpoint as SelectionCursor ).cursorPosition
 					.absoluteOffset
 			).toBe( 5 );
 			expect(
-				( result as SelectionInMultipleBlocks ).cursorEndPosition
+				( multiBlock.endEndpoint as SelectionCursor ).cursorPosition
 					.absoluteOffset
 			).toBe( 3 );
 		} );

package/src/utils/test/crdt-utils.ts

@@ -1,12 +1,5 @@
-/**
- * External dependencies
- */
 import { describe, expect, it } from '@jest/globals';
 import { Y } from '@wordpress/sync';
-
-/**
- * Internal dependencies
- */
 import {
 	asHtmlStringIndex,
 	asRichTextOffset,

package/src/utils/test/crdt.ts

@@ -1,13 +1,5 @@
-/**
- * WordPress dependencies
- */
 import { Y } from '@wordpress/sync';
-
-/**
- * External dependencies
- */
 import { describe, expect, it, jest, beforeEach } from '@jest/globals';
-
 /**
  * Mock getBlockTypes so CRDT merging can identify rich-text attributes.
  * Also stub __unstableSerializeAndClean so we can assert how it's invoked
@@ -54,16 +46,8 @@ jest.mock( '@wordpress/blocks', () => {
 		),
 	};
 } );
-
-/**
- * WordPress dependencies
- */
 import { parse } from '@wordpress/blocks';
 import { RichTextData } from '@wordpress/rich-text';
-
-/**
- * Internal dependencies
- */
 import { CRDT_RECORD_MAP_KEY } from '../../sync';
 import {
 	applyPostChangesToCRDTDoc,

package/src/utils/test/get-nested-value.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import getNestedValue from '../get-nested-value';
 
 describe( 'getNestedValue', () => {

package/src/utils/test/get-normalized-comma-separable.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import getNormalizedCommaSeparable from '../get-normalized-comma-separable';
 
 describe( 'getNormalizedCommaSeparable', () => {

package/src/utils/test/get-template-info.js

@@ -1,10 +1,4 @@
-/**
- * WordPress dependencies
- */
 import { footer, header, layout } from '@wordpress/icons';
-/**
- * Internal dependencies
- */
 import { getTemplateInfo } from '../get-template-info';
 
 describe( '__experimentalGetTemplateInfo', () => {

package/src/utils/test/if-matching-action.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import deepFreeze from 'deep-freeze';
-
-/**
- * Internal dependencies
- */
 import ifMatchingAction from '../if-matching-action';
 
 describe( 'ifMatchingAction', () => {

package/src/utils/test/is-numeric-id.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import isNumericID from '../is-numeric-id';
 
 describe( 'isNumericID', () => {

package/src/utils/test/log-entity-deprecation.js

@@ -1,11 +1,4 @@
-/**
- * WordPress dependencies
- */
 import deprecated from '@wordpress/deprecated';
-
-/**
- * Internal dependencies
- */
 import logEntityDeprecation from '../log-entity-deprecation';
 
 jest.useFakeTimers();

package/src/utils/test/replace-action.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import replaceAction from '../replace-action';
 
 describe( 'replaceAction', () => {

package/src/utils/test/rtc-rich-text-cursor-scope.test.js

@@ -1,19 +1,10 @@
-/**
- * External dependencies
- */
 import { beforeEach, describe, expect, it, jest } from '@jest/globals';
-
-/**
- * WordPress dependencies
- */
 import { Y } from '@wordpress/sync';
-
 /**
  * Mock block schemas and sync providers.
  */
 jest.mock( '@wordpress/blocks', () => {
 	const actual = jest.requireActual( '@wordpress/blocks' );
-
 	return {
 		...actual,
 		getBlockTypes: () => [
@@ -27,14 +18,9 @@ jest.mock( '@wordpress/blocks', () => {
 		],
 	};
 } );
-
 jest.mock( '../../../../sync/src/providers', () => ( {
 	getProviderCreators: jest.fn(),
 } ) );
-
-/**
- * Internal dependencies
- */
 import { createSyncManager } from '../../../../sync/src/manager';
 import { getProviderCreators } from '../../../../sync/src/providers';
 import { CRDT_RECORD_MAP_KEY } from '../../sync';

package/src/utils/test/rtc-rich-text-offset-space.test.js

@@ -1,19 +1,10 @@
-/**
- * External dependencies
- */
 import { beforeEach, describe, expect, it, jest } from '@jest/globals';
-
-/**
- * WordPress dependencies
- */
 import { Y } from '@wordpress/sync';
-
 /**
  * Mock block schemas and sync providers.
  */
 jest.mock( '@wordpress/blocks', () => {
 	const actual = jest.requireActual( '@wordpress/blocks' );
-
 	return {
 		...actual,
 		getBlockTypes: () => [
@@ -26,14 +17,9 @@ jest.mock( '@wordpress/blocks', () => {
 		],
 	};
 } );
-
 jest.mock( '../../../../sync/src/providers', () => ( {
 	getProviderCreators: jest.fn(),
 } ) );
-
-/**
- * Internal dependencies
- */
 import { createSyncManager } from '../../../../sync/src/manager';
 import { getProviderCreators } from '../../../../sync/src/providers';
 import { CRDT_RECORD_MAP_KEY, Delta } from '../../sync';

package/src/utils/test/save-crdt-doc.js

@@ -1,11 +1,4 @@
-/**
- * WordPress dependencies
- */
 import apiFetch from '@wordpress/api-fetch';
-
-/**
- * Internal dependencies
- */
 import { getSyncManager } from '../../sync';
 import { saveCRDTDoc } from '../save-crdt-doc';
 

package/src/utils/test/set-nested-value.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import setNestedValue from '../set-nested-value';
 
 describe( 'setNestedValue', () => {

package/src/utils/test/with-weak-map-cache.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import withWeakMapCache from '../with-weak-map-cache';
 
 describe( 'withWeakMapCache', () => {

package/build-types/utils/on-sub-key.d.ts

@@ -1,4 +0,0 @@
-export function onSubKey(actionProperty: string): AnyFunction;
-export default onSubKey;
-export type AnyFunction = import("../types").AnyFunction;
-//# sourceMappingURL=on-sub-key.d.ts.map

package/build-types/utils/on-sub-key.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"on-sub-key.d.ts","sourceRoot":"","sources":["../../src/utils/on-sub-key.js"],"names":[],"mappings":"AAUO,yCAJI,MAAM,GAEL,WAAW,CAwBrB;;0BAhCY,OAAO,UAAU,EAAE,WAAW"}