@instructure/ui-dialog 7.12.0 → 7.15.0

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [7.15.0](https://github.com/instructure/instructure-ui/compare/v7.14.1...v7.15.0) (2022-02-03)
+
+**Note:** Version bump only for package @instructure/ui-dialog
+
+## [7.14.1](https://github.com/instructure/instructure-ui/compare/v7.14.0...v7.14.1) (2021-12-06)
+
+**Note:** Version bump only for package @instructure/ui-dialog
+
+# [7.14.0](https://github.com/instructure/instructure-ui/compare/v7.13.0...v7.14.0) (2021-12-01)
+
+**Note:** Version bump only for package @instructure/ui-dialog
+
+# [7.13.0](https://github.com/instructure/instructure-ui/compare/v7.12.0...v7.13.0) (2021-11-18)
+
+### Bug Fixes
+
+- **ui-dialog,ui-drawer-layout:** fix Dialog role attribute ([f568377](https://github.com/instructure/instructure-ui/commit/f568377)), backports [#765](https://github.com/instructure/instructure-ui/issues/765)
+
 # [7.12.0](https://github.com/instructure/instructure-ui/compare/v7.11.0...v7.12.0) (2021-10-15)
 
 **Note:** Version bump only for package @instructure/ui-dialog

package/es/Dialog/index.js

@@ -162,10 +162,13 @@ var Dialog = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var ElementType = getElementType(Dialog, this.props);
+      var ElementType = getElementType(Dialog, this.props); // In case the HTML role attribute is explicitly passed, use props.role
+
+      var role = this.props.role || (this.props.label ? 'dialog' : void 0); // eslint-disable-line react/prop-types
+
       return this.props.open ? /*#__PURE__*/React.createElement(ElementType, Object.assign({}, omitProps(this.props, Dialog.propTypes), {
         ref: this.getRef,
-        role: this.props.label ? 'dialog' : null,
+        role: role,
         "aria-label": this.props.label,
         className: this.props.className // eslint-disable-line react/prop-types
 

package/lib/Dialog/index.js

@@ -182,10 +182,13 @@ var Dialog = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var ElementType = (0, _getElementType.getElementType)(Dialog, this.props);
+      var ElementType = (0, _getElementType.getElementType)(Dialog, this.props); // In case the HTML role attribute is explicitly passed, use props.role
+
+      var role = this.props.role || (this.props.label ? 'dialog' : void 0); // eslint-disable-line react/prop-types
+
       return this.props.open ? /*#__PURE__*/_react.default.createElement(ElementType, Object.assign({}, (0, _omitProps.omitProps)(this.props, Dialog.propTypes), {
         ref: this.getRef,
-        role: this.props.label ? 'dialog' : null,
+        role: role,
         "aria-label": this.props.label,
         className: this.props.className // eslint-disable-line react/prop-types
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-dialog",
-  "version": "7.12.0",
+  "version": "7.15.0",
   "description": "A utility component for managing keyboard accessibility and screen reader behavior",
   "author": "Instructure, Inc. Engineering and Product Design",
   "type": "commonjs",
@@ -23,17 +23,17 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.9.2",
-    "@instructure/ui-a11y-utils": "^7.12.0",
-    "@instructure/ui-dom-utils": "^7.12.0",
-    "@instructure/ui-react-utils": "^7.12.0",
-    "@instructure/ui-testable": "^7.12.0",
-    "@instructure/ui-themeable": "^7.12.0",
+    "@instructure/ui-a11y-utils": "^7.15.0",
+    "@instructure/ui-dom-utils": "^7.15.0",
+    "@instructure/ui-react-utils": "^7.15.0",
+    "@instructure/ui-testable": "^7.15.0",
+    "@instructure/ui-themeable": "^7.15.0",
     "prop-types": "^15"
   },
   "devDependencies": {
-    "@instructure/console": "^7.12.0",
-    "@instructure/ui-babel-preset": "^7.12.0",
-    "@instructure/ui-test-utils": "^7.12.0"
+    "@instructure/console": "^7.15.0",
+    "@instructure/ui-babel-preset": "^7.15.0",
+    "@instructure/ui-test-utils": "^7.15.0"
   },
   "peerDependencies": {
     "react": "^16.8"

package/src/Dialog/index.js

@@ -220,11 +220,15 @@ class Dialog extends Component {
 
   render() {
     const ElementType = getElementType(Dialog, this.props)
+
+    // In case the HTML role attribute is explicitly passed, use props.role
+    const role = this.props.role || (this.props.label ? 'dialog' : undefined) // eslint-disable-line react/prop-types
+
     return this.props.open ? (
       <ElementType
         {...omitProps(this.props, Dialog.propTypes)}
         ref={this.getRef}
-        role={this.props.label ? 'dialog' : null}
+        role={role}
         aria-label={this.props.label}
         className={this.props.className} // eslint-disable-line react/prop-types
       >