playbook_ui 14.3.2.pre.alpha.PBNTR515typeaheadmarginbottomredux3785 → 14.3.2.pre.alpha.pbntr523enablekitsforradiofix3809

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>
   )

data/app/pb_kits/playbook/pb_multiple_users_stacked/docs/_multiple_users_stacked_bubble.html.erb

@@ -0,0 +1,73 @@
+<%= pb_rails("multiple_users_stacked", props: {
+  variant: "bubble",
+  users: [
+    {
+      name: "Patrick Welch",
+      image_url: "https://randomuser.me/api/portraits/men/9.jpg",
+    }
+  ]
+}) %>
+
+<br/><br/>
+
+<%= pb_rails("multiple_users_stacked", props: {
+  variant: "bubble",
+  users: [
+    {
+      name: "Patrick Welch",
+      image_url: "https://randomuser.me/api/portraits/men/9.jpg",
+    },
+    {
+      name: "Lucille Sanchez",
+      image_url: "https://randomuser.me/api/portraits/women/6.jpg",
+    }
+  ]
+}) %>
+
+<br/><br/>
+
+<%= pb_rails("multiple_users_stacked", props: {
+  variant: "bubble",
+  users: [
+    {
+      name: "Patrick Welch",
+      image_url: "https://randomuser.me/api/portraits/men/9.jpg",
+    },
+    {
+      name: "Lucille Sanchez",
+      image_url: "https://randomuser.me/api/portraits/women/6.jpg",
+    },
+    {
+      name: "Beverly Reyes",
+      image_url: "https://randomuser.me/api/portraits/women/74.jpg",
+    },
+  ]
+}) %>
+
+<br/><br/>
+
+<%= pb_rails("multiple_users_stacked", props: {
+  variant: "bubble",
+  users: [
+    {
+      name: "Patrick Welch",
+      image_url: "https://randomuser.me/api/portraits/men/9.jpg",
+    },
+    {
+      name: "Lucille Sanchez",
+      image_url: "https://randomuser.me/api/portraits/women/6.jpg",
+    },
+    {
+      name: "Beverly Reyes",
+      image_url: "https://randomuser.me/api/portraits/women/74.jpg",
+    },
+    {
+      name: "Keith Craig",
+      image_url: "https://randomuser.me/api/portraits/men/40.jpg",
+    },
+    {
+      name: "Alicia Cooper",
+      image_url: "https://randomuser.me/api/portraits/women/46.jpg",
+    }
+  ]
+}) %>

data/app/pb_kits/playbook/pb_multiple_users_stacked/docs/_multiple_users_stacked_bubble.jsx

@@ -0,0 +1,86 @@
+import React from 'react'
+
+import MultipleUsersStacked from '../_multiple_users_stacked'
+
+const MultipleUsersStackedBubble = (props) => {
+  return (
+    <div>
+      <MultipleUsersStacked
+          users={[
+        {
+          name: 'Patrick Welch',
+          imageUrl: 'https://randomuser.me/api/portraits/men/9.jpg',
+        },
+      ]}
+          variant="bubble"
+          {...props}
+      />
+      <br />
+      <br />
+      <MultipleUsersStacked
+          users={[
+        {
+          name: 'Patrick Welch',
+          imageUrl: 'https://randomuser.me/api/portraits/men/9.jpg',
+        },
+        {
+          name: 'Lucille Sanchez',
+          imageUrl: 'https://randomuser.me/api/portraits/women/6.jpg',
+        },
+      ]}
+          variant="bubble"
+          {...props}
+      />
+      <br />
+      <br />
+      <MultipleUsersStacked
+          users={[
+        {
+          name: 'Patrick Welch',
+          imageUrl: 'https://randomuser.me/api/portraits/men/9.jpg',
+        },
+        {
+          name: 'Lucille Sanchez',
+          imageUrl: 'https://randomuser.me/api/portraits/women/6.jpg',
+        },
+        {
+          name: 'Beverly Reyes',
+          imageUrl: 'https://randomuser.me/api/portraits/women/74.jpg',
+        },
+      ]}
+          variant="bubble"
+          {...props}
+      />
+      <br />
+      <br />
+      <MultipleUsersStacked
+          users={[
+        {
+          name: 'Patrick Welch',
+          imageUrl: 'https://randomuser.me/api/portraits/men/9.jpg',
+        },
+        {
+          name: 'Lucille Sanchez',
+          imageUrl: 'https://randomuser.me/api/portraits/women/6.jpg',
+        },
+        {
+          name: 'Beverly Reyes',
+          imageUrl: 'https://randomuser.me/api/portraits/women/74.jpg',
+        },
+        {
+          name: 'Keith Craig',
+          imageUrl: 'https://randomuser.me/api/portraits/men/40.jpg',
+        },
+        {
+          name: 'Alicia Cooper',
+          imageUrl: 'https://randomuser.me/api/portraits/women/46.jpg',
+        },
+      ]}
+          variant="bubble"
+          {...props}
+      />
+    </div>
+  )
+}
+
+export default MultipleUsersStackedBubble

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

@@ -2,10 +2,12 @@ examples:
 
   rails:
   - multiple_users_stacked_default: Default
+  - multiple_users_stacked_bubble: Bubble
 
 
   react:
   - multiple_users_stacked_default: Default
+  - multiple_users_stacked_bubble: Bubble
 
   swift: 
   - multiple_users_stacked_default_swift: Default

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

@@ -1 +1,2 @@
 export { default as MultipleUsersStackedDefault } from './_multiple_users_stacked_default.jsx'
+export { default as MultipleUsersStackedBubble } from './_multiple_users_stacked_bubble.jsx'

data/app/pb_kits/playbook/pb_multiple_users_stacked/multiple_users_stacked.html.erb

@@ -1,14 +1,18 @@
 <%= pb_content_tag do %>
-  <%= pb_rails("avatar", props: object.users[0].merge({size: "xs", classname: "pb_multiple_users_stacked_item", dark: object.dark}) ) %>
+  <%= pb_rails("avatar", props: object.users[0].merge({size: object.bubble ? "sm" : "xs", classname: "pb_multiple_users_stacked_item first_item#{object.triple_bubble ? " triple_bubble" : ""}#{object.quadruple_bubble ? " quadruple_bubble" : ""}", dark: object.dark}) ) %>
 
   <% unless object.only_one %>
-    <% if object.more_than_two %>
+    <% if object.more_than_two && !object.bubble %>
       <%= pb_rails("badge", props: {
         dark: object.dark,
         text: "+#{object.users.count - object.display_count}",
         variant: "primary",
         rounded: true,
         classname: "pb_multiple_users_stacked_item second_item" }) %>
+    <% elsif object.bubble %>
+      <% object.users.slice(1,3).each_with_index do |item, idx| %>
+        <%= pb_rails("avatar", props: item.merge({size: "xs", classname: "pb_multiple_users_stacked_item #{idx == 0 ? "second_item#{object.triple_bubble ? " triple_bubble" : ""}#{object.quadruple_bubble ? " quadruple_bubble" : ""}" : idx == 1 ? "third_item#{object.quadruple_bubble ? " quadruple_bubble" : ""}" : "fourth_item"}", dark: object.dark}) ) %>
+      <% end %>
     <% else %>
       <%= pb_rails("avatar", props: object.users[1].merge({size: "xs", classname: "pb_multiple_users_stacked_item second_item", dark: object.dark}) ) %>
     <% end %>

data/app/pb_kits/playbook/pb_multiple_users_stacked/multiple_users_stacked.rb

@@ -5,6 +5,10 @@ module Playbook
     class MultipleUsersStacked < Playbook::KitBase
       prop :users, type: Playbook::Props::HashArray, required: true
 
+      prop :variant, type: Playbook::Props::Enum,
+                     values: %w[default bubble],
+                     default: "default"
+
       def more_than_two
         users.count > 2
       end
@@ -17,8 +21,20 @@ module Playbook
         more_than_two ? 1 : users.count
       end
 
+      def bubble
+        variant == "bubble"
+      end
+
+      def triple_bubble
+        bubble && users.count === 3
+      end
+
+      def quadruple_bubble
+        bubble && users.count > 3
+      end
+
       def classname
-        generate_classname("pb_multiple_users_stacked_kit", single_class)
+        generate_classname("pb_multiple_users_stacked_kit", single_class, bubble_class)
       end
 
     private
@@ -26,6 +42,10 @@ module Playbook
       def single_class
         only_one ? "single" : nil
       end
+
+      def bubble_class
+        bubble ? "bubble" : nil
+      end
     end
   end
 end

data/app/pb_kits/playbook/pb_radio/_radio.tsx

@@ -1,28 +1,30 @@
-/*eslint-disable react/no-multi-comp, flowtype/space-before-type-colon */
+/*eslint-disable react/no-multi-comp */
 
-import React, { forwardRef } from 'react'
+import React, { forwardRef, useRef } from 'react'
 import Body from '../pb_body/_body'
+import Flex from '../pb_flex/_flex'
 import classnames from 'classnames'
 import { buildAriaProps, buildCss, buildDataProps, buildHtmlProps } from '../utilities/props'
 import { globalProps, GlobalProps } from '../utilities/globalProps'
 
 type RadioProps = {
-  aria?: {[key: string]: string},
+  aria?: { [key: string]: string },
   alignment?: string,
   checked?: boolean,
   children?: React.ReactChild[] | React.ReactChild,
+  customChildren?: boolean,
   className?: string,
   dark?: boolean,
-  data?: {[key: string]: string},
+  data?: { [key: string]: string },
   disabled?: boolean,
   error?: boolean,
-  htmlOptions?: {[key: string]: string | number | boolean | (() => void)},
+  htmlOptions?: { [key: string]: string | number | boolean | (() => void) },
   id?: string,
   label: string,
   name?: string,
   value?: string,
   text?: string,
-  onChange: (event: React.FormEvent<HTMLInputElement> | null)=>void,
+  onChange: (event: React.FormEvent<HTMLInputElement> | null) => void,
 } & GlobalProps
 
 const Radio = ({
@@ -30,10 +32,11 @@ const Radio = ({
   alignment,
   children,
   className,
+  customChildren,
   dark = false,
-  data = {},
   disabled = false,
   error = false,
+  data = {},
   htmlOptions = {},
   id,
   label,
@@ -43,17 +46,28 @@ const Radio = ({
   onChange = () => { void 0 },
   ...props
 }: RadioProps, ref: any) => {
-  const ariaProps = buildAriaProps(aria)
-  const dataProps = buildDataProps(data)
-  const htmlProps = buildHtmlProps(htmlOptions)
+  const radioRef = useRef(null);
+
+  const ariaProps = buildAriaProps(aria);
+  const dataProps = buildDataProps(data);
+  const htmlProps = buildHtmlProps(htmlOptions);
   const classes = classnames(
-    buildCss('pb_radio_kit', alignment ),
-    dark ? 'dark': null, error ? 'error': null,
+    buildCss('pb_radio_kit', alignment),
+    dark ? 'dark' : null,
+    error ? 'error' : null,
     globalProps(props),
-    className)
+    className
+  );
+
+  const classesCustom = classnames(
+    dark ? 'dark' : null,
+    error ? 'error' : null,
+    globalProps(props),
+    className
+  );
 
   const displayRadio = (props: RadioProps & any) => {
-    if (children)
+    if (children && customChildren == false)
       return (children)
     else
     return (
@@ -70,24 +84,69 @@ const Radio = ({
     />
   )}
 
+  const handleContainerClick = (event: React.MouseEvent<HTMLDivElement, MouseEvent> | undefined) => {
+    if (event) {
+      const target = event.target as HTMLElement;
+      if (
+        target.id === 'pb-radio-children-wrapper' ||
+        target.closest('#pb-radio-children-wrapper')
+      ) {
+        radioRef.current?.click();
+      }
+    }
+  };
+
   return (
-    <label
-        {...ariaProps}
-        {...dataProps}
-        {...htmlProps}
-        className={classes}
-        htmlFor={id}
-    >
-    <>{displayRadio(props)}</>
-    <span className="pb_radio_button" />
-    <Body
-        dark={dark}
-        status={error ? 'negative' : null}
-        text={label}
-        variant={null}
-    />
-    </label>
-  )
-}
+    customChildren ? (
+      <Flex 
+          {...ariaProps}
+          {...dataProps}
+          {...htmlProps}
+          align='center'
+          className={classesCustom}
+          cursor='pointer'
+          htmlFor={id}
+          htmlOptions={{
+            onClick: ((event: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
+              handleContainerClick(event);
+            }) as unknown as () => void
+          }}
+          id="radio-container"
+      >
+        <label className={buildCss('pb_radio_kit', alignment)}>
+        <input
+            disabled={disabled}
+            id={id}
+            name={name}
+            onChange={onChange}
+            ref={radioRef}
+            type="radio"
+            value={value}
+            {...props}
+        />
+          <span className="pb_radio_button" />
+        </label>
+        <div id="pb-radio-children-wrapper"> {children} </div>
+      </Flex>
+    ) : (
+        <label
+            {...ariaProps}
+            {...dataProps}
+            {...htmlProps}
+            className={classes}
+            htmlFor={id}
+        >
+        <>{displayRadio(props)}</>
+        <span className="pb_radio_button" />
+        <Body
+            dark={dark}
+            status={error ? 'negative' : null}
+            text={label}
+            variant={null}
+        />
+      </label>
+    )
+  );
+};
 
-export default forwardRef(Radio)
+export default forwardRef(Radio);