@instructure/ui-drilldown 10.13.0 → 10.13.1-pr-snapshot-1741357986437

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [10.13.1-pr-snapshot-1741357986437](https://github.com/instructure/instructure-ui/compare/v10.13.0...v10.13.1-pr-snapshot-1741357986437) (2025-03-07)
+
+**Note:** Version bump only for package @instructure/ui-drilldown
+
+
+
+
+
 # [10.13.0](https://github.com/instructure/instructure-ui/compare/v10.12.0...v10.13.0) (2025-03-06)
 
 **Note:** Version bump only for package @instructure/ui-drilldown

package/lib/Drilldown/DrilldownGroup/props.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.propTypes = exports.allowedProps = void 0;
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _Children = require("@instructure/ui-prop-types/lib/Children.js");
+var _uiPropTypes = require("@instructure/ui-prop-types");
 var _DrilldownOption = _interopRequireDefault(require("../DrilldownOption"));
 var _DrilldownSeparator = _interopRequireDefault(require("../DrilldownSeparator"));
 /*
@@ -35,7 +35,7 @@ var _DrilldownSeparator = _interopRequireDefault(require("../DrilldownSeparator"
 
 const propTypes = exports.propTypes = {
   id: _propTypes.default.string.isRequired,
-  children: _Children.Children.oneOf([_DrilldownOption.default, _DrilldownSeparator.default]),
+  children: _uiPropTypes.Children.oneOf([_DrilldownOption.default, _DrilldownSeparator.default]),
   renderGroupTitle: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.func]),
   withoutSeparators: _propTypes.default.bool,
   disabled: _propTypes.default.bool,

package/lib/Drilldown/DrilldownOption/__new-tests__/DrilldownOption.test.js

@@ -6,7 +6,7 @@ var _react2 = require("@testing-library/react");
 var _vitest = require("vitest");
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
 require("@testing-library/jest-dom");
-var _IconCheckSolid3 = require("@instructure/ui-icons/lib/IconCheckSolid.js");
+var _uiIcons = require("@instructure/ui-icons");
 var _index = require("../../index");
 var _Drilldown, _Drilldown$Option, _Drilldown2, _Drilldown3, _Drilldown4, _Drilldown5, _Drilldown6, _Drilldown7, _Drilldown8, _Drilldown9, _Drilldown10, _Drilldown11, _Drilldown12, _Drilldown13, _Drilldown14, _Drilldown15, _Drilldown16, _IconCheckSolid, _Drilldown17, _Drilldown18, _IconCheckSolid2, _Drilldown19, _Drilldown20, _Drilldown21;
 /*
@@ -355,7 +355,7 @@ describe('<Drilldown.Option />', () => {
           id: "page0"
         }, /*#__PURE__*/_react.default.createElement(_index.Drilldown.Option, {
           id: "option1",
-          renderBeforeLabel: /*#__PURE__*/_react.default.createElement(_IconCheckSolid3.IconCheckSolid, null)
+          renderBeforeLabel: /*#__PURE__*/_react.default.createElement(_uiIcons.IconCheckSolid, null)
         }, "Option"))))),
         container = _render4.container;
       const icon = container.querySelector('svg');
@@ -363,7 +363,7 @@ describe('<Drilldown.Option />', () => {
       expect(icon).toHaveAttribute('name', 'IconCheck');
     });
     it('as function should have option props as params', async () => {
-      const beforeLabelFunction = _vitest.vi.fn(() => _IconCheckSolid || (_IconCheckSolid = /*#__PURE__*/_react.default.createElement(_IconCheckSolid3.IconCheckSolid, null)));
+      const beforeLabelFunction = _vitest.vi.fn(() => _IconCheckSolid || (_IconCheckSolid = /*#__PURE__*/_react.default.createElement(_uiIcons.IconCheckSolid, null)));
       (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.Drilldown, {
         rootPageId: "page0"
       }, /*#__PURE__*/_react.default.createElement(_index.Drilldown.Page, {
@@ -404,7 +404,7 @@ describe('<Drilldown.Option />', () => {
           id: "page0"
         }, /*#__PURE__*/_react.default.createElement(_index.Drilldown.Option, {
           id: "option1",
-          renderAfterLabel: /*#__PURE__*/_react.default.createElement(_IconCheckSolid3.IconCheckSolid, null)
+          renderAfterLabel: /*#__PURE__*/_react.default.createElement(_uiIcons.IconCheckSolid, null)
         }, "Option"))))),
         container = _render5.container;
       const icon = container.querySelector('svg');
@@ -412,7 +412,7 @@ describe('<Drilldown.Option />', () => {
       expect(icon).toHaveAttribute('name', 'IconCheck');
     });
     it('as function should have option props as params', async () => {
-      const beforeLabelFunction = _vitest.vi.fn(() => _IconCheckSolid2 || (_IconCheckSolid2 = /*#__PURE__*/_react.default.createElement(_IconCheckSolid3.IconCheckSolid, null)));
+      const beforeLabelFunction = _vitest.vi.fn(() => _IconCheckSolid2 || (_IconCheckSolid2 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconCheckSolid, null)));
       (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.Drilldown, {
         rootPageId: "page0"
       }, /*#__PURE__*/_react.default.createElement(_index.Drilldown.Page, {

package/lib/Drilldown/DrilldownPage/props.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.propTypes = exports.allowedProps = void 0;
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _Children = require("@instructure/ui-prop-types/lib/Children.js");
+var _uiPropTypes = require("@instructure/ui-prop-types");
 var _DrilldownGroup = _interopRequireDefault(require("../DrilldownGroup"));
 var _DrilldownOption = _interopRequireDefault(require("../DrilldownOption"));
 var _DrilldownSeparator = _interopRequireDefault(require("../DrilldownSeparator"));
@@ -36,7 +36,7 @@ var _DrilldownSeparator = _interopRequireDefault(require("../DrilldownSeparator"
 
 const propTypes = exports.propTypes = {
   id: _propTypes.default.string.isRequired,
-  children: _Children.Children.oneOf([_DrilldownOption.default, _DrilldownSeparator.default, _DrilldownGroup.default]),
+  children: _uiPropTypes.Children.oneOf([_DrilldownOption.default, _DrilldownSeparator.default, _DrilldownGroup.default]),
   renderTitle: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.func]),
   renderActionLabel: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.func]),
   renderBackButtonLabel: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.func]),

package/lib/Drilldown/__new-tests__/Drilldown.test.js

@@ -7,8 +7,8 @@ var _vitest = require("vitest");
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
 require("@testing-library/jest-dom");
 var _generateA11yTests = require("@instructure/ui-scripts/lib/test/generateA11yTests");
-var _runAxeCheck = require("@instructure/ui-axe-check/lib/runAxeCheck.js");
-var _IconCheckSolid = require("@instructure/ui-icons/lib/IconCheckSolid.js");
+var _uiAxeCheck = require("@instructure/ui-axe-check");
+var _uiIcons = require("@instructure/ui-icons");
 var _index = require("../index");
 var _Drilldown16 = _interopRequireDefault(require("../__examples__/Drilldown.examples"));
 var _Drilldown, _Drilldown2, _Drilldown3, _Drilldown4, _Drilldown5, _Drilldown6, _Drilldown7, _Drilldown8, _Drilldown9, _Drilldown$Page, _button, _Drilldown$Page2, _button2, _Drilldown$Page3, _Drilldown$Page4, _button3, _Drilldown$Page5, _button4, _Drilldown$Page6, _Drilldown$Page7, _button5, _Drilldown$Page8, _button6, _Drilldown$Page9, _Drilldown10, _button7, _Drilldown$Page10, _Drilldown11, _button8, _Drilldown$Page11, _button9, _Drilldown$Page12, _button10, _Drilldown$Page13, _Drilldown12, _button11, _Drilldown$Page14, _Drilldown13, _button12, _Drilldown$Page15, _button13, _Drilldown$Page16, _button14, _Drilldown$Page17, _button15, _Drilldown$Page18, _button16, _Drilldown$Page19, _button17, _Drilldown$Page20, _button18, _Drilldown$Page21, _button19, _Drilldown$Page22, _Drilldown14, _Drilldown15;
@@ -745,10 +745,10 @@ describe('<Drilldown />', () => {
           href: "/"
         }, "Item6"), /*#__PURE__*/_react.default.createElement(_index.Drilldown.Option, {
           id: "item07",
-          renderBeforeLabel: /*#__PURE__*/_react.default.createElement(_IconCheckSolid.IconCheckSolid, null)
+          renderBeforeLabel: /*#__PURE__*/_react.default.createElement(_uiIcons.IconCheckSolid, null)
         }, "Item7"), /*#__PURE__*/_react.default.createElement(_index.Drilldown.Option, {
           id: "item08",
-          renderAfterLabel: /*#__PURE__*/_react.default.createElement(_IconCheckSolid.IconCheckSolid, null)
+          renderAfterLabel: /*#__PURE__*/_react.default.createElement(_uiIcons.IconCheckSolid, null)
         }, "Item8"), /*#__PURE__*/_react.default.createElement(_index.Drilldown.Separator, {
           id: "sep1"
         }), /*#__PURE__*/_react.default.createElement(_index.Drilldown.Group, {
@@ -781,7 +781,7 @@ describe('<Drilldown />', () => {
       // axe-check is more strict now, and expects "list" role to have "listitem" children, but we use "role='none'" children. After discussing it with the A11y team, we agreed to ignore this error because the screen readers can read the component perfectly.
       // TODO: try to remove this ignore if axe-check is updated and isn't this strict anymore
       // https://dequeuniversity.com/rules/axe/4.6/aria-required-children?application=axeAPI
-      const axeCheck = await (0, _runAxeCheck.runAxeCheck)(container, {
+      const axeCheck = await (0, _uiAxeCheck.runAxeCheck)(container, {
         ignores: ['aria-required-children']
       });
       expect(axeCheck).toBe(true);
@@ -796,7 +796,7 @@ describe('<Drilldown />', () => {
           id: "option0"
         }, "Option 0"))))),
         container = _render10.container;
-      const axeCheck = await (0, _runAxeCheck.runAxeCheck)(container);
+      const axeCheck = await (0, _uiAxeCheck.runAxeCheck)(container);
       expect(axeCheck).toBe(true);
     });
   });
@@ -807,7 +807,7 @@ describe('<Drilldown />', () => {
     }) => {
       const _render11 = (0, _react2.render)(content),
         container = _render11.container;
-      const axeCheck = await (0, _runAxeCheck.runAxeCheck)(container, {
+      const axeCheck = await (0, _uiAxeCheck.runAxeCheck)(container, {
         // axe-check is more strict now, and expects "list" role to have "listitem" children, but we use "role='none'" children. After discussing it with the A11y team, we agreed to ignore this error because the screen readers can read the component perfectly.
         // TODO: try to remove this ignore if axe-check is updated and isn't this strict anymore
         // https://dequeuniversity.com/rules/axe/4.6/aria-required-children?application=axeAPI

package/lib/Drilldown/index.js

@@ -9,21 +9,14 @@ exports.default = exports.Drilldown = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(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");
-var _matchComponentTypes = require("@instructure/ui-react-utils/lib/matchComponentTypes.js");
-var _omitProps = require("@instructure/ui-react-utils/lib/omitProps.js");
-var _safeCloneElement = require("@instructure/ui-react-utils/lib/safeCloneElement.js");
-var _withDeterministicId = require("@instructure/ui-react-utils/lib/DeterministicIdContext/withDeterministicId.js");
-var _View = require("@instructure/ui-view/lib/View");
-var _Options = require("@instructure/ui-options/lib/Options");
-var _Popover = require("@instructure/ui-popover/lib/Popover");
-var _Selectable = require("@instructure/ui-selectable/lib/Selectable");
-var _IconArrowOpenStartSolid = require("@instructure/ui-icons/lib/IconArrowOpenStartSolid.js");
-var _IconArrowOpenEndSolid = require("@instructure/ui-icons/lib/IconArrowOpenEndSolid.js");
-var _IconCheckSolid = require("@instructure/ui-icons/lib/IconCheckSolid.js");
+var _uiTestable = require("@instructure/ui-testable");
+var _uiDomUtils = require("@instructure/ui-dom-utils");
+var _uiReactUtils = require("@instructure/ui-react-utils");
+var _uiView = require("@instructure/ui-view");
+var _uiOptions = require("@instructure/ui-options");
+var _uiPopover = require("@instructure/ui-popover");
+var _uiSelectable = require("@instructure/ui-selectable");
+var _uiIcons = require("@instructure/ui-icons");
 var _emotion = require("@instructure/emotion");
 var _DrilldownSeparator = require("./DrilldownSeparator");
 var _DrilldownOption = require("./DrilldownOption");
@@ -73,7 +66,7 @@ var _dec, _dec2, _dec3, _class, _Drilldown, _IconArrowOpenEndSoli, _IconArrowOpe
 category: components
 ---
 **/
-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 {
+let Drilldown = exports.Drilldown = (_dec = (0, _uiReactUtils.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec3 = (0, _uiTestable.testable)(), _dec(_class = _dec2(_class = _dec3(_class = (_Drilldown = class Drilldown extends _react.Component {
   constructor(props) {
     super(props);
     this._drilldownRef = null;
@@ -495,7 +488,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
     this.pages.forEach(page => {
       const children = page.props.children;
       this.getChildrenArray(children).forEach(child => {
-        if ((0, _matchComponentTypes.matchComponentTypes)(child, [_DrilldownGroup.DrilldownGroup])) {
+        if ((0, _uiReactUtils.matchComponentTypes)(child, [_DrilldownGroup.DrilldownGroup])) {
           var _this$getChildrenArra;
           const _child$props = child.props,
             groupId = _child$props.id,
@@ -515,7 +508,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
           }
           selectedGroupOptionsMap[groupId] = new Map();
           (_this$getChildrenArra = this.getChildrenArray(groupChildren)) === null || _this$getChildrenArra === void 0 ? void 0 : _this$getChildrenArra.forEach(groupChild => {
-            if ((0, _matchComponentTypes.matchComponentTypes)(groupChild, [_DrilldownOption.DrilldownOption])) {
+            if ((0, _uiReactUtils.matchComponentTypes)(groupChild, [_DrilldownOption.DrilldownOption])) {
               const _groupChild$props = groupChild.props,
                 optionId = _groupChild$props.id,
                 optionValue = _groupChild$props.value,
@@ -557,8 +550,8 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
 
     // Back navigation option
     if (this.previousPage) {
-      const prevPageTitle = (0, _callRenderProp.callRenderProp)(this.previousPage.renderTitle);
-      const backButtonLabel = (0, _callRenderProp.callRenderProp)(renderBackButtonLabel, prevPageTitle);
+      const prevPageTitle = (0, _uiReactUtils.callRenderProp)(this.previousPage.renderTitle);
+      const backButtonLabel = (0, _uiReactUtils.callRenderProp)(renderBackButtonLabel, prevPageTitle);
       headerChildren.push((0, _emotion.jsx)(_DrilldownOption.DrilldownOption, {
         id: this._headerBackId,
         onOptionClick: this.handleBackButtonClick
@@ -570,7 +563,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
 
     // Header title
     if (renderTitle) {
-      const title = (0, _callRenderProp.callRenderProp)(renderTitle);
+      const title = (0, _uiReactUtils.callRenderProp)(renderTitle);
       if (title) {
         headerChildren.push((0, _emotion.jsx)(_DrilldownOption.DrilldownOption, {
           id: this._headerTitleId,
@@ -585,7 +578,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
 
     // Action label
     if (renderActionLabel) {
-      const actionLabel = (0, _callRenderProp.callRenderProp)(renderActionLabel);
+      const actionLabel = (0, _uiReactUtils.callRenderProp)(renderActionLabel);
       if (actionLabel) {
         headerChildren.push((0, _emotion.jsx)(_DrilldownOption.DrilldownOption, {
           id: this._headerActionId,
@@ -644,9 +637,9 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
   }
   focused() {
     if (this.shown) {
-      return (0, _containsActiveElement.containsActiveElement)(this._drilldownRef);
+      return (0, _uiDomUtils.containsActiveElement)(this._drilldownRef);
     } else {
-      return (0, _containsActiveElement.containsActiveElement)(this._trigger);
+      return (0, _uiDomUtils.containsActiveElement)(this._trigger);
     }
   }
   focusOption(id) {
@@ -725,7 +718,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
       /**
        * --- RENDER GROUP ---
        */
-      if ((0, _matchComponentTypes.matchComponentTypes)(child, [_DrilldownGroup.DrilldownGroup])) {
+      if ((0, _uiReactUtils.matchComponentTypes)(child, [_DrilldownGroup.DrilldownGroup])) {
         const isFirstChild = index === 0;
         const isLastChild = index === pageChildren.length - 1;
         const afterSeparator = lastItemWasSeparator;
@@ -739,7 +732,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
         /**
          * --- RENDER SEPARATOR ---
          */
-      } else if ((0, _matchComponentTypes.matchComponentTypes)(child, [_DrilldownSeparator.DrilldownSeparator])) {
+      } else if ((0, _uiReactUtils.matchComponentTypes)(child, [_DrilldownSeparator.DrilldownSeparator])) {
         // if the last item was separator, we don't want to duplicate it
         if (lastItemWasSeparator) {
           return null;
@@ -750,7 +743,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
         /**
          * --- RENDER OPTION ---
          */
-      } else if ((0, _matchComponentTypes.matchComponentTypes)(child, [_DrilldownOption.DrilldownOption])) {
+      } else if ((0, _uiReactUtils.matchComponentTypes)(child, [_DrilldownOption.DrilldownOption])) {
         lastItemWasSeparator = false;
         return this.renderOption(child, getOptionProps, getDisabledOptionProps);
       } else {
@@ -763,7 +756,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
       id = _separator$props.id,
       themeOverride = _separator$props.themeOverride,
       props = (0, _objectWithoutProperties2.default)(_separator$props, _excluded3);
-    return (0, _emotion.jsx)(_Options.Options.Separator, Object.assign({}, props, {
+    return (0, _emotion.jsx)(_uiOptions.Options.Separator, Object.assign({}, props, {
       id: id,
       key: id,
       role: "separator"
@@ -801,7 +794,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
     // Props passed to the Option.Item
     let optionProps = {
       // passthrough props
-      ...(0, _omitProps.omitProps)(option.props, [..._DrilldownOption.DrilldownOption.allowedProps, ..._Options.Options.Item.allowedProps]),
+      ...(0, _uiReactUtils.omitProps)(option.props, [..._DrilldownOption.DrilldownOption.allowedProps, ..._uiOptions.Options.Item.allowedProps]),
       // props from selectable
       ...getOptionProps({
         id,
@@ -859,13 +852,13 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
     // we set a few manually on Options.Item,
     // the rest are passed directly
     if (subPageId) {
-      optionProps.renderAfterLabel = _IconArrowOpenEndSoli || (_IconArrowOpenEndSoli = (0, _emotion.jsx)(_IconArrowOpenEndSolid.IconArrowOpenEndSolid, null));
+      optionProps.renderAfterLabel = _IconArrowOpenEndSoli || (_IconArrowOpenEndSoli = (0, _emotion.jsx)(_uiIcons.IconArrowOpenEndSolid, null));
       optionProps['aria-haspopup'] = true;
       optionProps.role = customRole || 'button';
       (0, _console.warn)(!renderAfterLabel, `The prop "renderAfterLabel" is reserved on item with id: "${id}". When it has "subPageId" provided, a navigation arrow will render after the label.`);
     }
     if (id === this._headerBackId) {
-      optionProps.renderBeforeLabel = _IconArrowOpenStartSo || (_IconArrowOpenStartSo = (0, _emotion.jsx)(_IconArrowOpenStartSolid.IconArrowOpenStartSolid, null));
+      optionProps.renderBeforeLabel = _IconArrowOpenStartSo || (_IconArrowOpenStartSo = (0, _emotion.jsx)(_uiIcons.IconArrowOpenStartSolid, null));
     }
     const isOptionControlled = typeof option.props.selected === 'boolean';
     if ((groupProps !== null && groupProps !== void 0 && groupProps.selectableType || isOptionControlled) && groupProps) {
@@ -876,7 +869,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
         isSelected = Boolean(option.props.selected);
       }
       optionProps['aria-checked'] = isSelected;
-      optionProps.renderBeforeLabel = (0, _emotion.jsx)(_IconCheckSolid.IconCheckSolid, {
+      optionProps.renderBeforeLabel = (0, _emotion.jsx)(_uiIcons.IconCheckSolid, {
         style: {
           opacity: isSelected ? 1 : 0
         }
@@ -907,7 +900,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
         optionProps.href = href;
       }
     }
-    const optionLabel = (0, _callRenderProp.callRenderProp)(children, {
+    const optionLabel = (0, _uiReactUtils.callRenderProp)(children, {
       id,
       variant: optionProps.variant,
       isSelected
@@ -931,7 +924,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
     if (typeof optionProps.renderAfterLabel === 'function' && !((_optionProps$renderAf = optionProps.renderAfterLabel) !== null && _optionProps$renderAf !== void 0 && (_optionProps$renderAf2 = _optionProps$renderAf.prototype) !== null && _optionProps$renderAf2 !== void 0 && _optionProps$renderAf2.isReactComponent)) {
       optionProps.renderAfterLabel = optionProps.renderAfterLabel.bind(null, renderLabelProps);
     }
-    const labelInfo = renderLabelInfo && (0, _callRenderProp.callRenderProp)(renderLabelInfo, renderLabelProps);
+    const labelInfo = renderLabelInfo && (0, _uiReactUtils.callRenderProp)(renderLabelInfo, renderLabelProps);
     const vAlignMap = {
       start: 'flex-start',
       center: 'center',
@@ -941,7 +934,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
     const infoAriaId = `${id}__info`;
     const labelledby = option.props['aria-labelledby'] || labelAriaId;
     const describedby = option.props['aria-describedby'] || (labelInfo ? infoAriaId : void 0);
-    return (0, _emotion.jsx)(_Options.Options.Item, Object.assign({}, optionProps, {
+    return (0, _emotion.jsx)(_uiOptions.Options.Item, Object.assign({}, optionProps, {
       key: id,
       "aria-labelledby": labelledby,
       "aria-describedby": describedby
@@ -978,12 +971,12 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
 
     // add a separator above
     if (needsFirstSeparator) {
-      groupChildren.push(_Options$Separator || (_Options$Separator = (0, _emotion.jsx)(_Options.Options.Separator, null)));
+      groupChildren.push(_Options$Separator || (_Options$Separator = (0, _emotion.jsx)(_uiOptions.Options.Separator, null)));
     }
 
     // create a sublist as a group
     // (a wrapping list item will be created by Options)
-    groupChildren.push((0, _emotion.jsx)(_Options.Options, {
+    groupChildren.push((0, _emotion.jsx)(_uiOptions.Options, {
       id: id,
       key: id,
       role: role,
@@ -994,9 +987,9 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
       ,
       themeOverride: themeOverride
     }, this.getChildrenArray(children).map(child => {
-      if ((0, _matchComponentTypes.matchComponentTypes)(child, [_DrilldownSeparator.DrilldownSeparator])) {
+      if ((0, _uiReactUtils.matchComponentTypes)(child, [_DrilldownSeparator.DrilldownSeparator])) {
         return this.renderSeparator(child);
-      } else if ((0, _matchComponentTypes.matchComponentTypes)(child, [_DrilldownOption.DrilldownOption])) {
+      } else if ((0, _uiReactUtils.matchComponentTypes)(child, [_DrilldownOption.DrilldownOption])) {
         return this.renderOption(child, getOptionProps, getDisabledOptionProps, group.props);
       } else {
         return null;
@@ -1005,7 +998,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
 
     // add a separator below
     if (needsLastSeparator) {
-      groupChildren.push(_Options$Separator2 || (_Options$Separator2 = (0, _emotion.jsx)(_Options.Options.Separator, null)));
+      groupChildren.push(_Options$Separator2 || (_Options$Separator2 = (0, _emotion.jsx)(_uiOptions.Options.Separator, null)));
     }
     return groupChildren;
   }
@@ -1026,7 +1019,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
     if (!this.currentPage) {
       return null;
     }
-    return (0, _emotion.jsx)(_Selectable.Selectable, {
+    return (0, _emotion.jsx)(_uiSelectable.Selectable, {
       isShowingOptions: this.shown,
       highlightedOptionId: this.state.highlightedOptionId,
       selectedOptionId: this.selectedGroupOptionIdsArray,
@@ -1056,7 +1049,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
       getListProps,
       getOptionProps,
       getDisabledOptionProps
-    }) => (0, _emotion.jsx)(_View.View, Object.assign({
+    }) => (0, _emotion.jsx)(_uiView.View, Object.assign({
       borderWidth: "small",
       as: "div",
       elementRef: this.handleDrilldownRef,
@@ -1080,7 +1073,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
       onBlur: event => {
         const target = event.currentTarget;
         const related = event.relatedTarget;
-        const containsRelated = (0, _contains.contains)(target, related);
+        const containsRelated = (0, _uiDomUtils.contains)(target, related);
         if (!related || related === this._drilldownRef || related !== target && !containsRelated) {
           this.setState({
             highlightedOptionId: void 0
@@ -1092,7 +1085,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
           highlightedOptionId: void 0
         });
       }
-    })), (0, _emotion.jsx)(_View.View, {
+    })), (0, _emotion.jsx)(_uiView.View, {
       as: "div",
       overflowY: overflowY,
       overflowX: overflowX,
@@ -1108,7 +1101,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
       elementRef: element => {
         this._containerElement = element;
       }
-    }, (0, _emotion.jsx)(_Options.Options, Object.assign({}, getListProps(), {
+    }, (0, _emotion.jsx)(_uiOptions.Options, Object.assign({}, getListProps(), {
       role: "presentation",
       as: as
     }), this.renderList(getOptionProps, getDisabledOptionProps)))));
@@ -1135,7 +1128,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
       onMouseOver = _this$props6.onMouseOver,
       offsetX = _this$props6.offsetX,
       offsetY = _this$props6.offsetY;
-    return trigger ? (0, _emotion.jsx)(_Popover.Popover, {
+    return trigger ? (0, _emotion.jsx)(_uiPopover.Popover, {
       isShowingContent: show,
       defaultIsShowingContent: defaultShow,
       shouldCloseOnDocumentClick: true,
@@ -1174,7 +1167,7 @@ let Drilldown = exports.Drilldown = (_dec = (0, _withDeterministicId.withDetermi
           popoverRef(el);
         }
       },
-      renderTrigger: (0, _safeCloneElement.safeCloneElement)(trigger, {
+      renderTrigger: (0, _uiReactUtils.safeCloneElement)(trigger, {
         ref: el => {
           this._trigger = el;
         },

package/lib/Drilldown/props.js

@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 _uiPropTypes = require("@instructure/ui-prop-types");
+var _uiPosition = require("@instructure/ui-position");
 var _DrilldownPage = require("./DrilldownPage");
 /*
  * The MIT License (MIT)
@@ -36,7 +35,7 @@ var _DrilldownPage = require("./DrilldownPage");
 
 const propTypes = exports.propTypes = {
   rootPageId: _propTypes.default.string.isRequired,
-  children: _Children.Children.oneOf([_DrilldownPage.DrilldownPage]),
+  children: _uiPropTypes.Children.oneOf([_DrilldownPage.DrilldownPage]),
   id: _propTypes.default.string,
   label: _propTypes.default.string,
   disabled: _propTypes.default.bool,
@@ -54,19 +53,19 @@ const propTypes = exports.propTypes = {
   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,
+  placement: _uiPosition.PositionPropTypes.placement,
   defaultShow: _propTypes.default.bool,
-  show: (0, _controllable.controllable)(_propTypes.default.bool, 'onToggle', 'defaultShow'),
+  show: (0, _uiPropTypes.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,
+  mountNode: _uiPosition.PositionPropTypes.mountNode,
+  positionTarget: _uiPosition.PositionPropTypes.mountNode,
   positionContainerDisplay: _propTypes.default.oneOf(['inline-block', 'block']),
-  constrain: _PositionPropTypes.PositionPropTypes.constrain,
+  constrain: _uiPosition.PositionPropTypes.constrain,
   shouldHideOnSelect: _propTypes.default.bool,
   shouldContainFocus: _propTypes.default.bool,
   shouldReturnFocus: _propTypes.default.bool,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-drilldown",
-  "version": "10.13.0",
+  "version": "10.13.1-pr-snapshot-1741357986437",
   "description": "A drilldown menu component",
   "author": "Instructure, Inc. Engineering and Product Design",
   "module": "./es/index.js",
@@ -24,29 +24,29 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.26.0",
-    "@instructure/console": "10.13.0",
-    "@instructure/emotion": "10.13.0",
-    "@instructure/shared-types": "10.13.0",
-    "@instructure/ui-dom-utils": "10.13.0",
-    "@instructure/ui-icons": "10.13.0",
-    "@instructure/ui-options": "10.13.0",
-    "@instructure/ui-popover": "10.13.0",
-    "@instructure/ui-position": "10.13.0",
-    "@instructure/ui-prop-types": "10.13.0",
-    "@instructure/ui-react-utils": "10.13.0",
-    "@instructure/ui-selectable": "10.13.0",
-    "@instructure/ui-testable": "10.13.0",
-    "@instructure/ui-utils": "10.13.0",
-    "@instructure/ui-view": "10.13.0",
+    "@instructure/console": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/emotion": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/shared-types": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-dom-utils": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-icons": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-options": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-popover": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-position": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-prop-types": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-react-utils": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-selectable": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-testable": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-utils": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-view": "10.13.1-pr-snapshot-1741357986437",
     "prop-types": "^15.8.1"
   },
   "devDependencies": {
-    "@instructure/ui-axe-check": "10.13.0",
-    "@instructure/ui-babel-preset": "10.13.0",
-    "@instructure/ui-color-utils": "10.13.0",
-    "@instructure/ui-scripts": "10.13.0",
-    "@instructure/ui-test-utils": "10.13.0",
-    "@instructure/ui-themes": "10.13.0",
+    "@instructure/ui-axe-check": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-babel-preset": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-color-utils": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-scripts": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-test-utils": "10.13.1-pr-snapshot-1741357986437",
+    "@instructure/ui-themes": "10.13.1-pr-snapshot-1741357986437",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.0.1",
     "@testing-library/user-event": "^14.5.2",