Skip to content

Commit

Permalink
Tweak changed filter indicator
Browse files Browse the repository at this point in the history
  • Loading branch information
brunolemos committed Jun 29, 2019
1 parent 364d9fd commit b9f5ffa
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ export const ColumnOptions = React.memo((props: ColumnOptionsProps) => {
<ColumnOptionsRow
analyticsLabel="involves"
enableBackgroundHover={allowToggleCategories}
hasChanged={false}
hasChanged
headerItemFixedIconSize={columnHeaderItemContentSize}
iconName="person"
isOpen={openedOptionCategories.has('involves')}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export function ColumnOptionsInbox(props: ColumnOptionsInboxProps) {
containerStyle={containerStyle}
contentContainerStyle={contentContainerStyle}
enableBackgroundHover={enableBackgroundHover}
hasChanged={false}
hasChanged={inbox !== 'all'}
headerItemFixedIconSize={columnHeaderItemContentSize}
iconName="inbox"
isOpen={isOpen}
Expand Down
15 changes: 8 additions & 7 deletions packages/components/src/components/columns/ColumnOptionsRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@ export function ColumnOptionsRow(props: ColumnOptionsRowProps) {
<ColumnHeaderItem
analyticsLabel={undefined}
fixedIconSize
foregroundThemeColor={
hasChanged ? 'primaryBackgroundColor' : 'foregroundColor'
}
iconName={iconName}
iconStyle={{ lineHeight: 22 }}
noPadding
Expand All @@ -196,7 +199,7 @@ export function ColumnOptionsRow(props: ColumnOptionsRowProps) {
<Spacer width={contentPadding / 2} />

<ThemedText
color="foregroundColor"
color={hasChanged ? 'primaryBackgroundColor' : 'foregroundColor'}
numberOfLines={1}
style={{ fontWeight: '500' }}
>
Expand All @@ -205,17 +208,15 @@ export function ColumnOptionsRow(props: ColumnOptionsRowProps) {

<Spacer flex={1} minWidth={contentPadding / 2} />

{!!(subtitle || hasChanged) && (
{!!subtitle && (
<ThemedText
color={
!subtitle && hasChanged
? 'primaryBackgroundColor'
: 'foregroundColorMuted60'
hasChanged ? 'primaryBackgroundColor' : 'foregroundColorMuted60'
}
numberOfLines={1}
style={{ fontSize: subtitle ? 12 : 10 }}
style={{ fontSize: 12 }}
>
{subtitle || '●'}
{subtitle}
</ThemedText>
)}

Expand Down

0 comments on commit b9f5ffa

Please sign in to comment.