Skip to content

refactor(SelectDialog): use css modules instead of react-jss #5687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2024
Merged

refactor(SelectDialog): use css modules instead of react-jss #5687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 76 additions & 0 deletions packages/main/src/components/SelectDialog/SelectDialog.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
.dialog {
&::part(header) {
padding-block-end: 0.25rem;
flex-direction: column;
margin-block-end: 0;
}

&::part(content) {
padding: 0;
}
}

.headerContent {
display: grid;
grid-template-columns: fit-content(100px) minmax(0, 1fr) fit-content(100px);
grid-template-areas:
'titleStart titleCenter cancel'
'input input input';
grid-template-rows: var(--_ui5wcr-DialogHeaderHeight) var(--_ui5wcr-DialogSubHeaderHeight);
width: 100%;
align-items: center;
}

.title {
font-size: var(--sapFontLargeSize);
font-family: var(--sapFontHeaderFamily);
grid-column-start: titleStart;
grid-column-end: titleCenter;
max-width: 100%;
overflow: hidden;
text-overflow: ellipsis;
}

.titleCenterAlign {
grid-area: titleCenter;
justify-self: center;
}

.hiddenClearBtn {
grid-area: titleStart;
visibility: hidden;
}

.clearBtn {
grid-area: cancel;
justify-self: end;
}

.input {
grid-area: input;
width: 100%;
}

.footer {
display: flex;
align-items: center;
justify-content: end;
width: 100%;
box-sizing: border-box;

> * {
margin-inline-start: 0.5rem;
}
}

.inputIcon {
cursor: pointer;
color: var(--sapContent_IconColor);
}

.infoBar {
padding: 0 0.5rem;
position: sticky;
top: 0;
z-index: 1;
}
98 changes: 15 additions & 83 deletions packages/main/src/components/SelectDialog/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,10 @@

import iconDecline from '@ui5/webcomponents-icons/dist/decline.js';
import iconSearch from '@ui5/webcomponents-icons/dist/search.js';
import {
CssSizeVariables,
enrichEventWithDetails,
ThemingParameters,
useI18nBundle,
useSyncRef
} from '@ui5/webcomponents-react-base';
import { enrichEventWithDetails, useI18nBundle, useStylesheet, useSyncRef } from '@ui5/webcomponents-react-base';
import { clsx } from 'clsx';
import type { ReactNode } from 'react';
import React, { forwardRef, useState } from 'react';
import { createUseStyles } from 'react-jss';
import { ButtonDesign, ListMode, ToolbarDesign } from '../../enums/index.js';
import { CANCEL, CLEAR, RESET, SEARCH, SELECT, SELECTED } from '../../i18n/i18n-defaults.js';
import type { Ui5CustomEvent } from '../../types/index.js';
Expand All @@ -30,70 +23,7 @@ import type {
import { Button, Dialog, Icon, Input, List, Title } from '../../webComponents/index.js';
import { Text } from '../Text/index.js';
import { Toolbar } from '../Toolbar/index.js';

const useStyles = createUseStyles(
{
dialog: {
'&::part(header)': {
paddingBottom: '0.25rem',
flexDirection: 'column',
marginBottom: 0
},
'&::part(content)': {
padding: 0
}
},
headerContent: {
display: 'grid',
gridTemplateColumns: 'fit-content(100px) minmax(0, 1fr) fit-content(100px)',
gridTemplateAreas: `
"titleStart titleCenter cancel"
"input input input"
`,
gridTemplateRows: `${CssSizeVariables.ui5WcrDialogHeaderHeight} ${CssSizeVariables.ui5WcrDialogSubHeaderHeight}`,
width: '100%',
alignItems: 'center'
},
title: {
fontSize: ThemingParameters.sapFontLargeSize,
fontFamily: ThemingParameters.sapFontHeaderFamily,
gridColumnStart: 'titleStart',
gridColumnEnd: 'titleCenter',
maxWidth: '100%',
overflow: 'hidden',
textOverflow: 'ellipsis'
},
titleCenterAlign: {
gridArea: 'titleCenter',
justifySelf: 'center'
},
hiddenClearBtn: {
gridArea: 'titleStart',
visibility: 'hidden'
},
clearBtn: {
gridArea: 'cancel',
justifySelf: 'end'
},
input: {
gridArea: 'input',
width: '100%'
},
footer: {
display: 'flex',
alignItems: 'center',
justifyContent: 'end',
width: '100%',
boxSizing: 'border-box',
'& > *': {
marginInlineStart: '0.5rem'
}
},
inputIcon: { cursor: 'pointer', color: ThemingParameters.sapContent_IconColor },
infoBar: { padding: '0 0.5rem', position: 'sticky', top: 0, zIndex: 1 }
},
{ name: 'SelectDialog' }
);
import { classNames, styleData } from './SelectDialog.module.css.js';

interface ListDomRefWithPrivateAPIs extends ListDomRef {
get hasData(): boolean;
Expand Down Expand Up @@ -225,7 +155,7 @@ const SelectDialog = forwardRef<DialogDomRef, SelectDialogPropTypes>((props, ref
...rest
} = props;

const classes = useStyles();
useStylesheet(styleData, SelectDialog.displayName);
const i18nBundle = useI18nBundle('@ui5/webcomponents-react');
const [searchValue, setSearchValue] = useState('');
const [selectedItems, setSelectedItems] = useState([]);
Expand Down Expand Up @@ -335,32 +265,34 @@ const SelectDialog = forwardRef<DialogDomRef, SelectDialogPropTypes>((props, ref
{...rest}
data-component-name="SelectDialog"
ref={componentRef}
className={clsx(classes.dialog, className)}
className={clsx(classNames.dialog, className)}
onAfterClose={handleAfterClose}
onBeforeOpen={handleBeforeOpen}
onAfterOpen={handleAfterOpen}
onBeforeClose={handleBeforeClose}
>
<div className={classes.headerContent} slot="header">
<div className={classNames.headerContent} slot="header">
{showClearButton && headerTextAlignCenter && (
<Button
onClick={handleClear}
design={ButtonDesign.Transparent}
className={classes.hiddenClearBtn}
className={classNames.hiddenClearBtn}
tabIndex={-1}
aria-hidden="true"
>
{i18nBundle.getText(CLEAR)}
</Button>
)}
<Title className={clsx(classes.title, headerTextAlignCenter && classes.titleCenterAlign)}>{headerText}</Title>
<Title className={clsx(classNames.title, headerTextAlignCenter && classNames.titleCenterAlign)}>
{headerText}
</Title>
{showClearButton && (
<Button onClick={handleClear} design={ButtonDesign.Transparent} className={classes.clearBtn}>
<Button onClick={handleClear} design={ButtonDesign.Transparent} className={classNames.clearBtn}>
{i18nBundle.getText(CLEAR)}
</Button>
)}
<Input
className={classes.input}
className={classNames.input}
accessibleName={i18nBundle.getText(SEARCH)}
value={searchValue}
placeholder={i18nBundle.getText(SEARCH)}
Expand All @@ -375,13 +307,13 @@ const SelectDialog = forwardRef<DialogDomRef, SelectDialogPropTypes>((props, ref
name={iconDecline}
interactive
onClick={handleResetSearch}
className={classes.inputIcon}
className={classNames.inputIcon}
/>
)}
<Icon
interactive
name={iconSearch}
className={classes.inputIcon}
className={classNames.inputIcon}
onClick={handleSearchSubmit}
accessibleName={i18nBundle.getText(SEARCH)}
title={i18nBundle.getText(SEARCH)}
Expand All @@ -392,7 +324,7 @@ const SelectDialog = forwardRef<DialogDomRef, SelectDialogPropTypes>((props, ref
</div>

{mode === ListMode.MultiSelect && (!!selectedItems.length || numberOfSelectedItems > 0) && (
<Toolbar design={ToolbarDesign.Info} className={classes.infoBar}>
<Toolbar design={ToolbarDesign.Info} className={classNames.infoBar}>
<Text>{`${i18nBundle.getText(SELECTED)}: ${numberOfSelectedItems ?? selectedItems.length}`}</Text>
</Toolbar>
)}
Expand All @@ -406,7 +338,7 @@ const SelectDialog = forwardRef<DialogDomRef, SelectDialogPropTypes>((props, ref
>
{children}
</List>
<div slot="footer" className={classes.footer}>
<div slot="footer" className={classNames.footer}>
{mode === ListMode.MultiSelect && (
<Button {...confirmButtonProps} onClick={handleConfirm} design={ButtonDesign.Emphasized}>
{confirmButtonText ?? i18nBundle.getText(SELECT)}
Expand Down