From 1eb6a6cccd35d305f6353eb69f2dae8558330da7 Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Fri, 19 Jul 2024 18:17:52 +0300
Subject: [PATCH] enhanements

---
 .../dataviews/src/components/dataviews-filters/index.tsx   | 2 ++
 .../dataviews/src/components/dataviews-filters/style.scss  | 7 ++++++-
 packages/dataviews/src/components/dataviews/index.tsx      | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/dataviews/src/components/dataviews-filters/index.tsx b/packages/dataviews/src/components/dataviews-filters/index.tsx
index 66ed19445ab89..d4ea156a4f06e 100644
--- a/packages/dataviews/src/components/dataviews-filters/index.tsx
+++ b/packages/dataviews/src/components/dataviews-filters/index.tsx
@@ -103,6 +103,7 @@ export function FilterVisibilityToggle( {
 				setOpenedFilter={ setOpenedFilter }
 				trigger={
 					<Button
+						className="dataviews-filters__visibility-toggle"
 						size="compact"
 						icon={ funnel }
 						label={ __( 'Add filter' ) }
@@ -116,6 +117,7 @@ export function FilterVisibilityToggle( {
 	return (
 		<>
 			<Button
+				className="dataviews-filters__visibility-toggle"
 				size="compact"
 				icon={ funnel }
 				label={ __( 'Toggle filter display' ) }
diff --git a/packages/dataviews/src/components/dataviews-filters/style.scss b/packages/dataviews/src/components/dataviews-filters/style.scss
index 71e7f16b9367e..b4c2da45da7af 100644
--- a/packages/dataviews/src/components/dataviews-filters/style.scss
+++ b/packages/dataviews/src/components/dataviews-filters/style.scss
@@ -256,8 +256,13 @@
 	}
 }
 
+.dataviews-filters__visibility-toggle {
+	margin-left: -$grid-unit-05;
+}
+
 .dataviews-filters-toggle__container {
 	position: relative;
+	flex-shrink: 0;
 }
 
 .dataviews-filters-toggle__count {
@@ -277,4 +282,4 @@
 
 .dataviews-search {
 	width: 100%;
-}
\ No newline at end of file
+}
diff --git a/packages/dataviews/src/components/dataviews/index.tsx b/packages/dataviews/src/components/dataviews/index.tsx
index 320cdbb072c32..678aca2ab4cf9 100644
--- a/packages/dataviews/src/components/dataviews/index.tsx
+++ b/packages/dataviews/src/components/dataviews/index.tsx
@@ -111,6 +111,8 @@ export default function DataViews< Item >( {
 					className="dataviews__view-actions"
 				>
 					{ search && <DataViewsSearch label={ searchLabel } /> }
+					<DataViewsBulkActions />
+					<DataViewsViewConfig defaultLayouts={ defaultLayouts } />
 					<FilterVisibilityToggle
 						filters={ filters }
 						view={ view }
@@ -119,8 +121,6 @@ export default function DataViews< Item >( {
 						setIsShowingFilter={ setIsShowingFilter }
 						isShowingFilter={ isShowingFilter }
 					/>
-					<DataViewsBulkActions />
-					<DataViewsViewConfig defaultLayouts={ defaultLayouts } />
 				</HStack>
 				{ isShowingFilter && <DataViewsFilters /> }
 				<DataViewsLayout />