No keyboardReturn on edit

Also fixes spinner on the internal url input
WordPress · Aug 8, 2023 · b98f214 · b98f214
1 parent 7434c99
commit b98f214
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/packages/block-editor/src/components/link-control/index.js b/packages/block-editor/src/components/link-control/index.js
@@ -359,6 +359,7 @@ function LinkControl( {
 						className={ classnames( {
 							'block-editor-link-control__search-input-wrapper': true,
 							'has-text-control': showTextControl,
+							'has-actions': showActions,
 						} ) }
 					>
 						{ showTextControl && (
@@ -392,15 +393,17 @@ function LinkControl( {
 							}
 							hideLabelFromVision={ ! showTextControl }
 						/>
-						<div className="block-editor-link-control__search-enter">
-							<Button
-								onClick={ isDisabled ? noop : handleSubmit }
-								label={ __( 'Submit' ) }
-								icon={ keyboardReturn }
-								className="block-editor-link-control__search-submit"
-								aria-disabled={ isDisabled }
-							/>
-						</div>
+						{ ! showActions && (
+							<div className="block-editor-link-control__search-enter">
+								<Button
+									onClick={ isDisabled ? noop : handleSubmit }
+									label={ __( 'Submit' ) }
+									icon={ keyboardReturn }
+									className="block-editor-link-control__search-submit"
+									aria-disabled={ isDisabled }
+								/>
+							</div>
+						) }
 					</div>
 					{ errorMessage && (
 						<Notice

diff --git a/packages/block-editor/src/components/link-control/style.scss b/packages/block-editor/src/components/link-control/style.scss
@@ -46,7 +46,8 @@ $preview-image-height: 140px;
 }
 
 // Provides positioning context for search actions
-.block-editor-link-control__search-input-container {
+.block-editor-link-control__search-input-container,
+.block-editor-link-control__search-input-wrapper {
 	position: relative;
 }
 
@@ -458,6 +459,11 @@ $preview-image-height: 140px;
 	}
 }
 
+.block-editor-link-control .block-editor-link-control__search-input-wrapper.has-actions .components-spinner {
+	top: calc(50% + #{$spinner-size} / 4); // Add top spacing because this input has a visual label.
+	right: $grid-unit-15;
+}
+
 .block-editor-link-control__search-item-action {
 	margin-left: auto; // push to far right hand side
 	flex-shrink: 0;