Skip to content

Commit 2a4f007

Browse files
authored
refactor(SelectDialog): replace ui5wcr Toolbar (#6235)
1 parent 4473118 commit 2a4f007

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

packages/base/src/styling/CssSizeVariables.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export enum CssSizeVariablesNames {
1212
ui5WcrAnalyticalTableTreePaddingLevel2 = '--_ui5wcr-AnalyticalTableTreePaddingLevel2',
1313
ui5WcrAnalyticalTableTreePaddingLevel3 = '--_ui5wcr-AnalyticalTableTreePaddingLevel3',
1414
ui5WcrCheckBoxWidthHeight = '--_ui5wcr-CheckBoxWidthHeight',
15+
ui5WcrCheckBoxPaddingInline = '--_ui5wcr-CheckBoxPaddingInline',
1516
ui5WcrAnalyticalTableSelectionColumnWidth = '--_ui5wcr-AnalyticalTableSelectionColumnWidth',
1617
ui5WcrToolbarHeight = '--_ui5wcr-ToolbarHeight',
1718
ui5WcrToolbarPopoverContentPadding = '--_ui5wcr-ToolbarPopoverContentPadding',
@@ -46,6 +47,7 @@ export const CozySizes = {
4647
[CssSizeVariablesNames.ui5WcrAnalyticalTableTreePaddingLevel2]: `1.5rem`,
4748
[CssSizeVariablesNames.ui5WcrAnalyticalTableTreePaddingLevel3]: `2rem`,
4849
[CssSizeVariablesNames.ui5WcrCheckBoxWidthHeight]: `2.75rem`,
50+
[CssSizeVariablesNames.ui5WcrCheckBoxPaddingInline]: `0.6875rem`,
4951
[CssSizeVariablesNames.ui5WcrAnalyticalTableSelectionColumnWidth]: `44px`,
5052
[CssSizeVariablesNames.ui5WcrToolbarHeight]: `2.75rem`,
5153
[CssSizeVariablesNames.ui5WcrToolbarPopoverContentPadding]: `0.25rem 0.5rem`,
@@ -71,6 +73,7 @@ export const CompactSizes = {
7173
[CssSizeVariablesNames.ui5WcrAnalyticalTableTreePaddingLevel2]: `2.25rem`,
7274
[CssSizeVariablesNames.ui5WcrAnalyticalTableTreePaddingLevel3]: `2.75rem`,
7375
[CssSizeVariablesNames.ui5WcrCheckBoxWidthHeight]: `2rem`,
76+
[CssSizeVariablesNames.ui5WcrCheckBoxPaddingInline]: '0.5rem',
7477
[CssSizeVariablesNames.ui5WcrAnalyticalTableSelectionColumnWidth]: `32px`,
7578
[CssSizeVariablesNames.ui5WcrToolbarHeight]: `2rem`,
7679
[CssSizeVariablesNames.ui5WcrToolbarPopoverContentPadding]: `0.1875rem 0.375rem`,

packages/main/src/components/SelectDialog/SelectDialog.module.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,12 @@
6969
}
7070

7171
.infoBar {
72-
padding: 0 0.5rem;
72+
height: 2rem;
73+
background-color: var(--sapInfobar_NonInteractive_Background);
74+
color: var(--sapList_TextColor);
75+
padding-inline-start: var(--_ui5wcr-CheckBoxPaddingInline);
76+
border-block-end: 0.0625rem solid var(--sapGroup_TitleBorderColor);
77+
overflow: hidden;
7378
position: sticky;
7479
top: 0;
7580
z-index: 1;

packages/main/src/components/SelectDialog/index.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { clsx } from 'clsx';
1010
import type { ReactNode } from 'react';
1111
import { forwardRef, useEffect, useState } from 'react';
1212
import { CANCEL, CLEAR, RESET, SEARCH, SELECT, SELECTED } from '../../i18n/i18n-defaults.js';
13+
import { Button, Dialog, FlexBox, FlexBoxAlignItems, Icon, Input, List, Text, Title } from '../../index.js';
1314
import type { Ui5CustomEvent } from '../../types/index.js';
1415
import type {
1516
ButtonDomRef,
@@ -19,12 +20,9 @@ import type {
1920
IconDomRef,
2021
InputDomRef,
2122
ListDomRef,
22-
ListPropTypes,
23-
ListItemStandardDomRef
23+
ListItemStandardDomRef,
24+
ListPropTypes
2425
} from '../../webComponents/index.js';
25-
import { Button, Dialog, Icon, Input, List, Title } from '../../webComponents/index.js';
26-
import { Text } from '../../webComponents/Text/index.js';
27-
import { Toolbar } from '../Toolbar/index.js';
2826
import { classNames, styleData } from './SelectDialog.module.css.js';
2927

3028
interface ListDomRefWithPrivateAPIs extends ListDomRef {
@@ -334,9 +332,9 @@ const SelectDialog = forwardRef<DialogDomRef, SelectDialogPropTypes>((props, ref
334332
</div>
335333

336334
{selectionMode === ListSelectionMode.Multiple && (!!selectedItems.length || numberOfSelectedItems > 0) && (
337-
<Toolbar design="Info" className={classNames.infoBar}>
335+
<FlexBox alignItems={FlexBoxAlignItems.Center} className={classNames.infoBar}>
338336
<Text>{`${i18nBundle.getText(SELECTED)}: ${numberOfSelectedItems ?? selectedItems.length}`}</Text>
339-
</Toolbar>
337+
</FlexBox>
340338
)}
341339
<List
342340
{...listProps}

packages/main/src/components/ThemeProvider/Sizes.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
--_ui5wcr-AnalyticalTableTreePaddingLevel3: 2rem;
1111
--_ui5wcr-BarHeight: 2.75rem;
1212
--_ui5wcr-ButtonTopBottomPadding: 0.25rem 0;
13+
--_ui5wcr-CheckBoxPaddingInline: 0.6875rem;
1314
--_ui5wcr-CheckBoxWidthHeight: 2.75rem;
1415
--_ui5wcr-DialogHeaderHeight: 2.75rem;
1516
--_ui5wcr-DialogSubHeaderHeight: 3rem;
@@ -38,6 +39,7 @@
3839
--_ui5wcr-AnalyticalTableTreePaddingLevel3: 2.75rem;
3940
--_ui5wcr-BarHeight: 2.5rem;
4041
--_ui5wcr-ButtonTopBottomPadding: 0.1875rem 0;
42+
--_ui5wcr-CheckBoxPaddingInline: 0.5rem;
4143
--_ui5wcr-CheckBoxWidthHeight: 2rem;
4244
--_ui5wcr-DialogHeaderHeight: 2.5rem;
4345
--_ui5wcr-DialogSubHeaderHeight: 2.25rem;

0 commit comments

Comments
 (0)