playbook_ui 14.1.0.pre.alpha.pbntr373enablekitsforradio3595 → 14.1.0

data/app/pb_kits/playbook/pb_form_pill/_form_pill.tsx

@@ -46,7 +46,6 @@ const FormPill = (props: FormPillProps): React.ReactElement => {
   } = props
 
   const iconClass = icon ? "_icon" : ""
-  const closeIconSize = size === "small" ? "xs" : "sm"
   const css = classnames(
     `pb_form_pill_kit_${color}${iconClass}`,
     globalProps(props),
@@ -70,7 +69,7 @@ const FormPill = (props: FormPillProps): React.ReactElement => {
           <Avatar
               imageUrl={avatarUrl}
               name={name}
-              size="xxs"
+              size="xs"
               status={null}
           />
           <Title
@@ -85,7 +84,7 @@ const FormPill = (props: FormPillProps): React.ReactElement => {
           <Avatar
               imageUrl={avatarUrl}
               name={name}
-              size="xxs"
+              size="xs"
               status={null}
           />
           <Title
@@ -95,7 +94,6 @@ const FormPill = (props: FormPillProps): React.ReactElement => {
           />
           <Icon
               className="pb_form_pill_icon"
-              color={color}
               icon={icon}
           />
         </>
@@ -104,7 +102,6 @@ const FormPill = (props: FormPillProps): React.ReactElement => {
         <>
           <Icon
               className="pb_form_pill_icon"
-              color={color}
               icon={icon}
           />
           <Title
@@ -129,7 +126,6 @@ const FormPill = (props: FormPillProps): React.ReactElement => {
         <Icon
             fixedWidth
             icon="times"
-            size={closeIconSize}
         />
       </div>
     </div>

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

@@ -5,11 +5,11 @@ examples:
   - form_pill_size: Form Pill Size
   - form_pill_tag: Form Pill Tag
   - form_pill_example: Example
-  - form_pill_icon: Form Pill Icon
+  # - form_pill_icon: Form Pill Icon
 
   react:
   - form_pill_user: Form Pill User
   - form_pill_size: Form Pill Size
   - form_pill_tag: Form Pill Tag
   - form_pill_example: Example
-  - form_pill_icon: Form Pill Icon
+  # - form_pill_icon: Form Pill Icon

data/app/pb_kits/playbook/pb_form_pill/form_pill.html.erb

@@ -1,19 +1,19 @@
 <%= content_tag(:div, id: object.id, data: object.data, class: object.classname + object.size_class, tabindex: object.tabindex, **combined_html_options) do %>
   <% if object.name.present? %>
-    <%= pb_rails("avatar", props: { name: object.name, image_url: object.avatar_url, size: "xxs" }) %>
+    <%= pb_rails("avatar", props: { name: object.name, image_url: object.avatar_url, size: "xs" }) %>
     <%= pb_rails("title", props: { text: object.name, size: 4, classname: "pb_form_pill_text" }) %>
     <% if object.icon.present? %>
-      <%= pb_rails("icon", props: { classname: "pb_form_pill_icon", color: object.color, icon: object.icon }) %>
+      <%= pb_rails("icon", props: { classname: "pb_form_pill_icon", icon: object.icon }) %>
     <% end %>
   <% elsif object.text.present? %>
       <% if object.icon.present? %>
-        <%= pb_rails("icon", props: { classname: "pb_form_pill_icon", color: object.color, icon: object.icon }) %>
+        <%= pb_rails("icon", props: { classname: "pb_form_pill_icon", icon: object.icon }) %>
       <% end %>
       <% if object.text.present? %>
         <%= pb_rails("title", props: { text: object.text, size: 4, classname: "pb_form_pill_tag" }) %>
       <% end %>
   <% end %>
   <%= pb_rails("body", props: { classname: "pb_form_pill_close" }) do %>
-    <%= pb_rails("icon", props: { icon: 'times', fixed_width: true, size: object.close_icon_size }) %>
+    <%= pb_rails("icon", props: { icon: 'times' , fixed_width: true }) %>
   <% end %>
 <% end %>

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

@@ -32,10 +32,6 @@ module Playbook
       def icon_class
         icon ? "icon" : nil
       end
-
-      def close_icon_size
-        size == "small" ? "xs" : "sm"
-      end
     end
   end
 end

data/app/pb_kits/playbook/pb_icon/_icon.tsx

@@ -28,7 +28,7 @@ type IconProps = {
   data?: {[key: string]: string},
   fixedWidth?: boolean,
   flip?: "horizontal" | "vertical" | "both" | "none",
-  icon?: string | ReactSVGElement,
+  icon: string | ReactSVGElement,
   htmlOptions?: {[key: string]: string | number | boolean | (() => void)},
   id?: string,
   inverse?: boolean,

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

@@ -469,6 +469,7 @@ const MultiLevelSelect = (props: MultiLevelSelectProps) => {
                       <FormPill
                           key={index}
                           onClick={(event: any) => handlePillClose(event, item)}
+                          size="small"
                           text={item.label}
                       />
                     ))
@@ -481,6 +482,7 @@ const MultiLevelSelect = (props: MultiLevelSelectProps) => {
                       <FormPill
                           key={index}
                           onClick={(event: any) => handlePillClose(event, item)}
+                          size="small"
                           text={item.label}
                       />
                     ))

data/app/pb_kits/playbook/pb_pagination/_pagination.scss

@@ -3,45 +3,36 @@
 @import "../tokens/border_radius";
 @import "../tokens/shadows";
 
-
 $pagination_padding: 7px 13px 6px 13px;
 $top_bottom_radius: 0px;
 
-@mixin hover-state {
-  background-color: $active_light !important;
-  color: $primary;
-  border-radius: $border_rad_light;
-}
-
 .pb_pagination {
   display: inline-block;
   border-radius: $border_rad_light;
   border: $border_rad_lightest solid $border_light;
   background-color: $white;
-  padding: $space_xs 0px !important;
-  li, .pagination-number {
+  padding: $space_xxs 0px !important;
+  li {
     display: inline;
-    > a, li > span, .pagination-number {
+    > a, li > span {
     padding: $pagination_padding;
     text-decoration: none;
   }}
-  li:first-child > a, li:first-child > span, .pagination-number, .pagination-left {   
-    background-color: $white;
+  li:first-child > a, li:first-child > span  {
     padding: $pagination_padding;
     border-right: $border_rad_lightest solid $border_light;
     z-index: 2;
     border-top-right-radius: $top_bottom_radius;
     border-bottom-right-radius: $top_bottom_radius;
-    cursor: pointer;
   }
-  li:last-child > a, li:last-child > span, .pagination-number, .pagination-right {
+  li:last-child > a, li:last-child > span {
     padding: $pagination_padding;
     border-left: $border_rad_lightest solid $border_light;
     z-index: 2;
     border-top-left-radius: $top_bottom_radius;
     border-bottom-left-radius: $top_bottom_radius;
   }
-  a, .pagination-number {
+  a {
     color: $text_lt_default;
     font-size: $text_small;
     font-weight: $regular;
@@ -49,7 +40,9 @@ $top_bottom_radius: 0px;
     transition: all $transition_default ease-out;
 
     &:hover {
-      @include hover-state;
+      background-color: $active_light;
+      color: $primary;
+      border-radius: $border_rad_light;
     }
 
     &:focus-visible {
@@ -59,8 +52,8 @@ $top_bottom_radius: 0px;
       transition: none;
     }
   }
-  .active > span, .pagination-number.active {
-    background-color: $primary !important;
+  .active > span {
+    background-color: $primary;
     border-radius: $border_rad_light;
     color: #fff;
     padding: $pagination_padding;
@@ -69,37 +62,8 @@ $top_bottom_radius: 0px;
     font-weight: $bold;
     font-size: $text_small;
   }
-  .disabled {
-    pointer-events: none;
-    opacity: 0.5;        
-    color: grey; 
-
-    & > span {
-      padding: $pagination_padding;
-      font-size: $text_small;
-    }
-  }
-
-  .pagination-right, 
-  .pagination-left {
-    background-color: $white;
-    border-top: none;
-    border-bottom: none;
-    cursor: pointer;
-    padding: 7px 11px 6px;
+  .disabled > span {
+    padding: $pagination_padding;
     font-size: $text_small;
-    
-    &:hover {
-      @include hover-state;
-    }
-  }
-  .pagination-left {
-    border-left: none;
-    margin-right: $space_xxs;
-  }
-
-  .pagination-right {
-    border-right: none;
-    margin-left: $space_xxs;
   }
 }

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

@@ -3,6 +3,4 @@ examples:
   rails:
   - pagination_default: Default
   
-  react:
-  - pagination_default: Default
-  - pagination_page_change: Page Change
+  

data/app/pb_kits/playbook/pb_phone_number_input/_phone_number_input.scss

@@ -60,6 +60,7 @@ $flag-min-resolution: 192dpi;
   }
 
   .iti__flag {
+    background-image: url("https://intl-tel-input.com/intl-tel-input/img/flags.png");
     border-radius: 1px;
   }
 
@@ -196,4 +197,10 @@ $flag-min-resolution: 192dpi;
       }
     }
   }
+
+  @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: $flag-min-resolution) {
+    .iti__flag {
+      background-image: url("https://intl-tel-input.com/intl-tel-input/img/flags.png");
+    }
+  }
 }

data/app/pb_kits/playbook/pb_popover/_popover.tsx

@@ -21,8 +21,6 @@ import classnames from "classnames";
 import { globalProps, GlobalProps } from "../utilities/globalProps";
 import { uniqueId } from 'lodash';
 
-type ModifiedGlobalProps = Omit<GlobalProps, 'minWidth'>
-
 type PbPopoverProps = {
   aria?: { [key: string]: string };
   className?: string;
@@ -34,7 +32,7 @@ type PbPopoverProps = {
   reference: PopperReference & any;
   show?: boolean;
   shouldClosePopover?: (arg0: boolean) => void;
-} & ModifiedGlobalProps & Omit<PopperProps<any>, 'children'>
+} & GlobalProps & Omit<PopperProps<any>, 'children'>
 & { children?: React.ReactChild[] | React.ReactChild }
 
 // Prop enabled default modifiers here
@@ -82,13 +80,10 @@ const Popover = (props: PbPopoverProps) => {
     targetId,
   } = props;
 
-  const items = globalProps(props).split(' ')
-  const filteredItems = items.filter(item => !item.includes('min_width'))
-  const filteredGlobalProps = filteredItems.join(' ')
   const popoverSpacing =
-    filteredGlobalProps.includes("dark") || !filteredGlobalProps
+    globalProps(props).includes("dark") || !globalProps(props)
       ? "p_sm"
-      : filteredGlobalProps 
+      : globalProps(props);
   const overflowHandling = maxHeight || maxWidth ? "overflow_handling" : "";
   const zIndexStyle = zIndex ? { zIndex: zIndex } : {};
   const widthHeightStyles = () => {
@@ -105,7 +100,7 @@ const Popover = (props: PbPopoverProps) => {
   const htmlProps = buildHtmlProps(htmlOptions);
   const classes = classnames(
     buildCss("pb_popover_kit"),
-    filteredGlobalProps,
+    globalProps(props),
     className
   );
 
@@ -255,4 +250,4 @@ const PbReactPopover = (props: PbPopoverProps): React.ReactElement => {
   );
 };
 
-export default PbReactPopover;
+export default PbReactPopover;

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

@@ -8,7 +8,7 @@
   display: inline-flex;
   cursor: pointer;
 
-  .pb_radio_button{
+  .pb_radio_button {
     width: 22px;
     min-width: 22px;
     height: 22px;
@@ -18,7 +18,7 @@
     margin-right: $space_xs;
     transition: background $transition_default ease, box-shadow $transition_default ease, border-color $transition_default ease;
   }
-  
+
   @media (hover:hover) {
     &:hover .pb_radio_button {
       background-color: $bg_light;

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

@@ -1,27 +1,28 @@
-import React, { forwardRef, isValidElement, useRef } from 'react'
+/*eslint-disable react/no-multi-comp, flowtype/space-before-type-colon */
+
+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,
   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,9 +31,9 @@ const Radio = ({
   children,
   className,
   dark = false,
+  data = {},
   disabled = false,
   error = false,
-  data = {},
   htmlOptions = {},
   id,
   label,
@@ -41,103 +42,52 @@ const Radio = ({
   value = 'radio_text',
   onChange = () => { void 0 },
   ...props
-}: RadioProps ) => {
-  const radioRef = useRef(null);
-
-  const ariaProps = buildAriaProps(aria);
-  const dataProps = buildDataProps(data);
-  const htmlProps = buildHtmlProps(htmlOptions);
+}: RadioProps, ref: any) => {
+  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
-  );
-
-  const isCustomChild = children && isValidElement(children) && children.type !== 'input';
+    className)
 
   const displayRadio = (props: RadioProps & any) => {
-    if (isValidElement(children) && children.type === 'input') {
-      return React.cloneElement(children, { ...props, ref: radioRef });
-    } else if (isCustomChild || !children) {
-      return (
-        <input
-            disabled={disabled}
-            id={id}
-            name={name}
-            onChange={onChange}
-            ref={radioRef}
-            text={text}
-            type="radio"
-            value={value}
-            {...props}
-        />
-      );
-    }
-  };
-
-  const handleContainerClick = (event: React.MouseEvent<HTMLDivElement, MouseEvent> | undefined) => {
-    if (event) {
-      const target = event.target as HTMLElement;
-      if (
-        target.id === 'children-wrapper' ||
-        target.closest('#children-wrapper')
-      ) {
-        radioRef.current?.click();
-      }
-    }
-  };
+    if (children)
+      return (children)
+    else
+    return (
+    <input
+        disabled={disabled}
+        id={id}
+        name={name}
+        onChange={onChange}
+        ref={ref}
+        text={text}
+        type="radio"
+        value={value}
+        {...props}
+    />
+  )}
 
   return (
-    isCustomChild ? (
-      <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)}>
-          <>{displayRadio(props)}</>
-          <span className="pb_radio_button" />
-        </label>
-        <div id="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

@@ -14,7 +14,6 @@ examples:
   - radio_error: With Error
   - radio_alignment: Alignment
   - radio_disabled: Disabled
-  - radio_children: 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 RadioChildren } from './_radio_children.jsx'