Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

[WEB-5306] refactor: base layouts (#8051)

Jayash Tripathy0a738d419e35
diff --git a/apps/web/core/components/base-layouts/kanban/layout.tsx b/apps/web/core/components/base-layouts/kanban/layout.tsx
index 447a6dcb4c..7ef47f811e 100644
--- a/apps/web/core/components/base-layouts/kanban/layout.tsx
+++ b/apps/web/core/components/base-layouts/kanban/layout.tsx
@@ -20,15 +20,22 @@ export const BaseKanbanLayout = observer(<T extends IBaseLayoutsKanbanItem>(prop
showEmptyGroups = true,
enableDragDrop = false,
loadMoreItems,
- collapsedGroups: externalCollapsedGroups = [],
- onToggleGroup: externalOnToggleGroup = () => {},
+ collapsedGroups: externalCollapsedGroups,
+ onToggleGroup: externalOnToggleGroup,
} = props;
- const { containerRef, collapsedGroups, onToggleGroup } = useLayoutState({
- mode: "external",
- externalCollapsedGroups,
- externalOnToggleGroup,
- });
+ const useExternalMode = externalCollapsedGroups !== undefined && externalOnToggleGroup !== undefined;
+ const { containerRef, collapsedGroups, onToggleGroup } = useLayoutState(
+ useExternalMode
+ ? {
+ mode: "external",
+ externalCollapsedGroups,
+ externalOnToggleGroup,
+ }
+ : {
+ mode: "internal",
+ }
+ );
return (
<div ref={containerRef} className={cn("relative w-full flex gap-2 p-3 h-full overflow-x-auto", className)}>
diff --git a/apps/web/core/components/base-layouts/layout-switcher.tsx b/apps/web/core/components/base-layouts/layout-switcher.tsx
index 5fe9c57cf7..0f6d396269 100644
--- a/apps/web/core/components/base-layouts/layout-switcher.tsx
+++ b/apps/web/core/components/base-layouts/layout-switcher.tsx
@@ -9,7 +9,7 @@ import { BASE_LAYOUTS } from "./constants";
type Props = {
layouts?: TBaseLayoutType[];
onChange: (layout: TBaseLayoutType) => void;
- selectedLayout: TBaseLayoutType | undefined;
+ selectedLayout: TBaseLayoutType;
};
export const LayoutSwitcher: React.FC<Props> = (props) => {
diff --git a/apps/web/core/components/base-layouts/list/layout.tsx b/apps/web/core/components/base-layouts/list/layout.tsx
index e423e16d5a..59a012007a 100644
--- a/apps/web/core/components/base-layouts/list/layout.tsx
+++ b/apps/web/core/components/base-layouts/list/layout.tsx
@@ -17,17 +17,24 @@ export const BaseListLayout = observer(<T extends IBaseLayoutsListItem>(props: I
onDrop,
canDrag,
showEmptyGroups = false,
- collapsedGroups: externalCollapsedGroups = [],
- onToggleGroup: externalOnToggleGroup = () => {},
+ collapsedGroups: externalCollapsedGroups,
+ onToggleGroup: externalOnToggleGroup,
loadMoreItems,
className,
} = props;
- const { containerRef, collapsedGroups, onToggleGroup } = useLayoutState({
- mode: "external",
- externalCollapsedGroups,
- externalOnToggleGroup,
- });
+ const useExternalMode = externalCollapsedGroups !== undefined && externalOnToggleGroup !== undefined;
+ const { containerRef, collapsedGroups, onToggleGroup } = useLayoutState(
+ useExternalMode
+ ? {
+ mode: "external",
+ externalCollapsedGroups,
+ externalOnToggleGroup,
+ }
+ : {
+ mode: "internal",
+ }
+ );
return (
<div ref={containerRef} className={cn("relative size-full overflow-auto bg-custom-background-90", className)}>