playbook_ui 6.0.1.pre.alpha4 → 6.1.0.pre.alpha2

data/app/pb_kits/playbook/pb_section_separator/_section_separator.jsx

@@ -3,7 +3,7 @@ import React from 'react'
 import classnames from 'classnames'
 import { Caption } from '../'
 import { buildAriaProps, buildCss, buildDataProps } from '../utilities/props'
-import { spacing } from '../utilities/spacing.js'
+import { globalProps } from '../utilities/globalProps.js'
 
 type SectionSeparatorProps = {
   aria: object,
@@ -30,7 +30,7 @@ const SectionSeparator = (props: SectionSeparatorProps) => {
   const themeStyle = dark === true ? '_dark' : ''
   const ariaProps = buildAriaProps(aria)
   const dataProps = buildDataProps(data)
-  const classes = classnames(buildCss('pb_section_separator_kit', variant, orientation, themeStyle), className, spacing(props))
+  const classes = classnames(buildCss('pb_section_separator_kit', variant, orientation, themeStyle), className, globalProps(props))
 
   return (
 

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

@@ -14,7 +14,7 @@ import {
   buildDataProps,
 } from '../utilities/props'
 
-import { spacing } from '../utilities/spacing.js'
+import { globalProps } from '../utilities/globalProps.js'
 
 import type { InputCallback } from '../types'
 
@@ -72,7 +72,7 @@ const Select = ({
   ...props
 }: SelectProps) => {
   const errorClass = error ? ' error' : ''
-  const css = classnames(buildCss('pb_select', { dark }) + errorClass, spacing(props))
+  const css = classnames(buildCss('pb_select', { dark }) + errorClass, globalProps(props))
   const ariaProps = buildAriaProps(aria)
   const dataProps = buildDataProps(data)
   const optionsList = createOptions(options)

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

@@ -13,15 +13,14 @@ import {
   noop,
 } from '../utilities/props'
 
-import { spacing } from '../utilities/spacing.js'
+import { globalProps } from '../utilities/globalProps.js'
 
-type Props = {
-  aria: Object,
+type SelectableCardProps = {
+  aria?: object,
   checked: Boolean,
   children?: Array<React.ReactChild>,
   className?: String,
-  dark?: Boolean,
-  data: Object,
+  data: object,
   disabled?: Boolean,
   icon?: Boolean,
   id?: String,
@@ -38,7 +37,6 @@ const SelectableCard = ({
   checked = false,
   children,
   className,
-  dark = false,
   data = {},
   disabled = false,
   icon = false,
@@ -49,17 +47,15 @@ const SelectableCard = ({
   text,
   value,
   ...props
-}: Props) => {
+}: SelectableCardProps) => {
   const ariaProps = buildAriaProps(aria)
   const dataProps = buildDataProps(data)
 
-  const css = buildCss({
-    'pb_selectable_card_kit': true,
-    checked: checked,
-    dark: dark,
-    disabled: disabled,
-    enabled: !disabled,
-  })
+  const classes = classnames(buildCss('pb_selectable_card_kit',
+    { 'checked': checked,
+      'disabled': disabled,
+      'enabled': !disabled },
+    className), globalProps(props))
 
   const displayIcon = () => {
     if (icon === true) {
@@ -82,7 +78,7 @@ const SelectableCard = ({
     <div
         {...ariaProps}
         {...dataProps}
-        className={classnames(css, className)}
+        className={classes}
     >
       <input
           {...props}
@@ -95,7 +91,7 @@ const SelectableCard = ({
           value={value}
       />
       <label
-          className={spacing(props)}
+          className={globalProps(props)}
           htmlFor={inputIdPresent}
       >
         {text || children}

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

@@ -65,7 +65,7 @@ $pb_selectable_card_border: 2px;
     }
   }
 
-  &[class*=_dark] {
+  &.dark {
     label {
       @include pb_card_dark;
       background: transparent;

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

@@ -9,8 +9,6 @@ module Playbook
 
       prop :checked, type: Playbook::Props::Boolean,
                   default: false
-      prop :dark, type: Playbook::Props::Boolean,
-                  default: false
       prop :disabled, type: Playbook::Props::Boolean,
                   default: false
       prop :icon, type: Playbook::Props::Boolean,
@@ -26,7 +24,7 @@ module Playbook
       
 
       def classname
-        generate_classname("pb_selectable_card_kit", checked_class, dark_class, enable_disabled_class)
+        generate_classname("pb_selectable_card_kit", checked_class, enable_disabled_class)
       end
 
       def input_id_present
@@ -39,10 +37,6 @@ module Playbook
         checked ? "checked" : nil 
       end
 
-      def dark_class
-        dark ? "dark" : nil
-      end
-
       def enable_disabled_class
         disabled ? "disabled" : "enabled"
       end

data/app/pb_kits/playbook/pb_selectable_card_icon/_selectable_card_icon.jsx

@@ -3,6 +3,7 @@
 import React from 'react'
 import classnames from 'classnames'
 import { Body, SelectableCard, SelectableIcon } from '../'
+import { globalProps } from '../utilities/globalProps.js'
 
 import {
   buildAriaProps,
@@ -28,39 +29,39 @@ type SelectableCardIconProps = {
   onChange?: (e) => void,
 }
 
-const SelectableCardIcon = ({
-  aria = {},
-  checkmark = false,
-  checked = false,
-  className,
-  dark = false,
-  data = {},
-  disabled = false,
-  icon,
-  inputId,
-  multi = true,
-  name,
-  titleText,
-  bodyText,
-  value,
-  onChange,
-}: SelectableCardIconProps) => {
+const SelectableCardIcon = (props: SelectableCardIconProps) => {
+  const {
+    aria = {},
+    checkmark = false,
+    checked = false,
+    className,
+    dark = false,
+    data = {},
+    disabled = false,
+    icon,
+    inputId,
+    multi = true,
+    name,
+    titleText,
+    bodyText,
+    value,
+    onChange,
+  } = props
+
   const ariaProps = buildAriaProps(aria)
   const dataProps = buildDataProps(data)
 
-  const css = buildCss({
-    'pb_selectable_card_icon_kit': true,
-    'checked': checked,
-    'dark': dark,
-    'disabled': disabled,
-    'enabled': !disabled,
-  })
+  const classes = classnames(buildCss('pb_selectable_card_icon_kit',
+    { 'checked': checked,
+      'disabled': disabled,
+      'enabled': !disabled },
+    className), globalProps(props))
 
   return (
     <div
         {...ariaProps}
         {...dataProps}
-        className={classnames(css, className)}
+        className={classes}
     >
       <SelectableCard
           checked={checked}
@@ -76,7 +77,6 @@ const SelectableCardIcon = ({
         {
           <>
             <SelectableIcon
-                dark={dark}
                 icon={icon}
                 inputs="disabled"
                 size="2x"

data/app/pb_kits/playbook/pb_selectable_card_icon/_selectable_card_icon.scss

@@ -32,7 +32,7 @@
       }
     }
 
-  &[class*=_dark] {
+  &.dark {
 
     input[type="checkbox"],
     input[type="radio"] {       

data/app/pb_kits/playbook/pb_selectable_card_icon/selectable_card_icon.rb

@@ -25,11 +25,8 @@ module Playbook
                        default: false
       prop :value
 
-      prop :dark, type: Playbook::Props::Boolean,
-                  default: false
-
       def classname
-        generate_classname("pb_selectable_card_icon_kit", checked_class, dark_class, enabled_disabled_class)
+        generate_classname("pb_selectable_card_icon_kit", checked_class, enabled_disabled_class)
       end
 
     private
@@ -38,10 +35,6 @@ module Playbook
         checked ? "checked" : nil
       end
 
-      def dark_class
-        dark ? "dark" : nil
-      end
-
       def enabled_disabled_class
         disabled ? "disabled" : "enabled"
       end

data/app/pb_kits/playbook/pb_selectable_icon/_selectable_icon.jsx

@@ -10,12 +10,13 @@ import {
   buildDataProps,
 } from '../utilities/props'
 
+import { globalProps } from '../utilities/globalProps.js'
+
 type SelectableIconProps = {
   aria?: Object,
   checked?: Boolean,
   className?: String,
   disabled?: Boolean,
-  dark?: Boolean,
   data?: Object,
   icon: String,
   inputId: String,
@@ -30,7 +31,6 @@ const SelectableIcon = ({
   aria = {},
   className,
   checked = false,
-  dark = false,
   data = {},
   disabled = false,
   icon,
@@ -45,13 +45,11 @@ const SelectableIcon = ({
   const ariaProps = buildAriaProps(aria)
   const dataProps = buildDataProps(data)
 
-  const css = buildCss({
-    'pb_selectable_icon_kit': true,
-    'checked': checked,
-    'dark': dark,
-    'disabled': disabled,
-    'enabled': !disabled,
-  })
+  const classes = classnames(buildCss('pb_selectable_icon_kit',
+    { 'checked': checked,
+      'disabled': disabled,
+      'enabled': !disabled },
+    className), globalProps(props))
 
   const inputType = multi === false ? 'radio' : 'checkbox'
 
@@ -61,7 +59,7 @@ const SelectableIcon = ({
     <div
         {...ariaProps}
         {...dataProps}
-        className={classnames(css, className)}
+        className={classes}
     >
       <If condition={inputs === 'disabled'}>
         <>

data/app/pb_kits/playbook/pb_selectable_icon/_selectable_icon.scss

@@ -53,7 +53,7 @@
 	}
 
 
-  &[class*=_dark] {
+  &.dark {
 
 		input[type="checkbox"],
 		input[type="radio"] {

data/app/pb_kits/playbook/pb_selectable_icon/selectable_icon.rb

@@ -9,8 +9,6 @@ module Playbook
 
       # Icon props
       prop :icon, type: Playbook::Props::String
-      prop :dark, type: Playbook::Props::Boolean,
-                  default: false
       # Title text
       prop :text, type: Playbook::Props::String
 
@@ -30,7 +28,7 @@ module Playbook
                     default: "enabled"
 
       def classname
-        generate_classname("pb_selectable_icon_kit", checked_class, dark_class, enabled_disabled_class)
+        generate_classname("pb_selectable_icon_kit", checked_class, enabled_disabled_class)
       end
 
       def input_id_present
@@ -43,10 +41,6 @@ module Playbook
         checked ? "checked" : nil
       end
 
-      def dark_class
-        dark ? "dark" : nil
-      end
-
       def enabled_disabled_class
         disabled ? "disabled" : "enabled"
       end

data/app/pb_kits/playbook/pb_stat_change/_stat_change.jsx

@@ -5,7 +5,7 @@ import classnames from 'classnames'
 
 import { buildCss } from '../utilities/props'
 import { Body, Icon } from '../'
-import { spacing } from '../utilities/spacing.js'
+import { globalProps } from '../utilities/globalProps.js'
 
 const statusMap = {
   increase: 'positive',
@@ -35,7 +35,7 @@ const StatChange = (props: StatChangeProps) => {
           className={classnames(
           className,
           buildCss('pb_stat_change_kit', status),
-          spacing(props)
+          globalProps(props)
         )}
           id={id}
       >

data/app/pb_kits/playbook/pb_stat_value/_stat_value.jsx

@@ -3,7 +3,7 @@
 import React from 'react'
 import classnames from 'classnames'
 import { Title } from '../'
-import { spacing } from '../utilities/spacing.js'
+import { globalProps } from '../utilities/globalProps.js'
 
 type StatValueProps = {
   className?: String,
@@ -44,7 +44,7 @@ const StatValue = (props: StatValueProps) => {
 
   return (
     <div
-        className={classnames('pb_stat_value_kit', className, spacing(props))}
+        className={classnames('pb_stat_value_kit', className, globalProps(props))}
         id={id}
     >
       <div className="pb_stat_value_wrapper">

data/app/pb_kits/playbook/pb_table/_table.jsx

@@ -2,7 +2,7 @@
 
 import React, { type Node } from 'react'
 import classnames from 'classnames'
-import { spacing } from '../utilities/spacing.js'
+import { globalProps } from '../utilities/globalProps.js'
 
 type TableProps = {
   children: Array<Node> | Node,
@@ -43,7 +43,7 @@ const Table = (props: TableProps) => {
           'single-line': singleLine,
           'no-hover': disableHover,
         },
-        spacing(props)
+        globalProps(props)
       )}
     >
       {children}

data/app/pb_kits/playbook/pb_table/_table_row.jsx

@@ -2,7 +2,7 @@
 import React from 'react'
 import classnames from 'classnames'
 import { buildCss } from '../utilities/props'
-import { spacing } from '../utilities/spacing.js'
+import { globalProps } from '../utilities/globalProps.js'
 
 type TableRowPropTypes = {
   children: Array<React.ReactNode> | React.ReactNode,
@@ -17,7 +17,7 @@ const TableRow = (props: TableRowPropTypes) => {
   const tableRowCss = buildCss('pb_table_row_kit', sideHighlightClass)
 
   return (
-    <tr className={classnames(tableRowCss, className, spacing(props))}>
+    <tr className={classnames(tableRowCss, className, globalProps(props))}>
       {children}
     </tr>
   )

data/app/pb_kits/playbook/pb_text_input/_text_input.jsx

@@ -2,7 +2,7 @@
 import React from 'react'
 import classnames from 'classnames'
 import { Body, Caption } from '../'
-import { spacing } from '../utilities/spacing.js'
+import { globalProps } from '../utilities/globalProps.js'
 
 import {
   buildAriaProps,
@@ -60,7 +60,7 @@ const TextInput = ({
           dark={dark}
           text={label}
       />
-      <div className={classnames('text_input_wrapper', spacing(props))}>
+      <div className={classnames('text_input_wrapper', globalProps(props))}>
         <If condition={children}>
           {children}
           <Else />

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

@@ -3,7 +3,7 @@
     data: object.data,
     class: object.classname) do %>
   <% if object.label.present? %>
-    <%= pb_rails("caption", props: {text: object.label, dark: object.dark, classname: "pb_textarea_kit_label"}) %>
+    <%= pb_rails("caption", props: {text: object.label, dark: object.dark}) %>
   <% end %>
   <% if object.children %>
     <%= capture(&object.children) %>