Skip to content
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

a11y: make focus visible on create node button #2677

Merged
merged 8 commits into from
Apr 17, 2020
Merged

a11y: make focus visible on create node button #2677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5b29669
add circle outline for add button
alanlong9278 Apr 16, 2020
bf033a6
Merge branch 'master' into julong/addButtonUx
a-b-r-o-w-n Apr 16, 2020
abdc434
add set menuSelected false callback
alanlong9278 Apr 17, 2020
84ea950
Merge branch 'master' into julong/addButtonUx
alanlong9278 Apr 17, 2020
eb024c3
Merge branch 'julong/addButtonUx' of https://github.com/microsoft/Bot…
alanlong9278 Apr 17, 2020
bc3b564
Merge branch 'master' into julong/addButtonUx
corinagum Apr 17, 2020
43bcdd5
Merge branch 'master' into julong/addButtonUx
corinagum Apr 17, 2020
543b625
Merge branch 'master' into julong/addButtonUx
corinagum Apr 17, 2020
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
13 changes: 10 additions & 3 deletions Composer/packages/extensions/visual-designer/src/components/menus/EdgeMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

/** @jsx jsx */
import { jsx, css } from '@emotion/core';
import { useCallback, useContext } from 'react';
import { useCallback, useContext, useState } from 'react';
import classnames from 'classnames';
import formatMessage from 'format-message';
import { createStepMenu, DialogGroup, SDKKinds } from '@bfc/shared';
Expand All @@ -16,6 +16,7 @@ import { SelectionContext } from '../../store/SelectionContext';
import { SelfHostContext } from '../../store/SelfHostContext';
import { AttrNames } from '../../constants/ElementAttributes';
import { MenuTypes } from '../../constants/MenuTypes';
import { ObiColors } from '../../constants/ElementColors';

import { IconMenu } from './IconMenu';

Expand Down Expand Up @@ -115,8 +116,14 @@ export const EdgeMenu: React.FC<EdgeMenuProps> = ({ id, addCoachMarkRef, onClick
};
};

const [menuSelected, setMenuSelected] = useState<boolean>(false);
const addRef = useCallback((action: HTMLDivElement) => addCoachMarkRef && addCoachMarkRef({ action }), []);
let boxShaow = '0px 2px 8px rgba(0, 0, 0, 0.1)';
boxShaow += menuSelected ? `,0 0 0 2px ${ObiColors.AzureBlue}` : nodeSelected ? `, 0 0 0 2px ${ObiColors.Black}` : '';

const handleMenuShow = menuSelected => {
setMenuSelected(menuSelected);
};
return (
<div
ref={addRef}
Expand All @@ -125,10 +132,9 @@ export const EdgeMenu: React.FC<EdgeMenuProps> = ({ id, addCoachMarkRef, onClick
height: EdgeAddButtonSize.height,
borderRadius: '8px',
backdropFilter: 'white',
boxShadow: '0px 2px 8px rgba(0, 0, 0, 0.1)',
boxShadow: boxShaow,
overflow: 'hidden',
background: 'white',
outline: nodeSelected ? '1px solid #0078d4' : '',
}}
className={classnames({ 'step-renderer-container--selected': nodeSelected })}
{...declareElementAttributes(id)}
Expand Down Expand Up @@ -157,6 +163,7 @@ export const EdgeMenu: React.FC<EdgeMenuProps> = ({ id, addCoachMarkRef, onClick
selfHosted ? x => x !== SDKKinds.LogAction : undefined
)}
label={formatMessage('Add')}
handleMenuShow={handleMenuShow}
{...rest}
/>
</div>
Expand Down
10 changes: 10 additions & 0 deletions Composer/packages/extensions/visual-designer/src/components/menus/IconMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ interface IconMenuProps {
label?: string;
menuItems: any[];
menuWidth?: number;
handleMenuShow?: (menuShowed: boolean) => void;
}

export const IconMenu: React.FC<IconMenuProps> = ({
Expand All @@ -31,6 +32,7 @@ export const IconMenu: React.FC<IconMenuProps> = ({
label,
menuItems,
menuWidth,
handleMenuShow,
...rest
}): JSX.Element => {
const _onRenderItem = (item): React.ReactNode => {
Expand Down Expand Up @@ -78,6 +80,12 @@ export const IconMenu: React.FC<IconMenuProps> = ({
},
};

const onMenuClick = () => {
handleMenuShow && handleMenuShow(true);
};
const onAfterMenuDismiss = () => {
handleMenuShow && handleMenuShow(false);
};
return (
<IconButton
// @ts-ignore
Expand All @@ -86,6 +94,8 @@ export const IconMenu: React.FC<IconMenuProps> = ({
styles={buttonStyles}
menuIconProps={{ iconName, style: { fontSize: iconSize, fontWeight: 'bold', color } }}
menuProps={{ items: overflowItems, calloutProps: { calloutMaxWidth: menuWidth } }}
onMenuClick={onMenuClick}
onAfterMenuDismiss={onAfterMenuDismiss}
ariaLabel={label}
{...rest}
/>
Expand Down