From 82636641dcca4775e0f0eaf9f529863a2759dd07 Mon Sep 17 00:00:00 2001 From: Lena Morita Date: Sat, 10 Aug 2024 07:27:31 +0900 Subject: [PATCH 1/4] FocalPointPicker: Default to new 40px size --- packages/components/src/focal-point-picker/index.tsx | 3 +-- packages/components/src/focal-point-picker/types.ts | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/components/src/focal-point-picker/index.tsx b/packages/components/src/focal-point-picker/index.tsx index 4575108fe6a21d..89790ca6535862 100644 --- a/packages/components/src/focal-point-picker/index.tsx +++ b/packages/components/src/focal-point-picker/index.tsx @@ -85,7 +85,6 @@ const GRID_OVERLAY_TIMEOUT = 600; */ export function FocalPointPicker( { __nextHasNoMarginBottom, - __next40pxDefaultSize = false, autoPlay = true, className, help, @@ -285,7 +284,7 @@ export function FocalPointPicker( { { diff --git a/packages/components/src/focal-point-picker/types.ts b/packages/components/src/focal-point-picker/types.ts index bd66ae02451a95..9a196bd897f6e8 100644 --- a/packages/components/src/focal-point-picker/types.ts +++ b/packages/components/src/focal-point-picker/types.ts @@ -29,7 +29,8 @@ export type FocalPointPickerProps = Pick< /** * Start opting into the larger default height that will become the default size in a future version. * - * @default false + * @deprecated Default behavior since WP 6.7. Prop can be safely removed. + * @ignore */ __next40pxDefaultSize?: boolean; /** From a30fdc534d1ea76f82626553bc8f362576c8e7c7 Mon Sep 17 00:00:00 2001 From: Lena Morita Date: Sat, 10 Aug 2024 07:33:55 +0900 Subject: [PATCH 2/4] Simplify prop passing --- packages/components/src/focal-point-picker/controls.tsx | 4 +--- packages/components/src/focal-point-picker/index.tsx | 1 - packages/components/src/focal-point-picker/types.ts | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/components/src/focal-point-picker/controls.tsx b/packages/components/src/focal-point-picker/controls.tsx index 3df1725bf3bedb..1ecf846b10635e 100644 --- a/packages/components/src/focal-point-picker/controls.tsx +++ b/packages/components/src/focal-point-picker/controls.tsx @@ -23,7 +23,6 @@ const noop = () => {}; export default function FocalPointPickerControls( { __nextHasNoMarginBottom, - __next40pxDefaultSize, hasHelpText, onChange = noop, point = { @@ -57,7 +56,6 @@ export default function FocalPointPickerControls( { gap={ 4 } > { diff --git a/packages/components/src/focal-point-picker/types.ts b/packages/components/src/focal-point-picker/types.ts index 9a196bd897f6e8..357af1e090d7f5 100644 --- a/packages/components/src/focal-point-picker/types.ts +++ b/packages/components/src/focal-point-picker/types.ts @@ -69,7 +69,6 @@ export type FocalPointPickerProps = Pick< export type FocalPointPickerControlsProps = { __nextHasNoMarginBottom?: boolean; - __next40pxDefaultSize?: boolean; /** * A bit of extra bottom margin will be added if a `help` text * needs to be rendered under it. From 90245f92b85f5a5ccfc76425009fa330a3baf4fd Mon Sep 17 00:00:00 2001 From: Lena Morita Date: Sat, 10 Aug 2024 07:34:18 +0900 Subject: [PATCH 3/4] Remove unnecessary usage --- .../src/components/global-styles/background-panel.js | 1 - packages/block-library/src/cover/edit/inspector-controls.js | 1 - packages/block-library/src/media-text/edit.js | 1 - 3 files changed, 3 deletions(-) diff --git a/packages/block-editor/src/components/global-styles/background-panel.js b/packages/block-editor/src/components/global-styles/background-panel.js index 906202206d1b76..14b37bb3007658 100644 --- a/packages/block-editor/src/components/global-styles/background-panel.js +++ b/packages/block-editor/src/components/global-styles/background-panel.js @@ -585,7 +585,6 @@ function BackgroundSizeControls( { return ( Date: Tue, 13 Aug 2024 07:08:51 +0900 Subject: [PATCH 4/4] Add changelog --- packages/components/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index 96bf76815e71dd..038637b3513dcb 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -11,6 +11,7 @@ - `Composite`: improve Storybook examples and add interactive controls ([#64397](https://github.com/WordPress/gutenberg/pull/64397)). - `TimePicker`: add `hideLabelFromVision` prop ([#64267](https://github.com/WordPress/gutenberg/pull/64267)). +- `FocalPointPicker`: Default to new 40px size ([#64456](https://github.com/WordPress/gutenberg/pull/64456)). ## 28.5.0 (2024-08-07)