Skip to content

Commit e0251ec

Browse files
authored
chore(FilterBar): more post wc update fixes (#4680)
1 parent acc8b28 commit e0251ec

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

packages/base/src/styling/CssSizeVariables.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { ThemingParameters } from './ThemingParameters.js';
2+
13
export enum CssSizeVariablesNames {
24
sapWcrBarHeight = '--sapWcrBarHeight',
35
sapWcrButtonTopBottomPadding = '--sapWcrButtonTopBottomPadding',
@@ -18,7 +20,8 @@ export enum CssSizeVariablesNames {
1820
sapWcrMessageViewListItemHeightByLine = '--sapWcrMessageViewListItemHeightByLine',
1921
sapWcrSplitterSize = '--sapWcrSplitterSize',
2022
sapWcrDialogHeaderHeight = '--sapWcrDialogHeaderHeight',
21-
sapWcrDialogSubHeaderHeight = '--sapWcrDialogSubHeaderHeight'
23+
sapWcrDialogSubHeaderHeight = '--sapWcrDialogSubHeaderHeight',
24+
sawWcrElementHeight = '--sawWcrElementHeight'
2225
}
2326

2427
export const CssSizeVariables = new Proxy(CssSizeVariablesNames, {
@@ -45,7 +48,8 @@ export const CozySizes = {
4548
[CssSizeVariablesNames.sapWcrMessageViewListItemHeightByLine]: `3.325rem`,
4649
[CssSizeVariablesNames.sapWcrSplitterSize]: `1rem`,
4750
[CssSizeVariablesNames.sapWcrDialogHeaderHeight]: '2.75rem',
48-
[CssSizeVariablesNames.sapWcrDialogSubHeaderHeight]: '3rem'
51+
[CssSizeVariablesNames.sapWcrDialogSubHeaderHeight]: '3rem',
52+
[CssSizeVariablesNames.sawWcrElementHeight]: ThemingParameters.sapElement_Height
4953
};
5054

5155
export const CompactSizes = {
@@ -67,5 +71,6 @@ export const CompactSizes = {
6771
[CssSizeVariablesNames.sapWcrMessageViewListItemHeightSingle]: `2rem`,
6872
[CssSizeVariablesNames.sapWcrMessageViewListItemHeightByLine]: `3.25rem`,
6973
[CssSizeVariablesNames.sapWcrDialogHeaderHeight]: '2.5rem',
70-
[CssSizeVariablesNames.sapWcrDialogSubHeaderHeight]: '2.25rem'
74+
[CssSizeVariablesNames.sapWcrDialogSubHeaderHeight]: '2.25rem',
75+
[CssSizeVariablesNames.sawWcrElementHeight]: ThemingParameters.sapElement_Compact_Height
7176
};

packages/main/src/components/FilterBar/FilterBar.jss.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ThemingParameters } from '@ui5/webcomponents-react-base';
1+
import { CssSizeVariables, ThemingParameters } from '@ui5/webcomponents-react-base';
22

33
const styles = {
44
outerContainer: {
@@ -72,7 +72,7 @@ const styles = {
7272
flexBasis: 'calc(var(--_ui5wcr_filter_group_item_flex_basis))'
7373
},
7474
lastSpacer: {
75-
height: 'var(--_ui5_input_height)',
75+
height: CssSizeVariables.sawWcrElementHeight,
7676
flexGrow: 1,
7777
flexShrink: 0,
7878
maxWidth: 'calc(var(--_ui5wcr_filter_group_item_flex_basis) * 2)',

0 commit comments

Comments
 (0)