playbook_ui 14.18.0.pre.alpha.revert4567revert4553PLAY2056ATcolbordercolors7469 → 14.18.0.pre.rc.0

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

data/app/pb_kits/playbook/pb_layout/docs/_layout_bracket.jsx

@@ -1,102 +1,11 @@
 import React from 'react'
 
 import Layout from '../../pb_layout/_layout'
+import Flex from '../../pb_flex/_flex'
+import Body from '../../pb_body/_body'
 import Caption from '../../pb_caption/_caption'
 import SectionSeparator from '../../pb_section_separator/_section_separator'
 
-const teamData = {
-  eagles: {
-    avatar:"https://images.unsplash.com/photo-1628703117067-fb7c9c20946e?w=500&auto=format&fit=crop&q=60&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxzZWFyY2h8Mnx8ZWFnbGVzfGVufDB8fDB8fHww",
-    name:"Eagles",
-    rank:"#1 NFC East",
-    territory:"PHI",
-  },
-  packers: {
-    avatar:"https://images.unsplash.com/photo-1486297678162-eb2a19b0a32d?q=80&w=500&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D",
-    name:"Packers",
-    rank:"#3 NFC North",
-    territory:"GB",
-  },
-  vikings: {
-    avatar:"https://images.unsplash.com/photo-1525540796810-55f9fbc5592f?w=500&auto=format&fit=crop&q=60&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxzZWFyY2h8MTV8fHZpa2luZ3xlbnwwfHwwfHx8MA%3D%3D",
-    name:"Vikings",
-    rank:"#2 NFC North",
-    territory:"MIN",
-  },
-  rams: {
-    avatar:"https://images.unsplash.com/photo-1490739043913-239b6cdf4084?q=80&w=500&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D",
-    name:"Rams",
-    rank:"#1 NFC West",
-    territory:"LAR",
-  },
-  lions: {
-    avatar:"https://images.unsplash.com/photo-1614027164847-1b28cfe1df60?q=80&w=500&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D",
-    name:"Lions",
-    rank:"#1 NFC North",
-    territory:"DET",
-  },
-  commanders: {
-    avatar:"https://images.unsplash.com/photo-1501466044931-62695aada8e9?q=80&w=500&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D",
-    name:"Commanders",
-    rank:"#2 NFC East",
-    territory:"WAS",
-  },
-  buccaneers: {
-    avatar:"https://images.unsplash.com/photo-1584116843008-46d529f04145?q=80&w=500&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D",
-    name:"Buccaneers",
-    rank:"#1 NFC South",
-    territory:"TB",
-  },
-  chiefs: {
-    avatar:"https://plus.unsplash.com/premium_photo-1697729864667-57f5f29e946b?w=500&auto=format&fit=crop&q=60&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxzZWFyY2h8MXx8a2Fuc2FzJTIwY2l0eXxlbnwwfHwwfHx8MA%3D%3D",
-    name:"Chiefs",
-    rank:"#1 AFC West",
-    territory:"KC",
-  },
-  chargers: {
-    avatar:"https://images.unsplash.com/photo-1529310399831-ed472b81d589?q=80&w=500&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D",
-    name:"Chargers",
-    rank:"#2 AFC West",
-    territory:"LAC",
-  },
-  texans: {
-    avatar:"https://images.unsplash.com/photo-1545345540-ea5d968030af?q=80&w=500&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D",
-    name:"Texans",
-    rank:"#1 AFC South",
-    territory:"HOU",
-  },
-  broncos: {
-    avatar:"https://images.unsplash.com/photo-1553284965-83fd3e82fa5a?q=80&w=500&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D",
-    name:"Broncos",
-    rank:"#3 AFC West",
-    territory:"DEN",
-  },
-  bills: {
-    avatar:"https://images.unsplash.com/photo-1575414914265-ebc9aa2637f4?q=80&w=500&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D",
-    name:"Bills",
-    rank:"#1 AFC East",
-    territory:"BUF",
-  },
-  steelers: {
-    avatar:"https://plus.unsplash.com/premium_photo-1697730155764-cc8ca8f78cbe?w=500&auto=format&fit=crop&q=60&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxzZWFyY2h8MXx8cGl0dHNidXJnaHxlbnwwfHwwfHx8MA%3D%3D",
-    name:"Steelers",
-    rank:"#2 AFC North",
-    territory:"PIT",
-  },
-  ravens: {
-    avatar:"https://images.unsplash.com/photo-1433888376991-1297486ba3f5?w=500&auto=format&fit=crop&q=60&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxzZWFyY2h8Mnx8cmF2ZW58ZW58MHx8MHx8fDA%3D",
-    name:"Ravens",
-    rank:"#1 AFC North",
-    territory:"BAL",
-  },
-  bye: {
-    avatar:"",
-    name:"BYE",
-    rank:"",
-    territory:"",
-  },
-}
-
 const LayoutBracket = () => {
   return (
     <div>
@@ -109,141 +18,80 @@ const LayoutBracket = () => {
         </Layout.RoundLabel>
         <Layout.Round marginBottom={{ xs: "md", sm: "md" }}>
           <Layout.Game>
-            <Layout.Participant
-                avatar={teamData.packers.avatar}
-                name={teamData.packers.name}
-                points="10"
-                rank={teamData.packers.rank}
-                territory={teamData.packers.territory}
-            />
-            <Layout.Participant
-                avatar={teamData.eagles.avatar}
-                name={teamData.eagles.name}
-                points="22"
-                rank={teamData.eagles.rank}
-                self
-                territory={teamData.eagles.territory}
-                winner
-            />
+            <Flex justify="between">
+              <Body>Packers</Body>
+              <Body>10</Body>
+            </Flex>
+            <Flex justify="between">
+              <Body><strong>Eagles</strong></Body>
+              <Body>22</Body>
+            </Flex>
           </Layout.Game>
           <Layout.Game>
-            <Layout.Participant
-                avatar={teamData.vikings.avatar}
-                name={teamData.vikings.name}
-                points="9"
-                rank={teamData.vikings.rank}
-                territory={teamData.vikings.territory}
-            />
-            <Layout.Participant
-                avatar={teamData.rams.avatar}
-                name={teamData.rams.name}
-                points="27"
-                rank={teamData.rams.rank}
-                territory={teamData.rams.territory}
-                winner
-            />
+            <Flex justify="between">
+              <Body>Vikings</Body>
+              <Body>9</Body>
+            </Flex>
+            <Flex justify="between">
+              <Body><strong>Rams</strong></Body>
+              <Body>27</Body>
+            </Flex>
           </Layout.Game>
           <Layout.Game>
-            <Layout.Participant
-                avatar={teamData.lions.avatar}
-                name={teamData.lions.name}
-                points=""
-                rank={teamData.lions.rank}
-                territory={teamData.lions.territory}
-                winner
-            />
-            <Layout.Participant
-                avatar={teamData.bye.avatar}
-                name={teamData.bye.name}
-                points=""
-                rank={teamData.bye.rank}
-                territory={teamData.bye.territory}
-            />
+            <Flex justify="between">
+              <Body><strong>Lions</strong></Body>
+            </Flex>
+            <Flex justify="between">
+              <Body>BYE</Body>
+            </Flex>
           </Layout.Game>
           <Layout.Game>
-            <Layout.Participant
-                avatar={teamData.commanders.avatar}
-                name={teamData.commanders.name}
-                points="23"
-                rank={teamData.commanders.rank}
-                territory={teamData.commanders.territory}
-                winner
-            />
-            <Layout.Participant
-                avatar={teamData.buccaneers.avatar}
-                name={teamData.buccaneers.name}
-                points="20"
-                rank={teamData.buccaneers.rank}
-                territory={teamData.buccaneers.territory}
-            />
+            <Flex justify="between">
+              <Body><strong>Commanders</strong></Body>
+              <Body>23</Body>
+            </Flex>
+            <Flex justify="between">
+              <Body>Buccaneers</Body>
+              <Body>20</Body>
+            </Flex>
           </Layout.Game>
           <Layout.Game>
-            <Layout.Participant
-                avatar={teamData.chiefs.avatar}
-                name={teamData.chiefs.name}
-                points=""
-                rank={teamData.chiefs.rank}
-                territory={teamData.chiefs.territory}
-                winner
-            />
-            <Layout.Participant
-                avatar={teamData.bye.avatar}
-                name={teamData.bye.name}
-                points=""
-                rank={teamData.bye.rank}
-                territory={teamData.bye.territory}
-            />
+            <Flex justify="between">
+              <Body><strong>Chiefs</strong></Body>
+            </Flex>
+            <Flex justify="between">
+              <Body>BYE</Body>
+            </Flex>
           </Layout.Game>
           <Layout.Game>
-            <Layout.Participant
-                avatar={teamData.chargers.avatar}
-                name={teamData.chargers.name}
-                points="12"
-                rank={teamData.chargers.rank}
-                territory={teamData.chargers.territory}
-            />
-            <Layout.Participant
-                avatar={teamData.texans.avatar}
-                name={teamData.texans.name}
-                points="32"
-                rank={teamData.texans.rank}
-                territory={teamData.texans.territory}
-                winner
-            />
+            <Flex justify="between">
+              <Body>Chargers</Body>
+              <Body>12</Body>
+            </Flex>
+            <Flex justify="between">
+              <Body><strong>Texans</strong></Body>
+              <Body>32</Body>
+            </Flex>
           </Layout.Game>
           <Layout.Game>
-            <Layout.Participant
-                avatar={teamData.broncos.avatar}
-                name={teamData.broncos.name}
-                points="7"
-                rank={teamData.broncos.rank}
-                territory={teamData.broncos.territory}
-            />
-            <Layout.Participant
-                avatar={teamData.bills.avatar}
-                name={teamData.bills.name}
-                points="31"
-                rank={teamData.bills.rank}
-                territory={teamData.bills.territory}
-                winner
-            />
+            <Flex justify="between">
+              <Body>Broncos</Body>
+              <Body>7</Body>
+            </Flex>
+            <Flex justify="between">
+              <Body><strong>Bills</strong></Body>
+              <Body>31</Body>
+            </Flex>
           </Layout.Game>
           <Layout.Game>
-            <Layout.Participant
-                avatar={teamData.steelers.avatar}
-                name={teamData.steelers.name}
-                points="14"
-                rank={teamData.steelers.rank}
-                territory={teamData.steelers.territory}
-            />
-            <Layout.Participant
-                avatar={teamData.ravens.avatar}
-                name={teamData.ravens.name}
-                points="28"
-                rank={teamData.ravens.rank}
-                territory={teamData.ravens.territory}
-                winner
-            />
+            <Flex justify="between">
+              <Body>Steelers</Body>
+              <Body>14</Body>
+            </Flex>
+            <Flex justify="between">
+              <Body><strong>Ravens</strong></Body>
+              <Body>28</Body>
+            </Flex>
           </Layout.Game>
         </Layout.Round>
         <Layout.RoundLabel>
@@ -252,73 +100,44 @@ const LayoutBracket = () => {
         </Layout.RoundLabel>
         <Layout.Round marginBottom={{ xs: "md", sm: "md" }}>
           <Layout.Game>
-            <Layout.Participant
-                avatar={teamData.rams.avatar}
-                name={teamData.rams.name}
-                points="22"
-                rank={teamData.rams.rank}
-                territory={teamData.rams.territory}
-            />
-            <Layout.Participant
-                avatar={teamData.eagles.avatar}
-                name={teamData.eagles.name}
-                points="28"
-                rank={teamData.eagles.rank}
-                self
-                territory={teamData.eagles.territory}
-                winner
-            />
+            <Flex justify="between">
+              <Body>Rams</Body>
+              <Body>22</Body>
+            </Flex>
+            <Flex justify="between">
+              <Body><strong>Eagles</strong></Body>
+              <Body>28</Body>
+            </Flex>
           </Layout.Game>
           <Layout.Game>
-            <Layout.Participant
-                avatar={teamData.commanders.avatar}
-                name={teamData.commanders.name}
-                points="45"
-                rank={teamData.commanders.rank}
-                territory={teamData.commanders.territory}
-                winner
-            />
-            <Layout.Participant
-                avatar={teamData.lions.avatar}
-                name={teamData.lions.name}
-                points="31"
-                rank={teamData.lions.rank}
-                territory={teamData.lions.territory}
-            />
+            <Flex justify="between">
+              <Body><strong>Commanders</strong></Body>
+              <Body>45</Body>
+            </Flex>
+            <Flex justify="between">
+              <Body>Lions</Body>
+              <Body>31</Body>
+            </Flex>
           </Layout.Game>
           <Layout.Game>
-            <Layout.Participant
-                avatar={teamData.texans.avatar}
-                name={teamData.texans.name}
-                points="14"
-                rank={teamData.texans.rank}
-                territory={teamData.texans.territory}
-            />
-            <Layout.Participant
-                avatar={teamData.chiefs.avatar}
-                name={teamData.chiefs.name}
-                points="23"
-                rank={teamData.chiefs.rank}
-                territory={teamData.chiefs.territory}
-                winner
-            />
+            <Flex justify="between">
+              <Body>Texans</Body>
+              <Body>14</Body>
+            </Flex>
+            <Flex justify="between">
+              <Body><strong>Chiefs</strong></Body>
+              <Body>23</Body>
+            </Flex>
           </Layout.Game>
           <Layout.Game>
-            <Layout.Participant
-                avatar={teamData.ravens.avatar}
-                name={teamData.ravens.name}
-                points="25"
-                rank={teamData.ravens.rank}
-                territory={teamData.ravens.territory}
-            />
-            <Layout.Participant
-                avatar={teamData.bills.avatar}
-                name={teamData.bills.name}
-                points="27"
-                rank={teamData.bills.rank}
-                territory={teamData.bills.territory}
-                winner
-            />
+            <Flex justify="between">
+              <Body>Ravens</Body>
+              <Body>25</Body>
+            </Flex>
+            <Flex justify="between">
+              <Body><strong>Bills</strong></Body>
+              <Body>27</Body>
+            </Flex>
           </Layout.Game>
         </Layout.Round>
         <Layout.RoundLabel>
@@ -327,39 +146,24 @@ const LayoutBracket = () => {
         </Layout.RoundLabel>
         <Layout.Round marginBottom={{ xs: "md", sm: "md" }}>
           <Layout.Game>
-            <Layout.Participant
-                avatar={teamData.commanders.avatar}
-                name={teamData.commanders.name}
-                points="23"
-                rank={teamData.commanders.rank}
-                territory={teamData.commanders.territory}
-            />
-            <Layout.Participant
-                avatar={teamData.eagles.avatar}
-                name={teamData.eagles.name}
-                points="55"
-                rank={teamData.eagles.rank}
-                self
-                territory={teamData.eagles.territory}
-                winner
-            />
+            <Flex justify="between">
+              <Body>Commanders</Body>
+              <Body>23</Body>
+            </Flex>
+            <Flex justify="between">
+              <Body><strong>Eagles</strong></Body>
+              <Body>55</Body>
+            </Flex>
           </Layout.Game>
           <Layout.Game>
-            <Layout.Participant
-                avatar={teamData.bills.avatar}
-                name={teamData.bills.name}
-                points="29"
-                rank={teamData.bills.rank}
-                territory={teamData.bills.territory}
-            />
-            <Layout.Participant
-                avatar={teamData.chiefs.avatar}
-                name={teamData.chiefs.name}
-                points="32"
-                rank={teamData.chiefs.rank}
-                territory={teamData.chiefs.territory}
-                winner
-            />
+            <Flex justify="between">
+              <Body>Bills</Body>
+              <Body>29</Body>
+            </Flex>
+            <Flex justify="between">
+              <Body><strong>Chiefs</strong></Body>
+              <Body>32</Body>
+            </Flex>
           </Layout.Game>
         </Layout.Round>
         <Layout.RoundLabel>
@@ -368,22 +172,14 @@ const LayoutBracket = () => {
         </Layout.RoundLabel>
         <Layout.Round>
           <Layout.Game>
-            <Layout.Participant
-                avatar={teamData.chiefs.avatar}
-                name={teamData.chiefs.name}
-                points="22"
-                rank={teamData.chiefs.rank}
-                territory={teamData.chiefs.territory}
-            />
-            <Layout.Participant
-                avatar={teamData.eagles.avatar}
-                name={teamData.eagles.name}
-                points="40"
-                rank={teamData.eagles.rank}
-                self
-                territory={teamData.eagles.territory}
-                winner
-            />
+            <Flex justify="between">
+              <Body>Chiefs</Body>
+              <Body>22</Body>
+            </Flex>
+            <Flex justify="between">
+              <Body><strong>Eagles</strong></Body>
+              <Body>40</Body>
+            </Flex>
           </Layout.Game>
         </Layout.Round>
       </Layout>

data/app/pb_kits/playbook/pb_layout/docs/_layout_bracket.md

@@ -1,4 +1,4 @@
-Use `<Layout.RoundLabel>`, `<Layout.Round>`, `<Layout.Game>`, and/or `<Layout.Participant>` to make a bracket layout. Feel free to use custom components in place of the template components based on your needs. 
+Use `<Layout.RoundLabel>`, `<Layout.Round>`, and `<Layout.Game>` to make a bracket layout.
 
 On mobile devices, `<Layout.RoundLabel>` will display (on desktop these components are hidden) and the bracket will be in one column.