π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
style: page editor width and layout updates (#6826)
Aaryan Khandelwala25cd426a9c6
diff --git a/packages/editor/src/core/components/editors/document/collaborative-editor.tsx b/packages/editor/src/core/components/editors/document/collaborative-editor.tsxindex 751c791011..623ec9508c 100644--- a/packages/editor/src/core/components/editors/document/collaborative-editor.tsx+++ b/packages/editor/src/core/components/editors/document/collaborative-editor.tsx@@ -1,5 +1,7 @@import { Extensions } from "@tiptap/core";import React from "react";+// plane imports+import { cn } from "@plane/utils";// componentsimport { DocumentContentLoader, PageRenderer } from "@/components/editors";// constants@@ -73,7 +75,11 @@ const CollaborativeDocumentEditor = (props: ICollaborativeDocumentEditor) => {if (!editor) return null;- if (!hasServerSynced && !hasServerConnectionFailed) return <DocumentContentLoader />;+ const blockWidthClassName = cn("w-full max-w-[720px] mx-auto transition-all duration-200 ease-in-out", {+ "max-w-[1152px]": displayConfig.wideLayout,+ });++ if (!hasServerSynced && !hasServerConnectionFailed) return <DocumentContentLoader className={blockWidthClassName} />;return (<PageRenderer@@ -81,7 +87,7 @@ const CollaborativeDocumentEditor = (props: ICollaborativeDocumentEditor) => {bubbleMenuEnabled={bubbleMenuEnabled}displayConfig={displayConfig}editor={editor}- editorContainerClassName={editorContainerClassNames}+ editorContainerClassName={cn(editorContainerClassNames, "document-editor")}id={id}tabIndex={tabIndex}/>diff --git a/packages/editor/src/core/components/editors/document/loader.tsx b/packages/editor/src/core/components/editors/document/loader.tsxindex ab9c3b479d..ece0d4b770 100644--- a/packages/editor/src/core/components/editors/document/loader.tsx+++ b/packages/editor/src/core/components/editors/document/loader.tsx@@ -1,42 +1,51 @@-// ui+// plane importsimport { Loader } from "@plane/ui";+import { cn } from "@plane/utils";-export const DocumentContentLoader = () => (- <div className="size-full px-5">- <Loader className="relative space-y-4">- <div className="space-y-2">- <div className="py-2">- <Loader.Item width="100%" height="36px" />- </div>- <Loader.Item width="80%" height="22px" />- <div className="relative flex items-center gap-2">- <Loader.Item width="30px" height="30px" />- <Loader.Item width="30%" height="22px" />- </div>- <div className="py-2">- <Loader.Item width="60%" height="36px" />- </div>- <Loader.Item width="70%" height="22px" />- <Loader.Item width="30%" height="22px" />- <div className="relative flex items-center gap-2">- <Loader.Item width="30px" height="30px" />- <Loader.Item width="30%" height="22px" />- </div>- <div className="py-2">- <Loader.Item width="50%" height="30px" />- </div>- <Loader.Item width="100%" height="22px" />- <div className="py-2">- <Loader.Item width="30%" height="30px" />- </div>- <Loader.Item width="30%" height="22px" />- <div className="relative flex items-center gap-2">+type Props = {+ className?: string;+};++export const DocumentContentLoader = (props: Props) => {+ const { className } = props;++ return (+ <div className={cn("size-full", className)}>+ <Loader className="relative space-y-4">+ <div className="space-y-2"><div className="py-2">+ <Loader.Item width="100%" height="36px" />+ </div>+ <Loader.Item width="80%" height="22px" />+ <div className="relative flex items-center gap-2"><Loader.Item width="30px" height="30px" />+ <Loader.Item width="30%" height="22px" />+ </div>+ <div className="py-2">+ <Loader.Item width="60%" height="36px" />+ </div>+ <Loader.Item width="70%" height="22px" />+ <Loader.Item width="30%" height="22px" />+ <div className="relative flex items-center gap-2">+ <Loader.Item width="30px" height="30px" />+ <Loader.Item width="30%" height="22px" />+ </div>+ <div className="py-2">+ <Loader.Item width="50%" height="30px" />+ </div>+ <Loader.Item width="100%" height="22px" />+ <div className="py-2">+ <Loader.Item width="30%" height="30px" /></div><Loader.Item width="30%" height="22px" />+ <div className="relative flex items-center gap-2">+ <div className="py-2">+ <Loader.Item width="30px" height="30px" />+ </div>+ <Loader.Item width="30%" height="22px" />+ </div></div>- </div>- </Loader>- </div>-);+ </Loader>+ </div>+ );+};diff --git a/packages/editor/src/core/components/editors/document/page-renderer.tsx b/packages/editor/src/core/components/editors/document/page-renderer.tsxindex a297686564..2b4c094c59 100644--- a/packages/editor/src/core/components/editors/document/page-renderer.tsx+++ b/packages/editor/src/core/components/editors/document/page-renderer.tsx@@ -132,7 +132,7 @@ export const PageRenderer = (props: IPageRenderer) => {return (<>- <div className="frame-renderer flex-grow w-full -mx-5" onMouseOver={handleLinkHover}>+ <div className="frame-renderer flex-grow w-full" onMouseOver={handleLinkHover}><EditorContainerdisplayConfig={displayConfig}editor={editor}diff --git a/packages/editor/src/core/components/editors/document/read-only-editor.tsx b/packages/editor/src/core/components/editors/document/read-only-editor.tsxindex fa1770f0ce..54a1f96e2c 100644--- a/packages/editor/src/core/components/editors/document/read-only-editor.tsx+++ b/packages/editor/src/core/components/editors/document/read-only-editor.tsx@@ -1,5 +1,7 @@import { Extensions } from "@tiptap/core";import { forwardRef, MutableRefObject } from "react";+// plane imports+import { cn } from "@plane/utils";// componentsimport { PageRenderer } from "@/components/editors";// constants@@ -79,7 +81,7 @@ const DocumentReadOnlyEditor = (props: IDocumentReadOnlyEditor) => {bubbleMenuEnabled={false}displayConfig={displayConfig}editor={editor}- editorContainerClassName={editorContainerClassName}+ editorContainerClassName={cn(editorContainerClassName, "document-editor")}id={id}/>);diff --git a/packages/editor/src/core/components/editors/editor-container.tsx b/packages/editor/src/core/components/editors/editor-container.tsxindex b742a52652..02f0a02171 100644--- a/packages/editor/src/core/components/editors/editor-container.tsx+++ b/packages/editor/src/core/components/editors/editor-container.tsx@@ -74,6 +74,7 @@ export const EditorContainer: FC<EditorContainerProps> = (props) => {`editor-container cursor-text relative line-spacing-${displayConfig.lineSpacing ?? DEFAULT_DISPLAY_CONFIG.lineSpacing}`,{"active-editor": editor?.isFocused && editor?.isEditable,+ "wide-layout": displayConfig.wideLayout,},displayConfig.fontSize ?? DEFAULT_DISPLAY_CONFIG.fontSize,displayConfig.fontStyle ?? DEFAULT_DISPLAY_CONFIG.fontStyle,diff --git a/packages/editor/src/core/constants/config.ts b/packages/editor/src/core/constants/config.tsindex 788454f963..ac6d63dd16 100644--- a/packages/editor/src/core/constants/config.ts+++ b/packages/editor/src/core/constants/config.ts@@ -5,6 +5,7 @@ export const DEFAULT_DISPLAY_CONFIG: TDisplayConfig = {fontSize: "large-font",fontStyle: "sans-serif",lineSpacing: "regular",+ wideLayout: false,};export const ACCEPTED_FILE_MIME_TYPES = ["image/jpeg", "image/jpg", "image/png", "image/webp", "image/gif"];diff --git a/packages/editor/src/core/helpers/common.ts b/packages/editor/src/core/helpers/common.tsindex 8638d2c151..04f827ece5 100644--- a/packages/editor/src/core/helpers/common.ts+++ b/packages/editor/src/core/helpers/common.ts@@ -49,7 +49,7 @@ export const isValidHttpUrl = (string: string): boolean => {try {url = new URL(string);- } catch (_) {+ } catch {return false;}diff --git a/packages/editor/src/core/types/config.ts b/packages/editor/src/core/types/config.tsindex 12df0aa423..4c91fec5d1 100644--- a/packages/editor/src/core/types/config.ts+++ b/packages/editor/src/core/types/config.ts@@ -29,4 +29,5 @@ export type TDisplayConfig = {fontStyle?: TEditorFontStyle;fontSize?: TEditorFontSize;lineSpacing?: TEditorLineSpacing;+ wideLayout?: boolean;};diff --git a/packages/editor/src/styles/editor.css b/packages/editor/src/styles/editor.cssindex be686a5cc7..ba910d1449 100644--- a/packages/editor/src/styles/editor.css+++ b/packages/editor/src/styles/editor.css@@ -8,7 +8,7 @@-moz-user-select: text;-ms-user-select: text;user-select: text;- outline: none;+ outline: none !important;cursor: text;font-family: var(--font-style);font-size: var(--font-size-regular);diff --git a/packages/editor/src/styles/variables.css b/packages/editor/src/styles/variables.cssindex ea70fe1ab8..31b64fa56c 100644--- a/packages/editor/src/styles/variables.css+++ b/packages/editor/src/styles/variables.css@@ -1,3 +1,47 @@+:root {+ /* text colors */+ --editor-colors-gray-text: #5c5e63;+ --editor-colors-peach-text: #ff5b59;+ --editor-colors-pink-text: #f65385;+ --editor-colors-orange-text: #fd9038;+ --editor-colors-green-text: #0fc27b;+ --editor-colors-light-blue-text: #17bee9;+ --editor-colors-dark-blue-text: #266df0;+ --editor-colors-purple-text: #9162f9;+ /* end text colors */++ /* layout */+ --normal-content-width: 720px;+ --wide-content-width: 1152px;+ --normal-content-margin: 20px;+ --wide-content-margin: 96px;+ /* end layout */+}++/* text background colors */+[data-theme*="light"] {+ --editor-colors-gray-background: #d6d6d8;+ --editor-colors-peach-background: #ffd5d7;+ --editor-colors-pink-background: #fdd4e3;+ --editor-colors-orange-background: #ffe3cd;+ --editor-colors-green-background: #c3f0de;+ --editor-colors-light-blue-background: #c5eff9;+ --editor-colors-dark-blue-background: #c9dafb;+ --editor-colors-purple-background: #e3d8fd;+}+[data-theme*="dark"] {+ --editor-colors-gray-background: #404144;+ --editor-colors-peach-background: #593032;+ --editor-colors-pink-background: #562e3d;+ --editor-colors-orange-background: #583e2a;+ --editor-colors-green-background: #1d4a3b;+ --editor-colors-light-blue-background: #1f495c;+ --editor-colors-dark-blue-background: #223558;+ --editor-colors-purple-background: #3d325a;+}+/* end text background colors */++/* font size and style */.editor-container {--color-placeholder: rgba(var(--color-text-100), 0.5);@@ -47,6 +91,8 @@/* end font sizes and line heights *//* font styles */+ --font-style: "Inter", sans-serif;+&.sans-serif {--font-style: "Inter", sans-serif;}@@ -102,3 +148,94 @@}/* end spacing */}+/* end font size and style */++/* layout config */+#page-header-container {+ container-name: page-header-container;+ container-type: inline-size;++ .page-header-content {+ --header-width: var(--normal-content-width);++ &.wide-layout {+ --header-width: var(--wide-content-width);+ }++ padding-left: calc(((100% - var(--header-width)) / 2) - 10px);+ }+}++#page-content-container {+ container-name: page-content-container;+ container-type: inline-size;+}++.editor-container.document-editor {+ --editor-content-width: var(--normal-content-width);++ &.wide-layout {+ --editor-content-width: var(--wide-content-width);+ }++ .ProseMirror {+ max-width: var(--editor-content-width);+ margin: 0 auto;+ transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);+ }+}++/* keep a static padding of 96px for wide layouts for container width >912px and <1344px */+@container page-header-container (min-width: 912px) and (max-width: 1344px) {+ .page-header-content.wide-layout {+ padding-left: var(--wide-content-margin) !important;+ }+}++/* keep a static padding of 96px for wide layouts for container width <912px */+@container page-header-container (max-width: 912) {+ .page-header-content.wide-layout {+ padding-left: var(--wide-content-margin) !important;+ }+}+/* end layout config */++/* keep a static padding of 20px for wide layouts for container width <760px */+@container page-header-container (max-width: 760px) {+ .page-header-content {+ padding-left: var(--normal-content-margin) !important;+ }+}+/* end layout config */++/* keep a static padding of 96px for wide layouts for container width >912px and <1344px */+@container page-content-container (min-width: 912px) and (max-width: 1344px) {+ .editor-container.wide-layout,+ .page-title-container {+ padding-left: var(--wide-content-margin);+ padding-right: var(--wide-content-margin);+ }+}++/* keep a static padding of 20px for wide layouts for container width <912px */+@container page-content-container (max-width: 912px) {+ .editor-container.wide-layout,+ .page-title-container {+ padding-left: var(--normal-content-margin);+ padding-right: var(--normal-content-margin);+ }+}++/* keep a static padding of 20px for normal layouts for container width <760px */+@container page-content-container (max-width: 760px) {+ .editor-container:not(.wide-layout),+ .page-title-container {+ padding-left: var(--normal-content-margin);+ padding-right: var(--normal-content-margin);+ }++ .page-summary-container {+ display: none;+ }+}+/* end layout config */diff --git a/web/ce/components/pages/editor/embed/issue-embed-upgrade-card.tsx b/web/ce/components/pages/editor/embed/issue-embed-upgrade-card.tsxindex b4f68028d8..1f698f0a74 100644--- a/web/ce/components/pages/editor/embed/issue-embed-upgrade-card.tsx+++ b/web/ce/components/pages/editor/embed/issue-embed-upgrade-card.tsx@@ -8,27 +8,25 @@ import { cn } from "@/helpers/common.helper";export const IssueEmbedUpgradeCard: React.FC<any> = (props) => (<divclassName={cn(- "w-full h-20 bg-custom-background-80 rounded-md border-[0.5px] border-custom-border-200 shadow-custom-shadow-2xs",+ "w-full bg-custom-background-80 rounded-md border-[0.5px] border-custom-border-200 shadow-custom-shadow-2xs flex items-center justify-between gap-5 px-5 py-2 max-md:flex-wrap",{"border-2": props.selected,})}>- <div className="flex items-center justify-between gap-5 mt-2.5 pl-4 pr-5 py-3 w-full max-md:max-w-full max-md:flex-wrap rounded-md">- <div className="flex items-center gap-4">- <ProIcon className="flex-shrink-0 size-4" />- <p className="text-custom-text !text-base">- Embed and access work items in pages seamlessly, upgrade to Plane Pro now.- </p>- </div>- <a- href="https://plane.so/pro"- target="_blank"- rel="noopener noreferrer"- className={cn(getButtonStyling("primary", "md"), "no-underline")}- >- Upgrade- </a>+ <div className="flex items-center gap-4">+ <ProIcon className="flex-shrink-0 size-4" />+ <p className="text-custom-text !text-base">+ Embed and access issues in pages seamlessly, upgrade to Plane Pro now.+ </p></div>+ <a+ href="https://plane.so/pro"+ target="_blank"+ rel="noopener noreferrer"+ className={cn(getButtonStyling("primary", "md"), "no-underline")}+ >+ Upgrade+ </a></div>);diff --git a/web/core/components/pages/editor/editor-body.tsx b/web/core/components/pages/editor/editor-body.tsxindex aba274affe..fce7f2e888 100644--- a/web/core/components/pages/editor/editor-body.tsx+++ b/web/core/components/pages/editor/editor-body.tsx@@ -1,6 +1,6 @@import { Dispatch, SetStateAction, useCallback, useMemo } from "react";import { observer } from "mobx-react";-// document-editor+// plane importsimport {CollaborativeDocumentEditorWithRef,EditorRefApi,@@ -10,15 +10,14 @@ import {TRealtimeConfig,TServerHandler,} from "@plane/editor";-// plane typesimport { TSearchEntityRequestPayload, TSearchResponse, TWebhookConnectionQueryParams } from "@plane/types";-// plane ui-import { Row } from "@plane/ui";+import { ERowVariant, Row } from "@plane/ui";+import { cn } from "@plane/utils";// componentsimport { EditorMentionsRoot } from "@/components/editor";import { PageContentBrowser, PageContentLoader, PageEditorTitle } from "@/components/pages";// helpers-import { cn, LIVE_BASE_PATH, LIVE_BASE_URL } from "@/helpers/common.helper";+import { LIVE_BASE_PATH, LIVE_BASE_URL } from "@/helpers/common.helper";import { generateRandomColor } from "@/helpers/string.helper";// hooksimport { useEditorMention } from "@/hooks/editor";@@ -48,7 +47,6 @@ type Props = {handleEditorReady: Dispatch<SetStateAction<boolean>>;handlers: TEditorBodyHandlers;page: TPageInstance;- sidePeekVisible: boolean;webhookConnectionParams: TWebhookConnectionQueryParams;workspaceSlug: string;};@@ -61,7 +59,6 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {handleEditorReady,handlers,page,- sidePeekVisible,webhookConnectionParams,workspaceSlug,} = props;@@ -91,8 +88,9 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {() => ({fontSize,fontStyle,+ wideLayout: isFullWidth,}),- [fontSize, fontStyle]+ [fontSize, fontStyle, isFullWidth]);const getAIMenu = useCallback(@@ -152,69 +150,70 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {[currentUser?.display_name, currentUser?.id]);- if (pageId === undefined || !realtimeConfig) return <PageContentLoader />;+ const blockWidthClassName = cn(+ "block bg-transparent w-full max-w-[720px] mx-auto transition-all duration-200 ease-in-out",+ {+ "max-w-[1152px]": isFullWidth,+ }+ );++ if (pageId === undefined || !realtimeConfig) return <PageContentLoader className={blockWidthClassName} />;return (- <div className="flex items-center h-full w-full overflow-y-auto">- <Row- className={cn("sticky top-0 hidden h-full flex-shrink-0 -translate-x-full py-5 duration-200 md:block", {- "translate-x-0": sidePeekVisible,- "w-[10rem] lg:w-[14rem]": !isFullWidth,- "w-[5%]": isFullWidth,- })}- >- {!isFullWidth && <PageContentBrowser editorRef={editorRef.current} />}- </Row>- <div- className={cn("size-full pt-5 duration-200", {- "md:w-[calc(100%-10rem)] xl:w-[calc(100%-28rem)]": !isFullWidth,- "md:w-[90%]": isFullWidth,- })}- >- <div className="size-full flex flex-col gap-y-7 overflow-y-auto overflow-x-hidden">- <PageEditorTitle- editorRef={editorRef}- title={pageTitle}- updateTitle={updateTitle}- readOnly={!isContentEditable}- />- <CollaborativeDocumentEditorWithRef- editable={isContentEditable}- id={pageId}- fileHandler={config.fileHandler}- handleEditorReady={handleEditorReady}- ref={editorRef}- containerClassName="h-full p-0 pb-64"- displayConfig={displayConfig}- editorClassName="pl-10"- mentionHandler={{- searchCallback: async (query) => {- const res = await fetchMentions(query);- if (!res) throw new Error("Failed in fetching mentions");- return res;- },- renderComponent: (props) => <EditorMentionsRoot {...props} />,- getMentionedEntityDetails: (id: string) => ({ display_name: getUserDetails(id)?.display_name ?? "" }),- }}- embedHandler={{- issue: issueEmbedProps,- }}- realtimeConfig={realtimeConfig}- serverHandler={serverHandler}- user={userConfig}- disabledExtensions={disabledExtensions}- aiHandler={{- menu: getAIMenu,- }}- />+ <Row+ className="relative size-full flex flex-col pt-[64px] overflow-y-auto overflow-x-hidden vertical-scrollbar scrollbar-md duration-200"+ variant={ERowVariant.HUGGING}+ >+ <div id="page-content-container" className="relative w-full flex-shrink-0 space-y-4">+ {/* table of content */}+ <div className="page-summary-container absolute h-full right-0 top-[64px] z-[5]">+ <div className="sticky top-[72px]">+ <div className="group/page-toc relative px-page-x">+ <div className="cursor-pointer max-h-[50vh] overflow-hidden">+ <PageContentBrowser editorRef={editorRef?.current} showOutline />+ </div>+ <div className="absolute top-0 right-0 opacity-0 translate-x-1/2 pointer-events-none group-hover/page-toc:opacity-100 group-hover/page-toc:-translate-x-1/4 group-hover/page-toc:pointer-events-auto transition-all duration-300 w-52 max-h-[70vh] overflow-y-scroll vertical-scrollbar scrollbar-sm whitespace-nowrap bg-custom-background-90 p-4 rounded">+ <PageContentBrowser editorRef={editorRef?.current} />+ </div>+ </div>+ </div></div>+ <PageEditorTitle+ editorRef={editorRef}+ readOnly={!isContentEditable}+ title={pageTitle}+ updateTitle={updateTitle}+ widthClassName={blockWidthClassName}+ />+ <CollaborativeDocumentEditorWithRef+ editable={isContentEditable}+ id={pageId}+ fileHandler={config.fileHandler}+ handleEditorReady={handleEditorReady}+ ref={editorRef}+ containerClassName="h-full p-0 pb-64"+ displayConfig={displayConfig}+ mentionHandler={{+ searchCallback: async (query) => {+ const res = await fetchMentions(query);+ if (!res) throw new Error("Failed in fetching mentions");+ return res;+ },+ renderComponent: (props) => <EditorMentionsRoot {...props} />,+ getMentionedEntityDetails: (id: string) => ({ display_name: getUserDetails(id)?.display_name ?? "" }),+ }}+ embedHandler={{+ issue: issueEmbedProps,+ }}+ realtimeConfig={realtimeConfig}+ serverHandler={serverHandler}+ user={userConfig}+ disabledExtensions={disabledExtensions}+ aiHandler={{+ menu: getAIMenu,+ }}+ /></div>- <div- className={cn("hidden xl:block flex-shrink-0 duration-200", {- "w-[10rem] lg:w-[14rem]": !isFullWidth,- "w-[5%]": isFullWidth,- })}- />- </div>+ </Row>);});diff --git a/web/core/components/pages/editor/header/extra-options.tsx b/web/core/components/pages/editor/header/extra-options.tsxindex 0b81d14522..d9198b84f1 100644--- a/web/core/components/pages/editor/header/extra-options.tsx+++ b/web/core/components/pages/editor/header/extra-options.tsx@@ -69,7 +69,7 @@ export const PageExtraOptions: React.FC<Props> = observer((props) => {};return (- <div className="flex items-center justify-end gap-3">+ <div className="flex items-center gap-3">{is_locked && <LockedComponent />}{archived_at && (<div className="flex-shrink-0 flex h-7 items-center gap-2 rounded-full bg-blue-500/20 px-3 py-0.5 text-xs font-medium text-blue-500">diff --git a/web/core/components/pages/editor/header/mobile-root.tsx b/web/core/components/pages/editor/header/mobile-root.tsxindex 22f25e2541..a3cde27f4c 100644--- a/web/core/components/pages/editor/header/mobile-root.tsx+++ b/web/core/components/pages/editor/header/mobile-root.tsx@@ -2,9 +2,7 @@ import { observer } from "mobx-react";import { EditorRefApi } from "@plane/editor";// componentsimport { Header, EHeaderVariant } from "@plane/ui";-import { PageExtraOptions, PageSummaryPopover, PageToolbar } from "@/components/pages";-// hooks-import { usePageFilters } from "@/hooks/use-page-filters";+import { PageExtraOptions, PageToolbar } from "@/components/pages";// plane web hooksimport { EPageStoreType } from "@/plane-web/hooks/store";// store@@ -13,29 +11,17 @@ import { TPageInstance } from "@/store/pages/base-page";type Props = {editorRef: EditorRefApi;page: TPageInstance;- setSidePeekVisible: (sidePeekState: boolean) => void;- sidePeekVisible: boolean;storeType: EPageStoreType;};export const PageEditorMobileHeaderRoot: React.FC<Props> = observer((props) => {- const { editorRef, page, setSidePeekVisible, sidePeekVisible, storeType } = props;+ const { editorRef, page, storeType } = props;// derived valuesconst { isContentEditable } = page;- // page filters- const { isFullWidth } = usePageFilters();return (<><Header variant={EHeaderVariant.SECONDARY}>- <div className="flex-shrink-0 my-auto">- <PageSummaryPopover- editorRef={editorRef}- isFullWidth={isFullWidth}- sidePeekVisible={sidePeekVisible}- setSidePeekVisible={setSidePeekVisible}- />- </div><PageExtraOptions editorRef={editorRef} page={page} storeType={storeType} /></Header><Header variant={EHeaderVariant.TERNARY}>diff --git a/web/core/components/pages/editor/header/root.tsx b/web/core/components/pages/editor/header/root.tsxindex 552ba60097..1099e838f6 100644--- a/web/core/components/pages/editor/header/root.tsx+++ b/web/core/components/pages/editor/header/root.tsx@@ -1,8 +1,7 @@import { observer } from "mobx-react";import { EditorRefApi } from "@plane/editor";// components-import { Header, EHeaderVariant } from "@plane/ui";-import { PageEditorMobileHeaderRoot, PageExtraOptions, PageSummaryPopover, PageToolbar } from "@/components/pages";+import { PageEditorMobileHeaderRoot, PageExtraOptions, PageToolbar } from "@/components/pages";// helpersimport { cn } from "@/helpers/common.helper";// hooks@@ -16,13 +15,11 @@ type Props = {editorReady: boolean;editorRef: React.RefObject<EditorRefApi>;page: TPageInstance;- setSidePeekVisible: (sidePeekState: boolean) => void;- sidePeekVisible: boolean;storeType: EPageStoreType;};export const PageEditorHeaderRoot: React.FC<Props> = observer((props) => {- const { editorReady, editorRef, page, setSidePeekVisible, sidePeekVisible, storeType } = props;+ const { editorReady, editorRef, page, storeType } = props;// derived valuesconst { isContentEditable } = page;// page filters@@ -33,39 +30,27 @@ export const PageEditorHeaderRoot: React.FC<Props> = observer((props) => {if (!resolvedEditorRef) return null;return (- <>- <Header variant={EHeaderVariant.SECONDARY} showOnMobile={false}>- <Header.LeftItem className="gap-0 w-full">- {editorReady && (- <div- className={cn("flex-shrink-0 my-auto", {- "w-40 lg:w-56": !isFullWidth,- "w-[5%]": isFullWidth,- })}- >- <PageSummaryPopover- editorRef={editorRef.current}- isFullWidth={isFullWidth}- sidePeekVisible={sidePeekVisible}- setSidePeekVisible={setSidePeekVisible}- />- </div>- )}- {isStickyToolbarEnabled && editorReady && isContentEditable && editorRef.current && (- <PageToolbar editorRef={editorRef?.current} />- )}- </Header.LeftItem>- <PageExtraOptions editorRef={resolvedEditorRef} page={page} storeType={storeType} />- </Header>+ <div id="page-header-container">+ <div+ className={cn(+ "hidden md:flex items-center relative min-h-[52px] page-header-content border-b border-custom-border-200 px-page-x transition-all duration-200 ease-in-out",+ {+ "wide-layout": isFullWidth,+ }+ )}+ >+ <div className="max-w-full w-full flex items-center justify-between">+ <div>+ {isStickyToolbarEnabled && editorReady && isContentEditable && editorRef.current && (+ <PageToolbar editorRef={editorRef?.current} />+ )}+ </div>+ <PageExtraOptions editorRef={resolvedEditorRef} page={page} storeType={storeType} />+ </div>+ </div><div className="md:hidden">- <PageEditorMobileHeaderRoot- editorRef={resolvedEditorRef}- page={page}- sidePeekVisible={sidePeekVisible}- setSidePeekVisible={setSidePeekVisible}- storeType={storeType}- />+ <PageEditorMobileHeaderRoot editorRef={resolvedEditorRef} page={page} storeType={storeType} /></div>- </>+ </div>);});diff --git a/web/core/components/pages/editor/page-root.tsx b/web/core/components/pages/editor/page-root.tsxindex c80a52d434..8949d1556e 100644--- a/web/core/components/pages/editor/page-root.tsx+++ b/web/core/components/pages/editor/page-root.tsx@@ -48,7 +48,6 @@ export const PageRoot = observer((props: TPageRootProps) => {// statesconst [editorReady, setEditorReady] = useState(false);const [hasConnectionFailed, setHasConnectionFailed] = useState(false);- const [sidePeekVisible, setSidePeekVisible] = useState(window.innerWidth >= 768);const [isVersionsOverlayOpen, setIsVersionsOverlayOpen] = useState(false);// refsconst editorRef = useRef<EditorRefApi>(null);@@ -104,14 +103,7 @@ export const PageRoot = observer((props: TPageRootProps) => {pageId={page.id ?? ""}restoreEnabled={isContentEditable}/>- <PageEditorHeaderRoot- editorReady={editorReady}- editorRef={editorRef}- page={page}- setSidePeekVisible={(state) => setSidePeekVisible(state)}- sidePeekVisible={sidePeekVisible}- storeType={storeType}- />+ <PageEditorHeaderRoot editorReady={editorReady} editorRef={editorRef} page={page} storeType={storeType} /><PageEditorBodyconfig={config}editorReady={editorReady}@@ -120,7 +112,6 @@ export const PageRoot = observer((props: TPageRootProps) => {handleEditorReady={setEditorReady}handlers={handlers}page={page}- sidePeekVisible={sidePeekVisible}webhookConnectionParams={webhookConnectionParams}workspaceSlug={workspaceSlug}/>diff --git a/web/core/components/pages/editor/summary/content-browser.tsx b/web/core/components/pages/editor/summary/content-browser.tsxindex 16d818aaeb..f3a92d2aee 100644--- a/web/core/components/pages/editor/summary/content-browser.tsx+++ b/web/core/components/pages/editor/summary/content-browser.tsx@@ -7,10 +7,11 @@ import { OutlineHeading1, OutlineHeading2, OutlineHeading3 } from "./heading-comtype Props = {editorRef: EditorRefApi | null;setSidePeekVisible?: (sidePeekState: boolean) => void;+ showOutline?: boolean;};export const PageContentBrowser: React.FC<Props> = (props) => {- const { editorRef, setSidePeekVisible } = props;+ const { editorRef, setSidePeekVisible, showOutline = false } = props;// statesconst [headings, setHeadings] = useState<IMarking[]>([]);@@ -37,24 +38,28 @@ export const PageContentBrowser: React.FC<Props> = (props) => {};return (- <div className="h-full flex flex-col overflow-hidden">- <div className="h-full flex flex-col items-start gap-y-2 overflow-y-auto mt-2">- {headings && headings.length !== 0 ? (- headings.map((marking) => {- const Component = HeadingComponent[marking.level];- if (!Component) return null;- return (- <Component- key={`${marking.level}-${marking.sequence}`}- marking={marking}- onClick={() => handleOnClick(marking)}- />- );- })- ) : (- <p className="mt-3 text-xs text-custom-text-400">Headings will be displayed here for navigation</p>- )}- </div>+ <div className="h-full flex flex-col items-start gap-y-2 overflow-y-auto mt-2">+ {headings.map((marking) => {+ const Component = HeadingComponent[marking.level];+ if (!Component) return null;+ if (showOutline === true)+ return (+ <div+ key={`${marking.level}-${marking.sequence}`}+ className="h-0.5 bg-custom-border-400 self-end rounded-sm"+ style={{+ width: marking.level === 1 ? "20px" : marking.level === 2 ? "18px" : "14px",+ }}+ />+ );+ return (+ <Component+ key={`${marking.level}-${marking.sequence}`}+ marking={marking}+ onClick={() => handleOnClick(marking)}+ />+ );+ })}</div>);};diff --git a/web/core/components/pages/editor/summary/heading-components.tsx b/web/core/components/pages/editor/summary/heading-components.tsxindex 5ed1752de0..c2e78dd67f 100644--- a/web/core/components/pages/editor/summary/heading-components.tsx+++ b/web/core/components/pages/editor/summary/heading-components.tsx@@ -1,36 +1,36 @@-// document editor-import { IMarking } from "@plane/editor";+// plane editor+import type { IMarking } from "@plane/editor";-type HeadingProps = {+export type THeadingComponentProps = {marking: IMarking;onClick: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;};-export const OutlineHeading1 = ({ marking, onClick }: HeadingProps) => (+export const OutlineHeading1 = ({ marking, onClick }: THeadingComponentProps) => (<buttontype="button"onClick={onClick}- className="text-sm text-left font-medium text-custom-text-300 hover:text-custom-primary-100"+ className="text-sm text-left font-medium text-custom-text-300 hover:text-custom-primary-100 transition-colors">{marking.text}</button>);-export const OutlineHeading2 = ({ marking, onClick }: HeadingProps) => (+export const OutlineHeading2 = ({ marking, onClick }: THeadingComponentProps) => (<buttontype="button"onClick={onClick}- className="ml-2 text-xs text-left font-medium text-custom-text-300 hover:text-custom-primary-100"+ className="ml-2 text-xs text-left font-medium text-custom-text-300 hover:text-custom-primary-100 transition-colors">{marking.text}</button>);-export const OutlineHeading3 = ({ marking, onClick }: HeadingProps) => (+export const OutlineHeading3 = ({ marking, onClick }: THeadingComponentProps) => (<buttontype="button"onClick={onClick}- className="ml-4 text-xs text-left font-medium text-custom-text-300 hover:text-custom-primary-100"+ className="ml-4 text-xs text-left font-medium text-custom-text-300 hover:text-custom-primary-100 transition-colors">{marking.text}</button>diff --git a/web/core/components/pages/editor/summary/index.ts b/web/core/components/pages/editor/summary/index.tsindex 3c4afb4d8a..779b785483 100644--- a/web/core/components/pages/editor/summary/index.ts+++ b/web/core/components/pages/editor/summary/index.ts@@ -1,2 +1 @@export * from "./content-browser";-export * from "./popover";diff --git a/web/core/components/pages/editor/summary/popover.tsx b/web/core/components/pages/editor/summary/popover.tsxdeleted file mode 100644index 9acc4a7cc0..0000000000--- a/web/core/components/pages/editor/summary/popover.tsx+++ /dev/null@@ -1,74 +0,0 @@-import { useState } from "react";-import { usePopper } from "react-popper";-import { List } from "lucide-react";-// document editor-import { EditorRefApi } from "@plane/editor";-// helpers-import { cn } from "@/helpers/common.helper";-// components-import { PageContentBrowser } from "./content-browser";--type Props = {- editorRef: EditorRefApi | null;- isFullWidth: boolean;- sidePeekVisible: boolean;- setSidePeekVisible: (sidePeekState: boolean) => void;-};--export const PageSummaryPopover: React.FC<Props> = (props) => {- const { editorRef, sidePeekVisible, setSidePeekVisible } = props;- // refs- const [referenceElement, setReferenceElement] = useState<HTMLButtonElement | null>(null);- const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);- // popper-js- const { styles: summaryPopoverStyles, attributes: summaryPopoverAttributes } = usePopper(- referenceElement,- popperElement,- {- placement: "bottom-start",- }- );-- return (- <div className="group/summary-popover w-min whitespace-nowrap">- <button- type="button"- ref={setReferenceElement}- className={`grid h-7 w-7 place-items-center rounded ${- sidePeekVisible ? "bg-custom-primary-100/20 text-custom-primary-100" : "text-custom-text-300"- }`}- onClick={() => setSidePeekVisible(!sidePeekVisible)}- >- <List className="h-4 w-4" />- </button>- <div- className={cn("block md:hidden", {- // "md:hidden": !isFullWidth,- })}- >- {sidePeekVisible && (- <div- className="z-10 max-h-80 w-64 overflow-y-auto rounded border-[0.5px] border-custom-border-200 bg-custom-background-100 p-3 shadow-custom-shadow-rg"- ref={setPopperElement}- style={summaryPopoverStyles.popper}- {...summaryPopoverAttributes.popper}- >- <PageContentBrowser setSidePeekVisible={setSidePeekVisible} editorRef={editorRef} />- </div>- )}- </div>- <div className="hidden md:block">- {!sidePeekVisible && (- <div- className="z-10 hidden max-h-80 w-64 overflow-y-auto rounded border-[0.5px] border-custom-border-200 bg-custom-background-100 p-3 shadow-custom-shadow-rg group-hover/summary-popover:block"- ref={setPopperElement}- style={summaryPopoverStyles.popper}- {...summaryPopoverAttributes.popper}- >- <PageContentBrowser editorRef={editorRef} />- </div>- )}- </div>- </div>- );-};diff --git a/web/core/components/pages/editor/title.tsx b/web/core/components/pages/editor/title.tsxindex 9e85c33d3b..f9cd7f1f28 100644--- a/web/core/components/pages/editor/title.tsx+++ b/web/core/components/pages/editor/title.tsx@@ -17,26 +17,28 @@ type Props = {readOnly: boolean;title: string | undefined;updateTitle: (title: string) => void;+ widthClassName: string;};export const PageEditorTitle: React.FC<Props> = observer((props) => {- const { editorRef, readOnly, title, updateTitle } = props;+ const { editorRef, readOnly, title, updateTitle, widthClassName } = props;// statesconst [isLengthVisible, setIsLengthVisible] = useState(false);// page filtersconst { fontSize } = usePageFilters();// ui- const titleClassName = cn("bg-transparent tracking-[-2%] font-bold", {+ const titleFontClassName = cn("tracking-[-2%] font-bold", {"text-[1.6rem] leading-[1.9rem]": fontSize === "small-font","text-[2rem] leading-[2.375rem]": fontSize === "large-font",});return (- <div className="relative w-full flex-shrink-0 md:pl-5 px-4">+ <div className="relative w-full flex-shrink-0 py-3 page-title-container">{readOnly ? (<h6className={cn(- titleClassName,+ titleFontClassName,+ widthClassName,{"text-custom-text-400": !title,},@@ -46,9 +48,9 @@ export const PageEditorTitle: React.FC<Props> = observer((props) => {{getPageName(title)}</h6>) : (- <>+ <div className={cn("relative", widthClassName)}><TextArea- className={cn(titleClassName, "w-full outline-none p-0 border-none resize-none rounded-none")}+ className={cn(titleFontClassName, "block w-full border-none outline-none p-0 resize-none rounded-none")}placeholder="Untitled"onKeyDown={(e) => {if (e.key === "Enter") {@@ -65,7 +67,7 @@ export const PageEditorTitle: React.FC<Props> = observer((props) => {/><divclassName={cn(- "pointer-events-none absolute bottom-1 right-1 z-[2] rounded bg-custom-background-100 p-0.5 text-xs text-custom-text-200 opacity-0 transition-opacity",+ "pointer-events-none absolute bottom-1 right-1 z-[2] font-normal rounded bg-custom-background-100 p-0.5 text-xs text-custom-text-200 opacity-0 transition-opacity",{"opacity-100": isLengthVisible,}@@ -80,7 +82,7 @@ export const PageEditorTitle: React.FC<Props> = observer((props) => {</span>/255</div>- </>+ </div>)}</div>);diff --git a/web/core/components/pages/loaders/page-content-loader.tsx b/web/core/components/pages/loaders/page-content-loader.tsxindex 25a4d61532..2e00bdc6aa 100644--- a/web/core/components/pages/loaders/page-content-loader.tsx+++ b/web/core/components/pages/loaders/page-content-loader.tsx@@ -1,19 +1,20 @@"use client";-// ui+// plane importsimport { Loader } from "@plane/ui";+import { cn } from "@plane/utils";-export const PageContentLoader = () => (- <div className="relative w-full h-full flex flex-col">- {/* header */}- <div className="px-16 flex-shrink-0 relative flex items-center justify-between h-12 border-b border-custom-border-100">- {/* left options */}- <Loader className="flex-shrink-0 w-[280px]">- <Loader.Item width="26px" height="26px" />- </Loader>+type Props = {+ className?: string;+};- {/* editor options */}- <div className="w-full relative flex items-center divide-x divide-custom-border-100">+export const PageContentLoader = (props: Props) => {+ const { className } = props;++ return (+ <div className={cn("relative size-full flex flex-col", className)}>+ {/* header */}+ <div className="flex-shrink-0 w-full h-12 border-b border-custom-border-100 relative flex items-center divide-x divide-custom-border-100"><Loader className="relative flex items-center gap-1 pr-2"><Loader.Item width="26px" height="26px" /><Loader.Item width="26px" height="26px" />@@ -37,56 +38,48 @@ export const PageContentLoader = () => (</Loader></div>- {/* right options */}- <Loader className="w-full relative flex justify-end items-center gap-1">- <Loader.Item width="60px" height="26px" />- <Loader.Item width="40px" height="26px" />- <Loader.Item width="26px" height="26px" />- <Loader.Item width="26px" height="26px" />- </Loader>- </div>-- {/* content */}- <div className="px-16 w-full h-full overflow-hidden relative flex">- {/* editor loader */}- <div className="w-full h-full py-5">- <Loader className="relative space-y-4">- <Loader.Item width="50%" height="36px" />- <div className="space-y-2">- <div className="py-2">- <Loader.Item width="100%" height="36px" />- </div>- <Loader.Item width="80%" height="22px" />- <div className="relative flex items-center gap-2">- <Loader.Item width="30px" height="30px" />- <Loader.Item width="30%" height="22px" />- </div>- <div className="py-2">- <Loader.Item width="60%" height="36px" />- </div>- <Loader.Item width="70%" height="22px" />- <Loader.Item width="30%" height="22px" />- <div className="relative flex items-center gap-2">- <Loader.Item width="30px" height="30px" />- <Loader.Item width="30%" height="22px" />- </div>- <div className="py-2">- <Loader.Item width="50%" height="30px" />- </div>- <Loader.Item width="100%" height="22px" />- <div className="py-2">- <Loader.Item width="30%" height="30px" />- </div>- <Loader.Item width="30%" height="22px" />- <div className="relative flex items-center gap-2">+ {/* content */}+ <div className="size-full pt-[64px] overflow-hidden relative flex">+ {/* editor loader */}+ <div className="size-full py-5">+ <Loader className="relative space-y-4">+ <Loader.Item width="50%" height="36px" />+ <div className="space-y-2"><div className="py-2">+ <Loader.Item width="100%" height="36px" />+ </div>+ <Loader.Item width="80%" height="22px" />+ <div className="relative flex items-center gap-2"><Loader.Item width="30px" height="30px" />+ <Loader.Item width="30%" height="22px" /></div>+ <div className="py-2">+ <Loader.Item width="60%" height="36px" />+ </div>+ <Loader.Item width="70%" height="22px" /><Loader.Item width="30%" height="22px" />+ <div className="relative flex items-center gap-2">+ <Loader.Item width="30px" height="30px" />+ <Loader.Item width="30%" height="22px" />+ </div>+ <div className="py-2">+ <Loader.Item width="50%" height="30px" />+ </div>+ <Loader.Item width="100%" height="22px" />+ <div className="py-2">+ <Loader.Item width="30%" height="30px" />+ </div>+ <Loader.Item width="30%" height="22px" />+ <div className="relative flex items-center gap-2">+ <div className="py-2">+ <Loader.Item width="30px" height="30px" />+ </div>+ <Loader.Item width="30%" height="22px" />+ </div></div>- </div>- </Loader>+ </Loader>+ </div></div></div>- </div>-);+ );+};diff --git a/web/core/components/pages/version/editor.tsx b/web/core/components/pages/version/editor.tsxindex c067c5d9ed..f0b28e24e5 100644--- a/web/core/components/pages/version/editor.tsx+++ b/web/core/components/pages/version/editor.tsx@@ -1,19 +1,15 @@import { observer } from "mobx-react";import { useParams } from "next/navigation";-// plane editor+// plane importsimport { DocumentReadOnlyEditorWithRef, TDisplayConfig } from "@plane/editor";-// plane typesimport { TPageVersion } from "@plane/types";-// plane uiimport { Loader } from "@plane/ui";// componentsimport { EditorMentionsRoot } from "@/components/editor";// hooksimport { useEditorConfig } from "@/hooks/editor";-import { useWorkspace } from "@/hooks/store";+import { useMember, useWorkspace } from "@/hooks/store";import { usePageFilters } from "@/hooks/use-page-filters";-// store hooks-import { useMember } from "@/hooks/store";// plane web hooksimport { useEditorFlagging } from "@/plane-web/hooks/use-editor-flagging";import { useIssueEmbed } from "@/plane-web/hooks/use-issue-embed";@@ -50,6 +46,7 @@ export const PagesVersionEditor: React.FC<TVersionEditorProps> = observer((propsconst displayConfig: TDisplayConfig = {fontSize,fontStyle,+ wideLayout: true,};if (!isCurrentVersionActive && !versionDetails)