Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

a11y: improve bot controller keyboard handling #9014

Merged
tonyanziano merged 1 commit into from
Mar 2, 2022
Merged

a11y: improve bot controller keyboard handling #9014

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
1 change: 1 addition & 0 deletions Composer/packages/client/src/components/BotRuntimeController/BotController.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ const BotController: React.FC<BotControllerProps> = ({ onHideController, isContr
hidden={isControllerHidden}
items={items}
target={botControllerMenuTarget}
onDismiss={() => onHideController(true)}
/>
</React.Fragment>
);
Expand Down
10 changes: 7 additions & 3 deletions Composer/packages/client/src/components/BotRuntimeController/BotControllerMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/** @jsx jsx */
import { css, jsx } from '@emotion/core';
import React from 'react';
import { Callout, DirectionalHint } from 'office-ui-fabric-react/lib/Callout';
import { FocusTrapCallout, DirectionalHint } from 'office-ui-fabric-react/lib/Callout';
import { DetailsList, DetailsListLayoutMode, IColumn } from 'office-ui-fabric-react/lib/DetailsList';
import { IContextualMenuProps } from 'office-ui-fabric-react/lib/ContextualMenu';
import { SelectionMode } from 'office-ui-fabric-react/lib/Utilities';
Expand Down Expand Up @@ -100,10 +100,14 @@ const tableColumns: IColumn[] = [
const BotControllerMenu = React.forwardRef<HTMLDivElement, IContextualMenuProps>((props, ref) => {
const { items, target, onDismiss, hidden } = props;
return (
<Callout
<FocusTrapCallout
hideOverflow
setInitialFocus
directionalHint={DirectionalHint.topRightEdge}
focusTrapProps={{
isClickableOutsideFocusTrap: true,
forceFocusInsideTrap: false,
}}
hidden={hidden}
role="dialog"
styles={{
Expand Down Expand Up @@ -134,7 +138,7 @@ const BotControllerMenu = React.forwardRef<HTMLDivElement, IContextualMenuProps>
/>
</div>
</div>
</Callout>
</FocusTrapCallout>
);
});

Expand Down
14 changes: 11 additions & 3 deletions Composer/packages/client/src/pages/design/DebugPanel/DebugPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

/** @jsx jsx */
import { jsx, css } from '@emotion/core';
import { useCallback, useMemo } from 'react';
import { useCallback, useEffect, useMemo, useRef } from 'react';
import formatMessage from 'format-message';
import { IconButton } from 'office-ui-fabric-react/lib/Button';
import { Pivot, PivotItem } from 'office-ui-fabric-react/lib/Pivot';
import { IPivot, Pivot, PivotItem } from 'office-ui-fabric-react/lib/Pivot';
import { FontSizes } from '@uifabric/fluent-theme';
import { Resizable } from 're-resizable';
import { Label } from 'office-ui-fabric-react/lib/Label';
Expand Down Expand Up @@ -36,6 +36,13 @@ export const DebugPanel: React.FC = () => {
const { setActiveTabInDebugPanel, setDebugPanelExpansion } = useRecoilValue(dispatcherState);
const isPanelExpanded = useRecoilValue(debugPanelExpansionState);
const activeTab = useRecoilValue(debugPanelActiveTabState);
const pivotRef = useRef<IPivot>(null);

useEffect(() => {
if (isPanelExpanded) {
pivotRef.current?.focus();
}
}, [isPanelExpanded, activeTab]);

const onExpandPanel = useCallback((activeTabKey: DebugDrawerKeys) => {
setDebugPanelExpansion(true);
Expand Down Expand Up @@ -105,6 +112,7 @@ export const DebugPanel: React.FC = () => {
return (
<Pivot
aria-label={formatMessage('Debug Panel Header')}
componentRef={pivotRef}
selectedKey={isPanelExpanded ? activeTab : null}
styles={{
link: {
Expand All @@ -128,7 +136,7 @@ export const DebugPanel: React.FC = () => {
}, [isPanelExpanded, activeTab]);

return (
<div>
<div aria-label={formatMessage('debug panel')} role="region">
<Resizable
css={css`
${debugPaneContainerStyle}
Expand Down