playbook_ui 15.4.0.pre.rc.1 → 15.4.0.pre.rc.2
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 +2 -1
- data/app/pb_kits/playbook/pb_advanced_table/advanced_table.test.jsx +63 -0
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_background_control_rails.html.erb +4 -0
- 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_border_color.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_border_color_rails.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling.jsx +3 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling.md +2 -0
- 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 +1 -0
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling_rails.md +2 -0
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_padding_control.jsx +9 -1
- 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_sticky_columns_and_header.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_table_props_sticky_header_rails.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_table_props_sticky_header_react.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/table_row.rb +31 -2
- data/app/pb_kits/playbook/pb_background/background.html.erb +10 -2
- data/app/pb_kits/playbook/pb_background/docs/_background_category.md +1 -1
- data/app/pb_kits/playbook/pb_card/docs/_card_background.md +1 -1
- data/app/pb_kits/playbook/pb_card/docs/_card_header.md +1 -1
- data/app/pb_kits/playbook/pb_card/docs/_card_highlight.md +1 -1
- data/app/pb_kits/playbook/pb_card/docs/_card_light.md +1 -1
- data/app/pb_kits/playbook/pb_currency/_currency.tsx +20 -7
- data/app/pb_kits/playbook/pb_currency/currency.rb +35 -8
- data/app/pb_kits/playbook/pb_currency/currency.test.js +47 -0
- 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_currency/docs/_currency_variants.md +1 -0
- data/app/pb_kits/playbook/pb_distribution_bar/docs/_distribution_bar_custom_colors.md +1 -1
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_active_style_options_react.md +1 -1
- data/app/pb_kits/playbook/pb_filter/docs/_filter_max_width.md +1 -1
- data/app/pb_kits/playbook/pb_form_pill/docs/_form_pill_truncated_text_rails.md +1 -1
- data/app/pb_kits/playbook/pb_form_pill/docs/_form_pill_truncated_text_react.md +1 -1
- data/app/pb_kits/playbook/pb_icon/docs/_icon_color.md +1 -1
- data/app/pb_kits/playbook/pb_icon_circle/docs/_icon_circle_color.md +1 -1
- data/app/pb_kits/playbook/pb_icon_stat_value/docs/_icon_stat_value_color.html.erb +7 -14
- data/app/pb_kits/playbook/pb_icon_stat_value/docs/_icon_stat_value_color.jsx +6 -15
- data/app/pb_kits/playbook/pb_layout/docs/_layout_collection.md +1 -1
- data/app/pb_kits/playbook/pb_nav/docs/_collapsible_nav_item_spacing.md +1 -1
- data/app/pb_kits/playbook/pb_nav/docs/_nav_with_spacing_control.md +1 -1
- data/app/pb_kits/playbook/pb_overlay/docs/_overlay_layout.md +1 -1
- data/app/pb_kits/playbook/pb_pill/docs/_description.md +1 -1
- data/app/pb_kits/playbook/pb_rich_text_editor/docs/_description.md +1 -1
- data/app/pb_kits/playbook/pb_section_separator/docs/_description.md +1 -1
- data/app/pb_kits/playbook/pb_selectable_card/_selectable_card.scss +29 -0
- data/app/pb_kits/playbook/pb_skeleton_loading/docs/_skeleton_loading_border_radius_rails.md +1 -1
- data/app/pb_kits/playbook/pb_skeleton_loading/docs/_skeleton_loading_border_radius_react.md +1 -1
- data/app/pb_kits/playbook/pb_skeleton_loading/docs/_skeleton_loading_layout.md +1 -1
- data/app/pb_kits/playbook/pb_table/docs/_table_side_highlight.md +1 -1
- data/app/pb_kits/playbook/pb_table/docs/_table_sm.md +1 -1
- data/app/pb_kits/playbook/pb_table/docs/_table_with_dynamic_collapsible.html.erb +63 -0
- data/app/pb_kits/playbook/pb_table/docs/_table_with_dynamic_collapsible.jsx +89 -0
- data/app/pb_kits/playbook/pb_table/docs/_table_with_dynamic_collapsible_rails.md +4 -0
- data/app/pb_kits/playbook/pb_table/docs/_table_with_dynamic_collapsible_react.md +3 -0
- data/app/pb_kits/playbook/pb_table/docs/example.yml +2 -0
- data/app/pb_kits/playbook/pb_table/docs/index.js +1 -0
- data/app/pb_kits/playbook/pb_typeahead/docs/_typeahead_truncated_text.md +1 -1
- data/dist/chunks/{_weekday_stacked-BFB3mjtE.js → _weekday_stacked-DHzeEnCx.js} +1 -1
- data/dist/chunks/vendor.js +1 -1
- data/dist/playbook-doc.js +2 -2
- data/dist/playbook.css +1 -1
- data/lib/playbook/version.rb +1 -1
- metadata +8 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 8756195b79021a48424cf2bd8a089948bebbf4c613c04a66960f680d891d79f6
|
|
4
|
+
data.tar.gz: 904bdd2056ff5dd877f4d96d131a6548a05e9b601e83e8a9de77256a4265b08d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 375ba6253df92a3e7f304d214d60cbe0c0a19b663362be0499349704516a2307d810acd570cf2c8124148352d45f7c46bb178c6563802eb24501a701a557e11e
|
|
7
|
+
data.tar.gz: a5d7cce19c57a82b4cd3328bdec7b902d891d0930541d41fc4789adb93eb3b8910ba3284bd4ae8963f36f63b85cb1eabe9da3a7de6cc7a89dd878103419a66a9
|
|
@@ -66,6 +66,7 @@ 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
|
|
69
70
|
const paddingValue = colDef?.columnStyling?.cellPadding ?? customRowStyle?.cellPadding
|
|
70
71
|
const paddingClass = paddingValue ? `p_${paddingValue}` : undefined
|
|
71
72
|
|
|
@@ -88,7 +89,7 @@ const TableCellRenderer = ({
|
|
|
88
89
|
: `${column.getStart("left")}px`
|
|
89
90
|
: undefined,
|
|
90
91
|
backgroundColor: i === 0 && customRowStyle?.backgroundColor,
|
|
91
|
-
color: customRowStyle?.fontColor,
|
|
92
|
+
color: cellFontColor || customRowStyle?.fontColor,
|
|
92
93
|
}}
|
|
93
94
|
>
|
|
94
95
|
{collapsibleTrail && i === 0 && row.depth > 0 && renderCollapsibleTrail(row.depth)}
|
|
@@ -740,6 +740,69 @@ 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
|
+
|
|
743
806
|
test("renders virtualized table rows and header", () => {
|
|
744
807
|
render(
|
|
745
808
|
<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. Use `font_color` to achieve better contrast between cell content and background for darker backgrounds.
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
The borders of column groups can be set to a different color using the `columnGroupBorderColor` prop. In order for these borders to be visible, this prop must be used with `tableProps` and `verticalBorder` set to true.
|
|
2
2
|
|
|
3
|
-
The available colors for the border are Playbook's Text Colors, which can be found [here](https://playbook.powerapp.cloud/
|
|
3
|
+
The available colors for the border are Playbook's Text Colors, which can be found [here](https://playbook.powerapp.cloud/tokens/colors).
|
data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_border_color_rails.md
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
The borders of column groups can be set to a different color using the `column_group_border_color` prop. In order for these borders to be visible, this prop must be used with `table_props` and `vertical_border` set to true.
|
|
2
2
|
|
|
3
|
-
The available colors for the border are Playbook's Text Colors, which can be found [here](https://playbook.powerapp.cloud/
|
|
3
|
+
The available colors for the border are Playbook's Text Colors, which can be found [here](https://playbook.powerapp.cloud/tokens/colors).
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import React from "react"
|
|
2
|
-
import AdvancedTable from
|
|
2
|
+
import { AdvancedTable, colors } from "playbook-ui"
|
|
3
3
|
import MOCK_DATA from "./advanced_table_mock_data.json"
|
|
4
4
|
|
|
5
|
+
|
|
5
6
|
const AdvancedTableColumnStyling = (props) => {
|
|
6
7
|
const columnDefinitions = [
|
|
7
8
|
{
|
|
@@ -34,6 +35,7 @@ const AdvancedTableColumnStyling = (props) => {
|
|
|
34
35
|
{
|
|
35
36
|
accessor: "graduatedStudents",
|
|
36
37
|
label: "Graduated Students",
|
|
38
|
+
columnStyling:{fontColor: colors.data_8},
|
|
37
39
|
},
|
|
38
40
|
]
|
|
39
41
|
|
|
@@ -4,4 +4,6 @@ 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
|
+
|
|
7
9
|
`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,4 +4,6 @@ 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
|
+
|
|
7
9
|
`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,7 +22,6 @@ const AdvancedTablePaddingControl = (props) => {
|
|
|
22
22
|
{value}
|
|
23
23
|
</Background>
|
|
24
24
|
),
|
|
25
|
-
|
|
26
25
|
},
|
|
27
26
|
{
|
|
28
27
|
accessor: "scheduledMeetings",
|
|
@@ -39,6 +38,15 @@ const AdvancedTablePaddingControl = (props) => {
|
|
|
39
38
|
{
|
|
40
39
|
accessor: "classCompletionRate",
|
|
41
40
|
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
|
+
),
|
|
42
50
|
},
|
|
43
51
|
{
|
|
44
52
|
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. Use `fontColor` to achieve better contrast between cell content and background for darker backgrounds.
|
data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_sticky_columns_and_header.md
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
To achieve a sticky header AND sticky columns together, in addition to the `stickyLeftColumn` logic outlined above, you can:
|
|
2
2
|
|
|
3
3
|
- Set `sticky: true` via `tableProps`
|
|
4
|
-
- Give the AdvancedTable a `maxHeight` using our [Max Height](https://playbook.powerapp.cloud/
|
|
4
|
+
- Give the AdvancedTable a `maxHeight` using our [Max Height](https://playbook.powerapp.cloud//global_props/max_height) global prop.
|
|
5
5
|
|
|
6
6
|
**NOTE**: This behavior requires a `maxHeight` to work. The header is sticky within the table container, allowing for it to work along with the column stickiness.
|
|
7
7
|
|
data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_table_props_sticky_header_rails.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
Create a sticky header that works for responsive Advanced Tables by setting `sticky: true` via `table_props` and giving the AdvancedTable a `max_height` using our [Max Height](https://playbook.powerapp.cloud/
|
|
1
|
+
Create a sticky header that works for responsive Advanced Tables by setting `sticky: true` via `table_props` and giving the AdvancedTable a `max_height` using our [Max Height](https://playbook.powerapp.cloud/global_props/max_height) global prop.
|
|
2
2
|
|
|
3
3
|
**NOTE**: This behavior requires a `max_height` to work. The header is sticky within the table container, allowing for it to work along with the first column stickiness of a responsive table on smaller screen sizes.
|
|
4
4
|
|
data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_table_props_sticky_header_react.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
Create a sticky header that works for responsive Advanced Tables by setting `sticky: true` via `tableProps` and giving the AdvancedTable a `maxHeight` using our [Max Height](https://playbook.powerapp.cloud/
|
|
1
|
+
Create a sticky header that works for responsive Advanced Tables by setting `sticky: true` via `tableProps` and giving the AdvancedTable a `maxHeight` using our [Max Height](https://playbook.powerapp.cloud/global_props/max_height) global prop.
|
|
2
2
|
|
|
3
3
|
**NOTE**: This behavior requires a `maxHeight` to work. The header is sticky within the table container, allowing for it to work along with the first column stickiness of a responsive table on smaller screen sizes.
|
|
4
4
|
|
|
@@ -79,15 +79,44 @@ 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
|
+
|
|
82
96
|
# 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"
|
|
83
97
|
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
|
+
|
|
84
101
|
if has_custom_background_color?(column)
|
|
85
102
|
custom_bg_color = cell_background_color(column)
|
|
86
103
|
component_name = "background"
|
|
87
|
-
component_props = {
|
|
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?
|
|
88
110
|
else
|
|
89
111
|
component_name = "table/table_cell"
|
|
90
|
-
|
|
112
|
+
style_hash = { "background-color": bg_color }
|
|
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
|
+
}
|
|
91
120
|
end
|
|
92
121
|
|
|
93
122
|
{ name: component_name, props: component_props }
|
|
@@ -1,3 +1,11 @@
|
|
|
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
|
+
%>
|
|
1
9
|
<% if object.image_url.present? %>
|
|
2
10
|
<%= pb_content_tag(object.tag,
|
|
3
11
|
style: "background-image: url('#{object.image_url}');
|
|
@@ -9,8 +17,8 @@
|
|
|
9
17
|
<% end %>
|
|
10
18
|
<% else %>
|
|
11
19
|
<%= pb_content_tag(object.tag,
|
|
12
|
-
style: object.custom_background_color
|
|
20
|
+
style: "#{object.custom_background_color}#{html_options_style.present? ? "; #{html_options_style}" : ""}"
|
|
13
21
|
) do %>
|
|
14
22
|
<%= content.presence %>
|
|
15
23
|
<% end %>
|
|
16
|
-
<% end %>
|
|
24
|
+
<% end %>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Category colors can be passed into the background kit. Values `category_1` to `category_21` are accepted. List of all category and status colors can be viewed <a href="https://playbook.powerapp.cloud/
|
|
1
|
+
Category colors can be passed into the background kit. Values `category_1` to `category_21` are accepted. List of all category and status colors can be viewed <a href="https://playbook.powerapp.cloud/tokens/colors" target="_blank">here</a>.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Add a background color by passing the color name to background. List of all colors can be viewed <a href="https://playbook.powerapp.cloud/
|
|
1
|
+
Add a background color by passing the color name to background. List of all colors can be viewed <a href="https://playbook.powerapp.cloud/tokens/colors" target="_blank">here</a> under Product Colors and Status: Subtle Variations.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Card headers pass category, product, status and background colors only. List of all category, product, status and background colors can be viewed <a href="https://playbook.powerapp.cloud/
|
|
1
|
+
Card headers pass category, product, status and background colors only. List of all category, product, status and background colors can be viewed <a href="https://playbook.powerapp.cloud/token/colors" target="_blank">here</a>.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Card highlight can pass status, product, and category colors. List of all colors can be viewed <a href="https://playbook.powerapp.cloud/
|
|
1
|
+
Card highlight can pass status, product, and category colors. List of all colors can be viewed <a href="https://playbook.powerapp.cloud/token/colors" target="_blank">here</a>.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Card can leverage the max-width property. Learn more in our <a href="https://playbook.powerapp.cloud/
|
|
1
|
+
Card can leverage the max-width property. Learn more in our <a href="https://playbook.powerapp.cloud/global_props/max_width" target="_blank">visual guidelines.</a>
|
|
@@ -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 | number,
|
|
15
15
|
aria?: {[key:string]:string},
|
|
16
16
|
className?: string,
|
|
17
17
|
dark?: boolean,
|
|
@@ -59,6 +59,19 @@ 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
|
+
|
|
62
75
|
const emphasizedClass = emphasized ? '' : '_deemphasized'
|
|
63
76
|
|
|
64
77
|
let variantClass
|
|
@@ -68,7 +81,7 @@ const Currency = (props: CurrencyProps): React.ReactElement => {
|
|
|
68
81
|
variantClass = '_bold'
|
|
69
82
|
}
|
|
70
83
|
|
|
71
|
-
const [whole, decimal = '00'] =
|
|
84
|
+
const [whole, decimal = '00'] = currencyAmount.split('.')
|
|
72
85
|
const ariaProps = buildAriaProps(aria)
|
|
73
86
|
const dataProps = buildDataProps(data)
|
|
74
87
|
const htmlProps = buildHtmlProps(htmlOptions)
|
|
@@ -92,19 +105,19 @@ const Currency = (props: CurrencyProps): React.ReactElement => {
|
|
|
92
105
|
return isAmount ? num.slice(0, -1) : isUnit ? num.slice(-1) : ''
|
|
93
106
|
}
|
|
94
107
|
|
|
95
|
-
const getMatchingDecimalAmount = decimals === "matching" ?
|
|
108
|
+
const getMatchingDecimalAmount = decimals === "matching" ? currencyAmount : whole
|
|
96
109
|
const getMatchingDecimalValue = decimals === "matching" ? '' : `.${decimal}`
|
|
97
110
|
|
|
98
111
|
const formatAmount = (amount: string) => {
|
|
99
112
|
if (!commaSeparator) return amount;
|
|
100
|
-
|
|
113
|
+
|
|
101
114
|
const [wholePart, decimalPart] = amount.split('.');
|
|
102
115
|
const formattedWhole = new Intl.NumberFormat('en-US').format(parseInt(wholePart));
|
|
103
116
|
return decimalPart ? `${formattedWhole}.${decimalPart}` : formattedWhole;
|
|
104
117
|
}
|
|
105
118
|
|
|
106
119
|
const swapNegative = size === "sm" && symbol !== ""
|
|
107
|
-
const handleNegative =
|
|
120
|
+
const handleNegative = currencyAmount.startsWith("-") && swapNegative ? "-" : ""
|
|
108
121
|
const getAbsoluteAmount = (amountString: string) => amountString.replace(/^-/,'')
|
|
109
122
|
const getAbbrOrFormatAmount = abbreviate ? getAbbreviatedValue('amount') : formatAmount(getMatchingDecimalAmount)
|
|
110
123
|
const getAmount = swapNegative ? getAbsoluteAmount(getAbbrOrFormatAmount) : getAbbrOrFormatAmount
|
|
@@ -152,7 +165,7 @@ const Currency = (props: CurrencyProps): React.ReactElement => {
|
|
|
152
165
|
>
|
|
153
166
|
{handleNegative}{symbol}
|
|
154
167
|
</Body>
|
|
155
|
-
|
|
168
|
+
|
|
156
169
|
<Title
|
|
157
170
|
className="pb_currency_value"
|
|
158
171
|
dark={dark}
|
|
@@ -160,7 +173,7 @@ const Currency = (props: CurrencyProps): React.ReactElement => {
|
|
|
160
173
|
>
|
|
161
174
|
{getAmount}
|
|
162
175
|
</Title>
|
|
163
|
-
|
|
176
|
+
|
|
164
177
|
<Body
|
|
165
178
|
className="unit"
|
|
166
179
|
color="light"
|
|
@@ -17,8 +17,7 @@ module Playbook
|
|
|
17
17
|
prop :symbol, type: Playbook::Props::String,
|
|
18
18
|
default: "$"
|
|
19
19
|
|
|
20
|
-
prop :amount,
|
|
21
|
-
required: true
|
|
20
|
+
prop :amount, required: true
|
|
22
21
|
|
|
23
22
|
prop :unit, type: Playbook::Props::String,
|
|
24
23
|
required: false
|
|
@@ -92,7 +91,7 @@ module Playbook
|
|
|
92
91
|
end
|
|
93
92
|
|
|
94
93
|
def negative_sign
|
|
95
|
-
|
|
94
|
+
currency_amount.starts_with?("-") && swap_negative ? "-" : ""
|
|
96
95
|
end
|
|
97
96
|
|
|
98
97
|
def body_props
|
|
@@ -117,10 +116,32 @@ module Playbook
|
|
|
117
116
|
end
|
|
118
117
|
end
|
|
119
118
|
|
|
119
|
+
def currency_amount
|
|
120
|
+
@currency_amount ||= convert_amount(amount)
|
|
121
|
+
end
|
|
122
|
+
|
|
120
123
|
private
|
|
121
124
|
|
|
125
|
+
# Convert numeric input to string format
|
|
126
|
+
def convert_amount(input)
|
|
127
|
+
if input.is_a?(Numeric)
|
|
128
|
+
if input.zero? && null_display.nil?
|
|
129
|
+
""
|
|
130
|
+
else
|
|
131
|
+
format("%.2f", input)
|
|
132
|
+
end
|
|
133
|
+
# Handle string representations of zero
|
|
134
|
+
elsif input.to_s.strip.match?(/^-?0+(\.0+)?$/) && null_display.nil?
|
|
135
|
+
""
|
|
136
|
+
else
|
|
137
|
+
input.to_s
|
|
138
|
+
end
|
|
139
|
+
end
|
|
140
|
+
|
|
122
141
|
def whole_value
|
|
123
|
-
|
|
142
|
+
return "" if currency_amount.blank?
|
|
143
|
+
|
|
144
|
+
value = currency_amount.split(".").first
|
|
124
145
|
if comma_separator
|
|
125
146
|
number_with_delimiter(value.gsub(",", ""))
|
|
126
147
|
else
|
|
@@ -129,7 +150,9 @@ module Playbook
|
|
|
129
150
|
end
|
|
130
151
|
|
|
131
152
|
def decimal_value
|
|
132
|
-
|
|
153
|
+
return "00" if currency_amount.blank?
|
|
154
|
+
|
|
155
|
+
currency_amount.split(".")[1] || "00"
|
|
133
156
|
end
|
|
134
157
|
|
|
135
158
|
def units_element
|
|
@@ -147,7 +170,9 @@ module Playbook
|
|
|
147
170
|
end
|
|
148
171
|
|
|
149
172
|
def abbreviated_value(index = 0..-2)
|
|
150
|
-
|
|
173
|
+
return "" if currency_amount.blank?
|
|
174
|
+
|
|
175
|
+
value = currency_amount.split(".").first.gsub(",", "").to_i
|
|
151
176
|
abbreviated_num = number_to_human(value, units: { thousand: "K", million: "M", billion: "B", trillion: "T" }).gsub(/\s+/, "")
|
|
152
177
|
abbreviated_num[index]
|
|
153
178
|
end
|
|
@@ -174,9 +199,11 @@ module Playbook
|
|
|
174
199
|
|
|
175
200
|
if decimals == "matching"
|
|
176
201
|
if comma_separator
|
|
177
|
-
|
|
202
|
+
return "" if currency_amount.blank?
|
|
203
|
+
|
|
204
|
+
number_with_delimiter(currency_amount.gsub(",", ""))
|
|
178
205
|
else
|
|
179
|
-
|
|
206
|
+
currency_amount
|
|
180
207
|
end
|
|
181
208
|
else
|
|
182
209
|
whole_value
|
|
@@ -133,3 +133,50 @@ test('handles negative amounts correctly', () => {
|
|
|
133
133
|
expect(screen.getByTestId('test-negative-no-symbol')).toHaveTextContent('-400.50')
|
|
134
134
|
expect(screen.getByTestId('test-negative-medium-size')).toHaveTextContent('$-500.55')
|
|
135
135
|
})
|
|
136
|
+
|
|
137
|
+
test('handles numeric amounts correctly', () => {
|
|
138
|
+
render(
|
|
139
|
+
<>
|
|
140
|
+
<Currency
|
|
141
|
+
amount={320}
|
|
142
|
+
data={{ testid: 'test-numeric-default' }}
|
|
143
|
+
/>
|
|
144
|
+
<Currency
|
|
145
|
+
abbreviate
|
|
146
|
+
amount={3200000}
|
|
147
|
+
data={{ testid: 'test-numeric-millions' }}
|
|
148
|
+
/>
|
|
149
|
+
<Currency
|
|
150
|
+
amount={123456.78}
|
|
151
|
+
commaSeparator
|
|
152
|
+
data={{ testid: 'test-numeric-comma-decimals' }}
|
|
153
|
+
/>
|
|
154
|
+
<Currency
|
|
155
|
+
amount={400.50}
|
|
156
|
+
data={{ testid: 'test-numeric-no-symbol' }}
|
|
157
|
+
symbol=""
|
|
158
|
+
/>
|
|
159
|
+
<Currency
|
|
160
|
+
amount={500.55}
|
|
161
|
+
data={{ testid: 'test-numeric-medium-size' }}
|
|
162
|
+
size="md"
|
|
163
|
+
/>
|
|
164
|
+
<Currency
|
|
165
|
+
amount={-600.70}
|
|
166
|
+
data={{ testid: 'test-numeric-negative' }}
|
|
167
|
+
/>
|
|
168
|
+
<Currency
|
|
169
|
+
amount={0.00}
|
|
170
|
+
data={{ testid: 'test-numeric-null' }}
|
|
171
|
+
/>
|
|
172
|
+
</>
|
|
173
|
+
)
|
|
174
|
+
|
|
175
|
+
expect(screen.getByTestId('test-numeric-default')).toHaveTextContent('$320')
|
|
176
|
+
expect(screen.getByTestId('test-numeric-millions')).toHaveTextContent('$3.2M')
|
|
177
|
+
expect(screen.getByTestId('test-numeric-comma-decimals')).toHaveTextContent('$123,456.78')
|
|
178
|
+
expect(screen.getByTestId('test-numeric-no-symbol')).toHaveTextContent('400.50')
|
|
179
|
+
expect(screen.getByTestId('test-numeric-medium-size')).toHaveTextContent('$500.55')
|
|
180
|
+
expect(screen.getByTestId('test-numeric-negative')).toHaveTextContent('-$600.70')
|
|
181
|
+
expect(screen.getByTestId('test-numeric-null')).toHaveTextContent('$.00')
|
|
182
|
+
})
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
**NOTE:** The value passed into the `amount` prop can be either a string or numeric value.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
You can customize the order of the colors you would like to use by using the `colors` prop. Only the data and status colors will work for Playbook charts. See the [design page](/
|
|
1
|
+
You can customize the order of the colors you would like to use by using the `colors` prop. Only the data and status colors will work for Playbook charts. See the [design page](https://playbook.powerapp.cloud/token/colors) for reference.
|
data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_active_style_options_react.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
The `activeStyle` prop can be used to customize the appearance of the dropdown selection indicator. It accepts an object with the following keys: `backgroundColor` sets the background color of the selected item (and its hover state); `fontColor` sets the font color of the selected item.
|
|
2
2
|
|
|
3
3
|
`backgroundColor` **Type**: String | **Values**: bg_light | white | **Default**: (no selection) is primary
|
|
4
|
-
`fontColor` **Type**: String | **Values**: primary | all [Playbook Text Colors](https://playbook.powerapp.cloud/
|
|
4
|
+
`fontColor` **Type**: String | **Values**: primary | all [Playbook Text Colors](https://playbook.powerapp.cloud/global_props/colors) | **Default**: (no selection) is white
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Filter can leverage the max-width property. Learn more in our <a href="https://playbook.powerapp.cloud/
|
|
1
|
+
Filter can leverage the max-width property. Learn more in our <a href="https://playbook.powerapp.cloud/global_props/max_width" target="_blank">visual guidelines.</a>
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
For Form Pills with longer text, the truncate global prop can be used to truncate the label within each Form Pill. See [here](https://playbook.powerapp.cloud/
|
|
1
|
+
For Form Pills with longer text, the truncate global prop can be used to truncate the label within each Form Pill. See [here](https://playbook.powerapp.cloud/global_props/truncate) for more information on the truncate global prop.
|
|
2
2
|
|
|
3
3
|
__NOTE__: For Rails Form Pills (not ones embedded within a React-rendered Typeahead or MultiLevelSelect), a unique `id` is required to enable the Tooltip functionality displaying the text or tag section of the Form Pill.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
For Form Pills with longer text, the `truncate` global prop can be used to truncate the label within each Form Pill. Hover over the truncated Form Pill and a Tooltip containing the text or tag section of the Form Pill will appear. See [here](https://playbook.powerapp.cloud/
|
|
1
|
+
For Form Pills with longer text, the `truncate` global prop can be used to truncate the label within each Form Pill. Hover over the truncated Form Pill and a Tooltip containing the text or tag section of the Form Pill will appear. See [here](https://playbook.powerapp.cloud/global_props/truncate) for more information on the truncate global prop.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Pass any text, status, data, product, or category Playbook <a href="https://playbook.powerapp.cloud/
|
|
1
|
+
Pass any text, status, data, product, or category Playbook <a href="https://playbook.powerapp.cloud/tokens/colors" target="_blank">color token</a> to the `color` prop to change any icon's color.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Customize your icon circle by passing one of our seven base colors to the `variant` prop: `royal` `
|
|
1
|
+
Customize your icon circle by passing one of our seven base colors to the `variant` prop: `royal` `orange` `purple` `teal` `red` `yellow` `green`
|