Skip to content

Commit 9b35a54

Browse files
committed
fix(AnalyticalTableColumnFilter): fix callback, remove CustomListItem to allow inputs of spaces in filter
1 parent e9547df commit 9b35a54

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed

packages/base/src/styling/CssSizeVariables.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ export enum CssSizeVariablesNames {
1414
sapWcrAnalyticalTableTreePaddingLevel1 = 'sapWcrAnalyticalTableTreePaddingLevel1',
1515
sapWcrAnalyticalTableTreePaddingLevel2 = 'sapWcrAnalyticalTableTreePaddingLevel2',
1616
sapWcrAnalyticalTableTreePaddingLevel3 = 'sapWcrAnalyticalTableTreePaddingLevel3',
17-
sapWcrAnalyticalTableSelectionColumnWidth = 'sapWcrAnalyticalTableSelectionColumnWidth'
17+
sapWcrAnalyticalTableSelectionColumnWidth = 'sapWcrAnalyticalTableSelectionColumnWidth',
18+
sapWcrListItemHeight = 'sapWcrListItemHeight'
1819
}
1920

2021
export const CssSizeVariables: Record<CssSizeVariablesNames, string> = Object.values(CssSizeVariablesNames).reduce(
@@ -43,6 +44,7 @@ export const cssVariablesStyles = `
4344
--${CssSizeVariablesNames.sapWcrAnalyticalTableTreePaddingLevel2}:2.25rem;
4445
--${CssSizeVariablesNames.sapWcrAnalyticalTableTreePaddingLevel3}:2.75rem;
4546
--${CssSizeVariablesNames.sapWcrAnalyticalTableSelectionColumnWidth}:55px;
47+
--${CssSizeVariablesNames.sapWcrListItemHeight}:3rem;
4648
4749
}
4850
@@ -64,5 +66,6 @@ export const cssVariablesStyles = `
6466
--${CssSizeVariablesNames.sapWcrAnalyticalTableTreePaddingLevel2}:1.5rem;
6567
--${CssSizeVariablesNames.sapWcrAnalyticalTableTreePaddingLevel3}:2rem;
6668
--${CssSizeVariablesNames.sapWcrAnalyticalTableSelectionColumnWidth}:40px;
69+
--${CssSizeVariablesNames.sapWcrListItemHeight}:2rem;
6770
}
6871
`;

packages/main/src/components/AnalyticalTable/ColumnHeader/ColumnHeaderModal.tsx

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import '@ui5/webcomponents-icons/dist/icons/decline';
22
import { enrichEventWithDetails } from '@ui5/webcomponents-react-base/lib/Utils';
3-
import { CustomListItem } from '@ui5/webcomponents-react/lib/CustomListItem';
43
import { FlexBox } from '@ui5/webcomponents-react/lib/FlexBox';
4+
import { CssSizeVariables } from '@ui5/webcomponents-react-base/lib/CssSizeVariables';
5+
import { ThemingParameters } from '@ui5/webcomponents-react-base/lib/ThemingParameters';
56
import { FlexBoxAlignItems } from '@ui5/webcomponents-react/lib/FlexBoxAlignItems';
67
import { Icon } from '@ui5/webcomponents-react/lib/Icon';
78
import { List } from '@ui5/webcomponents-react/lib/List';
@@ -127,12 +128,17 @@ export const ColumnHeaderModal: FC<ColumnHeaderModalProperties> = (props: Column
127128
</StandardListItem>
128129
)}
129130
{showFilter && !column.isGrouped && (
130-
<CustomListItem type={ListItemTypes.Inactive}>
131-
<FlexBox alignItems={FlexBoxAlignItems.Center} style={{ padding: '0px 1rem' }}>
132-
<Icon name="filter" style={{ paddingRight: '0.5rem', minWidth: '1rem', minHeight: '1rem' }} />
133-
<Filter column={column} popoverRef={popoverRef} />
134-
</FlexBox>
135-
</CustomListItem>
131+
<FlexBox
132+
alignItems={FlexBoxAlignItems.Center}
133+
style={{
134+
padding: '0px 1rem',
135+
height: CssSizeVariables.sapWcrListItemHeight,
136+
borderBottom: `1px solid ${ThemingParameters.sapList_BorderColor}`
137+
}}
138+
>
139+
<Icon name="filter" style={{ paddingRight: '0.5rem', minWidth: '1rem', minHeight: '1rem' }} />
140+
<Filter column={column} popoverRef={popoverRef} />
141+
</FlexBox>
136142
)}
137143
{showGroup && (
138144
<StandardListItem type={ListItemTypes.Active} icon="group-2" data-sort={'group'}>

packages/main/src/components/AnalyticalTable/defaults/FilterComponent/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export /**
77
const DefaultFilterComponent: FC<any> = ({ column }) => {
88
const handleChange = useCallback(
99
(e) => {
10-
column.setFilter(e.detail.value);
10+
column.setFilter(e.target.value);
1111
},
1212
[column.setFilter]
1313
);

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3262,7 +3262,7 @@
32623262
dependencies:
32633263
"@types/react" "*"
32643264

3265-
"@types/react@*", "@types/react@^16.9.2":
3265+
"@types/react@*", "@types/react@16.9.2", "@types/react@^16.9.2":
32663266
version "16.9.2"
32673267
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.2.tgz#6d1765431a1ad1877979013906731aae373de268"
32683268
integrity sha512-jYP2LWwlh+FTqGd9v7ynUKZzjj98T8x7Yclz479QdRhHfuW9yQ+0jjnD31eXSXutmBpppj5PYNLYLRfnZJvcfg==

0 commit comments

Comments
 (0)