From 2f1b4dc85b0617d60c1da0e215e8ed2da6eb2cea Mon Sep 17 00:00:00 2001
From: David Calhoun <dpcalhoun@gmail.com>
Date: Wed, 17 Mar 2021 07:47:48 -0500
Subject: [PATCH] Improve focal point settings filename clarity (#29910)

Rename two identical filenames to improve clarity about their intent.
---
 .../src/components/block-settings/container.native.js     | 4 ++--
 packages/block-library/src/cover/controls.native.js       | 4 ++--
 ...gs.native.js => focal-point-settings-button.native.js} | 4 ++--
 packages/components/src/index.native.js                   | 2 +-
 .../index.native.js                                       | 8 ++++----
 .../styles.native.scss                                    | 0
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename packages/block-library/src/cover/{focal-point-settings.native.js => focal-point-settings-button.native.js} (93%)
 rename packages/components/src/mobile/{focal-point-settings => focal-point-settings-panel}/index.native.js (91%)
 rename packages/components/src/mobile/{focal-point-settings => focal-point-settings-panel}/styles.native.scss (100%)

diff --git a/packages/block-editor/src/components/block-settings/container.native.js b/packages/block-editor/src/components/block-settings/container.native.js
index de2cc7f4edbac6..e9f16b185a5564 100644
--- a/packages/block-editor/src/components/block-settings/container.native.js
+++ b/packages/block-editor/src/components/block-settings/container.native.js
@@ -5,7 +5,7 @@ import { InspectorControls } from '@wordpress/block-editor';
 import {
 	BottomSheet,
 	ColorSettings,
-	FocalPointSettings,
+	FocalPointSettingsPanel,
 	LinkPickerScreen,
 } from '@wordpress/components';
 import { compose } from '@wordpress/compose';
@@ -59,7 +59,7 @@ function BottomSheetSettings( {
 					name={ blockSettingsScreens.focalPoint }
 					fullScreen
 				>
-					<FocalPointSettings />
+					<FocalPointSettingsPanel />
 				</BottomSheet.NavigationScreen>
 				<BottomSheet.NavigationScreen
 					name={ blockSettingsScreens.linkPicker }
diff --git a/packages/block-library/src/cover/controls.native.js b/packages/block-library/src/cover/controls.native.js
index cf536cd2d32e9c..44a1ecd726df16 100644
--- a/packages/block-library/src/cover/controls.native.js
+++ b/packages/block-library/src/cover/controls.native.js
@@ -29,7 +29,7 @@ import { __ } from '@wordpress/i18n';
  */
 import styles from './style.scss';
 import OverlayColorSettings from './overlay-color-settings';
-import FocalPointSettings from './focal-point-settings';
+import FocalPointSettingsButton from './focal-point-settings-button';
 import {
 	ALLOWED_MEDIA_TYPES,
 	COVER_MIN_HEIGHT,
@@ -218,7 +218,7 @@ function Controls( {
 							{ displayPlaceholder ? null : focalPointHint }
 						</View>
 					</BottomSheet.Cell>
-					<FocalPointSettings
+					<FocalPointSettingsButton
 						disabled={ hasParallax }
 						focalPoint={ focalPoint || IMAGE_DEFAULT_FOCAL_POINT }
 						onFocalPointChange={ setFocalPoint }
diff --git a/packages/block-library/src/cover/focal-point-settings.native.js b/packages/block-library/src/cover/focal-point-settings-button.native.js
similarity index 93%
rename from packages/block-library/src/cover/focal-point-settings.native.js
rename to packages/block-library/src/cover/focal-point-settings-button.native.js
index 9d268e18f237f1..d9451831a6a2f5 100644
--- a/packages/block-library/src/cover/focal-point-settings.native.js
+++ b/packages/block-library/src/cover/focal-point-settings-button.native.js
@@ -17,7 +17,7 @@ import { chevronRight } from '@wordpress/icons';
  */
 import styles from './style.scss';
 
-function FocalPointSettings( {
+function FocalPointSettingsButton( {
 	disabled,
 	focalPoint,
 	onFocalPointChange,
@@ -50,4 +50,4 @@ function FocalPointSettings( {
 	);
 }
 
-export default FocalPointSettings;
+export default FocalPointSettingsButton;
diff --git a/packages/components/src/index.native.js b/packages/components/src/index.native.js
index 6f9b4c2915e8f1..afe0c37691e405 100644
--- a/packages/components/src/index.native.js
+++ b/packages/components/src/index.native.js
@@ -75,7 +75,7 @@ export { default as ReadableContentView } from './mobile/readable-content-view';
 export { default as CycleSelectControl } from './mobile/cycle-select-control';
 export { default as Gradient } from './mobile/gradient';
 export { default as ColorSettings } from './mobile/color-settings';
-export { default as FocalPointSettings } from './mobile/focal-point-settings';
+export { default as FocalPointSettingsPanel } from './mobile/focal-point-settings-panel';
 export { LinkPicker } from './mobile/link-picker';
 export { default as LinkPickerScreen } from './mobile/link-picker/link-picker-screen';
 export { default as LinkSettings } from './mobile/link-settings';
diff --git a/packages/components/src/mobile/focal-point-settings/index.native.js b/packages/components/src/mobile/focal-point-settings-panel/index.native.js
similarity index 91%
rename from packages/components/src/mobile/focal-point-settings/index.native.js
rename to packages/components/src/mobile/focal-point-settings-panel/index.native.js
index c959942ef9caa0..6b294526f1b0db 100644
--- a/packages/components/src/mobile/focal-point-settings/index.native.js
+++ b/packages/components/src/mobile/focal-point-settings-panel/index.native.js
@@ -17,7 +17,7 @@ import { BottomSheetContext, FocalPointPicker } from '@wordpress/components';
 import NavigationHeader from '../bottom-sheet/navigation-header';
 import styles from './styles.scss';
 
-const FocalPointSettingsMemo = memo(
+const FocalPointSettingsPanelMemo = memo(
 	( {
 		focalPoint,
 		onFocalPointChange,
@@ -62,12 +62,12 @@ const FocalPointSettingsMemo = memo(
 	}
 );
 
-function FocalPointSettings( props ) {
+function FocalPointSettingsPanel( props ) {
 	const route = useRoute();
 	const { shouldEnableBottomSheetScroll } = useContext( BottomSheetContext );
 
 	return (
-		<FocalPointSettingsMemo
+		<FocalPointSettingsPanelMemo
 			shouldEnableBottomSheetScroll={ shouldEnableBottomSheetScroll }
 			{ ...props }
 			{ ...route.params }
@@ -75,4 +75,4 @@ function FocalPointSettings( props ) {
 	);
 }
 
-export default FocalPointSettings;
+export default FocalPointSettingsPanel;
diff --git a/packages/components/src/mobile/focal-point-settings/styles.native.scss b/packages/components/src/mobile/focal-point-settings-panel/styles.native.scss
similarity index 100%
rename from packages/components/src/mobile/focal-point-settings/styles.native.scss
rename to packages/components/src/mobile/focal-point-settings-panel/styles.native.scss