Fix behavior of clicking on domain link (#98410)

Automattic · Jan 15, 2025 · 1bb294a · 1bb294a
1 parent 6c4f1c8
commit 1bb294a
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/packages/domains-table/src/domains-table/domains-table-row.tsx b/packages/domains-table/src/domains-table/domains-table-row.tsx
@@ -80,6 +80,8 @@ export function DomainsTableRow( { domain }: DomainsTableRowProps ) {
 	const domainTypeText =
 		currentDomainData && getDomainTypeText( currentDomainData, __, domainInfoContext.DOMAIN_ROW );
 
+	const isAllDomainManagementEnabled = config.isEnabled( 'calypso/all-domain-management' );
+
 	const domainManagementLink = isManageableDomain
 		? getDomainManagementLink(
 				domain,
@@ -105,8 +107,6 @@ export function DomainsTableRow( { domain }: DomainsTableRowProps ) {
 	};
 
 	const handleSelect = () => {
-		const isAllDomainManagementEnabled = config.isEnabled( 'calypso/all-domain-management' );
-
 		if ( isAllDomainManagementEnabled && ( isHostingOverview || isAllSitesView ) ) {
 			page.show( domainManagementLink );
 			return;
@@ -115,6 +115,9 @@ export function DomainsTableRow( { domain }: DomainsTableRowProps ) {
 		window.location.href = domainManagementLink;
 	};
 
+	const handleDomainLinkClick = ( e: MouseEvent ) =>
+		isAllDomainManagementEnabled ? e.preventDefault() : e.stopPropagation();
+
 	return (
 		<tr
 			key={ domain.domain }
@@ -156,7 +159,7 @@ export function DomainsTableRow( { domain }: DomainsTableRowProps ) {
 								<a
 									className="domains-table__domain-name"
 									href={ domainManagementLink }
-									onClick={ ( e: MouseEvent ) => e.stopPropagation() }
+									onClick={ handleDomainLinkClick }
 								>
 									{ domain.domain }
 								</a>