playbook_ui 14.4.0.pre.rc.14 → 14.4.0.pre.rc.16

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

@@ -6,6 +6,7 @@ examples:
   - form_pill_tag: Form Pill Tag
   - form_pill_example: Example
   - form_pill_icon: Form Pill Icon
+  - form_pill_colors: Form Pill Colors
 
   react:
   - form_pill_user: Form Pill User
@@ -13,3 +14,4 @@ examples:
   - form_pill_tag: Form Pill Tag
   - form_pill_example: Example
   - form_pill_icon: Form Pill Icon
+  - form_pill_colors: Form Pill Colors

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

@@ -3,3 +3,4 @@ export { default as FormPillSize } from './_form_pill_size.jsx'
 export { default as FormPillTag } from './_form_pill_tag.jsx'
 export { default as FormPillExample } from './_form_pill_example.jsx'
 export { default as FormPillIcon } from './_form_pill_icon.jsx'
+export { default as FormPillColors } from './_form_pill_colors.jsx'

data/app/pb_kits/playbook/pb_form_pill/form_pill.rb

@@ -12,7 +12,7 @@ module Playbook
                             values: %w[none lowercase],
                             default: "none"
       prop :color, type: Playbook::Props::Enum,
-                   values: %w[primary neutral],
+                   values: %w[primary neutral success warning error info data_1 data_2 data_3 data_4 data_5 data_6 data_7 data_8 windows siding roofing doors gutters solar insulation accessories],
                    default: "primary"
       prop :tabindex
       prop :icon

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

@@ -34,6 +34,7 @@ type MultiLevelSelectProps = {
   onSelect?: (prop: { [key: string]: any }) => void
   selectedIds?: string[]
   variant?: "multi" | "single"
+  pillColor?: "primary" | "neutral" | "success" | "warning" | "error" | "info" | "data_1" | "data_2" | "data_3" | "data_4" | "data_5" | "data_6" | "data_7" | "data_8" | "windows" | "siding" | "roofing" | "doors" | "gutters" | "solar" | "insulation" | "accessories",
 } & GlobalProps
 
 const MultiLevelSelect = (props: MultiLevelSelectProps) => {
@@ -50,7 +51,8 @@ const MultiLevelSelect = (props: MultiLevelSelectProps) => {
     treeData,
     onSelect = () => null,
     selectedIds,
-    variant = "multi"
+    variant = "multi",
+    pillColor = "primary"
   } = props
 
   const ariaProps = buildAriaProps(aria)
@@ -467,6 +469,7 @@ const MultiLevelSelect = (props: MultiLevelSelectProps) => {
                 inputDisplay === "pills"
                   ? returnedArray.map((item, index) => (
                       <FormPill
+                          color={pillColor}
                           key={index}
                           onClick={(event: any) => handlePillClose(event, item)}
                           text={item.label}
@@ -479,6 +482,7 @@ const MultiLevelSelect = (props: MultiLevelSelectProps) => {
                 inputDisplay === "pills"
                   ? defaultReturn.map((item, index) => (
                       <FormPill
+                          color={pillColor}
                           key={index}
                           onClick={(event: any) => handlePillClose(event, item)}
                           text={item.label}

data/app/pb_kits/playbook/pb_multi_level_select/docs/_multi_level_select_color.html.erb

@@ -0,0 +1,72 @@
+<% treeData = [{
+    label: "Power Home Remodeling",
+    value: "Power Home Remodeling",
+    id: "100",
+    expanded: true,
+    children: [
+      {
+        label: "People",
+        value: "People",
+        id: "101",
+        expanded: true,
+        children: [
+          {
+            label: "Talent Acquisition",
+            value: "Talent Acquisition",
+            id: "102",
+          },
+          {
+            label: "Business Affairs",
+            value: "Business Affairs",
+            id: "103",
+            children: [
+              {
+                label: "Initiatives",
+                value: "Initiatives",
+                id: "104",
+              },
+              {
+                label: "Learning & Development",
+                value: "Learning & Development",
+                id: "105",
+              },
+            ],
+          },
+          {
+            label: "People Experience",
+            value: "People Experience",
+            id: "106",
+          },
+        ],
+      },
+      {
+        label: "Contact Center",
+        value: "Contact Center",
+        id: "107",
+        children: [
+          {
+            label: "Appointment Management",
+            value: "Appointment Management",
+            id: "108",
+          },
+          {
+            label: "Customer Service",
+            value: "Customer Service",
+            id: "109",
+          },
+          {
+            label: "Energy",
+            value: "Energy",
+            id: "110",
+          },
+        ],
+      },
+    ],
+}] %>
+
+<%= pb_rails("multi_level_select", props: {
+    id: "multi-level-select-default-rails",
+    name: "my_array",
+    tree_data: treeData,
+    pill_color: "neutral"
+}) %>

data/app/pb_kits/playbook/pb_multi_level_select/docs/_multi_level_select_color.jsx

@@ -0,0 +1,91 @@
+import React from "react";
+import MultiLevelSelect from "../_multi_level_select";
+
+const treeData = [
+  {
+    label: "Power Home Remodeling",
+    value: "Power Home Remodeling",
+    id: "powerhome1",
+    expanded: true,
+    children: [
+      {
+        label: "People",
+        value: "People",
+        id: "people1",
+        expanded: true,
+        children: [
+          {
+            label: "Talent Acquisition",
+            value: "Talent Acquisition",
+            id: "talent1",
+          },
+          {
+            label: "Business Affairs",
+            value: "Business Affairs",
+            id: "business1",
+            children: [
+              {
+                label: "Initiatives",
+                value: "Initiatives",
+                id: "initiative1",
+              },
+              {
+                label: "Learning & Development",
+                value: "Learning & Development",
+                id: "development1",
+              },
+            ],
+          },
+          {
+            label: "People Experience",
+            value: "People Experience",
+            id: "experience1",
+          },
+        ],
+      },
+      {
+        label: "Contact Center",
+        value: "Contact Center",
+        id: "contact1",
+        children: [
+          {
+            label: "Appointment Management",
+            value: "Appointment Management",
+            id: "appointment1",
+          },
+          {
+            label: "Customer Service",
+            value: "Customer Service",
+            id: "customer1",
+          },
+          {
+            label: "Energy",
+            value: "Energy",
+            id: "energy1",
+          },
+        ],
+      },
+    ],
+  },
+];
+
+const MultiLevelSelectColor = (props) => {
+  return (
+    <div>
+      <MultiLevelSelect
+          id='multiselect-color'
+          onSelect={(selectedNodes) =>
+            console.log(
+              "Selected Items",
+              selectedNodes
+            )
+          }
+          pillColor="neutral"
+          treeData={treeData}
+          {...props}
+      />
+    </div>
+  )
+};
+
+export default MultiLevelSelectColor;

data/app/pb_kits/playbook/pb_multi_level_select/docs/_multi_level_select_color_rails.md

@@ -0,0 +1 @@
+Change the form pill color by passing the optional `pill_color` prop. Product, Data, and Status colors are available options. Check them out <a href="https://playbook.powerapp.cloud/kits/form_pill#form-pill-colors" target="_blank">here</a> in the Form Pill colors example.

data/app/pb_kits/playbook/pb_multi_level_select/docs/_multi_level_select_color_react.md

@@ -0,0 +1 @@
+Change the form pill color by passing the optional `pillColor` prop. Product, Data, and Status colors are available options. Check them out <a href="https://playbook.powerapp.cloud/kits/form_pill/react#form-pill-colors" target="_blank">here</a> in the Form Pill colors example.

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

@@ -6,6 +6,7 @@ examples:
   - multi_level_select_return_all_selected: Return All Selected
   - multi_level_select_selected_ids: Selected Ids
   - multi_level_select_with_form: With Form
+  - multi_level_select_color: With Pills (Custom Color)
 
   react:
   - multi_level_select_default: Default
@@ -13,3 +14,4 @@ examples:
   - multi_level_select_single_children_only: Single Select w/ Hidden Radios
   - multi_level_select_return_all_selected: Return All Selected
   - multi_level_select_selected_ids_react: Selected Ids
+  - multi_level_select_color: With Pills (Custom Color)

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

@@ -3,3 +3,4 @@ export { default as MultiLevelSelectSingle } from './_multi_level_select_single.
 export { default as MultiLevelSelectSingleChildrenOnly } from './_multi_level_select_single_children_only.jsx'
 export { default as MultiLevelSelectReturnAllSelected } from './_multi_level_select_return_all_selected.jsx'
 export { default as MultiLevelSelectSelectedIdsReact } from "./_multi_level_select_selected_ids_react.jsx"
+export { default as MultiLevelSelectColor } from './_multi_level_select_color.jsx'

data/app/pb_kits/playbook/pb_multi_level_select/multi_level_select.rb

@@ -19,6 +19,9 @@ module Playbook
       prop :variant, type: Playbook::Props::Enum,
                      values: %w[multi single],
                      default: "multi"
+      prop :pill_color, type: Playbook::Props::Enum,
+                        values: %w[primary neutral success warning error info data_1 data_2 data_3 data_4 data_5 data_6 data_7 data_8 windows siding roofing doors gutters solar insulation accessories],
+                        default: "primary"
 
       def classname
         generate_classname("pb_multi_level_select")
@@ -34,6 +37,7 @@ module Playbook
           selectedIds: selected_ids,
           input_name: input_name,
           variant: variant,
+          pillColor: pill_color,
         }
       end
     end

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

@@ -3,8 +3,25 @@
 @import "../tokens/opacity";
 @import "../pb_avatar/avatar";
 
+@mixin avatar-size($size) {
+  height: $size;
+  width: $size;
+  .avatar_wrapper {
+    width: $size;
+    height: $size;
+  }
+}
+
+@mixin position($position) {
+  position: absolute;
+  @each $pos, $val in $position {
+    #{$pos}: $val;
+  }
+}
+
 [class^=pb_multiple_users_stacked_kit] {
   $container_size: map-get($avatar-sizes, "xs");
+  $bubble_container_size: map-get($avatar-sizes, "sm");
   $overlap: -15px;
   $border_size: 1px;
   $stacked_size: 18px;
@@ -17,34 +34,24 @@
   flex-shrink: 0;
   flex-grow: 0;
   [class^=pb_avatar_kit].pb_multiple_users_stacked_item {
-    height: $stacked_size;
-    width: $stacked_size;
-      &.dark {
-        .avatar_wrapper {
-          border: $pb_multiple_users_border_size solid $bg_dark;
-        }
-      }
+    @include avatar-size($stacked_size);
+    &.dark {
       .avatar_wrapper {
-        border: $border_size solid $white;
-        height: $stacked_size;
-        width: $stacked_size;
-        img {
-          z-index: 0;
-        }
+        border: $border_size solid $bg_dark;
       }
     }
-  &[class*=_single] .pb_multiple_users_stacked_item {
-    width: $container_size;
-    height: $container_size;
     .avatar_wrapper {
-      width: $container_size;
-      height: $container_size;
+      border: $border_size solid $white;
+      img {
+        z-index: 0;
+      }
     }
   }
+  &[class*=_single] .pb_multiple_users_stacked_item {
+    @include avatar-size($container_size);
+  }
   [class^=pb_avatar_kit].second_item, [class^=pb_badge_kit].second_item {
-    position: absolute;
-    bottom: 0;
-    right: 0;
+    @include position((bottom: 0, right: 0));
     z-index: 2;
     background: tint($primary, 90%);
     border-radius: $border_rad_mega;
@@ -63,4 +70,73 @@
     font-size: 0;
     color: transparent;
   }
+
+  &[class*=_bubble] {
+    @include avatar-size($bubble_container_size);
+    background-color: $bg_light;
+    border-radius: 50%;
+
+    &.dark {
+      background-color: $card_dark;
+    }
+    
+    [class^=pb_avatar_kit].pb_multiple_users_stacked_item {
+      &.dark {
+        .avatar_wrapper {
+          border: $border_size solid $border_dark;
+        }
+      }
+    }
+
+    [class^=pb_avatar_kit] {
+      &.first_item {
+        @include position((top: 4px, left: 3px));
+        @include avatar-size(20px);
+
+        &.triple_bubble {
+          @include position((top: 4px, left: 4px));
+          @include avatar-size(16px);
+        }
+
+        &.quadruple_bubble {
+          @include position((top: 5px, left: 3px));
+          @include avatar-size(16px);
+        }
+      }
+
+      &.second_item {
+        @include position((bottom: 5px, right: 4px));
+        @include avatar-size(12px);
+
+        &.triple_bubble {
+          @include position((top: 13px, right: 2px));
+        }
+
+        &.quadruple_bubble {
+          @include position((bottom: 9px, right: 4px));
+        }
+      }
+
+      &.third_item {
+        @include position((bottom: 3px, left: 11px));
+        @include avatar-size(10px);
+
+        &.quadruple_bubble {
+          @include position((bottom: 3px, left: 9px));
+        }
+      }
+
+      &.fourth_item {
+        @include position((top: 5px, right: 6px));
+        @include avatar-size(8px);
+      }
+    }
+  }
+
+  &[class*=_single_bubble] {
+    [class^=pb_avatar_kit].first_item {
+      @include position((top: 0, left: 0));
+      @include avatar-size($bubble_container_size);
+    }
+  }
 }

data/app/pb_kits/playbook/pb_multiple_users_stacked/_multiple_users_stacked.test.js

@@ -58,4 +58,170 @@ test('should pass aria prop', () => {
     render(<MultipleUsersStackedDefault />)
     const kit = screen.getByTestId(testId)
     expect(kit).toHaveAttribute('aria-label', testId)
+})
+
+const MultipleUsersStackedSingleBubble = () => {
+    return (
+        <MultipleUsersStacked
+            aria={{ label: testId }}
+            className={className}
+            data={{ testid: testId }}
+            users={[
+                {
+                    name: "user1",
+                    imageUrl: "imageUser1",
+                    imageAlt: "nameUser1",
+                }
+            ]}
+            variant="bubble"
+        />
+    )
+}
+
+test('should have a single bubble', () => {
+    render(<MultipleUsersStackedSingleBubble />)
+    const kit = screen.getByTestId(testId)
+    expect(kit).toHaveClass("pb_multiple_users_stacked_kit_single_bubble")
+
+    const firstItem = kit.querySelector('.first_item');
+    expect(firstItem).toBeInTheDocument();
+})
+
+const MultipleUsersStackedDoubleBubble = () => {
+    return (
+        <MultipleUsersStacked
+            aria={{ label: testId }}
+            className={className}
+            data={{ testid: testId }}
+            users={[
+                {
+                    name: "user1",
+                    imageUrl: "imageUser1",
+                    imageAlt: "nameUser1",
+                },
+                {
+                    name: "user2",
+                    imageUrl: "imageUser2",
+                    imageAlt: "nameUser2",
+                },
+            ]}
+            variant="bubble"
+        />
+    )
+}
+
+test('should have a double bubble', () => {
+    render(<MultipleUsersStackedDoubleBubble />)
+    const kit = screen.getByTestId(testId)
+    expect(kit).toHaveClass("pb_multiple_users_stacked_kit_bubble")
+
+    const firstItem = kit.querySelector('.first_item');
+    expect(firstItem).toBeInTheDocument();
+
+    const secondItem = kit.querySelector('.second_item');
+    expect(secondItem).toBeInTheDocument();
+})
+
+const MultipleUsersStackedTripleBubble = () => {
+    return (
+        <MultipleUsersStacked
+            aria={{ label: testId }}
+            className={className}
+            data={{ testid: testId }}
+            users={[
+                {
+                    name: "user1",
+                    imageUrl: "imageUser1",
+                    imageAlt: "nameUser1",
+                },
+                {
+                    name: "user2",
+                    imageUrl: "imageUser2",
+                    imageAlt: "nameUser2",
+                },
+                {
+                    name: "user3",
+                    imageUrl: "imageUser3",
+                    imageAlt: "nameUser3",
+                },
+            ]}
+            variant="bubble"
+        />
+    )
+}
+
+test('should have a triple bubble', () => {
+    render(<MultipleUsersStackedTripleBubble />)
+    const kit = screen.getByTestId(testId)
+    expect(kit).toHaveClass("pb_multiple_users_stacked_kit_bubble")
+
+    const firstItem = kit.querySelector('.first_item');
+    expect(firstItem).toBeInTheDocument();
+    expect(firstItem).toHaveClass("triple_bubble")
+
+    const secondItem = kit.querySelector('.second_item');
+    expect(secondItem).toBeInTheDocument();
+    expect(secondItem).toHaveClass("triple_bubble")
+
+    const thirdItem = kit.querySelector('.third_item');
+    expect(thirdItem).toBeInTheDocument();
+})
+
+const MultipleUsersStackedQuadrupleBubble = () => {
+    return (
+        <MultipleUsersStacked
+            aria={{ label: testId }}
+            className={className}
+            data={{ testid: testId }}
+            users={[
+                {
+                    name: "user1",
+                    imageUrl: "imageUser1",
+                    imageAlt: "nameUser1",
+                },
+                {
+                    name: "user2",
+                    imageUrl: "imageUser2",
+                    imageAlt: "nameUser2",
+                },
+                {
+                    name: "user3",
+                    imageUrl: "imageUser3",
+                    imageAlt: "nameUser3",
+                },
+                {
+                    name: "user4",
+                    imageUrl: "imageUser4",
+                    imageAlt: "nameUser4",
+                },
+                {
+                    name: "user5",
+                    imageUrl: "imageUser5",
+                    imageAlt: "nameUser5",
+                },
+            ]}
+            variant="bubble"
+        />
+    )
+}
+
+test('should have a quadruple bubble', () => {
+    render(<MultipleUsersStackedQuadrupleBubble />)
+    const kit = screen.getByTestId(testId)
+    expect(kit).toHaveClass("pb_multiple_users_stacked_kit_bubble")
+
+    const firstItem = kit.querySelector('.first_item');
+    expect(firstItem).toBeInTheDocument();
+    expect(firstItem).toHaveClass("quadruple_bubble")
+
+    const secondItem = kit.querySelector('.second_item');
+    expect(secondItem).toBeInTheDocument();
+    expect(secondItem).toHaveClass("quadruple_bubble")
+
+    const thirdItem = kit.querySelector('.third_item');
+    expect(thirdItem).toBeInTheDocument();
+    expect(thirdItem).toHaveClass("quadruple_bubble")
+
+    const fourthItem = kit.querySelector('.fourth_item');
+    expect(fourthItem).toBeInTheDocument();
 })

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

@@ -15,6 +15,7 @@ type MultipleUsersStackedProps = {
   htmlOptions?: {[key: string]: string | number | boolean | (() => void)},
   id?: string,
   users: Array<{ [key: string]: string }>,
+  variant: "default" | "bubble",
 }
 
 const MultipleUsersStacked = (props: MultipleUsersStackedProps) => {
@@ -26,10 +27,14 @@ const MultipleUsersStacked = (props: MultipleUsersStackedProps) => {
     htmlOptions = {},
     id,
     users,
+    variant = "default",
   } = props
 
   const moreThanTwo = users.length > 2
   const onlyOne = users.length == 1
+  const isBubble = variant === "bubble"
+  const tripleBubble = isBubble && users.length === 3
+  const quadrupleBubble = isBubble && users.length > 3
   const displayCount = () => {
     return moreThanTwo ? 1 : users.length
   }
@@ -38,29 +43,61 @@ const MultipleUsersStacked = (props: MultipleUsersStackedProps) => {
   const htmlProps = buildHtmlProps(htmlOptions)
   const classes = classnames(buildCss(
     'pb_multiple_users_stacked_kit',
-    { single: onlyOne }), globalProps(props), className)
+    { single: onlyOne, bubble: isBubble }), globalProps(props), className)
 
   const firstUser = () => {
     return users.slice(0, 1).map((userObject, index) => {
       return (
         <Avatar
             {...userObject}
-            className="pb_multiple_users_stacked_item"
+            className={`pb_multiple_users_stacked_item first_item${tripleBubble ? " triple_bubble" : ""}${quadrupleBubble ? " quadruple_bubble" : ""}`}
             dark={dark}
             key={index}
-            size="xs"
+            size={isBubble ? "sm" : "xs"}
         />
       )
     })
   }
 
   const secondUser = () => {
-    if (moreThanTwo === false) {
+    if (!moreThanTwo || (isBubble && users.length > 1)) {
       return users.slice(1, 2).map((userObject, index) => {
         return (
           <Avatar
               {...userObject}
-              className="pb_multiple_users_stacked_item second_item"
+              className={`pb_multiple_users_stacked_item second_item${tripleBubble ? " triple_bubble" : ""}${quadrupleBubble ? " quadruple_bubble" : ""}`}
+              dark={dark}
+              key={index}
+              size="xs"
+          />
+        )
+      })
+    }
+  }
+
+  const thirdUser = () => {
+    if (isBubble && users.length > 2) {
+      return users.slice(2, 3).map((userObject, index) => {
+        return (
+          <Avatar
+              {...userObject}
+              className={`pb_multiple_users_stacked_item third_item${quadrupleBubble ? " quadruple_bubble" : ""}`}
+              dark={dark}
+              key={index}
+              size="xs"
+          />
+        )
+      })
+    }
+  }
+
+  const fourthUser = () => {
+    if (isBubble && users.length > 3) {
+      return users.slice(3, 4).map((userObject, index) => {
+        return (
+          <Avatar
+              {...userObject}
+              className="pb_multiple_users_stacked_item fourth_item"
               dark={dark}
               key={index}
               size="xs"
@@ -71,7 +108,7 @@ const MultipleUsersStacked = (props: MultipleUsersStackedProps) => {
   }
 
   const plusUsers = () => {
-    if (moreThanTwo === true) {
+    if (moreThanTwo && !isBubble) {
       return (
         <Badge
             className="pb_multiple_users_stacked_item second_item"
@@ -94,6 +131,8 @@ const MultipleUsersStacked = (props: MultipleUsersStackedProps) => {
     >
       {firstUser()}
       {secondUser()}
+      {thirdUser()}
+      {fourthUser()}
       {plusUsers()}
     </div>
   )