From da93f6f9efbdc1345acc73742db6878d3252c6c0 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Wed, 29 Jul 2020 16:55:02 -0700 Subject: [PATCH] style: FilterSelect style tweaks (#10446) * style: FilterSelect style tweaks * using withTheme to avoid raw supersetTheme * lint Co-authored-by: Evan Rusackas --- .../src/components/ListView/Filters.tsx | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/superset-frontend/src/components/ListView/Filters.tsx b/superset-frontend/src/components/ListView/Filters.tsx index 9b59dc162f829..c6017687ed31f 100644 --- a/superset-frontend/src/components/ListView/Filters.tsx +++ b/superset-frontend/src/components/ListView/Filters.tsx @@ -17,7 +17,7 @@ * under the License. */ import React, { useState } from 'react'; -import { styled, withTheme } from '@superset-ui/style'; +import { styled, withTheme, SupersetThemeProps } from '@superset-ui/style'; import { Select, @@ -46,11 +46,13 @@ interface SelectFilterProps extends BaseFilter { emptyLabel?: string; fetchSelects?: Filter['fetchSelects']; paginate?: boolean; + theme: SupersetThemeProps['theme']; } const FilterContainer = styled.div` display: inline-flex; margin-right: 2em; + font-size: ${({ theme }) => theme.typography.sizes.s}px; `; const FilterTitle = styled.label` @@ -59,13 +61,6 @@ const FilterTitle = styled.label` margin: 0 0.4em 0 0; `; -const filterSelectTheme: PartialThemeConfig = { - spacing: { - baseUnit: 2, - minWidth: '5em', - }, -}; - const filterSelectStyles: PartialStylesConfig = { container: (provider, { getValue }) => ({ ...provider, @@ -79,6 +74,7 @@ const filterSelectStyles: PartialStylesConfig = { ...provider, borderWidth: 0, boxShadow: 'none', + cursor: 'pointer', }), }; @@ -92,7 +88,16 @@ 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, @@ -175,6 +180,7 @@ function SelectFilter({ ); } +const StyledSelectFilter = withTheme(SelectFilter); interface SearchHeaderProps extends BaseFilter { Header: string; @@ -239,7 +245,7 @@ function UIFilters({ internalFilters[index] && internalFilters[index].value; if (input === 'select') { return ( -