From 8cc4668564e786ef59971bd2acae6480fd0f323c Mon Sep 17 00:00:00 2001 From: yassinedorbozgithub Date: Mon, 13 May 2024 22:35:01 +0100 Subject: [PATCH 1/6] fix: eazychart-[react & vue] - empty tooltip --- .../src/components/addons/tooltip/Tooltip.tsx | 45 +++++++------------ .../src/components/addons/tooltip/Tooltip.tsx | 4 +- 2 files changed, 18 insertions(+), 31 deletions(-) diff --git a/packages/ez-react/src/components/addons/tooltip/Tooltip.tsx b/packages/ez-react/src/components/addons/tooltip/Tooltip.tsx index 4c3659fd..27846620 100644 --- a/packages/ez-react/src/components/addons/tooltip/Tooltip.tsx +++ b/packages/ez-react/src/components/addons/tooltip/Tooltip.tsx @@ -50,35 +50,24 @@ export const Tooltip: FC = ({ color: undefined, }; - return ( + return datum ? (
- {datum ? ( - <> - {shapeDatum?.color && ( -
- )} -
- {Object.keys(attributes).map((attribute) => { - return ( -
-
- {attribute} : -
-
- {datum[attribute] as string} -
-
- ); - })} + {shapeDatum?.color && ( +
+ )} +
+ {Object.keys(attributes).map((attribute) => ( +
+
{attribute} :
+
+ {datum[attribute] as string} +
- - ) : null} + ))} +
- ); + ) : null; }; diff --git a/packages/ez-vue/src/components/addons/tooltip/Tooltip.tsx b/packages/ez-vue/src/components/addons/tooltip/Tooltip.tsx index f60fcb69..7cdc624d 100644 --- a/packages/ez-vue/src/components/addons/tooltip/Tooltip.tsx +++ b/packages/ez-vue/src/components/addons/tooltip/Tooltip.tsx @@ -128,8 +128,6 @@ export default class Tooltip extends mixins(AnimationMixin) { ))}
- ) : ( -
- ); + ) : null; } } From a0cc639a9283c27c2bef2f794444b6444ef185ce Mon Sep 17 00:00:00 2001 From: yassinedorbozgithub Date: Mon, 13 May 2024 23:20:02 +0100 Subject: [PATCH 2/6] fix: eazychart-[react & vue] - empty tooltip v0.01 --- .../snapshots/components/Chart.spec.tsx.snap | 5 +-- .../components/addons/Tooltip.spec.tsx.snap | 5 +-- .../recipes/area/AreaChart.spec.tsx.snap | 5 +-- .../recipes/area/MultiAreaChart.spec.tsx.snap | 5 +-- .../recipes/bar/BarChart.spec.tsx.snap | 5 +-- .../recipes/column/ColumnChart.spec.tsx.snap | 5 +-- .../column/LineColumnChart.spec.tsx.snap | 5 +-- .../recipes/line/LineChart.spec.tsx.snap | 5 +-- .../line/LineErrorMarginChart.spec.tsx.snap | 5 +-- .../recipes/line/MultiLineChart.spec.tsx.snap | 5 +-- .../recipes/map/MapChart.spec.tsx.snap | 5 +-- .../pie/IrregularPieChart.spec.tsx.snap | 5 +-- .../recipes/pie/PieChart.spec.tsx.snap | 5 +-- .../recipes/pie/RadialChart.spec.tsx.snap | 5 +-- .../recipes/pie/SemiCircleChart.spec.tsx.snap | 5 +-- .../recipes/scatter/BubbleChart.spec.tsx.snap | 5 +-- .../scatter/ScatterChart.spec.tsx.snap | 5 +-- .../src/components/addons/tooltip/Tooltip.tsx | 43 +++++++++++-------- .../src/components/addons/tooltip/Tooltip.tsx | 4 +- 19 files changed, 45 insertions(+), 87 deletions(-) diff --git a/packages/ez-dev/jest/snapshots/components/Chart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/components/Chart.spec.tsx.snap index 53c324d4..dfdbd0e3 100644 --- a/packages/ez-dev/jest/snapshots/components/Chart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/components/Chart.spec.tsx.snap @@ -50,10 +50,7 @@ exports[`Chart should provide the chart data to the children components 1`] = ` -
+
diff --git a/packages/ez-dev/jest/snapshots/components/addons/Tooltip.spec.tsx.snap b/packages/ez-dev/jest/snapshots/components/addons/Tooltip.spec.tsx.snap index be39a809..8e3ba355 100644 --- a/packages/ez-dev/jest/snapshots/components/addons/Tooltip.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/components/addons/Tooltip.spec.tsx.snap @@ -1,10 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Tooltip renders no tooltip when shape is being hovered 1`] = ` -
+
`; diff --git a/packages/ez-dev/jest/snapshots/recipes/area/AreaChart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/recipes/area/AreaChart.spec.tsx.snap index 3031dbb8..de9acb1f 100644 --- a/packages/ez-dev/jest/snapshots/recipes/area/AreaChart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/recipes/area/AreaChart.spec.tsx.snap @@ -479,10 +479,7 @@ exports[`AreaChart renders an area chart 1`] = `
-
+
diff --git a/packages/ez-dev/jest/snapshots/recipes/area/MultiAreaChart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/recipes/area/MultiAreaChart.spec.tsx.snap index bb9314df..153594dd 100644 --- a/packages/ez-dev/jest/snapshots/recipes/area/MultiAreaChart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/recipes/area/MultiAreaChart.spec.tsx.snap @@ -647,10 +647,7 @@ exports[`MultiAreaChart renders a multiarea chart 1`] = ` -
+
diff --git a/packages/ez-dev/jest/snapshots/recipes/bar/BarChart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/recipes/bar/BarChart.spec.tsx.snap index 1e1cb3f1..59112a3e 100644 --- a/packages/ez-dev/jest/snapshots/recipes/bar/BarChart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/recipes/bar/BarChart.spec.tsx.snap @@ -396,10 +396,7 @@ exports[`BarChart renders a bar chart 1`] = ` -
+
diff --git a/packages/ez-dev/jest/snapshots/recipes/column/ColumnChart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/recipes/column/ColumnChart.spec.tsx.snap index 25d8631f..80d32d70 100644 --- a/packages/ez-dev/jest/snapshots/recipes/column/ColumnChart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/recipes/column/ColumnChart.spec.tsx.snap @@ -396,10 +396,7 @@ exports[`ColumnChart renders a column chart 1`] = ` -
+
diff --git a/packages/ez-dev/jest/snapshots/recipes/column/LineColumnChart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/recipes/column/LineColumnChart.spec.tsx.snap index 9e73e50d..ab2365fd 100644 --- a/packages/ez-dev/jest/snapshots/recipes/column/LineColumnChart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/recipes/column/LineColumnChart.spec.tsx.snap @@ -643,10 +643,7 @@ exports[`LineColumnChart renders a line & column chart 1`] = ` -
+
diff --git a/packages/ez-dev/jest/snapshots/recipes/line/LineChart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/recipes/line/LineChart.spec.tsx.snap index d71aa7a7..8f01c746 100644 --- a/packages/ez-dev/jest/snapshots/recipes/line/LineChart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/recipes/line/LineChart.spec.tsx.snap @@ -468,10 +468,7 @@ exports[`LineChart renders a line chart 1`] = ` -
+
diff --git a/packages/ez-dev/jest/snapshots/recipes/line/LineErrorMarginChart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/recipes/line/LineErrorMarginChart.spec.tsx.snap index d5297eac..0f42e75e 100644 --- a/packages/ez-dev/jest/snapshots/recipes/line/LineErrorMarginChart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/recipes/line/LineErrorMarginChart.spec.tsx.snap @@ -579,10 +579,7 @@ exports[`LineErrorMarginChart renders a line error margin chart 1`] = ` -
+
diff --git a/packages/ez-dev/jest/snapshots/recipes/line/MultiLineChart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/recipes/line/MultiLineChart.spec.tsx.snap index 9cea1edc..7f918bd5 100644 --- a/packages/ez-dev/jest/snapshots/recipes/line/MultiLineChart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/recipes/line/MultiLineChart.spec.tsx.snap @@ -625,10 +625,7 @@ exports[`MultiLineChart renders a multiline chart 1`] = ` -
+
diff --git a/packages/ez-dev/jest/snapshots/recipes/map/MapChart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/recipes/map/MapChart.spec.tsx.snap index 5c3d19c0..a78d5e94 100644 --- a/packages/ez-dev/jest/snapshots/recipes/map/MapChart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/recipes/map/MapChart.spec.tsx.snap @@ -51,10 +51,7 @@ exports[`MapChart renders a map chart 1`] = ` -
+
diff --git a/packages/ez-dev/jest/snapshots/recipes/pie/IrregularPieChart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/recipes/pie/IrregularPieChart.spec.tsx.snap index b401dc40..5cbca184 100644 --- a/packages/ez-dev/jest/snapshots/recipes/pie/IrregularPieChart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/recipes/pie/IrregularPieChart.spec.tsx.snap @@ -94,10 +94,7 @@ exports[`IrregularPieChart renders a irregular pie chart 1`] = ` -
+
diff --git a/packages/ez-dev/jest/snapshots/recipes/pie/PieChart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/recipes/pie/PieChart.spec.tsx.snap index e6f568b5..42ead5d3 100644 --- a/packages/ez-dev/jest/snapshots/recipes/pie/PieChart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/recipes/pie/PieChart.spec.tsx.snap @@ -92,10 +92,7 @@ exports[`PieChart renders a pie chart 1`] = ` -
+
diff --git a/packages/ez-dev/jest/snapshots/recipes/pie/RadialChart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/recipes/pie/RadialChart.spec.tsx.snap index 252f8797..eb65c32c 100644 --- a/packages/ez-dev/jest/snapshots/recipes/pie/RadialChart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/recipes/pie/RadialChart.spec.tsx.snap @@ -94,10 +94,7 @@ exports[`RadialChart renders a Radial chart 1`] = ` -
+
diff --git a/packages/ez-dev/jest/snapshots/recipes/pie/SemiCircleChart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/recipes/pie/SemiCircleChart.spec.tsx.snap index e8e27ff3..fced98af 100644 --- a/packages/ez-dev/jest/snapshots/recipes/pie/SemiCircleChart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/recipes/pie/SemiCircleChart.spec.tsx.snap @@ -92,10 +92,7 @@ exports[`SemiCircleChart renders a semi-circle chart 1`] = ` -
+
diff --git a/packages/ez-dev/jest/snapshots/recipes/scatter/BubbleChart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/recipes/scatter/BubbleChart.spec.tsx.snap index b5b6f845..1a02b71c 100644 --- a/packages/ez-dev/jest/snapshots/recipes/scatter/BubbleChart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/recipes/scatter/BubbleChart.spec.tsx.snap @@ -515,10 +515,7 @@ exports[`BubbleChart renders a bubble chart 1`] = ` -
+
diff --git a/packages/ez-dev/jest/snapshots/recipes/scatter/ScatterChart.spec.tsx.snap b/packages/ez-dev/jest/snapshots/recipes/scatter/ScatterChart.spec.tsx.snap index c5d51b1b..0378249f 100644 --- a/packages/ez-dev/jest/snapshots/recipes/scatter/ScatterChart.spec.tsx.snap +++ b/packages/ez-dev/jest/snapshots/recipes/scatter/ScatterChart.spec.tsx.snap @@ -516,10 +516,7 @@ exports[`ScatterChart renders a scatter chart 1`] = ` -
+
diff --git a/packages/ez-react/src/components/addons/tooltip/Tooltip.tsx b/packages/ez-react/src/components/addons/tooltip/Tooltip.tsx index 27846620..35f9883b 100644 --- a/packages/ez-react/src/components/addons/tooltip/Tooltip.tsx +++ b/packages/ez-react/src/components/addons/tooltip/Tooltip.tsx @@ -50,24 +50,31 @@ export const Tooltip: FC = ({ color: undefined, }; - return datum ? ( -
- {shapeDatum?.color && ( -
- )} -
- {Object.keys(attributes).map((attribute) => ( -
-
{attribute} :
-
- {datum[attribute] as string} -
+ return ( +
+ {datum ? ( + <> + {shapeDatum?.color && ( +
+ )} +
+ {Object.keys(attributes).map((attribute) => ( +
+
{attribute} :
+
+ {datum[attribute] as string} +
+
+ ))}
- ))} -
+ + ) : null}
- ) : null; + ); }; diff --git a/packages/ez-vue/src/components/addons/tooltip/Tooltip.tsx b/packages/ez-vue/src/components/addons/tooltip/Tooltip.tsx index 7cdc624d..c8ea0f67 100644 --- a/packages/ez-vue/src/components/addons/tooltip/Tooltip.tsx +++ b/packages/ez-vue/src/components/addons/tooltip/Tooltip.tsx @@ -128,6 +128,8 @@ export default class Tooltip extends mixins(AnimationMixin) { ))}
- ) : null; + ) : ( +
+ ); } } From 3d752284fda5bd681e6c6f347f404c314086821b Mon Sep 17 00:00:00 2001 From: yassinedorbozgithub Date: Mon, 13 May 2024 23:23:00 +0100 Subject: [PATCH 3/6] fix: eazychart-[react & vue] - empty tooltip v0.0.2 --- lerna.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index 8176853e..6c5a8963 100644 --- a/lerna.json +++ b/lerna.json @@ -3,6 +3,5 @@ "packages/*" ], "version": "0.7.1-alpha.0", - "npmClient": "yarn", - "useWorkspaces": false + "npmClient": "yarn" } From 641dcb670e84fef1b40d49ec858dc329fe2ede89 Mon Sep 17 00:00:00 2001 From: yassinedorbozgithub Date: Mon, 13 May 2024 23:26:32 +0100 Subject: [PATCH 4/6] fix: eazychart-[react & vue] - empty tooltip v0.0.3 --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index dda46104..c8195596 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,7 @@ "scripts": { "prepare": "husky install", "clean": "lerna clean", - "bootstrap": "lerna bootstrap", - "setup": "lerna clean -y && rm -rf node_modules/ && yarn && lerna bootstrap", + "setup": "lerna clean -y && rm -rf node_modules/ && yarn", "storybook:react": "lerna run storybook --scope=eazychart-react --stream", "storybook:vue": "lerna run storybook --scope=eazychart-vue --stream", "storybook": "lerna run storybook --scope=eazychart-vue --scope=eazychart-react --stream", From 9f4f58a6b36369c38076905c34144f53f267bc14 Mon Sep 17 00:00:00 2001 From: yassinedorbozgithub Date: Tue, 14 May 2024 01:28:36 +0100 Subject: [PATCH 5/6] fix: eazychart-[react & vue] - empty tooltip v0.0.4 --- lerna.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 6c5a8963..8176853e 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,6 @@ "packages/*" ], "version": "0.7.1-alpha.0", - "npmClient": "yarn" + "npmClient": "yarn", + "useWorkspaces": false } From 34b3e156c7b5a414e3a967b3efb4eb0f0af9edf8 Mon Sep 17 00:00:00 2001 From: yassinedorbozgithub Date: Tue, 14 May 2024 01:29:45 +0100 Subject: [PATCH 6/6] fix: eazychart-[react & vue] - empty tooltip v0.0.5 --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c8195596..dda46104 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,8 @@ "scripts": { "prepare": "husky install", "clean": "lerna clean", - "setup": "lerna clean -y && rm -rf node_modules/ && yarn", + "bootstrap": "lerna bootstrap", + "setup": "lerna clean -y && rm -rf node_modules/ && yarn && lerna bootstrap", "storybook:react": "lerna run storybook --scope=eazychart-react --stream", "storybook:vue": "lerna run storybook --scope=eazychart-vue --stream", "storybook": "lerna run storybook --scope=eazychart-vue --scope=eazychart-react --stream",