Mirrors/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2026-02-24 04:00:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sync/ce-ee' of github.com:makeplane/plane-ee into develop

Browse Source
This commit is contained in:
sriram veeraghanta
2024-04-26 18:34:48 +05:30
parent f3fc68cb67 e75947a5f4
commit af92501b31
9 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/ui/src/form-fields/textarea.tsx
View File

@@ -15,7 +15,7 @@ const TextArea = React.forwardRef<HTMLTextAreaElement, TextAreaProps>((props, re
// refs
const textAreaRef = useRef<any>(ref);
// auto re-size
useAutoResizeTextArea(textAreaRef);
useAutoResizeTextArea(textAreaRef, value);
return (
<textarea

30
packages/ui/src/hooks/use-auto-resize-textarea.ts
View File

@@ -1,24 +1,16 @@
import { useEffect } from "react";
import { useLayoutEffect } from "react";
export const useAutoResizeTextArea = (textAreaRef: React.RefObject<HTMLTextAreaElement>) => {
useEffect(() => {
export const useAutoResizeTextArea = (
textAreaRef: React.RefObject<HTMLTextAreaElement>,
value: string | number | readonly string[]
) => {
useLayoutEffect(() => {
const textArea = textAreaRef.current;
if (!textArea) return;
const resizeTextArea = () => {
textArea.style.height = "auto";
const computedHeight = textArea.scrollHeight + "px";
textArea.style.height = computedHeight;
};
const handleInput = () => resizeTextArea();
// resize on mount
resizeTextArea();
textArea.addEventListener("input", handleInput);
return () => {
textArea.removeEventListener("input", handleInput);
};
}, [textAreaRef]);
// We need to reset the height momentarily to get the correct scrollHeight for the textarea
textArea.style.height = "0px";
const scrollHeight = textArea.scrollHeight;
textArea.style.height = scrollHeight + "px";
}, [textAreaRef, value]);
};

4
web/components/command-palette/command-modal.tsx
View File

@@ -178,7 +178,9 @@ export const CommandModal: React.FC = observer(() => {
return 0;
}}
onKeyDown={(e) => {
// when search is empty and page is undefined
// when search term is not empty, esc should clear the search term
if (e.key === "Escape" && searchTerm) setSearchTerm("");
// when user tries to close the modal with esc
if (e.key === "Escape" && !page && !searchTerm) closePalette();

4
web/components/headers/global-issues.tsx
View File

@@ -20,8 +20,8 @@ import { useLabel, useMember, useUser, useIssues } from "@/hooks/store";
import { usePlatformOS } from "@/hooks/use-platform-os";
const GLOBAL_VIEW_LAYOUTS = [
{ key: "list", title: "List", link: "/workspace-views", icon: List },
{ key: "spreadsheet", title: "Spreadsheet", link: "/workspace-views/all-issues", icon: Sheet },
{ key: "list", title: "List", link: "workspace-views", icon: List },
{ key: "spreadsheet", title: "Spreadsheet", link: "workspace-views/all-issues", icon: Sheet },
];
type Props = {

6
web/components/pages/editor/summary/heading-components.tsx
View File

@@ -10,7 +10,7 @@ export const OutlineHeading1 = ({ marking, onClick }: HeadingProps) => (
<button
type="button"
onClick={onClick}
className="ml-4 cursor-pointer text-sm font-medium text-custom-text-400 hover:text-custom-primary-100 max-md:ml-2.5"
className="text-sm text-left font-medium text-custom-text-300 hover:text-custom-primary-100"
>
{marking.text}
</button>
@@ -20,7 +20,7 @@ export const OutlineHeading2 = ({ marking, onClick }: HeadingProps) => (
<button
type="button"
onClick={onClick}
className="ml-6 cursor-pointer text-xs font-medium text-custom-text-400 hover:text-custom-primary-100"
className="ml-2 text-xs text-left font-medium text-custom-text-300 hover:text-custom-primary-100"
>
{marking.text}
</button>
@@ -30,7 +30,7 @@ export const OutlineHeading3 = ({ marking, onClick }: HeadingProps) => (
<button
type="button"
onClick={onClick}
className="ml-8 cursor-pointer text-xs font-medium text-custom-text-400 hover:text-custom-primary-100"
className="ml-4 text-xs text-left font-medium text-custom-text-300 hover:text-custom-primary-100"
>
{marking.text}
</button>

11
web/components/pages/editor/title.tsx
View File

@@ -22,12 +22,19 @@ export const PageEditorTitle: React.FC<Props> = observer((props) => {
return (
<>
{readOnly ? (
<h6 className="-mt-2 break-words bg-transparent text-4xl font-bold">{title}</h6>
<h6
className="break-words bg-transparent text-4xl font-bold"
style={{
lineHeight: "1.2",
}}
>
{title}
</h6>
) : (
<>
<TextArea
onChange={(e) => updateTitle(e.target.value)}
className="-mt-2 w-full bg-custom-background text-4xl font-bold outline-none p-0 border-none resize-none rounded-none"
className="w-full bg-custom-background text-4xl font-bold outline-none p-0 border-none resize-none rounded-none"
style={{
lineHeight: "1.2",
}}

2
web/components/pages/list/block.tsx
View File

@@ -51,7 +51,7 @@ export const PageListBlock: FC<TPageListBlock> = observer((props) => {
>
{/* page title */}
<Tooltip tooltipHeading="Title" tooltipContent={name}>
<h5 className="text-base font-semibold truncate">{name}</h5>
<h5 className="text-base font-medium truncate">{name}</h5>
</Tooltip>
{/* page properties */}

25
web/constants/cycle.ts
View File

@@ -93,29 +93,24 @@ export const CYCLE_STATUS: {
export const CYCLE_STATE_GROUPS_DETAILS = [
{
key: "backlog_issues",
title: "Backlog",
color: "#F0F0F3",
},
{
key: "unstarted_issues",
title: "Unstarted",
color: "#FB923C",
key: "completed_issues",
title: "Completed",
color: "#6490FE",
},
{
key: "started_issues",
title: "Started",
color: "#FFC53D",
color: "#FDD97F",
},
{
key: "completed_issues",
title: "Completed",
color: "#d687ff",
key: "unstarted_issues",
title: "Unstarted",
color: "#FEB055",
},
{
key: "cancelled_issues",
title: "Cancelled",
color: "#ef4444",
key: "backlog_issues",
title: "Backlog",
color: "#F0F0F3",
},
];

2
web/constants/issue.ts
View File

@@ -160,7 +160,7 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
},
extra_options: {
access: true,
values: ["show_empty_groups"],
values: ["show_empty_groups", "sub_issue"],
},
},
kanban: {