Refactor social icons

packages/block-editor/src/components/block-list/index.native.js

@@ -332,27 +332,26 @@ export default compose( [
 			const selectedBlockClientId = getSelectedBlockClientId();
 
 			let blockClientIds = getBlockOrder( rootClientId );
-
 			// Display only block which fulfill the condition in passed `filterInnerBlocks` function
 			if ( filterInnerBlocks ) {
-				blockClientIds = filterInnerBlocks(
-					getBlockOrder( rootClientId )
-				);
+				blockClientIds = filterInnerBlocks( blockClientIds );
 			}
 
 			const isReadOnly = getSettings().readOnly;
 
 			const rootBlockId = getBlockHierarchyRootClientId(
 				selectedBlockClientId
 			);
-			const hasRootInnerBlocks = !! getBlockCount( rootBlockId );
+
+			const blockCount = getBlockCount( rootBlockId );
+			const hasRootInnerBlocks = !! blockCount;
 
 			const isFloatingToolbarVisible =
 				!! selectedBlockClientId && hasRootInnerBlocks;
 
 			return {
 				blockClientIds,
-				blockCount: getBlockCount( rootClientId ),
+				blockCount,
 				isBlockInsertionPointVisible: isBlockInsertionPointVisible(),
 				isReadOnly,
 				isRootList: rootClientId === undefined,

packages/block-library/src/social-link/edit.native.js

@@ -25,6 +25,21 @@ import styles from './editor.scss';
 const ANIMATION_DELAY = 300;
 const ANIMATION_DURATION = 400;
 
+const linkSettingsOptions = {
+	url: {
+		label: __( 'URL' ),
+		placeholder: __( 'Add URL' ),
+		autoFocus: true,
+	},
+	linkLabel: {
+		label: __( 'Link label' ),
+		placeholder: __( 'None' ),
+	},
+	footer: {
+		label: __( 'Briefly describe the link to help screen reader user' ),
+	},
+};
+
 const SocialLinkEdit = ( {
 	attributes,
 	setAttributes,
@@ -83,21 +98,6 @@ const SocialLinkEdit = ( {
 		? activeIcon
 		: interpolationColors;
 
-	const options = {
-		url: {
-			label: __( 'URL' ),
-			placeholder: __( 'Add URL' ),
-			autoFocus: true,
-		},
-		linkLabel: {
-			label: __( 'Link label' ),
-			placeholder: __( 'None' ),
-		},
-		footer: {
-			label: __( 'Briefly describe the link to help screen reader user' ),
-		},
-	};
-
 	function animateColors() {
 		Animated.sequence( [
 			Animated.delay( ANIMATION_DELAY ),
@@ -113,6 +113,10 @@ const SocialLinkEdit = ( {
 		setIsLinkSheetVisible( false );
 	}
 
+	function onOpenSettingsSheet() {
+		setIsLinkSheetVisible( true );
+	}
+
 	function onEmptyURL() {
 		animatedValue.setValue( 0 );
 		setIsValue( false );
@@ -150,7 +154,7 @@ const SocialLinkEdit = ( {
 								socialLinkName
 							) }
 							icon={ link }
-							onClick={ () => setIsLinkSheetVisible( true ) }
+							onClick={ onOpenSettingsSheet }
 							isActive={ url }
 						/>
 					</ToolbarGroup>
@@ -162,7 +166,7 @@ const SocialLinkEdit = ( {
 				onEmptyURL={ onEmptyURL }
 				onClose={ onCloseSettingsSheet }
 				setAttributes={ setAttributes }
-				options={ options }
+				options={ linkSettingsOptions }
 				withBottomSheet={ true }
 			/>
 			<TouchableWithoutFeedback

packages/block-library/src/social-links/edit.native.js

@@ -64,7 +64,9 @@ function SocialLinksEdit( {
 	);
 
 	function renderPlaceholder() {
-		return [ ...new Array( innerBlocks.length || 1 ) ].map( ( index ) => (
+		return [
+			...new Array( innerBlocks.length || 1 ),
+		].map( ( _, index ) => (
 			<View style={ placeholderStyle } key={ index } />
 		) );
 	}