@instructure/ui-drilldown 10.26.1-snapshot-2 → 10.26.2

package/lib/Drilldown/index.js

@@ -8,6 +8,7 @@ exports.default = exports.Drilldown = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = require("react");
 var _console = require("@instructure/console");
+var _testable = require("@instructure/ui-testable/lib/testable.js");
 var _contains = require("@instructure/ui-dom-utils/lib/contains.js");
 var _containsActiveElement = require("@instructure/ui-dom-utils/lib/containsActiveElement.js");
 var _callRenderProp = require("@instructure/ui-react-utils/lib/callRenderProp.js");
@@ -35,7 +36,7 @@ var _react2 = require("@emotion/react");
 const _excluded = ["groupProps"],
   _excluded2 = ["groupProps"],
   _excluded3 = ["id", "themeOverride"];
-var _dec, _dec2, _class, _Drilldown, _IconArrowOpenEndSoli, _IconArrowOpenStartSo, _Options$Separator, _Options$Separator2;
+var _dec, _dec2, _dec3, _class, _Drilldown, _IconArrowOpenEndSoli, _IconArrowOpenStartSo, _Options$Separator, _Options$Separator2;
 /*
  * The MIT License (MIT)
  *
@@ -71,7 +72,7 @@ var _dec, _dec2, _class, _Drilldown, _IconArrowOpenEndSoli, _IconArrowOpenStartS
 category: components
 ---
 **/
-let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = _dec2(_class = (_Drilldown = class Drilldown extends _react.Component {
+let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec3 = (0, _testable.testable)(), _dec(_class = _dec2(_class = _dec3(_class = (_Drilldown = class Drilldown extends _react.Component {
   constructor(props) {
     super(props);
     this._drilldownRef = null;
@@ -238,6 +239,9 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
     }) => {
       var _this$currentPage, _selectedOption$group;
       const selectedOption = this.getPageChildById(id);
+
+      // TODO: this line can be removed when React 16 is no longer supported
+      event.persist();
       if (!id || !selectedOption) {
         event.preventDefault();
         event.stopPropagation();
@@ -283,19 +287,11 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
       if (groupProps !== null && groupProps !== void 0 && groupProps.selectableType) {
         this.handleGroupOptionSelected(event, selectedOption);
       } else {
-        // TODO workaround for react 19 default props
-        const optionWithDefaultProps = {
-          ...selectedOptionChild,
-          props: {
-            ...selectedOptionChild.props,
-            role: 'menuitem'
-          }
-        };
         if (typeof onSelect === 'function') {
           onSelect(event, {
             value,
             isSelected: true,
-            selectedOption: optionWithDefaultProps,
+            selectedOption: selectedOptionChild,
             drilldown: this
           });
         }
@@ -829,20 +825,15 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
       id = _option$props.id,
       children = _option$props.children,
       href = _option$props.href,
-      _option$props$as = _option$props.as,
-      as = _option$props$as === void 0 ? 'li' : _option$props$as,
-      _option$props$role = _option$props.role,
-      role = _option$props$role === void 0 ? 'menuitem' : _option$props$role,
+      as = _option$props.as,
+      role = _option$props.role,
       subPageId = _option$props.subPageId,
-      _option$props$disable = _option$props.disabled,
-      disabled = _option$props$disable === void 0 ? false : _option$props$disable,
+      disabled = _option$props.disabled,
       renderLabelInfo = _option$props.renderLabelInfo,
       renderBeforeLabel = _option$props.renderBeforeLabel,
       renderAfterLabel = _option$props.renderAfterLabel,
-      _option$props$beforeL = _option$props.beforeLabelContentVAlign,
-      beforeLabelContentVAlign = _option$props$beforeL === void 0 ? 'start' : _option$props$beforeL,
-      _option$props$afterLa = _option$props.afterLabelContentVAlign,
-      afterLabelContentVAlign = _option$props$afterLa === void 0 ? 'start' : _option$props$afterLa,
+      beforeLabelContentVAlign = _option$props.beforeLabelContentVAlign,
+      afterLabelContentVAlign = _option$props.afterLabelContentVAlign,
       description = _option$props.description,
       descriptionRole = _option$props.descriptionRole,
       elementRef = _option$props.elementRef,
@@ -1027,8 +1018,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
       children = _group$props.children,
       renderGroupTitle = _group$props.renderGroupTitle,
       themeOverride = _group$props.themeOverride,
-      _group$props$role = _group$props.role,
-      role = _group$props$role === void 0 ? 'group' : _group$props$role,
+      role = _group$props.role,
       as = _group$props.as,
       elementRef = _group$props.elementRef;
     if (!children) {
@@ -1038,7 +1028,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
 
     // add a separator above
     if (needsFirstSeparator) {
-      groupChildren.push(_Options$Separator || (_Options$Separator = (0, _jsxRuntime.jsx)(_Options.Options.Separator, {}, "drilldown-options-separator")));
+      groupChildren.push(_Options$Separator || (_Options$Separator = (0, _jsxRuntime.jsx)(_Options.Options.Separator, {})));
     }
 
     // create a sublist as a group
@@ -1065,7 +1055,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
 
     // add a separator below
     if (needsLastSeparator) {
-      groupChildren.push(_Options$Separator2 || (_Options$Separator2 = (0, _jsxRuntime.jsx)(_Options.Options.Separator, {}, "drilldown-options-separator-2")));
+      groupChildren.push(_Options$Separator2 || (_Options$Separator2 = (0, _jsxRuntime.jsx)(_Options.Options.Separator, {})));
     }
     return groupChildren;
   }
@@ -1125,7 +1115,6 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
           borderWidth: 'small'
         }),
         as: "div",
-        "data-cid": "Drilldown",
         elementRef: this.handleDrilldownRef,
         tabIndex: 0,
         css: styles === null || styles === void 0 ? void 0 : styles.drilldown,
@@ -1213,7 +1202,6 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
       styles = _this$props7.styles;
     const borderColor = styles === null || styles === void 0 ? void 0 : (_styles$drilldown = styles.drilldown) === null || _styles$drilldown === void 0 ? void 0 : _styles$drilldown.borderColor;
     return trigger ? (0, _jsxRuntime.jsx)(_Popover.Popover, {
-      "data-cid": "Drilldown",
       themeOverride: {
         // use here own theme's color
         borderColor: borderColor
@@ -1278,7 +1266,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
       children: this.renderPage()
     }) : this.renderPage();
   }
-}, _Drilldown.displayName = "Drilldown", _Drilldown.componentId = 'Drilldown', _Drilldown.allowedProps = _props.allowedProps, _Drilldown.defaultProps = {
+}, _Drilldown.displayName = "Drilldown", _Drilldown.componentId = 'Drilldown', _Drilldown.propTypes = _props.propTypes, _Drilldown.allowedProps = _props.allowedProps, _Drilldown.defaultProps = {
   disabled: false,
   rotateFocus: true,
   as: 'ul',
@@ -1294,5 +1282,5 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
   offsetX: 0,
   offsetY: 0,
   shouldSetAriaExpanded: true
-}, _Drilldown.Group = _DrilldownGroup.DrilldownGroup, _Drilldown.Option = _DrilldownOption.DrilldownOption, _Drilldown.Page = _DrilldownPage.DrilldownPage, _Drilldown.Separator = _DrilldownSeparator.DrilldownSeparator, _Drilldown)) || _class) || _class);
+}, _Drilldown.Group = _DrilldownGroup.DrilldownGroup, _Drilldown.Option = _DrilldownOption.DrilldownOption, _Drilldown.Page = _DrilldownPage.DrilldownPage, _Drilldown.Separator = _DrilldownSeparator.DrilldownSeparator, _Drilldown)) || _class) || _class) || _class);
 var _default = exports.default = Drilldown;

package/lib/Drilldown/props.js

@@ -1,9 +1,15 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.allowedProps = void 0;
+exports.propTypes = exports.allowedProps = void 0;
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _Children = require("@instructure/ui-prop-types/lib/Children.js");
+var _controllable = require("@instructure/ui-prop-types/lib/controllable.js");
+var _PositionPropTypes = require("@instructure/ui-position/lib/PositionPropTypes.js");
+var _DrilldownPage = require("./DrilldownPage");
 /*
  * The MIT License (MIT)
  *
@@ -28,6 +34,47 @@ exports.allowedProps = void 0;
  * SOFTWARE.
  */
 
+const propTypes = exports.propTypes = {
+  rootPageId: _propTypes.default.string.isRequired,
+  children: _Children.Children.oneOf([_DrilldownPage.DrilldownPage]),
+  id: _propTypes.default.string,
+  label: _propTypes.default.string,
+  disabled: _propTypes.default.bool,
+  rotateFocus: _propTypes.default.bool,
+  as: _propTypes.default.elementType,
+  role: _propTypes.default.string,
+  elementRef: _propTypes.default.func,
+  drilldownRef: _propTypes.default.func,
+  overflowX: _propTypes.default.oneOf(['auto', 'hidden', 'visible']),
+  overflowY: _propTypes.default.oneOf(['auto', 'hidden', 'visible']),
+  height: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  width: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  minHeight: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  minWidth: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  maxHeight: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  maxWidth: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  trigger: _propTypes.default.node,
+  placement: _PositionPropTypes.PositionPropTypes.placement,
+  defaultShow: _propTypes.default.bool,
+  show: (0, _controllable.controllable)(_propTypes.default.bool, 'onToggle', 'defaultShow'),
+  onToggle: _propTypes.default.func,
+  onSelect: _propTypes.default.func,
+  onDismiss: _propTypes.default.func,
+  onFocus: _propTypes.default.func,
+  onMouseOver: _propTypes.default.func,
+  popoverRef: _propTypes.default.func,
+  mountNode: _PositionPropTypes.PositionPropTypes.mountNode,
+  positionTarget: _PositionPropTypes.PositionPropTypes.mountNode,
+  positionContainerDisplay: _propTypes.default.oneOf(['inline-block', 'block']),
+  constrain: _PositionPropTypes.PositionPropTypes.constrain,
+  shouldHideOnSelect: _propTypes.default.bool,
+  shouldContainFocus: _propTypes.default.bool,
+  shouldReturnFocus: _propTypes.default.bool,
+  withArrow: _propTypes.default.bool,
+  offsetX: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  offsetY: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  shouldSetAriaExpanded: _propTypes.default.bool
+};
 const allowedProps = exports.allowedProps = ['rootPageId', 'children', 'id', 'label', 'disabled', 'rotateFocus', 'as', 'role', 'overflowX', 'overflowY', 'height', 'width', 'minHeight', 'minWidth', 'maxHeight', 'maxWidth',
 // Popover version props
 'trigger', 'placement', 'defaultShow', 'show', 'onToggle', 'onSelect', 'onDismiss', 'onFocus', 'onMouseOver', 'elementRef', 'drilldownRef', 'popoverRef', 'mountNode', 'positionTarget', 'positionContainerDisplay', 'constrain', 'shouldHideOnSelect', 'shouldContainFocus', 'shouldReturnFocus', 'withArrow', 'offsetX', 'offsetY'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-drilldown",
-  "version": "10.26.1-snapshot-2",
+  "version": "10.26.2",
   "description": "A drilldown menu component",
   "author": "Instructure, Inc. Engineering and Product Design",
   "module": "./es/index.js",
@@ -24,32 +24,35 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.27.6",
-    "@instructure/console": "10.26.1-snapshot-2",
-    "@instructure/emotion": "10.26.1-snapshot-2",
-    "@instructure/shared-types": "10.26.1-snapshot-2",
-    "@instructure/ui-dom-utils": "10.26.1-snapshot-2",
-    "@instructure/ui-icons": "10.26.1-snapshot-2",
-    "@instructure/ui-options": "10.26.1-snapshot-2",
-    "@instructure/ui-popover": "10.26.1-snapshot-2",
-    "@instructure/ui-position": "10.26.1-snapshot-2",
-    "@instructure/ui-react-utils": "10.26.1-snapshot-2",
-    "@instructure/ui-selectable": "10.26.1-snapshot-2",
-    "@instructure/ui-utils": "10.26.1-snapshot-2",
-    "@instructure/ui-view": "10.26.1-snapshot-2"
+    "@instructure/console": "10.26.2",
+    "@instructure/emotion": "10.26.2",
+    "@instructure/shared-types": "10.26.2",
+    "@instructure/ui-dom-utils": "10.26.2",
+    "@instructure/ui-icons": "10.26.2",
+    "@instructure/ui-options": "10.26.2",
+    "@instructure/ui-popover": "10.26.2",
+    "@instructure/ui-position": "10.26.2",
+    "@instructure/ui-prop-types": "10.26.2",
+    "@instructure/ui-react-utils": "10.26.2",
+    "@instructure/ui-selectable": "10.26.2",
+    "@instructure/ui-testable": "10.26.2",
+    "@instructure/ui-utils": "10.26.2",
+    "@instructure/ui-view": "10.26.2",
+    "prop-types": "^15.8.1"
   },
   "devDependencies": {
-    "@instructure/ui-axe-check": "10.26.1-snapshot-2",
-    "@instructure/ui-babel-preset": "10.26.1-snapshot-2",
-    "@instructure/ui-color-utils": "10.26.1-snapshot-2",
-    "@instructure/ui-scripts": "10.26.1-snapshot-2",
-    "@instructure/ui-themes": "10.26.1-snapshot-2",
+    "@instructure/ui-axe-check": "10.26.2",
+    "@instructure/ui-babel-preset": "10.26.2",
+    "@instructure/ui-color-utils": "10.26.2",
+    "@instructure/ui-scripts": "10.26.2",
+    "@instructure/ui-themes": "10.26.2",
     "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "15.0.7",
+    "@testing-library/react": "^16.0.1",
     "@testing-library/user-event": "^14.6.1",
     "vitest": "^3.2.2"
   },
   "peerDependencies": {
-    "react": ">=18 <=19"
+    "react": ">=16.14 <=18"
   },
   "publishConfig": {
     "access": "public"

package/src/Drilldown/DrilldownGroup/index.tsx

@@ -27,7 +27,7 @@ import { Component } from 'react'
 import { withStyle } from '@instructure/emotion'
 import { optionsThemeGenerator } from '@instructure/ui-options'
 
-import { allowedProps } from './props'
+import { propTypes, allowedProps } from './props'
 import type { DrilldownGroupProps } from './props'
 import { isMac, isFirefox } from '@instructure/ui-utils'
 
@@ -44,6 +44,7 @@ id: Drilldown.Group
 class DrilldownGroup extends Component<DrilldownGroupProps> {
   static readonly componentId = 'Drilldown.Group'
 
+  static propTypes = propTypes
   static allowedProps = allowedProps
   static defaultProps = {
     disabled: false,

package/src/Drilldown/DrilldownGroup/props.ts

@@ -23,9 +23,16 @@
  */
 
 import React from 'react'
+import PropTypes from 'prop-types'
+
+import { Children } from '@instructure/ui-prop-types'
+
+import DrilldownOption from '../DrilldownOption'
+import DrilldownSeparator from '../DrilldownSeparator'
 
 import type {
   OtherHTMLAttributes,
+  PropValidators,
   OptionsTheme,
   AsElementType
 } from '@instructure/shared-types'
@@ -109,6 +116,21 @@ type AllowedPropKeys = Readonly<Array<PropKeys>>
 type DrilldownGroupProps = DrilldownGroupOwnProps &
   WithStyleProps<OptionsTheme, null> &
   OtherHTMLAttributes<DrilldownGroupOwnProps>
+
+const propTypes: PropValidators<PropKeys> = {
+  id: PropTypes.string.isRequired,
+  children: Children.oneOf([DrilldownOption, DrilldownSeparator]),
+  renderGroupTitle: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  withoutSeparators: PropTypes.bool,
+  disabled: PropTypes.bool,
+  role: PropTypes.string,
+  as: PropTypes.elementType,
+  elementRef: PropTypes.func,
+  selectableType: PropTypes.oneOf(['single', 'multiple']),
+  defaultSelected: PropTypes.array,
+  onSelect: PropTypes.func
+}
+
 const allowedProps: AllowedPropKeys = [
   'id',
   'children',
@@ -124,4 +146,4 @@ const allowedProps: AllowedPropKeys = [
 ]
 
 export type { DrilldownGroupProps, GroupChildren }
-export { allowedProps }
+export { propTypes, allowedProps }

package/src/Drilldown/DrilldownOption/index.tsx

@@ -27,7 +27,7 @@ import { Component } from 'react'
 import { withStyle } from '@instructure/emotion'
 import { optionsItemThemeGenerator } from '@instructure/ui-options'
 
-import { allowedProps } from './props'
+import { propTypes, allowedProps } from './props'
 import type { DrilldownOptionProps } from './props'
 
 /**
@@ -43,6 +43,7 @@ id: Drilldown.Option
 class DrilldownOption extends Component<DrilldownOptionProps> {
   static readonly componentId = 'Drilldown.Option'
 
+  static propTypes = propTypes
   static allowedProps = allowedProps
 
   static defaultProps = {

package/src/Drilldown/DrilldownOption/props.ts

@@ -23,8 +23,11 @@
  */
 
 import React from 'react'
+import PropTypes from 'prop-types'
+
 import type {
   OtherHTMLAttributes,
+  PropValidators,
   OptionsItemTheme,
   AsElementType
 } from '@instructure/shared-types'
@@ -184,6 +187,30 @@ type AllowedPropKeys = Readonly<Array<PropKeys>>
 type DrilldownOptionProps = DrilldownOptionOwnProps &
   WithStyleProps<OptionsItemTheme, null> &
   OtherHTMLAttributes<DrilldownOptionOwnProps>
+
+const propTypes: PropValidators<PropKeys> = {
+  id: PropTypes.string.isRequired,
+  children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  subPageId: PropTypes.string,
+  disabled: PropTypes.bool,
+  selected: PropTypes.bool,
+  value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+  href: PropTypes.string,
+  as: PropTypes.elementType,
+  role: PropTypes.string,
+  renderLabelInfo: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  renderBeforeLabel: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  renderAfterLabel: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  beforeLabelContentVAlign: PropTypes.oneOf(['start', 'center', 'end']),
+  afterLabelContentVAlign: PropTypes.oneOf(['start', 'center', 'end']),
+  description: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  descriptionRole: PropTypes.string,
+  onOptionClick: PropTypes.func,
+  defaultSelected: PropTypes.bool,
+  elementRef: PropTypes.func,
+  shouldCloseOnClick: PropTypes.oneOf(['auto', 'always', 'never'])
+}
+
 const allowedProps: AllowedPropKeys = [
   'id',
   'children',
@@ -208,4 +235,4 @@ const allowedProps: AllowedPropKeys = [
 ]
 
 export type { DrilldownOptionProps, DrilldownOptionValue }
-export { allowedProps }
+export { propTypes, allowedProps }

package/src/Drilldown/DrilldownPage/index.tsx

@@ -24,7 +24,7 @@
 
 import { Component } from 'react'
 
-import { allowedProps } from './props'
+import { propTypes, allowedProps } from './props'
 import type { DrilldownPageProps } from './props'
 
 /**
@@ -37,6 +37,7 @@ id: Drilldown.Page
 class DrilldownPage extends Component<DrilldownPageProps> {
   static readonly componentId = 'Drilldown.Page'
 
+  static propTypes = propTypes
   static allowedProps = allowedProps
   static defaultProps = {
     renderBackButtonLabel: 'Back',

package/src/Drilldown/DrilldownPage/props.ts

@@ -23,7 +23,18 @@
  */
 
 import React from 'react'
-import type { OtherHTMLAttributes } from '@instructure/shared-types'
+import PropTypes from 'prop-types'
+
+import { Children } from '@instructure/ui-prop-types'
+
+import type {
+  OtherHTMLAttributes,
+  PropValidators
+} from '@instructure/shared-types'
+
+import DrilldownGroup from '../DrilldownGroup'
+import DrilldownOption from '../DrilldownOption'
+import DrilldownSeparator from '../DrilldownSeparator'
 
 import type { OptionChild, SeparatorChild, GroupChild } from '../props'
 import { Renderable } from '@instructure/shared-types'
@@ -86,6 +97,23 @@ type AllowedPropKeys = Readonly<Array<PropKeys>>
 
 type DrilldownPageProps = DrilldownPageOwnProps &
   OtherHTMLAttributes<DrilldownPageOwnProps>
+
+const propTypes: PropValidators<PropKeys> = {
+  id: PropTypes.string.isRequired,
+  children: Children.oneOf([
+    DrilldownOption,
+    DrilldownSeparator,
+    DrilldownGroup
+  ]),
+  renderTitle: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  renderActionLabel: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  renderBackButtonLabel: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  onHeaderActionClicked: PropTypes.func,
+  onBackButtonClicked: PropTypes.func,
+  withoutHeaderSeparator: PropTypes.bool,
+  disabled: PropTypes.bool
+}
+
 const allowedProps: AllowedPropKeys = [
   'id',
   'children',
@@ -99,4 +127,4 @@ const allowedProps: AllowedPropKeys = [
 ]
 
 export type { DrilldownPageProps, PageChildren }
-export { allowedProps }
+export { propTypes, allowedProps }

package/src/Drilldown/DrilldownSeparator/index.tsx

@@ -27,7 +27,7 @@ import { Component } from 'react'
 import { withStyle } from '@instructure/emotion'
 import { optionsSeparatorThemeGenerator } from '@instructure/ui-options'
 
-import { allowedProps } from './props'
+import { propTypes, allowedProps } from './props'
 import type { DrilldownSeparatorProps } from './props'
 
 /**
@@ -43,6 +43,7 @@ id: Drilldown.Separator
 class DrilldownSeparator extends Component<DrilldownSeparatorProps> {
   static readonly componentId = 'Drilldown.Separator'
 
+  static propTypes = propTypes
   static allowedProps = allowedProps
   static defaultProps = {}
 

package/src/Drilldown/DrilldownSeparator/props.ts

@@ -22,9 +22,12 @@
  * SOFTWARE.
  */
 
+import PropTypes from 'prop-types'
+
 import type {
   OtherHTMLAttributes,
   PickPropsWithExceptions,
+  PropValidators,
   AsElementType,
   OptionsSeparatorTheme
 } from '@instructure/shared-types'
@@ -50,7 +53,13 @@ type DrilldownSeparatorProps =
     DrilldownSeparatorOwnProps &
     WithStyleProps<OptionsSeparatorTheme, null> &
     OtherHTMLAttributes<DrilldownSeparatorOwnProps>
+
+const propTypes: PropValidators<PropKeys> = {
+  id: PropTypes.string.isRequired,
+  as: PropTypes.elementType
+}
+
 const allowedProps: AllowedPropKeys = ['id', 'as']
 
 export type { DrilldownSeparatorProps }
-export { allowedProps }
+export { propTypes, allowedProps }

package/src/Drilldown/index.tsx

@@ -25,6 +25,7 @@
 import { Children, Component, ReactElement, ReactNode } from 'react'
 
 import { warn, error } from '@instructure/console'
+import { testable } from '@instructure/ui-testable'
 import { contains, containsActiveElement } from '@instructure/ui-dom-utils'
 import {
   callRenderProp,
@@ -62,7 +63,7 @@ import type { DrilldownPageProps, PageChildren } from './DrilldownPage/props'
 import generateStyle from './styles'
 import generateComponentTheme from './theme'
 
-import { allowedProps, SelectedGroupOptionsMap } from './props'
+import { propTypes, allowedProps, SelectedGroupOptionsMap } from './props'
 
 import type {
   DrilldownProps,
@@ -100,9 +101,11 @@ category: components
 **/
 @withDeterministicId()
 @withStyle(generateStyle, generateComponentTheme)
+@testable()
 class Drilldown extends Component<DrilldownProps, DrilldownState> {
   static readonly componentId = 'Drilldown'
 
+  static propTypes = propTypes
   static allowedProps = allowedProps
   static defaultProps = {
     disabled: false,
@@ -781,6 +784,9 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {
   ) => {
     const selectedOption = this.getPageChildById(id)
 
+    // TODO: this line can be removed when React 16 is no longer supported
+    event.persist()
+
     if (!id || !selectedOption) {
       event.preventDefault()
       event.stopPropagation()
@@ -834,16 +840,11 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {
     if (groupProps?.selectableType) {
       this.handleGroupOptionSelected(event, selectedOption)
     } else {
-      // TODO workaround for react 19 default props
-      const optionWithDefaultProps = {
-        ...selectedOptionChild,
-        props: { ...selectedOptionChild.props, role: 'menuitem' }
-      }
       if (typeof onSelect === 'function') {
         onSelect(event, {
           value,
           isSelected: true,
-          selectedOption: optionWithDefaultProps,
+          selectedOption: selectedOptionChild,
           drilldown: this
         })
       }
@@ -1034,15 +1035,15 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {
       id,
       children,
       href,
-      as = 'li', // workaround after the react 19 upgrade, defaultProps doesn't work anymore
-      role = 'menuitem', // workaround after the react 19 upgrade, defaultProps doesn't work anymore
+      as,
+      role,
       subPageId,
-      disabled = false, // workaround after the react 19 upgrade, defaultProps doesn't work anymore
+      disabled,
       renderLabelInfo,
       renderBeforeLabel,
       renderAfterLabel,
-      beforeLabelContentVAlign = 'start', // workaround after the react 19 upgrade, defaultProps doesn't work anymore
-      afterLabelContentVAlign = 'start', // workaround after the react 19 upgrade, defaultProps doesn't work anymore
+      beforeLabelContentVAlign,
+      afterLabelContentVAlign,
       description,
       descriptionRole,
       elementRef,
@@ -1302,7 +1303,7 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {
       children,
       renderGroupTitle,
       themeOverride,
-      role = 'group', // react 19 defaultProps workaround
+      role,
       as,
       elementRef
     } = group.props
@@ -1318,9 +1319,7 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {
 
     // add a separator above
     if (needsFirstSeparator) {
-      groupChildren.push(
-        <Options.Separator key="drilldown-options-separator" />
-      )
+      groupChildren.push(<Options.Separator />)
     }
 
     // create a sublist as a group
@@ -1359,9 +1358,7 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {
 
     // add a separator below
     if (needsLastSeparator) {
-      groupChildren.push(
-        <Options.Separator key="drilldown-options-separator-2" />
-      )
+      groupChildren.push(<Options.Separator />)
     }
 
     return groupChildren
@@ -1423,7 +1420,6 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {
             // (because it has an arrow)
             {...(trigger ? {} : { borderWidth: 'small' })}
             as="div"
-            data-cid="Drilldown"
             elementRef={this.handleDrilldownRef}
             tabIndex={0}
             css={styles?.drilldown}
@@ -1516,12 +1512,10 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {
       shouldSetAriaExpanded,
       styles
     } = this.props
-
     const borderColor = (styles?.drilldown as { borderColor: string })
       ?.borderColor
     return trigger ? (
       <Popover
-        data-cid="Drilldown"
         themeOverride={{
           // use here own theme's color
           borderColor: borderColor
@@ -1582,11 +1576,9 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {
           },
           'aria-haspopup': this.props.role,
           id: this._triggerId,
-          disabled: !!(
-            (trigger as ReactElement<any>).props.disabled || disabled
-          ),
+          disabled: !!((trigger as ReactElement).props.disabled || disabled),
           'aria-disabled':
-            (trigger as ReactElement<any>).props.disabled || disabled
+            (trigger as ReactElement).props.disabled || disabled
               ? 'true'
               : undefined
         })}