playbook_ui 12.38.0.pre.alpha.PLAY966collapsiblenav41082 → 12.38.0.pre.alpha.audiencesalpha1083

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

@@ -11,109 +11,57 @@ import Collapsible from '../pb_collapsible/_collapsible'
 type NavItemProps = {
   active?: boolean,
   aria?: { [key: string]: string },
-  fontWeight?: "regular" | "bold" | "bolder",
   children?: React.ReactNode[] | React.ReactNode,
   className?: string,
   collapsible?: boolean,
+  collapsibleClick?: () => void,
   data?: object,
-  dark?: boolean,
-  fontSize?: "normal" | "small",
   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,
-  paddingBottom?: string,
-  paddingTop?: string,
-  paddingLeft?: string,
-  paddingRight?: string,
-  paddingX?: string,
-  paddingY?: string,
-  padding?: 'none' | 'xxs' | 'xs' | 'sm' | 'md' | 'lg' | 'xl',
-  orientation?: "vertical" | "horizontal",
-  variant?: "normal" | "subtle",
+  toggleCollapsed?: any
 } & GlobalProps
 
 const NavItem = (props: NavItemProps) => {
   const {
     active = false,
     aria = {},
-    fontWeight = "regular",
     children,
     className,
     collapsible,
+    collapsibleClick,
     data = {},
-    dark = false,
-    fontSize = "normal",
     iconLeft,
     iconRight,
-    onIconRightClick,
-    onIconLeftClick,
+    iconRightClick,
+    iconLeftClick,
     id,
     imageUrl,
     link,
     onClick = () => { },
     target = '_self',
     text = '',
-    collapsibleTrail,
-    collapsed, 
-    // orientation,
-    // variant,
-    padding,
-    paddingX,
-    paddingY,
-    paddingBottom,
-    paddingTop,
-    paddingLeft,
-    paddingRight
+    toggleCollapsed
   } = props
 
-  const filteredProps = {...props}
-  delete filteredProps?.padding
-  delete filteredProps?.paddingX
-  delete filteredProps?.paddingY
-  delete filteredProps?.paddingBottom
-  delete filteredProps?.paddingTop
-  delete filteredProps?.paddingRight
-  delete filteredProps?.paddingLeft
-
   const Tag = link ? 'a' : 'div'
   const activeClass = active === true ? 'active' : ''
-  const collapsibleTrailClass = collapsible && collapsibleTrail ? 'collapsible_trail' : ''
-  const fontSizeClass = fontSize === 'small' ? "font_size_small" : "font_size_normal"
-  const fontWeightClass = fontWeight === 'bold' ? "font_bold" : fontWeight === 'bolder' ? "font_bolder" : "font_regular"
   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) : '', 
-                  fontSizeClass,
-                  fontWeightClass,
-                  globalProps(filteredProps), 
-                  className)
-
-  const tagClasses = classnames(collapsible ? 'pb_nav_list_item_link_collapsible' : "pb_nav_list_item_link",
-                      globalProps({
-                        padding,
-                        paddingBottom,
-                        paddingLeft,
-                        paddingRight,
-                        paddingTop,
-                        paddingX,
-                        paddingY,
-                      }))
+  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()
     }
   }
 
@@ -129,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={tagClasses}
+          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)}
             >
@@ -154,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>
@@ -176,8 +125,8 @@ const NavItem = (props: NavItemProps) => {
         </Collapsible>
         ) : (
         <Tag
-        className={tagClasses}
-        href={link}
+          className="pb_nav_list_item_link"
+          href={link}
           onClick={onClick}
           target={target}
         >

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

@@ -22,11 +22,6 @@ type NavProps = {
   variant?: "normal" | "subtle",
 } & GlobalProps
 
-type NavChildProps = {
-  orientation: "vertical" | "horizontal";
-  variant: "normal" | "subtle";
-};
-
 const Nav = (props: NavProps) => {
   const {
     aria = {},
@@ -55,18 +50,6 @@ const Nav = (props: NavProps) => {
     className
   )
 
-// Map over the children and clone them with orientation and variant props to gain access to them in navItem
-const childrenWithProps = React.Children.map(children, (child) => {
-  if (React.isValidElement(child)) {
-    const childProps: NavChildProps = {
-      orientation: orientation,
-      variant: variant,
-    };
-    return React.cloneElement(child, childProps);
-  }
-  return child;
-});
-
   return (
     <nav
       {...ariaProps}
@@ -89,7 +72,7 @@ const childrenWithProps = React.Children.map(children, (child) => {
           </a>
         </div>
       }
-      <ul>{childrenWithProps}</ul>
+      <ul>{children}</ul>
     </nav>
   )
 }

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

@@ -27,7 +27,14 @@
       }
       [class*=_text] {
         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] {
@@ -37,11 +44,5 @@
           color: $primary;
         }
       }
-    }
-    &[class*=_active] [class*=_link] {
-      @include pb_title_4;
-      color: $primary;
-      letter-spacing: normal;
-    }
   }
 }

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

@@ -56,7 +56,7 @@ $selector: ".pb_nav_list";
               color: $primary;
             }
             [class*=_text] {
-              color: $primary !important;
+              color: $primary;
             }
           }
         }

data/app/pb_kits/playbook/pb_nav/docs/_collapsible_nav.jsx

@@ -1,90 +1,63 @@
-import React from "react";
-import { Nav, NavItem } from '../..'
+import React from "react"
+import { Nav, NavItem, useCollapsible } from "../.."
 
 const CollapsibleNav = (props) => {
+  const navItems = ["Overview", "Albums", "Similar Artists"]
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const collapsibles = navItems.map(() => useCollapsible(true))
+
+  const handleMainClick = (index) => {
+    collapsibles.forEach(([, , setCollapsed], idx) => {
+      if (idx === index) {
+        setCollapsed(false)
+      } else {
+        setCollapsed(true)
+      }
+    })
+  }
+
+
+  const handleIconRightClick = (index) => {
+    const [isCollapsed, setCollapsed] = collapsibles[index]
+    setCollapsed(!isCollapsed)
+  }
+
   return (
-    <Nav>
-      <NavItem
-          active
-          collapsible 
-          collapsibleTrail
-          fontWeight="bolder"
-          iconLeft="city" 
-          iconRight={["plus", "minus"]}
-          link="#" 
-          text="Overview" 
-          {...props}
-      >
-        <NavItem
-            link="#" 
-            text="City"
-            {...props}
-        />
-        <NavItem
-            link="#"
-            text="People"
-            {...props}
-        />
-        <NavItem 
-            link="#" 
-            text="Business" 
-            {...props}
-        />
-      </NavItem>
-      <NavItem 
-          collapsible 
-          collapsibleTrail
-          fontWeight="bolder"
-          iconLeft="theater-masks"
-          iconRight={["plus", "minus"]}
-          link="#" 
-          text="Albums" 
-          {...props}
-      >
-        <NavItem 
-            link="#" 
-            text="Entertainment" 
-            {...props}
-        />
-        <NavItem 
-            link="#" 
-            text="Food" 
-            {...props}
-        />
-        <NavItem 
-            link="#" 
-            text="Style" 
-            {...props}
-        />
-      </NavItem>
-      <NavItem 
-          collapsible 
-          collapsibleTrail
-          fontWeight="bolder"
-          iconLeft="city" 
-          iconRight={["plus", "minus"]}
-          link="#" 
-          text="Similar Artists" 
-          {...props}
-      >
-        <NavItem 
-            link="#" 
-            text="City"
-            {...props} 
-        />
-        <NavItem
-            link="#"
-            text="People"
-            {...props}
-        />
-        <NavItem 
-            link="#" 
-            text="Business" 
-            {...props}
-        />
-      </NavItem>
-    </Nav>
-  );
-};
+    <>
+      <Nav variant='subtle'>
+        {navItems.map((text, index) => {
+          const [collapsed] = collapsibles[index]
+          return (
+            <NavItem
+                collapsible
+                collapsibleClick={() => handleMainClick(index)}
+                iconLeft="chevron-down"
+                iconRightClick={() => handleIconRightClick(index)}
+                id={`collapsible-nav-item-${index + 1}`}
+                key={index}
+                link="#"
+                text={text}
+                toggleCollapsed={collapsed}
+                {...props}
+            >
+              <NavItem link="#" 
+                  text="City" 
+                  {...props} 
+              />
+              <NavItem link="#" 
+                  text="People" 
+                  {...props} 
+              />
+              <NavItem link="#" 
+                  text="Business" 
+                  {...props} 
+              />
+            </NavItem>
+          );
+        })}
+      </Nav>
+    </>
+  )
+}
 
 export default CollapsibleNav

data/app/pb_kits/playbook/pb_nav/docs/{_collapsible_nav_emphasize.jsx → _collapsible_nav_custom_icons.jsx}

@@ -1,15 +1,11 @@
 import React from "react";
 import { Nav, NavItem } from '../..'
 
-const CollapsibleNavEmphasize = (props) => {
+const CollapsibleNavCustomIcons = (props) => {
   return (
-    <Nav variant="bold">
+    <Nav variant="subtle">
       <NavItem
-          active 
-          collapsible
-          collapsibleTrail
-          fontSize="small"
-          fontWeight="bolder"
+          collapsible 
           iconLeft="city" 
           iconRight={["plus", "minus"]}
           link="#" 
@@ -33,10 +29,8 @@ const CollapsibleNavEmphasize = (props) => {
         />
       </NavItem>
       <NavItem 
+          active 
           collapsible 
-          collapsibleTrail
-          fontSize="small"
-          fontWeight="bolder"
           iconLeft="theater-masks"
           iconRight={["plus", "minus"]}
           link="#" 
@@ -61,9 +55,6 @@ const CollapsibleNavEmphasize = (props) => {
       </NavItem>
       <NavItem 
           collapsible 
-          collapsibleTrail
-          fontSize="small"
-          fontWeight="bolder"
           iconLeft="city" 
           iconRight={["plus", "minus"]}
           link="#" 
@@ -90,4 +81,4 @@ const CollapsibleNavEmphasize = (props) => {
   );
 };
 
-export default CollapsibleNavEmphasize;
+export default CollapsibleNavCustomIcons;

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

@@ -7,8 +7,7 @@ examples:
   - borderless_nav: No Borders
   - subtle_nav: Subtle Variant
   - subtle_with_icons_nav: Subtle With Icons
-  - collapsible_nav: Collapsible Nav
-  - collapsible_nav_emphasize: Collapsible Nav with Emphasize Styling
+  # - collapsible_nav: Subtle With Collapsible
   - subtle_no_highlight_nav: Subtle No Highlight
   - bold_vertical_nav: Bold Variant
   - horizontal_nav: Horizontal Nav
@@ -26,9 +25,8 @@ examples:
   - borderless_nav: No Borders
   - subtle_nav: Subtle Variant
   - subtle_with_icons_nav: Subtle With Icons
-  - collapsible_nav: Collapsible Nav
-  - collapsible_nav_emphasize: Collapsible Nav with Emphasize Styling
-  - collapsible_nav_custom: Collapsible Nav With Custom Toggling
+  # - collapsible_nav: Subtle With Collapsible
+  # - collapsible_nav_custom_icons: Subtle With Collapsible (No custom toggling)
   - subtle_no_highlight_nav: Subtle No Highlight
   - bold_vertical_nav: Bold Variant
   - horizontal_nav: Horizontal Nav

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

@@ -14,5 +14,4 @@ export { default as NewTab } from './_new_tab.jsx'
 export { default as BoldHorizontalNav } from './_bold_horizontal_nav.jsx'
 export { default as BoldVerticalNav } from './_bold_vertical_nav.jsx'
 export { default as CollapsibleNav } from './_collapsible_nav.jsx'
-export { default as CollapsibleNavCustom } from './_collapsible_nav_custom.jsx'
-export { default as CollapsibleNavEmphasize } from "./_collapsible_nav_emphasize.jsx"
+export { default as CollapsibleNavCustomIcons } from './_collapsible_nav_custom_icons.jsx'

data/app/pb_kits/playbook/pb_nav/item.html.erb

@@ -2,20 +2,19 @@
   aria: object.aria,
   class: object.classname,
   data: object.data,
-  dark: object.dark,
   id: object.id) do %>
   <% if object.collapsible %>
     <%= pb_rails("collapsible", props: { name: "collapsible-nav-example" }) do %>
-      <%= pb_rails("collapsible/collapsible_main", props: { name: "default-collapsible-nav", icon: object.collapsible_icons, size: "xs", dark: object.dark }) do %>
+      <%= pb_rails("collapsible/collapsible_main", props: { name: "default-collapsible-nav", icon: object.collapsible_icons, size: "xs" }) do %>
         <%= content_tag(object.tag,
         object.link ? object.link_options : object.options) do %>
           <% if object.image_url %>
-            <%= pb_rails("image", props: { url: object.image_url, classname: "pb_nav_img_wrapper_collapsible" }) %>
+            <%= pb_rails("image", props: { url: object.image_url, classname: "pb_nav_img_wrapper" }) %>
           <% end %>
           <% if object.icon_left %>
-            <%= pb_rails("icon", props: { icon: object.icon_left, classname: "pb_nav_list_item_icon_left_collapsible", fixed_width: true}) %>
+            <%= pb_rails("icon", props: { icon: object.icon_left, classname: "pb_nav_list_item_icon_left", fixed_width: true}) %>
           <% end %>
-          <span class="pb_nav_list_item_text_collapsible">
+          <span class="pb_nav_list_item_text">
             <%= object.text %>
           </span>
         <% end %>    

data/app/pb_kits/playbook/pb_nav/item.rb

@@ -4,16 +4,9 @@ module Playbook
   module PbNav
     class Item < Playbook::KitBase
       prop :active, type: Playbook::Props::Boolean, default: false
-      prop :font_size, type: Playbook::Props::Enum,
-                       values: %w[normal small],
-                       default: "normal"
-      prop :font_weight, type: Playbook::Props::Enum,
-                         values: %w[bold regular bolder],
-                         default: "regular"
       prop :collapsible, type: Playbook::Props::Boolean, default: false
       prop :link
       prop :text
-      prop :collapsible_trail, type: Playbook::Props::Boolean, default: false
       prop :icon_left
       prop :icon_right
       prop :image_url
@@ -22,9 +15,9 @@ module Playbook
                     default: "_self"
       def classname
         if collapsible
-          "#{generate_classname('pb_nav_list_kit_item', active_class)} #{generate_classname('pb_collapsible_nav_item', active_class, collapsible_trail_class)} #{font_size_class} #{font_weight_class}"
+          "pb_collapsible_nav_item #{generate_classname('pb_nav_list_kit_item', active_class)}"
         else
-          "#{generate_classname('pb_nav_list_kit_item', active_class)} #{font_size_class} #{font_weight_class}"
+          generate_classname("pb_nav_list_kit_item", active_class)
         end
       end
 
@@ -34,7 +27,7 @@ module Playbook
 
       def options
         {
-          class: collapsible ? "pb_nav_list_item_link_collapsible" : "pb_nav_list_item_link",
+          class: "pb_nav_list_item_link",
         }.compact
       end
 
@@ -54,25 +47,6 @@ module Playbook
       def active_class
         active ? "active" : nil
       end
-
-      def font_weight_class
-        case font_weight
-        when "bold"
-          "font_bold"
-        when "bolder"
-          "font_bolder"
-        else
-          "font_regular"
-        end
-      end
-
-      def collapsible_trail_class
-        collapsible_trail ? "collapsible_trail" : nil
-      end
-
-      def font_size_class
-        font_size === "small" ? "font_size_small" : "font_size_normal"
-      end
     end
   end
 end