Fix column picker errors

This commit is contained in:
dominik-zeglen 2020-01-31 16:20:14 +01:00
parent 679c193aab
commit 44d79897f2
2 changed files with 28 additions and 29 deletions

View file

@ -77,6 +77,7 @@ const ColumnPicker: React.FC<ColumnPickerProps> = props => {
};
return (
<ClickAwayListener onClickAway={() => setExpansionState(false)}>
<div ref={anchor} className={className}>
<ColumnPickerButton
active={isExpanded}
@ -97,10 +98,6 @@ const ColumnPicker: React.FC<ColumnPickerProps> = props => {
transformOrigin:
placement === "bottom" ? "right bottom" : "right top"
}}
>
<ClickAwayListener
onClickAway={() => setExpansionState(false)}
mouseEvent="onClick"
>
<ColumnPickerContent
columns={columns}
@ -114,11 +111,11 @@ const ColumnPicker: React.FC<ColumnPickerProps> = props => {
onReset={handleReset}
onSave={handleSave}
/>
</ClickAwayListener>
</Grow>
)}
</Popper>
</div>
</ClickAwayListener>
);
};

View file

@ -137,6 +137,7 @@ const ColumnPickerContent: React.FC<ColumnPickerContentProps> = props => {
name={column.value}
label={column.label}
onChange={() => onColumnToggle(column.value)}
key={column.value}
/>
))}
{loading && (
@ -160,6 +161,7 @@ const ColumnPickerContent: React.FC<ColumnPickerContentProps> = props => {
name={column.value}
label={column.label}
onChange={() => onColumnToggle(column.value)}
key={column.value}
/>
))}
</div>