Updated based on Matts PR

Author: Eric Olkowski

packages/react-core/src/components/Toolbar/Toolbar.tsx

@@ -38,8 +38,6 @@ export interface ToolbarProps extends React.HTMLProps<HTMLDivElement>, OUIAProps
   isFullHeight?: boolean;
   /** Flag indicating the toolbar is static */
   isStatic?: boolean;
-  /** Flag indicating the toolbar should use the Page insets */
-  usePageInsets?: boolean;
   /** Flag indicating the toolbar should stick to the top of its container */
   isSticky?: boolean;
   /** Insets at various breakpoints. */
@@ -140,7 +138,6 @@ class Toolbar extends React.Component<ToolbarProps, ToolbarState> {
       isFullHeight,
       isStatic,
       inset,
-      usePageInsets,
       isSticky,
       ouiaId,
       numberOfFiltersText,
@@ -164,7 +161,6 @@ class Toolbar extends React.Component<ToolbarProps, ToolbarState> {
               styles.toolbar,
               isFullHeight && styles.modifiers.fullHeight,
               isStatic && styles.modifiers.static,
-              usePageInsets && styles.modifiers.pageInsets,
               isSticky && styles.modifiers.sticky,
               formatBreakpointMods(inset, styles, '', getBreakpoint(width)),
               colorVariant === 'primary' && styles.modifiers.primary,

packages/react-core/src/components/Toolbar/ToolbarChipGroupContent.tsx

@@ -85,7 +85,8 @@ class ToolbarChipGroupContent extends React.Component<ToolbarChipGroupContentPro
           {...(collapseListedFilters && { 'aria-hidden': true })}
         />
         {(showNumberOfFilters || showDefaultClearFilter || customChipGroupContent) && (
-          <ToolbarGroup>
+          <ToolbarGroup variant="action-group-inline">
+            {showNumberOfFilters && <ToolbarItem>{numberOfFiltersText(numberOfFilters)}</ToolbarItem>}
             {showDefaultClearFilter && (
               <ToolbarItem>
                 <Button variant="link" onClick={clearChipGroups} isInline>
@@ -94,7 +95,6 @@ class ToolbarChipGroupContent extends React.Component<ToolbarChipGroupContentPro
               </ToolbarItem>
             )}
             {customChipGroupContent && customChipGroupContent}
-            {showNumberOfFilters && <ToolbarItem>{numberOfFiltersText(numberOfFilters)}</ToolbarItem>}
           </ToolbarGroup>
         )}
       </div>

packages/react-core/src/components/Toolbar/examples/ToolbarGroups.tsx

@@ -189,7 +189,7 @@ export const ToolbarGroups: React.FunctionComponent = () => {
     <React.Fragment>
       <ToolbarGroup variant="filter-group">{filterGroupItems}</ToolbarGroup>
       <ToolbarGroup variant="action-group-plain">{iconButtonGroupItems}</ToolbarGroup>
-      <ToolbarGroup>{buttonGroupItems}</ToolbarGroup>
+      <ToolbarGroup variant="action-group">{buttonGroupItems}</ToolbarGroup>
     </React.Fragment>
   );