playbook_ui 14.3.2.pre.alpha.pbntr523enablekitsforradiofix3809 → 14.3.2.pre.alpha.play1472newicons3773

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

@@ -1,30 +1,28 @@
-/*eslint-disable react/no-multi-comp */
+/*eslint-disable react/no-multi-comp, flowtype/space-before-type-colon */
 
-import React, { forwardRef, useRef } from 'react'
+import React, { forwardRef } 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 = ({
@@ -32,11 +30,10 @@ const Radio = ({
   alignment,
   children,
   className,
-  customChildren,
   dark = false,
+  data = {},
   disabled = false,
   error = false,
-  data = {},
   htmlOptions = {},
   id,
   label,
@@ -46,28 +43,17 @@ const Radio = ({
   onChange = () => { void 0 },
   ...props
 }: RadioProps, ref: any) => {
-  const radioRef = useRef(null);
-
-  const ariaProps = buildAriaProps(aria);
-  const dataProps = buildDataProps(data);
-  const htmlProps = buildHtmlProps(htmlOptions);
+  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
-  );
-
-  const classesCustom = classnames(
-    dark ? 'dark' : null,
-    error ? 'error' : null,
-    globalProps(props),
-    className
-  );
+    className)
 
   const displayRadio = (props: RadioProps & any) => {
-    if (children && customChildren == false)
+    if (children)
       return (children)
     else
     return (
@@ -84,69 +70,24 @@ 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 (
-    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>
-    )
-  );
-};
+    <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)

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

@@ -7,7 +7,6 @@ examples:
   - radio_options: With Options
   - radio_alignment: Alignment
   - radio_disabled: Disabled
-  - radio_custom_children: Custom Children
 
   react:
   - radio_default: Default
@@ -15,7 +14,6 @@ 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,4 +3,3 @@ 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/radio.html.erb

@@ -1,40 +1,18 @@
-<% if object.custom_children %>
-  <%= pb_rails("flex", props: {
+<%= content_tag(:label,
     aria: object.aria,
-    align: "center",
+    checked: object.checked,
     class: object.classname,
-    cursor: "pointer",
     data: object.data,
-    **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 %>
+    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 %>
+    <% 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 %>
-<% end %>
+    <span class="pb_radio_button"></span>
+    <%= pb_rails("body", props: { status: object.body_status, text: object.text, dark: object.dark }) %>
+<% end %>

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

@@ -20,8 +20,6 @@ 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
@@ -36,7 +34,7 @@ module Playbook
       end
 
       def input
-        radio_button_tag(name, value, checked, input_options.merge(disabled: disabled || input_options[:disabled]))
+        radio_button_tag(name, value, checked, input_options.merge(disabled: disabled))
       end
 
     private

data/app/pb_kits/playbook/pb_rich_text_editor/TipTap/ToolbarDropdown.tsx

@@ -1,5 +1,7 @@
 import React, { useState } from 'react'
 
+import { getAllIcons } from "../../utilities/icons/allicons"
+
 import Flex from '../../pb_flex/_flex'
 import PbReactPopover from '../../pb_popover/_popover'
 import Button from '../../pb_button/_button'
@@ -65,6 +67,7 @@ const toolbarDropdownItems = [
     },
 ]
 
+  const angleDown = getAllIcons()["angleDown"].icon as unknown as { [key: string]: SVGElement }
 
   const handleTogglePopover = () => {
     setShowPopover(!showPopover)
@@ -92,8 +95,10 @@ for (const { text, isActive, icon } of toolbarDropdownItems) {
         <Flex className={showPopover ? "fa-flip-vertical" : ""}
             display="inline_flex"
         >
-          <Icon fixedWidth
-              icon="angle-down"
+          <Icon 
+              className="svg-inline--fa"
+              customIcon={angleDown}
+              fixedWidth
               margin-left="xs"
           />
         </Flex>
@@ -125,8 +130,10 @@ const popoverReference = (
             <Flex className={showPopover ? "fa-flip-vertical" : ""}
                 display="inline_flex"
             >
-              <Icon fixedWidth
-                  icon="angle-down"
+              <Icon 
+                  className="svg-inline--fa"
+                  customIcon={angleDown}
+                  fixedWidth
                   margin-left="xs"
               />
             </Flex>
@@ -169,4 +176,4 @@ const popoverReference = (
   )
 }
 
-export default ToolbarDropdown
+export default ToolbarDropdown

data/app/pb_kits/playbook/pb_select/_select.tsx

@@ -4,6 +4,7 @@ import classnames from 'classnames'
 import { buildAriaProps, buildCss, buildDataProps, buildHtmlProps } from '../utilities/props'
 import { globalProps, GlobalProps, domSafeProps } from '../utilities/globalProps'
 import type { InputCallback } from '../types'
+import { getAllIcons } from "../utilities/icons/allicons"
 
 import Body from '../pb_body/_body'
 import Caption from '../pb_caption/_caption'
@@ -90,6 +91,8 @@ const Select = ({
     compactClass
   );
 
+  const angleDown = getAllIcons()["angleDown"].icon as unknown as { [key: string]: SVGElement }
+
   const selectWrapperClass = classnames(buildCss('pb_select_kit_wrapper'), { error }, className)
   const selectBody =(() =>{
     if (children) return children
@@ -134,9 +137,9 @@ const Select = ({
         {selectBody}
         { multiple !== true ?
           <Icon
-              className="pb_select_kit_caret"
+              className="pb_select_kit_caret svg-inline--fa"
+              customIcon={angleDown}
               fixedWidth
-              icon="angle-down"
           />
           :
           null

data/app/pb_kits/playbook/pb_select/select.html.erb

@@ -26,7 +26,7 @@
       <%= pb_rails("body", props: { status: "negative", text: object.error }) %>
     <% end %>
     <% if object.multiple != true %>
-      <%= pb_rails("icon", props: { icon: "angle-down", fixed_width: true, classname: "pb_select_kit_caret"}) %>
+      <%= pb_rails("icon", props: { custom_icon: Playbook::Engine::root.join(angle_down_path), fixed_width: true, classname: "pb_select_kit_caret"}) %>
     <% end %>
   </label>
 <% end %>

data/app/pb_kits/playbook/pb_select/select.rb

@@ -84,6 +84,10 @@ module Playbook
         end
       end
 
+      def angle_down_path
+        "app/pb_kits/playbook/utilities/icons/angle-down.svg"
+      end
+
     private
 
       def error_class

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

@@ -107,20 +107,4 @@ test('should pass className prop', () => {
 
   const kit = screen.getByTestId('typeahead-test')
   expect(kit).toHaveClass(className)
-})
-
-test('typeahead with colored pills', () => {
-  render(
-    <Typeahead
-        data={{ testid: 'pills-color-test' }}
-        defaultValue={[options[0]]}
-        isMulti
-        options={options}
-        pillColor="neutral"
-    />
-  )
-
-  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,14 +45,12 @@ type TypeaheadProps = {
   getOptionLabel?: string | (() => any),
   getOptionValue?: string | (() => any),
   name?: string,
-  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 = {
@@ -78,7 +76,6 @@ const Typeahead = ({
   htmlOptions = {},
   id,
   loadOptions = noop,
-  pillColor,
   ...props
 }: TypeaheadProps) => {
   const selectProps = {
@@ -108,7 +105,6 @@ const Typeahead = ({
     onCreateOption: null as null,
     plusIcon: false,
     onMultiValueClick: (_option: SelectValueType): any => undefined,
-    pillColor: pillColor,
     ...props,
   }
 

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

@@ -8,7 +8,6 @@ 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,
 }
@@ -16,55 +15,48 @@ type Props = {
 const MultiValue = (props: Props) => {
   const { removeProps } = props
   const { imageUrl, label } = props.data
-  const { dark, multiKit, pillColor } = props.selectProps
+  const { multiKit } = 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}
-            color={pillColor}
-            dark={dark}
-            marginRight="xs"
-            name={label}
-            size={multiKit === 'smallPill' ? 'small' : ''}
-            text=''
-            {...props}
+          avatarUrl={imageUrl}
+          closeProps={removeProps}
+          marginRight="xs"
+          name={label}
+          size={multiKit === 'smallPill' ? 'small' : ''}
+          text=''
         />
       }
 
       {multiKit !== 'badge' && !imageUrl &&
         <FormPill
-            closeProps={removeProps}
-            color={pillColor}
-            dark={dark}
-            marginRight="xs"
-            name=''
-            size={multiKit === 'smallPill' ? 'small' : ''}
-            text={label}
-            {...props}
+          closeProps={removeProps}
+          marginRight="xs"
+          name=''
+          size={multiKit === 'smallPill' ? 'small' : ''}
+          text={label}
         />
       }
     </components.MultiValueContainer>

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

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

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

@@ -10,4 +10,3 @@ 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 TypeaheadWithPillsColor } from './_typeahead_with_pills_color.jsx'

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

@@ -34,9 +34,6 @@ module Playbook
       prop :search_term_minimum_length, default: 3
       prop :search_debounce_timeout, default: 250
       prop :value
-      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_typeahead_kit")
@@ -61,7 +58,6 @@ module Playbook
       def typeahead_react_options
         base_options = {
           className: classname,
-          pillColor: pill_color,
           dark: dark,
           defaultValue: default_options,
           error: error,

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

@@ -259,7 +259,6 @@ $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,
@@ -268,7 +267,6 @@ $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,