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

data/app/pb_kits/playbook/pb_radio/docs/_radio_custom_children.html.erb

@@ -0,0 +1,48 @@
+<%
+  options = [
+    { label: "Orange", value: "Orange" },
+    { label: "Red", value: "Red" },
+    { label: "Green", value: "Green" },
+    { label: "Blue", value: "Blue" },
+  ]
+%>
+
+<%= pb_rails("radio", props: {
+  custom_children: true,
+  label: "Select",
+  name: "Group1",
+  value: "Select",
+}) do %>
+  <%= pb_rails("select", props: {
+    min_width: "xs",
+    options: options,
+  }) %>
+<% end %>
+
+<%= pb_rails("radio", props: {
+  custom_children: true,
+  label: "Typeahead",
+  name: "Group1",
+  value: "Typeahead",
+}) do %>
+  <%= pb_rails("typeahead", props: {
+      id: "typeahead-radio",
+      is_multi: false,
+      min_width: "xs",
+      options: options,
+      placeholder: "Select...",
+    })
+  %>
+<% end %>
+
+<%= pb_rails("radio", props: {
+  custom_children: true,
+  label: "Typography",
+  name: "Group1",
+  value: "Typography",
+}) do %>
+  <%= pb_rails("title", props: {
+      text: "Custom Typography",
+    })
+  %>
+<% end %>

data/app/pb_kits/playbook/pb_radio/docs/_radio_custom_children.jsx

@@ -0,0 +1,59 @@
+import React from 'react'
+import Radio from '../_radio'
+import Select from '../../pb_select/_select'
+import Typeahead from '../../pb_typeahead/_typeahead'
+import Title from '../../pb_title/_title'
+
+const RadioChildren = (props) => {
+
+
+  const options = [
+    { label: 'Orange', value: 'Orange' },
+    { label: 'Red', value: 'Red' },
+    { label: 'Green', value: 'Green' },
+    { label: 'Blue', value: 'Blue' },
+  ]
+
+  return (
+    <div>
+      <Radio
+          customChildren
+          label="Select"
+          name="Group1"
+          tabIndex={0}
+          value="Select"
+          {...props}
+      >
+        <Select 
+            minWidth="xs"
+            options={options}
+        />
+      </Radio>
+      <Radio
+          customChildren
+          label="Typeahead"
+          name="Group1"
+          tabIndex={0}
+          value="Typeahead"
+          {...props}
+      >
+        <Typeahead 
+            minWidth="xs"
+            options={options}
+        />
+      </Radio>
+      <br />
+      <Radio
+          customChildren
+          defaultChecked={false}
+          label="Typography"
+          name="Group1"
+          value="Typography"
+          {...props}
+      >
+        <Title text="Custom Typography" />
+      </Radio>
+    </div>
+  )
+}
+export default RadioChildren

data/app/pb_kits/playbook/pb_radio/docs/_radio_custom_children.md

@@ -0,0 +1 @@
+Use the `custom_children` prop to enable the use of kits instead of text labels.

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

@@ -7,6 +7,7 @@ examples:
   - radio_options: With Options
   - radio_alignment: Alignment
   - radio_disabled: Disabled
+  - radio_custom_children: Custom Children
 
   react:
   - radio_default: Default
@@ -14,6 +15,7 @@ examples:
   - radio_error: With Error
   - radio_alignment: Alignment
   - radio_disabled: Disabled
+  - radio_custom_children: Custom Children
 
   swift:
   - radio_default_swift: Default

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

@@ -3,3 +3,4 @@ export { default as RadioCustom } from './_radio_custom.jsx'
 export { default as RadioError } from './_radio_error.jsx'
 export { default as RadioAlignment } from './_radio_alignment.jsx'
 export { default as RadioDisabled } from './_radio_disabled.jsx'
+export { default as RadioCustomChildren } from './_radio_custom_children.jsx'

data/app/pb_kits/playbook/pb_radio/index.js

@@ -0,0 +1,17 @@
+import PbEnhancedElement from "../pb_enhanced_element"
+
+const RADIO_SELECTOR = "[data-pb-radio-children]"
+const RADIO_WRAPPER_SELECTOR = "[data-pb-radio-children-wrapper]"
+
+export default class PbRadio extends PbEnhancedElement {
+  static get selector() {
+    return RADIO_SELECTOR
+  }
+
+  connect() {
+    const radioWrapperElement = this.element.parentElement.querySelector(RADIO_WRAPPER_SELECTOR)
+    radioWrapperElement.addEventListener("click", () => {
+      this.element.querySelector("input[type='radio']").click()
+    })
+  }
+}

data/app/pb_kits/playbook/pb_radio/radio.html.erb

@@ -1,18 +1,40 @@
-<%= content_tag(:label,
+<% if object.custom_children %>
+  <%= pb_rails("flex", props: {
     aria: object.aria,
-    checked: object.checked,
+    align: "center",
     class: object.classname,
+    cursor: "pointer",
     data: object.data,
-    id: object.id,
-    value: object.value,
-    **combined_html_options) do %>
-
-    <% if content.present? %>
-      <%= content %>
-    <% else %>
-      <%= radio_button_tag object.name, object.value, object.selected, object.input_options %>
+    **combined_html_options
+  }) do %>
+    <%= content_tag(:label,
+      'data-pb-radio-children': 'true',
+      checked: object.checked,
+      class: object.classname,
+      id: object.id,
+      value: object.value) do %>
+      <%= input %>
+      <span class="pb_radio_button"></span>
     <% end %>
+    <div data-pb-radio-children-wrapper="true"> <%= content %> </div>
+  <% end %>
+<% else %>
+  <%= content_tag(:label,
+      aria: object.aria,
+      checked: object.checked,
+      class: object.classname,
+      data: object.data,
+      id: object.id,
+      value: object.value,
+      **combined_html_options) do %>
+
+      <% if content.present? %>
+        <%= content %>
+      <% else %>
+        <%= radio_button_tag object.name, object.value, object.selected, object.input_options %>
+      <% end %>
 
-    <span class="pb_radio_button"></span>
-    <%= pb_rails("body", props: { status: object.body_status, text: object.text, dark: object.dark }) %>
-<% end %>
+      <span class="pb_radio_button"></span>
+      <%= pb_rails("body", props: { status: object.body_status, text: object.text, dark: object.dark }) %>
+  <% end %>
+<% end %>

data/app/pb_kits/playbook/pb_radio/radio.rb

@@ -20,6 +20,8 @@ module Playbook
                   default: "Radio Text"
       prop :value, type: Playbook::Props::String,
                    default: "radio_text"
+      prop :custom_children, type: Playbook::Props::Boolean,
+                             default: false
 
       def classname
         generate_classname("pb_radio_kit") + error_class + alignment_class
@@ -34,7 +36,7 @@ module Playbook
       end
 
       def input
-        radio_button_tag(name, value, checked, input_options.merge(disabled: disabled))
+        radio_button_tag(name, value, checked, input_options.merge(disabled: disabled || input_options[:disabled]))
       end
 
     private

data/app/pb_kits/playbook/pb_text_input/_text_input.scss

@@ -45,6 +45,7 @@
       }
     }
     .text_input_wrapper {
+      margin-bottom: 1rem;
       input::placeholder,
       .text_input .placeholder {
         @include pb_body_light_dark;

data/app/pb_kits/playbook/pb_typeahead/_typeahead.scss

@@ -68,6 +68,7 @@
     opacity: 0;
   }
   [class^=pb_list_kit] {
+    margin-top: -$space-sm;
     li {
       transition: background-color .25s ease-in-out;
     }

data/app/pb_kits/playbook/pb_typeahead/_typeahead.test.jsx

@@ -109,16 +109,18 @@ test('should pass className prop', () => {
   expect(kit).toHaveClass(className)
 })
 
-test('typeahead textinput has mb_sm class by default', () => {
+test('typeahead with colored pills', () => {
   render(
     <Typeahead
-        data={{ testid: 'default-mb-test' }}
-        options={options} 
+        data={{ testid: 'pills-color-test' }}
+        defaultValue={[options[0]]}
+        isMulti
+        options={options}
+        pillColor="neutral"
     />
   )
 
-  const kit = screen.getByTestId('default-mb-test')
-  expect(kit).toHaveClass("pb_typeahead_kit mb_sm")
-  const textInput = kit.querySelector(".pb_text_input_kit")
-  expect(textInput).toHaveClass("mb_none")
+  const kit = screen.getByTestId('pills-color-test')
+  const pill = kit.querySelector(".pb_form_pill_kit_neutral")
+  expect(pill).toBeInTheDocument()
 })

data/app/pb_kits/playbook/pb_typeahead/_typeahead.tsx

@@ -45,13 +45,14 @@ type TypeaheadProps = {
   getOptionLabel?: string | (() => any),
   getOptionValue?: string | (() => any),
   name?: string,
-  marginBottom?: "none" | "xxs" | "xs" | "sm" | "md" | "lg" | "xl",
+  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
 
 export type SelectValueType = {
   label: string,
   value: string,
   imageUrl?: string,
+  pillColor?: string,
 }
 
 type TagOnChangeValues = {
@@ -77,7 +78,7 @@ const Typeahead = ({
   htmlOptions = {},
   id,
   loadOptions = noop,
-  marginBottom = "sm",
+  pillColor,
   ...props
 }: TypeaheadProps) => {
   const selectProps = {
@@ -107,6 +108,7 @@ const Typeahead = ({
     onCreateOption: null as null,
     plusIcon: false,
     onMultiValueClick: (_option: SelectValueType): any => undefined,
+    pillColor: pillColor,
     ...props,
   }
 
@@ -136,7 +138,6 @@ const Typeahead = ({
   const htmlProps = buildHtmlProps(htmlOptions)
   const classes = classnames(
     'pb_typeahead_kit react-select',
-    `mb_${marginBottom}`,
     globalProps(props),
     className
   )

data/app/pb_kits/playbook/pb_typeahead/components/Control.tsx

@@ -11,15 +11,14 @@ type Props = {
 const TypeaheadControl = (props: Props) => (
   <div className="pb_typeahead_wrapper">
     <TextInput
-        dark={props.selectProps.dark}
-        error={props.selectProps.error}
-        label={props.selectProps.label}
-        marginBottom="none"
+      dark={props.selectProps.dark}
+      error={props.selectProps.error}
+      label={props.selectProps.label}
     >
       <Flex>
         <components.Control
-            className="text_input"
-            {...props}
+          className="text_input"
+          {...props}
         />
       </Flex>
     </TextInput>

data/app/pb_kits/playbook/pb_typeahead/components/MultiValue.tsx

@@ -8,6 +8,7 @@ import { SelectValueType } from '../_typeahead'
 type Props = {
   data: SelectValueType,
   multiValueTemplate: any,
+  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",
   removeProps: any,
   selectProps: any,
 }
@@ -15,48 +16,55 @@ type Props = {
 const MultiValue = (props: Props) => {
   const { removeProps } = props
   const { imageUrl, label } = props.data
-  const { multiKit } = props.selectProps
+  const { dark, multiKit, pillColor } = props.selectProps
 
   const formPillProps = {
     marginRight: 'xs',
     name: label,
     avatarUrl: '',
+    dark,
   }
 
   if (typeof imageUrl === 'string') formPillProps.avatarUrl = imageUrl
 
   return (
     <components.MultiValueContainer
-      className="text_input_multivalue_container"
-      {...props}
+        className="text_input_multivalue_container"
+        {...props}
     >
       {multiKit === 'badge' &&
         <Badge
-          closeProps={removeProps}
-          removeIcon
-          text={label}
-          variant="primary"
+            closeProps={removeProps}
+            removeIcon
+            text={label}
+            variant="primary"
         />
       }
 
       {multiKit !== 'badge' && imageUrl &&
         <FormPill
-          avatarUrl={imageUrl}
-          closeProps={removeProps}
-          marginRight="xs"
-          name={label}
-          size={multiKit === 'smallPill' ? 'small' : ''}
-          text=''
+            avatarUrl={imageUrl}
+            closeProps={removeProps}
+            color={pillColor}
+            dark={dark}
+            marginRight="xs"
+            name={label}
+            size={multiKit === 'smallPill' ? 'small' : ''}
+            text=''
+            {...props}
         />
       }
 
       {multiKit !== 'badge' && !imageUrl &&
         <FormPill
-          closeProps={removeProps}
-          marginRight="xs"
-          name=''
-          size={multiKit === 'smallPill' ? 'small' : ''}
-          text={label}
+            closeProps={removeProps}
+            color={pillColor}
+            dark={dark}
+            marginRight="xs"
+            name=''
+            size={multiKit === 'smallPill' ? 'small' : ''}
+            text={label}
+            {...props}
         />
       }
     </components.MultiValueContainer>

data/app/pb_kits/playbook/pb_typeahead/docs/_typeahead_with_pills_color.html.erb

@@ -0,0 +1,31 @@
+<%
+  options = [
+    { label: 'Windows', value: '#FFA500' },
+    { label: 'Siding', value: '#FF0000' },
+    { label: 'Doors', value: '#00FF00' },
+    { label: 'Roofs', value: '#0000FF' },
+  ]
+%>
+
+<%= pb_rails("typeahead", props: { id: "typeahead-pills-example1", pill_color: "neutral", default_options: [options.first], options: options, label: "Colors", name: :foo, pills: true }) %>
+
+<%= pb_rails("button", props: {id: "clear-pills", text: "Clear All Options", variant: "secondary"}) %>
+
+<!-- This section is an example of the available JavaScript event hooks -->
+<%= javascript_tag defer: "defer" do %>
+  document.addEventListener("pb-typeahead-kit-typeahead-pills-example1-result-option-select", function(event) {
+    console.log('Option selected')
+    console.dir(event.detail)
+  })
+  document.addEventListener("pb-typeahead-kit-typeahead-pills-example1-result-option-remove", function(event) {
+    console.log('Option removed')
+    console.dir(event.detail)
+  })
+  document.addEventListener("pb-typeahead-kit-typeahead-pills-example1-result-clear", function() {
+    console.log('All options cleared')
+  })
+
+  document.querySelector('#clear-pills').addEventListener('click', function() {
+    document.dispatchEvent(new CustomEvent('pb-typeahead-kit-typeahead-pills-example1:clear'))
+  })
+<% end %>

data/app/pb_kits/playbook/pb_typeahead/docs/_typeahead_with_pills_color.jsx

@@ -0,0 +1,26 @@
+import React from 'react'
+import { Typeahead } from 'playbook-ui'
+
+const options = [
+  { label: 'Windows', value: '#FFA500' },
+  { label: 'Siding', value: '#FF0000' },
+  { label: 'Doors', value: '#00FF00' },
+  { label: 'Roofs', value: '#0000FF' },
+]
+
+const TypeaheadWithPills = (props) => {
+  return (
+    <>
+      <Typeahead
+          isMulti
+          label="Colors"
+          options={options}
+          pillColor="neutral"
+          placeholder=""
+          {...props}
+      />
+    </>
+  )
+}
+
+export default TypeaheadWithPills

data/app/pb_kits/playbook/pb_typeahead/docs/_typeahead_with_pills_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_typeahead/docs/_typeahead_with_pills_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_typeahead/docs/example.yml

@@ -9,7 +9,7 @@ examples:
     - typeahead_inline: Inline
     - typeahead_multi_kit: Multi Kit Options
     - typeahead_error_state: Error State
-    - typeahead_margin_bottom: Margin Bottom
+    - typeahead_with_pills_color: With Pills (Custom Color)
 
   react:
     - typeahead_default: Default
@@ -24,4 +24,4 @@ examples:
     - typeahead_async_createable: Createable (+ Async Data)
     - typeahead_error_state: Error State
     - typeahead_custom_menu_list: Custom MenuList
-    - typeahead_margin_bottom: Margin Bottom
+    - typeahead_with_pills_color: With Pills (Custom Color)

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

@@ -10,4 +10,4 @@ export { default as TypeaheadCreateable } from './_typeahead_createable.jsx'
 export { default as TypeaheadAsyncCreateable } from './_typeahead_async_createable.jsx'
 export { default as TypeaheadErrorState } from './_typeahead_error_state.jsx'
 export { default as TypeaheadCustomMenuList } from './_typeahead_custom_menu_list.jsx'
-export { default as TypeaheadMarginBottom } from './_typeahead_margin_bottom.jsx'
+export { default as TypeaheadWithPillsColor } from './_typeahead_with_pills_color.jsx'

data/app/pb_kits/playbook/pb_typeahead/typeahead.html.erb

@@ -20,8 +20,7 @@
         label: object.label,
         name: object.name,
         value: object.value,
-        placeholder: object.placeholder,
-        margin_bottom: "none",
+        placeholder: object.placeholder
       }) %>
       <%= pb_rails("list", props: { ordered: false, borderless: false, xpadding: true, role: "status", aria: { live: "polite" }, data: { pb_typeahead_kit_results: true } }) do %>
       <% end %>

data/app/pb_kits/playbook/pb_typeahead/typeahead.rb

@@ -34,13 +34,12 @@ module Playbook
       prop :search_term_minimum_length, default: 3
       prop :search_debounce_timeout, default: 250
       prop :value
-      prop :margin_bottom, type: Playbook::Props::Enum,
-                           values: %w[none xxs xs sm md lg xl],
-                           default: "sm"
+      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
-        default_margin_bottom = margin_bottom.present? ? "" : " mb_sm"
-        generate_classname("pb_typeahead_kit") + default_margin_bottom
+        generate_classname("pb_typeahead_kit")
       end
 
       def inline_class
@@ -62,6 +61,7 @@ module Playbook
       def typeahead_react_options
         base_options = {
           className: classname,
+          pillColor: pill_color,
           dark: dark,
           defaultValue: default_options,
           error: error,
@@ -69,7 +69,6 @@ module Playbook
           inline: inline,
           isMulti: is_multi,
           label: label,
-          marginBottom: margin_bottom,
           multiKit: multi_kit,
           name: name,
           options: options,

data/app/pb_kits/playbook/tokens/_colors.scss

@@ -259,6 +259,7 @@ $solar:                 $product_4_background !default; // deprecated
 $roofing:               $product_5_background !default; // deprecated
 $gutters:               $product_6_background !default; // deprecated
 $insulation:            $product_7_background !default; // deprecated
+$accessories:           $product_8_background !default; // added specifically for form_pill product map
 $product_colors: (
   windows:                $windows,
   siding:                 $siding,
@@ -267,6 +268,7 @@ $product_colors: (
   roofing:                $roofing,
   gutters:                $gutters,
   insulation:             $insulation,
+  accessories:            $accessories,
   product_1_background:   $product_1_background,
   product_1_highlight:    $product_1_highlight,
   product_2_background:   $product_2_background,