Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions packages/module/src/WidgetLayout/GridLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ import {
ExtendedTemplateConfig,
AnalyticsTracker,
WidgetConfiguration,
Breakpoints,
} from './types';
import { Button, EmptyState, EmptyStateActions, EmptyStateBody, EmptyStateVariant, PageSection } from '@patternfly/react-core';
import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
import GripVerticalIcon from '@patternfly/react-icons/dist/esm/icons/grip-vertical-icon';
import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
import { columns, breakpoints, droppingElemId, getWidgetIdentifier, extendLayout, getGridDimensions } from './utils';

export const defaultBreakpoints = breakpoints;
import { defaultBreakpoints, defaultColumns, droppingElemId, getWidgetIdentifier, extendLayout, getGridDimensions } from './utils';

const createSerializableConfig = (config?: WidgetConfiguration) => {
if (!config) { return undefined; }
Expand Down Expand Up @@ -62,6 +61,10 @@ export interface GridLayoutProps {
droppingWidgetType?: string;
/** Resize configuration options */
resizeWidgetConfig?: Partial<ResizeConfig>;
/** Custom breakpoints for responsive layout (container width thresholds in px) */
breakpoints?: Breakpoints;
/** Custom column counts per breakpoint variant */
columns?: Record<Variants, number>;
}

const LayoutEmptyState = ({
Expand Down Expand Up @@ -107,6 +110,8 @@ const GridLayout = ({
onActiveWidgetsChange,
droppingWidgetType,
resizeWidgetConfig,
breakpoints = defaultBreakpoints,
columns = defaultColumns,
}: GridLayoutProps) => {
const [isDragging, setIsDragging] = useState(false);
const [isInitialRender, setIsInitialRender] = useState(true);
Expand Down Expand Up @@ -226,10 +231,10 @@ const GridLayout = ({
// Update layout variant when container width changes
useEffect(() => {
if (mounted && layoutWidth > 0) {
const variant: Variants = getGridDimensions(layoutWidth);
const variant: Variants = getGridDimensions(layoutWidth, breakpoints);
setLayoutVariant(variant);
}
}, [layoutWidth, mounted]);
}, [layoutWidth, mounted, breakpoints]);

const activeLayout = internalTemplate[layoutVariant] || [];

Expand Down
4 changes: 2 additions & 2 deletions packages/module/src/WidgetLayout/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ export { default as WidgetDrawer } from './WidgetDrawer';

export * from './types';
export {
columns,
breakpoints,
defaultColumns,
defaultBreakpoints,
droppingElemId,
getWidgetIdentifier,
mapWidgetDefaults,
Expand Down
7 changes: 7 additions & 0 deletions packages/module/src/WidgetLayout/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ export const widgetIdSeparator = '#';

export type Variants = 'sm' | 'md' | 'lg' | 'xl';

export interface Breakpoints {
sm: number;
md: number;
lg: number;
xl: number;
}

export type LayoutWithTitle = LayoutItem & { title: string };

export type TemplateConfig = {
Expand Down
8 changes: 4 additions & 4 deletions packages/module/src/WidgetLayout/utils.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { ExtendedTemplateConfig, TemplateConfig, Variants, widgetIdSeparator } from './types';
import { ExtendedTemplateConfig, TemplateConfig, Variants, widgetIdSeparator, Breakpoints } from './types';

export const droppingElemId = '__dropping-elem__';

export const columns: Record<Variants, number> = { xl: 4, lg: 3, md: 2, sm: 1 };
export const defaultColumns: Record<Variants, number> = { xl: 4, lg: 3, md: 2, sm: 1 };

export const breakpoints: Record<Variants, number> = { xl: 1550, lg: 1400, md: 1100, sm: 800 };
export const defaultBreakpoints: Breakpoints = { xl: 1550, lg: 1400, md: 1100, sm: 800 };

/**
* Generate a unique widget identifier
Expand Down Expand Up @@ -52,7 +52,7 @@ export const extendLayout = (extendedTemplateConfig: ExtendedTemplateConfig): Ex
/**
* Get grid dimensions based on container width
*/
export function getGridDimensions(currentWidth: number): Variants {
export function getGridDimensions(currentWidth: number, breakpoints: Breakpoints = defaultBreakpoints): Variants {
if (currentWidth >= breakpoints.xl) {
return 'xl';
}
Expand Down