From f7428affaca64b43a2227f470d6caabaa5d524a7 Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <aaryankhandu123@gmail.com>
Date: Thu, 17 Apr 2025 17:03:54 +0530
Subject: [PATCH 1/2] chore: remove border when toolbar is hidden

---
 .../components/pages/editor/toolbar/mobile-root.tsx |  9 +++++++--
 web/core/components/pages/editor/toolbar/root.tsx   |  7 ++++---
 .../components/pages/editor/toolbar/toolbar.tsx     | 13 +++++++++++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/web/core/components/pages/editor/toolbar/mobile-root.tsx b/web/core/components/pages/editor/toolbar/mobile-root.tsx
index a3cde27f4ce..ccc04ab6ebb 100644
--- a/web/core/components/pages/editor/toolbar/mobile-root.tsx
+++ b/web/core/components/pages/editor/toolbar/mobile-root.tsx
@@ -1,8 +1,11 @@
 import { observer } from "mobx-react";
+// plane imports
 import { EditorRefApi } from "@plane/editor";
-// components
 import { Header, EHeaderVariant } from "@plane/ui";
+// components
 import { PageExtraOptions, PageToolbar } from "@/components/pages";
+// hooks
+import { usePageFilters } from "@/hooks/use-page-filters";
 // plane web hooks
 import { EPageStoreType } from "@/plane-web/hooks/store";
 // store
@@ -18,6 +21,8 @@ export const PageEditorMobileHeaderRoot: React.FC<Props> = observer((props) => {
   const { editorRef, page, storeType } = props;
   // derived values
   const { isContentEditable } = page;
+  // page filters
+  const { isStickyToolbarEnabled } = usePageFilters();
 
   return (
     <>
@@ -25,7 +30,7 @@ export const PageEditorMobileHeaderRoot: React.FC<Props> = observer((props) => {
         <PageExtraOptions editorRef={editorRef} page={page} storeType={storeType} />
       </Header>
       <Header variant={EHeaderVariant.TERNARY}>
-        {isContentEditable && editorRef && <PageToolbar editorRef={editorRef} />}
+        {isContentEditable && editorRef && <PageToolbar editorRef={editorRef} isHidden={!isStickyToolbarEnabled} />}
       </Header>
     </>
   );
diff --git a/web/core/components/pages/editor/toolbar/root.tsx b/web/core/components/pages/editor/toolbar/root.tsx
index 3618600e955..54ecb87bb1d 100644
--- a/web/core/components/pages/editor/toolbar/root.tsx
+++ b/web/core/components/pages/editor/toolbar/root.tsx
@@ -33,16 +33,17 @@ export const PageEditorToolbarRoot: React.FC<Props> = observer((props) => {
     <div id="page-toolbar-container">
       <div
         className={cn(
-          "hidden md:flex items-center relative min-h-[52px] page-toolbar-content border-b border-custom-border-200 px-page-x transition-all duration-200 ease-in-out",
+          "hidden md:flex items-center relative min-h-[52px] page-toolbar-content px-page-x border-b border-transparent transition-all duration-200 ease-in-out",
           {
             "wide-layout": isFullWidth,
+            "border-custom-border-200": isStickyToolbarEnabled,
           }
         )}
       >
         <div className="max-w-full w-full flex items-center justify-between">
           <div>
-            {isStickyToolbarEnabled && editorReady && isContentEditable && editorRef.current && (
-              <PageToolbar editorRef={editorRef?.current} />
+            {editorReady && isContentEditable && editorRef.current && (
+              <PageToolbar editorRef={editorRef?.current} isHidden={!isStickyToolbarEnabled} />
             )}
           </div>
           <PageExtraOptions editorRef={resolvedEditorRef} page={page} storeType={storeType} />
diff --git a/web/core/components/pages/editor/toolbar/toolbar.tsx b/web/core/components/pages/editor/toolbar/toolbar.tsx
index 8d378acdb13..a9c374f685a 100644
--- a/web/core/components/pages/editor/toolbar/toolbar.tsx
+++ b/web/core/components/pages/editor/toolbar/toolbar.tsx
@@ -15,6 +15,7 @@ import { cn } from "@/helpers/common.helper";
 
 type Props = {
   editorRef: EditorRefApi;
+  isHidden: boolean;
 };
 
 type ToolbarButtonProps = {
@@ -63,7 +64,8 @@ ToolbarButton.displayName = "ToolbarButton";
 
 const toolbarItems = TOOLBAR_ITEMS.document;
 
-export const PageToolbar: React.FC<Props> = ({ editorRef }) => {
+export const PageToolbar: React.FC<Props> = (props) => {
+  const { editorRef, isHidden } = props;
   // states
   const [activeStates, setActiveStates] = useState<Record<string, boolean>>({});
 
@@ -96,7 +98,14 @@ export const PageToolbar: React.FC<Props> = ({ editorRef }) => {
   );
 
   return (
-    <div className="flex flex-wrap items-center divide-x divide-custom-border-200">
+    <div
+      className={cn(
+        "flex flex-wrap items-center divide-x divide-custom-border-200 opacity-100 transition-opacity duration-200 ease-in-out",
+        {
+          "opacity-0 pointer-events-none": isHidden,
+        }
+      )}
+    >
       <CustomMenu
         customButton={
           <span className="text-custom-text-300 text-sm border-[0.5px] border-custom-border-300 hover:bg-custom-background-80 h-7 w-24 rounded px-2 flex items-center justify-between gap-2 whitespace-nowrap text-left">

From d5fc7ff74035aab7e1817cbe98c91cf4b82685bd Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <aaryankhandu123@gmail.com>
Date: Thu, 17 Apr 2025 17:09:45 +0530
Subject: [PATCH 2/2] chore: add stricter conditions

---
 web/core/components/pages/editor/toolbar/root.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/core/components/pages/editor/toolbar/root.tsx b/web/core/components/pages/editor/toolbar/root.tsx
index 54ecb87bb1d..901ce7f5ea5 100644
--- a/web/core/components/pages/editor/toolbar/root.tsx
+++ b/web/core/components/pages/editor/toolbar/root.tsx
@@ -26,6 +26,7 @@ export const PageEditorToolbarRoot: React.FC<Props> = observer((props) => {
   const { isFullWidth, isStickyToolbarEnabled } = usePageFilters();
   // derived values
   const resolvedEditorRef = editorRef.current;
+  const shouldHideToolbar = !isStickyToolbarEnabled || !isContentEditable;
 
   if (!resolvedEditorRef) return null;
 
@@ -36,14 +37,14 @@ export const PageEditorToolbarRoot: React.FC<Props> = observer((props) => {
           "hidden md:flex items-center relative min-h-[52px] page-toolbar-content px-page-x border-b border-transparent transition-all duration-200 ease-in-out",
           {
             "wide-layout": isFullWidth,
-            "border-custom-border-200": isStickyToolbarEnabled,
+            "border-custom-border-200": true,
           }
         )}
       >
         <div className="max-w-full w-full flex items-center justify-between">
           <div>
-            {editorReady && isContentEditable && editorRef.current && (
-              <PageToolbar editorRef={editorRef?.current} isHidden={!isStickyToolbarEnabled} />
+            {editorReady && resolvedEditorRef && (
+              <PageToolbar editorRef={resolvedEditorRef} isHidden={shouldHideToolbar} />
             )}
           </div>
           <PageExtraOptions editorRef={resolvedEditorRef} page={page} storeType={storeType} />