playbook_ui 12.5.0 → 12.6.0.pre.alpha.collapsible1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92319a3771d2aa0a3198e988dc95b91e977ee532db2884cd6197912cb045caae
-  data.tar.gz: caaa026385dd1d94a65175ba00ef818caab6a901c5bb0da90cd24920158e885f
+  metadata.gz: 55e72b83e3d53687568964faa9a5283ed8d916b77b704a9fd211cc0293abe056
+  data.tar.gz: 5bed51e081fddba422e24266f7e7604ded4acaa483fd0c65bbf583540e844d3e
 SHA512:
-  metadata.gz: 7469df006da7d11b70de500123a4d260db2a2c8c0b79ee80766dde6a760eaa81c71b59880aad14ee48a7d9ee91b2c6237e766b8c046a19b088b61830b0e5f2b6
-  data.tar.gz: 7e0f3a0e05f403da3b31e8b21ab01ee92fb4139a5223af663a62f9672ff381009a75cd1a9f30ea57289e28ffda043f23cab7364eae1e54973e9f4922d8884f28
+  metadata.gz: 0a9f9c24caba0d438ef30f406b1dddce897c59797f5fca036aa334fac978a644e5373f60a585ec81107c2e1fa68b17881e1a018a860b8dc71bfce789e12f3067
+  data.tar.gz: 6488b6637e9ccf87d52393b9d8ea1e95be985089f1e85e79035d54f01e0b4a94e6fcf4c7ceda312a0975b0a68298e9cd4a053a2e6030c27b8a7ee7a30e75794b

data/app/pb_kits/playbook/_playbook.scss

@@ -107,3 +107,5 @@
 @import './utilities/display';
 @import './utilities/flexbox';
 @import './utilities/focus';
+
+@import 'pb_multi_level_select/multi_level_select';

data/app/pb_kits/playbook/data/menu.yml

@@ -57,6 +57,7 @@ kits:
   - list
   - loading_inline
   - map
+  - multi_level_select
   - nav
   - tags:
     - badge
@@ -106,4 +107,4 @@ kits:
     - title_count
     - title_detail
   - user_badge
-  - walkthrough
+  - walkthrough

data/app/pb_kits/playbook/index.js

@@ -60,6 +60,7 @@ export { default as ListItem } from './pb_list/_list_item'
 export { default as LoadingInline } from './pb_loading_inline/_loading_inline'
 export { default as Map} from './pb_map/_map'
 export { default as Message } from './pb_message/_message'
+export { default as MultiLevelSelect} from './pb_multi_level_select/_multi_level_select'
 export { default as MultipleUsers } from './pb_multiple_users/_multiple_users'
 export { default as MultipleUsersStacked } from './pb_multiple_users_stacked/_multiple_users_stacked'
 export { default as Nav } from './pb_nav/_nav'

data/app/pb_kits/playbook/pb_button/_button_mixins.scss

@@ -101,7 +101,7 @@ $pb_button_border_width: 0px;
 
 // Secondary ====================
 @mixin pb_button_secondary {
-  @include pb_button_variant(rgba($primary_action, 0.05), $primary_action);
+  @include pb_button_variant($secondary-action, $primary_action);
 
   @media (hover:hover) {
     &:hover {
@@ -109,7 +109,7 @@ $pb_button_border_width: 0px;
     }
     &:active {
       transition: none;
-      @include pb_button_variant(rgba($primary_action, 0.05), $primary_action);
+      @include pb_button_variant($secondary-action, $primary_action);
     }
   } 
 }

data/app/pb_kits/playbook/pb_circle_icon_button/_circle_icon_button.scss

@@ -26,7 +26,7 @@ $pb_button_styles: [
 @mixin pb_circle_icon_button_active {
   &:active {
     transition: none;
-    @include pb_button_variant(rgba($primary_action, 0.05), $primary_action);
+    @include pb_button_variant($secondary-action, $primary_action);
   }
 }
 

data/app/pb_kits/playbook/pb_collapsible/_collapsible.tsx

@@ -19,6 +19,8 @@ type CollapsibleProps = {
   iconColor?: 'default' | 'light' | 'lighter' | 'link' | 'error' | 'success',
   iconSize?: typeof IconSizes
   id?: string,
+  mainFlex?: "around" | "between" | "evenly" | "none",
+  mainFlexItem?: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 'none',
   padding?: string,
 }
 
@@ -40,6 +42,8 @@ const Collapsible = ({
   iconColor = 'default',
   iconSize,
   id,
+  mainFlex = "between",
+  mainFlexItem = "none",
   padding = 'md',
   ...props
 }: CollapsibleProps) => {
@@ -64,7 +68,7 @@ const Collapsible = ({
   )
 
   return (
-    <CollapsibleContext.Provider value={{ collapsed: isCollapsed, collapse, iconSize, iconColor }}>
+    <CollapsibleContext.Provider value={{ collapsed: isCollapsed, collapse, iconSize, iconColor, mainFlex, mainFlexItem }}>
       <div
           {...ariaProps}
           {...dataProps}

data/app/pb_kits/playbook/pb_collapsible/child_kits/CollapsibleMain.tsx

@@ -3,7 +3,7 @@
 import classnames from 'classnames'
 import React, { useContext } from 'react'
 import { buildCss } from '../../utilities/props'
-import { globalProps } from '../../utilities/globalProps'
+import { GlobalProps, globalProps } from '../../utilities/globalProps'
 
 import Flex from '../../pb_flex/_flex'
 import FlexItem from '../../pb_flex/_flex_item'
@@ -37,6 +37,8 @@ type CollapsibleMainProps = {
 }
 type IconColors =  "default" | "light" | "lighter" | "link" | "error" | "success"
 
+type flexMainTypes = "around" | "between" | "evenly" | "none"
+
 type IconProps = {
   collapsed: boolean | (()=> void)
   iconColor?: IconColors
@@ -66,7 +68,7 @@ const CollapsibleMain = ({
   padding = 'md',
   ...props
 }: CollapsibleMainProps): React.ReactElement=> {
-  const context: {[key: string]: IconColors | (() => void)} | boolean = useContext(CollapsibleContext)
+  const context: {[key: string]: IconColors | (() => void)} | boolean | GlobalProps | flexMainTypes = useContext(CollapsibleContext)
   const mainCSS = buildCss('pb_collapsible_main_kit')
   const mainSpacing = globalProps(props, { cursor, padding })
 
@@ -74,10 +76,14 @@ const CollapsibleMain = ({
     <div className={classnames(mainCSS, className, mainSpacing)}>
       <div onClick={context.collapse as (() => void)}>
         <Flex
-            spacing="between"
+            spacing={context.mainFlex}
             vertical="center"
         >
-          <FlexItem>{children}</FlexItem>
+          <FlexItem
+            flex={context.mainFlexItem}
+          >
+            {children}
+          </FlexItem>
           <FlexItem>
             <Icon
                 collapsed={context.collapsed as () => void}

data/app/pb_kits/playbook/pb_collapsible/collapsible_main.html.erb

@@ -4,8 +4,8 @@
     class: object.classname,
     aria: object.aria) do %>
 
-    <%= pb_rails("flex", props: {vertical: "center", spacing: "between", cursor: "pointer"}) do %>
-      <%= pb_rails("flex/flex_item") do %>
+    <%= pb_rails("flex", props: {vertical: "center", spacing:object.main_flex , cursor: "pointer"}) do %>
+      <%= pb_rails("flex/flex_item", props: {flex:object.main_flex_item}) do %>
         <%= content.presence %>
       <% end %>
       <%= pb_rails("flex/flex_item") do %>

data/app/pb_kits/playbook/pb_collapsible/collapsible_main.rb

@@ -6,6 +6,13 @@ module Playbook
       prop :color, type: Playbook::Props::Enum,
                    values: %w[default light lighter link success error],
                    default: "default"
+      prop :main_flex, type: Playbook::Props::Enum,
+                       values: %w[around between evenly none],
+                       default: "between",
+                       deprecated: true
+      prop :main_flex_item, type: Playbook::Props::Enum,
+                            values: %w[auto initial 0 1 2 3 4 5 6 7 8 9 10 11 12 none],
+                            default: "none"
       prop :size, type: Playbook::Props::Enum,
                   values: ["lg", "xs", "sm", "1x", "2x", "3x", "4x", "5x", "6x", "7x", "8x", "9x", "10x", nil],
                   default: nil

data/app/pb_kits/playbook/pb_collapsible/docs/_collapsible_main_flex.html.erb

@@ -0,0 +1,10 @@
+<%= pb_rails("collapsible", props: { name: "default-example" }) do %>
+    <%= pb_rails("collapsible/collapsible_main", props: { padding: "md", name: "default-main", main_flex: "none" }) do %>
+      <%= pb_rails("body", props: { text: "Main Section"}) %>
+    <% end %>
+    <%= pb_rails("collapsible/collapsible_content", props: { padding: "md" }) do %>
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec iaculis, risus a fringilla luctus, sapien eros sodales ex, quis molestie est nulla non turpis. Vestibulum aliquet at ipsum eget posuere. Morbi sed laoreet erat. Sed commodo posuere lectus, at porta nulla ornare a. Suspendisse quam est, sollicitudin ut enim sit amet, commodo placerat enim. Donec laoreet metus ac mauris pellentesque mattis. Pellentesque luctus vel mauris non aliquam. Mauris hendrerit mattis porttitor. Curabitur vehicula justo non ex consectetur commodo. Quisque posuere aliquet quam. Maecenas malesuada magna mauris, ac tempor metus euismod at.
+      <br><br>
+      Cras ornare fermentum magna mollis efficitur. Sed vitae nulla vel purus ultrices mollis. Maecenas id nulla id libero faucibus feugiat quis sit amet turpis. In commodo pellentesque risus at fringilla. Integer non interdum leo, non commodo ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut mi augue, dignissim at orci vel, egestas aliquam mi. Proin finibus aliquet tempor. Integer cursus, ex quis gravida rhoncus, nisi elit viverra ipsum, non efficitur est ex ac tortor. Praesent vitae odio massa.
+    <% end %>
+<% end %>

data/app/pb_kits/playbook/pb_collapsible/docs/_collapsible_main_flex.jsx

@@ -0,0 +1,23 @@
+import React from "react";
+import { Collapsible } from "../..";
+
+
+const CollapsibleMainFlex = () => (
+
+<Collapsible
+    mainFlex="none"
+>
+<Collapsible.Main>
+  <div>{'Main Section'}</div>
+</Collapsible.Main>
+<Collapsible.Content>
+  <div>
+    {
+      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. In vel erat sed purus hendrerit viverra. Duis et vestibulum metus. Sed consequat ut ante non vehicula. Etiam nunc massa, pharetra vel quam id, posuere rhoncus quam. Quisque imperdiet arcu enim, nec aliquet justo auctor eget. Curabitur in metus nec nunc rhoncus faucibus vitae ac elit. Nulla facilisi. Vestibulum quis pretium nulla. Nulla ut accumsan velit. Duis varius urna sed sem tempor, sit amet fermentum nibh auctor. Praesent lorem arcu, egestas non ante quis, placerat pellentesque lectus.Vestibulum lacinia ipsum quis venenatis tristique. Vivamus suscipit, libero eu fringilla egestas, orci urna commodo arcu, vel gravida turpis ipsum molestie nibh. Donec cursus eu ante sagittis ultrices. Phasellus id sagittis risus. Mauris dapibus neque faucibus, tempor ligula vel, cursus ante. Donec faucibus gravida porta. Nullam egestas est quis aliquam feugiat. Sed eget metus diam. Cras eget placerat libero.'
+    }
+  </div>
+</Collapsible.Content>
+</Collapsible>
+);
+
+export default CollapsibleMainFlex;

data/app/pb_kits/playbook/pb_collapsible/docs/_collapsible_main_flex.md

@@ -0,0 +1 @@
+By default, the Collapisible.Main has the globalProp of 'spacing' set to 'between'. The `mainFlex` prop allows you to change this to 'none', 'around' or 'evenly'. The second example above sets `mainFlex` to 'none'.

data/app/pb_kits/playbook/pb_collapsible/docs/_collapsible_main_flex_item.html.erb

@@ -0,0 +1,23 @@
+<%= pb_rails("collapsible", props: { name: "default-example" }) do %>
+    <%= pb_rails("collapsible/collapsible_main", props: { padding: "md", name: "default-main", main_flex_item: "1"}) do %>
+        <%= pb_rails("flex", props: {gap:"lg", justify:"center", wrap:true}) do %>
+            <%= pb_rails("flex/flex_item", props: {orientation:"column"}) do %>
+               <%= pb_rails("caption", props: { text: "Number"}) %>
+               <%= pb_rails("body", props: { text: "12345"}) %>
+            <% end %>
+            <%= pb_rails("flex/flex_item", props: {orientation:"column"}) do %>
+                <%= pb_rails("caption", props: { text: "Title"}) %>
+                <%= pb_rails("body", props: { text: "Title"}) %>
+             <% end %>
+             <%= pb_rails("flex/flex_item", props: {orientation:"column"}) do %>
+                <%= pb_rails("caption", props: { text: "Description"}) %>
+                <%= pb_rails("body", props: { text: "Description"}) %>
+             <% end %>
+        <% end %>
+    <% end %>
+    <%= pb_rails("collapsible/collapsible_content", props: { padding: "md" }) do %>
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec iaculis, risus a fringilla luctus, sapien eros sodales ex, quis molestie est nulla non turpis. Vestibulum aliquet at ipsum eget posuere. Morbi sed laoreet erat. Sed commodo posuere lectus, at porta nulla ornare a. Suspendisse quam est, sollicitudin ut enim sit amet, commodo placerat enim. Donec laoreet metus ac mauris pellentesque mattis. Pellentesque luctus vel mauris non aliquam. Mauris hendrerit mattis porttitor. Curabitur vehicula justo non ex consectetur commodo. Quisque posuere aliquet quam. Maecenas malesuada magna mauris, ac tempor metus euismod at.
+      <br><br>
+      Cras ornare fermentum magna mollis efficitur. Sed vitae nulla vel purus ultrices mollis. Maecenas id nulla id libero faucibus feugiat quis sit amet turpis. In commodo pellentesque risus at fringilla. Integer non interdum leo, non commodo ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut mi augue, dignissim at orci vel, egestas aliquam mi. Proin finibus aliquet tempor. Integer cursus, ex quis gravida rhoncus, nisi elit viverra ipsum, non efficitur est ex ac tortor. Praesent vitae odio massa.
+    <% end %>
+  <% end %>

data/app/pb_kits/playbook/pb_collapsible/docs/_collapsible_main_flex_item.jsx

@@ -0,0 +1,48 @@
+import React from "react";
+import { Collapsible } from "../..";
+import { Flex, FlexItem, Caption, Body } from "../..";
+const CollapsibleMainFlexItem = () => (
+<>
+  <Collapsible 
+      mainFlexItem="1"
+  >
+    <Collapsible.Main>
+      <Flex 
+          gap="lg" 
+          justify="center"
+          wrap
+       >
+        <FlexItem 
+            orientation="column"
+        >
+          <Caption text="Number" />
+          <Body text="12345" />
+        </FlexItem>
+
+        <FlexItem 
+            orientation="column"
+        >
+          <Caption text="Title" />
+          <Body text="Title" />
+        </FlexItem>
+
+        <FlexItem 
+            orientation="column"
+        >
+          <Caption text="Description" />
+          <Body text="Description" />
+        </FlexItem>
+      </Flex>
+    </Collapsible.Main>
+    <Collapsible.Content>
+      <div>
+        {
+          "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In vel erat sed purus hendrerit viverra. Duis et vestibulum metus. Sed consequat ut ante non vehicula. Etiam nunc massa, pharetra vel quam id, posuere rhoncus quam. Quisque imperdiet arcu enim, nec aliquet justo auctor eget. Curabitur in metus nec nunc rhoncus faucibus vitae ac elit. Nulla facilisi. Vestibulum quis pretium nulla. Nulla ut accumsan velit. Duis varius urna sed sem tempor, sit amet fermentum nibh auctor. Praesent lorem arcu, egestas non ante quis, placerat pellentesque lectus.Vestibulum lacinia ipsum quis venenatis tristique. Vivamus suscipit, libero eu fringilla egestas, orci urna commodo arcu, vel gravida turpis ipsum molestie nibh. Donec cursus eu ante sagittis ultrices. Phasellus id sagittis risus. Mauris dapibus neque faucibus, tempor ligula vel, cursus ante. Donec faucibus gravida porta. Nullam egestas est quis aliquam feugiat. Sed eget metus diam. Cras eget placerat libero."
+        }
+      </div>
+    </Collapsible.Content>
+  </Collapsible>
+  </>
+);
+
+export default CollapsibleMainFlexItem;

data/app/pb_kits/playbook/pb_collapsible/docs/_collapsible_main_flex_item.md

@@ -0,0 +1 @@
+The `mainFlexItem` prop allows you to pass any of the 'flex' values to the Collapsible which will allow the Collapsible.Main to fill the entire space of the containing div instead of being restricted by the size of it's contents. The default value is 'none'. The first example above sets `mainFlexItem` to '1'.

data/app/pb_kits/playbook/pb_collapsible/docs/example.yml

@@ -4,8 +4,13 @@ examples:
   - collapsible_default: Default
   - collapsible_size: Size
   - collapsible_color: Color
+  - collapsible_main_flex: Main Flex Spacing
+  - collapsible_main_flex_item: Main Flex Item
+ 
 
   react:
   - collapsible_default: Default
   - collapsible_size: Size
-  - collapsible_color: Color
+  - collapsible_color: Color
+  - collapsible_main_flex: Main Flex Spacing
+  - collapsible_main_flex_item: Main Flex Item

data/app/pb_kits/playbook/pb_collapsible/docs/index.js

@@ -1,3 +1,5 @@
 export { default as CollapsibleDefault } from './_collapsible_default.jsx'
 export { default as CollapsibleSize } from './_collapsible_size.jsx'
 export { default as CollapsibleColor } from './_collapsible_color.jsx'
+export {default as CollapsibleMainFlex } from './_collapsible_main_flex.jsx'
+export {default as CollapsibleMainFlexItem } from './_collapsible_main_flex_item.jsx'

data/app/pb_kits/playbook/pb_filter/Filter/CurrentFilters.tsx

@@ -0,0 +1,72 @@
+import React from 'react'
+import { isEmpty, map, omitBy } from 'lodash'
+
+import Body from '../../pb_body/_body'
+import Caption from '../../pb_caption/_caption'
+import Title from '../../pb_title/_title'
+
+export type FilterDescription = {
+  [key: string]: string | null | boolean,
+}
+
+export type CurrentFiltersProps = {
+  dark: boolean,
+  filters: FilterDescription,
+}
+
+const hiddenFilters = (value: any) => isEmpty(value) && value !== true
+
+const CurrentFilters = ({ dark, filters }: CurrentFiltersProps): React.ReactElement => {
+  const displayableFilters = omitBy(filters, hiddenFilters)
+
+  return (
+    <div className="maskContainer">
+      { isEmpty(filters) &&
+      <div className="filters">
+        <Body
+            color="light"
+            paddingLeft="xs"
+            size={4}
+            tag="h4"
+            text="No Filter Selected"
+        />
+      </div>
+      }
+      { !isEmpty(filters) &&
+        <div className="filters">
+          <div className="left_gradient" />
+            {map(displayableFilters, (value, name) => (
+              <div
+                  className="filter"
+                  key={`filter-${name}`}
+              >
+                { value === true ? 
+                <Title
+                    dark={dark}
+                    size={4}
+                    tag="h4"
+                    text={name}
+                /> : 
+                <div>
+                  <Caption
+                      dark={dark}
+                      text={name}
+                  />
+                  <Title
+                      dark={dark}
+                      size={4}
+                      tag="h4"
+                      text={value}
+                  />
+                </div>    
+                }
+              </div>
+            ))}
+          <div className="right_gradient" />
+        </div>
+      }
+    </div>
+  )
+}
+
+export default CurrentFilters

data/app/pb_kits/playbook/pb_filter/Filter/{FilterBackground.jsx → FilterBackground.tsx}

@@ -1,35 +1,33 @@
-/* @flow */
-
-import React, { Node } from 'react'
+import React from 'react'
 import classnames from 'classnames'
 
-import { globalProps } from '../../utilities/globalProps'
+import { GlobalProps, globalProps } from '../../utilities/globalProps'
 
 import Card from '../../pb_card/_card'
 
-type FilterBackgroundProps = {
+export type FilterBackgroundProps = {
   background: boolean,
   className: string,
-  children: Node,
+  children?: React.ReactChild[] | React.ReactChild,
   dark: boolean,
-}
+} & GlobalProps
 
-const FilterBackground = (props: FilterBackgroundProps) => {
+const FilterBackground = (props: FilterBackgroundProps): React.ReactElement => {
   const { background = true, className, children, dark } = props
 
   return (
     <div className={classnames(`pb_filter_kit ${className}`, globalProps(props))}>
-      <Choose>
-        <When condition={background}>
+      { background ? 
           <Card
               dark={dark}
               padding="none"
           >
             {children}
-          </Card>
-        </When>
-        <Otherwise>{children}</Otherwise>
-      </Choose>
+          </Card> : 
+          <>
+            {children}
+          </>
+      }
     </div>
   )
 }

data/app/pb_kits/playbook/pb_filter/Filter/{FilterDouble.jsx → FilterDouble.tsx}

@@ -1,5 +1,3 @@
-/* @flow */
-
 import React from 'react'
 
 import CurrentFilters, { FilterDescription } from './CurrentFilters'
@@ -15,13 +13,14 @@ import SortMenu, {
 import Caption from '../../pb_caption/_caption'
 import Flex from '../../pb_flex/_flex'
 import SectionSeparator from '../../pb_section_separator/_section_separator'
+
 export type FilterDoubleProps = {
-  children: Node,
+  children?: React.ReactChild[] | React.ReactChild, 
   filters?: FilterDescription,
-  onSortChange: SortingChangeCallback,
+  onSortChange?: SortingChangeCallback,
   results?: number,
-  sortOptions: SortOptions,
-  sortValue?: SortValue,
+  sortOptions?: SortOptions,
+  sortValue?: SortValue[],
 } & FilterBackgroundProps
 
 const FilterDouble = ({
@@ -35,7 +34,7 @@ const FilterDouble = ({
   minWidth,
   placement,
   ...bgProps
-}: FilterDoubleProps) => (
+}: FilterDoubleProps): React.ReactElement => (
   <FilterBackground
       dark={dark}
       {...bgProps}
@@ -49,7 +48,7 @@ const FilterDouble = ({
           minWidth={minWidth}
           placement={placement}
       >
-        {children}
+          {children}
       </FiltersPopover>
       <CurrentFilters
           dark={dark}

data/app/pb_kits/playbook/pb_filter/Filter/{FilterSingle.jsx → FilterSingle.tsx}

@@ -1,5 +1,3 @@
-/* @flow */
-
 import React from 'react'
 import { isEmpty } from 'lodash'
 
@@ -16,12 +14,12 @@ import SortMenu, {
 } from './SortMenu'
 
 export type FilterSingleProps = {
-  children?: Node,
+  children?: React.ReactChild[] | React.ReactChild, 
   filters?: FilterDescription,
   onSortChange?: SortingChangeCallback,
   results?: number,
   sortOptions?: SortOptions,
-  sortValue?: SortValue,
+  sortValue?: SortValue[],
 } & FilterBackgroundProps
 
 const FilterSingle = ({
@@ -35,7 +33,7 @@ const FilterSingle = ({
   minWidth,
   placement,
   ...bgProps
-}: FilterSingleProps) => {
+}: FilterSingleProps): React.ReactElement => {
   return (
     <FilterBackground
         dark={dark}
@@ -46,31 +44,33 @@ const FilterSingle = ({
           paddingRight="lg"
           vertical="center"
       >
-        <If condition={children}>
-          <FiltersPopover
-              dark={dark}
-              minWidth={minWidth}
-              placement={placement}
-          >
+        { children && 
+          <>
+            <FiltersPopover
+                dark={dark}
+                minWidth={minWidth}
+                placement={placement}
+            >
             {children}
-          </FiltersPopover>
-          <CurrentFilters
-              dark={dark}
-              filters={filters}
-          />
-        </If>
+            </FiltersPopover>
+            <CurrentFilters
+                dark={dark}
+                filters={filters}
+            />
+          </>
+        }
         <ResultsCount
             dark={dark}
             results={results}
         />
-        <If condition={!isEmpty(sortOptions)}>
-          <SortMenu
-              dark={dark}
-              onChange={onSortChange}
-              options={sortOptions}
-              value={sortValue}
-          />
-        </If>
+        { !isEmpty(sortOptions) &&
+            <SortMenu
+                dark={dark}
+                onChange={onSortChange}
+                options={sortOptions}
+                value={sortValue}
+            />
+        }
       </Flex>
     </FilterBackground>
   )

data/app/pb_kits/playbook/pb_filter/Filter/{FiltersPopover.jsx → FiltersPopover.tsx}

@@ -1,12 +1,15 @@
-/* @flow */
-
-import React, { Node, useState } from 'react'
+import React, { ReactNode, useState } from 'react'
 
 import CircleIconButton from '../../pb_circle_icon_button/_circle_icon_button'
 import PbReactPopover from '../../pb_popover/_popover'
 
-const FiltersPopoverProps = { children: Node }
-const FiltersPopover = ({ children, dark, minWidth, placement = "bottom-start" }: FiltersPopoverProps) => {
+type FiltersPopoverProps = { 
+  children?: React.ReactChild[] | React.ReactChild | (({closePopover}: {closePopover: () => void}) =>  ReactNode), 
+  dark?: boolean,
+  minWidth?: string,
+  placement?: "top" | "right" | "bottom" | "left" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "right-start" | "right-end" | "left-start" | "left-end",
+}
+const FiltersPopover = ({ children, dark, minWidth, placement = "bottom-start" }: FiltersPopoverProps): React.ReactElement => {
   const [hide, updateHide] = useState(true)
   const toggle = () => updateHide(!hide)
 
@@ -16,7 +19,6 @@ const FiltersPopover = ({ children, dark, minWidth, placement = "bottom-start" }
         icon="filter"
         id="filter"
         onClick={toggle}
-        text="filter"
         variant="secondary"
     />
   )
@@ -30,11 +32,11 @@ const FiltersPopover = ({ children, dark, minWidth, placement = "bottom-start" }
         shouldClosePopover={updateHide}
         show={!hide}
     >
-      <div className="pb-form">
-        {typeof children === 'function'
-          ? children({ closePopover: () => (updateHide(true)) })
-          : children}
-      </div>
+        <div className="pb-form">
+          {typeof children === 'function'
+            ? children({ closePopover: () => (updateHide(true)) })
+            : children}
+        </div>
     </PbReactPopover>
   )
 }