playbook_ui 14.2.1 → 14.3.0.pre.alpha.revert3654PBNTR479removeextraspacingfromradiochildren3734

data/app/pb_kits/playbook/pb_pill/_pill.scss

@@ -9,9 +9,9 @@ $pb_pill_height: 22px;
   display: inline-flex;
   justify-content: center;
   align-items: center;
-  padding: 0 calc($space-sm/1.8);
+  padding: 0 $space-sm/1.8;
   height: $pb_pill_height;
-  border-radius: calc($pb_pill_height/2);
+  border-radius: $pb_pill_height/2;
   white-space: nowrap;
 
   &[class*=lowercase] {

data/app/pb_kits/playbook/pb_progress_simple/_progress_simple.scss

@@ -21,7 +21,7 @@ $pb_progress_simple_height: 4px;
 [class^=pb_progress_simple_kit] {
   width: 100%;
   height: $pb_progress_simple_height;
-  border-radius: calc($pb_progress_simple_height/2);
+  border-radius: $pb_progress_simple_height/2;
   background: rgba($primary, $opacity-1);
     &[class*=_positive] {
       .progress_simple_value {
@@ -42,7 +42,7 @@ $pb_progress_simple_height: 4px;
   [class^=progress_simple_value] {
     width: 0%;
     height: 100%;
-    border-radius: calc($pb_progress_simple_height/2);
+    border-radius: $pb_progress_simple_height/2;
     background: $primary;
   }
 

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

@@ -1,28 +1,27 @@
-/*eslint-disable react/no-multi-comp, flowtype/space-before-type-colon */
-
-import React, { forwardRef } from 'react'
+import React, { forwardRef, isValidElement, 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,
   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 = ({
@@ -31,9 +30,9 @@ const Radio = ({
   children,
   className,
   dark = false,
-  data = {},
   disabled = false,
   error = false,
+  data = {},
   htmlOptions = {},
   id,
   label,
@@ -42,52 +41,103 @@ const Radio = ({
   value = 'radio_text',
   onChange = () => { void 0 },
   ...props
-}: RadioProps, ref: any) => {
-  const ariaProps = buildAriaProps(aria)
-  const dataProps = buildDataProps(data)
-  const htmlProps = buildHtmlProps(htmlOptions)
+}: RadioProps ) => {
+  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 isCustomChild = children && isValidElement(children) && children.type !== 'input';
 
   const displayRadio = (props: RadioProps & any) => {
-    if (children)
-      return (children)
-    else
-    return (
-    <input
-        disabled={disabled}
-        id={id}
-        name={name}
-        onChange={onChange}
-        ref={ref}
-        text={text}
-        type="radio"
-        value={value}
-        {...props}
-    />
-  )}
+    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();
+      }
+    }
+  };
 
   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>
-  )
-}
+    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>
+    )
+  );
+};
 
-export default forwardRef(Radio)
+export default forwardRef(Radio);

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

@@ -0,0 +1,56 @@
+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
+          label="Select"
+          name="Group1"
+          tabIndex={0}
+          value="Select"
+          {...props}
+      >
+        <Select 
+            minWidth="xs"
+            options={options}
+        />
+      </Radio>
+      <Radio
+          label="Typeahead"
+          name="Group1"
+          tabIndex={0}
+          value="Typeahead"
+          {...props}
+      >
+        <Typeahead 
+            minWidth="xs"
+            options={options}
+        />
+      </Radio>
+      <br />
+      <Radio
+          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/example.yml

@@ -14,6 +14,7 @@ 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,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 RadioChildren } from './_radio_children.jsx'

data/app/pb_kits/playbook/pb_rich_text_editor/_previewer_mixin.scss

@@ -3,18 +3,20 @@
 @import "../tokens/spacing";
 @import "../tokens/typography";
 
-@mixin preview_first_child {
+
+// Tiptap mixins section (React Advanced Editor)
+@mixin preview_tiptap_first_child {
     :first-child {
         margin-top: 0;
     }
 }
 
-@mixin preview_p {
+@mixin preview_tiptap_p {
     margin: 1rem 0 0 0;
     min-height: 1rem;
 }
 
-@mixin preview_code {
+@mixin preview_tiptap_code {
     font-family: monospace;
     background: $bg_light;
     padding: 0.1rem 0.3rem;
@@ -23,7 +25,7 @@
     overflow: hidden;
 }
 
-@mixin preview_pre_codeblock {
+@mixin preview_tiptap_pre_codeblock {
     display: inline-block;
     width: 100%;
     vertical-align: top;
@@ -44,7 +46,7 @@
     }
 }
 
-@mixin preview_a {
+@mixin preview_tiptap_a {
     color: $primary;
     border-bottom: 1px solid $primary;
     &:hover {
@@ -53,7 +55,7 @@
     }
 }
 
-@mixin preview_blockquote {
+@mixin preview_tiptap_blockquote {
     font-size: $font_larger;
     padding: $space_sm $space_md;
     font-style: italic;
@@ -63,7 +65,7 @@
     }
 }
 
-@mixin preview_h1 {
+@mixin preview_tiptap_h1 {
     font-size: $text_largest;
     line-height: $text_larger;
     font-weight: $bolder;
@@ -71,7 +73,7 @@
     margin: 2.1rem 0 0 0;
 }
 
-@mixin preview_h2 {
+@mixin preview_tiptap_h2 {
     font-size: $text_larger;
     line-height: $text_larger;
     font-weight: $bolder;
@@ -79,7 +81,7 @@
     margin: 1.9rem 0 0 0;
 }
 
-@mixin preview_h3 {
+@mixin preview_tiptap_h3 {
     font-size: $text_large;
     line-height: $text_large;
     font-weight: $bolder;
@@ -87,7 +89,7 @@
     margin: 1.7rem 0 0 0;
 }
 
-@mixin preview_smaller_headings {
+@mixin preview_tiptap_smaller_headings {
     font-size: $text_base;
     line-height: $text_base;
     letter-spacing: $lspace_tight;
@@ -95,7 +97,7 @@
     margin: 1rem 0 0 0;
 }
 
-@mixin preview_hr {
+@mixin preview_tiptap_hr {
     margin: 2.2rem 0;
     box-sizing: content-box;
     overflow: hidden;
@@ -107,7 +109,7 @@
     border: 0; 
 }
 
-@mixin preview_ol {
+@mixin preview_tiptap_ol {
     margin: 1rem 0 0 0;
     padding-left: $space_md;
     list-style: decimal;
@@ -119,7 +121,7 @@
     }
 }
 
-@mixin preview_ul {
+@mixin preview_tiptap_ul {
     list-style-position: disc;
     margin: 1rem 0 0 0;
     padding-left: $space_md;
@@ -130,3 +132,37 @@
       }
     }
 }
+
+// Trix mixins section (Rails and React default editor)
+@mixin preview_trix_div {
+    line-height: 1.4;
+}
+
+@mixin preview_trix_h1 {
+    font-size: 2em;
+    line-height: 1.4; 
+}
+@mixin preview_trix_blockquote {
+    border: 0 solid #ccc;
+    border-left-width: 0.3em;
+    margin-left: 0.3em;
+    padding-left: 0.6em; 
+    line-height: 1.4;
+}
+
+@mixin preview_trix_li {
+    line-height: 1.4;
+    margin-left: $space_sm;
+}
+
+@mixin preview_trix_pre {
+    display: inline-block;
+    width: 100%;
+    vertical-align: top;
+    font-family: monospace;
+    font-size: 0.9em;
+    padding: 0.5em;
+    white-space: pre;
+    background-color: #eee;
+    overflow-x: auto; 
+}

data/app/pb_kits/playbook/pb_rich_text_editor/_rich_text_editor.scss

@@ -10,18 +10,6 @@
 @import "./trix_styles";
 @import "./tiptap_styles";
 
-.trix-content pre {
-  display: inline-block;
-  width: 100%;
-  vertical-align: top;
-  font-family: monospace;
-  font-size: 0.9em;
-  padding: 0.5em;
-  white-space: pre;
-  background-color: #ccc !important;
-  color: black !important;
-  overflow-x: auto;
-}
 [class^=pb_rich_text_editor_kit] {
   // Disables File Attatchment Button in Toolbar
   trix-toolbar [data-trix-button-group="file-tools"] {
@@ -106,7 +94,7 @@
     .trix-button--icon {
       height: $space_lg;
       width: $space_lg;
-      margin: calc($space_xs / 2);
+      margin: $space_xs / 2;
       border-radius: $border_rad_heavier;
       &::before {
         background-size: auto;
@@ -116,7 +104,7 @@
       background: $white;
       border: 1px solid #E4E8F0;
       border-bottom: none;
-      padding: calc($space_xs / 2);
+      padding: $space_xs / 2;
       border-top-left-radius: $border_rad_heavier;
       border-top-right-radius: $border_rad_heavier;
       .trix-button-group {

data/app/pb_kits/playbook/pb_rich_text_editor/_tiptap_styles.scss

@@ -86,44 +86,44 @@
     }
 
     code {
-      @include preview_code;
+      @include preview_tiptap_code;
     }
 
     pre {
-      @include preview_pre_codeblock;
+      @include preview_tiptap_pre_codeblock;
     }
     a {
-      @include preview_a;
+      @include preview_tiptap_a;
     }
     blockquote {
-      @include preview_blockquote;
+      @include preview_tiptap_blockquote;
     }
     &:focus-visible {
       outline: unset;
       @include transition_default;
     }
     h1 {
-      @include preview_h1;
+      @include preview_tiptap_h1;
     }
     h2 {
-      @include preview_h2;
+      @include preview_tiptap_h2;
     }
     h3 {
-      @include preview_h3;
+      @include preview_tiptap_h3;
     }
     h4,
     h5,
     h6 {
-      @include preview_smaller_headings;
+      @include preview_tiptap_smaller_headings;
     }
     hr {
-      @include preview_hr;
+      @include preview_tiptap_hr;
     }
     ol {
-      @include preview_ol;
+      @include preview_tiptap_ol;
     }
     ul {
-      @include preview_ul;
+      @include preview_tiptap_ul;
     }
   }
 }
@@ -170,40 +170,40 @@
   }
 }
 .tiptap-content {
-  @include preview_first_child;
+  @include preview_tiptap_first_child;
   a {
-    @include preview_a;
+    @include preview_tiptap_a;
   }
   blockquote {
-    @include preview_blockquote;
+    @include preview_tiptap_blockquote;
   }
   h1 {
-    @include preview_h1;
+    @include preview_tiptap_h1;
   }
   h2 {
-    @include preview_h2;
+    @include preview_tiptap_h2;
   }
   h3 {
-    @include preview_h3;
+    @include preview_tiptap_h3;
   }
   h4,
   h5,
   h6 {
-    @include preview_smaller_headings;
+    @include preview_tiptap_smaller_headings;
   }
   hr {
-    @include preview_hr;
+    @include preview_tiptap_hr;
   }
   ol {
-    @include preview_ol;
+    @include preview_tiptap_ol;
   }
   p {
-    @include preview_p;
+    @include preview_tiptap_p;
   }
   pre {
-    @include preview_pre_codeblock;
+    @include preview_tiptap_pre_codeblock;
   }
   ul {
-    @include preview_ul;
+    @include preview_tiptap_ul;
   }
 }

data/app/pb_kits/playbook/pb_rich_text_editor/_trix_styles.scss

@@ -1,3 +1,5 @@
+@import "previewer_mixin";
+
 @charset "UTF-8";
 /*
 Trix 1.3.0
@@ -297,41 +299,31 @@ trix-editor .attachment__metadata {
   trix-editor .attachment__metadata .attachment__size {
     margin-left: 0.2em;
     white-space: nowrap; }
+  trix-editor blockquote {
+    @include preview_trix_blockquote; }
+  trix-editor [dir=rtl] blockquote,
+  trix-editor blockquote[dir=rtl] {
+    @include preview_trix_blockquote }
 @charset "UTF-8";
-.trix-content {
-  line-height: 1.5; }
-  .trix-content * {
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0; }
+.trix-content * {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0; }
+  .trix-content#content-preview div {
+    @include preview_trix_div; }
   .trix-content h1 {
-    font-size: 1.2em;
-    line-height: 1.2; }
+    @include preview_trix_h1; }
   .trix-content blockquote {
-    border: 0 solid #ccc;
-    border-left-width: 0.3em;
-    margin-left: 0.3em;
-    padding-left: 0.6em; }
+    @include preview_trix_blockquote; }
   .trix-content [dir=rtl] blockquote,
   .trix-content blockquote[dir=rtl] {
-    border-width: 0;
-    border-right-width: 0.3em;
-    margin-right: 0.3em;
-    padding-right: 0.6em; }
+    @include preview_trix_blockquote; }
   .trix-content li {
-    margin-left: 1em; }
+    @include preview_trix_li; }
   .trix-content [dir=rtl] li {
-    margin-right: 1em; }
+    @include preview_trix_li; }
   .trix-content pre {
-    display: inline-block;
-    width: 100%;
-    vertical-align: top;
-    font-family: monospace;
-    font-size: 0.9em;
-    padding: 0.5em;
-    white-space: pre;
-    background-color: #eee;
-    overflow-x: auto; }
+    @include preview_trix_pre; }
   .trix-content img {
     max-width: 100%;
     height: auto; }