playbook_ui 14.3.1 → 14.3.2.pre.alpha.PBNTR480radiocustomchildrenprop3759

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 223cdf028c8ae365aea864aba370c644cb017cd3501f5516a6194b262e645247
-  data.tar.gz: 28bba121bbd8c768afb2b19ba5b1de90590369d0b8221baac9c4f72b7fd94cd5
+  metadata.gz: cdd1dded7ae1ba871ee3d9c6301c8157a59069e5b30bd4192aa3923cda2f470f
+  data.tar.gz: f9a6884a3c4fbc00c1cacb9706fcfa02c166c5bcd81c394e37489a953f29b099
 SHA512:
-  metadata.gz: ccc0daa6fc9ae5b8da363a8f27ca0d4eba016801cf10fa494fc342e3ec6b27a1ed9f7a868f4308201afb638044ffc9a7e26de4069cff1fd3db0b25fb1755de1e
-  data.tar.gz: '082044ed8cf58f4ea10b85cbcbf2bda70e24084d272df992596251a495e8fac5376f0d28c4367885ac85f9a86227c52c45e42ed8ebbab319ad057251b3404caf'
+  metadata.gz: cb419c98c99095e28a2b17fef5e5f9a5dd258a2d75b26d46a34182af3c56396f3ac60de61e40f9fec9afc6dd38ef00341e54f02bc762f9d4eae31d5d5b783550
+  data.tar.gz: ad8e3e17e90704d2f8ee7f4ff4665e0a195cfc83c0a4908ae19f8cbf3edfbd79930a221d23ba714b9272053c1514e95753dfad4b56722ce1bbbfcb44ac2d07a2

data/app/pb_kits/playbook/pb_collapsible/_helper_functions.ts

@@ -6,6 +6,10 @@ export const showElement = (elem: HTMLElement) => {
   elem.style.overflow = "hidden"
   // Once the transition is complete, remove the inline max-height so the content can scale responsively
   window.setTimeout(() => {
+    // If a user toggles multiple times quickly in a row, 'is-visible' can be removed by hideElement's timeout
+    if (!elem.classList.contains('is-visible')) {
+      elem.classList.add('is-visible')
+    }
     elem.style.height = '';
     elem.style.overflow = "visible"
   }, 300);

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 children;
-    } 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 === 'pb-radio-children-wrapper' ||
-        target.closest('#pb-radio-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="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/_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.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,7 +15,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'

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.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,42 @@
-<%= 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 %>
+<% if object.custom_children %>
+  <div data-pb-radio-children="true">
+    <%= pb_rails("flex", props: {
+      aria: object.aria,
+      align: "center",
+      class: object.classname,
+      cursor: "pointer",
+      **combined_html_options
+    }) do %>
+      <%= content_tag(:label,
+        checked: object.checked,
+        class: object.classname,
+        data: object.data,
+        id: object.id,
+        value: object.value,
+        **combined_html_options) do %>
+        <%= input %>
+        <span class="pb_radio_button"></span>
+      <% end %>
+      <div data-pb-radio-children-wrapper="true"> <%= content %> </div>
     <% end %>
+  </div>
+<% 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_textarea/_textarea.tsx

@@ -92,7 +92,6 @@ const Textarea = ({
       <Caption text={label} />
       {children || (
         <textarea
-            className="pb_textarea_kit"
             disabled={disabled}
             name={name}
             onChange={onChange}

data/app/pb_kits/playbook/pb_textarea/textarea.html.erb

@@ -15,7 +15,6 @@
     <%= text_area(
         :object,
         :method,
-        :class => "#{object.classname}",
         :max_characters => object.max_characters,
         :name => object.name,
         :onkeyup => object.onkeyup,