playbook_ui 14.6.2.pre.alpha.PBNTR667railstypeaheadformintegration4424 → 14.6.2.pre.alpha.PLAY1485selectablecardoverflowoutlinebug4247

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

@@ -3,7 +3,6 @@ import classnames from 'classnames'
 import Title from '../pb_title/_title'
 import Icon from '../pb_icon/_icon'
 import Avatar from '../pb_avatar/_avatar'
-import Tooltip from '../pb_tooltip/_tooltip'
 import { globalProps, GlobalProps } from '../utilities/globalProps'
 import { buildDataProps, buildHtmlProps } from '../utilities/props'
 
@@ -63,30 +62,6 @@ const FormPill = (props: FormPillProps): React.ReactElement => {
   const dataProps = buildDataProps(data)
   const htmlProps = buildHtmlProps(htmlOptions)
 
-  const renderTitle = (content: string, className: string) => {
-    const titleComponent = (
-      <Title
-          className={className}
-          size={4}
-          text={content}
-          truncate={props.truncate}
-      />
-    )
-    if (props.truncate) {
-      return (
-        <Tooltip
-            interaction
-            placement="top"
-            position="fixed"
-            text={content}
-        >
-          {titleComponent}
-        </Tooltip>
-      )
-    }
-    return titleComponent
-  }
-
   return (
     <div className={css}
         id={id}
@@ -102,7 +77,12 @@ const FormPill = (props: FormPillProps): React.ReactElement => {
               size="xxs"
               status={null}
           />
-          {renderTitle(name, "pb_form_pill_text")}
+          <Title
+              className="pb_form_pill_text"
+              size={4}
+              text={name}
+              truncate={props.truncate}
+          />
         </>
       )}
       {((name && icon && !text) || (name && icon && text)) && (
@@ -113,7 +93,12 @@ const FormPill = (props: FormPillProps): React.ReactElement => {
               size="xxs"
               status={null}
           />
-          {renderTitle(name, "pb_form_pill_text")}
+          <Title
+              className="pb_form_pill_text"
+              size={4}
+              text={name}
+              truncate={props.truncate}
+          />
           <Icon
               className="pb_form_pill_icon"
               color={color}
@@ -128,10 +113,22 @@ const FormPill = (props: FormPillProps): React.ReactElement => {
               color={color}
               icon={icon}
           />
-          {renderTitle(text, "pb_form_pill_tag")}
+          <Title
+              className="pb_form_pill_tag"
+              size={4}
+              text={text}
+              truncate={props.truncate}
+          />
         </>
       )}
-      {(!name && !icon && text) && renderTitle(text, "pb_form_pill_tag")}
+      {(!name && !icon && text) && (
+        <Title
+            className="pb_form_pill_tag"
+            size={4}
+            text={text}
+            truncate={props.truncate}
+        />
+      )}
       <div
           className="pb_form_pill_close"
           onClick={onClick}
@@ -146,5 +143,4 @@ const FormPill = (props: FormPillProps): React.ReactElement => {
     </div>
   )
 }
-
 export default FormPill

data/app/pb_kits/playbook/pb_form_pill/docs/_form_pill_truncated_text.html.erb

@@ -13,30 +13,7 @@
     id: "typeahead-form-pill",
     is_multi: true,
     options: names,
-    label: "Truncation Within Typeahead",
+    label: "Names",
     pills: true,
     truncate: 1,
 }) %>
-
-<%= pb_rails("caption", props: { text: "Form Pill Truncation" }) %>
-<%= pb_rails("card", props: { max_width: "xs" })  do %>
-  <%= pb_rails("form_pill", props: {
-      name: "Princess Amelia Mignonette Grimaldi Thermopolis Renaldo",
-      avatar_url: "https://randomuser.me/api/portraits/women/44.jpg",
-      tabindex: 0,
-      truncate: 1,
-      id: "truncation-1"
-  }) %>
-  <%= pb_rails("form_pill", props: {
-      icon: "badge-check",
-      text: "icon and a very long tag to show truncation",
-      tabindex: 0,
-      truncate: 1,
-      id: "truncation-2"
-  }) %>
-  <%= pb_rails("form_pill", props: {
-      text: "form pill long tag no tooltip show truncation",
-      tabindex: 0,
-      truncate: 1,
-  }) %>
-<% end %>

data/app/pb_kits/playbook/pb_form_pill/docs/_form_pill_truncated_text.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Card, Caption, FormPill, Typeahead } from 'playbook-ui'
+import Typeahead from '../../pb_typeahead/_typeahead'
 
 const names = [
   { label: 'Alexander Nathaniel Montgomery', value: 'Alexander Nathaniel Montgomery' },
@@ -15,34 +15,11 @@ const FormPillTruncatedText = (props) => {
       <Typeahead
           htmlOptions={{ style: { maxWidth: "240px" }}}
           isMulti
-          label="Truncation Within Typeahead"
+          label="Names"
           options={names}
           truncate={1}
           {...props}
       />
-      <Caption text="Form Pill Truncation"/>
-      <Card maxWidth="xs">
-        <FormPill
-            avatarUrl="https://randomuser.me/api/portraits/women/44.jpg"
-            name="Princess Amelia Mignonette Grimaldi Thermopolis Renaldo"
-            onClick={() => alert('Click!')}
-            tabIndex={0}
-            truncate={1}
-        />
-        <FormPill
-            icon="badge-check"
-            onClick={() => {alert('Click!')}}
-            tabIndex={0}
-            text="icon and a very long tag to show truncation"
-            truncate={1}
-        />
-        <FormPill
-            onClick={() => {alert('Click!')}}
-            tabIndex={0}
-            text="form pill with a very long tag to show truncation"
-            truncate={1}
-        />
-      </Card>
     </>
   )
 }

data/app/pb_kits/playbook/pb_form_pill/docs/_form_pill_truncated_text.md

@@ -0,0 +1 @@
+For pills with longer text, the `truncate` global prop can be used to truncate the label within each Form Pill. See [here](https://playbook.powerapp.cloud/visual_guidelines/truncate) for more information on the truncate global prop.

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

@@ -1,57 +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" }) %>
-    <% if object.truncate %>
-      <div>
-        <%= pb_rails("title", props: { 
-          classname: "pb_form_pill_text truncate_#{object.truncate}",
-          id: object.id,
-          size: 4, 
-          text: object.name,
-        }) %>
-        <% if object.id.present? %>
-          <%= pb_rails("tooltip", props: {
-            position: "top",
-            tooltip_id: "tooltip-#{object.id}",
-            trigger_element_selector: "##{object.id}"
-          }) do %>
-            <%= object.name %>
-          <% end %>
-        <% end %>
-      </div>
-    <% else %>
-      <%= pb_rails("title", props: { classname: "pb_form_pill_text", id: object.id, size: 4, text: object.name }) %>
-    <% end %>
+    <%= 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 }) %>
     <% end %>
   <% elsif object.text.present? %>
-    <% if object.icon.present? %>
-      <%= pb_rails("icon", props: { classname: "pb_form_pill_icon", color: object.color, icon: object.icon }) %>
-    <% end %>
-    <% if object.truncate %>
-      <div>
-        <%= pb_rails("title", props: { 
-          classname: "pb_form_pill_tag truncate_#{object.truncate}",
-          id: object.id,
-          size: 4, 
-          text: object.text,
-        }) %>
-        <% if object.id.present? %>
-          <%= pb_rails("tooltip", props: {
-            position: "top",
-            tooltip_id: "tooltip-#{object.id}",
-            trigger_element_selector: "##{object.id}"
-          }) do %>
-            <%= object.text %>
-          <% end %>
-        <% end %>
-      </div>
-    <% else %>
-      <%= pb_rails("title", props: { classname: "pb_form_pill_tag", id: object.id, size: 4, text: object.text, }) %>
-    <% end %>
+      <% if object.icon.present? %>
+        <%= pb_rails("icon", props: { classname: "pb_form_pill_icon", color: object.color, 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 }) %>
   <% end %>
-<% end %>
+<% end %>

data/app/pb_kits/playbook/pb_selectable_card/_selectable_card.scss

@@ -129,7 +129,7 @@ $pb_selectable_paddings: (
     }
   }
 
-  &.display_input {
+  &[class*=_display_input] {
     input[type="checkbox"],
     input[type="radio"] {
       &:checked {

data/app/pb_kits/playbook/pb_selectable_card/_selectable_card.tsx

@@ -66,8 +66,8 @@ const SelectableCard = (props: SelectableCardProps) => {
       'checked': checked,
       'disabled': disabled,
       'enabled': !disabled,
+      'display_input': variant === 'displayInput',
     }),
-  variant === 'displayInput' ? 'display_input' : '',
   { error },
   dark ? 'dark' : '',
   className

data/app/pb_kits/playbook/pb_selectable_card/selectable_card.rb

@@ -25,7 +25,7 @@ module Playbook
 
       def classname
         [
-          generate_classname_without_spacing("pb_selectable_card_kit", checked_class, enable_disabled_class) + display_input_class,
+          generate_classname_without_spacing("pb_selectable_card_kit", checked_class, enable_disabled_class, display_input_class),
           error_class,
           dark_props,
         ].compact.join(" ")
@@ -81,7 +81,7 @@ module Playbook
       end
 
       def display_input_class
-        variant == "display_input" ? " display_input" : ""
+        variant == "display_input" ? "display_input" : nil
       end
     end
   end

data/app/pb_kits/playbook/pb_timeline/_item.tsx

@@ -1,15 +1,12 @@
 import React from 'react'
 import classnames from 'classnames'
+
 import { buildCss, buildHtmlProps } from '../utilities/props'
-import { globalProps, GlobalProps } from "../utilities/globalProps"
+import { globalProps, GlobalProps } from "../utilities/globalProps";
 
 import DateStacked from '../pb_date_stacked/_date_stacked'
 import IconCircle from '../pb_icon_circle/_icon_circle'
 
-import TimelineLabel from './subcomponents/Label'
-import TimelineStep from './subcomponents/Step'
-import TimelineDetail from './subcomponents/Detail'
-
 type ItemProps = {
   className?: string,
   children?: React.ReactNode[] | React.ReactNode,
@@ -20,13 +17,6 @@ type ItemProps = {
   lineStyle?: 'solid' | 'dotted',
 } & GlobalProps
 
-function isElementOfType<P>(
-  element: React.ReactNode,
-  component: React.ComponentType<P>
-): element is React.ReactElement<P> {
-  return React.isValidElement<P>(element) && element.type === component
-}
-
 const TimelineItem = ({
   className,
   children,
@@ -41,57 +31,31 @@ const TimelineItem = ({
 
   const htmlProps = buildHtmlProps(htmlOptions)
 
-  const childrenArray = React.Children.toArray(children)
-
-  const labelChild = childrenArray.find(
-    (child): child is React.ReactElement => isElementOfType(child, TimelineLabel)
-  )
-
-  const stepChild = childrenArray.find(
-    (child): child is React.ReactElement => isElementOfType(child, TimelineStep)
-  )
-
-  const detailChild = childrenArray.find(
-    (child): child is React.ReactElement => isElementOfType(child, TimelineDetail)
-  )
-
-  const otherChildren = childrenArray.filter(
-    (child) =>
-      !isElementOfType(child, TimelineLabel) &&
-      !isElementOfType(child, TimelineStep) &&
-      !isElementOfType(child, TimelineDetail)
-  )
-
   return (
-    <div
+    <div 
         {...htmlProps}
         className={classnames(timelineItemCss, globalProps(props), className)}
     >
-        {labelChild || (
-          <div className="pb_timeline_item_left_block">
-            {date && (
-              <DateStacked
-                  align="center"
-                  date={date}
-                  size="sm"
-              />
-            )}
-          </div>
-        )}
-        {stepChild || (
-          <div className="pb_timeline_item_step">
-            <IconCircle icon={icon}
-                size="xs"
-                variant={iconColor}
-            />
-            <div className="pb_timeline_item_connector" />
-          </div>
-        )}
-        {detailChild || (
-          <div className="pb_timeline_item_right_block">
-           { otherChildren }
-          </div>
-        )}
+      <div className="pb_timeline_item_left_block">
+        {date &&
+          <DateStacked
+              align="center"
+              date={date}
+              size="sm"
+          />
+        }
+      </div>
+      <div className="pb_timeline_item_step">
+        <IconCircle
+            icon={icon}
+            size="xs"
+            variant={iconColor}
+        />
+        <div className="pb_timeline_item_connector" />
+      </div>
+      <div className="pb_timeline_item_right_block">
+        {children}
+      </div>
     </div>
   )
 }

data/app/pb_kits/playbook/pb_timeline/_timeline.tsx

@@ -5,11 +5,6 @@ import { buildAriaProps, buildCss, buildDataProps, buildHtmlProps } from '../uti
 import { GlobalProps, globalProps } from '../utilities/globalProps'
 
 import TimelineItem from './_item'
-import {
-  TimelineStep,
-  TimelineLabel,
-  TimelineDetail,
-} from './subcomponents'
 
 type TimelineProps = {
   aria?: { [key: string]: string },
@@ -52,8 +47,5 @@ const Timeline = ({
 }
 
 Timeline.Item = TimelineItem
-Timeline.Step = TimelineStep
-Timeline.Label = TimelineLabel
-Timeline.Detail = TimelineDetail
 
 export default Timeline

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

@@ -4,11 +4,10 @@ examples:
   - timeline_default: Default
   - timeline_vertical: Vertical
   - timeline_with_date: With Date
-  - timeline_with_children: With Children
   
   
   react:
   - timeline_default: Default
   - timeline_vertical: Vertical
   - timeline_with_date: With Date
-  - timeline_with_children: With Children
+  

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

@@ -1,4 +1,3 @@
 export { default as TimelineDefault } from './_timeline_default.jsx'
 export { default as TimelineVertical } from './_timeline_vertical.jsx'
 export { default as TimelineWithDate } from './_timeline_with_date.jsx'
-export { default as TimelineWithChildren } from './_timeline_with_children.jsx'

data/app/pb_kits/playbook/pb_timeline/item.html.erb

@@ -1,21 +1,25 @@
 <%= pb_content_tag do %>
-  <% if label %>
-    <%= label %>
-  <% else %>
-    <%= pb_rails("timeline/label", props: { date: date }) %>
-  <% end %>
 
-  <% if step %>
-    <%= step %>
-  <% else %>
-    <%= pb_rails("timeline/step", props: { icon: icon, icon_color: icon_color }) %>
-  <% end %>
-
-  <% if detail%>
-    <%= detail%>
-  <% else %>
-    <%= pb_rails("timeline/detail") do %>
-      <%= content %>
+  <div class="pb_timeline_item_left_block">
+    <% if object.date.present? %>
+      <%= pb_rails("date_stacked", props: {
+        date: object.date,
+        size: "sm",
+        align: "center"
+      }) %>
     <% end %>
-  <% end %>
+  </div>
+
+  <div class="pb_timeline_item_step">
+    <%= pb_rails("icon_circle", props: {
+      icon: object.icon,
+      variant: object.icon_color,
+      size: "xs"
+    }) %>
+    <div class="pb_timeline_item_connector"></div>
+  </div>
+
+  <div class="pb_timeline_item_right_block">
+    <%= content.presence %>
+  </div>
 <% end %>

data/app/pb_kits/playbook/pb_timeline/item.rb

@@ -13,10 +13,6 @@ module Playbook
                         values: %w[solid dotted],
                         default: "solid"
 
-      renders_one :label
-      renders_one :step
-      renders_one :detail
-
       def classname
         generate_classname("pb_timeline_item_kit", line_style)
       end

data/app/pb_kits/playbook/pb_timeline/timeline.test.js

@@ -2,10 +2,6 @@ import React from 'react'
 import { render, screen } from '../utilities/test-utils'
 
 import Timeline from './_timeline'
-import TimelineItem from './_item'
-import TimelineLabel from './subcomponents/Label'
-import TimelineStep from './subcomponents/Step'
-import TimelineDetail from './subcomponents/Detail'
 import TitleDetail from '../pb_title_detail/_title_detail'
 
 const testId = 'timeline'
@@ -47,91 +43,18 @@ const TimelineDefault = (props) => (
     </>
 )
 
-const TimelineWithChildren = (props) => (
-  <>
-    <Timeline
-        className={className}
-        data={{ testid: testId }}
-        orientation="horizontal"
-        showDate
-        {...props}
-    >
-      <TimelineItem lineStyle="solid"
-          {...props}
-      >
-        <TimelineLabel date={new Date()} />
-        <TimelineStep icon="user"
-            iconColor="royal"
-        />
-        <TimelineDetail>
-          <TitleDetail
-              detail="37-27 74th Street"
-              title="Jackson Heights"
-              {...props}
-          />
-        </TimelineDetail>
-      </TimelineItem>
-
-      <TimelineItem lineStyle="dotted"
-          {...props}
-      >
-        <TimelineStep icon="check"
-            iconColor="teal"
-        />
-        <TimelineDetail>
-          <TitleDetail
-              detail="81 Gate St Brooklyn"
-              title="Greenpoint"
-              {...props}
-          />
-        </TimelineDetail>
-      </TimelineItem>
-
-      <TimelineItem lineStyle="solid"
-          {...props}
-      >
-        <TimelineLabel
-            date={new Date(new Date().setDate(new Date().getDate() + 1))}
-        />
-        <TimelineStep icon="map-marker-alt"
-            iconColor="purple"
-        />
-        <TimelineDetail>
-          <TitleDetail
-              detail="72 E St Astoria"
-              title="Society Hill"
-              {...props}
-          />
-        </TimelineDetail>
-      </TimelineItem>
-    </Timeline>
-  </>
-)
-
 test('should pass data prop', () => {
     render(<TimelineDefault />)
     const kit = screen.getByTestId(testId)
     expect(kit).toBeInTheDocument()
 })
 
-test('should pass data prop using children', () => {
-    render(<TimelineWithChildren />)
-    const kit = screen.getByTestId(testId)
-    expect(kit).toBeInTheDocument()
-})
-
 test('should pass className prop', () => {
     render(<TimelineDefault />)
     const kit = screen.getByTestId(testId)
     expect(kit).toHaveClass(className)
 })
 
-test('should pass className prop with children', () => {
-    render(<TimelineWithChildren />)
-    const kit = screen.getByTestId(testId)
-    expect(kit).toHaveClass(className)
-})
-
 test('should pass aria prop', () => {
     render(<TimelineDefault />)
     const kit = screen.getByTestId(testId)
@@ -163,10 +86,3 @@ test('should pass showDate prop', () => {
     const kit = screen.getByTestId(testId)
     expect(kit).toHaveClass('pb_timeline_kit__horizontal__with_date')
 })
-
-test('should pass showDate prop with Children', () => {
-    const props = { showDate: true }
-    render(<TimelineWithChildren {...props} />)
-    const kit = screen.getByTestId(testId)
-    expect(kit).toHaveClass('pb_timeline_kit__horizontal__with_date')
-})

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

@@ -14,20 +14,14 @@
           fixed_width: true,
         }) %>
       </div>
-      <% if object.label.present? %>
-        <label class="pb_typeahead_kit_label" for="<%= object.name %>">
-          <%= pb_rails("caption", props: { text: object.label, margin_bottom:"xs"}) %>
-        </label>
-      <% end %>
       <%= pb_rails("text_input", props: {
         type: "search",
         input_options: object.input_options,
+        label: object.label,
         name: object.name,
         value: object.value,
         placeholder: object.placeholder,
         margin_bottom: "none",
-        required: object.required,
-        id: object.name,
       }) %>
       <%= 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

@@ -40,8 +40,6 @@ module Playbook
       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"
-      prop :required, type: Playbook::Props::Boolean,
-                      default: false
 
       def classname
         default_margin_bottom = margin_bottom.present? ? "" : " mb_sm"

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

@@ -1,5 +1,3 @@
-@import "../tokens/colors";
-
 $font_family_base: "Power Centra", "Helvetica Neue", Helvetica, Arial, sans_serif !default;
 
 /* CLEAN UP AND REMOVE */
@@ -53,36 +51,3 @@ $boldest:       700 !default;
 $bolder:        700 !default;
 $light:         300 !default;
 $lighter:       300 !default;
-
-/* Link Colors */
-$pb_link_colors: (
-  default:        $primary_action,
-  body:           $text_lt_default,
-  muted:          $text_lt_light,
-  destructive:    $error,
-);
-
-$pb_link_hover_colors: (
-  default:        $text_lt_default,
-  body:           $primary_action,
-  muted:          $text_lt_default,
-  destructive:    $text_lt_default,
-);
-
-$pb_dark_link_colors: (
-  default:        $active_dark,
-  body:           $text_dk_default,
-  muted:          $text_dk_light,
-  destructive:    $error_dark,
-);
-
-$pb_dark_link_hover_colors: (
-  default:        $text_dk_default,
-  body:           $active_dark,
-  muted:          $text_dk_default,
-  destructive:    $text_dk_default,
-);
-
-@mixin pb_link($color: $primary_action) {
-  color: $color;
-}