Skip to content

POC for disabled-busy switch row with a spinner #1404

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

Open
brtbrt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

POC for disabled-busy switch row with a spinner #1404

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
122 changes: 81 additions & 41 deletions src/list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {vars} from './skins/skin-contract.css';
import {applyCssVars} from './utils/css';
import {IconButton, ToggleIconButton} from './icon-button';
import ScreenReaderOnly from './screen-reader-only';
import Spinner from './spinner';

import type {IconButtonProps, ToggleIconButtonProps} from './icon-button';
import type {TouchableElement, TouchableProps} from './touchable';
Expand All @@ -52,7 +53,7 @@ interface CommonProps {
touchableRole?: string;
extra?: React.ReactNode;
dataAttributes?: DataAttributes;
disabled?: boolean;
disabled?: boolean | 'busy';
withChevron?: boolean;
'aria-label'?: string;
right?: Right;
Expand Down Expand Up @@ -108,6 +109,19 @@ export const Content = ({
const numTextLines = [headline, title, subtitle, description, extra].filter(Boolean).length;
const centerY = numTextLines === 1;

const rightContent = (right: Right): JSX.Element => (
<div
className={classNames({
[styles.detailRight]: !!detail,
[styles.disabled]: disabled,
})}
ref={rightRef}
data-testid="endSlot"
>
{renderRight(right, centerY)}
</div>
);
console.log('content > ', disabled, control);
return (
<div className={styles.content} id={labelId}>
{asset && (
Expand Down Expand Up @@ -137,7 +151,6 @@ export const Content = ({
</div>
</div>
)}

<div
className={classNames(styles.rowBody, {[styles.disabled]: disabled})}
style={{justifyContent: centerY ? 'center' : 'flex-start'}}
Expand Down Expand Up @@ -196,15 +209,13 @@ export const Content = ({
</Box>
)}
</div>

{badge && (
<Box paddingLeft={16}>
<div className={classNames(styles.badge, {[styles.disabled]: disabled})}>
<Badge value={badge === true ? undefined : badge} />
</div>
</Box>
)}

{(detail || right || withChevron || control) && (
<div className={classNames(styles.rightContent, {[styles.rightRestrictedWidth]: !!detail})}>
{detail && (
Expand All @@ -220,18 +231,7 @@ export const Content = ({
</div>
)}

{right && (
<div
className={classNames({
[styles.detailRight]: !!detail,
[styles.disabled]: disabled,
})}
ref={rightRef}
data-testid="endSlot"
>
{renderRight(right, centerY)}
</div>
)}
{right && disabled !== 'busy' && rightContent(right)}

{withChevron && (
<div
Expand All @@ -246,11 +246,20 @@ export const Content = ({
</div>
)}

{control && (
{control && disabled !== 'busy' && (
<div style={{paddingLeft: detail || right ? 8 : 0}} className={styles.center}>
{control}
</div>
)}

{control && disabled === 'busy' && (
<>
{rightContent(<Spinner aria-hidden />)}
<div style={{display: 'none'}} aria-hidden={false}>
{control}
</div>
</>
)}
</div>
)}
</div>
Expand Down Expand Up @@ -436,6 +445,7 @@ const RowContent = React.forwardRef<TouchableElement, RowContentProps>((props, r
'aria-description': props['aria-description'],
'aria-describedby': props['aria-describedby'],
'aria-current': props['aria-current'],
'aria-busy': props.disabled === 'busy',
} as TouchableProps;

const [isChecked, toggle] = useControlState(props.switch || props.checkbox || {});
Expand Down Expand Up @@ -479,26 +489,54 @@ const RowContent = React.forwardRef<TouchableElement, RowContentProps>((props, r
withChevron={hasChevron}
/>
);
const BusyComponent = React.useMemo(
() =>
disabled === 'busy'
? () => (
<div
aria-live="assertive"
aria-hidden={false}
style={{
position: 'absolute',
width: '1px',
height: '1px',
margin: '-1px',
padding: '0',
overflow: 'hidden',
clip: 'rect(0 0 0 0)',
border: '0',
whiteSpace: 'nowrap',
}}
>
this component is updating itself
</div>
)
: () => null,
[disabled]
);

if (isInteractive && !hasControl) {
return (
<BaseTouchable
ref={ref}
className={classNames(styles.rowContent, {
[styles.touchableBackground]: hasHoverDefault,
[styles.touchableBackgroundInverse]: hasHoverInverse,
[styles.pointer]: !disabled,
})}
{...interactiveProps}
role={touchableRole}
dataAttributes={dataAttributes}
disabled={disabled}
tabIndex={tabIndex}
>
<Box paddingX={16} aria-hidden={!!props.to || !!props.href || undefined}>
{renderContent({role})}
</Box>
</BaseTouchable>
<>
<BusyComponent />
<BaseTouchable
ref={ref}
className={classNames(styles.rowContent, {
[styles.touchableBackground]: hasHoverDefault,
[styles.touchableBackgroundInverse]: hasHoverInverse,
[styles.pointer]: !disabled,
})}
{...interactiveProps}
role={touchableRole}
dataAttributes={dataAttributes}
disabled={!!disabled}
tabIndex={tabIndex}
>
<Box paddingX={16} aria-hidden={!!props.to || !!props.href || undefined}>
{renderContent({role})}
</Box>
</BaseTouchable>
</>
);
}

Expand All @@ -508,8 +546,9 @@ const RowContent = React.forwardRef<TouchableElement, RowContentProps>((props, r
ref={ref as React.Ref<HTMLDivElement>}
{...getPrefixedDataAttributes(dataAttributes)}
>
<BusyComponent />
<BaseTouchable
disabled={disabled}
disabled={!!disabled}
{...interactiveProps}
role={touchableRole}
className={classNames(styles.dualActionLeft, {
Expand Down Expand Up @@ -537,6 +576,7 @@ const RowContent = React.forwardRef<TouchableElement, RowContentProps>((props, r
ref={ref as React.Ref<HTMLDivElement>}
{...getPrefixedDataAttributes(dataAttributes)}
>
<BusyComponent />
{content}
</div>
);
Expand All @@ -548,7 +588,7 @@ const RowContent = React.forwardRef<TouchableElement, RowContentProps>((props, r
return isInteractive
? renderRowWithDoubleInteraction(
<Control
disabled={disabled}
disabled={!!disabled}
name={name}
checked={isChecked}
aria-label={ariaLabel}
Expand All @@ -561,7 +601,7 @@ const RowContent = React.forwardRef<TouchableElement, RowContentProps>((props, r
)
: renderRowWithSingleControl(
<Control
disabled={disabled}
disabled={!!disabled}
name={name}
checked={isChecked}
aria-label={ariaLabel}
Expand Down Expand Up @@ -618,9 +658,9 @@ const RowContent = React.forwardRef<TouchableElement, RowContentProps>((props, r
<Box padding={16}>
<Stack space="around">
{props.iconButton.Icon ? (
<IconButton {...props.iconButton} disabled={props.disabled} />
<IconButton {...props.iconButton} disabled={!!props.disabled} />
) : (
<ToggleIconButton {...props.iconButton} disabled={props.disabled} />
<ToggleIconButton {...props.iconButton} disabled={!!props.disabled} />
)}
</Stack>
</Box>
Expand All @@ -634,13 +674,13 @@ const RowContent = React.forwardRef<TouchableElement, RowContentProps>((props, r
{props.iconButton.Icon ? (
<IconButton
{...props.iconButton}
disabled={props.disabled}
disabled={!!props.disabled}
role={role}
/>
) : (
<ToggleIconButton
{...props.iconButton}
disabled={props.disabled}
disabled={!!props.disabled}
role={role}
/>
)}
Expand Down
2 changes: 2 additions & 0 deletions src/touchable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ interface CommonProps {
'aria-selected'?: 'true' | 'false' | boolean;
'aria-labelledby'?: string;
'aria-live'?: 'polite' | 'off' | 'assertive';
'aria-busy'?: boolean;
'aria-current'?: React.AriaAttributes['aria-current'];
'aria-description'?: string;
'aria-describedby'?: string;
Expand Down Expand Up @@ -153,6 +154,7 @@ const RawTouchable = React.forwardRef<TouchableElement, TouchableProps>((props,
'aria-labelledby': props['aria-labelledby'],
'aria-description': props['aria-description'],
'aria-describedby': props['aria-describedby'],
'aria-busy': props['aria-busy'],
};

const type = props.type ? props.type : 'button';
Expand Down
Loading