Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

using withTheme to avoid raw supersetTheme #24

Merged
merged 1 commit into from
Jul 29, 2020
Merged

using withTheme to avoid raw supersetTheme #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 15 additions & 10 deletions superset-frontend/src/components/ListView/Filters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/
import React, { useState } from 'react';
import { styled, withTheme, supersetTheme } from '@superset-ui/style';
import { styled, withTheme, SupersetThemeProps } from '@superset-ui/style';

import {
Select,
Expand Down Expand Up @@ -46,6 +46,7 @@ interface SelectFilterProps extends BaseFilter {
emptyLabel?: string;
fetchSelects?: Filter['fetchSelects'];
paginate?: boolean;
theme: SupersetThemeProps["theme"];
}

const FilterContainer = styled.div`
Expand All @@ -60,14 +61,6 @@ const FilterTitle = styled.label`
margin: 0 0.4em 0 0;
`;

const filterSelectTheme: PartialThemeConfig = {
spacing: {
baseUnit: 2,
minWidth: '5em',
fontSize: supersetTheme.typography.sizes.s,
},
};

const filterSelectStyles: PartialStylesConfig = {
container: (provider, { getValue }) => ({
...provider,
Expand All @@ -87,6 +80,8 @@ const filterSelectStyles: PartialStylesConfig = {

const CLEAR_SELECT_FILTER_VALUE = 'CLEAR_SELECT_FILTER_VALUE';

const StyledSelectFilter = withTheme(SelectFilter);

function SelectFilter({
Header,
selects = [],
Expand All @@ -95,7 +90,17 @@ function SelectFilter({
onSelect,
fetchSelects,
paginate = false,
theme,
}: SelectFilterProps) {

const filterSelectTheme: PartialThemeConfig = {
spacing: {
baseUnit: 2,
minWidth: '5em',
fontSize: theme.typography.sizes.s,
},
};

const clearFilterSelect = {
label: emptyLabel,
value: CLEAR_SELECT_FILTER_VALUE,
Expand Down Expand Up @@ -236,7 +241,7 @@ function UIFilters({
internalFilters[index] && internalFilters[index].value;
if (input === 'select') {
return (
<SelectFilter
<StyledSelectFilter
key={id}
name={id}
Header={Header}
Expand Down