playbook_ui 12.38.0.pre.alpha.playbook123801077 → 12.39.0.pre.alpha.PLAY966collapsiblenav41115

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d15bd257d06087ce0074ce9bd2b6da1eec45ac30944b5e374b61ae5ca850603
-  data.tar.gz: 9c380b505ec7dac1a17fa933d92004e93aa0684224bafc99d5f858682d7b88b4
+  metadata.gz: bf4167e4358045e1ef6c706b26d0e1893336ef2e673212b907abf2e2bfd7d37f
+  data.tar.gz: f43205d27b1ceffd14ba706a9faf3285b650e220a71e889a78c0f55d41356737
 SHA512:
-  metadata.gz: 6468ce2626244e40f7feb6883dd3c69422bcdb566442c0ec8ab404e8fe10d38f58576250c3096ec0eb1e91b8b72a160a3ccba028da3c859043598f6a834c109a
-  data.tar.gz: a8856a67e7d2c1e3487418c795d66a855e3fb003a0057d2a8f9872eb44bd709b9a290e683109078b0b7dc26fd5988a799e897d268546da36273d516830aa8b19
+  metadata.gz: 2f2ecc613d9a31db4877c93101a664ddf9922ad0b46361971792336e51ee8f36f9b5aaa325893b26530a6ccf1b2dfb13af5f8f87309ad3e0c8bdc6501d8214da
+  data.tar.gz: c4b92e867f72479651eee9d82afa551fd717fd66d7ced9a4997dbcec133d6e3b1e2916f5197ccc5e9c6c9b8c8a16db1931f6aca42dd758427e5a2c076abfc7f1

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

@@ -20,6 +20,12 @@
   .icon_wrapper:hover {
       color: $primary
   }
+
+  .dark {
+    .pb_icon_kit {
+      color: $white;
+    }
+  }
 }
 
 [class^=pb_collapsible_main_kit] {

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

@@ -20,7 +20,7 @@ type CollapsibleProps = {
   icon?: string | string[],
   iconColor?: 'default' | 'light' | 'lighter' | 'link' | 'error' | 'success',
   iconSize?: IconSizes,
-  iconClick?: ()=> void,
+  onIconClick?: ()=> void,
   onClick?: ()=> void,
   id?: string,
 }
@@ -36,7 +36,7 @@ const Collapsible = ({
   icon,
   iconColor = 'default',
   iconSize,
-  iconClick,
+  onIconClick,
   onClick,
   id,
   ...props
@@ -66,7 +66,7 @@ const Collapsible = ({
     className
   )
   return (
-    <CollapsibleContext.Provider value={{ collapsed: isCollapsed, toggle, icon, iconSize, iconColor, iconClick, onClick }}>
+    <CollapsibleContext.Provider value={{ collapsed: isCollapsed, toggle, icon, iconSize, iconColor, onIconClick, onClick }}>
       <div
           {...ariaProps}
           {...dataProps}

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

@@ -33,6 +33,7 @@ type CollapsibleMainProps = {
   children: React.ReactNode[] | React.ReactNode,
   className?: string,
   cursor?: string,
+  dark?: boolean,
   onClick?: ()=> void
 }
 type IconColors =  "default" | "light" | "lighter" | "link" | "error" | "success"
@@ -42,10 +43,10 @@ type IconProps = {
   icon?: string[] | string
   iconColor?: IconColors
   iconSize?: IconSizes
-  iconClick?: ()=> void
+  onIconClick?: ()=> void
 }
 
-const ToggleIcon = ({ collapsed, icon, iconSize, iconColor, iconClick }: IconProps) => {
+const ToggleIcon = ({ collapsed, icon, iconSize, iconColor, onIconClick }: IconProps) => {
   const color = colorMap[iconColor]
 
   const showIcon = (icon: string |string[]) => {
@@ -56,9 +57,9 @@ const ToggleIcon = ({ collapsed, icon, iconSize, iconColor, iconClick }: IconPro
   }
 
   const handleIconClick = (e:any) => {
-    if (iconClick) {
+    if (onIconClick) {
     e.stopPropagation();
-    iconClick()
+    onIconClick()
     }
   }
 
@@ -93,18 +94,18 @@ const CollapsibleMain = ({
   cursor = 'pointer',
   ...props
 }: CollapsibleMainProps): React.ReactElement=> {
-  const {collapsed, toggle, icon, iconSize, iconColor, iconClick, onClick}: any = useContext(CollapsibleContext)
+  const {collapsed, toggle, icon, iconSize, iconColor, onIconClick, onClick}: any = useContext(CollapsibleContext)
   const mainCSS = buildCss('pb_collapsible_main_kit')
   const mainSpacing = globalProps(props, { cursor })
 
-  const handleCollapsibleClick = (e:any) => {
+  const handleCollapsibleClick = () => {
     toggle();
-    onClick && onClick(e)
+    onClick && onClick()
   }
 
   return (
     <div className={classnames(mainCSS, className, mainSpacing)}>
-      <div onClick={(e)=>handleCollapsibleClick(e)}>
+      <div onClick={handleCollapsibleClick}>
         <Flex
             spacing="between"
             vertical="center"
@@ -116,7 +117,7 @@ const CollapsibleMain = ({
                 iconColor={iconColor as IconColors}
                 iconSize={iconSize as IconSizes}
                 icon={icon as string[] | string}
-                iconClick={iconClick}
+                onIconClick={onIconClick}
             />
             </FlexItem>
         </Flex>

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

@@ -1,13 +1,13 @@
 import React from 'react'
 import { Collapsible } from '../..'
 
-const CollapsibleColor = () => (
+const CollapsibleColor = (props) => (
   <div>
     <Collapsible
         iconColor='default'
         marginBottom="xs"
     >
-      <Collapsible.Main>
+      <Collapsible.Main {...props}>
         <div>{'Default Section'}</div>
       </Collapsible.Main>
       <Collapsible.Content>

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

@@ -1,9 +1,9 @@
 import React from 'react'
 import { Collapsible } from '../..'
 
-const CollapsibleDefault = () => (
+const CollapsibleDefault = (props) => (
   <Collapsible >
-    <Collapsible.Main>
+    <Collapsible.Main {...props}>
       <div>{'Main Section'}</div>
     </Collapsible.Main>
     <Collapsible.Content>

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

@@ -1,18 +1,14 @@
 import React from 'react'
-import { Collapsible, useCollapsible, Button } from '../..'
+import { Collapsible } from '../..'
 
-const CollapsibleIcons = () => {
-  const [isCollapsed, setIsCollapsed] = useCollapsible(true)
+const CollapsibleIcons = (props) => {
 
   return (
   <>
-  <Button onClick={()=> setIsCollapsed(!isCollapsed)}>
-        {isCollapsed ? "Expand" : "Collapse"}
-  </Button>
-  <Collapsible collapsed={isCollapsed}
+  <Collapsible
       icon={['plus','minus']}
   >
-    <Collapsible.Main>
+    <Collapsible.Main {...props}>
       <div>{'Main Section'}</div>
     </Collapsible.Main>
     <Collapsible.Content>

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

@@ -1,2 +1,2 @@
 ##### Prop
-This kit uses 'chevron-up' and 'chevron-down' icons as default for the toggle icons. To customize these icons, use the `icon` prop to pass in an array of two icons, the first will render when the collapisble is closed and the second will render when the collapsible is open. In this example, we are using `icon: ['plus','minus']`
+The `icon` prop allows you to customize your icon sets by passing it an array of any comma-separated pair of icon values. The first icon value will replace the kit's default icon when collapsed (chevron-down), and the second value will replace the default icon when expanded (chevron-up). `icon` also allows you to pass it a single icon as a string, in which case the icon will not toggle with the collapsible state.

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

@@ -1,13 +1,13 @@
 import React from 'react'
 import { Collapsible } from '../..'
 
-const CollapsibleSize = () => (
+const CollapsibleSize = (props) => (
   <div>
     <Collapsible
         iconSize="xs"
         marginBottom="xs"
     >
-      <Collapsible.Main>
+      <Collapsible.Main {...props}>
         <div>{'Extra Small Section'}</div>
       </Collapsible.Main>
       <Collapsible.Content>
@@ -22,7 +22,7 @@ const CollapsibleSize = () => (
         iconSize="sm"
         marginBottom="xs"
     >
-      <Collapsible.Main>
+      <Collapsible.Main {...props}>
         <div>{'Small Section'}</div>
       </Collapsible.Main>
       <Collapsible.Content>
@@ -36,7 +36,7 @@ const CollapsibleSize = () => (
     <Collapsible
         marginBottom="xs"
     >
-      <Collapsible.Main>
+      <Collapsible.Main {...props}>
         <div>{'Default Section'}</div>
       </Collapsible.Main>
       <Collapsible.Content>
@@ -51,7 +51,7 @@ const CollapsibleSize = () => (
         iconSize="lg"
         marginBottom="xs"
     >
-      <Collapsible.Main>
+      <Collapsible.Main {...props}>
         <div>{'Large Section'}</div>
       </Collapsible.Main>
       <Collapsible.Content>

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

@@ -0,0 +1,75 @@
+import React from 'react'
+import { Collapsible, useCollapsible, Button } from '../..'
+
+const CollapsibleState = (props) => {
+  const [isCollapsed, setIsCollapsed] = useCollapsible(true)
+
+  return (
+  <>
+    <Button
+        onClick={() => setIsCollapsed(!isCollapsed)}
+        padding="none"
+        variant="link"
+    >
+      {isCollapsed ? "Expand All" : "Collapse All"}
+    </Button>
+
+    <Collapsible
+        collapsed={isCollapsed}
+        icon={["plus", "minus"]}
+        padding="none"
+    >
+      <Collapsible.Main padding="sm" 
+          {...props}
+      >
+          <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."
+            }
+          </div>
+      </Collapsible.Content>
+    </Collapsible>
+    <Collapsible
+        collapsed={isCollapsed}
+        icon={["plus", "minus"]}
+        padding="none"
+    >
+      <Collapsible.Main padding="sm" 
+          {...props}
+      >
+          <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."
+            }
+          </div>
+      </Collapsible.Content>
+    </Collapsible>
+    <Collapsible
+        collapsed={isCollapsed}
+        icon={["plus", "minus"]}
+        padding="none"
+    >
+        <Collapsible.Main padding="sm" 
+            {...props}
+        >
+          <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."
+            }
+          </div>
+        </Collapsible.Content>
+    </Collapsible>
+  </>
+  )
+}
+
+export default CollapsibleState

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

@@ -0,0 +1,3 @@
+The `collapsed` prop allows you to toggle the collapsible with external controls (like buttons) when used in conjunction with our `useCollapsible` hook.
+ 
+NOTE: you must import and declare the `useCollapsible` hook then pass its state to the collapsed prop of any Collapsible you wish to manage with the external control. See our code example for details.

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

@@ -2,12 +2,13 @@ examples:
 
   rails:
   - collapsible_default: Default
-  - collapsible_size: Size
-  - collapsible_color: Color
-  # - collapsible_icons: Custom Icons
+  - collapsible_size: Icon Size
+  - collapsible_color: Icon Color
+  - collapsible_icons: Custom Icons
 
   react:
   - collapsible_default: Default
-  - collapsible_size: Size
-  - collapsible_color: Color
-  # - collapsible_icons: Custom Icons
+  - collapsible_size: Icon Size
+  - collapsible_color: Icon Color
+  - collapsible_icons: Custom Icons
+  - collapsible_state: useCollapsible Hook

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

@@ -1,4 +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 CollapsibleIcons } from './_collapsible_icons.jsx'
+export { default as CollapsibleIcons } from './_collapsible_icons.jsx'
+export {default as CollapsibleState } from './_collapsible_state.jsx'

data/app/pb_kits/playbook/pb_nav/_collapsible_nav.scss

@@ -1,27 +1,284 @@
 @import "../tokens/spacing";
 @import "../tokens/colors";
 @import "../tokens/border_radius";
+@import "../tokens/titles";
+@import "../tokens/typography";
+@import "./mixins";
 
 [class^="pb_nav_list"] {
-  .pb_collapsible_nav_item {
-  .pb_collapsible_main_kit,
-  .pb_collapsible_content_kit,
-  .pb_collapsible_kit {
-    padding: 0 !important;
-  }
-
-  .icon_wrapper {
-    border-radius: $border_radius_rounded;
-    width: 19px;
-    height: 19px;
-    display:flex;
-    align-items: center;
-    justify-content: center;
-    margin-right: $space_xs;
+  .font_size_small {
+    .pb_nav_list_item_text,
+    .pb_nav_list_item_text_collapsible {
+      font-size: $font_small !important;
+    }
+  }
+
+  .font_bolder {
+    .pb_nav_list_item_text {
+      @include pb_title_4;
+    }
+    .pb_collapsible_main_kit {
+      .pb_nav_list_item_text_collapsible {
+        @include pb_title_4;
+        font-weight: $bolder !important;
+      }
+    }
+  }
+
+  .font_bold {
+    .pb_nav_list_item_text {
+      font-weight: $bold;
+    }
+    .pb_collapsible_main_kit {
+      .pb_nav_list_item_text_collapsible {
+        font-weight: $bold !important;
+      }
+    }
+  }
+
+  .font_regular {
+    .pb_nav_list_item_text {
+      font-weight: $regular;
+    }
+    .pb_collapsible_main_kit {
+      .pb_nav_list_item_text_collapsible {
+        font-weight: $regular !important;
+      }
+    }
+  }
+
+  //styling for default variant with collapsible
+  &[class*="_normal"] {
+    [class*="pb_collapsible_nav_item"] {
+      .pb_collapsible_content_kit {
+        margin-left: $space_lg + 3;
+      }
+      .pb_collapsible_main_kit {
+        border-radius: unset;
+      }
+      &[class*="_active"] {
+        .pb_collapsible_main_kit {
+          background-color: $active_light;
+        }
+        .pb_nav_list_item_link {
+          border-color: transparent !important;
+          .pb_nav_list_item_text {
+            color: unset !important;
+            font-weight: $regular !important;
+          }
+        }
+      }
+
+      &.dark {
+        border-color: $border_dark;
+        .pb_collapsible_main_kit:hover {
+          .pb_nav_list_item_text_collapsible {
+            color: $white !important;
+          }
+        }
+        &[class*="_active"] {
+          .pb_collapsible_main_kit {
+            background-color: mix($white, $card_dark, 20%);
+            .pb_nav_list_item_text_collapsible,
+            svg {
+              color: $white !important;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  //styling bold variant to work with collapsible
+  &[class*="_bold"] {
+    [class*="pb_collapsible_nav_item"] {
+      &[class*="_active"] {
+        .pb_collapsible_main_kit {
+          background-color: $primary !important;
+          border-radius: $border_rad_heavier;
+          .pb_nav_list_item_text_collapsible,
+          .pb_nav_list_item_icon_collapsible,
+          .icon_wrapper,
+          .pb_icon_kit {
+            color: $white !important;
+          }
+        }
+        .pb_nav_list_item_link {
+          background-color: unset !important;
+          box-shadow: unset !important;
+          &:hover {
+            background-color: rgba($primary, 0.03) !important;
+            .pb_nav_list_item_text {
+              color: $primary !important;
+            }
+          }
+          .pb_nav_list_item_text {
+            font-weight: $regular !important;
+          }
+        }
+          .icon_wrapper:hover {
+            background-color: mix($primary, $card_light, 40%);
+          }
+      }
+    }
+  }
+
+  //styling for subtle variant with collapsible
+  &[class*="_subtle"] {
+    [class*="pb_collapsible_nav_item"] {
+      &[class*="_active"] {
+        .pb_collapsible_main_kit {
+          background-color: $active_light;
+          border-radius: $border_rad_heavier;
+          .pb_nav_list_item_text_collapsible,
+          .pb_nav_list_item_icon_collapsible
+           {
+            color: $primary;
+          }
+        }
+        &:hover {
+          background-color: unset;
+        }
+      }
+      &.dark {
+        &[class*="_active"] {
+          .pb_collapsible_main_kit {
+            background-color: mix($white, $card_dark, 20%);
+            .pb_nav_list_item_text_collapsible,
+            svg {
+              color: $white !important;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  [class*="pb_collapsible_nav_item"] {
+    .pb_nav_list_kit_item {
+      margin-right: 0px !important;
+    }
+
+    &[class*="_active"] {
+      background-color: unset !important;
+      .pb_nav_list_item_link {
+        color: unset !important;
+      }
+    }
+
+    .pb_nav_list_item_link_collapsible {
+      &:focus-visible {
+        outline: none;
+      }
+    }
+
+    .pb_collapsible_main_kit {
+      &:focus-visible {
+        box-shadow: 0px 0px 0px 2px $primary_action;
+        border-radius: $border_rad_heavier;
+      }
+    }
+
+    //Make sure link is entire width of navitem when in collapsible
+    .pb_collapsible_main_kit {
+      .pb_flex_item_kit:first-child {
+        width: 100%;
+      }
+    }
+
     &:hover {
-      background-color: rgba($primary_action, $opacity_3);
+      .pb_nav_list_item_link_collapsible {
+        background-color: unset !important;
+      }
+    }
+
+    // vertical line on left of collapsible content
+    .pb_collapsible_content_kit {
+      margin-left: $space_sm + 2;
+    }
 
+    .pb_collapsible_main_kit {
+      transition-property: color, border-color, background-color;
+      transition-duration: 0.15s;
+      transition-timing-function: $bezier;
+      border-radius: $border_rad_heavier;
+      &:hover {
+        background-color: mix($primary, $card_light, 10%);
+        .pb_nav_list_item_text_collapsible,
+        svg {
+          color: $primary !important;
+        }
+      }
+    }
+
+    .pb_collapsible_main_kit,
+    .pb_collapsible_content_kit,
+    .pb_collapsible_kit {
+      padding: 0 !important;
+    }
+
+    &[class*="_collapsible_trail"] {
+      @include collapsible_trail_class;
+    }
+
+    .icon_wrapper {
+      border-radius: $border_radius_rounded;
+      width: $space_sm + 3;
+      height: $space_sm + 3;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-right: $space_xs;
+      &:hover {
+        background-color: mix($primary, $card_light, 40%);
+      }
+    }
+
+    &.dark {
+      .pb_nav_list_kit_item {
+        border-color: $border_dark;
+        .pb_nav_list_item_text {
+          color: $text_dk_light !important;
+        }
+      }
+      &[class*="pb_nav_list_kit_item"] [class*="_link"]:hover {
+        .pb_nav_list_item_text {
+          color: $white !important;
+        }
+      }
+
+      .pb_nav_list_item_text_collapsible {
+        color: $white !important;
+      }
+      .pb_nav_list_item_text {
+        color: $text_dk_light;
+      }
+      .pb_nav_list_kit_item:hover {
+        background-color: #ffffff33;
+        color: $white;
+      }
+      .pb_icon_kit {
+        color: $text_dk_light;
+      }
+
+      .pb_collapsible_main_kit:hover {
+        background-color: mix($white, $card_dark, 20%);
+        .pb_nav_list_item_text_collapsible,
+        svg {
+          color: $white !important;
+        }
+      }
+      .icon_wrapper:hover {
+        background-color: mix($white, $card_dark, 40%);
+      }
+
+      &[class*="pb_collapsible_nav_item"][class*="_collapsible_trail"] {
+        .pb_collapsible_content_kit {
+          &::after {
+            background-color: $border_dark;
+          }
+        }
+      }
     }
   }
 }
-}

data/app/pb_kits/playbook/pb_nav/_horizontal_nav.scss

@@ -44,7 +44,7 @@ $selector: ".pb_nav_list";
 
       [class*=_text] {
         font-size: $font_base;
-        font-weight: $bold;
+        // font-weight: $bold;
         color: $text_lt_default;
       }
 
@@ -81,6 +81,9 @@ $selector: ".pb_nav_list";
     // Horizontal Overrides
     [class*=pb_nav_list_kit_item] {
       margin: 0;
+      [class*=_item_text]{
+        font-weight: $regular;
+      }
     }
     [class*=_active] {
       background-color: $active_light;
@@ -101,6 +104,9 @@ $selector: ".pb_nav_list";
     // Horizontal Overrides
     [class*=pb_nav_list_kit_item] {
       margin: 0;
+      [class*=_item_text]{
+        font-weight: $regular;
+      }
     }
     [class*=_active] {
       [class*=_text] {