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

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

@@ -1,26 +1,24 @@
 import PbEnhancedElement from "../pb_enhanced_element";
 
-const DRAGGABLE_SELECTOR  = "[data-pb-draggable]";
+const DRAGGABLE_SELECTOR = "[data-pb-draggable]";
 const DRAGGABLE_CONTAINER = ".pb_draggable_container";
-const NEEDS_CLONE         = ["shadow", "outline"];   // clone only for these types
 
 export default class PbDraggable extends PbEnhancedElement {
-  static get selector() { return DRAGGABLE_SELECTOR; }
+  static get selector() {
+    return DRAGGABLE_SELECTOR;
+  }
 
   connect() {
     this.state = {
-      items:        [],
-      dragData:     { id: "", initialGroup: "" },
-      isDragging:   "",
-      activeContainer: "",
+      items: [],
+      dragData: { id: "", initialGroup: "" },
+      isDragging: "",
+      activeContainer: ""
     };
 
-    this.draggedItem   = null;
+    this.draggedItem = null;
     this.draggedItemId = null;
-    this.dragGhost     = null;
     this.hasMultipleContainers = false;
-    this.dragZoneType  = "";
-    this.dragZoneColor = "";
 
     document.addEventListener("DOMContentLoaded", () => this.bindEventListeners());
   }
@@ -28,12 +26,13 @@ export default class PbDraggable extends PbEnhancedElement {
   setState(newState) {
     this.state = { ...this.state, ...newState };
     if (newState.items) {
-      this.element.dispatchEvent(new CustomEvent("pb-draggable-reorder", {
+      const customEvent = new CustomEvent('pb-draggable-reorder', {
         detail: {
           reorderedItems: this.state.items,
-          containerId:    this.element.querySelector(DRAGGABLE_CONTAINER).id,
-        },
-      }));
+          containerId: this.element.querySelector(DRAGGABLE_CONTAINER).id
+        }
+      });
+      this.element.dispatchEvent(customEvent);
     }
   }
 
@@ -44,100 +43,71 @@ export default class PbDraggable extends PbEnhancedElement {
 
     // Needed to prevent images within draggable items from being independently draggable
     // Needed if using Image kit in draggable items
-    this.element.querySelectorAll(".pb_draggable_item img")
-      .forEach(img => img.setAttribute("draggable", "false"));
-
-    this.element.querySelectorAll(".pb_draggable_item")
-      .forEach(item => {
-        item.addEventListener("dragstart", this.handleDragStart.bind(this));
-        item.addEventListener("dragend",   this.handleDragEnd.bind(this));
-        item.addEventListener("dragenter", this.handleDragEnter.bind(this));
-      });
+    this.element.querySelectorAll(".pb_draggable_item img").forEach(img => {
+      img.setAttribute("draggable", "false");
+    });
 
-    containers.forEach(c => {
-      c.addEventListener("dragover", this.handleDragOver.bind(this));
-      c.addEventListener("drop",     this.handleDrop.bind(this));
+    this.element.querySelectorAll(".pb_draggable_item").forEach(item => {
+      item.addEventListener("dragstart", this.handleDragStart.bind(this));
+      item.addEventListener("dragend", this.handleDragEnd.bind(this));
+      item.addEventListener("dragenter", this.handleDragEnter.bind(this));
+    });
+
+    containers.forEach(container => {
+      container.addEventListener("dragover", this.handleDragOver.bind(this));
+      container.addEventListener("drop", this.handleDrop.bind(this));
     });
   }
 
-  /* ---------------- DRAG START ---------------- */
   handleDragStart(event) {
     // Needed to prevent images within draggable items from being independently draggable
     // Needed if using Image kit in draggable items
-    if (event.target.tagName.toLowerCase() === "img") {
+    if (event.target.tagName.toLowerCase() === 'img') {
       event.preventDefault();
       return;
     }
 
-    const container    = event.target.closest(DRAGGABLE_CONTAINER);
-    this.draggedItem   = event.target;
+    const container = event.target.closest(DRAGGABLE_CONTAINER);
+    this.draggedItem = event.target;
     this.draggedItemId = event.target.id;
-    this.dragZoneType  = this.element.dataset.dropZoneType  || "";
-    this.dragZoneColor = this.element.dataset.dropZoneColor || "";
 
     this.setState({
-      dragData:   { id: this.draggedItemId, initialGroup: container.id },
-      isDragging: this.draggedItemId,
+      dragData: { id: this.draggedItemId, initialGroup: container.id },
+      isDragging: this.draggedItemId
     });
 
-    this.draggedItem.classList.add(
-      "is_dragging",
-      `drop_zone_${this.dragZoneType}`,
-      `drop_zone_color_${this.dragZoneColor}`,
-    );
-
+    event.target.classList.add("is_dragging");
     if (event.dataTransfer) {
-      event.dataTransfer.effectAllowed = "move";
-      event.dataTransfer.setData("text/plain", this.draggedItemId);
-
-      /* ---------- custom ghost clone (shadow + outline only) ---------- */
-      if (NEEDS_CLONE.includes(this.dragZoneType)) {
-        const ghost = this.draggedItem.cloneNode(true);
-        ghost.classList.remove(
-          "is_dragging",
-          `drop_zone_${this.dragZoneType}`,
-          `drop_zone_color_${this.dragZoneColor}`,
-        );
-        const { width, height } = this.draggedItem.getBoundingClientRect();
-        Object.assign(ghost.style, {
-          border:    "none",
-          width:     `${width}px`,
-          height:    `${height}px`,
-          position:  "absolute",
-          top:      "-9999px",
-          left:     "-9999px",
-          boxSizing: "border-box",
-          zIndex:    "9999",
-        });
-        document.body.appendChild(ghost);
-        this.dragGhost = ghost;
-        event.dataTransfer.setDragImage(ghost, width / 2, height / 2);
-      }
-      /* ---------------------------------------------------------------- */
+      event.dataTransfer.effectAllowed = 'move';
+      event.dataTransfer.setData('text/plain', this.draggedItemId);
     }
 
-    requestAnimationFrame(() => (event.target.style.opacity = "0.5"));
+    setTimeout(() => {
+      event.target.style.opacity = '0.5';
+    }, 0);
   }
 
-  /* ---------------- DRAG ENTER ---------------- */
   handleDragEnter(event) {
     if (!this.draggedItem || event.target === this.draggedItem) return;
-    this.hasMultipleContainers
-      ? this.handleMultiContainerDragEnter(event)
-      : this.handleSingleContainerDragEnter(event);
+
+    if (this.hasMultipleContainers) {
+      this.handleMultiContainerDragEnter(event);
+    } else {
+      this.handleSingleContainerDragEnter(event);
+    }
   }
 
   handleSingleContainerDragEnter(event) {
-    const targetItem = event.target.closest(".pb_draggable_item");
-    // If we're entering a container directly or there's no target item
+    const targetItem = event.target.closest('.pb_draggable_item');
     if (!targetItem) return;
 
     const container = targetItem.parentNode;
-    const items     = Array.from(container.children);
-    const fromIdx   = items.indexOf(this.draggedItem);
-    const toIdx     = items.indexOf(targetItem);
+    const items = Array.from(container.children);
 
-    if (fromIdx > toIdx) {
+    const draggedIndex = items.indexOf(this.draggedItem);
+    const targetIndex = items.indexOf(targetItem);
+
+    if (draggedIndex > targetIndex) {
       container.insertBefore(this.draggedItem, targetItem);
     } else {
       container.insertBefore(this.draggedItem, targetItem.nextSibling);
@@ -146,113 +116,146 @@ export default class PbDraggable extends PbEnhancedElement {
 
   handleMultiContainerDragEnter(event) {
     const targetContainer = event.target.closest(DRAGGABLE_CONTAINER);
-    const targetItem      = event.target.closest(".pb_draggable_item");
+    const targetItem = event.target.closest('.pb_draggable_item');
+
     if (!targetContainer) return;
 
+    // If we're entering a container directly or there's no target item
     if (!targetItem) {
-      const last = targetContainer.querySelector(".pb_draggable_item:last-child");
-      last
-        ? targetContainer.insertBefore(this.draggedItem, last.nextSibling)
-        : targetContainer.appendChild(this.draggedItem);
+      const lastItem = targetContainer.querySelector('.pb_draggable_item:last-child');
+      if (lastItem) {
+        targetContainer.insertBefore(this.draggedItem, lastItem.nextSibling);
+      } else {
+        targetContainer.appendChild(this.draggedItem);
+      }
       return;
     }
 
-    const items = Array.from(targetContainer.children);
-    this.setState({ items: items.map(i => ({ id: i.id, container: targetContainer.id })) });
+    const container = targetItem.parentNode;
+    const items = Array.from(container.children);
+
+    const newItems = [...items].map(item => ({
+      id: item.id,
+      container: container.id
+    }));
+
+    this.setState({ items: newItems });
 
-    const midY = targetItem.getBoundingClientRect().top +
-                 targetItem.getBoundingClientRect().height / 2;
+    const rect = targetItem.getBoundingClientRect();
+    const middleY = rect.top + rect.height / 2;
 
-    if (event.clientY < midY) {
-      targetContainer.insertBefore(this.draggedItem, targetItem);
+    if (event.clientY < middleY) {
+      container.insertBefore(this.draggedItem, targetItem);
     } else {
-      targetContainer.insertBefore(this.draggedItem, targetItem.nextSibling);
+      container.insertBefore(this.draggedItem, targetItem.nextSibling);
     }
   }
 
-  /* ---------------- DRAG OVER ---------------- */
   handleDragOver(event) {
     event.preventDefault();
     event.stopPropagation();
-    this.hasMultipleContainers
-      ? this.handleMultiContainerDragOver(event)
-      : this.handleSingleContainerDragOver(event);
+
+    if (this.hasMultipleContainers) {
+      this.handleMultiContainerDragOver(event);
+    } else {
+      this.handleSingleContainerDragOver(event);
+    }
   }
 
   handleSingleContainerDragOver(event) {
     const container = event.target.closest(DRAGGABLE_CONTAINER);
-    if (container) container.classList.add("active_container");
+    if (container) {
+      container.classList.add("active_container");
+    }
   }
 
   handleMultiContainerDragOver(event) {
-    const container = event.target.matches(DRAGGABLE_CONTAINER)
-      ? event.target
-      : event.target.closest(DRAGGABLE_CONTAINER);
-    if (!container) return;
-
-    this.setState({ activeContainer: container.id });
-    container.classList.add("active_container");
-
-    const last = container.querySelector(".pb_draggable_item:last-child");
-    if (!last || event.clientY > last.getBoundingClientRect().bottom) {
-      if (this.draggedItem && this.draggedItem.parentNode !== container) {
-        container.appendChild(this.draggedItem);
+    let container;
+    if (event.target.matches(DRAGGABLE_CONTAINER)) {
+      container = event.target;
+    } else {
+      container = event.target.closest(DRAGGABLE_CONTAINER);
+    }
+
+    if (container) {
+      this.setState({ activeContainer: container.id });
+      container.classList.add("active_container");
+
+      // If dragging over empty container or below last item
+      const lastItem = container.querySelector('.pb_draggable_item:last-child');
+      if (!lastItem || (lastItem && event.clientY > lastItem.getBoundingClientRect().bottom)) {
+        if (this.draggedItem && this.draggedItem.parentNode !== container) {
+          container.appendChild(this.draggedItem);
+        }
       }
     }
   }
 
-  /* ---------------- DROP ---------------- */
   handleDrop(event) {
     event.preventDefault();
     event.stopPropagation();
 
-    const container = event.target.matches(DRAGGABLE_CONTAINER)
-      ? event.target
-      : event.target.closest(DRAGGABLE_CONTAINER);
+    let container;
+    if (event.target.matches(DRAGGABLE_CONTAINER)) {
+      container = event.target;
+    } else {
+      container = event.target.closest(DRAGGABLE_CONTAINER);
+    }
+
     if (!container || !this.draggedItem) return;
 
     container.classList.remove("active_container");
-    this.draggedItem.style.opacity = "1";
+    this.draggedItem.style.opacity = '1';
 
     // Handle empty containers
-    if (this.hasMultipleContainers && !container.querySelector(".pb_draggable_item")) {
+    if (this.hasMultipleContainers && !container.querySelector('.pb_draggable_item')) {
       container.appendChild(this.draggedItem);
     }
 
     // Updated order of items as an array of item IDs
-    const reorderedItems = Array.from(this.element.querySelectorAll(".pb_draggable_item"))
-      .map(i => ({ id: i.id, container: i.closest(DRAGGABLE_CONTAINER).id }));
-
-    container.dataset.reorderedItems = JSON.stringify(reorderedItems);
-    this.element.dispatchEvent(new CustomEvent("pb-draggable-reorder", {
-      detail: { reorderedItems, containerId: container.id },
+    const reorderedItems = Array.from(
+      this.element.querySelectorAll('.pb_draggable_item')
+    ).map(item => ({
+      id: item.id,
+      container: item.closest(DRAGGABLE_CONTAINER).id
     }));
 
-    this.setState({ items: reorderedItems, isDragging: "", activeContainer: "" });
-    this.draggedItem   = null;
+    // Store reordered items in a data attribute on the container
+    container.setAttribute("data-reordered-items", JSON.stringify(reorderedItems));
+
+    const customEvent = new CustomEvent('pb-draggable-reorder', {
+      detail: {
+        reorderedItems,
+        containerId: container.id,
+      }
+    });
+
+    this.element.dispatchEvent(customEvent);
+
+    this.setState({
+      items: reorderedItems,
+      isDragging: "",
+      activeContainer: ""
+    });
+
+    this.draggedItem = null;
     this.draggedItemId = null;
   }
 
-  /* ---------------- DRAG END ---------------- */
   handleDragEnd(event) {
-    event.target.classList.remove(
-      "is_dragging",
-      `drop_zone_${this.dragZoneType}`,
-      `drop_zone_color_${this.dragZoneColor}`,
-    );
-    event.target.style.opacity = "1";
-
-    if (this.dragGhost) {
-      document.body.removeChild(this.dragGhost);
-      this.dragGhost = null;
-    }
-
-    this.setState({ isDragging: "", activeContainer: "" });
+    event.target.classList.remove("is_dragging");
+    event.target.style.opacity = '1';
 
-    this.element.querySelectorAll(DRAGGABLE_CONTAINER)
-      .forEach(c => c.classList.remove("active_container"));
+    this.setState({
+      isDragging: "",
+      activeContainer: ""
+    });
 
-    this.draggedItem   = null;
+    this.draggedItem = null;
     this.draggedItemId = null;
+
+    this.element.querySelectorAll(DRAGGABLE_CONTAINER).forEach(container => {
+      container.classList.remove("active_container");
+    });
   }
 }

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/docs/_dropdown_error.jsx

@@ -1,12 +1,9 @@
 import React, { useState } from 'react'
 import Dropdown from '../../pb_dropdown/_dropdown'
-import Icon from '../../pb_icon/_icon'
 
 const DropdownError = (props) => {
     const [selectedOption, setSelectedOption] = useState()
-    const error = selectedOption?.value ? null : (<>
-        <Icon icon="warning" /> Please make a valid selection
-    </>)
+    const error = selectedOption?.value ? null : "Please make a valid selection"
     const options = [
         {
             label: "United States",

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_filter/docs/example.yml

@@ -11,7 +11,6 @@ examples:
   - filter_max_height: Max Height for Popover Inside of Filter
   - filter_placement: Filter Placement
   - filter_popover_props: Popover Props
-  - filter_within_turbo_frames: Within Turbo Frames
 
   react:
   - filter_default: Default

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_gauge/docs/example.yml

@@ -15,7 +15,6 @@ examples:
 
   react:
   - gauge_default: Default
-  - gauge_pb_styles: Playbook Styles
   - gauge_disable_animation: Disable Animation
   - gauge_title: Title
   - gauge_units: Units

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

@@ -1,5 +1,4 @@
 export { default as GaugeDefault } from './_gauge_default.jsx'
-export { default as GaugePbStyles } from './_gauge_pb_styles.jsx'
 export { default as GaugeDisableAnimation } from './_gauge_disable_animation.jsx'
 export { default as GaugeFullCircle } from './_gauge_full_circle.jsx'
 export { default as GaugeHeight } from './_gauge_height.jsx'