playbook_ui 13.19.0.pre.alpha.PBNTR200addadvancedtablekitdarkmodestyles2346 → 13.19.0.pre.alpha.PBNTR207tabledivsupport2245

Sign up to get free protection for your applications and to get access to all the features.
Files changed (64) hide show
  1. checksums.yaml +4 -4
  2. data/app/pb_kits/playbook/pb_advanced_table/Components/CollapsibleTrail.tsx +1 -6
  3. data/app/pb_kits/playbook/pb_advanced_table/SubKits/TableBody.tsx +0 -2
  4. data/app/pb_kits/playbook/pb_advanced_table/SubKits/TableHeader.tsx +0 -2
  5. data/app/pb_kits/playbook/pb_advanced_table/_advanced_table.scss +0 -30
  6. data/app/pb_kits/playbook/pb_advanced_table/_advanced_table.tsx +4 -7
  7. data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_collapsible_trail.md +1 -1
  8. data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_default.md +1 -1
  9. data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_loading.md +1 -1
  10. data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_subrow_headers.md +1 -1
  11. data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_table_options.md +1 -1
  12. data/app/pb_kits/playbook/pb_icon/_icon.tsx +16 -28
  13. data/app/pb_kits/playbook/pb_icon/docs/_icon_custom.html.erb +11 -5
  14. data/app/pb_kits/playbook/pb_icon/docs/_icon_custom.jsx +18 -44
  15. data/app/pb_kits/playbook/pb_icon/docs/_icon_custom.md +8 -4
  16. data/app/pb_kits/playbook/pb_icon/icon.html.erb +4 -6
  17. data/app/pb_kits/playbook/pb_icon/icon.rb +10 -27
  18. data/app/pb_kits/playbook/pb_nav/_subtle_mixin.scss +0 -4
  19. data/app/pb_kits/playbook/pb_table/_table.tsx +67 -86
  20. data/app/pb_kits/playbook/pb_table/docs/_table_div.html.erb +26 -26
  21. data/app/pb_kits/playbook/pb_table/docs/_table_div.jsx +26 -27
  22. data/app/pb_kits/playbook/pb_table/docs/example.yml +2 -5
  23. data/app/pb_kits/playbook/pb_table/styles/_all.scss +1 -0
  24. data/app/pb_kits/playbook/pb_table/styles/_content.scss +3 -3
  25. data/app/pb_kits/playbook/pb_table/styles/_desktop_collapse.scss +15 -15
  26. data/app/pb_kits/playbook/pb_table/styles/_div_support.scss +22 -0
  27. data/app/pb_kits/playbook/pb_table/styles/_headers.scss +3 -3
  28. data/app/pb_kits/playbook/pb_table/styles/_hover.scss +11 -11
  29. data/app/pb_kits/playbook/pb_table/styles/_mobile.scss +15 -15
  30. data/app/pb_kits/playbook/pb_table/styles/_mobile_collapse.scss +15 -15
  31. data/app/pb_kits/playbook/pb_table/styles/_reset.scss +3 -3
  32. data/app/pb_kits/playbook/pb_table/styles/_side_highlight.scss +2 -2
  33. data/app/pb_kits/playbook/pb_table/styles/_single-line.scss +4 -4
  34. data/app/pb_kits/playbook/pb_table/styles/_sticky_header.scss +2 -2
  35. data/app/pb_kits/playbook/pb_table/styles/_striped.scss +4 -4
  36. data/app/pb_kits/playbook/pb_table/styles/_structure.scss +8 -22
  37. data/app/pb_kits/playbook/pb_table/styles/_table-card.scss +7 -7
  38. data/app/pb_kits/playbook/pb_table/styles/_table-dark.scss +14 -14
  39. data/app/pb_kits/playbook/pb_table/styles/_table_header.scss +2 -2
  40. data/app/pb_kits/playbook/pb_table/styles/_tablet_collapse.scss +15 -15
  41. data/app/pb_kits/playbook/pb_table/styles/_vertical_border.scss +3 -3
  42. data/app/pb_kits/playbook/pb_table/table.html.erb +3 -1
  43. data/app/pb_kits/playbook/pb_table/table_header.html.erb +39 -49
  44. data/app/pb_kits/playbook/pb_table/table_header.rb +1 -8
  45. data/app/pb_kits/playbook/pb_table/table_row.html.erb +7 -17
  46. data/app/pb_kits/playbook/pb_table/table_row.rb +1 -8
  47. data/app/pb_kits/playbook/pb_text_input/_text_input.tsx +5 -9
  48. data/app/pb_kits/playbook/pb_text_input/docs/_text_input_add_on.jsx +0 -20
  49. data/app/pb_kits/playbook/pb_user/docs/_user_props_table.md +1 -2
  50. data/app/pb_kits/playbook/pb_user/docs/example.yml +0 -1
  51. data/dist/playbook-rails.js +2 -2
  52. data/lib/playbook/version.rb +1 -1
  53. metadata +3 -13
  54. data/app/pb_kits/playbook/pb_table/docs/_table_with_subcomponents.html.erb +0 -34
  55. data/app/pb_kits/playbook/pb_table/docs/_table_with_subcomponents.md +0 -7
  56. data/app/pb_kits/playbook/pb_table/docs/_table_with_subcomponents_as_divs.html.erb +0 -34
  57. data/app/pb_kits/playbook/pb_table/docs/_table_with_subcomponents_as_divs.md +0 -3
  58. data/app/pb_kits/playbook/pb_table/table_body.html.erb +0 -17
  59. data/app/pb_kits/playbook/pb_table/table_body.rb +0 -15
  60. data/app/pb_kits/playbook/pb_table/table_cell.html.erb +0 -17
  61. data/app/pb_kits/playbook/pb_table/table_cell.rb +0 -17
  62. data/app/pb_kits/playbook/pb_table/table_head.html.erb +0 -17
  63. data/app/pb_kits/playbook/pb_table/table_head.rb +0 -15
  64. data/app/pb_kits/playbook/pb_user/docs/_user_presence_indicator_swift.md +0 -30
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0e92276b817648438498c23e0ecd061e7c98a9475ad753f40cc7e5c9fb0af6d7
4
- data.tar.gz: f4140309f468eed4a83eceeb5f7615dba9a2a36b8b98304adaeed0dc094b6a49
3
+ metadata.gz: a73601703c905cb01092a7d850385c15520882f090cc1708efcab0b0224df4ee
4
+ data.tar.gz: 5277c579fec4b9464b461e16ab568501caacdcf865bac3f4f2ae78dd3ae5d395
5
5
  SHA512:
6
- metadata.gz: 8af07f55548723f7ec6ea94fc068ce0159eac619cbd0c48dbee56256dcfa9e1598c2aaf5a5518ba82005a8d01c927902dd76f59abefa151d54edf33e90083d65
7
- data.tar.gz: '0299fa636b48f91f847ba704349dd639d9a412e354ac81508f744b85bfbb2d0d109885e3047aa126099a651875be533142b1e52f8232f99ca76244b614fed8db'
6
+ metadata.gz: 76c033c78404a767f48b6ac6ec2d1e370bb5ad14ad7c19f326366a6c298470db581f4c9eddf0f27158e6cb1ee6857ec5505a297f0a36c309cb333aee3457640c
7
+ data.tar.gz: 846e857b5a3f98b0695a10482590579a9552c67ebc22c9a6804db22d8ffc95dff6abd0beba8abd3d8baabef068ca92b21c687cc86754990cf44d31f1576ccc8c
@@ -11,12 +11,7 @@ const CollapsibleTrail = ({ leftOffset }: { leftOffset: number }) => {
11
11
  backgroundColor: "#E4E8F0",
12
12
  }
13
13
 
14
- return (
15
- <div
16
- className="collapsible-trail"
17
- style={style}
18
- />
19
- )
14
+ return <div style={style} />
20
15
  }
21
16
 
22
17
  // Updated function to render multiple trails depending on depth
@@ -15,7 +15,6 @@ import { DataType } from "../Utilities/types"
15
15
  type TableBodyProps = {
16
16
  className?: string;
17
17
  collapsibleTrail?: boolean
18
- dark?: boolean,
19
18
  id?: string;
20
19
  subRowHeaders?: string[]
21
20
  }
@@ -23,7 +22,6 @@ type TableBodyProps = {
23
22
  export const TableBody = ({
24
23
  className,
25
24
  collapsibleTrail = true,
26
- dark = false,
27
25
  id,
28
26
  subRowHeaders,
29
27
  ...props
@@ -10,7 +10,6 @@ import { DataType } from "../Utilities/types"
10
10
  type TableHeaderProps = {
11
11
  children?: React.ReactNode | React.ReactNode[]
12
12
  className?: string
13
- dark?: boolean,
14
13
  enableSorting?: boolean
15
14
  id?: string;
16
15
  sortIcon?: string | string[]
@@ -19,7 +18,6 @@ type TableHeaderProps = {
19
18
  export const TableHeader = ({
20
19
  children,
21
20
  className,
22
- dark = false,
23
21
  enableSorting = false,
24
22
  id,
25
23
  sortIcon = ["arrow-up-short-wide", "arrow-down-short-wide"],
@@ -95,34 +95,4 @@
95
95
  border-right: $transparent !important;
96
96
  }
97
97
  }
98
-
99
- &.dark {
100
- .bg-white {
101
- background: $bg_dark_card;
102
- }
103
-
104
- .bg-silver {
105
- background: $bg_dark;
106
- }
107
-
108
- .table-header-cells:first-child, td:first-child {
109
- box-shadow: 1px 0px 0px 0px $border_dark !important;
110
- }
111
-
112
- .collapsible-trail {
113
- background-color: $border_dark !important;
114
- }
115
-
116
- .sort-button-icon, .header-sort-button > div {
117
- color: $white !important;
118
- }
119
-
120
- .gray-icon {
121
- color: $text_dk_light !important;
122
- }
123
-
124
- .sticky-header {
125
- background-color: $bg_dark_card;
126
- }
127
- }
128
98
  }
@@ -20,14 +20,13 @@ import AdvancedTableContext from "./Context/AdvancedTableContext";
20
20
  import { TableHeader } from "./SubKits/TableHeader";
21
21
  import { TableBody } from "./SubKits/TableBody";
22
22
 
23
- import { DataType } from "./Utilities/types";
23
+ import { DataType, ExpandedStateObject } from "./Utilities/types";
24
24
 
25
25
  type AdvancedTableProps = {
26
26
  aria?: { [key: string]: string };
27
27
  children?: React.ReactNode | React.ReactNode[];
28
28
  className?: string;
29
29
  columnDefinitions: DataType[];
30
- dark?: boolean,
31
30
  data?: { [key: string]: string };
32
31
  enableToggleExpansion?: "all" | "header" | "none";
33
32
  expandedControl?: DataType;
@@ -51,7 +50,6 @@ const AdvancedTable = (props: AdvancedTableProps) => {
51
50
  children,
52
51
  className,
53
52
  columnDefinitions,
54
- dark = false,
55
53
  data = {},
56
54
  enableToggleExpansion = "header",
57
55
  expandedControl,
@@ -82,7 +80,7 @@ const AdvancedTable = (props: AdvancedTableProps) => {
82
80
  ? expandedControl.onChange
83
81
  : setLocalExpanded;
84
82
 
85
- const columnHelper = createColumnHelper();
83
+ const columnHelper = createColumnHelper<DataType>();
86
84
 
87
85
  //Create cells for first columns
88
86
  const createCellFunction = (cellAccessors: string[]) => {
@@ -165,7 +163,7 @@ const AdvancedTable = (props: AdvancedTableProps) => {
165
163
  data: loading ? Array(loadingStateRowCount).fill({}) : tableData,
166
164
  columns,
167
165
  onExpandedChange: setExpanded,
168
- getSubRows: (row: DataType) => row.children,
166
+ getSubRows: (row) => row.children,
169
167
  getCoreRowModel: getCoreRowModel(),
170
168
  getExpandedRowModel: getExpandedRowModel(),
171
169
  getSortedRowModel: getSortedRowModel(),
@@ -194,7 +192,7 @@ const AdvancedTable = (props: AdvancedTableProps) => {
194
192
  const handleExpandOrCollapse = (row: Row<DataType>) => {
195
193
  onToggleExpansionClick && onToggleExpansionClick(row);
196
194
 
197
- const expandedState = expanded;
195
+ const expandedState = expanded as ExpandedStateObject;
198
196
  const targetParent = row?.parentId;
199
197
  return setExpanded(
200
198
  updateExpandAndCollapseState(tableRows, expandedState, targetParent)
@@ -233,7 +231,6 @@ const AdvancedTable = (props: AdvancedTableProps) => {
233
231
  >
234
232
  <Table
235
233
  className={`${loading ? "content-loading" : ""}`}
236
- dark={dark}
237
234
  dataTable
238
235
  numberSpacing="tabular"
239
236
  responsive="none"
@@ -1 +1 @@
1
- `collapsibleTrail` is an optional prop that is set to 'true' by default. If set to 'false', it will remove the trail on the left of the rows when subRows are toggled open.
1
+ `collapsibleTrail` is an optional prop that is set to 'true' by default. If set to 'false', it will remove the trail on the left of rows when subRows are toggled open.
@@ -8,7 +8,7 @@ For a visual of the data structure needed for `tableData`, see [here](https://gi
8
8
 
9
9
  ### columnDefinitions
10
10
 
11
- `columnDefinitions` maps to the columns prop on the Tanstack table. Column definitions are the single most important part of building a table as they are responsible for building the underlying data model that is used for all sorting, expansion, etc. `ColumnDefinitions` in the AdvancedTable kit is an array of objects as seen in the code snippet below. Each object within the array has two REQUIRED items:
11
+ `columnDefinitions` maps to the columns prop on the Tanstack table. Column definitions are the single most important part of building a table as they are responsible for building the underlying data model that is used for all sorting, expansion, etc. `ColumnDefinitions` in the AdvancedTable kit is a array of objects as seen in the code snippet below. Each object within the array has two REQUIRED items:
12
12
 
13
13
  - `accessor`: this is the key from your data for the value you want rendered in that column
14
14
  - `label`: this is what will be rendered as the column header label
@@ -1,3 +1,3 @@
1
1
  the optional `loading` prop takes a boolean value that can be managed using state. If loading is true, the table will display the loading skeleton and once loading is false, the table will render with the data provided.
2
2
 
3
- By default, the inital row count of the loading skeleton is set to 10. If you want more control over this initial row count, the optional `initialLoadingRowCount` prop can be used to pass in a number. __NOTE__: This is only for the first render of the table, subsequent loading skeleton row count logic is handled within the kit itself.
3
+ By default, the inital row count of the loading skeleton is set to 10. If you want more control over this initial row count, the optional `initialLoadingRowCount` prop can be used to to pass in a number. __NOTE__: This is only for the first render of the table, subsequent loading skeleton row count logic is handled within the kit itself.
@@ -1,3 +1,3 @@
1
1
  `subRowHeaders` is an optional prop that if present will add header rows at each level of the nested data. The prop takes an array of strings, each string being the text for each header row. The array of strings must be in the order in which they need to be rendered in the UI according to depth.
2
2
 
3
- `enableToggleExpansion` is an additional optional prop that can be used in conjunction with the subRowHeaders prop. `enableToggleExpansion` is a string that can be 'all', 'header" or "none". If set to 'all', the toggle exapansion button will appear in the table header as well as in the subRow headers. If set to 'header' button will only appear in header and NOT in subRow headers. This is set to 'header' by default.
3
+ `enableToggleExpansion` is an additional optional prop that can be used in conjunction with the subRowHeaders prop. `enableToggleExpansion` is a string that can be 'all' or 'header". If set to 'all', the toggle exapansion button will appear in the table header as well as in the subRow headers. If set to 'header' button will only appear in header and NOT in subRow headers. This is set to 'headeer' by default.
@@ -1,3 +1,3 @@
1
1
  The Tanstack table consumes the useReactTable hook to create the table. This hook takes an object that can contain any of the functions that the Tanstack table provides. The advancedTable's optional `tableOptions` can be used to pass tanstack options to the kit.
2
2
 
3
- In the above example, we are using the initialState option provided by tanstack that takes sort as one of it's values. Setting it to true for the first column is reversing the sort order on first render of the table. For a complete list of possible options and how to use them, see [here](https://tanstack.com/table/v8/docs/api/core/table#usereacttable--createsolidtable--usevuetable--createsveltetable)
3
+ In the above example, we are using the initialState option provided by tanstack that takes sort as one of it's values. Setting it to true for the first column is reversing the sort order on first render of the table. For a complete list of possible options and hoe to use them, see [here](https://tanstack.com/table/v8/docs/api/core/table#usereacttable--createsolidtable--usevuetable--createsveltetable)
@@ -1,4 +1,4 @@
1
- import React, { ReactSVGElement } from 'react'
1
+ import React from 'react'
2
2
  import classnames from 'classnames'
3
3
  import { buildAriaProps, buildDataProps, buildHtmlProps } from '../utilities/props'
4
4
  import { GlobalProps, globalProps } from '../utilities/globalProps'
@@ -27,7 +27,7 @@ type IconProps = {
27
27
  data?: {[key: string]: string},
28
28
  fixedWidth?: boolean,
29
29
  flip?: "horizontal" | "vertical" | "both" | "none",
30
- icon: string | ReactSVGElement,
30
+ icon: string,
31
31
  htmlOptions?: {[key: string]: string | number | boolean | (() => void)},
32
32
  id?: string,
33
33
  inverse?: boolean,
@@ -47,11 +47,6 @@ const flipMap = {
47
47
  none: ""
48
48
  }
49
49
 
50
- declare global {
51
- // eslint-disable-next-line no-var
52
- var PB_ICONS: {[key: string]: React.FunctionComponent<any>}
53
- }
54
-
55
50
  const Icon = (props: IconProps) => {
56
51
  const {
57
52
  aria = {},
@@ -62,7 +57,7 @@ const Icon = (props: IconProps) => {
62
57
  fixedWidth = true,
63
58
  flip = "none",
64
59
  htmlOptions = {},
65
- icon = "",
60
+ icon,
66
61
  id,
67
62
  inverse = false,
68
63
  listItem = false,
@@ -74,8 +69,6 @@ const Icon = (props: IconProps) => {
74
69
  spin = false,
75
70
  } = props
76
71
 
77
- let iconElement: ReactSVGElement | null = typeof(icon) === "object" ? icon : null
78
-
79
72
  const faClasses = {
80
73
  'fa-border': border,
81
74
  'fa-fw': fixedWidth,
@@ -86,23 +79,19 @@ const Icon = (props: IconProps) => {
86
79
  [`fa-${size}`]: size,
87
80
  [`fa-pull-${pull}`]: pull,
88
81
  [`fa-rotate-${rotation}`]: rotation,
89
- }
90
-
91
- if (!customIcon && !iconElement) {
92
- const PowerIcon: React.FunctionComponent<any> | undefined =
93
- window.PB_ICONS ? window.PB_ICONS[icon as string] : null
94
82
 
95
- if (PowerIcon) {
96
- iconElement = <PowerIcon /> as ReactSVGElement
97
- } else {
98
- faClasses[`fa-${icon}`] = icon as string
99
- }
100
83
  }
101
84
 
85
+ // Lets check and see if the icon prop is referring to a custom Power icon...
86
+ // If so, then set fa-icon to "custom"
87
+ // this ensures the JS will not do any further operations
88
+ // faClasses[`fa-${icon}`] = customIcon ? 'custom' : icon
89
+ if (!customIcon) faClasses[`fa-${icon}`] = icon
90
+
102
91
  const classes = classnames(
103
92
  flipMap[flip],
104
- (!iconElement && !customIcon) ? 'pb_icon_kit' : '',
105
- (iconElement || customIcon) ? 'pb_custom_icon' : fontStyle,
93
+ 'pb_icon_kit',
94
+ customIcon ? '' : fontStyle,
106
95
  faClasses,
107
96
  globalProps(props),
108
97
  className
@@ -121,22 +110,20 @@ const Icon = (props: IconProps) => {
121
110
 
122
111
  // Add a conditional here to show only the SVG if custom
123
112
  const displaySVG = (customIcon: any) => {
124
- if (iconElement || customIcon)
113
+ if (customIcon)
125
114
  return (
126
115
  <>
127
116
  {
128
- React.cloneElement(iconElement || customIcon, {
117
+ React.cloneElement(customIcon, {
129
118
  ...dataProps,
130
119
  ...htmlProps,
131
120
  className: classes,
132
121
  id,
133
- width: 'auto',
134
- height: 'auto',
135
122
  })
136
123
  }
137
124
  </>
138
125
  )
139
- else if (isValidEmoji(icon as string))
126
+ else if (isValidEmoji(icon))
140
127
  return (
141
128
  <>
142
129
  <span
@@ -149,6 +136,7 @@ const Icon = (props: IconProps) => {
149
136
  </span>
150
137
  </>
151
138
  )
139
+
152
140
  else
153
141
  return (
154
142
  <>
@@ -173,4 +161,4 @@ const Icon = (props: IconProps) => {
173
161
  )
174
162
  }
175
163
 
176
- export default Icon
164
+ export default Icon
@@ -2,9 +2,15 @@
2
2
  <div class="icon-wrapper">
3
3
 
4
4
  <% svg_url = "https://upload.wikimedia.org/wikipedia/commons/3/3b/Wrench_font_awesome.svg" %>
5
- <p><%= pb_rails("icon", props: { icon: svg_url } ) %></p>
6
- <p><%= pb_rails("icon", props: { rotation: 90, icon: svg_url, size: "2x" } ) %></p>
7
- <p><%= pb_rails("icon", props: { spin: true, icon: svg_url, size: "3x" } ) %></p>
8
- <p><%= pb_rails("icon", props: { size: "5x", icon: svg_url } ) %></p>
9
- <p><%= pb_rails("icon", props: { flip: "horizontal", size: "5x", icon: svg_url } ) %></p>
5
+ <p><%= pb_rails("icon", props: { custom_icon: svg_url } ) %></p>
6
+ <p><%= pb_rails("icon", props: { rotation: 90, custom_icon: svg_url, size: "2x" } ) %></p>
7
+ <p><%= pb_rails("icon", props: { spin: true, custom_icon: svg_url, size: "3x" } ) %></p>
8
+ <p><%= pb_rails("icon", props: { size: "5x", custom_icon: svg_url } ) %></p>
9
+ <p><%= pb_rails("icon", props: { flip: "horizontal", size: "5x", custom_icon: svg_url } ) %></p>
10
+
11
+ <%= pb_rails("body", props: {
12
+ text: "Custom icons are compatible with other icon props (size, rotation,
13
+ spin, flip, etc). Their SVG fill colors will be inherited from
14
+ parent element's css color properties."
15
+ } ) %>
10
16
  </div>
@@ -1,59 +1,33 @@
1
1
  import React from 'react'
2
2
  import { Icon } from '../../'
3
3
 
4
+ // import Icons as config from 'power-icons'
4
5
  const config = {
5
- icon: (
6
- <svg viewBox="0 -256 1792 1792"
6
+ moon: (
7
+ <svg
8
+ ariaHidden="true"
9
+ focusable="false"
10
+ role="img"
11
+ viewBox="0 0 512 512"
7
12
  xmlns="http://www.w3.org/2000/svg"
8
13
  >
9
- <g transform="matrix(1,0,0,-1,53.152542,1217.0847)">
10
- <path d="m 384,64 q 0,26 -19,45 -19,19 -45,19 -26,0 -45,-19 -19,-19 -19,-45 0,-26 19,-45 19,-19 45,-19 26,0 45,19 19,19 19,45 z m 644,420 -682,-682 q -37,-37 -90,-37 -52,0 -91,37 L 59,-90 Q 21,-54 21,0 21,53 59,91 L 740,772 Q 779,674 854.5,598.5 930,523 1028,484 z m 634,435 q 0,-39 -23,-106 Q 1592,679 1474.5,595.5 1357,512 1216,512 1031,512 899.5,643.5 768,775 768,960 q 0,185 131.5,316.5 131.5,131.5 316.5,131.5 58,0 121.5,-16.5 63.5,-16.5 107.5,-46.5 16,-11 16,-28 0,-17 -16,-28 L 1152,1120 V 896 l 193,-107 q 5,3 79,48.5 74,45.5 135.5,81 61.5,35.5 70.5,35.5 15,0 23.5,-10 8.5,-10 8.5,-25 z" />
11
- </g>
14
+ <path
15
+ d="M448 0H64C28.7 0 0 28.7 0 64v288c0 35.3 28.7 64 64 64h96v84c0 7.1 5.8 12 12 12 2.4 0 4.9-.7 7.1-2.4L304 416h144c35.3 0 64-28.7 64-64V64c0-35.3-28.7-64-64-64zm16 352c0 8.8-7.2 16-16 16H288l-12.8 9.6L208 428v-60H64c-8.8 0-16-7.2-16-16V64c0-8.8 7.2-16 16-16h384c8.8 0 16 7.2 16 16v288zM336 184h-56v-56c0-8.8-7.2-16-16-16h-16c-8.8 0-16 7.2-16 16v56h-56c-8.8 0-16 7.2-16 16v16c0 8.8 7.2 16 16 16h56v56c0 8.8 7.2 16 16 16h16c8.8 0 16-7.2 16-16v-56h56c8.8 0 16-7.2 16-16v-16c0-8.8-7.2-16-16-16z"
16
+ fill="currentColor"
17
+ />
12
18
  </svg>
13
19
  ),
14
20
  }
15
21
 
16
22
  const IconCustom = (props) => {
17
23
  return (
18
- <React.Fragment>
19
- <p>
20
- <Icon
21
- icon={config.icon}
22
- {...props}
23
- />
24
- </p>
25
- <p>
26
- <Icon
27
- icon={config.icon}
28
- rotation={90}
29
- size="2x"
30
- {...props}
31
- />
32
- </p>
33
- <p>
34
- <Icon
35
- icon={config.icon}
36
- size="3x"
37
- spin
38
- {...props}
39
- />
40
- </p>
41
- <p>
42
- <Icon
43
- icon={config.icon}
44
- size="5x"
45
- {...props}
46
- />
47
- </p>
48
- <p>
49
- <Icon
50
- flip="horizontal"
51
- icon={config.icon}
52
- size="5x"
53
- {...props}
54
- />
55
- </p>
56
- </React.Fragment>
24
+ <div>
25
+ <Icon
26
+ customIcon={config.moon}
27
+ size="7x"
28
+ {...props}
29
+ />
30
+ </div>
57
31
  )
58
32
  }
59
33
 
@@ -4,12 +4,16 @@ When using custom icons it is important to introduce a "clean" SVG. In order to
4
4
 
5
5
  Attributes must be React compatible e.g. <code>xmlns:xlink</code> should be <code>xmlnsXlink</code> and so on. <strong>There should be no hyphenated attributes and no semi-colons!.</strong>
6
6
 
7
- Fill colors with regards to <code>g</code> or <code>path</code> nodes, e.g. <code>fill="black"</code>, should be replaced with <code>currentColor</code> ala <code>fill="currentColor"</code>. Your mileage may vary depending on the complexity of your SVG.
7
+ Fill colors with regards to <code>g</code> or <code>path</code> nodes, e.g. <code>fill="black"</code>, should be replaced with <code>currentColor</code> ala <code>fill="currentColor"</code>. Your mileage may vary depending on the complexity of your SVG.
8
8
 
9
- Pay attention to your custom icon's dimensions and `viewBox` attribute. It is best to use a `viewBox="0 0 512 512"` starting point **when designing instead of trying to retrofit the viewbox afterwards**!
9
+ Pay attention to your custom icon's dimensions and `viewBox` attribute. It is best to use a `viewBox="0 0 512 512"` starting point __when designing instead of trying to retrofit the viewbox afterwards__!
10
10
 
11
- You must source _your own SVG into component/view_ you are working on. This can easily be done in programmatic and maintainable ways.
11
+ You must source *your own SVG into component/view* you are working on. This can easily be done in programmatic and maintainable ways.
12
+
13
+ ### React
14
+
15
+ So long as you have a valid React `<SVG>` node, you can send it as the `customIcon` prop and the kit will take care of the rest.
12
16
 
13
17
  ### Rails
14
18
 
15
- Sending the absolute path to the `icon` prop results in an `<SVG>` tag within the working view.
19
+ Some Rails applications use only webpack(er) which means using `image_url` will be successful over `image_path` in most cases especially development where Webpack Dev Server is serving assets over HTTP. Rails applications still using Asset Pipeline may use `image_path` or `image_url`. Of course, YMMV depending on any custom configurations in your Rails application.
@@ -1,9 +1,7 @@
1
- <% if object.is_svg? %>
2
- <%= object.render_svg %>
3
- <% elsif object.valid_emoji? %>
4
- <span class="pb_icon_kit_emoji">
5
- <%= object.icon.html_safe %>
6
- </span>
1
+ <% if object.custom_icon %>
2
+ <%= object.render_svg(object.custom_icon) %>
3
+ <% elsif object.valid_emoji(object.icon) %>
4
+ <span class="pb_icon_kit_emoji"><%= object.icon.html_safe %></span>
7
5
  <% else %>
8
6
  <%= content_tag(:i, nil,
9
7
  id: object.id,
@@ -38,7 +38,7 @@ module Playbook
38
38
  prop :spin, type: Playbook::Props::Boolean,
39
39
  default: false
40
40
 
41
- def valid_emoji?
41
+ def valid_emoji(icon)
42
42
  emoji_regex = /\p{Emoji}/
43
43
  emoji_regex.match?(icon)
44
44
  end
@@ -79,36 +79,19 @@ module Playbook
79
79
  )
80
80
  end
81
81
 
82
- def asset_path
83
- return unless Rails.application.config.respond_to?(:icon_path)
84
- return unless Dir.entries(Rails.application.config.icon_path).include? "#{icon}.svg"
85
-
86
- Rails.root.join(Rails.application.config.icon_path, "#{icon}.svg")
87
- end
88
-
89
- def render_svg
90
- doc = Nokogiri::XML(URI.open(asset_path || icon || custom_icon)) # rubocop:disable Security/Open
91
- svg = doc.at_css "svg"
92
- svg["class"] = "pb_custom_icon " + object.custom_icon_classname
93
- svg["id"] = object.id
94
- svg["data"] = object.data
95
- svg["aria"] = object.aria
96
- svg["height"] = "auto"
97
- svg["width"] = "auto"
98
- doc.at_css("path")["fill"] = "currentColor"
99
- raw doc
100
- end
101
-
102
- def is_svg?
103
- (icon || custom_icon.to_s).include?(".svg") || asset_path.present?
82
+ def render_svg(path)
83
+ if File.extname(path) == ".svg"
84
+ doc = Nokogiri::XML(URI.open(path)) # rubocop:disable Security/Open
85
+ svg = doc.at_css "svg"
86
+ svg["class"] = "pb_custom_icon " + object.custom_icon_classname
87
+ raw doc
88
+ else
89
+ raise("Custom icon must be an svg. Please check your path and file type.")
90
+ end
104
91
  end
105
92
 
106
93
  private
107
94
 
108
- def svg_size
109
- size.nil? ? "1x" : size
110
- end
111
-
112
95
  def border_class
113
96
  border ? "fa-border" : nil
114
97
  end
@@ -40,10 +40,6 @@
40
40
  &[class*="_active"] {
41
41
  color: $primary;
42
42
  letter-spacing: normal;
43
-
44
- [class*="_icon_right"] {
45
- color: $white;
46
- }
47
43
  }
48
44
  &[class*="dark"] {
49
45
  [class*="_item_text"],