IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

chore: Replace sizeMe with AutoSizer in DashboardGrid

Browse Source
This commit is contained in:
Johannes Schill 2019-02-05 09:34:04 +01:00
parent 310ee5674f
commit ae0b027d69
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
public/app/features/dashboard/dashgrid/DashboardGrid.tsx
View File

@ -5,13 +5,12 @@ import { GRID_CELL_HEIGHT, GRID_CELL_VMARGIN, GRID_COLUMN_COUNT } from 'app/core
import { DashboardPanel } from './DashboardPanel'; import { DashboardPanel } from './DashboardPanel';
import { DashboardModel, PanelModel } from '../state'; import { DashboardModel, PanelModel } from '../state';
import classNames from 'classnames'; import classNames from 'classnames';
import sizeMe from 'react-sizeme'; import { AutoSizer } from 'react-virtualized';
let lastGridWidth = 1200; let lastGridWidth = 1200;
let ignoreNextWidthChange = false; let ignoreNextWidthChange = false;
interface GridWrapperProps { interface SizedReactLayoutGridProps {
size: { width: number; };
layout: ReactGridLayout.Layout[]; layout: ReactGridLayout.Layout[];
onLayoutChange: (layout: ReactGridLayout.Layout[]) => void; onLayoutChange: (layout: ReactGridLayout.Layout[]) => void;
children: JSX.Element | JSX.Element[]; children: JSX.Element | JSX.Element[];
@ -25,8 +24,12 @@ interface GridWrapperProps {
isFullscreen?: boolean; isFullscreen?: boolean;
} }
interface GridWrapperProps extends SizedReactLayoutGridProps {
sizedWidth: number;
}
function GridWrapper({ function GridWrapper({
size, sizedWidth,
layout, layout,
onLayoutChange, onLayoutChange,
children, children,
@ -38,8 +41,8 @@ function GridWrapper({
isResizable, isResizable,
isDraggable, isDraggable,
isFullscreen, isFullscreen,
}: GridWrapperProps) { }: GridWrapperProps) {
const width = size.width > 0 ? size.width : lastGridWidth; const width = sizedWidth > 0 ? sizedWidth : lastGridWidth;
// logic to ignore width changes (optimization) // logic to ignore width changes (optimization)
if (width !== lastGridWidth) { if (width !== lastGridWidth) {
@ -74,7 +77,16 @@ function GridWrapper({
); );
} }
const SizedReactLayoutGrid = sizeMe({ monitorWidth: true })(GridWrapper); const SizedReactLayoutGrid = (props: SizedReactLayoutGridProps) => (
<AutoSizer disableHeight>
{({width}) => (
<GridWrapper
sizedWidth={width}
{...props}
/>
)}
</AutoSizer>
);
export interface DashboardGridProps { export interface DashboardGridProps {
dashboard: DashboardModel; dashboard: DashboardModel;