Desktop: Accessibility: Improve "change application layout" screen keyboard accessibility #11718
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| import * as React from 'react'; | ||
| import { Resizable, ResizeCallback, ResizeStartCallback, Size } from 're-resizable'; | ||
| import { LayoutItem } from './utils/types'; | ||
| import { itemMinHeight, itemMinWidth, itemSize, LayoutItemSizes } from './utils/useLayoutItemSizes'; | ||
|
|
||
| interface Props { | ||
| item: LayoutItem; | ||
| parent: LayoutItem|null; | ||
| sizes: LayoutItemSizes; | ||
| resizedItemMaxSize: Size|null; | ||
| onResizeStart: ResizeStartCallback; | ||
| onResize: ResizeCallback; | ||
| onResizeStop: ResizeCallback; | ||
| children: React.ReactNode; | ||
| isLastChild: boolean; | ||
| visible: boolean; | ||
| } | ||
|
|
||
| const LayoutItemContainer: React.FC<Props> = ({ | ||
| item, visible, parent, sizes, resizedItemMaxSize, onResize, onResizeStart, onResizeStop, children, isLastChild, | ||
| }) => { | ||
| const style: React.CSSProperties = { | ||
| display: visible ? 'flex' : 'none', | ||
| flexDirection: item.direction, | ||
| }; | ||
|
|
||
| const size: Size = itemSize(item, parent, sizes, true); | ||
|
|
||
| const className = `resizableLayoutItem rli-${item.key}`; | ||
| if (item.resizableRight || item.resizableBottom) { | ||
| const enable = { | ||
| top: false, | ||
| right: !!item.resizableRight && !isLastChild, | ||
| bottom: !!item.resizableBottom && !isLastChild, | ||
| left: false, | ||
| topRight: false, | ||
| bottomRight: false, | ||
| bottomLeft: false, | ||
| topLeft: false, | ||
| }; | ||
|
|
||
| return ( | ||
| <Resizable | ||
| key={item.key} | ||
| className={className} | ||
| style={style} | ||
| size={size} | ||
| onResizeStart={onResizeStart} | ||
| onResize={onResize} | ||
| onResizeStop={onResizeStop} | ||
| enable={enable} | ||
| minWidth={'minWidth' in item ? item.minWidth : itemMinWidth} | ||
| minHeight={'minHeight' in item ? item.minHeight : itemMinHeight} | ||
| maxWidth={resizedItemMaxSize?.width} | ||
| maxHeight={resizedItemMaxSize?.height} | ||
| > | ||
| {children} | ||
| </Resizable> | ||
| ); | ||
| } else { | ||
| return ( | ||
| <div key={item.key} className={className} style={{ ...style, ...size }}> | ||
| {children} | ||
| </div> | ||
| ); | ||
| } | ||
| }; | ||
|
|
||
| export default LayoutItemContainer; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,21 @@ | ||
| import * as React from 'react'; | ||
| import { useCallback, useId } from 'react'; | ||
| import Button, { ButtonLevel } from '../Button/Button'; | ||
| import { MoveDirection } from './utils/movements'; | ||
| import styled from 'styled-components'; | ||
| import { _ } from '@joplin/lib/locale'; | ||
|
|
||
| const StyledRoot = styled.div` | ||
| display: flex; | ||
| flex-direction: column; | ||
| padding: 5px; | ||
| background-color: ${props => props.theme.backgroundColor}; | ||
| border-radius: 5px; | ||
|
|
||
| > .label { | ||
| // Used only for accessibility tools | ||
| display: none; | ||
| } | ||
| `; | ||
|
|
||
| const ButtonRow = styled.div` | ||
|
|
@@ -26,23 +32,32 @@ const ArrowButton = styled(Button)` | |
| opacity: ${props => props.disabled ? 0.2 : 1}; | ||
| `; | ||
|
|
||
| type ButtonKey = string; | ||
|
|
||
| export interface MoveButtonClickEvent { | ||
| direction: MoveDirection; | ||
| itemKey: string; | ||
| buttonKey: ButtonKey; | ||
| } | ||
|
|
||
| interface Props { | ||
| onClick(event: MoveButtonClickEvent): void; | ||
| itemKey: string; | ||
| itemLabel: string; | ||
| canMoveLeft: boolean; | ||
| canMoveRight: boolean; | ||
| canMoveUp: boolean; | ||
| canMoveDown: boolean; | ||
|
|
||
| // Specifies which button to auto-focus (if any). Clicking a "Move ..." button changes the app's layout. By default, this | ||
| // causes focus to jump to the start of the move dialog. Providing the key of the last-clicked button allows focus | ||
| // to be restored after changing the app layout: | ||
| autoFocusKey: ButtonKey|null; | ||
| } | ||
|
|
||
| export default function MoveButtons(props: Props) { | ||
| const onButtonClick = useCallback((direction: MoveDirection) => { | ||
| props.onClick({ direction, itemKey: props.itemKey, buttonKey: `${props.itemKey}-${direction}` }); | ||
| }, [props.onClick, props.itemKey]); | ||
|
|
||
| function canMove(dir: MoveDirection) { | ||
|
|
@@ -53,28 +68,64 @@ export default function MoveButtons(props: Props) { | |
| throw new Error('Unreachable'); | ||
| } | ||
|
|
||
| const iconLabel = (dir: MoveDirection) => { | ||
| if (dir === MoveDirection.Up) return _('Move up'); | ||
| if (dir === MoveDirection.Down) return _('Move down'); | ||
| if (dir === MoveDirection.Left) return _('Move left'); | ||
| if (dir === MoveDirection.Right) return _('Move right'); | ||
| const unreachable: never = dir; | ||
| throw new Error(`Invalid direction: ${unreachable}`); | ||
| }; | ||
|
|
||
| const descriptionId = useId(); | ||
|
|
||
| const buttonKey = (dir: MoveDirection) => `${props.itemKey}-${dir}`; | ||
| const autoFocusDirection = (() => { | ||
| if (!props.autoFocusKey) return undefined; | ||
|
|
||
| const buttonDirections = [MoveDirection.Up, MoveDirection.Down, MoveDirection.Left, MoveDirection.Right]; | ||
| const autoFocusDirection = buttonDirections.find( | ||
| direction => buttonKey(direction) === props.autoFocusKey, | ||
| ); | ||
|
|
||
| if (!autoFocusDirection) { | ||
| return null; | ||
| } | ||
|
|
||
| const autoFocusDirectionEnabled = autoFocusDirection && canMove(autoFocusDirection); | ||
| if (autoFocusDirectionEnabled) { | ||
| return autoFocusDirection; | ||
| } else { | ||
| // Select an enabled direction instead | ||
| return buttonDirections.find(dir => canMove(dir)); | ||
| } | ||
| })(); | ||
|
|
||
| function renderButton(dir: MoveDirection) { | ||
| return <ArrowButton | ||
| disabled={!canMove(dir)} | ||
| level={ButtonLevel.Primary} | ||
| iconName={`fas fa-arrow-${dir}`} | ||
| iconLabel={iconLabel(dir)} | ||
| autoFocus={autoFocusDirection === dir} | ||
| onClick={() => onButtonClick(dir)} | ||
| />; | ||
| } | ||
|
|
||
| return ( | ||
| <StyledRoot role='group' aria-labelledby={descriptionId}> | ||
| <ButtonRow> | ||
| {renderButton(MoveDirection.Up)} | ||
| </ButtonRow> | ||
| <ButtonRow> | ||
| {renderButton(MoveDirection.Left)} | ||
| <EmptyButton iconName="fas fa-arrow-down" aria-hidden={true} disabled={true}/> | ||
| {renderButton(MoveDirection.Right)} | ||
| </ButtonRow> | ||
| <ButtonRow> | ||
| {renderButton(MoveDirection.Down)} | ||
| </ButtonRow> | ||
| <div className='label' id={descriptionId}>{props.itemLabel}</div> | ||
| </StyledRoot> | ||
| ); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Most of the changes to the
Buttoncomponent are to pass unused props through to the<button>component it wraps. This removes the need to enumerate allaria-*props that can be used with custom<Button>s.