playbook_ui 13.15.0.pre.alpha.play10841940 → 13.15.0.pre.alpha.reactselectbump581876

data/app/pb_kits/playbook/pb_multi_level_select/_multi_level_select.tsx

@@ -86,50 +86,6 @@ const MultiLevelSelect = (props: MultiLevelSelectProps) => {
     item: []
   })
 
-  const modifyRecursive = (tree: { [key: string]: any }[], check: boolean) => {
-    if (!Array.isArray(tree)) {
-      return
-    }
-    return tree.map((item: { [key: string]: any }) => {
-      item.checked = check
-      item.children = modifyRecursive(item.children, check)
-      return item
-    })
-  }
-
-   // Function to map over data and add parent_id + depth property to each item
-  const addCheckedAndParentProperty = (
-    treeData: { [key: string]: any }[],
-    selectedIds: string[],
-    parent_id: string = null,
-    depth = 0,
-  ) => {
-    if (!Array.isArray(treeData)) {
-      return
-    }
-    return treeData.map((item: { [key: string]: any } | any) => {
-      const newItem = {
-        ...item,
-        checked: Boolean(selectedIds && selectedIds.length && selectedIds.includes(item.id)),
-        parent_id,
-        depth,
-      }
-      if (newItem.children && newItem.children.length > 0) {
-        const children =
-          item.checked && !returnAllSelected
-            ? modifyRecursive(item.children, true)
-            : item.children
-        newItem.children = addCheckedAndParentProperty(
-          children,
-          selectedIds,
-          newItem.id,
-          depth + 1
-        )
-      }
-      return newItem
-    })
-  }
-
   useEffect(() => {
     const formattedData = addCheckedAndParentProperty(
       treeData,
@@ -183,7 +139,16 @@ const MultiLevelSelect = (props: MultiLevelSelectProps) => {
     }
   }, [])
 
-
+  const modifyRecursive = (tree: { [key: string]: any }[], check: boolean) => {
+    if (!Array.isArray(tree)) {
+      return
+    }
+    return tree.map((item: { [key: string]: any }) => {
+      item.checked = check
+      item.children = modifyRecursive(item.children, check)
+      return item
+    })
+  }
 
   // Iterate over tree, find item and set checked or unchecked
   const modifyValue = (
@@ -241,7 +206,38 @@ const MultiLevelSelect = (props: MultiLevelSelectProps) => {
     return tree
   }
 
- 
+  // Function to map over data and add parent_id + depth property to each item
+  const addCheckedAndParentProperty = (
+    treeData: { [key: string]: any }[],
+    selectedIds: string[],
+    parent_id: string = null,
+    depth = 0,
+  ) => {
+    if (!Array.isArray(treeData)) {
+      return
+    }
+    return treeData.map((item: { [key: string]: any } | any) => {
+      const newItem = {
+        ...item,
+        checked: Boolean(selectedIds && selectedIds.length && selectedIds.includes(item.id)),
+        parent_id,
+        depth,
+      }
+      if (newItem.children && newItem.children.length > 0) {
+        const children =
+          item.checked && !returnAllSelected
+            ? modifyRecursive(item.children, true)
+            : item.children
+        newItem.children = addCheckedAndParentProperty(
+          children,
+          selectedIds,
+          newItem.id,
+          depth + 1
+        )
+      }
+      return newItem
+    })
+  }
 
   // Click event for x on form pill
   const handlePillClose = (event: any, clickedItem: { [key: string]: any }) => {

data/app/pb_kits/playbook/pb_multiple_users_stacked/_multiple_users_stacked.tsx

@@ -44,11 +44,11 @@ const MultipleUsersStacked = (props: MultipleUsersStackedProps) => {
     return users.slice(0, 1).map((userObject, index) => {
       return (
         <Avatar
-            {...userObject}
-            className="pb_multiple_users_stacked_item"
-            dark={dark}
-            key={index}
-            size="xs"
+          {...userObject}
+          className="pb_multiple_users_stacked_item"
+          dark={dark}
+          key={index}
+          size="xs"
         />
       )
     })
@@ -59,11 +59,11 @@ const MultipleUsersStacked = (props: MultipleUsersStackedProps) => {
       return users.slice(1, 2).map((userObject, index) => {
         return (
           <Avatar
-              {...userObject}
-              className="pb_multiple_users_stacked_item second_item"
-              dark={dark}
-              key={index}
-              size="xs"
+            {...userObject}
+            className="pb_multiple_users_stacked_item second_item"
+            dark={dark}
+            key={index}
+            size="xs"
           />
         )
       })
@@ -74,11 +74,11 @@ const MultipleUsersStacked = (props: MultipleUsersStackedProps) => {
     if (moreThanTwo === true) {
       return (
         <Badge
-            className="pb_multiple_users_stacked_item second_item"
-            dark={dark}
-            rounded
-            text={`+${users.length - displayCount()}`}
-            variant="primary"
+          className="pb_multiple_users_stacked_item second_item"
+          dark={dark}
+          rounded
+          text={`+${users.length - displayCount()}`}
+          variant="primary"
         />
       )
     }
@@ -86,11 +86,11 @@ const MultipleUsersStacked = (props: MultipleUsersStackedProps) => {
 
   return (
     <div
-        {...ariaProps}
-        {...dataProps}
-        {...htmlProps}
-        className={classes}
-        id={id}
+      {...ariaProps}
+      {...dataProps}
+      {...htmlProps}
+      className={classes}
+      id={id}
     >
       {firstUser()}
       {secondUser()}

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

@@ -18,7 +18,7 @@ type NavItemProps = {
   children?: React.ReactNode[] | React.ReactNode;
   className?: string;
   collapsible?: boolean;
-  data?: Record<string, unknown>;
+  data?: object;
   dark?: boolean;
   fontSize?: "normal" | "small";
   htmlOptions?: {[key: string]: string | number | boolean | (() => void)},
@@ -76,7 +76,7 @@ const NavItem = (props: NavItemProps) => {
     id,
     imageUrl,
     link,
-    onClick,
+    onClick = () => {},
     target = "_self",
     text = "",
     collapsibleTrail,
@@ -205,49 +205,46 @@ const { filteredPadding, filteredMargin } = filterItemSpacing(itemSpacing);
       {collapsible ? (
         <>
           <Collapsible
-              className={collapsibleClasses}
-              collapsed={collapsed}
-              icon={iconRight && iconRight}
-              iconSize="xs"
-              id={id}
-              onClick={onClick}
-              onIconClick={onIconRightClick}
+            className={collapsibleClasses}
+            icon={iconRight && iconRight}
+            iconSize="xs"
+            id={id}
+            collapsed={collapsed}
+            onIconClick={onIconRightClick}
+            onClick={onClick}
           >
             <Collapsible.Main
-                className={globalProps({ ...finalItemSpacing })}
-                dark={dark}
-            >
+            className={globalProps({ ...finalItemSpacing })}
+            dark={dark}>
               <Tag
-                  {...ariaProps}
-                  {...dataProps}
-                  {...htmlProps}
-                  className={classes}
-                  href={link}
-                  id={id}
-                  target={target}
+                {...ariaProps}
+                {...dataProps}
+                {...htmlProps}
+                className={classes}
+                id={id}
+                href={link}
+                target={target}
               >
                 {imageUrl && (
                   <div
-                      className="pb_nav_list_item_icon_section_collapsible"
-                      key={imageUrl}
-                      onClick={(e) => handleIconClick(e)}
+                    className="pb_nav_list_item_icon_section_collapsible"
+                    key={imageUrl}
+                    onClick={(e) => handleIconClick(e)}
                   >
-                    <Image className="pb_nav_img_wrapper"
-                        url={imageUrl}
-                    />
+                    <Image className="pb_nav_img_wrapper" url={imageUrl} />
                   </div>
                 )}
 
                 {iconLeft && (
                   <div
-                      className="pb_nav_list_item_icon_section_collapsible"
-                      key={iconLeft}
-                      onClick={(e) => handleIconClick(e)}
+                    className="pb_nav_list_item_icon_section_collapsible"
+                    key={iconLeft}
+                    onClick={(e) => handleIconClick(e)}
                   >
                     <Icon
-                        className="pb_nav_list_item_icon_left_collapsible"
-                        fixedWidth
-                        icon={iconLeft}
+                      className="pb_nav_list_item_icon_left_collapsible"
+                      fixedWidth
+                      icon={iconLeft}
                     />
                   </div>
                 )}
@@ -261,33 +258,27 @@ const { filteredPadding, filteredMargin } = filterItemSpacing(itemSpacing);
         </>
       ) : (
         <Tag
-            {...ariaProps}
-            {...dataProps}
-            {...htmlProps}
-            className={classes}
-            href={link}
-            id={id}
-            onClick={onClick}
-            target={target}
+          {...ariaProps}
+          {...dataProps}
+          {...htmlProps}
+          className={classes}
+          id={id}
+          href={link}
+          onClick={onClick}
+          target={target}
         >
           {imageUrl && (
-            <div className="pb_nav_list_item_icon_section"
-                key={imageUrl}
-            >
-              <Image className="pb_nav_img_wrapper"
-                  url={imageUrl}
-              />
+            <div className="pb_nav_list_item_icon_section" key={imageUrl}>
+              <Image className="pb_nav_img_wrapper" url={imageUrl} />
             </div>
           )}
 
           {iconLeft && (
-            <div className="pb_nav_list_item_icon_section"
-                key={iconLeft}
-            >
+            <div className="pb_nav_list_item_icon_section" key={iconLeft}>
               <Icon
-                  className="pb_nav_list_item_icon_left"
-                  fixedWidth
-                  icon={iconLeft}
+                className="pb_nav_list_item_icon_left"
+                fixedWidth
+                icon={iconLeft}
               />
             </div>
           )}
@@ -296,13 +287,13 @@ const { filteredPadding, filteredMargin } = filterItemSpacing(itemSpacing);
 
           {iconRight && (
             <div
-                className="pb_nav_list_item_icon_section"
-                key={iconRight as string}
+              className="pb_nav_list_item_icon_section"
+              key={iconRight as string}
             >
               <Icon
-                  className="pb_nav_list_item_icon_right"
-                  fixedWidth
-                  icon={iconRight as string}
+                className="pb_nav_list_item_icon_right"
+                fixedWidth
+                icon={iconRight as string}
               />
             </div>
           )}

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

@@ -12,12 +12,12 @@ type NavProps = {
   borderless?: boolean,
   children?: React.ReactNode[] | React.ReactNode,
   className?: string | string[],
-  data?: Record<string, unknown>,
+  data?: object,
   dark?: boolean,
   highlight?: boolean,
   htmlOptions?: {[key: string]: string | number | boolean | (() => void)},
   id?: string,
-  onClick?: () => void,
+  onClick?: React.MouseEventHandler<HTMLElement>,
   orientation?: "vertical" | "horizontal",
   link?: string,
   title?: string,
@@ -25,7 +25,7 @@ type NavProps = {
   itemSpacing?: SpacingObject
 } & GlobalProps
 
-const Nav = (props: NavProps): React.ReactElement => {
+const Nav = (props: NavProps) => {
   const {
     aria = {},
     borderless = false,
@@ -37,7 +37,7 @@ const Nav = (props: NavProps): React.ReactElement => {
     htmlOptions = {},
     id,
     link = '#',
-    onClick,
+    onClick = () => { },
     orientation = 'vertical',
     title = '',
     variant = 'normal',
@@ -71,23 +71,23 @@ const childrenWithProps = React.Children.map(children, (child) => {
 
   return (
     <nav
-        {...ariaProps}
-        {...dataProps}
-        {...htmlProps}
-        className={cardCss}
-        id={id}
+      {...ariaProps}
+      {...dataProps}
+      {...htmlProps}
+      className={cardCss}
+      id={id}
     >
       {title &&
         <div className="pb_nav_list_title">
           <a
-              className="pb_nav_list_item_link_text"
-              href={link}
-              onClick={onClick}
+            className="pb_nav_list_item_link_text"
+            href={link}
+            onClick={onClick}
           >
             <Caption
-                dark={dark}
-                size="md"
-                text={`${title}`}
+              dark={dark}
+              size="md"
+              text={`${title}`}
             />
           </a>
         </div>