playbook_ui 15.3.0.pre.alpha.PLAY2630fctearlyautoClose12133 → 15.3.0.pre.alpha.PLAY258611978
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/pb_kits/playbook/pb_advanced_table/Components/RegularTableView.tsx +1 -2
- data/app/pb_kits/playbook/pb_advanced_table/advanced_table.test.jsx +0 -63
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_background_control_rails.html.erb +0 -4
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_background_control_rails.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling.jsx +1 -3
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling.md +0 -2
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling_column_headers.jsx +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling_rails.html.erb +0 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling_rails.md +0 -2
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_padding_control.jsx +1 -9
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_padding_control.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_with_custom_header_multi_header.jsx +0 -16
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_with_custom_header_rails.html.erb +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/example.yml +0 -1
- data/app/pb_kits/playbook/pb_advanced_table/table_header.rb +20 -90
- data/app/pb_kits/playbook/pb_advanced_table/table_row.rb +2 -31
- data/app/pb_kits/playbook/pb_background/background.html.erb +2 -10
- data/app/pb_kits/playbook/pb_badge/_badge.tsx +1 -4
- data/app/pb_kits/playbook/pb_badge/badge.test.js +0 -13
- data/app/pb_kits/playbook/pb_currency/_currency.tsx +7 -20
- data/app/pb_kits/playbook/pb_currency/currency.rb +8 -35
- data/app/pb_kits/playbook/pb_currency/currency.test.js +0 -47
- data/app/pb_kits/playbook/pb_currency/docs/_currency_variants.html.erb +1 -1
- data/app/pb_kits/playbook/pb_currency/docs/_currency_variants.jsx +1 -1
- data/app/pb_kits/playbook/pb_fixed_confirmation_toast/_fixed_confirmation_toast.tsx +9 -31
- data/app/pb_kits/playbook/pb_fixed_confirmation_toast/docs/_fixed_confirmation_toast_auto_close.html.erb +1 -15
- data/app/pb_kits/playbook/pb_fixed_confirmation_toast/docs/_fixed_confirmation_toast_multi_line.html.erb +8 -9
- data/app/pb_kits/playbook/pb_fixed_confirmation_toast/docs/_fixed_confirmation_toast_positions.html.erb +10 -11
- data/app/pb_kits/playbook/pb_form_pill/_form_pill.tsx +1 -1
- data/app/pb_kits/playbook/pb_typeahead/_typeahead.scss +0 -7
- data/app/pb_kits/playbook/pb_typeahead/_typeahead.test.jsx +1 -64
- data/app/pb_kits/playbook/pb_typeahead/components/MultiValue.tsx +1 -33
- data/dist/chunks/{_line_graph-BRirnhGy.js → _line_graph-BokgW0SI.js} +1 -1
- data/dist/chunks/_typeahead-BR-uKbcO.js +6 -0
- data/dist/chunks/{_weekday_stacked-C4BovBRB.js → _weekday_stacked-n_2SPgc2.js} +3 -3
- data/dist/chunks/vendor.js +1 -1
- data/dist/playbook-doc.js +1 -1
- data/dist/playbook-rails-react-bindings.js +1 -1
- data/dist/playbook-rails.js +1 -1
- data/dist/playbook.css +1 -1
- data/lib/playbook/version.rb +1 -1
- metadata +6 -9
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_with_custom_header_multi_header_rails.html.erb +0 -104
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_with_custom_header_multi_header_rails.md +0 -1
- data/app/pb_kits/playbook/pb_currency/docs/_currency_variants.md +0 -1
- data/dist/chunks/_typeahead-CFOqvZNu.js +0 -6
- /data/app/pb_kits/playbook/pb_date_picker/docs/{_date_picker_and_dropdown_range.md → _date_picker_and_dropdown_range..md} +0 -0
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a1a62cafaa16e4da926d69ebca037e59cce874784adfe55e1650cd94f7152f08
|
|
4
|
+
data.tar.gz: c3689d869441ef31917edf4c5e124e0a0a1b42f66d9753fea748897b15a20d2e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f1274d98903345d89ebb1ab7cf7aa5d07f138aa90fd36e6f5d6fdee3ce3ca242999a02b4f97bfc338408d1f33628c01c0d0277a266ce1abe50b8518c7d298eb7
|
|
7
|
+
data.tar.gz: be5e89b4822ed1af5030fa5abcc219e36c6cb97fd95b6b414ac91c2e4814686ad834e7b8dca0da3cdaaf0e7ba27abb27911b5247ce54381bf5385f199fb34c81
|
|
@@ -66,7 +66,6 @@ const TableCellRenderer = ({
|
|
|
66
66
|
// Find the “owning” colDefinition by accessor. Needed for multi column logic
|
|
67
67
|
const colDef = findColumnDefByAccessor(columnDefinitions ?? [], column.id)
|
|
68
68
|
const cellAlignment = colDef?.columnStyling?.cellAlignment ?? "right"
|
|
69
|
-
const cellFontColor = colDef?.columnStyling?.fontColor
|
|
70
69
|
const paddingValue = colDef?.columnStyling?.cellPadding ?? customRowStyle?.cellPadding
|
|
71
70
|
const paddingClass = paddingValue ? `p_${paddingValue}` : undefined
|
|
72
71
|
|
|
@@ -89,7 +88,7 @@ const TableCellRenderer = ({
|
|
|
89
88
|
: `${column.getStart("left")}px`
|
|
90
89
|
: undefined,
|
|
91
90
|
backgroundColor: i === 0 && customRowStyle?.backgroundColor,
|
|
92
|
-
color:
|
|
91
|
+
color: customRowStyle?.fontColor,
|
|
93
92
|
}}
|
|
94
93
|
>
|
|
95
94
|
{collapsibleTrail && i === 0 && row.depth > 0 && renderCollapsibleTrail(row.depth)}
|
|
@@ -740,69 +740,6 @@ test("columnStyling.cellPadding sets cell padding", () => {
|
|
|
740
740
|
expect(firstEnrollmentCell).toHaveClass('p_none')
|
|
741
741
|
});
|
|
742
742
|
|
|
743
|
-
test("columnStyling.fontColor sets cell font color", () => {
|
|
744
|
-
const styledColumnDefs = [
|
|
745
|
-
{
|
|
746
|
-
accessor: "year",
|
|
747
|
-
label: "Year",
|
|
748
|
-
cellAccessors: ["quarter", "month", "day"],
|
|
749
|
-
},
|
|
750
|
-
{
|
|
751
|
-
accessor: "newEnrollments",
|
|
752
|
-
label: "New Enrollments",
|
|
753
|
-
columnStyling: { fontColor: colors.category_1 },
|
|
754
|
-
},
|
|
755
|
-
{
|
|
756
|
-
accessor: "scheduledMeetings",
|
|
757
|
-
label: "Scheduled Meetings",
|
|
758
|
-
},
|
|
759
|
-
];
|
|
760
|
-
|
|
761
|
-
render(
|
|
762
|
-
<AdvancedTable
|
|
763
|
-
columnDefinitions={styledColumnDefs}
|
|
764
|
-
data={{ testid: testId }}
|
|
765
|
-
tableData={MOCK_DATA}
|
|
766
|
-
/>
|
|
767
|
-
);
|
|
768
|
-
|
|
769
|
-
const firstEnrollmentCell = screen.getAllByText("20")[0].closest("td");
|
|
770
|
-
expect(firstEnrollmentCell).toHaveStyle({ color: colors.category_1 });
|
|
771
|
-
});
|
|
772
|
-
|
|
773
|
-
test("columnStyling.fontColor works with background color", () => {
|
|
774
|
-
const styledColumnDefs = [
|
|
775
|
-
{
|
|
776
|
-
accessor: "year",
|
|
777
|
-
label: "Year",
|
|
778
|
-
cellAccessors: ["quarter", "month", "day"],
|
|
779
|
-
},
|
|
780
|
-
{
|
|
781
|
-
accessor: "newEnrollments",
|
|
782
|
-
label: "New Enrollments",
|
|
783
|
-
columnStyling: {
|
|
784
|
-
cellBackgroundColor: (row) => row.newEnrollments > 20 ? "success_secondary" : "warning_secondary",
|
|
785
|
-
fontColor: colors.white
|
|
786
|
-
},
|
|
787
|
-
},
|
|
788
|
-
{
|
|
789
|
-
accessor: "scheduledMeetings",
|
|
790
|
-
label: "Scheduled Meetings",
|
|
791
|
-
},
|
|
792
|
-
];
|
|
793
|
-
|
|
794
|
-
render(
|
|
795
|
-
<AdvancedTable
|
|
796
|
-
columnDefinitions={styledColumnDefs}
|
|
797
|
-
data={{ testid: testId }}
|
|
798
|
-
tableData={MOCK_DATA}
|
|
799
|
-
/>
|
|
800
|
-
);
|
|
801
|
-
|
|
802
|
-
const firstEnrollmentCell = screen.getAllByText("20")[0].closest("td");
|
|
803
|
-
expect(firstEnrollmentCell).toHaveStyle({ color: colors.white });
|
|
804
|
-
});
|
|
805
|
-
|
|
806
743
|
test("renders virtualized table rows and header", () => {
|
|
807
744
|
render(
|
|
808
745
|
<AdvancedTable
|
data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_background_control_rails.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
`column_styling` can also be used to control the background color on all cells in a given column via the use of the `cell_background_color` key/value pair. Use `cell_background_color` to achieve custom background colors for individual cells as seen here.
|
|
1
|
+
`column_styling` can also be used to control the background color on all cells in a given column via the use of the `cell_background_color` key/value pair. Use `cell_background_color` to achieve custom background colors for individual cells as seen here.
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import React from "react"
|
|
2
|
-
import
|
|
2
|
+
import AdvancedTable from '../../pb_advanced_table/_advanced_table'
|
|
3
3
|
import MOCK_DATA from "./advanced_table_mock_data.json"
|
|
4
4
|
|
|
5
|
-
|
|
6
5
|
const AdvancedTableColumnStyling = (props) => {
|
|
7
6
|
const columnDefinitions = [
|
|
8
7
|
{
|
|
@@ -35,7 +34,6 @@ const AdvancedTableColumnStyling = (props) => {
|
|
|
35
34
|
{
|
|
36
35
|
accessor: "graduatedStudents",
|
|
37
36
|
label: "Graduated Students",
|
|
38
|
-
columnStyling:{fontColor: colors.data_8},
|
|
39
37
|
},
|
|
40
38
|
]
|
|
41
39
|
|
|
@@ -4,6 +4,4 @@ The `columnStyling` prop is an optional item that can be used within `columnDefi
|
|
|
4
4
|
|
|
5
5
|
2) `cellAlignment`: This will allow you to control alignment of content within all cells in the given column. This is set to right aligned by default. you can set this to `left`, `right` or `center`.
|
|
6
6
|
|
|
7
|
-
3) `fontColor`: This will allow you to control the font color for a given column.
|
|
8
|
-
|
|
9
7
|
`columnStyling` can be used within the columnDefinition of all the columns or some of them, as shown. Each column has its own individual control in this way.
|
|
@@ -4,6 +4,4 @@ The `column_styling` prop is an optional item that can be used within `column_de
|
|
|
4
4
|
|
|
5
5
|
2) `cell_alignment`: This will allow you to control alignment of content within all cells in the given column. This is set to right aligned by default. you can set this to `left`, `right` or `center`.
|
|
6
6
|
|
|
7
|
-
3) `font_color`: This will allow you to control the font color for a given column.
|
|
8
|
-
|
|
9
7
|
`column_styling` can be used within the column_definition of all the columns or some of them, as shown. Each column has its own individual control in this way.
|
|
@@ -22,6 +22,7 @@ const AdvancedTablePaddingControl = (props) => {
|
|
|
22
22
|
{value}
|
|
23
23
|
</Background>
|
|
24
24
|
),
|
|
25
|
+
|
|
25
26
|
},
|
|
26
27
|
{
|
|
27
28
|
accessor: "scheduledMeetings",
|
|
@@ -38,15 +39,6 @@ const AdvancedTablePaddingControl = (props) => {
|
|
|
38
39
|
{
|
|
39
40
|
accessor: "classCompletionRate",
|
|
40
41
|
label: "Class Completion Rate",
|
|
41
|
-
columnStyling:{cellPadding: "none", fontColor: "white"},
|
|
42
|
-
customRenderer: (row, value) => (
|
|
43
|
-
<Background
|
|
44
|
-
backgroundColor={"category_1"}
|
|
45
|
-
padding="xs"
|
|
46
|
-
>
|
|
47
|
-
{value}
|
|
48
|
-
</Background>
|
|
49
|
-
),
|
|
50
42
|
},
|
|
51
43
|
{
|
|
52
44
|
accessor: "graduatedStudents",
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
`columnStyling` can also be used to control padding on all cells in a given column via the use of the `cellPadding` key/value pair. `cellPadding` lets you use 'xxs', 'xs', 'sm', 'md', 'lg', 'xl' and 'none'.
|
|
2
2
|
|
|
3
|
-
This control can be used in conjunction with the `customRenderer` item within each columnDefinition to achieve custom background colors for individual cells as seen here.
|
|
3
|
+
This control can be used in conjunction with the `customRenderer` item within each columnDefinition to achieve custom background colors for individual cells as seen here.
|
data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_with_custom_header_multi_header.jsx
CHANGED
|
@@ -76,22 +76,6 @@ const columnDefinitions = [
|
|
|
76
76
|
{
|
|
77
77
|
label: "Attendance",
|
|
78
78
|
id: "attendance",
|
|
79
|
-
header: () => (
|
|
80
|
-
<Flex alignItems="center"
|
|
81
|
-
justifyContent="center"
|
|
82
|
-
>
|
|
83
|
-
<Caption marginRight="xs">Attendance</Caption>
|
|
84
|
-
<Tooltip placement="top"
|
|
85
|
-
text="Whoa. I'm a Tooltip Too!"
|
|
86
|
-
zIndex={10}
|
|
87
|
-
>
|
|
88
|
-
<Icon cursor="pointer"
|
|
89
|
-
icon="info"
|
|
90
|
-
size="xs"
|
|
91
|
-
/>
|
|
92
|
-
</Tooltip>
|
|
93
|
-
</Flex>
|
|
94
|
-
),
|
|
95
79
|
columns: [
|
|
96
80
|
{
|
|
97
81
|
accessor: "attendanceRate",
|
data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_with_custom_header_rails.html.erb
CHANGED
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
capture do
|
|
13
13
|
pb_rails("flex", props: { align_items: "center", justify_content: "center" }) do
|
|
14
14
|
pb_rails("caption", props: { margin_right: "xs", text: "New Enrollments" }) +
|
|
15
|
-
pb_rails("icon", props: { id: "tooltip-interact", icon: "info", size: "xs"
|
|
15
|
+
pb_rails("icon", props: { id: "tooltip-interact", icon: "info", size: "xs" }) +
|
|
16
16
|
pb_rails("tooltip", props: {
|
|
17
17
|
trigger_element_id: "tooltip-interact",
|
|
18
18
|
tooltip_id: "example-custom-tooltip",
|
|
@@ -11,7 +11,6 @@ examples:
|
|
|
11
11
|
- advanced_table_responsive: Responsive Tables
|
|
12
12
|
- advanced_table_custom_cell_rails: Custom Components for Cells
|
|
13
13
|
- advanced_table_with_custom_header_rails: Custom Header Cell
|
|
14
|
-
- advanced_table_with_custom_header_multi_header_rails: Custom Header with Multiple Headers
|
|
15
14
|
- advanced_table_column_headers: Multi-Header Columns
|
|
16
15
|
- advanced_table_column_headers_multiple: Multi-Header Columns (Multiple Levels)
|
|
17
16
|
- advanced_table_column_headers_vertical_border: Multi-Header Columns with Vertical Borders
|
|
@@ -82,62 +82,32 @@ module Playbook
|
|
|
82
82
|
end
|
|
83
83
|
end
|
|
84
84
|
|
|
85
|
-
# Get original column definition for custom rendering
|
|
85
|
+
# Get original column definition for custom rendering
|
|
86
86
|
def find_original_column_def(accessor)
|
|
87
87
|
find_column_def_by_accessor(column_definitions, accessor)
|
|
88
88
|
end
|
|
89
89
|
|
|
90
|
-
# Get original column definition for custom rendering by id
|
|
91
|
-
def find_original_column_def_by_id(id)
|
|
92
|
-
find_column_def_by_id(column_definitions, id)
|
|
93
|
-
end
|
|
94
|
-
|
|
95
90
|
# Check if a header cell has a custom renderer
|
|
96
91
|
def has_header_renderer?(cell)
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
92
|
+
return false unless cell[:accessor].present?
|
|
93
|
+
|
|
94
|
+
original_def = find_original_column_def(cell[:accessor])
|
|
95
|
+
original_def && original_def[:header].present?
|
|
101
96
|
end
|
|
102
97
|
|
|
103
98
|
# Render custom header content
|
|
104
99
|
def render_header(cell)
|
|
105
100
|
return cell[:label] unless has_header_renderer?(cell)
|
|
106
101
|
|
|
107
|
-
original_def =
|
|
108
|
-
return cell[:label] unless original_def
|
|
109
|
-
|
|
102
|
+
original_def = find_original_column_def(cell[:accessor])
|
|
110
103
|
custom_renderer = original_def[:header]
|
|
111
|
-
return cell[:label] unless custom_renderer
|
|
112
104
|
|
|
113
105
|
# Call the custom renderer with the cell data and label
|
|
114
|
-
|
|
115
|
-
result = custom_renderer.call(cell, cell[:label])
|
|
116
|
-
result.present? ? result.to_s : cell[:label]
|
|
117
|
-
rescue
|
|
118
|
-
cell[:label]
|
|
119
|
-
end
|
|
106
|
+
custom_renderer.call(cell, cell[:label])
|
|
120
107
|
end
|
|
121
108
|
|
|
122
109
|
private
|
|
123
110
|
|
|
124
|
-
# Find the original column definition for a cell
|
|
125
|
-
def find_original_column_def_for_cell(cell)
|
|
126
|
-
# Try accessor first (for leaf columns)
|
|
127
|
-
if cell[:accessor].present?
|
|
128
|
-
found = find_original_column_def(cell[:accessor])
|
|
129
|
-
return found if found
|
|
130
|
-
end
|
|
131
|
-
|
|
132
|
-
# Try id if accessor lookup didn't find it (for grouped columns or leaf columns with id)
|
|
133
|
-
if cell[:id].present?
|
|
134
|
-
found = find_original_column_def_by_id(cell[:id])
|
|
135
|
-
return found if found
|
|
136
|
-
end
|
|
137
|
-
|
|
138
|
-
nil
|
|
139
|
-
end
|
|
140
|
-
|
|
141
111
|
def compute_max_depth(columns)
|
|
142
112
|
columns.map do |col|
|
|
143
113
|
col[:columns] ? 1 + compute_max_depth(col[:columns]) : 1
|
|
@@ -148,24 +118,21 @@ module Playbook
|
|
|
148
118
|
total_columns = columns.size
|
|
149
119
|
columns.each_with_index do |col, index|
|
|
150
120
|
is_last = index == total_columns - 1
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
cell_hash = {
|
|
121
|
+
if col[:columns]
|
|
122
|
+
colspan = compute_leaf_columns(col[:columns])
|
|
123
|
+
rows[current_depth] << {
|
|
155
124
|
label: col[:label],
|
|
156
125
|
colspan: colspan,
|
|
157
126
|
is_last_in_group: is_last && current_depth.positive?,
|
|
158
127
|
}
|
|
159
|
-
cell_hash[:id] = col[:id] if col[:id].present?
|
|
160
|
-
rows[current_depth] << cell_hash
|
|
161
128
|
|
|
162
|
-
process_columns(
|
|
129
|
+
process_columns(col[:columns], rows, current_depth + 1, max_depth)
|
|
163
130
|
else
|
|
164
|
-
raw_styling
|
|
165
|
-
header_alignment
|
|
131
|
+
raw_styling = col[:column_styling] || {}
|
|
132
|
+
header_alignment = raw_styling[:header_alignment]
|
|
166
133
|
|
|
167
134
|
colspan = 1
|
|
168
|
-
|
|
135
|
+
rows[current_depth] << {
|
|
169
136
|
label: col[:label],
|
|
170
137
|
colspan: colspan,
|
|
171
138
|
accessor: col[:accessor],
|
|
@@ -173,8 +140,6 @@ module Playbook
|
|
|
173
140
|
is_last_in_group: is_last && current_depth.positive?,
|
|
174
141
|
header_alignment: header_alignment,
|
|
175
142
|
}
|
|
176
|
-
cell_hash[:id] = col[:id] if col[:id].present?
|
|
177
|
-
rows[current_depth] << cell_hash
|
|
178
143
|
end
|
|
179
144
|
end
|
|
180
145
|
end
|
|
@@ -189,15 +154,11 @@ module Playbook
|
|
|
189
154
|
max_depth = compute_max_depth(column_definitions)
|
|
190
155
|
|
|
191
156
|
column_definitions.map do |col|
|
|
192
|
-
if col
|
|
193
|
-
|
|
194
|
-
wrapped = {
|
|
157
|
+
if col.key?(:columns)
|
|
158
|
+
{
|
|
195
159
|
label: col[:label],
|
|
196
|
-
columns: wrap_leaf_columns(
|
|
160
|
+
columns: wrap_leaf_columns(col[:columns]),
|
|
197
161
|
}
|
|
198
|
-
wrapped[:id] = col[:id] if col[:id].present?
|
|
199
|
-
wrapped[:header] = col[:header] if col[:header].present?
|
|
200
|
-
wrapped
|
|
201
162
|
else
|
|
202
163
|
# For leaf columns, wrap with empty labels up to max depth to get proper structure
|
|
203
164
|
wrap_leaf_column(col, max_depth)
|
|
@@ -212,7 +173,6 @@ module Playbook
|
|
|
212
173
|
sort_menu: col[:sort_menu] || nil,
|
|
213
174
|
column_styling: col[:column_styling] || {},
|
|
214
175
|
}
|
|
215
|
-
wrapped[:id] = col[:id] if col[:id].present?
|
|
216
176
|
(max_depth - 1).times do
|
|
217
177
|
wrapped = { label: "", columns: [wrapped] }
|
|
218
178
|
end
|
|
@@ -220,41 +180,11 @@ module Playbook
|
|
|
220
180
|
end
|
|
221
181
|
|
|
222
182
|
def find_column_def_by_accessor(defs, target_accessor)
|
|
223
|
-
return nil if target_accessor.blank?
|
|
224
|
-
|
|
225
183
|
defs.each do |col|
|
|
226
|
-
|
|
227
|
-
next if col_accessor.blank?
|
|
228
|
-
|
|
229
|
-
return col if col_accessor.to_s == target_accessor.to_s
|
|
230
|
-
|
|
231
|
-
nested_columns = col[:columns]
|
|
232
|
-
if nested_columns.is_a?(Array)
|
|
233
|
-
found = find_column_def_by_accessor(nested_columns, target_accessor)
|
|
234
|
-
return found if found
|
|
235
|
-
end
|
|
236
|
-
end
|
|
237
|
-
nil
|
|
238
|
-
end
|
|
239
|
-
|
|
240
|
-
def find_column_def_by_id(defs, target_id)
|
|
241
|
-
return nil if target_id.blank?
|
|
242
|
-
|
|
243
|
-
defs.each do |col|
|
|
244
|
-
col_id = col[:id]
|
|
245
|
-
|
|
246
|
-
return col if col_id.present? && col_id.to_s == target_id.to_s
|
|
247
|
-
|
|
248
|
-
# Recursively search nested columns, even if current col has no id or doesn't match
|
|
249
|
-
nested_columns = col[:columns]
|
|
250
|
-
|
|
251
|
-
next unless nested_columns.present?
|
|
252
|
-
|
|
253
|
-
# Convert to array if needed (for edge cases where is_a?(Array) might fail)
|
|
254
|
-
array_columns = Array(nested_columns)
|
|
184
|
+
return col if col[:accessor] == target_accessor
|
|
255
185
|
|
|
256
|
-
if
|
|
257
|
-
found =
|
|
186
|
+
if col[:columns].is_a?(Array)
|
|
187
|
+
found = find_column_def_by_accessor(col[:columns], target_accessor)
|
|
258
188
|
return found if found
|
|
259
189
|
end
|
|
260
190
|
end
|
|
@@ -79,44 +79,15 @@ module Playbook
|
|
|
79
79
|
cell_background_color(column).present?
|
|
80
80
|
end
|
|
81
81
|
|
|
82
|
-
def cell_font_color(column)
|
|
83
|
-
return nil unless column[:accessor].present?
|
|
84
|
-
|
|
85
|
-
orig_def = find_column_def_by_accessor(column_definitions, column[:accessor])
|
|
86
|
-
if orig_def && orig_def[:column_styling].is_a?(Hash) && orig_def[:column_styling][:font_color].present?
|
|
87
|
-
font_color = orig_def[:column_styling][:font_color]
|
|
88
|
-
if font_color.respond_to?(:call)
|
|
89
|
-
font_color.call(row)
|
|
90
|
-
else
|
|
91
|
-
font_color
|
|
92
|
-
end
|
|
93
|
-
end
|
|
94
|
-
end
|
|
95
|
-
|
|
96
82
|
# Uses a regular table/table_cell component if there is no custom background color; if there is a cell_background_color uses a background component with tag "td"
|
|
97
83
|
def cell_component_info(column, index, bg_color, font_color)
|
|
98
|
-
column_font_color = cell_font_color(column)
|
|
99
|
-
effective_font_color = column_font_color || font_color
|
|
100
|
-
|
|
101
84
|
if has_custom_background_color?(column)
|
|
102
85
|
custom_bg_color = cell_background_color(column)
|
|
103
86
|
component_name = "background"
|
|
104
|
-
component_props = {
|
|
105
|
-
background_color: custom_bg_color,
|
|
106
|
-
tag: "td",
|
|
107
|
-
classname: td_classname(column, index),
|
|
108
|
-
}
|
|
109
|
-
component_props[:html_options] = { style: { color: effective_font_color } } if effective_font_color.present?
|
|
87
|
+
component_props = { background_color: custom_bg_color, tag: "td", classname: td_classname(column, index) }
|
|
110
88
|
else
|
|
111
89
|
component_name = "table/table_cell"
|
|
112
|
-
|
|
113
|
-
style_hash[:color] = effective_font_color if effective_font_color.present?
|
|
114
|
-
component_props = {
|
|
115
|
-
html_options: {
|
|
116
|
-
style: style_hash,
|
|
117
|
-
},
|
|
118
|
-
classname: td_classname(column, index),
|
|
119
|
-
}
|
|
90
|
+
component_props = { html_options: { style: { "background-color": bg_color, color: font_color } }, classname: td_classname(column, index) }
|
|
120
91
|
end
|
|
121
92
|
|
|
122
93
|
{ name: component_name, props: component_props }
|
|
@@ -1,11 +1,3 @@
|
|
|
1
|
-
<%
|
|
2
|
-
html_options_style = ""
|
|
3
|
-
if object.html_options[:style].is_a?(Hash)
|
|
4
|
-
html_options_style = object.html_options[:style].map { |k, v| "#{k.to_s.tr('_', '-')}: #{v}" }.join("; ")
|
|
5
|
-
elsif object.html_options[:style].is_a?(String)
|
|
6
|
-
html_options_style = object.html_options[:style]
|
|
7
|
-
end
|
|
8
|
-
%>
|
|
9
1
|
<% if object.image_url.present? %>
|
|
10
2
|
<%= pb_content_tag(object.tag,
|
|
11
3
|
style: "background-image: url('#{object.image_url}');
|
|
@@ -17,8 +9,8 @@
|
|
|
17
9
|
<% end %>
|
|
18
10
|
<% else %>
|
|
19
11
|
<%= pb_content_tag(object.tag,
|
|
20
|
-
style:
|
|
12
|
+
style: object.custom_background_color
|
|
21
13
|
) do %>
|
|
22
14
|
<%= content.presence %>
|
|
23
15
|
<% end %>
|
|
24
|
-
<% end %>
|
|
16
|
+
<% end %>
|
|
@@ -20,12 +20,11 @@ type BadgeProps = {
|
|
|
20
20
|
onTouchEnd?: React.TouchEventHandler<HTMLSpanElement>,
|
|
21
21
|
},
|
|
22
22
|
data?: {[key: string]: string},
|
|
23
|
-
htmlOptions?: {[key: string]: string | number | boolean | (() => void)
|
|
23
|
+
htmlOptions?: {[key: string]: string | number | boolean | (() => void)},
|
|
24
24
|
id?: string,
|
|
25
25
|
removeIcon?: boolean,
|
|
26
26
|
removeOnClick?: React.MouseEventHandler<HTMLSpanElement>,
|
|
27
27
|
rounded?: boolean,
|
|
28
|
-
tabIndex?: number,
|
|
29
28
|
text?: string,
|
|
30
29
|
variant?: "error" | "info" | "neutral" | "notification" | "notificationError" | "primary" | "success" | "warning",
|
|
31
30
|
} & GlobalProps
|
|
@@ -40,7 +39,6 @@ const Badge = (props: BadgeProps): React.ReactElement => {
|
|
|
40
39
|
removeIcon = false,
|
|
41
40
|
removeOnClick,
|
|
42
41
|
rounded = false,
|
|
43
|
-
tabIndex,
|
|
44
42
|
text,
|
|
45
43
|
variant = 'neutral',
|
|
46
44
|
} = props
|
|
@@ -63,7 +61,6 @@ const Badge = (props: BadgeProps): React.ReactElement => {
|
|
|
63
61
|
{...htmlProps}
|
|
64
62
|
className={css}
|
|
65
63
|
id={id}
|
|
66
|
-
tabIndex={tabIndex}
|
|
67
64
|
>
|
|
68
65
|
<span>
|
|
69
66
|
{text}
|
|
@@ -112,16 +112,3 @@ test('displays notification variants', () => {
|
|
|
112
112
|
cleanup()
|
|
113
113
|
})
|
|
114
114
|
})
|
|
115
|
-
|
|
116
|
-
test('should allow tabIndex to be set', () => {
|
|
117
|
-
render(
|
|
118
|
-
<Badge
|
|
119
|
-
data={{ testid: testId }}
|
|
120
|
-
tabIndex={0}
|
|
121
|
-
text="+1"
|
|
122
|
-
/>
|
|
123
|
-
)
|
|
124
|
-
|
|
125
|
-
const kit = screen.getByTestId(testId)
|
|
126
|
-
expect(kit).toHaveAttribute('tabIndex', '0')
|
|
127
|
-
})
|
|
@@ -11,7 +11,7 @@ import Title from '../pb_title/_title'
|
|
|
11
11
|
type CurrencyProps = {
|
|
12
12
|
abbreviate?: boolean,
|
|
13
13
|
align?: 'center' | 'left' | 'right',
|
|
14
|
-
amount: string
|
|
14
|
+
amount: string,
|
|
15
15
|
aria?: {[key:string]:string},
|
|
16
16
|
className?: string,
|
|
17
17
|
dark?: boolean,
|
|
@@ -59,19 +59,6 @@ const Currency = (props: CurrencyProps): React.ReactElement => {
|
|
|
59
59
|
commaSeparator = false,
|
|
60
60
|
} = props
|
|
61
61
|
|
|
62
|
-
// Convert numeric input to string format
|
|
63
|
-
const convertAmount = (input: string | number): string => {
|
|
64
|
-
if (typeof input === 'number') {
|
|
65
|
-
if (input === 0 && !nullDisplay) {
|
|
66
|
-
return ""
|
|
67
|
-
}
|
|
68
|
-
return input.toFixed(2)
|
|
69
|
-
}
|
|
70
|
-
return input
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
const currencyAmount = convertAmount(amount)
|
|
74
|
-
|
|
75
62
|
const emphasizedClass = emphasized ? '' : '_deemphasized'
|
|
76
63
|
|
|
77
64
|
let variantClass
|
|
@@ -81,7 +68,7 @@ const Currency = (props: CurrencyProps): React.ReactElement => {
|
|
|
81
68
|
variantClass = '_bold'
|
|
82
69
|
}
|
|
83
70
|
|
|
84
|
-
const [whole, decimal = '00'] =
|
|
71
|
+
const [whole, decimal = '00'] = amount.split('.')
|
|
85
72
|
const ariaProps = buildAriaProps(aria)
|
|
86
73
|
const dataProps = buildDataProps(data)
|
|
87
74
|
const htmlProps = buildHtmlProps(htmlOptions)
|
|
@@ -105,19 +92,19 @@ const Currency = (props: CurrencyProps): React.ReactElement => {
|
|
|
105
92
|
return isAmount ? num.slice(0, -1) : isUnit ? num.slice(-1) : ''
|
|
106
93
|
}
|
|
107
94
|
|
|
108
|
-
const getMatchingDecimalAmount = decimals === "matching" ?
|
|
95
|
+
const getMatchingDecimalAmount = decimals === "matching" ? amount : whole
|
|
109
96
|
const getMatchingDecimalValue = decimals === "matching" ? '' : `.${decimal}`
|
|
110
97
|
|
|
111
98
|
const formatAmount = (amount: string) => {
|
|
112
99
|
if (!commaSeparator) return amount;
|
|
113
|
-
|
|
100
|
+
|
|
114
101
|
const [wholePart, decimalPart] = amount.split('.');
|
|
115
102
|
const formattedWhole = new Intl.NumberFormat('en-US').format(parseInt(wholePart));
|
|
116
103
|
return decimalPart ? `${formattedWhole}.${decimalPart}` : formattedWhole;
|
|
117
104
|
}
|
|
118
105
|
|
|
119
106
|
const swapNegative = size === "sm" && symbol !== ""
|
|
120
|
-
const handleNegative =
|
|
107
|
+
const handleNegative = amount.startsWith("-") && swapNegative ? "-" : ""
|
|
121
108
|
const getAbsoluteAmount = (amountString: string) => amountString.replace(/^-/,'')
|
|
122
109
|
const getAbbrOrFormatAmount = abbreviate ? getAbbreviatedValue('amount') : formatAmount(getMatchingDecimalAmount)
|
|
123
110
|
const getAmount = swapNegative ? getAbsoluteAmount(getAbbrOrFormatAmount) : getAbbrOrFormatAmount
|
|
@@ -165,7 +152,7 @@ const Currency = (props: CurrencyProps): React.ReactElement => {
|
|
|
165
152
|
>
|
|
166
153
|
{handleNegative}{symbol}
|
|
167
154
|
</Body>
|
|
168
|
-
|
|
155
|
+
|
|
169
156
|
<Title
|
|
170
157
|
className="pb_currency_value"
|
|
171
158
|
dark={dark}
|
|
@@ -173,7 +160,7 @@ const Currency = (props: CurrencyProps): React.ReactElement => {
|
|
|
173
160
|
>
|
|
174
161
|
{getAmount}
|
|
175
162
|
</Title>
|
|
176
|
-
|
|
163
|
+
|
|
177
164
|
<Body
|
|
178
165
|
className="unit"
|
|
179
166
|
color="light"
|