From 92bef9b02a8669fce124533503670e987a320ecd Mon Sep 17 00:00:00 2001
From: ntsekouras <ntsekouras@outlook.com>
Date: Tue, 13 Feb 2024 12:32:39 +0200
Subject: [PATCH 1/2] DataViews: Fix patterns pagination `z-index`

---
 packages/edit-site/src/components/page-patterns/style.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/edit-site/src/components/page-patterns/style.scss b/packages/edit-site/src/components/page-patterns/style.scss
index 89f38e7d4c9a6..9e0158e025aae 100644
--- a/packages/edit-site/src/components/page-patterns/style.scss
+++ b/packages/edit-site/src/components/page-patterns/style.scss
@@ -101,6 +101,10 @@
 		text-overflow: ellipsis;
 		color: inherit;
 	}
+
+	.dataviews-pagination {
+		z-index: 2;
+	}
 }
 
 .dataviews-action-modal__duplicate-pattern {

From 13f095303149c3ea5ff01211f793b46d0269a0bb Mon Sep 17 00:00:00 2001
From: ntsekouras <ntsekouras@outlook.com>
Date: Tue, 13 Feb 2024 15:50:55 +0200
Subject: [PATCH 2/2] use css vars

---
 packages/base-styles/_z-index.scss                          | 3 ++-
 packages/edit-site/src/components/page-patterns/style.scss  | 2 +-
 .../src/components/page-templates-template-parts/index.js   | 1 +
 .../src/components/page-templates-template-parts/style.scss | 6 ++++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/base-styles/_z-index.scss b/packages/base-styles/_z-index.scss
index e6d8d12769e70..ff21d1d8df8f3 100644
--- a/packages/base-styles/_z-index.scss
+++ b/packages/base-styles/_z-index.scss
@@ -190,7 +190,8 @@ $z-layers: (
 	".edit-site-page-header": 2,
 	".edit-site-page-content": 1,
 	".edit-site-patterns__header": 2,
-	".edit-site-patterns__grid-pagination": 2,
+	".edit-site-patterns__dataviews-list-pagination": 2,
+	".edit-site-templates__dataviews-list-pagination": 2,
 	".edit-site-layout__canvas-container": 2,
 	".edit-site-layout__sidebar": 1,
 	".edit-site-layout__canvas-container.is-resizing::after": 100,
diff --git a/packages/edit-site/src/components/page-patterns/style.scss b/packages/edit-site/src/components/page-patterns/style.scss
index 9e0158e025aae..2dc9326e4d29b 100644
--- a/packages/edit-site/src/components/page-patterns/style.scss
+++ b/packages/edit-site/src/components/page-patterns/style.scss
@@ -103,7 +103,7 @@
 	}
 
 	.dataviews-pagination {
-		z-index: 2;
+		z-index: z-index(".edit-site-patterns__dataviews-list-pagination");
 	}
 }
 
diff --git a/packages/edit-site/src/components/page-templates-template-parts/index.js b/packages/edit-site/src/components/page-templates-template-parts/index.js
index 514ff14807195..9089d31cd66e0 100644
--- a/packages/edit-site/src/components/page-templates-template-parts/index.js
+++ b/packages/edit-site/src/components/page-templates-template-parts/index.js
@@ -429,6 +429,7 @@ export default function PageTemplatesTemplateParts( { postType } ) {
 
 	return (
 		<Page
+			className="edit-site-page-template-template-parts-dataviews"
 			title={
 				postType === TEMPLATE_POST_TYPE
 					? __( 'Templates' )
diff --git a/packages/edit-site/src/components/page-templates-template-parts/style.scss b/packages/edit-site/src/components/page-templates-template-parts/style.scss
index c4c2e3a6f2dbb..4e4c01bac8239 100644
--- a/packages/edit-site/src/components/page-templates-template-parts/style.scss
+++ b/packages/edit-site/src/components/page-templates-template-parts/style.scss
@@ -58,3 +58,9 @@
 .page-templates-description {
 	white-space: normal;
 }
+
+.edit-site-page-template-template-parts-dataviews {
+	.dataviews-pagination {
+		z-index: z-index(".edit-site-templates__dataviews-list-pagination");
+	}
+}