From ecfeb111508d9d77c9128f43b32a64aa7fea000a Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Thu, 10 Jun 2021 22:17:38 +0100
Subject: [PATCH] Use block supports to check for feature support

---
 packages/block-library/src/navigation/block.json |  4 +++-
 packages/block-library/src/navigation/edit.js    | 13 +++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/block-library/src/navigation/block.json b/packages/block-library/src/navigation/block.json
index bb9a24dab353c..ce77717fef1b1 100644
--- a/packages/block-library/src/navigation/block.json
+++ b/packages/block-library/src/navigation/block.json
@@ -72,7 +72,9 @@
 			"__experimentalFontFamily": true,
 			"__experimentalTextDecoration": true
 		},
-		"color": true
+		"color": true,
+		"__experimentalSubmenuIndicatorSetting": true,
+		"__experimentalItemJustificationControls": true
 	},
 	"editorStyle": "wp-block-navigation-editor",
 	"style": "wp-block-navigation"
diff --git a/packages/block-library/src/navigation/edit.js b/packages/block-library/src/navigation/edit.js
index d4b6cd57b497b..71d20b219a754 100644
--- a/packages/block-library/src/navigation/edit.js
+++ b/packages/block-library/src/navigation/edit.js
@@ -20,6 +20,7 @@ import { useDispatch, withSelect, withDispatch } from '@wordpress/data';
 import { PanelBody, ToggleControl, ToolbarGroup } from '@wordpress/components';
 import { compose } from '@wordpress/compose';
 import { __ } from '@wordpress/i18n';
+import { getBlockSupport } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -53,8 +54,6 @@ function Navigation( {
 	isSelected,
 	updateInnerBlocks,
 	className,
-	hasSubmenuIndicatorSetting = true,
-	hasItemJustificationControls = true,
 } ) {
 	const [ isPlaceholderShown, setIsPlaceholderShown ] = useState(
 		! hasExistingNavItems
@@ -103,6 +102,16 @@ function Navigation( {
 		}
 	);
 
+	const hasSubmenuIndicatorSetting = getBlockSupport(
+		'core/navigation',
+		'__experimentalSubmenuIndicatorSetting'
+	);
+
+	const hasItemJustificationControls = getBlockSupport(
+		'core/navigation',
+		'__experimentalItemJustificationControls'
+	);
+
 	if ( isPlaceholderShown ) {
 		return (
 			<div { ...blockProps }>