@wordpress/block-library 9.19.0 → 9.20.0

package/src/table-of-contents/hooks.js

@@ -16,8 +16,8 @@ function getLatestHeadings( select, clientId ) {
 	const {
 		getBlockAttributes,
 		getBlockName,
-		getClientIdsWithDescendants,
 		getBlocksByName,
+		getClientIdsOfDescendants,
 	} = select( blockEditorStore );
 
 	// FIXME: @wordpress/block-library should not depend on @wordpress/editor.
@@ -31,8 +31,11 @@ function getLatestHeadings( select, clientId ) {
 	const isPaginated = getBlocksByName( 'core/nextpage' ).length !== 0;
 	const { onlyIncludeCurrentPage } = getBlockAttributes( clientId ) ?? {};
 
+	// Get post-content block client ID.
+	const [ postContentClientId = '' ] = getBlocksByName( 'core/post-content' );
+
 	// Get the client ids of all blocks in the editor.
-	const allBlockClientIds = getClientIdsWithDescendants();
+	const allBlockClientIds = getClientIdsOfDescendants( postContentClientId );
 
 	// If onlyIncludeCurrentPage is true, calculate the page (of a paginated post) this block is part of, so we know which headings to include; otherwise, skip the calculation.
 	let tocPage = 1;

package/src/template-part/edit/advanced-controls.js

@@ -36,7 +36,7 @@ export function TemplatePartAdvancedControls( {
 
 	const defaultTemplatePartAreas = useSelect(
 		( select ) =>
-			select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+			select( coreStore ).getCurrentTheme()
 				?.default_template_part_areas || [],
 		[]
 	);

package/src/template-part/edit/utils/hooks.js

@@ -137,7 +137,7 @@ export function useTemplatePartArea( area ) {
 	return useSelect(
 		( select ) => {
 			const definedAreas =
-				select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+				select( coreStore ).getCurrentTheme()
 					?.default_template_part_areas || [];
 
 			const selectedArea = definedAreas.find(