playbook_ui 13.20.0 → 13.21.0.pre.alpha.PBNTR224letuserresetrowexpansion2466

data/app/pb_kits/playbook/pb_table/subcomponents/_table_cell.tsx

@@ -0,0 +1,66 @@
+import React from "react";
+import classnames from "classnames";
+import {
+  buildAriaProps,
+  buildDataProps,
+  buildHtmlProps,
+} from "../../utilities/props";
+import { globalProps } from "../../utilities/globalProps";
+
+type TableCellPropTypes = {
+  aria?: { [key: string]: string };
+  children: React.ReactNode[] | React.ReactNode;
+  className: string;
+  data?: { [key: string]: string };
+  htmlOptions?: { [key: string]: string | number | boolean | (() => void) };
+  id?: string;
+  tag?: "table" | "div";
+  text?: string
+};
+
+const TableCell = (props: TableCellPropTypes) => {
+  const {
+    aria = {},
+    children,
+    className,
+    data = {},
+    htmlOptions = {},
+    id,
+    tag = "table",
+    text,
+  } = props;
+
+  const ariaProps = buildAriaProps(aria);
+  const dataProps = buildDataProps(data);
+  const htmlProps = buildHtmlProps(htmlOptions);
+  const classes = classnames("pb_table_td", globalProps(props), className);
+  const isTableTag = tag === "table";
+
+  return (
+    <>
+      {isTableTag ? (
+        <td
+            {...ariaProps}
+            {...dataProps}
+            {...htmlProps}
+            className={classes}
+            id={id}
+        >
+          {text || children}
+        </td>
+      ) : (
+        <div
+            {...ariaProps}
+            {...dataProps}
+            {...htmlProps}
+            className={classes}
+            id={id}
+        >
+          {text || children}
+        </div>
+      )}
+    </>
+  );
+};
+
+export default TableCell;

data/app/pb_kits/playbook/pb_table/subcomponents/_table_head.tsx

@@ -0,0 +1,64 @@
+import React from "react";
+import classnames from "classnames";
+import {
+  buildAriaProps,
+  buildDataProps,
+  buildHtmlProps,
+} from "../../utilities/props";
+import { globalProps } from "../../utilities/globalProps";
+
+type TableHeadPropTypes = {
+  aria?: { [key: string]: string };
+  children: React.ReactNode[] | React.ReactNode;
+  className: string;
+  data?: { [key: string]: string };
+  htmlOptions?: { [key: string]: string | number | boolean | (() => void) };
+  id?: string;
+  tag?: "table" | "div";
+};
+
+const TableHead = (props: TableHeadPropTypes) => {
+  const {
+    aria = {},
+    children,
+    className,
+    data = {},
+    htmlOptions = {},
+    id,
+    tag = "table",
+  } = props;
+
+  const ariaProps = buildAriaProps(aria);
+  const dataProps = buildDataProps(data);
+  const htmlProps = buildHtmlProps(htmlOptions);
+  const classes = classnames("pb_table_thead", globalProps(props), className);
+  const isTableTag = tag === "table";
+
+  return (
+    <>
+      {isTableTag ? (
+        <thead
+            {...ariaProps}
+            {...dataProps}
+            {...htmlProps}
+            className={classes}
+            id={id}
+        >
+          {children}
+        </thead>
+      ) : (
+        <div
+            {...ariaProps}
+            {...dataProps}
+            {...htmlProps}
+            className={classes}
+            id={id}
+        >
+          {children}
+        </div>
+      )}
+    </>
+  );
+};
+
+export default TableHead;

data/app/pb_kits/playbook/pb_table/subcomponents/_table_header.tsx

@@ -0,0 +1,66 @@
+import React from "react";
+import classnames from "classnames";
+import {
+  buildAriaProps,
+  buildDataProps,
+  buildHtmlProps,
+} from "../../utilities/props";
+import { globalProps } from "../../utilities/globalProps";
+
+type TableHeaderPropTypes = {
+  aria?: { [key: string]: string };
+  children: React.ReactNode[] | React.ReactNode;
+  className: string;
+  data?: { [key: string]: string };
+  htmlOptions?: { [key: string]: string | number | boolean | (() => void) };
+  id?: string;
+  tag?: "table" | "div";
+  text?: string;
+};
+
+const TableHeader = (props: TableHeaderPropTypes) => {
+  const {
+    aria = {},
+    children,
+    className,
+    data = {},
+    htmlOptions = {},
+    id,
+    tag = "table",
+    text
+  } = props;
+
+  const ariaProps = buildAriaProps(aria);
+  const dataProps = buildDataProps(data);
+  const htmlProps = buildHtmlProps(htmlOptions);
+  const classes = classnames("pb_table_th", globalProps(props), className);
+  const isTableTag = tag === "table";
+
+  return (
+    <>
+      {isTableTag ? (
+        <th
+            {...ariaProps}
+            {...dataProps}
+            {...htmlProps}
+            className={classes}
+            id={id}
+        >
+          {text || children}
+        </th>
+      ) : (
+        <div
+            {...ariaProps}
+            {...dataProps}
+            {...htmlProps}
+            className={classes}
+            id={id}
+        >
+          {text || children}
+        </div>
+      )}
+    </>
+  );
+};
+
+export default TableHeader;

data/app/pb_kits/playbook/pb_table/subcomponents/_table_row.tsx

@@ -0,0 +1,74 @@
+import React from "react";
+import classnames from "classnames";
+import {
+  buildAriaProps,
+  buildCss,
+  buildDataProps,
+  buildHtmlProps,
+} from "../../utilities/props";
+import { globalProps } from "../../utilities/globalProps";
+
+type TableRowPropTypes = {
+  aria?: { [key: string]: string };
+  children: React.ReactNode[] | React.ReactNode;
+  className: string;
+  data?: { [key: string]: string };
+  htmlOptions?: { [key: string]: string | number | boolean | (() => void) };
+  id?: string;
+  sideHighlightColor: string;
+  tag?: "table" | "div";
+};
+
+const TableRow = (props: TableRowPropTypes) => {
+  const {
+    aria = {},
+    children,
+    className,
+    data = {},
+    htmlOptions = {},
+    id,
+    sideHighlightColor = "none",
+    tag = "table",
+  } = props;
+
+  const ariaProps = buildAriaProps(aria);
+  const dataProps = buildDataProps(data);
+  const htmlProps = buildHtmlProps(htmlOptions);
+  const sideHighlightClass =
+    sideHighlightColor != "" ? `side_highlight_${sideHighlightColor}` : null;
+  const classes = classnames(
+    buildCss("pb_table_row_kit", sideHighlightClass),
+    "pb_table_tr",
+    globalProps(props),
+    className
+  );
+  const isTableTag = tag === "table";
+
+  return (
+    <>
+      {isTableTag ? (
+        <tr
+            {...ariaProps}
+            {...dataProps}
+            {...htmlProps}
+            className={classes}
+            id={id}
+        >
+          {children}
+        </tr>
+      ) : (
+        <div
+            {...ariaProps}
+            {...dataProps}
+            {...htmlProps}
+            className={classes}
+            id={id}
+        >
+          {children}
+        </div>
+      )}
+    </>
+  );
+};
+
+export default TableRow;

data/app/pb_kits/playbook/pb_table/subcomponents/index.tsx

@@ -0,0 +1,5 @@
+export { default as TableHead } from './_table_head';
+export { default as TableHeader } from './_table_header';
+export { default as TableBody } from './_table_body';
+export { default as TableRow } from './_table_row';
+export { default as TableCell } from './_table_cell';

data/app/pb_kits/playbook/pb_table/table.html.erb

@@ -4,7 +4,8 @@
       aria: object.aria,
       class: object.classname,
       data: object.data,
-      id: object.id) do %>
+      id: object.id,
+      **combined_html_options) do %>
       <%= content.presence %>
     <% end %>
   <% else %>
@@ -12,7 +13,8 @@
       aria: object.aria,
       class: object.classname,
       data: object.data,
-      id: object.id) do %>
+      id: object.id,
+      **combined_html_options) do %>
       <%= content.presence %>
     <% end %>
   <% end %>

data/app/pb_kits/playbook/pb_table/table.test.js

@@ -1,7 +1,58 @@
-import { ensureAccessible, renderKit } from "../utilities/test-utils"
+import React from "react";
+import { ensureAccessible, renderKit, render, screen } from "../utilities/test-utils"
 
 import Table from "./_table"
 
+const DivsTable = () => {
+  return (
+    <>
+      <Table 
+          data={{testid: "table"}}
+          size="sm" 
+          tag="div"
+      >
+        <Table.Head tag="div">
+          <Table.Row tag="div">
+            <Table.Header tag="div">{"Column 1"}</Table.Header>
+            <Table.Header tag="div">{"Column 2"}</Table.Header>
+          </Table.Row>
+        </Table.Head>
+        <Table.Body tag="div">
+          <Table.Row tag="div">
+            <Table.Cell tag="div">{"Value 1"}</Table.Cell>
+            <Table.Cell tag="div">{"Value 2"}</Table.Cell>
+          </Table.Row>
+        </Table.Body>
+      </Table>
+    </>
+  );
+};
+
+const TableTagTable = () => {
+  return (
+    <>
+      <Table 
+          data={{testid: "table"}}
+          size="sm" 
+      >
+        <Table.Head>
+          <Table.Row>
+            <Table.Header>{"Column 1"}</Table.Header>
+            <Table.Header>{"Column 2"}</Table.Header>
+          </Table.Row>
+        </Table.Head>
+        <Table.Body>
+          <Table.Row>
+            <Table.Cell>{"Value 1"}</Table.Cell>
+            <Table.Cell>{"Value 2"}</Table.Cell>
+          </Table.Row>
+        </Table.Body>
+      </Table>
+    </>
+  );
+};
+
+
 const props = {
   data: { testid: "table" },
   sticky: false
@@ -20,3 +71,93 @@ test("when striped is true", () => {
   const kit = renderKit(Table, props, { striped: true })
   expect(kit).toHaveClass("pb_table table-sm table-responsive-collapse table-card striped table-collapse-sm")
 })
+
+test("Renders Table.Head subkit for Div Table", () => {
+  render (<DivsTable/>)
+
+  const kit = screen.getByTestId("table")
+  const head = kit.querySelector(".pb_table_thead")
+  expect(head).toBeInTheDocument()
+  expect(head.tagName).toBe("DIV")
+})
+
+test("Renders Table.Header subkit for Div Table", () => {
+  render (<DivsTable/>)
+
+  const kit = screen.getByTestId("table")
+  const head = kit.querySelector(".pb_table_th")
+  expect(head).toBeInTheDocument()
+  expect(head.tagName).toBe("DIV")
+})
+
+test("Renders Table.Body subkit for Div Table", () => {
+  render (<DivsTable/>)
+
+  const kit = screen.getByTestId("table")
+  const head = kit.querySelector(".pb_table_tbody")
+  expect(head).toBeInTheDocument()
+  expect(head.tagName).toBe("DIV")
+})
+
+test("Renders Table.Row subkit for Div Table", () => {
+  render (<DivsTable/>)
+
+  const kit = screen.getByTestId("table")
+  const head = kit.querySelector(".pb_table_tr")
+  expect(head).toBeInTheDocument()
+  expect(head.tagName).toBe("DIV")
+})
+
+test("Renders Table.Cell subkit for Div Table", () => {
+  render (<DivsTable/>)
+
+  const kit = screen.getByTestId("table")
+  const head = kit.querySelector(".pb_table_td")
+  expect(head).toBeInTheDocument()
+  expect(head.tagName).toBe("DIV")
+})
+
+test("Renders Table.Head subkit for HTML Table elements Table", () => {
+  render (<TableTagTable/>)
+
+  const kit = screen.getByTestId("table")
+  const head = kit.querySelector(".pb_table_thead")
+  expect(head).toBeInTheDocument()
+  expect(head.tagName).toBe("THEAD")
+})
+
+test("Renders Table.Header subkit for HTML Table elements Table", () => {
+  render (<TableTagTable/>)
+
+  const kit = screen.getByTestId("table")
+  const head = kit.querySelector(".pb_table_th")
+  expect(head).toBeInTheDocument()
+  expect(head.tagName).toBe("TH")
+})
+
+test("Renders Table.Body subkit for HTML Table elements Table", () => {
+  render (<TableTagTable/>)
+
+  const kit = screen.getByTestId("table")
+  const head = kit.querySelector(".pb_table_tbody")
+  expect(head).toBeInTheDocument()
+  expect(head.tagName).toBe("TBODY")
+})
+
+test("Renders Table.Row subkit for HTML Table elements Table", () => {
+  render (<TableTagTable/>)
+
+  const kit = screen.getByTestId("table")
+  const head = kit.querySelector(".pb_table_tr")
+  expect(head).toBeInTheDocument()
+  expect(head.tagName).toBe("TR")
+})
+
+test("Renders Table.Cell subkit for HTML Table elements Table", () => {
+  render (<TableTagTable/>)
+
+  const kit = screen.getByTestId("table")
+  const head = kit.querySelector(".pb_table_td")
+  expect(head).toBeInTheDocument()
+  expect(head.tagName).toBe("TD")
+})

data/app/pb_kits/playbook/pb_table/table_body.html.erb

@@ -0,0 +1,19 @@
+<% if object.tag == "table" %>
+    <%= content_tag(:tbody,
+      aria: object.aria,
+      class: object.classname,
+      data: object.data,
+      id: object.id,
+      **combined_html_options) do %>
+      <%= content.presence %>
+    <% end %>
+<% else %>
+    <%= content_tag(:div,
+      aria: object.aria,
+      class: object.classname,
+      data: object.data,
+      id: object.id,
+      **combined_html_options) do %>
+      <%= content.presence %>
+    <% end %>
+<% end %>

data/app/pb_kits/playbook/pb_table/table_body.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Playbook
+  module PbTable
+    class TableBody < Playbook::KitBase
+      prop :tag, type: Playbook::Props::Enum,
+                 values: %w[table div],
+                 default: "table"
+
+      def classname
+        generate_classname("pb_table_tbody")
+      end
+    end
+  end
+end

data/app/pb_kits/playbook/pb_table/table_cell.html.erb

@@ -0,0 +1,19 @@
+<% if object.tag == "table" %>
+    <%= content_tag(:td,
+      aria: object.aria,
+      class: object.classname,
+      data: object.data,
+      id: object.id,
+      **combined_html_options) do %>
+      <%= content.presence || object.text %>
+    <% end %>
+<% else %>
+    <%= content_tag(:div,
+      aria: object.aria,
+      class: object.classname,
+      data: object.data,
+      id: object.id,
+      **combined_html_options) do %>
+      <%= content.presence || object.text %>
+    <% end %>
+<% end %>

data/app/pb_kits/playbook/pb_table/table_cell.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Playbook
+  module PbTable
+    class TableCell < Playbook::KitBase
+      prop :tag, type: Playbook::Props::Enum,
+                 values: %w[table div],
+                 default: "table"
+      prop :text, type: Playbook::Props::String,
+                  default: ""
+
+      def classname
+        generate_classname("pb_table_td")
+      end
+    end
+  end
+end

data/app/pb_kits/playbook/pb_table/table_head.html.erb

@@ -0,0 +1,19 @@
+<% if object.tag == "table" %>
+    <%= content_tag(:thead,
+      aria: object.aria,
+      class: object.classname,
+      data: object.data,
+      id: object.id,
+      **combined_html_options) do %>
+      <%= content.presence %>
+    <% end %>
+<% else %>
+    <%= content_tag(:div,
+      aria: object.aria,
+      class: object.classname,
+      data: object.data,
+      id: object.id,
+      **combined_html_options) do %>
+      <%= content.presence %>
+    <% end %>
+<% end %>

data/app/pb_kits/playbook/pb_table/table_head.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Playbook
+  module PbTable
+    class TableHead < Playbook::KitBase
+      prop :tag, type: Playbook::Props::Enum,
+                 values: %w[table div],
+                 default: "table"
+
+      def classname
+        generate_classname("pb_table_thead")
+      end
+    end
+  end
+end

data/app/pb_kits/playbook/pb_table/table_header.html.erb

@@ -1,47 +1,59 @@
-<%= content_tag(:th,
-    colspan: object.colspan,
-    aria: object.aria,
-    class: object.classname,
-    data: object.data,
-    id: "pb-th#{object.id}" ) do %>
-  <% unless sorting_style? %>
-    <%= pb_rails("flex", props:{ align: object.align_content, justify: object.justify_sort_icon, classname: "pb_th_nolink" }) do %>
-      <%= content.presence || object.text %>
-    <% end %>
-  <% else %>
-    <%= link_to next_link, style: link_style do %>
-      <%= pb_rails("flex", props:{ align: object.align_content, justify: object.justify_sort_icon, classname: "pb_th_link" }) do %>
+<% if object.tag == "table" %>  
+  <%= content_tag(:th,
+      colspan: object.colspan,
+      aria: object.aria,
+      class: object.classname,
+      data: object.data,
+      id: "pb-th#{object.id}",
+      **combined_html_options) do %>
+    <% unless sorting_style? %>
+      <%= pb_rails("flex", props:{ align: object.align_content, justify: object.justify_sort_icon, classname: "pb_th_nolink" }) do %>
         <%= content.presence || object.text %>
-          <% if sorting_style? %>
-            <%= pb_rails("icon", props: { icon: object.sort_icon(active_item[:direction], active_item[:active]),
-                                          fixed_width: true,
-                                          classname: active_item.any? ? "pb_th_active" : "",
-                                          padding_left: "xs" }) %>
+      <% end %>
+    <% else %>
+      <%= link_to next_link, style: link_style do %>
+        <%= pb_rails("flex", props:{ align: object.align_content, justify: object.justify_sort_icon, classname: "pb_th_link" }) do %>
+          <%= content.presence || object.text %>
+            <% if sorting_style? %>
+              <%= pb_rails("icon", props: { icon: object.sort_icon(active_item[:direction], active_item[:active]),
+                                            fixed_width: true,
+                                            classname: active_item.any? ? "pb_th_active" : "",
+                                            padding_left: "xs" }) %>
+          <% end %>
         <% end %>
       <% end %>
-    <% end %>
-    <% if use_dropdown_select %>
-      <%= pb_rails("popover", props: { classname: "pb_filter_sort_menu",
-                                      close_on_click: "outside",
-                                      trigger_element_id: "pb-th#{object.id}",
-                                      tooltip_id: "sort-filter-btn-tooltip#{object.id}",
-                                      position: object.placement ,
-                                      padding: 'none'}) do %>
-        <%= pb_rails("nav", props: {classname: "pb_table_header_dropdown"}) do %>
-          <% object.sort_items.each do |sort_item| %>
-            <% item = active_or_first_item(sort_items_for(sort_item)) %>
-            <%= pb_rails("nav/item", props: {
-              text: item[:item],
-              link: next_link(sort_item: sort_item),
-              highlighted_border: false,
-              padding: "xs",
-              icon_right: sort_icon(item[:direction], item[:active]),
-              active: item[:active],
-              classname: "header_nav_item"
-            }) %>
+      <% if use_dropdown_select %>
+        <%= pb_rails("popover", props: { classname: "pb_filter_sort_menu",
+                                        close_on_click: "outside",
+                                        trigger_element_id: "pb-th#{object.id}",
+                                        tooltip_id: "sort-filter-btn-tooltip#{object.id}",
+                                        position: object.placement ,
+                                        padding: 'none'}) do %>
+          <%= pb_rails("nav", props: {classname: "pb_table_header_dropdown"}) do %>
+            <% object.sort_items.each do |sort_item| %>
+              <% item = active_or_first_item(sort_items_for(sort_item)) %>
+              <%= pb_rails("nav/item", props: {
+                text: item[:item],
+                link: next_link(sort_item: sort_item),
+                highlighted_border: false,
+                padding: "xs",
+                icon_right: sort_icon(item[:direction], item[:active]),
+                active: item[:active],
+                classname: "header_nav_item"
+              }) %>
+            <% end %>
           <% end %>
         <% end %>
       <% end %>
     <% end %>
   <% end %>
+<% else %>
+  <%= content_tag(:div,
+    aria: object.aria,
+    class: object.classname,
+    data: object.data,
+    id: object.id,
+    **combined_html_options) do %>
+      <%= content.presence || object.text %>
+  <% end %>
 <% end %>

data/app/pb_kits/playbook/pb_table/table_header.rb

@@ -23,9 +23,16 @@ module Playbook
                   default: ""
       prop :sort_dropdown, type: Playbook::Props::Boolean,
                            default: false
+      prop :tag, type: Playbook::Props::Enum,
+                 values: %w[table div],
+                 default: "table"
 
       def classname
-        generate_classname("pb_table_header_kit", align_class)
+        generate_classname("pb_table_header_kit", align_class) + tag_class
+      end
+
+      def tag_class
+        " pb_table_th"
       end
 
       def align_class