From 9c453001c19e6c5349c19516f04b288201c7a3ae Mon Sep 17 00:00:00 2001
From: Karl Kallavus <232199+karl-kallavus@users.noreply.github.com>
Date: Mon, 13 Nov 2023 15:04:14 +0100
Subject: [PATCH 1/8] fix: the lost part of the code has been restored (#2486)
---
workspaces/tables/src/components/Table.tsx | 23 +++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/workspaces/tables/src/components/Table.tsx b/workspaces/tables/src/components/Table.tsx
index 84b341d4b2..c2918e5c68 100644
--- a/workspaces/tables/src/components/Table.tsx
+++ b/workspaces/tables/src/components/Table.tsx
@@ -80,6 +80,7 @@ const Table = ({
rowsById,
prepareRow,
visibleColumns,
+ isAllRowsExpanded,
toggleAllRowsExpanded,
toggleRowExpanded,
rowSpanHeaders,
@@ -92,6 +93,7 @@ const Table = ({
} as TableOptions
-
-
-
+
+ 84837d8ac654aa4689efa4649-84837d8ac654aa4689efa4649756454a5646545546d54f6546f546
+
+
+ aleksandr@heathmonitoring.com
+
+
+ 2023-09-19T14:31:46.105Z
+
+
+ Bender (old) Coingaming
+
+
+ Pragmatic Play
+
+
+ 22.97
+
+
-
- Test
-
-
- Test
-
-
-
- 0
-
-
-
-
- 0
-
-
-
- 0
-
-
-
- 0
-
-
-
-
-
- Test
-
-
- Test
-
-
-
- 30
-
-
-
-
- 100
-
-
-
- 100
-
-
-
- 100
-
-
+ USD
+
+
-
- Test
-
-
- Test
-
-
-
- 60
-
-
-
-
- 200
-
-
-
- 200
-
-
-
- 200
-
-
+ SUCCESS
+
+
+
+
+ 84837d8ac654aa4689efa4649-84837d8ac654aa4689efa4649756454a5646545546d54f6546f546
+
+
+ aleksandr@heathmonitoring.com
+
+
+ 2023-09-19T14:31:46.105Z
+
+
+ Bender (old) Coingaming
+
+
+ Pragmatic Play
+
+
+ 22.97
+
+
-
- Test
-
-
- Test
-
-
-
- 90
-
-
-
-
- 300
-
-
-
- 300
-
-
-
- 300
-
-
+ USD
+
+
-
- Test
-
-
- Test
-
-
-
- 120
-
-
-
-
- 400
-
-
-
- 400
-
-
-
- 400
-
-
+ SUCCESS
+
+
+
+
+ 84837d8ac654aa4689efa4649-84837d8ac654aa4689efa4649756454a5646545546d54f6546f546
+
+
+ aleksandr@heathmonitoring.com
+
+
+ 2023-09-19T14:31:46.105Z
+
+
+ Bender (old) Coingaming
+
+
+ Pragmatic Play
+
+
+ 22.97
+
+
-
- Test
-
-
- Test
-
-
-
- 150
-
-
-
-
- 500
-
-
-
- 500
-
-
-
- 500
-
-
-
-
-
- Test
-
-
- Test
-
-
-
- 180
-
-
-
-
- 600
-
-
-
- 600
-
-
-
- 600
-
-
+ USD
+
+
-
- Test
-
-
- Test
-
-
-
- 210
-
-
-
-
- 700
-
-
-
- 700
-
-
-
- 700
-
-
+ SUCCESS
+
+
+
+
+ 84837d8ac654aa4689efa4649-84837d8ac654aa4689efa4649756454a5646545546d54f6546f546
+
+
+ aleksandr@heathmonitoring.com
+
+
+ 2023-09-19T14:31:46.105Z
+
+
+ Bender (old) Coingaming
+
+
+ Pragmatic Play
+
+
+ 22.97
+
+
-
- Test
-
-
- Test
-
-
-
- 240
-
-
-
-
- 800
-
-
-
- 800
-
-
-
- 800
-
-
+ USD
+
+
-
- Test
-
-
- Test
-
-
-
- 270
-
-
-
-
- 900
-
-
-
- 900
-
-
-
- 900
-
-
+ SUCCESS
+
+
+
+
+ 84837d8ac654aa4689efa4649-84837d8ac654aa4689efa4649756454a5646545546d54f6546f546
+
+
+ aleksandr@heathmonitoring.com
+
+
+ 2023-09-19T14:31:46.105Z
+
+
+ Bender (old) Coingaming
+
+
+ Pragmatic Play
+
+
+ 22.97
+
+
-
- Test
-
-
- Test
-
-
-
- 300
-
-
-
-
- 1000
-
-
-
- 1000
-
-
-
- 1000
-
-
+ USD
+
+
-
- Test
-
-
- Test
-
-
-
- 330
-
-
-
-
- 1100
-
-
-
- 1100
-
-
-
- 1100
-
-
-
-
-
- Test
-
-
- Test
-
-
-
- 360
-
-
-
-
- 1200
-
-
-
- 1200
-
-
-
- 1200
-
-
+ SUCCESS
+
+
+
+
+ 84837d8ac654aa4689efa4649-84837d8ac654aa4689efa4649756454a5646545546d54f6546f546
+
+
+ aleksandr@heathmonitoring.com
+
+
+ 2023-09-19T14:31:46.105Z
+
+
+ Bender (old) Coingaming
+
+
+ Pragmatic Play
+
+
+ 22.97
+
+
-
- Test
-
-
- Test
-
-
-
- 390
-
-
-
-
- 1300
-
-
-
- 1300
-
-
-
- 1300
-
-
+ USD
+
+
-
- Test
-
-
- Test
-
-
-
- 420
-
-
-
-
- 1400
-
-
-
- 1400
-
-
-
- 1400
-
-
+ SUCCESS
+
+
+
+
+ 84837d8ac654aa4689efa4649-84837d8ac654aa4689efa4649756454a5646545546d54f6546f546
+
+
+ aleksandr@heathmonitoring.com
+
+
+ 2023-09-19T14:31:46.105Z
+
+
+ Bender (old) Coingaming
+
+
+ Pragmatic Play
+
+
+ 22.97
+
+
-
- Test
-
-
- Test
-
-
-
- 450
-
-
-
-
- 1500
-
-
-
- 1500
-
-
-
- 1500
-
-
+ USD
+
+
-
- Test
-
-
- Test
-
-
-
- 480
-
-
-
-
- 1600
-
-
-
- 1600
-
-
-
- 1600
-
-
+ SUCCESS
+
+
+
+
+ 84837d8ac654aa4689efa4649-84837d8ac654aa4689efa4649756454a5646545546d54f6546f546
+
+
+ aleksandr@heathmonitoring.com
+
+
+ 2023-09-19T14:31:46.105Z
+
+
+ Bender (old) Coingaming
+
+
+ Pragmatic Play
+
+
+ 22.97
+
+
-
- Test
-
-
- Test
-
-
-
- 510
-
-
-
-
- 1700
-
-
-
- 1700
-
-
-
- 1700
-
-
-
-
-
- Test
-
-
- Test
-
-
-
- 540
-
-
-
-
- 1800
-
-
-
- 1800
-
-
-
- 1800
-
-
+ USD
+
+
-
- Test
-
-
- Test
-
-
-
- 570
-
-
-
-
- 1900
-
-
-
- 1900
-
-
-
- 1900
-
-
+ SUCCESS
+ 84837d8ac654aa4689efa4649-84837d8ac654aa4689efa4649756454a5646545546d54f6546f546
+
+
+ aleksandr@heathmonitoring.com
+
+
+ 2023-09-19T14:31:46.105Z
+
+
+ Bender (old) Coingaming
+
+
+ Pragmatic Play
+
+
+ 22.97
+
+
-
-
-
-
-
+ class="flex items-center rounded-moon-i-xs gap-1 select-none py-1 px-2 h-6 text-moon-10-caption uppercase font-medium bg-gray-100 text-lg text-gray-600 max-w-fit"
+ >
+ USD
+
+
+
+ class="flex items-center rounded-moon-i-xs gap-1 select-none py-1 px-2 h-6 text-moon-10-caption uppercase font-medium bg-roshi-10 text-lg text-roshi max-w-fit"
+ >
+ SUCCESS
+
-
-
-
-
@@ -74913,769 +74430,1507 @@ Object {
dir="rtl"
>
-
-
-
-
-
-
- Visits
+ class="relative box-border justify-between items-center text-start text-moon-14 px-3 py-2 text-bulma bg-goku border-goku"
+ data-sticky-last-left-td="true"
+ data-sticky-td="true"
+ role="cell"
+ style="box-sizing: border-box; flex: 150 0 auto; min-width: 100px; width: 150px; position: sticky; z-index: 3; left: 150px;"
+ >
+ Test
+
+ class="relative box-border justify-between items-center text-start text-moon-14 px-3 py-2 text-bulma bg-goku border-goku"
+ role="cell"
+ style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
+ >
+
+ 60
+
+
+
+
+ 200
+
+
+
+ 200
+
+
+
+ 200
+
+
- Activity
+ class="relative box-border justify-between items-center text-start text-moon-14 px-3 py-2 rounded-s-lg text-bulma bg-goku border-goku"
+ data-sticky-td="true"
+ role="cell"
+ style="box-sizing: border-box; flex: 150 0 auto; min-width: 100px; width: 150px; position: sticky; z-index: 3; left: 0px;"
+ >
+ Test
+
+
+ Test
+
+
+
+ 90
+
+
+
+
+ 300
+
+
+
+ 300
+
+
+
+ 300
+
+
- Status
+ class="relative box-border justify-between items-center text-start text-moon-14 px-3 py-2 rounded-s-lg text-bulma bg-goku border-goku"
+ data-sticky-td="true"
+ role="cell"
+ style="box-sizing: border-box; flex: 150 0 auto; min-width: 100px; width: 150px; position: sticky; z-index: 3; left: 0px;"
+ >
+ Test
+
+
+ Test
+
+
+
+ 120
+
+
+
+
+ 400
+
+
+
+ 400
+
+
+
+ 400
+
+
-
-
-
-
-
-
- Visits
+ class="relative box-border justify-between items-center text-start text-moon-14 px-3 py-2 rounded-s-lg text-bulma bg-goku border-goku"
+ data-sticky-td="true"
+ role="cell"
+ style="box-sizing: border-box; flex: 150 0 auto; min-width: 100px; width: 150px; position: sticky; z-index: 3; left: 0px;"
+ >
+ Test
+
+
+ Test
+
+
+
+ 420
+
+
+
+
+ 1400
+
+
+
+ 1400
+
+
+
+ 1400
+
+
- Activity
+ class="relative box-border justify-between items-center text-start text-moon-14 px-3 py-2 rounded-s-lg text-bulma bg-goku border-goku"
+ data-sticky-td="true"
+ role="cell"
+ style="box-sizing: border-box; flex: 150 0 auto; min-width: 100px; width: 150px; position: sticky; z-index: 3; left: 0px;"
+ >
+ Test
+
+
+ Test
+
+
+
+ 450
+
+
+
+
+ 1500
+
+
+
+ 1500
+
+
+
+ 1500
+
+
- Status
+ class="relative box-border justify-between items-center text-start text-moon-14 px-3 py-2 rounded-s-lg text-bulma bg-goku border-goku"
+ data-sticky-td="true"
+ role="cell"
+ style="box-sizing: border-box; flex: 150 0 auto; min-width: 100px; width: 150px; position: sticky; z-index: 3; left: 0px;"
+ >
+ Test
+
+
+ Test
+
+
+
+ 480
+
+
+
+
+ 1600
+
+
+
+ 1600
+
+
+
+ 1600
+
+
+
+
+
+ Test
+
+
+ Test
+
+
+
+ 510
+
+
+
+
+ 1700
+
+
+
+ 1700
+
+
+
+ 1700
+
+
+
+
+
+ Test
+
+
+ Test
+
+
+
+ 540
+
+
+
+
+ 1800
+
+
+
+ 1800
+
+
+
+ 1800
+
+
+
+
+
+ Test
+
+
+ Test
+
+
+
+ 570
+
+
+
+
+ 1900
+
+
+
+ 1900
+
+
+
+ 1900
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- ,
- "debug": [Function],
- "findAllByAltText": [Function],
- "findAllByDisplayValue": [Function],
- "findAllByLabelText": [Function],
- "findAllByPlaceholderText": [Function],
- "findAllByRole": [Function],
- "findAllByTestId": [Function],
- "findAllByText": [Function],
- "findAllByTitle": [Function],
- "findByAltText": [Function],
- "findByDisplayValue": [Function],
- "findByLabelText": [Function],
- "findByPlaceholderText": [Function],
- "findByRole": [Function],
- "findByTestId": [Function],
- "findByText": [Function],
- "findByTitle": [Function],
- "getAllByAltText": [Function],
- "getAllByDisplayValue": [Function],
- "getAllByLabelText": [Function],
- "getAllByPlaceholderText": [Function],
- "getAllByRole": [Function],
- "getAllByTestId": [Function],
- "getAllByText": [Function],
- "getAllByTitle": [Function],
- "getByAltText": [Function],
- "getByDisplayValue": [Function],
- "getByLabelText": [Function],
- "getByPlaceholderText": [Function],
- "getByRole": [Function],
- "getByTestId": [Function],
- "getByText": [Function],
- "getByTitle": [Function],
- "queryAllByAltText": [Function],
- "queryAllByDisplayValue": [Function],
- "queryAllByLabelText": [Function],
- "queryAllByPlaceholderText": [Function],
- "queryAllByRole": [Function],
- "queryAllByTestId": [Function],
- "queryAllByText": [Function],
- "queryAllByTitle": [Function],
- "queryByAltText": [Function],
- "queryByDisplayValue": [Function],
- "queryByLabelText": [Function],
- "queryByPlaceholderText": [Function],
- "queryByRole": [Function],
- "queryByTestId": [Function],
- "queryByText": [Function],
- "queryByTitle": [Function],
- "rerender": [Function],
- "unmount": [Function],
-}
-`;
-
-exports[`Table in RTL renders RowSizes 1`] = `
-Object {
- "asFragment": [Function],
- "baseElement":
-
+
-
-
- ,
- "debug": [Function],
- "findAllByAltText": [Function],
- "findAllByDisplayValue": [Function],
- "findAllByLabelText": [Function],
- "findAllByPlaceholderText": [Function],
- "findAllByRole": [Function],
- "findAllByTestId": [Function],
- "findAllByText": [Function],
- "findAllByTitle": [Function],
- "findByAltText": [Function],
- "findByDisplayValue": [Function],
- "findByLabelText": [Function],
- "findByPlaceholderText": [Function],
- "findByRole": [Function],
- "findByTestId": [Function],
- "findByText": [Function],
- "findByTitle": [Function],
- "getAllByAltText": [Function],
- "getAllByDisplayValue": [Function],
- "getAllByLabelText": [Function],
- "getAllByPlaceholderText": [Function],
- "getAllByRole": [Function],
- "getAllByTestId": [Function],
- "getAllByText": [Function],
- "getAllByTitle": [Function],
- "getByAltText": [Function],
- "getByDisplayValue": [Function],
- "getByLabelText": [Function],
- "getByPlaceholderText": [Function],
- "getByRole": [Function],
- "getByTestId": [Function],
- "getByText": [Function],
- "getByTitle": [Function],
- "queryAllByAltText": [Function],
- "queryAllByDisplayValue": [Function],
- "queryAllByLabelText": [Function],
- "queryAllByPlaceholderText": [Function],
- "queryAllByRole": [Function],
- "queryAllByTestId": [Function],
- "queryAllByText": [Function],
- "queryAllByTitle": [Function],
- "queryByAltText": [Function],
- "queryByDisplayValue": [Function],
- "queryByLabelText": [Function],
- "queryByPlaceholderText": [Function],
- "queryByRole": [Function],
- "queryByTestId": [Function],
- "queryByText": [Function],
- "queryByTitle": [Function],
- "rerender": [Function],
- "unmount": [Function],
-}
-`;
-
-exports[`Table in RTL renders SelectableCheckboxes 1`] = `
-Object {
- "asFragment": [Function],
- "baseElement":
-
-
-
@@ -80833,72 +80547,26 @@ Object {
-
Test
Test
0
@@ -80907,7 +80575,7 @@ Object {
0
@@ -80916,98 +80584,41 @@ Object {
0
0
-
-
- 0
-
-
-
Test
Test
30
@@ -81016,7 +80627,7 @@ Object {
100
@@ -81025,1682 +80636,4501 @@ Object {
100
100
-
-
- 100
-
-
+
+
+
+
+
+
+
+ ,
+ "container":
+
+
+
,
+ "debug": [Function],
+ "findAllByAltText": [Function],
+ "findAllByDisplayValue": [Function],
+ "findAllByLabelText": [Function],
+ "findAllByPlaceholderText": [Function],
+ "findAllByRole": [Function],
+ "findAllByTestId": [Function],
+ "findAllByText": [Function],
+ "findAllByTitle": [Function],
+ "findByAltText": [Function],
+ "findByDisplayValue": [Function],
+ "findByLabelText": [Function],
+ "findByPlaceholderText": [Function],
+ "findByRole": [Function],
+ "findByTestId": [Function],
+ "findByText": [Function],
+ "findByTitle": [Function],
+ "getAllByAltText": [Function],
+ "getAllByDisplayValue": [Function],
+ "getAllByLabelText": [Function],
+ "getAllByPlaceholderText": [Function],
+ "getAllByRole": [Function],
+ "getAllByTestId": [Function],
+ "getAllByText": [Function],
+ "getAllByTitle": [Function],
+ "getByAltText": [Function],
+ "getByDisplayValue": [Function],
+ "getByLabelText": [Function],
+ "getByPlaceholderText": [Function],
+ "getByRole": [Function],
+ "getByTestId": [Function],
+ "getByText": [Function],
+ "getByTitle": [Function],
+ "queryAllByAltText": [Function],
+ "queryAllByDisplayValue": [Function],
+ "queryAllByLabelText": [Function],
+ "queryAllByPlaceholderText": [Function],
+ "queryAllByRole": [Function],
+ "queryAllByTestId": [Function],
+ "queryAllByText": [Function],
+ "queryAllByTitle": [Function],
+ "queryByAltText": [Function],
+ "queryByDisplayValue": [Function],
+ "queryByLabelText": [Function],
+ "queryByPlaceholderText": [Function],
+ "queryByRole": [Function],
+ "queryByTestId": [Function],
+ "queryByText": [Function],
+ "queryByTitle": [Function],
+ "rerender": [Function],
+ "unmount": [Function],
+}
+`;
+
+exports[`Table in RTL renders SelectableCheckboxes 1`] = `
+Object {
+ "asFragment": [Function],
+ "baseElement":
+
+
+
- 400
+ 800
- 400
+ 800
- 400
+ 800
- 400
+ 800
@@ -159803,7 +162569,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 150
+ 270
- 500
+ 900
- 500
+ 900
- 500
+ 900
- 500
+ 900
@@ -159887,7 +162653,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 180
+ 300
- 600
+ 1000
- 600
+ 1000
- 600
+ 1000
- 600
+ 1000
@@ -159971,7 +162737,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 210
+ 330
- 700
+ 1100
- 700
+ 1100
- 700
+ 1100
- 700
+ 1100
@@ -160055,7 +162821,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 240
+ 360
- 800
+ 1200
- 800
+ 1200
- 800
+ 1200
- 800
+ 1200
@@ -160139,7 +162905,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 270
+ 390
- 900
+ 1300
- 900
+ 1300
- 900
+ 1300
- 900
+ 1300
@@ -160223,7 +162989,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 300
+ 420
- 1000
+ 1400
- 1000
+ 1400
- 1000
+ 1400
- 1000
+ 1400
@@ -160307,7 +163073,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 330
+ 450
- 1100
+ 1500
- 1100
+ 1500
- 1100
+ 1500
- 1100
+ 1500
@@ -160391,7 +163157,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 360
+ 480
- 1200
+ 1600
- 1200
+ 1600
- 1200
+ 1600
- 1200
+ 1600
@@ -160475,7 +163241,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 390
+ 510
- 1300
+ 1700
- 1300
+ 1700
- 1300
+ 1700
- 1300
+ 1700
@@ -160559,7 +163325,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 420
+ 540
- 1400
+ 1800
- 1400
+ 1800
- 1400
+ 1800
- 1400
+ 1800
@@ -160643,7 +163409,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 450
+ 570
- 1500
+ 1900
- 1500
+ 1900
- 1500
+ 1900
- 1500
+ 1900
@@ -160727,7 +163493,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 480
+ 600
- 1600
+ 2000
- 1600
+ 2000
- 1600
+ 2000
- 1600
+ 2000
@@ -160811,7 +163577,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 510
+ 630
- 1700
+ 2100
- 1700
+ 2100
- 1700
+ 2100
- 1700
+ 2100
@@ -160895,7 +163661,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 540
+ 660
- 1800
+ 2200
- 1800
+ 2200
- 1800
+ 2200
- 1800
+ 2200
@@ -160979,7 +163745,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 570
+ 690
- 1900
+ 2300
- 1900
+ 2300
- 1900
+ 2300
- 1900
+ 2300
@@ -161063,7 +163829,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 600
+ 720
- 2000
+ 2400
- 2000
+ 2400
- 2000
+ 2400
- 2000
+ 2400
@@ -161147,7 +163913,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 630
+ 750
- 2100
+ 2500
- 2100
+ 2500
- 2100
+ 2500
- 2100
+ 2500
@@ -161231,7 +163997,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 660
+ 780
- 2200
+ 2600
- 2200
+ 2600
- 2200
+ 2600
- 2200
+ 2600
@@ -161315,7 +164081,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 690
+ 810
- 2300
+ 2700
- 2300
+ 2700
- 2300
+ 2700
- 2300
+ 2700
@@ -161399,7 +164165,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 720
+ 840
- 2400
+ 2800
- 2400
+ 2800
- 2400
+ 2800
- 2400
+ 2800
@@ -161483,7 +164249,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 750
+ 870
- 2500
+ 2900
- 2500
+ 2900
- 2500
+ 2900
- 2500
+ 2900
@@ -161567,7 +164333,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 780
+ 900
- 2600
+ 3000
- 2600
+ 3000
- 2600
+ 3000
- 2600
+ 3000
@@ -161651,7 +164417,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 810
+ 930
- 2700
+ 3100
- 2700
+ 3100
- 2700
+ 3100
- 2700
+ 3100
@@ -161735,7 +164501,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 840
+ 960
- 2800
+ 3200
- 2800
+ 3200
- 2800
+ 3200
- 2800
+ 3200
@@ -161819,7 +164585,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 870
+ 990
- 2900
+ 3300
- 2900
+ 3300
- 2900
+ 3300
- 2900
+ 3300
@@ -161903,7 +164669,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 900
+ 1020
- 3000
+ 3400
- 3000
+ 3400
- 3000
+ 3400
- 3000
+ 3400
@@ -161987,7 +164753,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 930
+ 1050
- 3100
+ 3500
- 3100
+ 3500
- 3100
+ 3500
- 3100
+ 3500
@@ -162071,7 +164837,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 960
+ 1080
- 3200
+ 3600
- 3200
+ 3600
- 3200
+ 3600
- 3200
+ 3600
@@ -162155,7 +164921,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 990
+ 1110
- 3300
+ 3700
- 3300
+ 3700
- 3300
+ 3700
- 3300
+ 3700
@@ -162239,7 +165005,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 1020
+ 1140
- 3400
+ 3800
- 3400
+ 3800
- 3400
+ 3800
- 3400
+ 3800
@@ -162323,7 +165089,7 @@ Object {
style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
>
- 1050
+ 1170
- 3500
+ 3900
- 3500
+ 3900
- 3500
+ 3900
+
+
+
+ 3900
+
+
+
+
+
+ ,
+ "debug": [Function],
+ "findAllByAltText": [Function],
+ "findAllByDisplayValue": [Function],
+ "findAllByLabelText": [Function],
+ "findAllByPlaceholderText": [Function],
+ "findAllByRole": [Function],
+ "findAllByTestId": [Function],
+ "findAllByText": [Function],
+ "findAllByTitle": [Function],
+ "findByAltText": [Function],
+ "findByDisplayValue": [Function],
+ "findByLabelText": [Function],
+ "findByPlaceholderText": [Function],
+ "findByRole": [Function],
+ "findByTestId": [Function],
+ "findByText": [Function],
+ "findByTitle": [Function],
+ "getAllByAltText": [Function],
+ "getAllByDisplayValue": [Function],
+ "getAllByLabelText": [Function],
+ "getAllByPlaceholderText": [Function],
+ "getAllByRole": [Function],
+ "getAllByTestId": [Function],
+ "getAllByText": [Function],
+ "getAllByTitle": [Function],
+ "getByAltText": [Function],
+ "getByDisplayValue": [Function],
+ "getByLabelText": [Function],
+ "getByPlaceholderText": [Function],
+ "getByRole": [Function],
+ "getByTestId": [Function],
+ "getByText": [Function],
+ "getByTitle": [Function],
+ "queryAllByAltText": [Function],
+ "queryAllByDisplayValue": [Function],
+ "queryAllByLabelText": [Function],
+ "queryAllByPlaceholderText": [Function],
+ "queryAllByRole": [Function],
+ "queryAllByTestId": [Function],
+ "queryAllByText": [Function],
+ "queryAllByTitle": [Function],
+ "queryByAltText": [Function],
+ "queryByDisplayValue": [Function],
+ "queryByLabelText": [Function],
+ "queryByPlaceholderText": [Function],
+ "queryByRole": [Function],
+ "queryByTestId": [Function],
+ "queryByText": [Function],
+ "queryByTitle": [Function],
+ "rerender": [Function],
+ "unmount": [Function],
+}
+`;
+
+exports[`Table renders ExpandedWithKeepState 1`] = `
+Object {
+ "asFragment": [Function],
+ "baseElement":
+
+
-
- 3600
-
+
+
+ Test
+
+
+
+ 30
+
+
+
+
+ 100
+
+
+
+ 100
+
+
+ 100
+
+
+
+ 100
+
+
+
-
-
+
+ Test
+
+
+
+ 60
+
+
+
+
+ 200
+
+
+
+ 200
+
+
+ 200
+
+
+
+ 200
+
+
+
-
- Test
-
-
-
- 1110
-
-
-
- 3700
+
+
+ Test
+
+
+
+ 90
+
+
+
+
+ 300
+
+
+
+ 300
+
+
+ 300
+
+
+
+ 300
+
+
+
- 3700
+
+
+ Test
+
+
+
+ 120
+
+
+
+
+ 400
+
+
+
+ 400
+
+
+ 400
+
+
+
+ 400
+
+
+
-
- 3700
-
+
+
+ Test
+
+
+
+ 150
+
+
+
+
+ 500
+
+
+
+ 500
+
+
+ 500
+
+
+
+ 500
+
+
+
-
-
+
+ Test
+
+
+
+ 180
+
+
+
+
+ 600
+
+
+
+ 600
+
+
+ 600
+
+
+
+ 600
+
+
+
-
- Test
-
-
-
- 1140
-
-
-
-
- 3800
-
-
-
- 3800
-
-
- 3800
-
-
-
-
-
- Test
-
-
-
- 1170
-
-
-
-
- 3900
-
-
-
+
+
+ Test
+
+
+
+ 210
+
+
+
+
+ 700
+
+
+
+ 700
+
+
+ 700
+
+
+
+ 700
+
+
+
- 3900
+
+
+ Test
+
+
+
+ 240
+
+
+
+
+ 800
+
+
+
+ 800
+
+
+ 800
+
+
+
+ 800
+
+
+
-
- 3900
-
-
-
-
-
- ,
- "debug": [Function],
- "findAllByAltText": [Function],
- "findAllByDisplayValue": [Function],
- "findAllByLabelText": [Function],
- "findAllByPlaceholderText": [Function],
- "findAllByRole": [Function],
- "findAllByTestId": [Function],
- "findAllByText": [Function],
- "findAllByTitle": [Function],
- "findByAltText": [Function],
- "findByDisplayValue": [Function],
- "findByLabelText": [Function],
- "findByPlaceholderText": [Function],
- "findByRole": [Function],
- "findByTestId": [Function],
- "findByText": [Function],
- "findByTitle": [Function],
- "getAllByAltText": [Function],
- "getAllByDisplayValue": [Function],
- "getAllByLabelText": [Function],
- "getAllByPlaceholderText": [Function],
- "getAllByRole": [Function],
- "getAllByTestId": [Function],
- "getAllByText": [Function],
- "getAllByTitle": [Function],
- "getByAltText": [Function],
- "getByDisplayValue": [Function],
- "getByLabelText": [Function],
- "getByPlaceholderText": [Function],
- "getByRole": [Function],
- "getByTestId": [Function],
- "getByText": [Function],
- "getByTitle": [Function],
- "queryAllByAltText": [Function],
- "queryAllByDisplayValue": [Function],
- "queryAllByLabelText": [Function],
- "queryAllByPlaceholderText": [Function],
- "queryAllByRole": [Function],
- "queryAllByTestId": [Function],
- "queryAllByText": [Function],
- "queryAllByTitle": [Function],
- "queryByAltText": [Function],
- "queryByDisplayValue": [Function],
- "queryByLabelText": [Function],
- "queryByPlaceholderText": [Function],
- "queryByRole": [Function],
- "queryByTestId": [Function],
- "queryByText": [Function],
- "queryByTitle": [Function],
- "rerender": [Function],
- "unmount": [Function],
-}
-`;
-
-exports[`Table renders ExpandedWithKeepState 1`] = `
-Object {
- "asFragment": [Function],
- "baseElement":
-
-
- Profile Progress
-
+
+ 1100
+
+ >
+ Test
+
+ class="relative box-border justify-between items-center text-start text-moon-14 px-3 py-2 text-bulma bg-goku border-goku"
+ role="cell"
+ style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
+ >
+
+ 360
+
+
+ class="relative box-border justify-between items-center text-start text-moon-14 px-3 py-2 text-bulma bg-goku border-goku"
+ role="cell"
+ style="box-sizing: border-box; flex: 150 0 auto; min-width: 100px; width: 150px;"
+ >
+
+ 1200
+
+
+ class="relative box-border justify-between items-center text-start text-moon-14 px-3 py-2 text-bulma bg-goku border-goku"
+ role="cell"
+ style="box-sizing: border-box; flex: 150 0 auto; min-width: 100px; width: 150px;"
+ >
+ 1200
+
+ class="relative box-border justify-between items-center text-start text-moon-14 px-3 py-2 text-bulma bg-goku border-goku"
+ role="cell"
+ style="box-sizing: border-box; flex: 100 0 auto; min-width: 100px; width: 100px;"
+ >
+ 1200
+
+ class="relative box-border justify-between items-center text-start text-moon-14 px-3 py-2 text-bulma bg-goku border-goku"
+ role="cell"
+ style="box-sizing: border-box; flex: 150 0 auto; min-width: 100px; width: 150px;"
+ >
+
+ 1200
+
+
+ >
+
+
-
-
+
+
+
+ Test
+
+
600
+
+
+ 2000
+
+
+
+ 2000
+
+
+ 2000
+
+
+
+ 2000
+
+
- 210
+ 630
- 700
+ 2100
- 700
+ 2100
- 700
+ 2100
- 700
+ 2100
- 240
+ 660
- 800
+ 2200
- 800
+ 2200
- 800
+ 2200
- 800
+ 2200
- 270
+ 690
- 900
+ 2300
- 900
+ 2300
- 900
+ 2300
- 900
+ 2300
- 300
+ 720
- 1000
+ 2400
- 1000
+ 2400
- 1000
+ 2400
- 1000
+ 2400
- 330
+ 750
- 1100
+ 2500
- 1100
+ 2500
- 1100
+ 2500
- 1100
+ 2500
- 360
+ 780
- 1200
+ 2600
- 1200
+ 2600
- 1200
+ 2600
- 1200
+ 2600
- 390
+ 810
- 1300
+ 2700
- 1300
+ 2700
- 1300
+ 2700
- 1300
+ 2700
- 420
+ 840
- 1400
+ 2800
- 1400
+ 2800
- 1400
+ 2800
- 1400
+ 2800
- 450
+ 870
- 1500
+ 2900
- 1500
+ 2900
- 1500
+ 2900
- 1500
+ 2900
- 480
+ 900
- 1600
+ 3000
- 1600
+ 3000
- 1600
+ 3000
- 1600
+ 3000
- 510
+ 930
- 1700
+ 3100
- 1700
+ 3100
- 1700
+ 3100
- 1700
+ 3100
- 540
+ 960
- 1800
+ 3200
- 1800
+ 3200
- 1800
+ 3200
- 1800
+ 3200
- 570
+ 990
- 1900
+ 3300
- 1900
+ 3300
- 1900
+ 3300
- 1900
+ 3300
- 600
+ 1020
- 2000
+ 3400
- 2000
+ 3400
- 2000
+ 3400
- 2000
+ 3400
- 630
+ 1050
- 2100
+ 3500
- 2100
+ 3500
- 2100
+ 3500
- 2100
+ 3500
- 660
+ 1080
- 2200
+ 3600
- 2200
+ 3600
- 2200
+ 3600
- 2200
+ 3600
- 690
+ 1110
- 2300
+ 3700
- 2300
+ 3700
- 2300
+ 3700
- 2300
+ 3700
- 720
+ 1140
- 2400
+ 3800
- 2400
+ 3800
- 2400
+ 3800
- 2400
+ 3800
- 750
+ 1170
- 2500
+ 3900
- 2500
+ 3900
- 2500
+ 3900
- 2500
+ 3900
+
+
+
+
+
+
+
+ ,
+ "container":
@@ -1623,7 +1579,7 @@ Object {
Error
-
-
-
- Preset data
-
-
+
+
-
-
+
+
+
+
@@ -1775,7 +1727,7 @@ Object {
Lower
-
-
-
- Preset data
-
-
+
+
-
-
-
-
-
-
+
+
+
+
@@ -1839,7 +1787,7 @@ Object {
Capitalized
-
-
-
- Preset data
-
-
+
+
-
-
-
-
-
-
+
+
+
+
@@ -1914,7 +1858,7 @@ Object {
Lower
-
-
-
- Preset data
-
-
+
+
-
-
-
-
-
-
+
+
+
+
@@ -1978,7 +1918,7 @@ Object {
Capitalized
-
-
-
- Preset data
-
-
+
+
-
-
-
-
-
-
+
+
+
+
diff --git a/workspaces/core/src/tagsInput/TagsInput.tsx b/workspaces/core/src/tagsInput/TagsInput.tsx
index a8f86c43bd..e661f7c5c3 100644
--- a/workspaces/core/src/tagsInput/TagsInput.tsx
+++ b/workspaces/core/src/tagsInput/TagsInput.tsx
@@ -1,93 +1,100 @@
-import React, { forwardRef, useState } from "react";
-import { Listbox } from "@headlessui/react";
-import SelectedItemProps from "./private/types/SelectedItemProps";
-import { TagsInputRootProps } from "./private/types/TagsInputRootProps";
-import { TagsInputContext, useTagsInputContext } from "./private/utils/useTagsInputContext";
-import getTextSizes from "./private/utils/useTextSizes";
-import { Input as NativeInput, SelectButton, mergeClassnames } from "../index";
+import React, { forwardRef, useState } from 'react';
+import { Listbox } from '@headlessui/react';
+import SelectedItemProps from './private/types/SelectedItemProps';
+import { TagsInputRootProps } from './private/types/TagsInputRootProps';
+import getTextSize from './private/utils/getTextSize';
+import getWrapperStyle from './private/utils/getWrapperStyle';
+import {
+ TagsInputContext,
+ useTagsInputContext,
+} from './private/utils/useTagsInputContext';
+import { Input as NativeInput, SelectButton, mergeClassnames } from '../index';
-const TagsInputRoot = forwardRef(({
- label,
- children,
- selected = [],
- type = 'text',
- size = 'md',
- className,
- placeholder,
- disabled,
- isError,
- onEnter,
- onClear,
- isUppercase,
-},
- ref
-) => {
- const [isFocused, setIsFocused] = useState(false);
- const states = {
- isUppercase,
- value: selected,
- size: size,
- disabled: disabled,
- isError: isError,
- onClear: onClear,
- }
+const TagsInputRoot = forwardRef(
+ (
+ {
+ label,
+ children,
+ selected = [],
+ type = 'text',
+ size = 'md',
+ className,
+ placeholder,
+ disabled,
+ isError,
+ onEnter,
+ onClear,
+ isUppercase,
+ },
+ ref
+ ) => {
+ const [isFocused, setIsFocused] = useState(false);
+ const states = {
+ isUppercase,
+ value: selected,
+ size: size,
+ disabled: disabled,
+ isError: isError,
+ onClear: onClear,
+ };
- return (
-
-
- {label && (
-
- {label}
-
- )}
-
+
+ {label && (
+
+ {label}
+
)}
- ref={ref}
- >
-
- {children}
-
- {
- e.code === 'Enter'
- && (e.target as HTMLInputElement).value.length
- && onEnter
- && onEnter((e.target as HTMLInputElement).value);
- e.code === 'Enter'
- && ((e.target as HTMLInputElement).value = '');
- }}
- onFocus={() => setIsFocused(true)}
- onBlur={() => setIsFocused(false)}
- />
-
-
-
- );
-});
+ ref={ref}
+ >
+
+ {children}
+
+ {
+ e.code === 'Enter' &&
+ (e.target as HTMLInputElement).value.length &&
+ onEnter &&
+ onEnter((e.target as HTMLInputElement).value);
+ e.code === 'Enter' &&
+ ((e.target as HTMLInputElement).value = '');
+ }}
+ onFocus={() => setIsFocused(true)}
+ onBlur={() => setIsFocused(false)}
+ />
+
+
+
+ );
+ }
+);
const SelectedItem = ({
className,
@@ -96,7 +103,9 @@ const SelectedItem = ({
isUppercase,
...rest
}: SelectedItemProps) => {
- const { size, disabled, isError, onClear } = useTagsInputContext('TagstInput.SelectedItem');
+ const { size, disabled, isError, onClear } = useTagsInputContext(
+ 'TagstInput.SelectedItem'
+ );
return (
-
- !disabled && onClear && onClear(index)}
- >
-
- {label}
-
-
-
+ {/* */}
+ !disabled && onClear && onClear(index)}
+ >
+ {label}
+
+ {/* */}
);
-}
+};
const TagsInput = Object.assign(TagsInputRoot, {
SelectedItem,
diff --git a/workspaces/core/src/tagsInput/private/types/SelectedItemProps.ts b/workspaces/core/src/tagsInput/private/types/SelectedItemProps.ts
index 42c57a52e7..95b31aa1a2 100644
--- a/workspaces/core/src/tagsInput/private/types/SelectedItemProps.ts
+++ b/workspaces/core/src/tagsInput/private/types/SelectedItemProps.ts
@@ -3,6 +3,6 @@ type SelectedItemProps = {
label: string;
className?: string;
isUppercase?: boolean;
-}
+};
export default SelectedItemProps;
diff --git a/workspaces/core/src/tagsInput/private/types/Size.ts b/workspaces/core/src/tagsInput/private/types/Size.ts
index 723870e019..cd4df04250 100644
--- a/workspaces/core/src/tagsInput/private/types/Size.ts
+++ b/workspaces/core/src/tagsInput/private/types/Size.ts
@@ -1,3 +1,3 @@
-type Size = 'sm' | 'md' | 'lg' | 'xl';
+type Size = 'sm' | 'md' | 'lg';
export default Size;
diff --git a/workspaces/core/src/tagsInput/private/types/TagsInputRootProps.ts b/workspaces/core/src/tagsInput/private/types/TagsInputRootProps.ts
index 39f26207fb..8b2dc1425e 100644
--- a/workspaces/core/src/tagsInput/private/types/TagsInputRootProps.ts
+++ b/workspaces/core/src/tagsInput/private/types/TagsInputRootProps.ts
@@ -1,4 +1,4 @@
-import Size from "./Size";
+import type Size from './Size';
export interface TagsInputRootProps
extends Omit<
@@ -17,4 +17,4 @@ export interface TagsInputRootProps
onEnter?: (value: string) => void;
onClear?: (index: number) => void;
isUppercase?: boolean;
-};
+}
diff --git a/workspaces/core/src/tagsInput/private/types/TagsInputState.ts b/workspaces/core/src/tagsInput/private/types/TagsInputState.ts
index 93990bf422..a0aefe1d3d 100644
--- a/workspaces/core/src/tagsInput/private/types/TagsInputState.ts
+++ b/workspaces/core/src/tagsInput/private/types/TagsInputState.ts
@@ -1,4 +1,4 @@
-import Size from "./Size";
+import type Size from './Size';
type TagsInputState = {
value?: unknown;
diff --git a/workspaces/core/src/tagsInput/private/utils/getTextSize.ts b/workspaces/core/src/tagsInput/private/utils/getTextSize.ts
new file mode 100644
index 0000000000..743f7173ab
--- /dev/null
+++ b/workspaces/core/src/tagsInput/private/utils/getTextSize.ts
@@ -0,0 +1,10 @@
+import Size from '../types/Size';
+
+const getTextSize = (size: Size) =>
+ ({
+ sm: 'text-moon-14',
+ md: 'text-moon-16',
+ lg: 'text-moon-16',
+ }[size] || 'text-moon-16');
+
+export default getTextSize;
diff --git a/workspaces/core/src/tagsInput/private/utils/getWrapperStyle.ts b/workspaces/core/src/tagsInput/private/utils/getWrapperStyle.ts
new file mode 100644
index 0000000000..98cd348a7c
--- /dev/null
+++ b/workspaces/core/src/tagsInput/private/utils/getWrapperStyle.ts
@@ -0,0 +1,10 @@
+import type Size from '../types/Size';
+
+const getWrapperStyle = (size: Size) =>
+ ({
+ sm: 'rounded-moon-i-xs px-2 py-1',
+ md: 'rounded-moon-i-sm px-3 py-2',
+ lg: 'rounded-moon-i-sm px-3 py-3',
+ }[size] || 'rounded-moon-i-sm px-3 py-2');
+
+export default getWrapperStyle;
diff --git a/workspaces/core/src/tagsInput/private/utils/useTagsInputContext.ts b/workspaces/core/src/tagsInput/private/utils/useTagsInputContext.ts
index 5642b07f91..d2361996a4 100644
--- a/workspaces/core/src/tagsInput/private/utils/useTagsInputContext.ts
+++ b/workspaces/core/src/tagsInput/private/utils/useTagsInputContext.ts
@@ -1,4 +1,4 @@
-import { createContext, useContext } from "react";
+import { createContext, useContext } from 'react';
import TagsInputState from '../types/TagsInputState';
const TagsInputContext = createContext({});
@@ -15,4 +15,4 @@ const useTagsInputContext = (component: string) => {
return context;
};
-export { useTagsInputContext, TagsInputContext }
+export { useTagsInputContext, TagsInputContext };
diff --git a/workspaces/core/src/tagsInput/private/utils/useTextSizes.ts b/workspaces/core/src/tagsInput/private/utils/useTextSizes.ts
deleted file mode 100644
index 16d4f4c5ab..0000000000
--- a/workspaces/core/src/tagsInput/private/utils/useTextSizes.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import Size from "../types/Size";
-
-const getTextSizes = (size: Size = 'md') => {
- return (
- {
- sm: 'text-moon-14 leading-4',
- md: 'text-moon-16 leading-5',
- lg: 'text-moon-18 leading-5',
- xl: 'text-moon-20 leading-5',
- }[size] || 'text-moon-16 leading-5'
- );
-};
-
-export default getTextSizes;
From fd8a1391f0940bbf465ea6b3c6e104e9ef4b1cd0 Mon Sep 17 00:00:00 2001
From: Dmytro Kireiev
Date: Thu, 16 Nov 2023 16:25:59 +0200
Subject: [PATCH 7/8] fix: Progress styles and add Labels variant to docs
[MDS-809] (#2494)
---
next-docs/pages/components/progress.tsx | 8 +-
.../public/examples/progress/WithLabels.tsx | 14 +
.../__snapshots__/index.test.tsx.snap | 494 ++++++++++++++----
.../progress/__tests__/index.test.tsx | 9 +
workspaces/core/src/progress/Progress.tsx | 7 +-
.../src/progress/private/utils/getPinStyle.ts | 10 +-
6 files changed, 416 insertions(+), 126 deletions(-)
create mode 100644 next-docs/public/examples/progress/WithLabels.tsx
diff --git a/next-docs/pages/components/progress.tsx b/next-docs/pages/components/progress.tsx
index dc6e98f042..ee75678989 100644
--- a/next-docs/pages/components/progress.tsx
+++ b/next-docs/pages/components/progress.tsx
@@ -1,15 +1,16 @@
import { ReactNode } from 'react';
import Preview from '../../components/codePreview/Preview';
import ComponentPageDescription from '../../components/ComponentPageDescription';
+import type { ComponentNames } from '../../components/getComponent';
import Layout from '../../components/Layout';
import PropsTable from '../../components/PropsTable';
import Customisation from '../../public/examples/progress/Customisation';
import Default from '../../public/examples/progress/Default';
import Sizes from '../../public/examples/progress/Sizes';
import Values from '../../public/examples/progress/Values';
+import WithLabels from '../../public/examples/progress/WithLabels';
import WithPin from '../../public/examples/progress/WithPin';
import useComponent from '../../utils/useComponent';
-import type { ComponentNames } from '../../components/getComponent';
const COMPONENT_NAME: ComponentNames = 'Progress';
@@ -50,6 +51,11 @@ const PageProgress = () => {
preview={}
code={examples ? examples.WithPin : 'Loading'}
/>
+ }
+ code={examples ? examples.WithLabels : 'Loading'}
+ />
(
+
+
+ 0%
+ 100%
+
+
+
Progress Title
+
+);
+
+export default Example;
diff --git a/next-docs/public/examples/progress/__tests__/__snapshots__/index.test.tsx.snap b/next-docs/public/examples/progress/__tests__/__snapshots__/index.test.tsx.snap
index a43b9914bd..99fbb008aa 100644
--- a/next-docs/public/examples/progress/__tests__/__snapshots__/index.test.tsx.snap
+++ b/next-docs/public/examples/progress/__tests__/__snapshots__/index.test.tsx.snap
@@ -13,11 +13,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full h-4 bg-trunks"
+ class="w-full rounded-full h-4 bg-trunks"
role="progressbar"
>
@@ -26,11 +26,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full h-4 bg-whis [&_.progress]:bg-dodoria"
+ class="w-full rounded-full h-4 bg-whis [&_.progress]:bg-dodoria"
role="progressbar"
>
@@ -39,11 +39,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4 [&_.progress]:bg-roshi"
+ class="w-full rounded-full bg-beerus h-4 [&_.progress]:bg-roshi"
role="progressbar"
>
@@ -59,11 +59,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full h-4 bg-trunks"
+ class="w-full rounded-full h-4 bg-trunks"
role="progressbar"
>
@@ -72,11 +72,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full h-4 bg-whis [&_.progress]:bg-dodoria"
+ class="w-full rounded-full h-4 bg-whis [&_.progress]:bg-dodoria"
role="progressbar"
>
@@ -85,11 +85,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4 [&_.progress]:bg-roshi"
+ class="w-full rounded-full bg-beerus h-4 [&_.progress]:bg-roshi"
role="progressbar"
>
@@ -162,11 +162,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="0"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -182,11 +182,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="0"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -259,11 +259,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-0.5"
+ class="w-full rounded-full bg-beerus h-0.5"
role="progressbar"
>
@@ -272,11 +272,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-1"
+ class="w-full rounded-full bg-beerus h-1"
role="progressbar"
>
@@ -285,11 +285,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-2"
+ class="w-full rounded-full bg-beerus h-2"
role="progressbar"
>
@@ -298,11 +298,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-3"
+ class="w-full rounded-full bg-beerus h-3"
role="progressbar"
>
@@ -311,11 +311,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -331,11 +331,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-0.5"
+ class="w-full rounded-full bg-beerus h-0.5"
role="progressbar"
>
@@ -344,11 +344,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-1"
+ class="w-full rounded-full bg-beerus h-1"
role="progressbar"
>
@@ -357,11 +357,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-2"
+ class="w-full rounded-full bg-beerus h-2"
role="progressbar"
>
@@ -370,11 +370,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-3"
+ class="w-full rounded-full bg-beerus h-3"
role="progressbar"
>
@@ -383,11 +383,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -460,11 +460,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="25"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -473,11 +473,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="50"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -486,11 +486,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -499,11 +499,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="100"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -519,11 +519,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="25"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -532,11 +532,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="50"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -545,11 +545,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -558,11 +558,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="100"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -622,6 +622,141 @@ Object {
}
`;
+exports[`Progress in RTL renders WithLabels 1`] = `
+Object {
+ "asFragment": [Function],
+ "baseElement":
+
+
+
+
+
+ 0%
+
+
+ 100%
+
+
+
+
+ Progress Title
+
+
+
+
+ ,
+ "container":
+
+
+
+
+ 0%
+
+
+ 100%
+
+
+
+
+ Progress Title
+
+
+
+
,
+ "debug": [Function],
+ "findAllByAltText": [Function],
+ "findAllByDisplayValue": [Function],
+ "findAllByLabelText": [Function],
+ "findAllByPlaceholderText": [Function],
+ "findAllByRole": [Function],
+ "findAllByTestId": [Function],
+ "findAllByText": [Function],
+ "findAllByTitle": [Function],
+ "findByAltText": [Function],
+ "findByDisplayValue": [Function],
+ "findByLabelText": [Function],
+ "findByPlaceholderText": [Function],
+ "findByRole": [Function],
+ "findByTestId": [Function],
+ "findByText": [Function],
+ "findByTitle": [Function],
+ "getAllByAltText": [Function],
+ "getAllByDisplayValue": [Function],
+ "getAllByLabelText": [Function],
+ "getAllByPlaceholderText": [Function],
+ "getAllByRole": [Function],
+ "getAllByTestId": [Function],
+ "getAllByText": [Function],
+ "getAllByTitle": [Function],
+ "getByAltText": [Function],
+ "getByDisplayValue": [Function],
+ "getByLabelText": [Function],
+ "getByPlaceholderText": [Function],
+ "getByRole": [Function],
+ "getByTestId": [Function],
+ "getByText": [Function],
+ "getByTitle": [Function],
+ "queryAllByAltText": [Function],
+ "queryAllByDisplayValue": [Function],
+ "queryAllByLabelText": [Function],
+ "queryAllByPlaceholderText": [Function],
+ "queryAllByRole": [Function],
+ "queryAllByTestId": [Function],
+ "queryAllByText": [Function],
+ "queryAllByTitle": [Function],
+ "queryByAltText": [Function],
+ "queryByDisplayValue": [Function],
+ "queryByLabelText": [Function],
+ "queryByPlaceholderText": [Function],
+ "queryByRole": [Function],
+ "queryByTestId": [Function],
+ "queryByText": [Function],
+ "queryByTitle": [Function],
+ "rerender": [Function],
+ "unmount": [Function],
+}
+`;
+
exports[`Progress in RTL renders WithPin 1`] = `
Object {
"asFragment": [Function],
@@ -635,15 +770,15 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
75%
@@ -661,15 +796,15 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
75%
@@ -741,11 +876,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full h-4 bg-trunks"
+ class="w-full rounded-full h-4 bg-trunks"
role="progressbar"
>
@@ -754,11 +889,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full h-4 bg-whis [&_.progress]:bg-dodoria"
+ class="w-full rounded-full h-4 bg-whis [&_.progress]:bg-dodoria"
role="progressbar"
>
@@ -767,11 +902,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4 [&_.progress]:bg-roshi"
+ class="w-full rounded-full bg-beerus h-4 [&_.progress]:bg-roshi"
role="progressbar"
>
@@ -783,11 +918,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full h-4 bg-trunks"
+ class="w-full rounded-full h-4 bg-trunks"
role="progressbar"
>
@@ -796,11 +931,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full h-4 bg-whis [&_.progress]:bg-dodoria"
+ class="w-full rounded-full h-4 bg-whis [&_.progress]:bg-dodoria"
role="progressbar"
>
@@ -809,11 +944,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4 [&_.progress]:bg-roshi"
+ class="w-full rounded-full bg-beerus h-4 [&_.progress]:bg-roshi"
role="progressbar"
>
@@ -882,11 +1017,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="0"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -898,11 +1033,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="0"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -971,11 +1106,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-0.5"
+ class="w-full rounded-full bg-beerus h-0.5"
role="progressbar"
>
@@ -984,11 +1119,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-1"
+ class="w-full rounded-full bg-beerus h-1"
role="progressbar"
>
@@ -997,11 +1132,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-2"
+ class="w-full rounded-full bg-beerus h-2"
role="progressbar"
>
@@ -1010,11 +1145,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-3"
+ class="w-full rounded-full bg-beerus h-3"
role="progressbar"
>
@@ -1023,11 +1158,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -1039,11 +1174,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-0.5"
+ class="w-full rounded-full bg-beerus h-0.5"
role="progressbar"
>
@@ -1052,11 +1187,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-1"
+ class="w-full rounded-full bg-beerus h-1"
role="progressbar"
>
@@ -1065,11 +1200,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-2"
+ class="w-full rounded-full bg-beerus h-2"
role="progressbar"
>
@@ -1078,11 +1213,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-3"
+ class="w-full rounded-full bg-beerus h-3"
role="progressbar"
>
@@ -1091,11 +1226,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -1164,11 +1299,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="25"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -1177,11 +1312,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="50"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -1190,11 +1325,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -1203,11 +1338,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="100"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -1219,11 +1354,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="25"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -1232,11 +1367,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="50"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -1245,11 +1380,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -1258,11 +1393,11 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="100"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
@@ -1321,6 +1456,133 @@ Object {
}
`;
+exports[`Progress renders WithLabels 1`] = `
+Object {
+ "asFragment": [Function],
+ "baseElement":
+
+
+
+
+ 0%
+
+
+ 100%
+
+
+
+
+ Progress Title
+
+
+
+ ,
+ "container":
+
+
+
+ 0%
+
+
+ 100%
+
+
+
+
+ Progress Title
+
+
+
,
+ "debug": [Function],
+ "findAllByAltText": [Function],
+ "findAllByDisplayValue": [Function],
+ "findAllByLabelText": [Function],
+ "findAllByPlaceholderText": [Function],
+ "findAllByRole": [Function],
+ "findAllByTestId": [Function],
+ "findAllByText": [Function],
+ "findAllByTitle": [Function],
+ "findByAltText": [Function],
+ "findByDisplayValue": [Function],
+ "findByLabelText": [Function],
+ "findByPlaceholderText": [Function],
+ "findByRole": [Function],
+ "findByTestId": [Function],
+ "findByText": [Function],
+ "findByTitle": [Function],
+ "getAllByAltText": [Function],
+ "getAllByDisplayValue": [Function],
+ "getAllByLabelText": [Function],
+ "getAllByPlaceholderText": [Function],
+ "getAllByRole": [Function],
+ "getAllByTestId": [Function],
+ "getAllByText": [Function],
+ "getAllByTitle": [Function],
+ "getByAltText": [Function],
+ "getByDisplayValue": [Function],
+ "getByLabelText": [Function],
+ "getByPlaceholderText": [Function],
+ "getByRole": [Function],
+ "getByTestId": [Function],
+ "getByText": [Function],
+ "getByTitle": [Function],
+ "queryAllByAltText": [Function],
+ "queryAllByDisplayValue": [Function],
+ "queryAllByLabelText": [Function],
+ "queryAllByPlaceholderText": [Function],
+ "queryAllByRole": [Function],
+ "queryAllByTestId": [Function],
+ "queryAllByText": [Function],
+ "queryAllByTitle": [Function],
+ "queryByAltText": [Function],
+ "queryByDisplayValue": [Function],
+ "queryByLabelText": [Function],
+ "queryByPlaceholderText": [Function],
+ "queryByRole": [Function],
+ "queryByTestId": [Function],
+ "queryByText": [Function],
+ "queryByTitle": [Function],
+ "rerender": [Function],
+ "unmount": [Function],
+}
+`;
+
exports[`Progress renders WithPin 1`] = `
Object {
"asFragment": [Function],
@@ -1331,15 +1593,15 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
75%
@@ -1353,15 +1615,15 @@ Object {
aria-valuemax="100"
aria-valuemin="0"
aria-valuenow="75"
- class="w-full relative rounded-full bg-trunks/[.24] h-4"
+ class="w-full rounded-full bg-beerus h-4"
role="progressbar"
>
75%
diff --git a/next-docs/public/examples/progress/__tests__/index.test.tsx b/next-docs/public/examples/progress/__tests__/index.test.tsx
index 5c977bfd09..fe96f41894 100644
--- a/next-docs/public/examples/progress/__tests__/index.test.tsx
+++ b/next-docs/public/examples/progress/__tests__/index.test.tsx
@@ -7,6 +7,7 @@ import Default from '../Default';
import Customisation from '../Customisation';
import Values from '../Values';
import Sizes from '../Sizes';
+import WithLabels from '../WithLabels';
import WithPin from '../WithPin';
const withRtl = (component: JSX.Element) =>
{component}
;
@@ -33,6 +34,10 @@ describe('Progress', () => {
const tree = render(
);
expect(tree).toMatchSnapshot();
});
+ it('renders WithLabels', () => {
+ const tree = render(
);
+ expect(tree).toMatchSnapshot();
+ });
});
describe('Progress in RTL', () => {
@@ -57,4 +62,8 @@ describe('Progress in RTL', () => {
const tree = render(withRtl(
));
expect(tree).toMatchSnapshot();
});
+ it('renders WithLabels', () => {
+ const tree = render(withRtl(
));
+ expect(tree).toMatchSnapshot();
+ });
});
diff --git a/workspaces/core/src/progress/Progress.tsx b/workspaces/core/src/progress/Progress.tsx
index 8530721385..bec43beaf3 100644
--- a/workspaces/core/src/progress/Progress.tsx
+++ b/workspaces/core/src/progress/Progress.tsx
@@ -17,7 +17,7 @@ const ProgressRoot = ({
@@ -49,9 +49,8 @@ const Pin = ({ className }: PinProps) => {
className={mergeClassnames(
'absolute box-content flex items-center justify-center w-8 h-8 border-2 font-medium',
'text-moon-10-caption uppercase text-goten bg-popo border-goten rounded-full',
- 'shadow-[0_2px_8px_0_rgba(0,0,0,0.16)]',
+ 'shadow-[0_2px_8px_0_rgba(0,0,0,0.16)] before:shadow-[0_2px_8px_0_rgba(0,0,0,0.16)]',
'before:absolute before:bg-goten before:rounded-full',
- 'before:shadow-[0_2px_8px_0_rgba(0,0,0,0.16)]',
'after:absolute after:w-0 after:h-0 after:border-x-4 after:border-x-transparent',
'after:-bottom-[6px] after:border-t-[6px] after:border-t-goten',
getPinStyle(size),
diff --git a/workspaces/core/src/progress/private/utils/getPinStyle.ts b/workspaces/core/src/progress/private/utils/getPinStyle.ts
index 231eebbb2c..f34669017d 100644
--- a/workspaces/core/src/progress/private/utils/getPinStyle.ts
+++ b/workspaces/core/src/progress/private/utils/getPinStyle.ts
@@ -3,16 +3,16 @@ import type Sizes from '../types/Sizes';
const getPinStyle = (size?: Sizes) => {
switch (size) {
case '6xs':
- return 'bottom-[18px] ltr:-right-3 rtl:-left-3 before:w-3 before:h-3 before:-bottom-[25px]';
+ return 'bottom-[18px] -end-3 before:w-3 before:h-3 before:-bottom-[25px]';
case '5xs':
- return 'bottom-5 ltr:-right-3 rtl:-left-3 before:w-3 before:h-3 before:-bottom-[26px]';
+ return 'bottom-5 -end-3 before:w-3 before:h-3 before:-bottom-[26px]';
case '4xs':
- return 'bottom-6 ltr:-right-3 rtl:-left-3 before:w-3 before:h-3 before:-bottom-7';
+ return 'bottom-6 -end-3 before:w-3 before:h-3 before:-bottom-7';
case '3xs':
- return 'bottom-7 ltr:-right-3 rtl:-left-3 before:w-3 before:h-3 before:-bottom-[30px]';
+ return 'bottom-7 -end-3 before:w-3 before:h-3 before:-bottom-[30px]';
case '2xs':
default:
- return 'bottom-8 ltr:-right-[10px] rtl:-left-[10px] before:w-4 before:h-4 before:-bottom-[34px]';
+ return 'bottom-8 -end-2.5 before:w-4 before:h-4 before:-bottom-[34px]';
}
};
From fb9ce2e2880906394bd15ed3908b8cfdbcf40c32 Mon Sep 17 00:00:00 2001
From: Dmytro Kireiev
Date: Thu, 16 Nov 2023 16:42:03 +0200
Subject: [PATCH 8/8] chore: bump version to 10.10.7 (#2495)
---
docs/CHANGELOG.md | 11 +++++++++++
docs/package.json | 10 +++++-----
next-docs/CHANGELOG.md | 11 +++++++++++
next-docs/package.json | 10 +++++-----
pnpm-lock.yaml | 20 ++++++++++----------
workspaces/base/CHANGELOG.md | 6 ++++++
workspaces/base/package.json | 2 +-
workspaces/cmdk/CHANGELOG.md | 8 ++++++++
workspaces/cmdk/package.json | 4 ++--
workspaces/core/CHANGELOG.md | 6 ++++++
workspaces/core/package.json | 2 +-
workspaces/tables/CHANGELOG.md | 8 ++++++++
workspaces/tables/package.json | 4 ++--
workspaces/themes/CHANGELOG.md | 6 ++++++
workspaces/themes/package.json | 2 +-
15 files changed, 83 insertions(+), 27 deletions(-)
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index e20967f790..4d9b970155 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,5 +1,16 @@
# docs
+## 10.10.7
+
+### Patch Changes
+
+- Deploy 10.10.7
+- Updated dependencies
+ - @heathmont/moon-core-tw@10.10.7
+ - @heathmont/moon-base-tw@10.10.7
+ - @heathmont/moon-cmdk-tw@10.10.7
+ - @heathmont/moon-themes-tw@10.10.7
+
## 10.10.6
### Patch Changes
diff --git a/docs/package.json b/docs/package.json
index b9b7d051f7..52e5defcd7 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,6 +1,6 @@
{
"name": "docs",
- "version": "10.10.6",
+ "version": "10.10.7",
"private": true,
"type": "module",
"scripts": {
@@ -11,11 +11,11 @@
"lint": "next lint"
},
"dependencies": {
- "@heathmont/moon-base-tw": "workspace:^10.10.6",
- "@heathmont/moon-cmdk-tw": "workspace:^10.10.6",
- "@heathmont/moon-core-tw": "workspace:^10.10.6",
+ "@heathmont/moon-base-tw": "workspace:^10.10.7",
+ "@heathmont/moon-cmdk-tw": "workspace:^10.10.7",
+ "@heathmont/moon-core-tw": "workspace:^10.10.7",
"@heathmont/moon-icons-tw": "9.28.6",
- "@heathmont/moon-themes-tw": "workspace:^10.10.6",
+ "@heathmont/moon-themes-tw": "workspace:^10.10.7",
"@types/node": "20.4.9",
"@types/react": "18.2.19",
"@types/react-dom": "18.2.7",
diff --git a/next-docs/CHANGELOG.md b/next-docs/CHANGELOG.md
index 7cef7b5c16..46f51ff616 100644
--- a/next-docs/CHANGELOG.md
+++ b/next-docs/CHANGELOG.md
@@ -1,5 +1,16 @@
# Change Log
+## 10.10.7
+
+### Patch Changes
+
+- Deploy 10.10.7
+- Updated dependencies
+ - @heathmont/moon-table-tw@10.10.7
+ - @heathmont/moon-core-tw@10.10.7
+ - @heathmont/moon-cmdk-tw@10.10.7
+ - @heathmont/moon-themes-tw@10.10.7
+
## 10.10.6
### Patch Changes
diff --git a/next-docs/package.json b/next-docs/package.json
index 2812b63054..9e6a76030e 100644
--- a/next-docs/package.json
+++ b/next-docs/package.json
@@ -1,6 +1,6 @@
{
"name": "next-docs",
- "version": "10.10.6",
+ "version": "10.10.7",
"private": true,
"scripts": {
"dev": "next dev",
@@ -19,9 +19,9 @@
"@heathmont/moon-assets": "workspace:^10.7.1",
"@heathmont/moon-charts": "workspace:^10.7.1",
"@heathmont/moon-components": "workspace:^10.7.1",
- "@heathmont/moon-cmdk-tw": "workspace:^10.10.6",
+ "@heathmont/moon-cmdk-tw": "workspace:^10.10.7",
"@heathmont/moon-core": "workspace:^10.7.1",
- "@heathmont/moon-core-tw": "workspace:^10.10.6",
+ "@heathmont/moon-core-tw": "workspace:^10.10.7",
"@heathmont/moon-datepicker": "workspace:^10.7.1",
"@heathmont/moon-draggabletable": "workspace:^10.7.1",
"@heathmont/moon-icons": "workspace:^10.7.1",
@@ -30,9 +30,9 @@
"@heathmont/moon-select": "workspace:^10.7.1",
"@heathmont/moon-sidebar": "workspace:^10.7.1",
"@heathmont/moon-table": "workspace:^10.7.1",
- "@heathmont/moon-table-tw": "workspace:^10.10.6",
+ "@heathmont/moon-table-tw": "workspace:^10.10.7",
"@heathmont/moon-themes": "workspace:^10.7.1",
- "@heathmont/moon-themes-tw": "workspace:^10.10.6",
+ "@heathmont/moon-themes-tw": "workspace:^10.10.7",
"@heathmont/moon-utils": "workspace:^10.7.1",
"@heathmont/moon-icons-tw": "9.28.6",
"@hookform/resolvers": "3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 42978484d9..a90057c986 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -166,19 +166,19 @@ importers:
docs:
dependencies:
'@heathmont/moon-base-tw':
- specifier: workspace:^10.10.6
+ specifier: workspace:^10.10.7
version: link:../workspaces/base
'@heathmont/moon-cmdk-tw':
- specifier: workspace:^10.10.6
+ specifier: workspace:^10.10.7
version: link:../workspaces/cmdk
'@heathmont/moon-core-tw':
- specifier: workspace:^10.10.6
+ specifier: workspace:^10.10.7
version: link:../workspaces/core
'@heathmont/moon-icons-tw':
specifier: 9.28.6
version: 9.28.6(react-dom@18.2.0)(react@18.2.0)
'@heathmont/moon-themes-tw':
- specifier: workspace:^10.10.6
+ specifier: workspace:^10.10.7
version: link:../workspaces/themes
'@types/node':
specifier: 20.4.9
@@ -238,7 +238,7 @@ importers:
specifier: workspace:^10.7.1
version: link:../packages/charts
'@heathmont/moon-cmdk-tw':
- specifier: workspace:^10.10.6
+ specifier: workspace:^10.10.7
version: link:../workspaces/cmdk
'@heathmont/moon-components':
specifier: workspace:^10.7.1
@@ -247,7 +247,7 @@ importers:
specifier: workspace:^10.7.1
version: link:../packages/core
'@heathmont/moon-core-tw':
- specifier: workspace:^10.10.6
+ specifier: workspace:^10.10.7
version: link:../workspaces/core
'@heathmont/moon-datepicker':
specifier: workspace:^10.7.1
@@ -277,13 +277,13 @@ importers:
specifier: workspace:^10.7.1
version: link:../packages/table
'@heathmont/moon-table-tw':
- specifier: workspace:^10.10.6
+ specifier: workspace:^10.10.7
version: link:../workspaces/tables
'@heathmont/moon-themes':
specifier: workspace:^10.7.1
version: link:../packages/themes
'@heathmont/moon-themes-tw':
- specifier: workspace:^10.10.6
+ specifier: workspace:^10.10.7
version: link:../workspaces/themes
'@heathmont/moon-utils':
specifier: workspace:^10.7.1
@@ -1005,7 +1005,7 @@ importers:
specifier: 1.7.16
version: 1.7.16(react-dom@18.2.0)(react@18.2.0)
'@heathmont/moon-core-tw':
- specifier: workspace:^10.10.6
+ specifier: workspace:^10.10.7
version: link:../core
cmdk:
specifier: 0.2.0
@@ -1065,7 +1065,7 @@ importers:
workspaces/tables:
dependencies:
'@heathmont/moon-core-tw':
- specifier: workspace:^10.10.6
+ specifier: workspace:^10.10.7
version: link:../core
react:
specifier: 18.2.0
diff --git a/workspaces/base/CHANGELOG.md b/workspaces/base/CHANGELOG.md
index 45303dee57..f931f1a1d3 100644
--- a/workspaces/base/CHANGELOG.md
+++ b/workspaces/base/CHANGELOG.md
@@ -1,5 +1,11 @@
# @heathmont/moon-base-tw
+## 10.10.7
+
+### Patch Changes
+
+- Deploy 10.10.7
+
## 10.10.6
### Patch Changes
diff --git a/workspaces/base/package.json b/workspaces/base/package.json
index a3fca91bf9..b478a56fc3 100644
--- a/workspaces/base/package.json
+++ b/workspaces/base/package.json
@@ -1,7 +1,7 @@
{
"name": "@heathmont/moon-base-tw",
"sideEffects": false,
- "version": "10.10.6",
+ "version": "10.10.7",
"files": [
"lib"
],
diff --git a/workspaces/cmdk/CHANGELOG.md b/workspaces/cmdk/CHANGELOG.md
index be985e2169..e61d1cea96 100644
--- a/workspaces/cmdk/CHANGELOG.md
+++ b/workspaces/cmdk/CHANGELOG.md
@@ -1,5 +1,13 @@
# @heathmont/moon-cmdk-tw
+## 10.10.7
+
+### Patch Changes
+
+- Deploy 10.10.7
+- Updated dependencies
+ - @heathmont/moon-core-tw@10.10.7
+
## 10.10.6
### Patch Changes
diff --git a/workspaces/cmdk/package.json b/workspaces/cmdk/package.json
index 423ab010d4..c3efcf5721 100644
--- a/workspaces/cmdk/package.json
+++ b/workspaces/cmdk/package.json
@@ -1,7 +1,7 @@
{
"name": "@heathmont/moon-cmdk-tw",
"sideEffects": false,
- "version": "10.10.6",
+ "version": "10.10.7",
"files": [
"lib"
],
@@ -21,7 +21,7 @@
},
"dependencies": {
"@headlessui/react": "1.7.16",
- "@heathmont/moon-core-tw": "workspace:^10.10.6",
+ "@heathmont/moon-core-tw": "workspace:^10.10.7",
"cmdk": "0.2.0",
"tailwind-merge": "1.14.0",
"tailwindcss-radix": "2.8.0"
diff --git a/workspaces/core/CHANGELOG.md b/workspaces/core/CHANGELOG.md
index 6c5dc22c12..8d0df36373 100644
--- a/workspaces/core/CHANGELOG.md
+++ b/workspaces/core/CHANGELOG.md
@@ -1,5 +1,11 @@
# @heathmont/moon-core-tw
+## 10.10.7
+
+### Patch Changes
+
+- Deploy 10.10.7
+
## 10.10.6
### Patch Changes
diff --git a/workspaces/core/package.json b/workspaces/core/package.json
index 15590cd2d2..33633be94b 100644
--- a/workspaces/core/package.json
+++ b/workspaces/core/package.json
@@ -1,7 +1,7 @@
{
"name": "@heathmont/moon-core-tw",
"sideEffects": false,
- "version": "10.10.6",
+ "version": "10.10.7",
"files": [
"lib"
],
diff --git a/workspaces/tables/CHANGELOG.md b/workspaces/tables/CHANGELOG.md
index 9186593b25..1cfafcf89f 100644
--- a/workspaces/tables/CHANGELOG.md
+++ b/workspaces/tables/CHANGELOG.md
@@ -1,5 +1,13 @@
# @heathmont/moon-table-tw
+## 10.10.7
+
+### Patch Changes
+
+- Deploy 10.10.7
+- Updated dependencies
+ - @heathmont/moon-core-tw@10.10.7
+
## 10.10.6
### Patch Changes
diff --git a/workspaces/tables/package.json b/workspaces/tables/package.json
index 279606d58e..1c03126bec 100644
--- a/workspaces/tables/package.json
+++ b/workspaces/tables/package.json
@@ -1,7 +1,7 @@
{
"name": "@heathmont/moon-table-tw",
"sideEffects": false,
- "version": "10.10.6",
+ "version": "10.10.7",
"files": [
"lib"
],
@@ -20,7 +20,7 @@
"chokidar": "chokidar \"**/*.tsx\" \"**/*.ts\" -i \"lib/**/*.d.ts\" -c \"pnpm run build:code\" "
},
"dependencies": {
- "@heathmont/moon-core-tw": "workspace:^10.10.6",
+ "@heathmont/moon-core-tw": "workspace:^10.10.7",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-table": "7.8.0",
diff --git a/workspaces/themes/CHANGELOG.md b/workspaces/themes/CHANGELOG.md
index 982b122dc4..e4bcdb3415 100644
--- a/workspaces/themes/CHANGELOG.md
+++ b/workspaces/themes/CHANGELOG.md
@@ -1,5 +1,11 @@
# @heathmont/moon-themes-tw
+## 10.10.7
+
+### Patch Changes
+
+- Deploy 10.10.7
+
## 10.10.6
### Patch Changes
diff --git a/workspaces/themes/package.json b/workspaces/themes/package.json
index 2d75fe466a..ad7711d602 100644
--- a/workspaces/themes/package.json
+++ b/workspaces/themes/package.json
@@ -1,7 +1,7 @@
{
"name": "@heathmont/moon-themes-tw",
"sideEffects": false,
- "version": "10.10.6",
+ "version": "10.10.7",
"files": [
"lib"
],