Fix strange "NS_ERROR_FAILURE" error

Automattic · Aug 23, 2021 · e00a1f5 · e00a1f5
1 parent 0516de4
commit e00a1f5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/projects/plugins/jetpack/modules/widget-visibility/editor/index.jsx b/projects/plugins/jetpack/modules/widget-visibility/editor/index.jsx
@@ -20,6 +20,7 @@ const blockHasVisibilitySettings = name => {
 		'core/latest-comments',
 		'core/latest-posts',
 		'core/legacy-widget', // These already have legacy visibility settings, avoid 2 levels of controls
+		'core/widget-area',
 	] );
 	return ! disallowed.has( name );
 };
@@ -195,7 +196,10 @@ const visibilityAdvancedControls = createHigherOrderComponent(
 
 		// Initialize props.conditions if none is sent.
 		useEffect( () => {
-			if ( ! ( 'action' in conditions ) || ! ( 'match_all' in conditions ) ) {
+			if (
+				blockHasVisibilitySettings( props.name ) &&
+				( ! ( 'action' in conditions ) || ! ( 'match_all' in conditions ) )
+			) {
 				setAttributes( {
 					conditions: {
 						action: 'show',
@@ -204,7 +208,7 @@ const visibilityAdvancedControls = createHigherOrderComponent(
 					},
 				} );
 			}
-		}, [ conditions, setAttributes ] );
+		}, [ conditions, setAttributes, props.name ] );
 
 		const toggleMatchAll = useCallback(
 			() =>