playbook_ui 14.17.0.pre.alpha.PLAY20547327 → 14.17.0.pre.alpha.alphaforaudiences7167

data/app/pb_kits/playbook/pb_draggable/docs/_draggable_drop_zones_colors.jsx

@@ -6,8 +6,6 @@ import Caption from '../../pb_caption/_caption'
 import Draggable from '../../pb_draggable/_draggable'
 import { DraggableProvider } from '../../pb_draggable/context'
 
-
-
 // Initial items to be dragged
 const dataPrimary = [
   {
@@ -44,54 +42,54 @@ const DraggableDropZonesColors = (props) => {
 
   return (
     <>
-      <Caption marginBottom="xs"
-          text="Primary"
-      />
-      <DraggableProvider
-          dropZone={{type: "shadow", color: "primary"}}
-          initialItems={dataPrimary}
-          onReorder={(items) => setInitialPrimaryState(items)}
-      >
-          <Draggable.Container {...props}>
-              <Flex>
-                  {initialPrimaryState.map(({ id, url }) => (
-                    <Draggable.Item dragId={id}
-                        key={id}
-                        marginRight="sm"
-                    >
-                        <Image alt={id}
-                            size="md"
-                            url={url}
-                        />
-                    </Draggable.Item>
-                  ))}
-              </Flex>
-          </Draggable.Container>
-      </DraggableProvider>
-      <Caption marginBottom="xs"
-          text="Purple"
-      />
-      <DraggableProvider
-          dropZone={{type: "outline", color: "purple"}}
-          initialItems={dataPurple}
-          onReorder={(items) => setInitialPurpleState(items)}
-      >
-          <Draggable.Container {...props}>
-              <Flex>
-                  {initialPurpleState.map(({ id, url }) => (
-                    <Draggable.Item dragId={id}
-                        key={id}
-                        marginRight="sm"
-                    >
-                        <Image alt={id}
-                            size="md"
-                            url={url}
-                        />
-                    </Draggable.Item>
-                  ))}
-              </Flex>
-          </Draggable.Container>
-      </DraggableProvider>
+    <Caption marginBottom="xs">
+      Primary
+    </Caption>
+    <DraggableProvider
+        dropZone={{type: "shadow", color: "primary"}}
+        initialItems={dataPrimary}
+        onReorder={(items) => setInitialPrimaryState(items)}
+    >
+        <Draggable.Container {...props}>
+        <Flex>
+            {initialPrimaryState.map(({ id, url }) => (
+              <Draggable.Item dragId={id}
+                  key={id}
+                  marginRight="sm"
+              >
+                <Image alt={id}
+                    size="md"
+                    url={url}
+                />
+              </Draggable.Item>
+            ))}
+         </Flex>
+        </Draggable.Container>
+    </DraggableProvider>
+    <Caption marginBottom="xs">
+      Purple
+    </Caption>
+    <DraggableProvider
+        dropZone={{type: "outline", color: "purple"}}
+        initialItems={dataPurple}
+        onReorder={(items) => setInitialPurpleState(items)}
+    >
+        <Draggable.Container {...props}>
+        <Flex>
+            {initialPurpleState.map(({ id, url }) => (
+              <Draggable.Item dragId={id}
+                  key={id}
+                  marginRight="sm"
+              >
+                <Image alt={id}
+                    size="md"
+                    url={url}
+                />
+              </Draggable.Item>
+            ))}
+         </Flex>
+        </Draggable.Container>
+    </DraggableProvider>
     </>
   );
 };

data/app/pb_kits/playbook/pb_draggable/docs/_draggable_drop_zones_colors.md

@@ -1 +1 @@
-  The default `color` for Draggable kit drop zones is "neutral", with "primary" or "purple" as additional options. When `type` is set to "line", the default color is "primary" and "purple" is the only other option.
+By default, the Draggable kit sets the default color of drop zones to "neutral" (or "primary" if using the "line" style.)

data/app/pb_kits/playbook/pb_draggable/docs/{_draggable_with_table.jsx → _draggable_with_table_react.jsx}

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 
 import Flex from '../../pb_flex/_flex'
-import { DraggableProvider } from '../context'
+import { DraggableProvider } from '../../pb_draggable/context'
 import Avatar from '../../pb_avatar/_avatar'
 import Body from '../../pb_body/_body'
 import Table from '../../pb_table/_table'

data/app/pb_kits/playbook/pb_draggable/docs/_draggable_with_table_react.md

@@ -2,6 +2,4 @@ The draggable kit can also be used in conjunction with the table kit to create d
 
 - Wrap the Table with the `DraggableProvider` and manage state as shown. 
 - use the `draggableContainer` prop on the Table.Body to designate it as the Draggable Container
-- use the `draggableItem` prop on the Table.Row to designate it as the Draggable Item. Make sure to also pass id to the `dragId` prop here. 
-
-We recommending using the default `dropZone type` with the Table kit.
+- use the `draggableItem` prop on the Table.Row to designate it as the Draggable Item. Make sure to also pass id to the `dragId` prop here. 

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

@@ -4,17 +4,14 @@ examples:
   - draggable_with_list: Draggable with List Kit
   - draggable_with_selectable_list: Draggable with SelectableList Kit
   - draggable_with_cards: Draggable with Cards
-  - draggable_with_table: Draggable with Table
+  - draggable_with_table_react: Draggable with Table
   - draggable_multiple_containers: Dragging Across Multiple Containers
-  - draggable_drop_zones: Draggable Drop Zones
-  - draggable_drop_zones_colors: Draggable Drop Zones Colors
-  - draggable_drop_zones_line: Draggable Drop Zones Line
 
   rails:
-  - draggable_default: Default
-  - draggable_with_list: Draggable with List Kit
-  - draggable_with_selectable_list: Draggable with SelectableList Kit
-  - draggable_with_cards: Draggable with Cards
+  - draggable_default_rails: Default
+  - draggable_with_list_rails: Draggable with List Kit
+  - draggable_with_selectable_list_rails: Draggable with SelectableList Kit
+  - draggable_with_cards_rails: Draggable with Cards
   - draggable_with_table: Draggable with Table
-  - draggable_multiple_containers: Dragging Across Multiple Containers
+  - draggable_multiple_containers_rails: Dragging Across Multiple Containers
 

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

@@ -3,7 +3,4 @@ export { default as DraggableWithCards } from './_draggable_with_cards.jsx'
 export { default as DraggableWithList } from './_draggable_with_list.jsx'
 export { default as DraggableWithSelectableList } from './_draggable_with_selectable_list.jsx'
 export { default as DraggableMultipleContainers } from './_draggable_multiple_containers.jsx'
-export { default as DraggableWithTable } from './_draggable_with_table.jsx'
-export { default as DraggableDropZones } from './_draggable_drop_zones.jsx'
-export { default as DraggableDropZonesColors } from './_draggable_drop_zones_colors.jsx'
-export { default as DraggableDropZonesLine } from './_draggable_drop_zones_line.jsx'
+export { default as DraggableWithTableReact } from './_draggable_with_table_react.jsx'

data/app/pb_kits/playbook/pb_draggable/draggable.test.jsx

@@ -128,58 +128,6 @@ const DraggableKitWithCard = () => {
   );
 };
 
-const DraggableWithLineVertical = () => {
-  const [initialState, setInitialState] = useState(data);
-  return (
-    <div data-testid={testId}>
-      <DraggableProvider
-          dropZone={{ type: "line" }}
-          initialItems={data}
-          onReorder={(items) => setInitialState(items)}
-      >
-        <Draggable>
-          <Draggable.Container>
-            {initialState.map(({ id, text }) => (
-              <Draggable.Item
-                  dragId={id}
-                  key={id}
-              >
-                {text}
-              </Draggable.Item>
-            ))}
-          </Draggable.Container>
-        </Draggable>
-      </DraggableProvider>
-    </div>
-  );
-};
-
-const DraggableWithLineHorizontal = () => {
-  const [initialState, setInitialState] = useState(data);
-  return (
-    <div data-testid={testId}>
-      <DraggableProvider
-          dropZone={{ type: "line", direction: "horizontal" }}
-          initialItems={data}
-          onReorder={(items) => setInitialState(items)}
-      >
-        <Draggable>
-          <Draggable.Container>
-            {initialState.map(({ id, text }) => (
-              <Draggable.Item
-                  dragId={id}
-                  key={id}
-              >
-                {text}
-              </Draggable.Item>
-            ))}
-          </Draggable.Container>
-        </Draggable>
-      </DraggableProvider>
-    </div>
-  );
-};
-
 test("generated default kit and classname", () => {
   render(<DefaultDraggableKit />);
   const kit = screen.getByTestId(testId);
@@ -240,19 +188,3 @@ test("generated dragHandle with Card", () => {
   const dragHandle = card.querySelector(".pb_custom_icon");
   expect(dragHandle).toBeInTheDocument();
 });
-
-test("line dropZone with default direction applies 'line_vertical' class to container", () => {
-  render(<DraggableWithLineVertical />);
-  const kit = screen.getByTestId(testId);
-  const container = kit.querySelector(".pb_draggable_container");
-  
-  expect(container).toHaveClass("line_vertical");
-});
-
-test("line dropZone with horizontal direction applies 'line_horizontal' class to container", () => {
-  render(<DraggableWithLineHorizontal />);
-  const kit = screen.getByTestId(testId);
-  const container = kit.querySelector(".pb_draggable_container");
-  
-  expect(container).toHaveClass("line_horizontal");
-});

data/app/pb_kits/playbook/pb_draggable/subcomponents/DraggableContainer.tsx

@@ -31,7 +31,7 @@ const DraggableContainer = (props: DraggableContainerProps) => {
   } = contextValues;
 
   // Only get direction if dropZone is 'line'
-  const direction = dropZone === 'line' ? (contextValues.direction || 'vertical') : null; 
+  const direction = dropZone === 'line' ? (contextValues.direction || 'vertical') : 'vertical';
 
   const ariaProps = buildAriaProps(aria);
   const dataProps = buildDataProps(data);
@@ -41,9 +41,8 @@ const DraggableContainer = (props: DraggableContainerProps) => {
   const classes = classnames(
     buildCss("pb_draggable_container"),
     `${activeContainer === container ? "active" : ""}`,
-    // Line variant gets line_{direction} classname on container no matter what
-    dropZone === 'line' && direction === 'vertical' ? 'line_vertical' : '',
-    dropZone === 'line' && direction === 'horizontal' ? 'line_horizontal' : '',
+    // Only add vertical class if dropZone is 'line' and direction is 'vertical'
+    (dropZone === 'line' && direction === 'vertical') ? 'vertical' : '',
     globalProps(props),
     className
   );

data/app/pb_kits/playbook/pb_dropdown/_dropdown.tsx

@@ -35,7 +35,7 @@ type DropdownProps = {
     label?: string;
     onSelect?: (arg: GenericObject) => null;
     options: GenericObject;
-    separators?: boolean;
+    separators: boolean;
     triggerRef?: any;
     variant?: "default" | "subtle";
 };

data/app/pb_kits/playbook/pb_dropdown/subcomponents/DropdownOption.tsx

@@ -22,7 +22,7 @@ type DropdownOptionProps = {
   data?: { [key: string]: string };
   htmlOptions?: { [key: string]: string | number | boolean | (() => void) };
   id?: string;
-  key?: string | number;
+  key?: string;
   option?: GenericObject;
   padding?: string;
 }  & GlobalProps;

data/app/pb_kits/playbook/pb_form_group/_form_group.scss

@@ -85,19 +85,11 @@
     .text_input_wrapper input, [class^=pb_text_input_kit] .text_input_wrapper .text_input {
       border-bottom-right-radius: 0;
       border-top-right-radius: 0;
-      border-right-color: transparent;
+      border-right-width: 0;
     }
-    [class^=pb_text_input_kit] .text_input_wrapper input:focus,
-    [class^=pb_text_input_kit] .text_input_wrapper .text_input:focus {
-      border-right-color: $primary;
-    } 
-    [class^=pb_text_input_kit].error .text_input_wrapper input,
-    [class^=pb_text_input_kit].error .text_input_wrapper .text_input {
-      border-right-color: $error;
-    }   
   }
 
-  & > [class^=pb_phone_number_input]:not(:first-child), [class^=pb_passphrase]:not(:first-child) {
+  & > [class^=pb_phone_number_input]:not(:first-child) {
     .text_input_wrapper input, [class^=pb_text_input_kit] .text_input_wrapper .text_input {
       border-bottom-left-radius: 0;
       border-top-left-radius: 0;
@@ -115,16 +107,8 @@
     .text_input {
       border-bottom-right-radius: 0;
       border-top-right-radius: 0;
-      border-right-color: transparent;
+      border-right: none;
     }
-    [class^=pb_text_input_kit] .text_input_wrapper input:focus,
-    [class^=pb_text_input_kit] .text_input_wrapper .text_input:focus {
-      border-right-color: $primary;
-    } 
-    [class^=pb_text_input_kit].error .text_input_wrapper input,
-    [class^=pb_text_input_kit].error .text_input_wrapper .text_input {
-      border-right-color: $error;
-    }  
   }
 
   &[class*=rails] > [class^=pb_date_picker_kit] {
@@ -243,8 +227,4 @@
       padding-left: calc(var(--iti-flag-width) + 1px);
     }
   }
-  
-  &:has(> [class^="pb_select"]):has(> .pb_passphrase) [class^="pb_select"] {
-      align-self: baseline;
-  }
 }

data/app/pb_kits/playbook/pb_form_group/docs/_form_group_select.html.erb

@@ -1,4 +1,5 @@
-<%= pb_rails("flex", props: {orientation: "column", row_gap:"md"}) do %>
+<div>
+
   <%= pb_rails("form_group") do %>
     <%= pb_rails("text_input", props: { placeholder: "Enter Artist Name" }) %>
     <%= pb_rails("select", props: {
@@ -16,6 +17,8 @@
       ]
     }) %>
   <% end %>
+  <br>
+  <br>
   <%= pb_rails("form_group") do %>
     <%= pb_rails("select", props: {
         blank_selection: "Phone",
@@ -29,17 +32,4 @@
         id: "phone"
     }) %>
   <% end %>
-  <%= pb_rails("form_group") do %>
-      <%= pb_rails("phone_number_input", props: {
-        id: "phone2"
-      }) %>
-      <%= pb_rails("select", props: {
-        blank_selection: "Phone",
-        options: [
-          { value: "Cell" },
-          { value: "Work" },
-          { value: "Home" },
-        ]
-      }) %>
-  <% end %>
-<% end %>
+</div>

data/app/pb_kits/playbook/pb_form_group/docs/_form_group_select.jsx

@@ -1,16 +1,11 @@
-import React, {useState} from 'react'
+import React from 'react'
 
 import FormGroup from '../_form_group'
 import PhoneNumberInput from '../../pb_phone_number_input/_phone_number_input'
 import Select from '../../pb_select/_select'
 import TextInput from '../../pb_text_input/_text_input'
-import Flex from '../../pb_flex/_flex'
-import Passphrase from '../../pb_passphrase/_passphrase'
 
 const FormGroupSelect = (props) => {
-  const [input, setInput] = useState("");
-  const handleChange = (e) => setInput(e.target.value);
-
   const options = [
     { value: 'Country' },
     { value: 'Pop' },
@@ -30,10 +25,7 @@ const FormGroupSelect = (props) => {
   ]
 
   return (
-    <Flex 
-        orientation="column" 
-        rowGap="md"
-    >
+    <div>
       <FormGroup>
         <TextInput
             placeholder="Enter Artist Name"
@@ -45,43 +37,18 @@ const FormGroupSelect = (props) => {
             {...props}
         />
       </FormGroup>
+      <br />
+      <br />
       <FormGroup>
         <Select
             blankSelection="Phone"
             options={phoneOptions}
-            {...props}
-        />
+            />
         <PhoneNumberInput
             id='default'
-            {...props}
         />
     </FormGroup>
-    <FormGroup>
-      <PhoneNumberInput
-          id='default-2'
-          {...props}
-      />
-      <Select
-          blankSelection="Phone"
-          options={phoneOptions}
-          {...props}
-      />
-    </FormGroup>
-    <FormGroup>
-        <Select 
-            blankSelection="Phone" 
-            options={phoneOptions}
-            {...props}
-        />
-        <Passphrase
-            id="my-passphrase"
-            label=""
-            onChange={handleChange}
-            value={input}
-            {...props}
-        />
-      </FormGroup>
-    </Flex>
+    </div>
   )
 }
 

data/app/pb_kits/playbook/pb_layout/_layout.scss

@@ -210,78 +210,10 @@ $bracket-border-width: 4px;
       border-right: $bracket-border-width solid $border_light;
     }
 
-    .polygon_node {
-      position: absolute;
-      top: calc(50% - 5px);
-      right: -10px;
-
-      width: 0;
-      height: 0;
-      border-top: 5px solid transparent;
-      border-bottom: 5px solid transparent;
-      border-left: 10px solid $border_light;
-    }
-
     .layout_round_label {
       display: none;
     }
 
-    .layout_participant,
-    .layout_participant_winner,
-    .layout_participant_self,
-    .layout_participant_winner_self,
-    .layout_participant_winner_self_last {
-      height: 60px;
-    }
-
-    .layout_tbd {
-      height: 140px;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-    }
-
-    .layout_participant_winner,
-    .layout_participant_self,
-    .layout_participant_winner_self,
-    .layout_participant_winner_self_last {
-      position: relative;
-
-      &::after {
-        content: "";
-        position: absolute;
-        top: 0;
-        width: 4px;
-        height: 100%;
-      }
-    }
-
-    .layout_participant_winner::after {
-      right: 0;
-      background: $product_6_highlight;
-    }
-
-    .layout_participant_self::after {
-      left: 0;
-      background: $category_1;
-    }
-
-    .layout_participant_winner_self::after {
-      right: 0;
-      background: $product_6_highlight;
-    }
-
-    .layout_participant_winner_self_last::after {
-      left: 0;
-      background: $category_1;
-    }
-
-    .game_separator {
-      &::before, &::after {
-        height: 2px;
-      }
-    }
-
     @media (max-width: $screen-md-max) {
       flex-direction: column;
       .layout_round_label {
@@ -289,8 +221,7 @@ $bracket-border-width: 4px;
       }
       .layout_round .layout_game::after,
       .connector_container,
-      .half_box,
-      .polygon_node {
+      .half_box {
         display: none !important;
       }
     }

data/app/pb_kits/playbook/pb_layout/_layout.tsx

@@ -6,7 +6,6 @@ import { GlobalProps, globalProps, globalInlineProps } from '../utilities/global
 
 import { Round, RoundLabel } from "./subcomponents/_round";
 import Game from "./subcomponents/_game";
-import Participant from "./subcomponents/_participant";
 
 type LayoutPropTypes = {
   aria?: {[key: string]: string},
@@ -177,38 +176,13 @@ const Layout = (props: LayoutPropTypes) => {
     (child: React.ReactElement & {type: {displayName: string}}) => child.type?.displayName !== 'Side'
   )
 
-  const numberOfRounds = Array.isArray(children) ? React.Children.toArray(children).filter(
+  const numberOfRounds = Array.isArray(nonSideChildren) ? React.Children.toArray(children).filter(
     (child) => {
       return (child as React.ReactElement).type === Layout.Round;
     }
   ).length : 0
-
-  const lastRoundWithSelf = React.Children.toArray(children).filter((child) => {
-    if ((child as React.ReactElement).type !== Layout.Round) {
-      return false
-    }
-  
-    const roundElement = child as React.ReactElement
-  
-    const gameChildren = React.Children.toArray(roundElement.props.children)
-  
-    const hasWinningSelfParticipant = gameChildren.some((gameChild) => {
-      const gameElement = gameChild as React.ReactElement
-  
-      const participantChildren = React.Children.toArray(gameElement.props.children)
-  
-      return participantChildren.some((participantChild) => {
-        const participantElement = participantChild as React.ReactElement
-        const { self } = participantElement.props
-        return self === true
-      })
-    })
-  
-    return hasWinningSelfParticipant
-  }).length
-
   const bracketChildren = nonSideChildren.map(child =>
-    React.isValidElement(child) ? React.cloneElement(child, { numberOfRounds, lastRoundWithSelf }) : child
+    React.isValidElement(child) ? React.cloneElement(child, { numberOfRounds }) : child
   )
   
   const filteredProps = {...props}
@@ -245,6 +219,5 @@ Layout.Footer = Footer
 Layout.Round = Round
 Layout.Game = Game
 Layout.RoundLabel = RoundLabel
-Layout.Participant = Participant
 
 export default Layout