From b80c6e2575a47d1aef5a73fc3b97530d4154228a Mon Sep 17 00:00:00 2001
From: sharma01ketan <sharma01ketan@gmail.com>
Date: Tue, 17 Sep 2024 21:50:54 +0530
Subject: [PATCH 1/2] fixed only for spreadsheet

---
 .../(projects)/workspace-views/[globalViewId]/page.tsx          | 2 +-
 .../filters/applied-filters/roots/global-view-root.tsx          | 2 ++
 web/core/components/workspace/views/header.tsx                  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx b/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx
index 3eec4b02764..c0580480767 100644
--- a/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx
@@ -25,7 +25,7 @@ const GlobalViewIssuesPage = observer(() => {
     <>
       <PageHead title={pageTitle} />
       <div className="h-full overflow-hidden bg-custom-background-100">
-        <div className="flex h-full w-full flex-col border-b border-custom-border-300">
+        <div className="flex h-full w-full flex-col border-b border-custom-border-300 bg-custom-background-100 z-[12]">
           <GlobalViewsHeader />
           {globalViewId && <GlobalViewsAppliedFiltersRoot globalViewId={globalViewId.toString()} />}
           <AllIssueLayoutRoot isDefaultView={!!defaultView} />
diff --git a/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx b/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx
index 7b3e8669eac..fca7f453afe 100644
--- a/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx
+++ b/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx
@@ -135,6 +135,7 @@ export const GlobalViewsAppliedFiltersRoot = observer((props: Props) => {
   if (areAppliedFiltersEmpty && areFiltersEqual) return null;
 
   return (
+    <div className="z-[12] bg-custom-background-100">
     <Header variant={EHeaderVariant.TERNARY}>
       <CreateUpdateWorkspaceViewModal
         isOpen={isModalOpen}
@@ -169,5 +170,6 @@ export const GlobalViewsAppliedFiltersRoot = observer((props: Props) => {
         <></>
       )}
     </Header>
+    </div>
   );
 });
diff --git a/web/core/components/workspace/views/header.tsx b/web/core/components/workspace/views/header.tsx
index 81554e8ca06..559bd6578ca 100644
--- a/web/core/components/workspace/views/header.tsx
+++ b/web/core/components/workspace/views/header.tsx
@@ -107,7 +107,7 @@ export const GlobalViewsHeader: React.FC = observer(() => {
   );
 
   return (
-    <Header variant={EHeaderVariant.SECONDARY} className="min-h-[44px]">
+    <Header variant={EHeaderVariant.SECONDARY} className="min-h-[44px] z-[12] bg-custom-background-100">
       <CreateUpdateWorkspaceViewModal isOpen={createViewModal} onClose={() => setCreateViewModal(false)} />
       <div
         ref={containerRef}

From e1a4b38d0959053f9f6076dd5cd4acd53b67255a Mon Sep 17 00:00:00 2001
From: sharma01ketan <sharma01ketan@gmail.com>
Date: Wed, 18 Sep 2024 16:40:52 +0530
Subject: [PATCH 2/2] change package for global change

---
 packages/ui/src/header/helper.tsx                               | 2 +-
 .../(projects)/workspace-views/[globalViewId]/page.tsx          | 2 +-
 .../filters/applied-filters/roots/global-view-root.tsx          | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/ui/src/header/helper.tsx b/packages/ui/src/header/helper.tsx
index b833f899fe6..bb6bbf1cc84 100644
--- a/packages/ui/src/header/helper.tsx
+++ b/packages/ui/src/header/helper.tsx
@@ -12,7 +12,7 @@ export const headerStyle: IHeaderProperties = {
   [EHeaderVariant.PRIMARY]:
     "relative flex w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100",
   [EHeaderVariant.SECONDARY]: "!py-0  overflow-y-hidden border-b border-custom-border-200 justify-between",
-  [EHeaderVariant.TERNARY]: "flex flex-wrap justify-between py-2  border-b border-custom-border-200 gap-2",
+  [EHeaderVariant.TERNARY]: "flex flex-wrap justify-between py-2  border-b border-custom-border-200 gap-2 bg-custom-background-100 z-[12]",
 };
 export const minHeights: IHeaderProperties = {
   [EHeaderVariant.PRIMARY]: "",
diff --git a/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx b/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx
index c0580480767..3eec4b02764 100644
--- a/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx
@@ -25,7 +25,7 @@ const GlobalViewIssuesPage = observer(() => {
     <>
       <PageHead title={pageTitle} />
       <div className="h-full overflow-hidden bg-custom-background-100">
-        <div className="flex h-full w-full flex-col border-b border-custom-border-300 bg-custom-background-100 z-[12]">
+        <div className="flex h-full w-full flex-col border-b border-custom-border-300">
           <GlobalViewsHeader />
           {globalViewId && <GlobalViewsAppliedFiltersRoot globalViewId={globalViewId.toString()} />}
           <AllIssueLayoutRoot isDefaultView={!!defaultView} />
diff --git a/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx b/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx
index fca7f453afe..7b3e8669eac 100644
--- a/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx
+++ b/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx
@@ -135,7 +135,6 @@ export const GlobalViewsAppliedFiltersRoot = observer((props: Props) => {
   if (areAppliedFiltersEmpty && areFiltersEqual) return null;
 
   return (
-    <div className="z-[12] bg-custom-background-100">
     <Header variant={EHeaderVariant.TERNARY}>
       <CreateUpdateWorkspaceViewModal
         isOpen={isModalOpen}
@@ -170,6 +169,5 @@ export const GlobalViewsAppliedFiltersRoot = observer((props: Props) => {
         <></>
       )}
     </Header>
-    </div>
   );
 });