From 3aa8882c8c365ea1d1ad0f87acffa3cf51783a5c Mon Sep 17 00:00:00 2001 From: Lena Morita Date: Wed, 24 Jun 2026 21:51:53 +0900 Subject: [PATCH 1/2] FocalPointPicker: Complete __next40pxDefaultSize cleanup --- packages/components/src/focal-point-picker/index.tsx | 1 + tools/eslint/config.mjs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/components/src/focal-point-picker/index.tsx b/packages/components/src/focal-point-picker/index.tsx index 94aa23e1bd63e3..2f9e52f9268282 100644 --- a/packages/components/src/focal-point-picker/index.tsx +++ b/packages/components/src/focal-point-picker/index.tsx @@ -94,6 +94,7 @@ const GRID_OVERLAY_TIMEOUT = 600; export function FocalPointPicker( { // Prevent passing to internal component. __nextHasNoMarginBottom: _, + __next40pxDefaultSize: _next40pxDefaultSize, autoPlay = true, className, help, diff --git a/tools/eslint/config.mjs b/tools/eslint/config.mjs index de526367aa67ae..67a677801bb6ca 100644 --- a/tools/eslint/config.mjs +++ b/tools/eslint/config.mjs @@ -159,7 +159,7 @@ const restrictedSyntax = [ selector: 'JSXAttribute[name.name="__nextHasNoMarginBottom"]', message: 'The `__nextHasNoMarginBottom` prop is no longer needed.', }, - ...[ 'BoxControl', 'TextControl' ].map( ( componentName ) => ( { + ...[ 'BoxControl', 'TextControl', 'FocalPointPicker' ].map( ( componentName ) => ( { selector: `JSXElement[openingElement.name.name="${ componentName }"] JSXAttribute[name.name="__next40pxDefaultSize"]`, message: `The \`__next40pxDefaultSize\` prop is no longer needed on \`${ componentName }\`.`, } ) ), From b26a9fd70b5dfe91f2aaa56cedfa634d2ad14879 Mon Sep 17 00:00:00 2001 From: Lena Morita Date: Wed, 24 Jun 2026 22:07:17 +0900 Subject: [PATCH 2/2] Fix eslint config formatting --- tools/eslint/config.mjs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/eslint/config.mjs b/tools/eslint/config.mjs index 67a677801bb6ca..806efe42d2c801 100644 --- a/tools/eslint/config.mjs +++ b/tools/eslint/config.mjs @@ -159,10 +159,12 @@ const restrictedSyntax = [ selector: 'JSXAttribute[name.name="__nextHasNoMarginBottom"]', message: 'The `__nextHasNoMarginBottom` prop is no longer needed.', }, - ...[ 'BoxControl', 'TextControl', 'FocalPointPicker' ].map( ( componentName ) => ( { - selector: `JSXElement[openingElement.name.name="${ componentName }"] JSXAttribute[name.name="__next40pxDefaultSize"]`, - message: `The \`__next40pxDefaultSize\` prop is no longer needed on \`${ componentName }\`.`, - } ) ), + ...[ 'BoxControl', 'FocalPointPicker', 'TextControl' ].map( + ( componentName ) => ( { + selector: `JSXElement[openingElement.name.name="${ componentName }"] JSXAttribute[name.name="__next40pxDefaultSize"]`, + message: `The \`__next40pxDefaultSize\` prop is no longer needed on \`${ componentName }\`.`, + } ) + ), { selector: 'CallExpression[callee.name="withDispatch"] > :function > BlockStatement > :not(VariableDeclaration,ReturnStatement)',