@patternfly/react-data-view 6.0.0-prerelease.1 → 6.1.0
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.
- package/dist/cjs/DataView/DataView.d.ts +15 -1
- package/dist/cjs/DataView/DataView.js +14 -3
- package/dist/cjs/DataViewCheckboxFilter/DataViewCheckboxFilter.d.ts +29 -0
- package/dist/cjs/DataViewCheckboxFilter/DataViewCheckboxFilter.js +70 -0
- package/dist/cjs/DataViewCheckboxFilter/DataViewCheckboxFilter.test.d.ts +1 -0
- package/dist/cjs/DataViewCheckboxFilter/DataViewCheckboxFilter.test.js +25 -0
- package/dist/cjs/DataViewCheckboxFilter/index.d.ts +2 -0
- package/dist/cjs/DataViewCheckboxFilter/index.js +23 -0
- package/dist/cjs/DataViewEventsContext/DataViewEventsContext.d.ts +16 -0
- package/dist/cjs/DataViewEventsContext/DataViewEventsContext.js +62 -0
- package/dist/cjs/DataViewEventsContext/DataViewEventsContext.test.d.ts +1 -0
- package/dist/cjs/DataViewEventsContext/DataViewEventsContext.test.js +72 -0
- package/dist/cjs/DataViewEventsContext/index.d.ts +2 -0
- package/dist/cjs/DataViewEventsContext/index.js +23 -0
- package/dist/cjs/DataViewFilters/DataViewFilters.d.ts +25 -0
- package/dist/cjs/DataViewFilters/DataViewFilters.js +85 -0
- package/dist/cjs/DataViewFilters/DataViewFilters.test.d.ts +1 -0
- package/dist/cjs/DataViewFilters/DataViewFilters.test.js +19 -0
- package/dist/cjs/DataViewFilters/index.d.ts +2 -0
- package/dist/cjs/DataViewFilters/index.js +23 -0
- package/dist/cjs/DataViewTable/DataViewTable.d.ts +49 -0
- package/dist/cjs/DataViewTable/DataViewTable.js +18 -0
- package/dist/cjs/DataViewTable/DataViewTable.test.d.ts +1 -0
- package/dist/cjs/DataViewTable/DataViewTable.test.js +57 -0
- package/dist/cjs/DataViewTable/index.d.ts +2 -0
- package/dist/cjs/DataViewTable/index.js +23 -0
- package/dist/cjs/DataViewTableBasic/DataViewTableBasic.d.ts +19 -0
- package/dist/cjs/DataViewTableBasic/DataViewTableBasic.js +71 -0
- package/dist/cjs/DataViewTableBasic/DataViewTableBasic.test.d.ts +1 -0
- package/dist/cjs/DataViewTableBasic/DataViewTableBasic.test.js +43 -0
- package/dist/cjs/DataViewTableBasic/index.d.ts +2 -0
- package/dist/cjs/DataViewTableBasic/index.js +23 -0
- package/dist/cjs/DataViewTableHead/DataViewTableHead.d.ts +14 -0
- package/dist/cjs/DataViewTableHead/DataViewTableHead.js +57 -0
- package/dist/cjs/DataViewTableHead/DataViewTableHead.test.d.ts +1 -0
- package/dist/cjs/DataViewTableHead/DataViewTableHead.test.js +36 -0
- package/dist/cjs/DataViewTableHead/index.d.ts +2 -0
- package/dist/cjs/DataViewTableHead/index.js +23 -0
- package/dist/cjs/DataViewTableTree/DataViewTableTree.d.ts +25 -0
- package/dist/cjs/DataViewTableTree/DataViewTableTree.js +144 -0
- package/dist/cjs/DataViewTableTree/DataViewTableTree.test.d.ts +1 -0
- package/dist/cjs/DataViewTableTree/DataViewTableTree.test.js +90 -0
- package/dist/cjs/DataViewTableTree/index.d.ts +2 -0
- package/dist/cjs/DataViewTableTree/index.js +23 -0
- package/dist/cjs/DataViewTextFilter/DataViewTextFilter.d.ts +21 -0
- package/dist/cjs/DataViewTextFilter/DataViewTextFilter.js +26 -0
- package/dist/cjs/DataViewTextFilter/DataViewTextFilter.test.d.ts +1 -0
- package/dist/cjs/DataViewTextFilter/DataViewTextFilter.test.js +22 -0
- package/dist/cjs/DataViewTextFilter/index.d.ts +2 -0
- package/dist/cjs/DataViewTextFilter/index.js +23 -0
- package/dist/cjs/DataViewToolbar/DataViewToolbar.d.ts +11 -3
- package/dist/cjs/DataViewToolbar/DataViewToolbar.js +30 -6
- package/dist/cjs/Hooks/filters.d.ts +14 -0
- package/dist/cjs/Hooks/filters.js +69 -0
- package/dist/cjs/Hooks/filters.test.d.ts +1 -0
- package/dist/cjs/Hooks/filters.test.js +50 -0
- package/dist/cjs/Hooks/index.d.ts +2 -0
- package/dist/cjs/Hooks/index.js +2 -0
- package/dist/cjs/Hooks/pagination.d.ts +14 -1
- package/dist/cjs/Hooks/pagination.js +36 -4
- package/dist/cjs/Hooks/pagination.test.js +1 -1
- package/dist/cjs/Hooks/selection.d.ts +3 -3
- package/dist/cjs/Hooks/selection.js +4 -4
- package/dist/cjs/Hooks/selection.test.js +4 -4
- package/dist/cjs/Hooks/sort.d.ts +32 -0
- package/dist/cjs/Hooks/sort.js +47 -0
- package/dist/cjs/Hooks/sort.test.d.ts +1 -0
- package/dist/cjs/Hooks/sort.test.js +68 -0
- package/dist/cjs/InternalContext/InternalContext.d.ts +26 -0
- package/dist/cjs/InternalContext/InternalContext.js +40 -0
- package/dist/cjs/InternalContext/InternalContext.test.d.ts +1 -0
- package/dist/cjs/InternalContext/InternalContext.test.js +56 -0
- package/dist/cjs/InternalContext/index.d.ts +2 -0
- package/dist/cjs/InternalContext/index.js +23 -0
- package/dist/cjs/index.d.ts +16 -0
- package/dist/cjs/index.js +26 -2
- package/dist/dynamic/DataViewCheckboxFilter/package.json +1 -0
- package/dist/dynamic/DataViewEventsContext/package.json +1 -0
- package/dist/dynamic/DataViewFilters/package.json +1 -0
- package/dist/dynamic/DataViewTable/package.json +1 -0
- package/dist/dynamic/DataViewTableBasic/package.json +1 -0
- package/dist/dynamic/DataViewTableHead/package.json +1 -0
- package/dist/dynamic/DataViewTableTree/package.json +1 -0
- package/dist/dynamic/DataViewTextFilter/package.json +1 -0
- package/dist/dynamic/InternalContext/package.json +1 -0
- package/dist/esm/DataView/DataView.d.ts +15 -1
- package/dist/esm/DataView/DataView.js +13 -2
- package/dist/esm/DataViewCheckboxFilter/DataViewCheckboxFilter.d.ts +29 -0
- package/dist/esm/DataViewCheckboxFilter/DataViewCheckboxFilter.js +62 -0
- package/dist/esm/DataViewCheckboxFilter/DataViewCheckboxFilter.test.d.ts +1 -0
- package/dist/esm/DataViewCheckboxFilter/DataViewCheckboxFilter.test.js +20 -0
- package/dist/esm/DataViewCheckboxFilter/index.d.ts +2 -0
- package/dist/esm/DataViewCheckboxFilter/index.js +2 -0
- package/dist/esm/DataViewEventsContext/DataViewEventsContext.d.ts +16 -0
- package/dist/esm/DataViewEventsContext/DataViewEventsContext.js +34 -0
- package/dist/esm/DataViewEventsContext/DataViewEventsContext.test.d.ts +1 -0
- package/dist/esm/DataViewEventsContext/DataViewEventsContext.test.js +67 -0
- package/dist/esm/DataViewEventsContext/index.d.ts +2 -0
- package/dist/esm/DataViewEventsContext/index.js +2 -0
- package/dist/esm/DataViewFilters/DataViewFilters.d.ts +25 -0
- package/dist/esm/DataViewFilters/DataViewFilters.js +58 -0
- package/dist/esm/DataViewFilters/DataViewFilters.test.d.ts +1 -0
- package/dist/esm/DataViewFilters/DataViewFilters.test.js +14 -0
- package/dist/esm/DataViewFilters/index.d.ts +2 -0
- package/dist/esm/DataViewFilters/index.js +2 -0
- package/dist/esm/DataViewTable/DataViewTable.d.ts +49 -0
- package/dist/esm/DataViewTable/DataViewTable.js +8 -0
- package/dist/esm/DataViewTable/DataViewTable.test.d.ts +1 -0
- package/dist/esm/DataViewTable/DataViewTable.test.js +52 -0
- package/dist/esm/DataViewTable/index.d.ts +2 -0
- package/dist/esm/DataViewTable/index.js +2 -0
- package/dist/esm/DataViewTableBasic/DataViewTableBasic.d.ts +19 -0
- package/dist/esm/DataViewTableBasic/DataViewTableBasic.js +44 -0
- package/dist/esm/DataViewTableBasic/DataViewTableBasic.test.d.ts +1 -0
- package/dist/esm/DataViewTableBasic/DataViewTableBasic.test.js +38 -0
- package/dist/esm/DataViewTableBasic/index.d.ts +2 -0
- package/dist/esm/DataViewTableBasic/index.js +2 -0
- package/dist/esm/DataViewTableHead/DataViewTableHead.d.ts +14 -0
- package/dist/esm/DataViewTableHead/DataViewTableHead.js +30 -0
- package/dist/esm/DataViewTableHead/DataViewTableHead.test.d.ts +1 -0
- package/dist/esm/DataViewTableHead/DataViewTableHead.test.js +31 -0
- package/dist/esm/DataViewTableHead/index.d.ts +2 -0
- package/dist/esm/DataViewTableHead/index.js +2 -0
- package/dist/esm/DataViewTableTree/DataViewTableTree.d.ts +25 -0
- package/dist/esm/DataViewTableTree/DataViewTableTree.js +117 -0
- package/dist/esm/DataViewTableTree/DataViewTableTree.test.d.ts +1 -0
- package/dist/esm/DataViewTableTree/DataViewTableTree.test.js +85 -0
- package/dist/esm/DataViewTableTree/index.d.ts +2 -0
- package/dist/esm/DataViewTableTree/index.js +2 -0
- package/dist/esm/DataViewTextFilter/DataViewTextFilter.d.ts +21 -0
- package/dist/esm/DataViewTextFilter/DataViewTextFilter.js +19 -0
- package/dist/esm/DataViewTextFilter/DataViewTextFilter.test.d.ts +1 -0
- package/dist/esm/DataViewTextFilter/DataViewTextFilter.test.js +17 -0
- package/dist/esm/DataViewTextFilter/index.d.ts +2 -0
- package/dist/esm/DataViewTextFilter/index.js +2 -0
- package/dist/esm/DataViewToolbar/DataViewToolbar.d.ts +11 -3
- package/dist/esm/DataViewToolbar/DataViewToolbar.js +8 -4
- package/dist/esm/Hooks/filters.d.ts +14 -0
- package/dist/esm/Hooks/filters.js +65 -0
- package/dist/esm/Hooks/filters.test.d.ts +1 -0
- package/dist/esm/Hooks/filters.test.js +48 -0
- package/dist/esm/Hooks/index.d.ts +2 -0
- package/dist/esm/Hooks/index.js +2 -0
- package/dist/esm/Hooks/pagination.d.ts +14 -1
- package/dist/esm/Hooks/pagination.js +36 -4
- package/dist/esm/Hooks/pagination.test.js +1 -1
- package/dist/esm/Hooks/selection.d.ts +3 -3
- package/dist/esm/Hooks/selection.js +4 -4
- package/dist/esm/Hooks/selection.test.js +4 -4
- package/dist/esm/Hooks/sort.d.ts +32 -0
- package/dist/esm/Hooks/sort.js +43 -0
- package/dist/esm/Hooks/sort.test.d.ts +1 -0
- package/dist/esm/Hooks/sort.test.js +66 -0
- package/dist/esm/InternalContext/InternalContext.d.ts +26 -0
- package/dist/esm/InternalContext/InternalContext.js +12 -0
- package/dist/esm/InternalContext/InternalContext.test.d.ts +1 -0
- package/dist/esm/InternalContext/InternalContext.test.js +51 -0
- package/dist/esm/InternalContext/index.d.ts +2 -0
- package/dist/esm/InternalContext/index.js +2 -0
- package/dist/esm/index.d.ts +16 -0
- package/dist/esm/index.js +16 -0
- package/dist/tsconfig.tsbuildinfo +1 -0
- package/package.json +16 -15
- package/patternfly-docs/content/extensions/data-view/examples/DataView/DataView.md +63 -0
- package/patternfly-docs/content/extensions/data-view/examples/DataView/EventsExample.tsx +130 -0
- package/patternfly-docs/content/extensions/data-view/examples/DataView/PredefinedLayoutFullExample.tsx +275 -0
- package/patternfly-docs/content/extensions/data-view/examples/Table/DataViewTableEmptyExample.tsx +57 -0
- package/patternfly-docs/content/extensions/data-view/examples/Table/DataViewTableErrorExample.tsx +45 -0
- package/patternfly-docs/content/extensions/data-view/examples/Table/DataViewTableExample.tsx +67 -0
- package/patternfly-docs/content/extensions/data-view/examples/Table/DataViewTableLoadingExample.tsx +27 -0
- package/patternfly-docs/content/extensions/data-view/examples/Table/DataViewTableTreeExample.tsx +71 -0
- package/patternfly-docs/content/extensions/data-view/examples/Table/SortingExample.tsx +87 -0
- package/patternfly-docs/content/extensions/data-view/examples/Table/Table.md +130 -0
- package/patternfly-docs/content/extensions/data-view/examples/Toolbar/DataViewToolbarActionsExample.tsx +27 -0
- package/patternfly-docs/content/extensions/data-view/examples/Toolbar/DataViewToolbarExample.tsx +36 -0
- package/patternfly-docs/content/extensions/data-view/examples/Toolbar/FiltersExample.tsx +107 -0
- package/patternfly-docs/content/extensions/data-view/examples/Toolbar/PaginationExample.tsx +56 -0
- package/patternfly-docs/content/extensions/data-view/examples/Toolbar/SelectionExample.tsx +57 -0
- package/patternfly-docs/content/extensions/data-view/examples/Toolbar/Toolbar.md +142 -0
- package/patternfly-docs/pages/index.js +1 -1
- package/src/DataView/DataView.tsx +28 -5
- package/src/DataView/__snapshots__/DataView.test.tsx.snap +2 -2
- package/src/DataViewCheckboxFilter/DataViewCheckboxFilter.test.tsx +24 -0
- package/src/DataViewCheckboxFilter/DataViewCheckboxFilter.tsx +175 -0
- package/src/DataViewCheckboxFilter/__snapshots__/DataViewCheckboxFilter.test.tsx.snap +197 -0
- package/src/DataViewCheckboxFilter/index.ts +2 -0
- package/src/DataViewEventsContext/DataViewEventsContext.test.tsx +105 -0
- package/src/DataViewEventsContext/DataViewEventsContext.tsx +70 -0
- package/src/DataViewEventsContext/index.ts +2 -0
- package/src/DataViewFilters/DataViewFilters.test.tsx +21 -0
- package/src/DataViewFilters/DataViewFilters.tsx +144 -0
- package/src/DataViewFilters/__snapshots__/DataViewFilters.test.tsx.snap +194 -0
- package/src/DataViewFilters/index.tsx +2 -0
- package/src/DataViewTable/DataViewTable.test.tsx +80 -0
- package/src/DataViewTable/DataViewTable.tsx +57 -0
- package/src/DataViewTable/__snapshots__/DataViewTable.test.tsx.snap +1042 -0
- package/src/DataViewTable/index.ts +2 -0
- package/src/DataViewTableBasic/DataViewTableBasic.test.tsx +65 -0
- package/src/DataViewTableBasic/DataViewTableBasic.tsx +83 -0
- package/src/DataViewTableBasic/__snapshots__/DataViewTableBasic.test.tsx.snap +555 -0
- package/src/DataViewTableBasic/index.ts +2 -0
- package/src/DataViewTableHead/DataViewTableHead.test.tsx +50 -0
- package/src/DataViewTableHead/DataViewTableHead.tsx +54 -0
- package/src/DataViewTableHead/__snapshots__/DataViewTableHead.test.tsx.snap +227 -0
- package/src/DataViewTableHead/index.ts +2 -0
- package/src/DataViewTableTree/DataViewTableTree.test.tsx +113 -0
- package/src/DataViewTableTree/DataViewTableTree.tsx +186 -0
- package/src/DataViewTableTree/__snapshots__/DataViewTableTree.test.tsx.snap +1200 -0
- package/src/DataViewTableTree/index.ts +2 -0
- package/src/DataViewTextFilter/DataViewTextFilter.test.tsx +24 -0
- package/src/DataViewTextFilter/DataViewTextFilter.tsx +54 -0
- package/src/DataViewTextFilter/__snapshots__/DataViewTextFilter.test.tsx.snap +203 -0
- package/src/DataViewTextFilter/index.ts +2 -0
- package/src/DataViewToolbar/DataViewToolbar.tsx +48 -22
- package/src/DataViewToolbar/__snapshots__/DataViewToolbar.test.tsx.snap +264 -174
- package/src/Hooks/filters.test.tsx +62 -0
- package/src/Hooks/filters.ts +97 -0
- package/src/Hooks/index.ts +2 -0
- package/src/Hooks/pagination.test.tsx +1 -1
- package/src/Hooks/pagination.ts +69 -12
- package/src/Hooks/selection.test.tsx +5 -5
- package/src/Hooks/selection.ts +7 -7
- package/src/Hooks/sort.test.tsx +84 -0
- package/src/Hooks/sort.ts +87 -0
- package/src/InternalContext/InternalContext.test.tsx +89 -0
- package/src/InternalContext/InternalContext.tsx +52 -0
- package/src/InternalContext/index.ts +2 -0
- package/src/index.ts +24 -0
- package/patternfly-docs/content/extensions/data-view/about-data-view.md +0 -14
- package/patternfly-docs/content/extensions/data-view/examples/Components/Components.md +0 -31
- package/patternfly-docs/content/extensions/data-view/examples/Components/DataViewToolbarExample.tsx +0 -20
- package/patternfly-docs/content/extensions/data-view/examples/Functionality/Functionality.md +0 -77
- package/patternfly-docs/content/extensions/data-view/examples/Functionality/PaginationExample.tsx +0 -65
- package/patternfly-docs/content/extensions/data-view/examples/Functionality/SelectionExample.tsx +0 -88
- package/patternfly-docs/content/extensions/data-view/examples/Layout/Layout.md +0 -39
- package/patternfly-docs/content/extensions/data-view/examples/Layout/PredefinedLayoutExample.tsx +0 -120
- /package/patternfly-docs/content/extensions/data-view/examples/{Layout → DataView}/AbstractLayoutExample.tsx +0 -0
|
@@ -46,51 +46,58 @@ exports[`DataViewToolbar component should render correctly 1`] = `
|
|
|
46
46
|
</b>
|
|
47
47
|
|
|
48
48
|
</div>
|
|
49
|
-
<
|
|
50
|
-
|
|
51
|
-
aria-haspopup="listbox"
|
|
52
|
-
class="pf-v6-c-menu-toggle pf-m-plain pf-m-text"
|
|
53
|
-
id="options-menu-top-toggle"
|
|
54
|
-
type="button"
|
|
49
|
+
<div
|
|
50
|
+
class="pf-v6-c-pagination__page-menu"
|
|
55
51
|
>
|
|
56
|
-
<
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
of
|
|
66
|
-
|
|
67
|
-
<b>
|
|
68
|
-
0
|
|
69
|
-
</b>
|
|
70
|
-
|
|
71
|
-
</span>
|
|
72
|
-
<span
|
|
73
|
-
class="pf-v6-c-menu-toggle__controls"
|
|
52
|
+
<button
|
|
53
|
+
aria-expanded="false"
|
|
54
|
+
aria-haspopup="listbox"
|
|
55
|
+
class="pf-v6-c-menu-toggle pf-m-plain pf-m-text"
|
|
56
|
+
data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-1"
|
|
57
|
+
data-ouia-component-type="PF6/MenuToggle"
|
|
58
|
+
data-ouia-safe="true"
|
|
59
|
+
id="options-menu-top-toggle"
|
|
60
|
+
type="button"
|
|
74
61
|
>
|
|
75
62
|
<span
|
|
76
|
-
class="pf-v6-c-menu-
|
|
63
|
+
class="pf-v6-c-menu-toggle__text"
|
|
77
64
|
>
|
|
78
|
-
<
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
65
|
+
<b>
|
|
66
|
+
1
|
|
67
|
+
-
|
|
68
|
+
10
|
|
69
|
+
</b>
|
|
70
|
+
|
|
71
|
+
of
|
|
72
|
+
|
|
73
|
+
<b>
|
|
74
|
+
0
|
|
75
|
+
</b>
|
|
76
|
+
|
|
77
|
+
</span>
|
|
78
|
+
<span
|
|
79
|
+
class="pf-v6-c-menu-toggle__controls"
|
|
80
|
+
>
|
|
81
|
+
<span
|
|
82
|
+
class="pf-v6-c-menu-toggle__toggle-icon"
|
|
86
83
|
>
|
|
87
|
-
<
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
84
|
+
<svg
|
|
85
|
+
aria-hidden="true"
|
|
86
|
+
class="pf-v6-svg"
|
|
87
|
+
fill="currentColor"
|
|
88
|
+
height="1em"
|
|
89
|
+
role="img"
|
|
90
|
+
viewBox="0 0 320 512"
|
|
91
|
+
width="1em"
|
|
92
|
+
>
|
|
93
|
+
<path
|
|
94
|
+
d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
|
|
95
|
+
/>
|
|
96
|
+
</svg>
|
|
97
|
+
</span>
|
|
91
98
|
</span>
|
|
92
|
-
</
|
|
93
|
-
</
|
|
99
|
+
</button>
|
|
100
|
+
</div>
|
|
94
101
|
<nav
|
|
95
102
|
aria-label="Pagination"
|
|
96
103
|
class="pf-v6-c-pagination__nav"
|
|
@@ -109,19 +116,23 @@ exports[`DataViewToolbar component should render correctly 1`] = `
|
|
|
109
116
|
disabled=""
|
|
110
117
|
type="button"
|
|
111
118
|
>
|
|
112
|
-
<
|
|
113
|
-
|
|
114
|
-
class="pf-v6-svg"
|
|
115
|
-
fill="currentColor"
|
|
116
|
-
height="1em"
|
|
117
|
-
role="img"
|
|
118
|
-
viewBox="0 0 448 512"
|
|
119
|
-
width="1em"
|
|
119
|
+
<span
|
|
120
|
+
class="pf-v6-c-button__icon"
|
|
120
121
|
>
|
|
121
|
-
<
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
122
|
+
<svg
|
|
123
|
+
aria-hidden="true"
|
|
124
|
+
class="pf-v6-svg"
|
|
125
|
+
fill="currentColor"
|
|
126
|
+
height="1em"
|
|
127
|
+
role="img"
|
|
128
|
+
viewBox="0 0 448 512"
|
|
129
|
+
width="1em"
|
|
130
|
+
>
|
|
131
|
+
<path
|
|
132
|
+
d="M223.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L319.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L393.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34zm-192 34l136 136c9.4 9.4 24.6 9.4 33.9 0l22.6-22.6c9.4-9.4 9.4-24.6 0-33.9L127.9 256l96.4-96.4c9.4-9.4 9.4-24.6 0-33.9L201.7 103c-9.4-9.4-24.6-9.4-33.9 0l-136 136c-9.5 9.4-9.5 24.6-.1 34z"
|
|
133
|
+
/>
|
|
134
|
+
</svg>
|
|
135
|
+
</span>
|
|
125
136
|
</button>
|
|
126
137
|
</div>
|
|
127
138
|
<div
|
|
@@ -138,19 +149,23 @@ exports[`DataViewToolbar component should render correctly 1`] = `
|
|
|
138
149
|
disabled=""
|
|
139
150
|
type="button"
|
|
140
151
|
>
|
|
141
|
-
<
|
|
142
|
-
|
|
143
|
-
class="pf-v6-svg"
|
|
144
|
-
fill="currentColor"
|
|
145
|
-
height="1em"
|
|
146
|
-
role="img"
|
|
147
|
-
viewBox="0 0 256 512"
|
|
148
|
-
width="1em"
|
|
152
|
+
<span
|
|
153
|
+
class="pf-v6-c-button__icon"
|
|
149
154
|
>
|
|
150
|
-
<
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
155
|
+
<svg
|
|
156
|
+
aria-hidden="true"
|
|
157
|
+
class="pf-v6-svg"
|
|
158
|
+
fill="currentColor"
|
|
159
|
+
height="1em"
|
|
160
|
+
role="img"
|
|
161
|
+
viewBox="0 0 256 512"
|
|
162
|
+
width="1em"
|
|
163
|
+
>
|
|
164
|
+
<path
|
|
165
|
+
d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
|
|
166
|
+
/>
|
|
167
|
+
</svg>
|
|
168
|
+
</span>
|
|
154
169
|
</button>
|
|
155
170
|
</div>
|
|
156
171
|
<div
|
|
@@ -185,19 +200,23 @@ exports[`DataViewToolbar component should render correctly 1`] = `
|
|
|
185
200
|
data-ouia-safe="true"
|
|
186
201
|
type="button"
|
|
187
202
|
>
|
|
188
|
-
<
|
|
189
|
-
|
|
190
|
-
class="pf-v6-svg"
|
|
191
|
-
fill="currentColor"
|
|
192
|
-
height="1em"
|
|
193
|
-
role="img"
|
|
194
|
-
viewBox="0 0 256 512"
|
|
195
|
-
width="1em"
|
|
203
|
+
<span
|
|
204
|
+
class="pf-v6-c-button__icon"
|
|
196
205
|
>
|
|
197
|
-
<
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
206
|
+
<svg
|
|
207
|
+
aria-hidden="true"
|
|
208
|
+
class="pf-v6-svg"
|
|
209
|
+
fill="currentColor"
|
|
210
|
+
height="1em"
|
|
211
|
+
role="img"
|
|
212
|
+
viewBox="0 0 256 512"
|
|
213
|
+
width="1em"
|
|
214
|
+
>
|
|
215
|
+
<path
|
|
216
|
+
d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
|
|
217
|
+
/>
|
|
218
|
+
</svg>
|
|
219
|
+
</span>
|
|
201
220
|
</button>
|
|
202
221
|
</div>
|
|
203
222
|
<div
|
|
@@ -213,19 +232,23 @@ exports[`DataViewToolbar component should render correctly 1`] = `
|
|
|
213
232
|
data-ouia-safe="true"
|
|
214
233
|
type="button"
|
|
215
234
|
>
|
|
216
|
-
<
|
|
217
|
-
|
|
218
|
-
class="pf-v6-svg"
|
|
219
|
-
fill="currentColor"
|
|
220
|
-
height="1em"
|
|
221
|
-
role="img"
|
|
222
|
-
viewBox="0 0 448 512"
|
|
223
|
-
width="1em"
|
|
235
|
+
<span
|
|
236
|
+
class="pf-v6-c-button__icon"
|
|
224
237
|
>
|
|
225
|
-
<
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
238
|
+
<svg
|
|
239
|
+
aria-hidden="true"
|
|
240
|
+
class="pf-v6-svg"
|
|
241
|
+
fill="currentColor"
|
|
242
|
+
height="1em"
|
|
243
|
+
role="img"
|
|
244
|
+
viewBox="0 0 448 512"
|
|
245
|
+
width="1em"
|
|
246
|
+
>
|
|
247
|
+
<path
|
|
248
|
+
d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34zm192-34l-136-136c-9.4-9.4-24.6-9.4-33.9 0l-22.6 22.6c-9.4 9.4-9.4 24.6 0 33.9l96.4 96.4-96.4 96.4c-9.4 9.4-9.4 24.6 0 33.9l22.6 22.6c9.4 9.4 24.6 9.4 33.9 0l136-136c9.4-9.2 9.4-24.4 0-33.8z"
|
|
249
|
+
/>
|
|
250
|
+
</svg>
|
|
251
|
+
</span>
|
|
229
252
|
</button>
|
|
230
253
|
</div>
|
|
231
254
|
</nav>
|
|
@@ -240,6 +263,28 @@ exports[`DataViewToolbar component should render correctly 1`] = `
|
|
|
240
263
|
<div
|
|
241
264
|
class="pf-v6-c-toolbar__group"
|
|
242
265
|
/>
|
|
266
|
+
<div
|
|
267
|
+
class="pf-v6-c-toolbar__group pf-m-action-group-inline"
|
|
268
|
+
>
|
|
269
|
+
<div
|
|
270
|
+
class="pf-v6-c-toolbar__item"
|
|
271
|
+
>
|
|
272
|
+
<button
|
|
273
|
+
aria-disabled="false"
|
|
274
|
+
class="pf-v6-c-button pf-m-link pf-m-inline"
|
|
275
|
+
data-ouia-component-id="DataViewToolbar-clear-all-filters"
|
|
276
|
+
data-ouia-component-type="PF6/Button"
|
|
277
|
+
data-ouia-safe="true"
|
|
278
|
+
type="button"
|
|
279
|
+
>
|
|
280
|
+
<span
|
|
281
|
+
class="pf-v6-c-button__text"
|
|
282
|
+
>
|
|
283
|
+
Clear filters
|
|
284
|
+
</span>
|
|
285
|
+
</button>
|
|
286
|
+
</div>
|
|
287
|
+
</div>
|
|
243
288
|
</div>
|
|
244
289
|
</div>
|
|
245
290
|
</div>
|
|
@@ -286,51 +331,58 @@ exports[`DataViewToolbar component should render correctly 1`] = `
|
|
|
286
331
|
</b>
|
|
287
332
|
|
|
288
333
|
</div>
|
|
289
|
-
<
|
|
290
|
-
|
|
291
|
-
aria-haspopup="listbox"
|
|
292
|
-
class="pf-v6-c-menu-toggle pf-m-plain pf-m-text"
|
|
293
|
-
id="options-menu-top-toggle"
|
|
294
|
-
type="button"
|
|
334
|
+
<div
|
|
335
|
+
class="pf-v6-c-pagination__page-menu"
|
|
295
336
|
>
|
|
296
|
-
<
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
of
|
|
306
|
-
|
|
307
|
-
<b>
|
|
308
|
-
0
|
|
309
|
-
</b>
|
|
310
|
-
|
|
311
|
-
</span>
|
|
312
|
-
<span
|
|
313
|
-
class="pf-v6-c-menu-toggle__controls"
|
|
337
|
+
<button
|
|
338
|
+
aria-expanded="false"
|
|
339
|
+
aria-haspopup="listbox"
|
|
340
|
+
class="pf-v6-c-menu-toggle pf-m-plain pf-m-text"
|
|
341
|
+
data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-1"
|
|
342
|
+
data-ouia-component-type="PF6/MenuToggle"
|
|
343
|
+
data-ouia-safe="true"
|
|
344
|
+
id="options-menu-top-toggle"
|
|
345
|
+
type="button"
|
|
314
346
|
>
|
|
315
347
|
<span
|
|
316
|
-
class="pf-v6-c-menu-
|
|
348
|
+
class="pf-v6-c-menu-toggle__text"
|
|
317
349
|
>
|
|
318
|
-
<
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
350
|
+
<b>
|
|
351
|
+
1
|
|
352
|
+
-
|
|
353
|
+
10
|
|
354
|
+
</b>
|
|
355
|
+
|
|
356
|
+
of
|
|
357
|
+
|
|
358
|
+
<b>
|
|
359
|
+
0
|
|
360
|
+
</b>
|
|
361
|
+
|
|
362
|
+
</span>
|
|
363
|
+
<span
|
|
364
|
+
class="pf-v6-c-menu-toggle__controls"
|
|
365
|
+
>
|
|
366
|
+
<span
|
|
367
|
+
class="pf-v6-c-menu-toggle__toggle-icon"
|
|
326
368
|
>
|
|
327
|
-
<
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
369
|
+
<svg
|
|
370
|
+
aria-hidden="true"
|
|
371
|
+
class="pf-v6-svg"
|
|
372
|
+
fill="currentColor"
|
|
373
|
+
height="1em"
|
|
374
|
+
role="img"
|
|
375
|
+
viewBox="0 0 320 512"
|
|
376
|
+
width="1em"
|
|
377
|
+
>
|
|
378
|
+
<path
|
|
379
|
+
d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
|
|
380
|
+
/>
|
|
381
|
+
</svg>
|
|
382
|
+
</span>
|
|
331
383
|
</span>
|
|
332
|
-
</
|
|
333
|
-
</
|
|
384
|
+
</button>
|
|
385
|
+
</div>
|
|
334
386
|
<nav
|
|
335
387
|
aria-label="Pagination"
|
|
336
388
|
class="pf-v6-c-pagination__nav"
|
|
@@ -349,19 +401,23 @@ exports[`DataViewToolbar component should render correctly 1`] = `
|
|
|
349
401
|
disabled=""
|
|
350
402
|
type="button"
|
|
351
403
|
>
|
|
352
|
-
<
|
|
353
|
-
|
|
354
|
-
class="pf-v6-svg"
|
|
355
|
-
fill="currentColor"
|
|
356
|
-
height="1em"
|
|
357
|
-
role="img"
|
|
358
|
-
viewBox="0 0 448 512"
|
|
359
|
-
width="1em"
|
|
404
|
+
<span
|
|
405
|
+
class="pf-v6-c-button__icon"
|
|
360
406
|
>
|
|
361
|
-
<
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
407
|
+
<svg
|
|
408
|
+
aria-hidden="true"
|
|
409
|
+
class="pf-v6-svg"
|
|
410
|
+
fill="currentColor"
|
|
411
|
+
height="1em"
|
|
412
|
+
role="img"
|
|
413
|
+
viewBox="0 0 448 512"
|
|
414
|
+
width="1em"
|
|
415
|
+
>
|
|
416
|
+
<path
|
|
417
|
+
d="M223.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L319.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L393.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34zm-192 34l136 136c9.4 9.4 24.6 9.4 33.9 0l22.6-22.6c9.4-9.4 9.4-24.6 0-33.9L127.9 256l96.4-96.4c9.4-9.4 9.4-24.6 0-33.9L201.7 103c-9.4-9.4-24.6-9.4-33.9 0l-136 136c-9.5 9.4-9.5 24.6-.1 34z"
|
|
418
|
+
/>
|
|
419
|
+
</svg>
|
|
420
|
+
</span>
|
|
365
421
|
</button>
|
|
366
422
|
</div>
|
|
367
423
|
<div
|
|
@@ -378,19 +434,23 @@ exports[`DataViewToolbar component should render correctly 1`] = `
|
|
|
378
434
|
disabled=""
|
|
379
435
|
type="button"
|
|
380
436
|
>
|
|
381
|
-
<
|
|
382
|
-
|
|
383
|
-
class="pf-v6-svg"
|
|
384
|
-
fill="currentColor"
|
|
385
|
-
height="1em"
|
|
386
|
-
role="img"
|
|
387
|
-
viewBox="0 0 256 512"
|
|
388
|
-
width="1em"
|
|
437
|
+
<span
|
|
438
|
+
class="pf-v6-c-button__icon"
|
|
389
439
|
>
|
|
390
|
-
<
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
440
|
+
<svg
|
|
441
|
+
aria-hidden="true"
|
|
442
|
+
class="pf-v6-svg"
|
|
443
|
+
fill="currentColor"
|
|
444
|
+
height="1em"
|
|
445
|
+
role="img"
|
|
446
|
+
viewBox="0 0 256 512"
|
|
447
|
+
width="1em"
|
|
448
|
+
>
|
|
449
|
+
<path
|
|
450
|
+
d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
|
|
451
|
+
/>
|
|
452
|
+
</svg>
|
|
453
|
+
</span>
|
|
394
454
|
</button>
|
|
395
455
|
</div>
|
|
396
456
|
<div
|
|
@@ -425,19 +485,23 @@ exports[`DataViewToolbar component should render correctly 1`] = `
|
|
|
425
485
|
data-ouia-safe="true"
|
|
426
486
|
type="button"
|
|
427
487
|
>
|
|
428
|
-
<
|
|
429
|
-
|
|
430
|
-
class="pf-v6-svg"
|
|
431
|
-
fill="currentColor"
|
|
432
|
-
height="1em"
|
|
433
|
-
role="img"
|
|
434
|
-
viewBox="0 0 256 512"
|
|
435
|
-
width="1em"
|
|
488
|
+
<span
|
|
489
|
+
class="pf-v6-c-button__icon"
|
|
436
490
|
>
|
|
437
|
-
<
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
491
|
+
<svg
|
|
492
|
+
aria-hidden="true"
|
|
493
|
+
class="pf-v6-svg"
|
|
494
|
+
fill="currentColor"
|
|
495
|
+
height="1em"
|
|
496
|
+
role="img"
|
|
497
|
+
viewBox="0 0 256 512"
|
|
498
|
+
width="1em"
|
|
499
|
+
>
|
|
500
|
+
<path
|
|
501
|
+
d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
|
|
502
|
+
/>
|
|
503
|
+
</svg>
|
|
504
|
+
</span>
|
|
441
505
|
</button>
|
|
442
506
|
</div>
|
|
443
507
|
<div
|
|
@@ -453,19 +517,23 @@ exports[`DataViewToolbar component should render correctly 1`] = `
|
|
|
453
517
|
data-ouia-safe="true"
|
|
454
518
|
type="button"
|
|
455
519
|
>
|
|
456
|
-
<
|
|
457
|
-
|
|
458
|
-
class="pf-v6-svg"
|
|
459
|
-
fill="currentColor"
|
|
460
|
-
height="1em"
|
|
461
|
-
role="img"
|
|
462
|
-
viewBox="0 0 448 512"
|
|
463
|
-
width="1em"
|
|
520
|
+
<span
|
|
521
|
+
class="pf-v6-c-button__icon"
|
|
464
522
|
>
|
|
465
|
-
<
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
523
|
+
<svg
|
|
524
|
+
aria-hidden="true"
|
|
525
|
+
class="pf-v6-svg"
|
|
526
|
+
fill="currentColor"
|
|
527
|
+
height="1em"
|
|
528
|
+
role="img"
|
|
529
|
+
viewBox="0 0 448 512"
|
|
530
|
+
width="1em"
|
|
531
|
+
>
|
|
532
|
+
<path
|
|
533
|
+
d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34zm192-34l-136-136c-9.4-9.4-24.6-9.4-33.9 0l-22.6 22.6c-9.4 9.4-9.4 24.6 0 33.9l96.4 96.4-96.4 96.4c-9.4 9.4-9.4 24.6 0 33.9l22.6 22.6c9.4 9.4 24.6 9.4 33.9 0l136-136c9.4-9.2 9.4-24.4 0-33.8z"
|
|
534
|
+
/>
|
|
535
|
+
</svg>
|
|
536
|
+
</span>
|
|
469
537
|
</button>
|
|
470
538
|
</div>
|
|
471
539
|
</nav>
|
|
@@ -480,6 +548,28 @@ exports[`DataViewToolbar component should render correctly 1`] = `
|
|
|
480
548
|
<div
|
|
481
549
|
class="pf-v6-c-toolbar__group"
|
|
482
550
|
/>
|
|
551
|
+
<div
|
|
552
|
+
class="pf-v6-c-toolbar__group pf-m-action-group-inline"
|
|
553
|
+
>
|
|
554
|
+
<div
|
|
555
|
+
class="pf-v6-c-toolbar__item"
|
|
556
|
+
>
|
|
557
|
+
<button
|
|
558
|
+
aria-disabled="false"
|
|
559
|
+
class="pf-v6-c-button pf-m-link pf-m-inline"
|
|
560
|
+
data-ouia-component-id="DataViewToolbar-clear-all-filters"
|
|
561
|
+
data-ouia-component-type="PF6/Button"
|
|
562
|
+
data-ouia-safe="true"
|
|
563
|
+
type="button"
|
|
564
|
+
>
|
|
565
|
+
<span
|
|
566
|
+
class="pf-v6-c-button__text"
|
|
567
|
+
>
|
|
568
|
+
Clear filters
|
|
569
|
+
</span>
|
|
570
|
+
</button>
|
|
571
|
+
</div>
|
|
572
|
+
</div>
|
|
483
573
|
</div>
|
|
484
574
|
</div>
|
|
485
575
|
</div>,
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import '@testing-library/jest-dom';
|
|
2
|
+
import { renderHook, act } from '@testing-library/react';
|
|
3
|
+
import { useDataViewFilters, UseDataViewFiltersProps } from './filters';
|
|
4
|
+
|
|
5
|
+
describe('useDataViewFilters', () => {
|
|
6
|
+
const initialFilters = { search: 'test', tags: [ 'tag1', 'tag2' ] };
|
|
7
|
+
|
|
8
|
+
it('should initialize with provided initial filters', () => {
|
|
9
|
+
const { result } = renderHook(() => useDataViewFilters({ initialFilters }));
|
|
10
|
+
expect(result.current.filters).toEqual(initialFilters);
|
|
11
|
+
});
|
|
12
|
+
|
|
13
|
+
it('should initialize with empty filters if no initialFilters provided', () => {
|
|
14
|
+
const { result } = renderHook(() => useDataViewFilters({}));
|
|
15
|
+
expect(result.current.filters).toEqual({});
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
it('should set filters correctly', () => {
|
|
19
|
+
const { result } = renderHook(() => useDataViewFilters({ initialFilters }));
|
|
20
|
+
const newFilters = { search: 'new search' };
|
|
21
|
+
act(() => result.current.onSetFilters(newFilters));
|
|
22
|
+
|
|
23
|
+
expect(result.current.filters).toEqual({ ...initialFilters, ...newFilters });
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
it('should delete specific filters without removing keys', () => {
|
|
27
|
+
const { result } = renderHook(() => useDataViewFilters({ initialFilters }));
|
|
28
|
+
const filtersToDelete = { search: 'test' };
|
|
29
|
+
act(() => result.current.onDeleteFilters(filtersToDelete));
|
|
30
|
+
|
|
31
|
+
expect(result.current.filters).toEqual({ search: '', tags: [ 'tag1', 'tag2' ] });
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
it('should clear all filters', () => {
|
|
35
|
+
const { result } = renderHook(() => useDataViewFilters({ initialFilters }));
|
|
36
|
+
act(() => result.current.clearAllFilters());
|
|
37
|
+
|
|
38
|
+
expect(result.current.filters).toEqual({ search: '', tags: [] });
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
it('should sync with URL search params if isUrlSyncEnabled', () => {
|
|
42
|
+
const searchParams = new URLSearchParams();
|
|
43
|
+
const setSearchParams = jest.fn();
|
|
44
|
+
const props: UseDataViewFiltersProps<typeof initialFilters> = {
|
|
45
|
+
initialFilters,
|
|
46
|
+
searchParams,
|
|
47
|
+
setSearchParams,
|
|
48
|
+
};
|
|
49
|
+
|
|
50
|
+
const { result } = renderHook(() => useDataViewFilters(props));
|
|
51
|
+
act(() => result.current.onSetFilters({ search: 'new search' }));
|
|
52
|
+
|
|
53
|
+
expect(setSearchParams).toHaveBeenCalled();
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
it('should reset filters to default values when clearAllFilters is called', () => {
|
|
57
|
+
const { result } = renderHook(() => useDataViewFilters({ initialFilters }));
|
|
58
|
+
act(() => result.current.clearAllFilters());
|
|
59
|
+
|
|
60
|
+
expect(result.current.filters).toEqual({ search: '', tags: [] });
|
|
61
|
+
});
|
|
62
|
+
});
|