@patternfly/react-core 4.266.3 → 4.267.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +11 -0
- package/dist/esm/components/Menu/Menu.d.ts +1 -0
- package/dist/esm/components/Menu/Menu.d.ts.map +1 -1
- package/dist/esm/components/Menu/Menu.js +17 -4
- package/dist/esm/components/Menu/Menu.js.map +1 -1
- package/dist/js/components/Menu/Menu.d.ts +1 -0
- package/dist/js/components/Menu/Menu.d.ts.map +1 -1
- package/dist/js/components/Menu/Menu.js +17 -4
- package/dist/js/components/Menu/Menu.js.map +1 -1
- package/dist/umd/react-core.min.js +1 -1
- package/package.json +2 -2
- package/src/components/Menu/Menu.tsx +20 -4
- package/src/components/Menu/examples/Menu.md +5 -0
- package/src/components/Menu/examples/MenuFilterDrilldown.tsx +123 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [4.267.0](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-core@4.266.3...@patternfly/react-core@4.267.0) (2022-12-07)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* **Menu:** add drilldown filter demo, add flag to support demo & fix some keyboard interaction ([#8405](https://github.com/patternfly/patternfly-react/issues/8405)) ([6fd28da](https://github.com/patternfly/patternfly-react/commit/6fd28da87bbc1f06553df388c626de8d94e0fa05))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [4.266.3](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-core@4.266.2...@patternfly/react-core@4.266.3) (2022-12-07)
|
|
7
18
|
|
|
8
19
|
**Note:** Version bump only for package @patternfly/react-core
|
|
@@ -62,6 +62,7 @@ export interface MenuState {
|
|
|
62
62
|
transitionMoveTarget: HTMLElement;
|
|
63
63
|
flyoutRef: React.Ref<HTMLLIElement> | null;
|
|
64
64
|
disableHover: boolean;
|
|
65
|
+
currentDrilldownMenuId: string;
|
|
65
66
|
}
|
|
66
67
|
export declare const Menu: React.ForwardRefExoticComponent<MenuProps & React.RefAttributes<HTMLDivElement>>;
|
|
67
68
|
//# sourceMappingURL=Menu.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Menu.d.ts","sourceRoot":"","sources":["../../../../src/components/Menu/Menu.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Menu.d.ts","sourceRoot":"","sources":["../../../../src/components/Menu/Menu.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,8 @@ class MenuBase extends React.Component {
|
|
|
16
16
|
searchInputValue: '',
|
|
17
17
|
transitionMoveTarget: null,
|
|
18
18
|
flyoutRef: null,
|
|
19
|
-
disableHover: false
|
|
19
|
+
disableHover: false,
|
|
20
|
+
currentDrilldownMenuId: this.props.id
|
|
20
21
|
};
|
|
21
22
|
this.handleDrilldownTransition = (event) => {
|
|
22
23
|
const current = this.menuRef.current;
|
|
@@ -31,7 +32,15 @@ class MenuBase extends React.Component {
|
|
|
31
32
|
}
|
|
32
33
|
else {
|
|
33
34
|
const nextMenu = current.querySelector('#' + this.props.activeMenu) || current || null;
|
|
34
|
-
const
|
|
35
|
+
const nextMenuChildren = Array.from(nextMenu.getElementsByTagName('UL')[0].children);
|
|
36
|
+
if (!this.state.currentDrilldownMenuId || nextMenu.id !== this.state.currentDrilldownMenuId) {
|
|
37
|
+
this.setState({ currentDrilldownMenuId: nextMenu.id });
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
// if the drilldown transition ends on the same menu, do not focus the first item
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
const nextTarget = nextMenuChildren.filter(el => !(el.classList.contains('pf-m-disabled') || el.classList.contains('pf-c-divider')))[0].firstChild;
|
|
35
44
|
nextTarget.focus();
|
|
36
45
|
nextTarget.tabIndex = 0;
|
|
37
46
|
}
|
|
@@ -141,9 +150,13 @@ class MenuBase extends React.Component {
|
|
|
141
150
|
setFlyoutRef: flyoutRef => this.setState({ flyoutRef }),
|
|
142
151
|
disableHover: this.state.disableHover
|
|
143
152
|
} },
|
|
144
|
-
isRootMenu && (React.createElement(KeyboardHandler, { containerRef: this.menuRef || null, additionalKeyHandler: this.handleExtraKeys, createNavigableElements: this.createNavigableElements, isActiveElement: (element) => document.activeElement.closest('li') === element ||
|
|
153
|
+
isRootMenu && (React.createElement(KeyboardHandler, { containerRef: this.menuRef || null, additionalKeyHandler: this.handleExtraKeys, createNavigableElements: this.createNavigableElements, isActiveElement: (element) => document.activeElement.closest('li') === element || // if element is a basic MenuItem
|
|
145
154
|
document.activeElement.parentElement === element ||
|
|
146
|
-
|
|
155
|
+
document.activeElement.closest('.pf-c-menu__search') === element || // if element is a MenuInput
|
|
156
|
+
(document.activeElement.closest('ol') && document.activeElement.closest('ol').firstChild === element), getFocusableElement: (navigableElement) => (navigableElement.tagName === 'DIV' && navigableElement.querySelector('input')) || // for MenuInput
|
|
157
|
+
(navigableElement.firstChild.tagName === 'LABEL' &&
|
|
158
|
+
navigableElement.querySelector('input')) || // for MenuItem checkboxes
|
|
159
|
+
navigableElement.firstChild, noHorizontalArrowHandling: document.activeElement &&
|
|
147
160
|
(document.activeElement.classList.contains('pf-c-breadcrumb__link') ||
|
|
148
161
|
document.activeElement.classList.contains('pf-c-dropdown__toggle')), noEnterHandling: true, noSpaceHandling: true })),
|
|
149
162
|
React.createElement("div", Object.assign({ id: id, className: css(styles.menu, isPlain && styles.modifiers.plain, isScrollable && styles.modifiers.scrollable, containsFlyout && styles.modifiers.flyout, isNavFlyout && styles.modifiers.nav, containsDrilldown && styles.modifiers.drilldown, _isMenuDrilledIn && styles.modifiers.drilledIn, className), "aria-label": ariaLabel, ref: this.menuRef }, getOUIAProps(Menu.displayName, ouiaId !== undefined ? ouiaId : this.state.ouiaStateId, ouiaSafe), props), children)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../../src/components/Menu/Menu.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,MAAM,MAAM,mDAAmD,CAAC;AACvE,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAa,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../../src/components/Menu/Menu.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,MAAM,MAAM,mDAAmD,CAAC;AACvE,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAa,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAsEhD,MAAM,QAAS,SAAQ,KAAK,CAAC,SAA+B;IAa1D,YAAY,KAAgB;QAC1B,KAAK,CAAC,KAAK,CAAC,CAAC;QAVP,YAAO,GAAG,KAAK,CAAC,SAAS,EAAkB,CAAC;QAC5C,eAAU,GAAG,IAAe,CAAC;QAerC,UAAK,GAAc;YACjB,WAAW,EAAE,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC;YAC/C,gBAAgB,EAAE,EAAE;YACpB,oBAAoB,EAAE,IAAI;YAC1B,SAAS,EAAE,IAAI;YACf,YAAY,EAAE,KAAK;YACnB,sBAAsB,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;SACtC,CAAC;QAsCF,8BAAyB,GAAG,CAAC,KAAsB,EAAE,EAAE;YACrD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;YAErC,IACE,CAAC,OAAO;gBACR,CAAC,OAAO,KAAM,KAAK,CAAC,MAAsB,CAAC,OAAO,CAAC,YAAY,CAAC;oBAC9D,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAC9D,KAAK,CAAC,MAAsB,CAAC,OAAO,CAAC,YAAY,CAAC,CACpD,CAAC,EACJ;gBACA,OAAO;aACR;YAED,IAAI,IAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE;gBACnC,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC;gBACxC,IAAI,CAAC,QAAQ,CAAC,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC,CAAC;aAC/C;iBAAM;gBACL,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,OAAO,IAAI,IAAI,CAAC;gBACvF,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBAErF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,sBAAsB,IAAI,QAAQ,CAAC,EAAE,KAAK,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE;oBAC3F,IAAI,CAAC,QAAQ,CAAC,EAAE,sBAAsB,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;iBACxD;qBAAM;oBACL,iFAAiF;oBACjF,OAAO;iBACR;gBAED,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,CACxC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CACzF,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;gBAEf,UAA0B,CAAC,KAAK,EAAE,CAAC;gBACnC,UAA0B,CAAC,QAAQ,GAAG,CAAC,CAAC;aAC1C;QACH,CAAC,CAAC;QAEF,oBAAe,GAAG,CAAC,KAAoB,EAAE,EAAE;YACzC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC;YACjD,MAAM,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;YAE7C,IACG,KAAK,CAAC,MAAsB,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC,UAAU;gBACvE,CAAE,KAAK,CAAC,MAAsB,CAAC,SAAS,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAC1E;gBACA,IAAI,CAAC,UAAU,GAAI,KAAK,CAAC,MAAsB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBACtE,IAAI,CAAC,QAAQ,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;aACvC;YAED,IAAK,KAAK,CAAC,MAAsB,CAAC,OAAO,KAAK,OAAO,EAAE;gBACrD,OAAO;aACR;YAED,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;YACnC,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;YACtB,MAAM,gBAAgB,GACpB,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,uBAAuB,CAAC;gBACzD,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;YAE5D,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,OAAO,EAAE;gBAClC,KAAK,CAAC,cAAc,EAAE,CAAC;gBACvB,IAAI,WAAW,IAAI,CAAC,gBAAgB,EAAE;oBACpC,MAAM,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;oBAC1F,IAAI,aAAa,IAAI,UAAU,CAAC,aAAa,CAAC,OAAO,KAAK,IAAI,EAAE;wBAC7D,aAA6B,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;wBAC5C,UAAU,CAAC,aAAa,CAAC,UAA0B,CAAC,QAAQ,GAAG,CAAC,CAAC;wBAClE,IAAI,CAAC,QAAQ,CAAC,EAAE,oBAAoB,EAAE,UAAU,CAAC,aAAa,CAAC,UAAyB,EAAE,CAAC,CAAC;qBAC7F;yBAAM;wBACL,IAAI,aAAa,CAAC,kBAAkB,IAAI,aAAa,CAAC,kBAAkB,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;4BACxG,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAC3B,aAAa,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CACxE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;4BAElG,aAA6B,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;4BAC5C,UAAU,CAAC,CAAC,CAAC,CAAC,UAA0B,CAAC,QAAQ,GAAG,CAAC,CAAC;4BACvD,IAAI,CAAC,QAAQ,CAAC,EAAE,oBAAoB,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,UAAyB,EAAE,CAAC,CAAC;yBAClF;qBACF;iBACF;gBACA,QAAQ,CAAC,aAA6B,CAAC,KAAK,EAAE,CAAC;aACjD;QACH,CAAC,CAAC;QAEF,4BAAuB,GAAG,GAAG,EAAE;YAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC;YAEjD,IAAI,WAAW,EAAE;gBACf,OAAO,IAAI,CAAC,UAAU;oBACpB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CACvE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CACzF;oBACH,CAAC,CAAC,EAAE,CAAC;aACR;iBAAM;gBACL,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO;oBACzB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAChE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CACzF;oBACH,CAAC,CAAC,EAAE,CAAC;aACR;QACH,CAAC,CAAC;QApJA,IAAI,KAAK,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,QAA2C,CAAC;SAClE;IACH,CAAC;IAWD,iBAAiB;QACf,mCAAmC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QACrC,IAAI,OAAO,EAAE;YACX,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,+CAA+C,CAE9D,CAAC;YACtB,IAAI,KAAK,EAAE;gBACT,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC;aACpB;SACF;IACH,CAAC;IAED,iBAAiB;QACf,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,QAAQ,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;SAC5D;QACD,IAAI,SAAS,EAAE;YACb,MAAM,CAAC,gBAAgB,CAAC,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SACzG;QAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAED,oBAAoB;QAClB,IAAI,SAAS,EAAE;YACb,MAAM,CAAC,mBAAmB,CAAC,eAAe,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAC;SAC7E;IACH,CAAC;IAED,kBAAkB,CAAC,SAAoB;QACrC,IAAI,SAAS,CAAC,QAAQ,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;YAC9C,IAAI,CAAC,iBAAiB,EAAE,CAAC;SAC1B;IACH,CAAC;IAsGD,MAAM;QACJ,MAAM,KA6BF,IAAI,CAAC,KAAK,EA7BR,EACJ,YAAY,EAAE,SAAS,EACvB,EAAE,EACF,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,QAAQ,GAAG,IAAI,EACf,aAAa,EACb,MAAM,EACN,QAAQ,EACR,cAAc,EACd,WAAW,EACX,iBAAiB,EACjB,eAAe,EACf,OAAO,EACP,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,SAAS,EACT,UAAU,EACV,eAAe,EACf,UAAU,GAAG,IAAI,EACjB,YAAY,GAAG,IAAI;QACnB,sDAAsD;QACtD,QAAQ,EACR,UAAU,EACV,UAAU,OAGE;QAFZ,qDAAqD;QAClD,KAAK,cA5BJ,2WA6BL,CAAa,CAAC;QACf,MAAM,gBAAgB,GAAG,eAAe,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,CAAC;QACrG,OAAO,CACL,oBAAC,WAAW,CAAC,QAAQ,IACnB,KAAK,EAAE;gBACL,MAAM,EAAE,EAAE;gBACV,UAAU,EAAE,UAAU,IAAI,EAAE;gBAC5B,QAAQ;gBACR,aAAa;gBACb,YAAY;gBACZ,QAAQ;gBACR,cAAc;gBACd,iBAAiB;gBACjB,SAAS;gBACT,UAAU;gBACV,eAAe;gBACf,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS;gBAC/B,YAAY,EAAE,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC;gBACvD,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;aACtC;YAEA,UAAU,IAAI,CACb,oBAAC,eAAe,IACd,YAAY,EAAG,IAAI,CAAC,OAA2C,IAAI,IAAI,EACvE,oBAAoB,EAAE,IAAI,CAAC,eAAe,EAC1C,uBAAuB,EAAE,IAAI,CAAC,uBAAuB,EACrD,eAAe,EAAE,CAAC,OAAgB,EAAE,EAAE,CACpC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,OAAO,IAAI,iCAAiC;oBACrF,QAAQ,CAAC,aAAa,CAAC,aAAa,KAAK,OAAO;oBAChD,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,OAAO,IAAI,4BAA4B;oBAChG,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,KAAK,OAAO,CAAC,EAEvG,mBAAmB,EAAE,CAAC,gBAAyB,EAAE,EAAE,CACjD,CAAC,gBAAgB,CAAC,OAAO,KAAK,KAAK,IAAI,gBAAgB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,gBAAgB;oBACnG,CAAE,gBAAgB,CAAC,UAAsB,CAAC,OAAO,KAAK,OAAO;wBAC3D,gBAAgB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,0BAA0B;oBACvE,gBAAgB,CAAC,UAAsB,EAE1C,yBAAyB,EACvB,QAAQ,CAAC,aAAa;oBACtB,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,uBAAuB,CAAC;wBACjE,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,EAEvE,eAAe,QACf,eAAe,SACf,CACH;YACD,2CACE,EAAE,EAAE,EAAE,EACN,SAAS,EAAE,GAAG,CACZ,MAAM,CAAC,IAAI,EACX,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,EACjC,YAAY,IAAI,MAAM,CAAC,SAAS,CAAC,UAAU,EAC3C,cAAc,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,EACzC,WAAW,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,EACnC,iBAAiB,IAAI,MAAM,CAAC,SAAS,CAAC,SAAS,EAC/C,gBAAgB,IAAI,MAAM,CAAC,SAAS,CAAC,SAAS,EAC9C,SAAS,CACV,gBACW,SAAS,EACrB,GAAG,EAAE,IAAI,CAAC,OAAO,IACb,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,EAChG,KAAK,GAER,QAAQ,CACL,CACe,CACxB,CAAC;IACJ,CAAC;;AAtQM,oBAAW,GAAG,MAAM,CAAC;AACrB,oBAAW,GAAG,WAAW,CAAC;AAI1B,qBAAY,GAAc;IAC/B,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE,KAAK;IACd,YAAY,EAAE,KAAK;CACpB,CAAC;AA+PJ,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,KAAgB,EAAE,GAA8B,EAAE,EAAE,CAAC,CACzF,oBAAC,QAAQ,oBAAK,KAAK,IAAE,QAAQ,EAAE,GAAG,IAAI,CACvC,CAAC,CAAC;AACH,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC"}
|
|
@@ -62,6 +62,7 @@ export interface MenuState {
|
|
|
62
62
|
transitionMoveTarget: HTMLElement;
|
|
63
63
|
flyoutRef: React.Ref<HTMLLIElement> | null;
|
|
64
64
|
disableHover: boolean;
|
|
65
|
+
currentDrilldownMenuId: string;
|
|
65
66
|
}
|
|
66
67
|
export declare const Menu: React.ForwardRefExoticComponent<MenuProps & React.RefAttributes<HTMLDivElement>>;
|
|
67
68
|
//# sourceMappingURL=Menu.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Menu.d.ts","sourceRoot":"","sources":["../../../../src/components/Menu/Menu.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Menu.d.ts","sourceRoot":"","sources":["../../../../src/components/Menu/Menu.tsx"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,8 @@ class MenuBase extends React.Component {
|
|
|
19
19
|
searchInputValue: '',
|
|
20
20
|
transitionMoveTarget: null,
|
|
21
21
|
flyoutRef: null,
|
|
22
|
-
disableHover: false
|
|
22
|
+
disableHover: false,
|
|
23
|
+
currentDrilldownMenuId: this.props.id
|
|
23
24
|
};
|
|
24
25
|
this.handleDrilldownTransition = (event) => {
|
|
25
26
|
const current = this.menuRef.current;
|
|
@@ -34,7 +35,15 @@ class MenuBase extends React.Component {
|
|
|
34
35
|
}
|
|
35
36
|
else {
|
|
36
37
|
const nextMenu = current.querySelector('#' + this.props.activeMenu) || current || null;
|
|
37
|
-
const
|
|
38
|
+
const nextMenuChildren = Array.from(nextMenu.getElementsByTagName('UL')[0].children);
|
|
39
|
+
if (!this.state.currentDrilldownMenuId || nextMenu.id !== this.state.currentDrilldownMenuId) {
|
|
40
|
+
this.setState({ currentDrilldownMenuId: nextMenu.id });
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
// if the drilldown transition ends on the same menu, do not focus the first item
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
const nextTarget = nextMenuChildren.filter(el => !(el.classList.contains('pf-m-disabled') || el.classList.contains('pf-c-divider')))[0].firstChild;
|
|
38
47
|
nextTarget.focus();
|
|
39
48
|
nextTarget.tabIndex = 0;
|
|
40
49
|
}
|
|
@@ -144,9 +153,13 @@ class MenuBase extends React.Component {
|
|
|
144
153
|
setFlyoutRef: flyoutRef => this.setState({ flyoutRef }),
|
|
145
154
|
disableHover: this.state.disableHover
|
|
146
155
|
} },
|
|
147
|
-
isRootMenu && (React.createElement(helpers_2.KeyboardHandler, { containerRef: this.menuRef || null, additionalKeyHandler: this.handleExtraKeys, createNavigableElements: this.createNavigableElements, isActiveElement: (element) => document.activeElement.closest('li') === element ||
|
|
156
|
+
isRootMenu && (React.createElement(helpers_2.KeyboardHandler, { containerRef: this.menuRef || null, additionalKeyHandler: this.handleExtraKeys, createNavigableElements: this.createNavigableElements, isActiveElement: (element) => document.activeElement.closest('li') === element || // if element is a basic MenuItem
|
|
148
157
|
document.activeElement.parentElement === element ||
|
|
149
|
-
|
|
158
|
+
document.activeElement.closest('.pf-c-menu__search') === element || // if element is a MenuInput
|
|
159
|
+
(document.activeElement.closest('ol') && document.activeElement.closest('ol').firstChild === element), getFocusableElement: (navigableElement) => (navigableElement.tagName === 'DIV' && navigableElement.querySelector('input')) || // for MenuInput
|
|
160
|
+
(navigableElement.firstChild.tagName === 'LABEL' &&
|
|
161
|
+
navigableElement.querySelector('input')) || // for MenuItem checkboxes
|
|
162
|
+
navigableElement.firstChild, noHorizontalArrowHandling: document.activeElement &&
|
|
150
163
|
(document.activeElement.classList.contains('pf-c-breadcrumb__link') ||
|
|
151
164
|
document.activeElement.classList.contains('pf-c-dropdown__toggle')), noEnterHandling: true, noSpaceHandling: true })),
|
|
152
165
|
React.createElement("div", Object.assign({ id: id, className: react_styles_1.css(menu_1.default.menu, isPlain && menu_1.default.modifiers.plain, isScrollable && menu_1.default.modifiers.scrollable, containsFlyout && menu_1.default.modifiers.flyout, isNavFlyout && menu_1.default.modifiers.nav, containsDrilldown && menu_1.default.modifiers.drilldown, _isMenuDrilledIn && menu_1.default.modifiers.drilledIn, className), "aria-label": ariaLabel, ref: this.menuRef }, helpers_1.getOUIAProps(exports.Menu.displayName, ouiaId !== undefined ? ouiaId : this.state.ouiaStateId, ouiaSafe), props), children)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../../src/components/Menu/Menu.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,qGAAuE;AACvE,2DAA+C;AAC/C,2CAA0E;AAC1E,+CAA4C;AAC5C,6CAA+C;AAC/C,2CAAgD;
|
|
1
|
+
{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../../src/components/Menu/Menu.tsx"],"names":[],"mappings":"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"}
|