playbook_ui 12.37.0.pre.alpha.PLAY951collapsiblenav31062 → 12.37.0.pre.alpha.svgiconmethods1064

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9285fc7f8a5cbbb075de7237ed92122dafbc6edf55281c2d6b95992a7b693a64
-  data.tar.gz: 2219ddec9c8fd3b0481727aef59bbd729bcc5312ac2b529cde1530c7a6d7cc84
+  metadata.gz: 14c36bf2dc83555d191d529d857f9be98bed92ff0165962b37676c269dee8c44
+  data.tar.gz: 36997b2084a332b87ef58515b6a3263e633c2e9f873bb754ad71282a2babef31
 SHA512:
-  metadata.gz: 7f9a4389f9097f76c67178b17b8198154c3357a52ba5b15e219bd661ba411f136d8eb5e6a0c6787c342b6224b1200789b945c34476f7b36c043b7a19e2556f17
-  data.tar.gz: ad198b06d6282ef56baae64a8333b856ddf246c091bc65766bf2fe90b86a55c4d6adc151c2b7d2e35184ef7a6824686ad2e8bb123a61f21d2778726b89e34e11
+  metadata.gz: 96695e4ab6365e311252d3b7b02971bbcb418b1bae241f7d23cdeef069d469ccf01db4739ae41c8f1b3db91b939d1851f0be4301e789988add39902acc538c64
+  data.tar.gz: 1b88816484853815d500c9629c80e36970d7c238be5b017d88ed2f761e81525b4073e0c55135dfbfeacc385fc653fdb593eb7f9ff70ad17d44edfc09a1be1ff2

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_icon/docs/_icon_animate.html.erb

@@ -1,3 +1,4 @@
 <p><%= pb_rails("icon", props: { icon: "spinner", spin: true, fixed_width: true, size: "2x" }) %> <span>Spin</span></p>
 <br/>
 <p><%= pb_rails("icon", props: { icon: "spinner", pulse: true, fixed_width: true, size: "2x" }) %> <span>Pulse</span></p>
+

data/app/pb_kits/playbook/pb_icon/docs/_icon_custom.html.erb

@@ -14,3 +14,5 @@
     parent element's css color properties."
   } ) %>
 </div>
+
+

data/app/pb_kits/playbook/pb_icon/docs/_icon_svg.html.erb

@@ -0,0 +1,5 @@
+<%= pb_rails("icon", props: { size: "5x", custom_icon: "copilot", padding_left: "xl" } ) %>
+<%= pb_rails("icon", props: { size: "5x", custom_icon: "squirrel", padding_left: "xl" } ) %>
+
+
+

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

@@ -1,14 +1,15 @@
 examples:
   rails:
-  - icon_default: Icon Default
-  - icon_rotate: Icon Rotate
-  - icon_flip: Icon Flip
-  - icon_animate: Icon Animation
-  - icon_pull: Icon Pull
-  - icon_border: Icon Border
-  - icon_sizes: Icon Sizes
-  - icon_custom: Icon Custom
-  - icon_fa_kit: Icon with FontAwesome Kit
+  # - icon_default: Icon Default
+  # - icon_rotate: Icon Rotate
+  # - icon_flip: Icon Flip
+  # - icon_animate: Icon Animation
+  # - icon_pull: Icon Pull
+  # - icon_border: Icon Border
+  # - icon_sizes: Icon Sizes
+  # - icon_custom: Icon Custom
+  # - icon_fa_kit: Icon with FontAwesome Kit
+  - icon_svg: Icon SVG
 
   react:
   - icon_default: Icon Default

data/app/pb_kits/playbook/pb_icon/icon.html.erb

@@ -1,15 +1,15 @@
 <% if object.custom_icon %>
-  <%= object.render_svg(object.custom_icon) %>
+  <%= object.embedded_svg(object.custom_icon) %>
 <% elsif object.valid_emoji(object.icon) %>
   <span class="pb_icon_kit_emoji"><%= object.icon.html_safe %></span>
 <% else %>
   <%= content_tag(:i, nil,
       id: object.id,
       data: object.data,
-      class: object.classname
+      class: object.classname,
   ) %>
   <%= content_tag(:span, nil,
       aria: { label: "#{object.icon} icon" }.merge(object.aria),
       hidden: true
   ) %>
-<% end %>
+<% end %>

data/app/pb_kits/playbook/pb_icon/icon.rb

@@ -90,6 +90,25 @@ module Playbook
         end
       end
 
+      def embedded_svg(icon_name)
+        svg_path = Rails.application.config.respond_to?(:icon_path) ? Rails.application.config.icon_path : "app/assets/images"
+        file_path = File.read(Rails.root.join(svg_path, "#{icon_name}.svg"))
+
+        doc = Nokogiri::HTML::DocumentFragment.parse file_path
+        svg = doc.at_css "svg"
+
+        doc.to_html.html_safe
+
+        size_factor = size.to_i
+        if size_factor > 1
+          pixel_size = size_factor * 16
+          svg["width"] = pixel_size.to_s
+          svg["height"] = pixel_size.to_s
+        end
+
+        raw doc
+      end
+
     private
 
       def border_class

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

@@ -1,152 +1,27 @@
 @import "../tokens/spacing";
 @import "../tokens/colors";
 @import "../tokens/border_radius";
-@import "../tokens/titles";
-@import "../tokens/typography";
 
 [class^="pb_nav_list"] {
-  [class*="pb_collapsible_nav_item"] {
-    @mixin collapsible_trail_class {
-      .pb_collapsible_content_kit {
-        margin-left: $space_md - 2 !important;
-        border-left: 2px solid $border_light;
-      }
-    }
-
-    @mixin bold_class {
-      .pb_collapsible_main_kit {
-        .pb_nav_list_item_text_collapsible {
-          @include pb_title_4;
-          font-weight: $bolder !important;
-        }
-      }
-    }
-
-    &[class*="_active"] {
-      background-color: unset !important;
-      .pb_nav_list_item_link {
-        color: unset !important;
-      }
-      .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;
-          }
-        }
-      }
-    }
+  .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;
     &:hover {
-      .pb_nav_list_item_link_collapsible {
-        background-color: unset !important;
-      }
-    }
-
-    .pb_collapsible_main_kit:hover {
-      border-radius: $border_rad_heavier;
-      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;
-    }
-
-    &[class*="_bold_text"] {
-      @include bold_class;
-    }
-
-    &[class*="_emphasized"] {
-      @include collapsible_trail_class;
-      @include bold_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 {
-      &[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*="_emphasized"],
-      &[class*="pb_collapsible_nav_item"][class*="_collapsible_trail"] {
-        .pb_collapsible_content_kit {
-          border-color: $border_dark;
-        }
-      }
     }
   }
 }
+}

data/app/pb_kits/playbook/pb_nav/_item.tsx

@@ -11,69 +11,57 @@ import Collapsible from '../pb_collapsible/_collapsible'
 type NavItemProps = {
   active?: boolean,
   aria?: { [key: string]: string },
-  bold?: boolean,
-  emphasized?: boolean,
   children?: React.ReactNode[] | React.ReactNode,
   className?: string,
   collapsible?: boolean,
+  collapsibleClick?: () => void,
   data?: object,
-  dark?: boolean,
   iconLeft?: string,
   iconRight?: string | string[],
-  onIconRightClick?: () => void,
-  onIconLeftClick?: () => void,
+  iconRightClick?: () => void,
+  iconLeftClick?: () => void,
   id?: string,
   imageUrl?: string,
   link?: string,
-  onClick?: () => void,
+  onClick?: React.MouseEventHandler<HTMLElement>,
   target?: '_blank' | '_self' | '_parent' | '_top',
   text: string,
-  collapsibleTrail?: boolean,
-  collapsed?: boolean
+  toggleCollapsed?: any
 } & GlobalProps
 
 const NavItem = (props: NavItemProps) => {
   const {
     active = false,
     aria = {},
-    bold,
-    emphasized,
     children,
     className,
     collapsible,
+    collapsibleClick,
     data = {},
-    dark = false,
     iconLeft,
     iconRight,
-    onIconRightClick,
-    onIconLeftClick,
+    iconRightClick,
+    iconLeftClick,
     id,
     imageUrl,
     link,
     onClick = () => { },
     target = '_self',
     text = '',
-    collapsibleTrail,
-    collapsed
+    toggleCollapsed
   } = props
 
   const Tag = link ? 'a' : 'div'
   const activeClass = active === true ? 'active' : ''
-  const collapsibleTrailClass = collapsible && collapsibleTrail ? 'collapsible_trail' : ''
-  const boldClass = collapsible && bold ? 'bold' : ''
-  const emphasizedClass = collapsible && emphasized ? 'emphasized' : ''
   const ariaProps = buildAriaProps(aria)
   const dataProps = buildDataProps(data)
-  const classes = classnames(buildCss('pb_nav_list_kit_item', activeClass), 
-                  collapsible ? buildCss('pb_collapsible_nav_item', activeClass, collapsibleTrailClass, boldClass, emphasizedClass) : '', 
-                  globalProps(props), 
-                  className)
+  const classes = classnames(buildCss('pb_nav_list_kit_item', activeClass), collapsible ? 'pb_collapsible_nav_item' : '', globalProps(props), className)
 
 
   const handleIconClick = (e:any) => {
-    if (onIconLeftClick) {
+    if (iconLeftClick) {
     e.stopPropagation();
-    onIconLeftClick()
+    iconLeftClick()
     }
   }
 
@@ -89,19 +77,20 @@ const NavItem = (props: NavItemProps) => {
           <Collapsible icon={iconRight ? iconRight : ['plus','minus']} 
             iconSize="xs" 
             id={id}
-            collapsed={collapsed}
-            onIconClick={onIconRightClick}
-            onClick={onClick}
+            collapsed={toggleCollapsed}
+            iconClick={iconRightClick}
+            onClick={collapsibleClick}
           >
-          <Collapsible.Main dark={dark}>
+          <Collapsible.Main>
           <Tag
-          className="pb_nav_list_item_link_collapsible"
+          className="pb_nav_list_item_link"
           href={link}
+          onClick={onClick}
           target={target}
         >
           {imageUrl &&
             <div
-              className="pb_nav_list_item_icon_section_collapsible"
+              className="pb_nav_list_item_icon_section"
               key={imageUrl}
               onClick={(e)=>handleIconClick(e)}
             >
@@ -114,18 +103,18 @@ const NavItem = (props: NavItemProps) => {
   
           {iconLeft &&
             <div
-              className="pb_nav_list_item_icon_section_collapsible"
+              className="pb_nav_list_item_icon_section"
               key={iconLeft}
               onClick={(e)=>handleIconClick(e)}
             >
               <Icon
-                className="pb_nav_list_item_icon_left_collapsible"
+                className="pb_nav_list_item_icon_left"
                 fixedWidth
                 icon={iconLeft}
               />
             </div>
           }
-           <span className="pb_nav_list_item_text_collapsible">
+           <span className="pb_nav_list_item_text">
             {text}
           </span>
         </Tag>

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

@@ -29,6 +29,12 @@
         flex: 1;
         font-weight: $regular;
       }
+    }
+    &[class*=_active] [class*=_link] {
+      @include pb_title_4;
+      color: $primary;
+      letter-spacing: normal;
+    }
       &:hover {
         background-color: rgba($primary, 0.03);
         [class*=_icon] {
@@ -38,11 +44,5 @@
           color: $primary;
         }
       }
-    }
-    &[class*=_active] [class*=_link] {
-      @include pb_title_4;
-      color: $primary;
-      letter-spacing: normal;
-    }
   }
 }