diff --git a/packages/block-editor/CHANGELOG.md b/packages/block-editor/CHANGELOG.md
index 5ba19b090d925..bc7d1b88bc9b0 100644
--- a/packages/block-editor/CHANGELOG.md
+++ b/packages/block-editor/CHANGELOG.md
@@ -4,6 +4,7 @@
### Breaking Changes
+- `URLInput`: Remove deprecated `__nextHasNoMarginBottom` prop and promote to default behavior ([#64282](https://github.com/WordPress/gutenberg/pull/64282)).
- `LineHeightControl`: Remove deprecated `__nextHasNoMarginBottom` prop and promote to default behavior ([#64281](https://github.com/WordPress/gutenberg/pull/64281)).
### Enhancements
diff --git a/packages/block-editor/src/components/link-control/search-input.js b/packages/block-editor/src/components/link-control/search-input.js
index 78730463389e2..3a5dcd4148e95 100644
--- a/packages/block-editor/src/components/link-control/search-input.js
+++ b/packages/block-editor/src/components/link-control/search-input.js
@@ -119,7 +119,6 @@ const LinkControlSearchInput = forwardRef(
setAttributes( { url, text: (post && post.title) || 'Click here' } ) }
diff --git a/packages/block-editor/src/components/url-input/button.js b/packages/block-editor/src/components/url-input/button.js
index fca054993e7c3..6ee6b96f61e0e 100644
--- a/packages/block-editor/src/components/url-input/button.js
+++ b/packages/block-editor/src/components/url-input/button.js
@@ -57,7 +57,6 @@ class URLInputButton extends Component {
onClick={ this.toggle }
/>
diff --git a/packages/block-editor/src/components/url-input/index.js b/packages/block-editor/src/components/url-input/index.js
index 36e279f94cc79..8360bfada853c 100644
--- a/packages/block-editor/src/components/url-input/index.js
+++ b/packages/block-editor/src/components/url-input/index.js
@@ -6,7 +6,6 @@ import clsx from 'clsx';
/**
* WordPress dependencies
*/
-import deprecated from '@wordpress/deprecated';
import { __, sprintf, _n } from '@wordpress/i18n';
import { Component, createRef } from '@wordpress/element';
import { UP, DOWN, ENTER, TAB } from '@wordpress/keycodes';
@@ -416,8 +415,6 @@ class URLInput extends Component {
renderControl() {
const {
- /** Start opting into the new margin-free styles that will become the default in a future version. */
- __nextHasNoMarginBottom = false,
label = null,
className,
isFullWidth,
@@ -473,19 +470,8 @@ class URLInput extends Component {
return renderControl( controlProps, inputProps, loading );
}
- if ( ! __nextHasNoMarginBottom ) {
- deprecated( 'Bottom margin styles for wp.blockEditor.URLInput', {
- since: '6.2',
- version: '6.5',
- hint: 'Set the `__nextHasNoMarginBottom` prop to true to start opting into the new styles, which will become the default in a future version',
- } );
- }
-
return (
-
+
{ loading && }
diff --git a/packages/block-editor/src/components/url-popover/link-editor.js b/packages/block-editor/src/components/url-popover/link-editor.js
index dc9d6d45590d3..e7d39eed764b8 100644
--- a/packages/block-editor/src/components/url-popover/link-editor.js
+++ b/packages/block-editor/src/components/url-popover/link-editor.js
@@ -31,7 +31,6 @@ export default function LinkEditor( {
{ ...props }
>
setAttributes( { url: nextURL } )