playbook_ui 12.37.0.pre.alpha.PLAY951collapsiblenav31073 → 12.37.0.pre.alpha.PLAYaddingdatapropselectkit1071

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a614a1ec23f8a5684100225c2de79beb702f61989d5d0507cf334247e5dee619
-  data.tar.gz: 2426810438f198dd19fbbe01fbb08a8701b85d9abd987ae8a0b31e588f9e0764
+  metadata.gz: 1c4ed389de4d3d4fb6707f7b6d320cb5fab04f242dd3a85dd13d36fd27bed1bb
+  data.tar.gz: 730de6094c4243b515b6c07950896fff797c699b65214d691ba5cfe116137e59
 SHA512:
-  metadata.gz: 92ce569a84e8e191695ff8bb75735d698ee0ba5b1915a8a174951cca08f70b7f1236532ec565f37e63f5cf1b3a7b57945804a5b1d3dc4bec018d41fe0d5208c1
-  data.tar.gz: e8c89499abd48d531b224ebba171145fbc302ff66f513ee11fe2c52af599925dea9ecbb889a5798e0a3cb4196d1770710b5aaeb88e785a99b519615d0a802213
+  metadata.gz: 999f9f2a0a7b74a1db4a819b61dceef4a283fb3c2965185475cca1c73c0fdc071013bde30b9dd0b6df7a1cee7824b1085a822969ada3d299a8a130b8317d545c
+  data.tar.gz: 318dbf4af0bea085d7ca027bb6c5da323d73655f33d2704f3479c92a5694a61723bfabc57262bb68b4fb4ae0975a5d492ceee6d63c9f9151862dd1ab2e0c7de4

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

@@ -20,12 +20,6 @@
   .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,
-  onIconClick?: ()=> void,
+  iconClick?: ()=> void,
   onClick?: ()=> void,
   id?: string,
 }
@@ -36,7 +36,7 @@ const Collapsible = ({
   icon,
   iconColor = 'default',
   iconSize,
-  onIconClick,
+  iconClick,
   onClick,
   id,
   ...props
@@ -66,7 +66,7 @@ const Collapsible = ({
     className
   )
   return (
-    <CollapsibleContext.Provider value={{ collapsed: isCollapsed, toggle, icon, iconSize, iconColor, onIconClick, onClick }}>
+    <CollapsibleContext.Provider value={{ collapsed: isCollapsed, toggle, icon, iconSize, iconColor, iconClick, onClick }}>
       <div
           {...ariaProps}
           {...dataProps}

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

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

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

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

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

@@ -1,2 +1,2 @@
 ##### Prop
-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.
+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']`

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

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

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

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

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

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

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

@@ -1,276 +1,27 @@
 @import "../tokens/spacing";
 @import "../tokens/colors";
 @import "../tokens/border_radius";
-@import "../tokens/titles";
-@import "../tokens/typography";
-@import "./mixins";
 
 [class^="pb_nav_list"] {
-  .font_size_small {
-    .pb_nav_list_item_text,
-    .pb_nav_list_item_text_collapsible {
-      font-size: $font_small !important;
-    }
-  }
-
-  .font_bold {
-    .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_regular {
-    .pb_nav_list_item_text {
-      font-weight: $regular;
-    }
-    .pb_collapsible_main_kit {
-      .pb_nav_list_item_text_collapsible {
-        font-weight: $regular !important;
-      }
-    }
+  .pb_collapsible_nav_item {
+  .pb_collapsible_main_kit,
+  .pb_collapsible_content_kit,
+  .pb_collapsible_kit {
+    padding: 0 !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;
-          }
-        }
-      }
-    }
-  }
-
-  //styling for subtle variant with collapsible
-  &[class*="_subtle"] {
-    [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;
-          }
-        }
-
-        &:hover {
-          background-color: unset;
-        }
-        .pb_collapsible_main_kit:hover {
-          .pb_nav_list_item_text_collapsible {
-            color: $white !important;
-          }
-        }
-
-        .icon_wrapper {
-          &:hover {
-            background-color: mix($primary, $card_light, 40%);
-            .pb_icon_kit {
-              color: $primary !important;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  [class*="pb_collapsible_nav_item"] {
-    &[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%;
-      }
-    }
-
+  .icon_wrapper {
+    border-radius: $border_radius_rounded;
+    width: 19px;
+    height: 19px;
+    display:flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: $space_xs;
     &:hover {
-      .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;
-      border-left: 1px solid transparent;
-    }
-
-    .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;
-    }
+      background-color: rgba($primary_action, $opacity_3);
 
-    &[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*="_active"] {
-        .icon_wrapper:hover {
-          background-color: mix($primary, $card_light, 40%);
-        }
-      }
-
-      &[class*="pb_collapsible_nav_item"][class*="_collapsible_trail"] {
-        .pb_collapsible_content_kit {
-          border-color: $border_dark;
-        }
-      }
     }
   }
 }
+}

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

@@ -81,9 +81,6 @@ $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;
@@ -104,9 +101,6 @@ $selector: ".pb_nav_list";
     // Horizontal Overrides
     [class*=pb_nav_list_kit_item] {
       margin: 0;
-      [class*=_item_text]{
-        font-weight: $regular;
-      }
     }
     [class*=_active] {
       [class*=_text] {