disabled while busy

WordPress · May 9, 2024 · ec86533 · ec86533
1 parent e2e3ebe
commit ec86533
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/packages/dataviews/src/bulk-actions-toolbar.js b/packages/dataviews/src/bulk-actions-toolbar.js
@@ -47,7 +47,7 @@ function ActionTrigger( { action, onClick, isBusy } ) {
 			size="compact"
 			onClick={ onClick }
 			isBusy={ isBusy }
-			isDisabled={ isBusy }
+			__experimentalIsFocusable
 			tooltipPosition="top"
 		/>
 	);
@@ -142,7 +142,7 @@ function renderToolbarContent(
 					showTooltip
 					tooltipPosition="top"
 					label={ __( 'Cancel' ) }
-					isDisabled={ !! actionInProgress }
+					disabled={ !! actionInProgress }
 					onClick={ () => {
 						setSelection( EMPTY_ARRAY );
 					} }

diff --git a/packages/editor/src/components/post-actions/actions.js b/packages/editor/src/components/post-actions/actions.js
@@ -76,7 +76,8 @@ const trashPostAction = {
 					<Button
 						variant="tertiary"
 						onClick={ closeModal }
-						isDisabled={ isBusy }
+						disabled={ isBusy }
+						__experimentalIsFocusable
 					>
 						{ __( 'Cancel' ) }
 					</Button>
@@ -179,6 +180,8 @@ const trashPostAction = {
 							closeModal();
 						} }
 						isBusy={ isBusy }
+						disabled={ isBusy }
+						__experimentalIsFocusable
 					>
 						{ __( 'Delete' ) }
 					</Button>
@@ -757,7 +760,8 @@ const resetTemplateAction = {
 					<Button
 						variant="tertiary"
 						onClick={ closeModal }
-						isDisabled={ isBusy }
+						disabled={ isBusy }
+						__experimentalIsFocusable
 					>
 						{ __( 'Cancel' ) }
 					</Button>
@@ -774,6 +778,8 @@ const resetTemplateAction = {
 							isBusy( false );
 						} }
 						isBusy={ isBusy }
+						disabled={ isBusy }
+						__experimentalIsFocusable
 					>
 						{ __( 'Reset' ) }
 					</Button>
@@ -840,7 +846,8 @@ const deleteTemplateAction = {
 					<Button
 						variant="tertiary"
 						onClick={ closeModal }
-						isDisabled={ isBusy }
+						disabled={ isBusy }
+						__experimentalIsFocusable
 					>
 						{ __( 'Cancel' ) }
 					</Button>
@@ -859,6 +866,8 @@ const deleteTemplateAction = {
 							closeModal();
 						} }
 						isBusy={ isBusy }
+						disabled={ isBusy }
+						__experimentalIsFocusable
 					>
 						{ __( 'Delete' ) }
 					</Button>