Fixes cherry-picked to be included in WordPress 5.3.1 (#18932)

WordPress · Dec 5, 2019 · f79aef2 · f79aef2
1 parent d088ec2
commit f79aef2
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 15 deletions.
diff --git a/packages/block-editor/src/components/typewriter/index.js b/packages/block-editor/src/components/typewriter/index.js
@@ -129,7 +129,7 @@ class Typewriter extends Component {
 			return;
 		}
 
-		const diff = currentCaretRect.y - this.caretRect.y;
+		const diff = currentCaretRect.top - this.caretRect.top;
 
 		if ( diff === 0 ) {
 			return;
@@ -148,10 +148,10 @@ class Typewriter extends Component {
 			scrollContainer.scrollTop;
 		const scrollContainerY = windowScroll ?
 			0 :
-			scrollContainer.getBoundingClientRect().y;
+			scrollContainer.getBoundingClientRect().top;
 		const relativeScrollPosition = windowScroll ?
-			this.caretRect.y / window.innerHeight :
-			( this.caretRect.y - scrollContainerY ) /
+			this.caretRect.top / window.innerHeight :
+			( this.caretRect.top - scrollContainerY ) /
 			( window.innerHeight - scrollContainerY );
 
 		// If the scroll position is at the start, the active editable element
@@ -178,10 +178,10 @@ class Typewriter extends Component {
 		// view.
 		if (
 			// The caret is under the lower fold.
-			this.caretRect.y + this.caretRect.height >
+			this.caretRect.top + this.caretRect.height >
 				scrollContainerY + scrollContainerHeight ||
 			// The caret is above the upper fold.
-			this.caretRect.y < scrollContainerY
+			this.caretRect.top < scrollContainerY
 		) {
 			// Reset the caret position to maintain.
 			this.caretRect = currentCaretRect;

diff --git a/packages/block-library/src/embed/core-embeds.js b/packages/block-library/src/embed/core-embeds.js
@@ -137,13 +137,17 @@ export const others = [
 		patterns: [ /^https?:\/\/cloudup\.com\/.+/i ],
 	},
 	{
+		// Deprecated since CollegeHumor content is now powered by YouTube
 		name: 'core-embed/collegehumor',
 		settings: {
 			title: 'CollegeHumor',
 			icon: embedVideoIcon,
 			description: __( 'Embed CollegeHumor content.' ),
+			supports: {
+				inserter: false,
+			},
 		},
-		patterns: [ /^https?:\/\/(www\.)?collegehumor\.com\/.+/i ],
+		patterns: [],
 	},
 	{
 		name: 'core-embed/crowdsignal',

diff --git a/packages/core-data/src/actions.js b/packages/core-data/src/actions.js
@@ -136,11 +136,11 @@ export function receiveEmbedPreview( url, preview ) {
  * @return {Object} Action object.
  */
 export function* editEntityRecord( kind, name, recordId, edits, options = {} ) {
-	const { transientEdits = {}, mergedEdits = {} } = yield select(
-		'getEntity',
-		kind,
-		name
-	);
+	const entity = yield select( 'getEntity', kind, name );
+	if ( ! entity ) {
+		throw new Error( `The entity being edited (${ kind }, ${ name }) does not have a loaded config.` );
+	}
+	const { transientEdits = {}, mergedEdits = {} } = entity;
 	const record = yield select( 'getRawEntityRecord', kind, name, recordId );
 	const editedRecord = yield select(
 		'getEditedEntityRecord',

diff --git a/packages/core-data/src/selectors.js b/packages/core-data/src/selectors.js
@@ -183,8 +183,11 @@ export function getEntityRecordEdits( state, kind, name, recordId ) {
  */
 export const getEntityRecordNonTransientEdits = createSelector(
 	( state, kind, name, recordId ) => {
-		const { transientEdits = {} } = getEntity( state, kind, name );
-		const edits = getEntityRecordEdits( state, kind, name, recordId ) || [];
+		const { transientEdits } = getEntity( state, kind, name ) || {};
+		const edits = getEntityRecordEdits( state, kind, name, recordId ) || {};
+		if ( ! transientEdits ) {
+			return edits;
+		}
 		return Object.keys( edits ).reduce( ( acc, key ) => {
 			if ( ! transientEdits[ key ] ) {
 				acc[ key ] = edits[ key ];

diff --git a/packages/core-data/src/test/actions.js b/packages/core-data/src/test/actions.js
@@ -1,7 +1,34 @@
 /**
  * Internal dependencies
  */
-import { saveEntityRecord, receiveEntityRecords, receiveUserPermission, receiveAutosaves, receiveCurrentUser } from '../actions';
+import {
+	editEntityRecord,
+	saveEntityRecord,
+	receiveEntityRecords,
+	receiveUserPermission,
+	receiveAutosaves,
+	receiveCurrentUser,
+} from '../actions';
+import { select } from '../controls';
+
+describe( 'editEntityRecord', () => {
+	it( 'throws when the edited entity does not have a loaded config.', () => {
+		const entity = { kind: 'someKind', name: 'someName', id: 'someId' };
+		const fulfillment = editEntityRecord(
+			entity.kind,
+			entity.name,
+			entity.id,
+			{}
+		);
+		expect( fulfillment.next().value ).toEqual(
+			select( 'getEntity', entity.kind, entity.name )
+		);
+		// Don't pass back an entity config.
+		expect( fulfillment.next.bind( fulfillment ) ).toThrow(
+			`The entity being edited (${ entity.kind }, ${ entity.name }) does not have a loaded config.`
+		);
+	} );
+} );
 
 describe( 'saveEntityRecord', () => {
 	it( 'triggers a POST request for a new record', async () => {

diff --git a/packages/core-data/src/test/selectors.js b/packages/core-data/src/test/selectors.js
@@ -9,6 +9,7 @@ import deepFreeze from 'deep-freeze';
 import {
 	getEntityRecord,
 	getEntityRecords,
+	getEntityRecordNonTransientEdits,
 	getEmbedPreview,
 	isPreviewEmbedFallback,
 	canUser,
@@ -104,6 +105,17 @@ describe( 'getEntityRecords', () => {
 	} );
 } );
 
+describe( 'getEntityRecordNonTransientEdits', () => {
+	it( 'should return an empty object when the entity does not have a loaded config.', () => {
+		const state = deepFreeze( {
+			entities: { config: {}, data: {} },
+		} );
+		expect(
+			getEntityRecordNonTransientEdits( state, 'someKind', 'someName', 'someId' )
+		).toEqual( {} );
+	} );
+} );
+
 describe( 'getEmbedPreview()', () => {
 	it( 'returns preview stored for url', () => {
 		let state = deepFreeze( {