chore: merge two separate info popovers (#6289)

web/core/components/pages/dropdowns/edit-information-popover.tsx

@@ -1,14 +1,7 @@
 import { observer } from "mobx-react";
-import Link from "next/link";
-import { useParams } from "next/navigation";
-// plane ui
-import { Avatar } from "@plane/ui";
 // helpers
-import { calculateTimeAgoShort, renderFormattedDate } from "@/helpers/date-time.helper";
+import { calculateTimeAgoShort } from "@/helpers/date-time.helper";
-import { getFileURL } from "@/helpers/file.helper";
+// store types
-// hooks
-import { useMember } from "@/hooks/store";
-// store
 import { TPageInstance } from "@/store/pages/base-page";
 
 type Props = {
@@ -17,55 +10,10 @@ type Props = {
 
 export const PageEditInformationPopover: React.FC<Props> = observer((props) => {
   const { page } = props;
-  // router
-  const { workspaceSlug } = useParams();
-  // store hooks
-  const { getUserDetails } = useMember();
-  // derived values
-  const editorInformation = page.updated_by ? getUserDetails(page.updated_by) : undefined;
-  const creatorInformation = page.created_by ? getUserDetails(page.created_by) : undefined;
 
   return (
-    <div className="flex-shrink-0 relative group/edit-information whitespace-nowrap">
+    <div className="flex-shrink-0 whitespace-nowrap">
       <span className="text-sm text-custom-text-300">Edited {calculateTimeAgoShort(page.updated_at ?? "")} ago</span>
-      <div className="hidden group-hover/edit-information:block absolute z-10 top-full right-0 rounded border-[0.5px] border-custom-border-200 bg-custom-background-100 p-2 shadow-custom-shadow-rg space-y-2">
-        <div>
-          <p className="text-xs font-medium text-custom-text-300">Edited by</p>
-          <Link
-            href={`/${workspaceSlug?.toString()}/profile/${page.updated_by}`}
-            className="mt-2 flex items-center gap-1.5 text-sm font-medium"
-          >
-            <Avatar
-              src={getFileURL(editorInformation?.avatar_url ?? "")}
-              name={editorInformation?.display_name}
-              className="flex-shrink-0"
-              size="sm"
-            />
-            <span>
-              {editorInformation?.display_name}{" "}
-              <span className="text-custom-text-300">{renderFormattedDate(page.updated_at)}</span>
-            </span>
-          </Link>
-        </div>
-        <div>
-          <p className="text-xs font-medium text-custom-text-300">Created by</p>
-          <Link
-            href={`/${workspaceSlug?.toString()}/profile/${page.created_by}`}
-            className="mt-2 flex items-center gap-1.5 text-sm font-medium"
-          >
-            <Avatar
-              src={getFileURL(creatorInformation?.avatar_url ?? "")}
-              name={creatorInformation?.display_name}
-              className="flex-shrink-0"
-              size="sm"
-            />
-            <span>
-              {creatorInformation?.display_name}{" "}
-              <span className="text-custom-text-300">{renderFormattedDate(page.created_at)}</span>
-            </span>
-          </Link>
-        </div>
-      </div>
     </div>
   );
 });

web/core/components/pages/editor/header/extra-options.tsx

@@ -83,7 +83,7 @@ export const PageExtraOptions: React.FC<Props> = observer((props) => {
           iconClassName="text-custom-text-100"
         />
       )}
-      <PageInfoPopover editorRef={editorRef} />
+      <PageInfoPopover editorRef={editorRef} page={page} />
       <PageOptionsDropdown editorRef={editorRef} page={page} />
     </div>
   );

web/core/components/pages/editor/header/info-popover.tsx

@@ -1,26 +1,44 @@
 import { useState } from "react";
+import Link from "next/link";
+import { useParams } from "next/navigation";
 import { usePopper } from "react-popper";
 import { Info } from "lucide-react";
 // plane editor
 import { EditorRefApi } from "@plane/editor";
+// plane ui
+import { Avatar } from "@plane/ui";
+// plane utils
+import { getFileURL, renderFormattedDate } from "@plane/utils";
 // helpers
 import { getReadTimeFromWordsCount } from "@/helpers/date-time.helper";
+// hooks
+import { useMember } from "@/hooks/store";
+// store types
+import { TPageInstance } from "@/store/pages/base-page";
 
 type Props = {
   editorRef: EditorRefApi | null;
+  page: TPageInstance;
 };
 
 export const PageInfoPopover: React.FC<Props> = (props) => {
-  const { editorRef } = props;
+  const { editorRef, page } = props;
   // states
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
   // refs
   const [referenceElement, setReferenceElement] = useState<HTMLButtonElement | null>(null);
   const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);
+  // router
+  const { workspaceSlug } = useParams();
   // popper-js
   const { styles: infoPopoverStyles, attributes: infoPopoverAttributes } = usePopper(referenceElement, popperElement, {
     placement: "bottom-start",
   });
+  // store hooks
+  const { getUserDetails } = useMember();
+  // derived values
+  const editorInformation = page.updated_by ? getUserDetails(page.updated_by) : undefined;
+  const creatorInformation = page.created_by ? getUserDetails(page.created_by) : undefined;
 
   const documentsInfo = editorRef?.getDocumentInfo() || { words: 0, characters: 0, paragraphs: 0 };
 
@@ -60,17 +78,57 @@ export const PageInfoPopover: React.FC<Props> = (props) => {
       </button>
       {isPopoverOpen && (
         <div
-          className="z-10 w-64 rounded border-[0.5px] border-custom-border-200 bg-custom-background-100 p-2 shadow-custom-shadow-rg grid grid-cols-2 gap-1.5"
+          className="z-10 w-64 rounded border-[0.5px] border-custom-border-200 bg-custom-background-100 p-2 shadow-custom-shadow-rg"
           ref={setPopperElement}
           style={infoPopoverStyles.popper}
           {...infoPopoverAttributes.popper}
         >
-          {documentInfoCards.map((card) => (
+          <div className="grid grid-cols-2 gap-1.5">
-            <div key={card.key} className="p-2 bg-custom-background-90 rounded">
+            {documentInfoCards.map((card) => (
-              <h6 className="text-base font-semibold">{card.info}</h6>
+              <div key={card.key} className="p-2 bg-custom-background-90 rounded">
-              <p className="mt-1.5 text-sm text-custom-text-300">{card.title}</p>
+                <h6 className="text-base font-semibold">{card.info}</h6>
+                <p className="mt-1.5 text-sm text-custom-text-300">{card.title}</p>
+              </div>
+            ))}
+          </div>
+          <div className="space-y-2 mt-3">
+            <div>
+              <p className="text-xs font-medium text-custom-text-300">Edited by</p>
+              <Link
+                href={`/${workspaceSlug?.toString()}/profile/${page.updated_by}`}
+                className="mt-2 flex items-center gap-1.5 text-sm font-medium"
+              >
+                <Avatar
+                  src={getFileURL(editorInformation?.avatar_url ?? "")}
+                  name={editorInformation?.display_name}
+                  className="flex-shrink-0"
+                  size="sm"
+                />
+                <span>
+                  {editorInformation?.display_name}{" "}
+                  <span className="text-custom-text-300">{renderFormattedDate(page.updated_at)}</span>
+                </span>
+              </Link>
             </div>
-          ))}
+            <div>
+              <p className="text-xs font-medium text-custom-text-300">Created by</p>
+              <Link
+                href={`/${workspaceSlug?.toString()}/profile/${page.created_by}`}
+                className="mt-2 flex items-center gap-1.5 text-sm font-medium"
+              >
+                <Avatar
+                  src={getFileURL(creatorInformation?.avatar_url ?? "")}
+                  name={creatorInformation?.display_name}
+                  className="flex-shrink-0"
+                  size="sm"
+                />
+                <span>
+                  {creatorInformation?.display_name}{" "}
+                  <span className="text-custom-text-300">{renderFormattedDate(page.created_at)}</span>
+                </span>
+              </Link>
+            </div>
+          </div>
         </div>
       )}
     </div>