Ensure getThemeSupports is backward compatible

WordPress · Nov 1, 2021 · dad9d2b · dad9d2b
1 parent 2b8b304
commit dad9d2b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/packages/block-library/src/embed/edit.js b/packages/block-library/src/embed/edit.js
@@ -89,7 +89,7 @@ const EmbedEdit = ( props ) => {
 			return {
 				preview: validPreview ? embedPreview : undefined,
 				fetching: isRequestingEmbedPreview( attributesUrl ),
-				themeSupportsResponsive: getThemeSupports()?.[
+				themeSupportsResponsive: getThemeSupports()[
 					'responsive-embeds'
 				],
 				cannotEmbed: ! validPreview || previewIsFallback,

diff --git a/packages/core-data/src/selectors.js b/packages/core-data/src/selectors.js
@@ -19,6 +19,15 @@ import { getQueriedItems } from './queried-data';
 import { DEFAULT_ENTITY_KEY } from './entities';
 import { getNormalizedCommaSeparable, isRawAttribute } from './utils';
 
+/**
+ * Shared reference to an empty object for cases where it is important to avoid
+ * returning a new object reference on every invocation, as in a connected or
+ * other pure component which performs `shouldComponentUpdate` check on props.
+ * This should be used as a last resort, since the normalized data should be
+ * maintained by the reducer result in state.
+ */
+const EMPTY_OBJECT = {};
+
 /**
  * Shared reference to an empty array for cases where it is important to avoid
  * returning a new array reference on every invocation, as in a connected or
@@ -706,7 +715,7 @@ export function __experimentalGetCurrentGlobalStylesId( state ) {
  * @return {*} Index data.
  */
 export function getThemeSupports( state ) {
-	return getCurrentTheme( state )?.theme_supports;
+	return getCurrentTheme( state )?.theme_supports ?? EMPTY_OBJECT;
 }
 
 /**