@jetbrains/ring-ui 4.0.42 → 4.0.46

package/components/dropdown-menu/dropdown-menu.js

@@ -11,36 +11,44 @@ const {children, ...dropdownPropTypes} = Dropdown.propTypes || {};
 const {
   id: idPropType,
   data: dataPropType,
-  ariaLabel: ariaLabelPropType
+  ariaLabel: ariaLabelPropType,
+  onSelect: onSelectPropType
 } = PopupMenu.propTypes || {};
 
 const defaultAriaLabel = 'Dropdown menu';
 
 function DropdownAnchorWrapper({anchor, pinned, active, activeListItemId, listId, ...restProps}) {
-  const anchorAriaProps = useMemo(() => (
-    active && activeListItemId
-      ? {'aria-owns': listId, 'aria-activedescendant': activeListItemId}
-      : {}
-  ), [active, activeListItemId, listId]);
+  const anchorAriaProps = useMemo(() => ({
+    ...(listId ? {'aria-haspopup': 'true'} : {}),
+    ...(activeListItemId ? {'aria-activedescendant': activeListItemId, 'aria-owns': listId} : {}),
+    ...(active ? {'aria-expanded': 'true'} : {})
+  }), [active, activeListItemId, listId]);
 
   const anchorProps = useMemo(
     () => ({active, pinned, ...restProps, ...anchorAriaProps}),
     [pinned, active, restProps, anchorAriaProps]
   );
 
+  const anchorComponentProps = useMemo(
+    () => ({...anchorProps, pinned: `${anchorProps.pinned}`}),
+    [anchorProps]
+  );
+
   if (typeof anchor === 'string') {
     return (
       <Anchor
-        {...anchorProps}
-        pinned={`${pinned}`}
+        {...anchorComponentProps}
       >{anchor}</Anchor>
     );
   }
   if (typeof anchor === 'function') {
-    return anchor(anchorProps);
+    return anchor(({active, pinned, ...restProps}), anchorAriaProps);
   }
   if (!Array.isArray(anchor)) {
-    return cloneElement(anchor, anchorProps);
+    return cloneElement(
+      anchor,
+      typeof anchor.type === 'string' ? anchorAriaProps : anchorComponentProps
+    );
   }
   return (
     <div {...anchorAriaProps}>{anchor}</div>
@@ -56,7 +64,7 @@ DropdownAnchorWrapper.propTypes = {
 };
 
 const DropdownMenu = React.forwardRef(function DropdownMenu(
-  {id, anchor, ariaLabel, data, menuProps, ...restDropdownProps},
+  {id, anchor, ariaLabel, data, onSelect, menuProps, ...restDropdownProps},
   forwardedRef
 ) {
   const listId = useMemo(() => id || getUID('dropdown-menu-list'), [id]);
@@ -87,6 +95,7 @@ const DropdownMenu = React.forwardRef(function DropdownMenu(
           closeOnSelect
           activateFirstItem
           data={data}
+          onSelect={onSelect}
           {...menuProps}
         />
       </Dropdown>
@@ -98,6 +107,7 @@ DropdownMenu.propTypes = {
   id: idPropType,
   data: dataPropType,
   ariaLabel: ariaLabelPropType,
+  onSelect: onSelectPropType,
   menuProps: PropTypes.object,
   ...dropdownPropTypes
 };

package/components/tooltip/tooltip.js

@@ -133,11 +133,16 @@ export default class Tooltip extends Component {
     const {children, 'data-test': dataTest,
       title, delay, selfOverflowOnly, popupProps, ...restProps} = this.props;
 
+    const ariaProps = typeof title === 'string'
+      ? {'aria-label': title, role: 'contentinfo'}
+      : {};
+
     const {onNestedTooltipShow, onNestedTooltipHide} = this;
 
     return (
       <TooltipContext.Provider value={{onNestedTooltipShow, onNestedTooltipHide}}>
         <span
+          {...ariaProps}
           {...restProps}
           ref={this.containerRef}
           data-test={dataTests('ring-tooltip', dataTest)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "4.0.42",
+  "version": "4.0.46",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",
@@ -68,7 +68,7 @@
     "@babel/cli": "^7.15.4",
     "@babel/eslint-parser": "^7.15.4",
     "@jetbrains/eslint-config": "^5.3.1",
-    "@jetbrains/generator-ring-ui": "^4.0.33",
+    "@jetbrains/generator-ring-ui": "^4.0.35",
     "@jetbrains/stylelint-config": "^2.0.1",
     "@primer/octicons": "^15.1.0",
     "@storybook/addon-a11y": "6.3.8",
@@ -95,7 +95,7 @@
     "babel-plugin-require-context-hook": "^1.0.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "chai-dom": "^1.9.0",
+    "chai-dom": "^1.10.0",
     "chai-enzyme": "1.0.0-beta.1",
     "cheerio": "^0.22.0",
     "core-js": "^3.17.3",
@@ -106,7 +106,7 @@
     "eslint-plugin-bdd": "^2.1.1",
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-react": "^7.25.1",
+    "eslint-plugin-react": "^7.25.2",
     "events": "^3.3.0",
     "html-webpack-plugin": "^5.3.2",
     "husky": "^7.0.2",
@@ -139,7 +139,7 @@
     "teamcity-service-messages": "^0.1.11",
     "terser-webpack-plugin": "^5.2.4",
     "wallaby-webpack": "^3.9.16",
-    "webpack": "^5.52.1",
+    "webpack": "^5.53.0",
     "webpack-cli": "^4.8.0",
     "xmlappend": "^1.0.4",
     "yo": "^4.3.0"
@@ -148,7 +148,7 @@
     "core-js": ">=3.0.0",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
-    "webpack": "^5.52.1"
+    "webpack": "^5.53.0"
   },
   "dependencies": {
     "@babel/core": "^7.15.5",
@@ -167,7 +167,7 @@
     "compile-code-loader": "^1.0.0",
     "conic-gradient": "^1.0.0",
     "css-loader": "^6.2.0",
-    "date-fns": "^2.23.0",
+    "date-fns": "^2.24.0",
     "deep-equal": "^2.0.4",
     "element-resize-detector": "^1.2.3",
     "es6-error": "^4.1.1",
@@ -207,5 +207,5 @@
     "node": ">=7.4",
     "npm": ">=6.0.0"
   },
-  "gitHead": "e61c7bc48bbba6e2763359ab0904e34a91272f84"
+  "gitHead": "51ea222790f311224226726b175ff773329f23ed"
 }