@patternfly/react-core 4.201.2 → 4.202.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-core",
-  "version": "4.201.2",
+  "version": "4.202.0",
   "description": "This library provides a set of common React components for use with the PatternFly reference implementation.",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -34,16 +34,16 @@
     "generate": "node scripts/copyStyles.js"
   },
   "dependencies": {
-    "@patternfly/react-icons": "^4.52.2",
-    "@patternfly/react-styles": "^4.51.2",
-    "@patternfly/react-tokens": "^4.53.2",
+    "@patternfly/react-icons": "^4.53.0",
+    "@patternfly/react-styles": "^4.52.0",
+    "@patternfly/react-tokens": "^4.54.0",
     "focus-trap": "6.2.2",
     "react-dropzone": "9.0.0",
     "tippy.js": "5.1.2",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "4.183.2",
+    "@patternfly/patternfly": "4.184.1",
     "@rollup/plugin-commonjs": "^21.0.0",
     "@rollup/plugin-node-resolve": "^13.0.0",
     "@rollup/plugin-replace": "^3.0.0",
@@ -60,5 +60,5 @@
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },
-  "gitHead": "c7164830706215f812e1982fdad6c9903229e71f"
+  "gitHead": "a328f46967c052f0d72d77dff763ecbb3318bc4e"
 }

package/src/components/Menu/MenuContent.tsx

@@ -21,8 +21,33 @@ export const MenuContent = React.forwardRef((props: MenuContentProps, ref: React
   const menuContentRef = React.createRef<HTMLDivElement>();
   const refCallback = (el: HTMLElement, menuId: string, onGetMenuHeight: (menuId: string, height: number) => void) => {
     if (el) {
-      onGetMenuHeight && onGetMenuHeight(menuId, el.clientHeight);
-      getHeight && getHeight(el.clientHeight.toString());
+      let clientHeight = el.clientHeight;
+
+      // if this menu is a submenu, we need to account for the root menu list's padding and root menu content's border.
+      let rootMenuList = null;
+      let parentEl = el.closest(`.${styles.menuList}`);
+      while (parentEl !== null && parentEl.nodeType === 1) {
+        if (parentEl.classList.contains(styles.menuList)) {
+          rootMenuList = parentEl;
+        }
+        parentEl = parentEl.parentElement;
+      }
+
+      if (rootMenuList) {
+        const rootMenuListStyles = getComputedStyle(rootMenuList);
+        const rootMenuListPaddingOffset =
+          parseFloat(rootMenuListStyles.getPropertyValue('padding-top').replace(/px/g, '')) +
+          parseFloat(rootMenuListStyles.getPropertyValue('padding-bottom').replace(/px/g, '')) +
+          parseFloat(
+            getComputedStyle(rootMenuList.parentElement)
+              .getPropertyValue('border-bottom-width')
+              .replace(/px/g, '')
+          );
+        clientHeight = clientHeight + rootMenuListPaddingOffset;
+      }
+
+      onGetMenuHeight && onGetMenuHeight(menuId, clientHeight);
+      getHeight && getHeight(clientHeight.toString());
     }
     return ref || menuContentRef;
   };

package/src/components/Select/Select.tsx

@@ -122,7 +122,7 @@ export interface SelectProps
     isPlaceholder?: boolean
   ) => void;
   /** Callback for toggle button behavior */
-  onToggle: (isExpanded: boolean) => void;
+  onToggle: (isExpanded: boolean, event: React.MouseEvent | React.ChangeEvent | React.KeyboardEvent | Event) => void;
   /** Callback for typeahead clear button */
   onClear?: (event: React.MouseEvent) => void;
   /** Optional callback for custom filtering */
@@ -159,6 +159,8 @@ export interface SelectProps
   isInputValuePersisted?: boolean;
   /** @beta Flag for retaining filter results on blur from keyboard-entered typeahead text */
   isInputFilterPersisted?: boolean;
+  /** Flag indicating the typeahead input value should reset upon selection */
+  shouldResetOnSelect?: boolean;
   /** Content rendered in the footer of the select menu */
   footer?: React.ReactNode;
 }
@@ -232,7 +234,8 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
     chipGroupComponent: null,
     isInputValuePersisted: false,
     isInputFilterPersisted: false,
-    isCreateSelectOptionObject: false
+    isCreateSelectOptionObject: false,
+    shouldResetOnSelect: true
   };
 
   state: SelectState = {
@@ -328,7 +331,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
     this.setState({ focusFirstOption: true });
   };
 
-  onToggle = (isExpanded: boolean) => {
+  onToggle = (isExpanded: boolean, e: React.MouseEvent | React.ChangeEvent | React.KeyboardEvent | Event) => {
     const { isInputValuePersisted, onSelect, onToggle, hasInlineFilter } = this.props;
     if (!isExpanded && isInputValuePersisted && onSelect) {
       onSelect(undefined, this.inputRef.current ? this.inputRef.current.value : '');
@@ -338,7 +341,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
         focusFirstOption: true
       });
     }
-    onToggle(isExpanded);
+    onToggle(isExpanded, e);
   };
 
   onClose = () => {
@@ -358,7 +361,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
 
   onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     if (e.target.value.toString() !== '' && !this.props.isOpen) {
-      this.onToggle(true);
+      this.onToggle(true, e);
     }
 
     if (this.props.onTypeaheadInputChanged) {
@@ -503,9 +506,9 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
     });
   };
 
-  onClick = (_e: React.MouseEvent) => {
+  onClick = (e: React.MouseEvent) => {
     if (!this.props.isOpen) {
-      this.onToggle(true);
+      this.onToggle(true, e);
     }
   };
 
@@ -678,10 +681,20 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
           typeaheadCurrIndex !== -1 && // do not allow selection without moving to an initial option
           (typeaheadActiveChild || (this.refCollection[0] && this.refCollection[0][0]))
         ) {
-          this.setState({
-            typeaheadInputValue:
-              (typeaheadActiveChild && typeaheadActiveChild.innerText) || this.refCollection[0][0].innerText
-          });
+          if (typeaheadActiveChild) {
+            const hasDescriptionElm = typeaheadActiveChild.childElementCount > 1;
+            const typeaheadActiveChildText = hasDescriptionElm
+              ? (typeaheadActiveChild.firstChild as HTMLElement).innerText
+              : typeaheadActiveChild.innerText;
+            this.setState({
+              typeaheadInputValue: typeaheadActiveChildText
+            });
+          } else {
+            this.setState({
+              typeaheadInputValue: this.refCollection[0][0].innerText
+            });
+          }
+
           if (typeaheadActiveChild) {
             typeaheadActiveChild.click();
           } else {
@@ -755,7 +768,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
         } else {
           // Close if there is no footer
           if (!this.props.footer) {
-            this.onToggle(false);
+            this.onToggle(false, null);
             this.onClose();
           } else {
             // has footer
@@ -764,14 +777,14 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
             if (this.inputRef.current === document.activeElement) {
               if (shiftKey) {
                 // close toggle if shift key and tab on input
-                this.onToggle(false);
+                this.onToggle(false, null);
                 this.onClose();
               } else {
                 // tab to first tabbable item in footer
                 if (tabbableItems[0]) {
                   tabbableItems[0].focus();
                 } else {
-                  this.onToggle(false);
+                  this.onToggle(false, null);
                   this.onClose();
                 }
               }
@@ -791,7 +804,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
                   tabbableItems[currentElementIndex + 1].focus();
                 } else {
                   // no next item, close toggle
-                  this.onToggle(false);
+                  this.onToggle(false, null);
                   this.inputRef.current.focus();
                   this.onClose();
                 }
@@ -947,6 +960,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
       footer,
       loadingVariant,
       isCreateSelectOptionObject,
+      shouldResetOnSelect,
       ...props
     } = this.props;
     const {
@@ -1085,7 +1099,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
                 } else if (event.key === KeyTypes.Tab && variant !== SelectVariant.checkbox && this.props.footer) {
                   // tab to footer or close menu if shift key
                   if (event.shiftKey) {
-                    this.onToggle(false);
+                    this.onToggle(false, event);
                   } else {
                     const tabbableItems = findTabbableElements(this.footerRef, SelectFooterTabbableItems);
                     if (tabbableItems.length > 0) {
@@ -1093,7 +1107,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
                       event.stopPropagation();
                       event.preventDefault();
                     } else {
-                      this.onToggle(false);
+                      this.onToggle(false, event);
                     }
                   }
                 } else if (event.key === KeyTypes.Tab && variant === SelectVariant.checkbox) {
@@ -1367,7 +1381,14 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
       <GenerateId>
         {randomId => (
           <SelectContext.Provider
-            value={{ onSelect, onFavorite, onClose: this.onClose, variant, inputIdPrefix: inputIdPrefix || randomId }}
+            value={{
+              onSelect,
+              onFavorite,
+              onClose: this.onClose,
+              variant,
+              inputIdPrefix: inputIdPrefix || randomId,
+              shouldResetOnSelect
+            }}
           >
             {menuAppendTo === 'inline' ? (
               mainContainer

package/src/components/Select/SelectOption.tsx

@@ -245,7 +245,8 @@ export class SelectOption extends React.Component<SelectOptionProps> {
       onClose: () => void,
       variant: string,
       inputIdPrefix: string,
-      onFavorite: (itemId: string, isFavorite: boolean) => void
+      onFavorite: (itemId: string, isFavorite: boolean) => void,
+      shouldResetOnSelect: boolean
     ) => {
       if (variant !== SelectVariant.checkbox && isLoading && isGrouped) {
         return (
@@ -323,7 +324,7 @@ export class SelectOption extends React.Component<SelectOptionProps> {
                     if (!isDisabled) {
                       onClick(event);
                       onSelect(event, value, isPlaceholder);
-                      onClose();
+                      shouldResetOnSelect && onClose();
                     }
                   }}
                   role="option"
@@ -449,8 +450,10 @@ export class SelectOption extends React.Component<SelectOptionProps> {
 
     return (
       <SelectConsumer>
-        {({ onSelect, onClose, variant, inputIdPrefix, onFavorite }) => (
-          <React.Fragment>{renderOption(onSelect, onClose, variant, inputIdPrefix, onFavorite)}</React.Fragment>
+        {({ onSelect, onClose, variant, inputIdPrefix, onFavorite, shouldResetOnSelect }) => (
+          <React.Fragment>
+            {renderOption(onSelect, onClose, variant, inputIdPrefix, onFavorite, shouldResetOnSelect)}
+          </React.Fragment>
         )}
       </SelectConsumer>
     );

package/src/components/Select/SelectToggle.tsx

@@ -18,7 +18,7 @@ export interface SelectToggleProps extends React.HTMLProps<HTMLElement> {
   /** Flag to indicate if select is open */
   isOpen?: boolean;
   /** Callback called when toggle is clicked */
-  onToggle?: (isExpanded: boolean) => void;
+  onToggle?: (isExpanded: boolean, event: React.MouseEvent | React.ChangeEvent | React.KeyboardEvent | Event) => void;
   /** Callback for toggle open on keyboard entry */
   onEnter?: () => void;
   /** Callback for toggle close */
@@ -105,7 +105,7 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
     const clickedWithinMenu =
       menuRef && menuRef.current && menuRef.current.contains && menuRef.current.contains(event.target as Node);
     if (isOpen && !(clickedOnToggle || clickedWithinMenu)) {
-      onToggle(false);
+      onToggle(false, event);
       onClose();
     }
   };
@@ -140,7 +140,7 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
 
       // If no tabbable item in footer close select
       if (tabbableItems.length <= 0) {
-        onToggle(false);
+        onToggle(false, event);
         onClose();
         this.toggle.current.focus();
         return;
@@ -151,7 +151,7 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
           if (event.shiftKey) {
             if (variant !== 'checkbox') {
               // only close non checkbox variation on shift clicked
-              onToggle(false);
+              onToggle(false, event);
               onClose();
               this.toggle.current.focus();
             }
@@ -175,7 +175,7 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
           tabbableItems[currentElementIndex + 1].focus();
         } else {
           // no more footer items close menu
-          onToggle(false);
+          onToggle(false, event);
           onClose();
           this.toggle.current.focus();
         }
@@ -189,7 +189,7 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
       (event.key === KeyTypes.Escape || event.key === KeyTypes.Tab) &&
       (escFromToggle || escFromWithinMenu)
     ) {
-      onToggle(false);
+      onToggle(false, event);
       onClose();
       this.toggle.current.focus();
     }
@@ -206,7 +206,7 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
         if (isOpen) {
           handleTypeaheadKeys('enter');
         } else {
-          onToggle(!isOpen);
+          onToggle(!isOpen, event);
         }
       }
     }
@@ -221,11 +221,11 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
     }
     event.preventDefault();
     if ((event.key === KeyTypes.Tab || event.key === KeyTypes.Enter || event.key === KeyTypes.Space) && isOpen) {
-      onToggle(!isOpen);
+      onToggle(!isOpen, event);
       onClose();
       this.toggle.current.focus();
     } else if ((event.key === KeyTypes.Enter || event.key === KeyTypes.Space) && !isOpen) {
-      onToggle(!isOpen);
+      onToggle(!isOpen, event);
       onEnter();
     }
   };
@@ -290,8 +290,8 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
             )}
             aria-label={ariaLabel}
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            onClick={_event => {
-              onToggle(!isOpen);
+            onClick={event => {
+              onToggle(!isOpen, event);
               if (isOpen) {
                 onClose();
               }
@@ -318,9 +318,9 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
               className
             )}
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            onClick={_event => {
+            onClick={event => {
               if (!isDisabled) {
-                onToggle(!isOpen);
+                onToggle(!isOpen, event);
                 if (isOpen) {
                   onClose();
                 }
@@ -334,8 +334,8 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
               type={type}
               className={css(buttonStyles.button, styles.selectToggleButton, styles.modifiers.plain)}
               aria-label={ariaLabel}
-              onClick={_event => {
-                onToggle(!isOpen);
+              onClick={event => {
+                onToggle(!isOpen, event);
                 if (isOpen) {
                   onClose();
                 }

package/src/components/Select/__tests__/__snapshots__/Select.test.tsx.snap

@@ -1184,6 +1184,7 @@ exports[`select custom select filter filters properly 1`] = `
   position="left"
   removeSelectionAriaLabel="Remove"
   selections={Array []}
+  shouldResetOnSelect={true}
   toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId="custom-select-filters"
@@ -3123,6 +3124,7 @@ exports[`typeahead select test select existing option on a non-creatable select
   position="left"
   removeSelectionAriaLabel="Remove"
   selections={Array []}
+  shouldResetOnSelect={true}
   toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}