Merge branch 'master' into fix/pivot-tables-legend-value-type

dhis2 · Jun 20, 2024 · 027ed8e · 027ed8e
2 parents 9509e64 + 6d73f14
commit 027ed8e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [26.7.4](https://github.com/dhis2/analytics/compare/v26.7.3...v26.7.4) (2024-06-20)
+
+
+### Bug Fixes
+
+* **pivot-table:** use a scoped base selector and global sub selectors ([#1681](https://github.com/dhis2/analytics/issues/1681)) ([44b753a](https://github.com/dhis2/analytics/commit/44b753a5dc618d20e92a056691819ea5cee351b3))
+
 ## [26.7.3](https://github.com/dhis2/analytics/compare/v26.7.2...v26.7.3) (2024-06-16)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.7.3",
+    "version": "26.7.4",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {

diff --git a/src/components/PivotTable/styles/PivotTable.style.js b/src/components/PivotTable/styles/PivotTable.style.js
@@ -10,14 +10,14 @@ import {
     FONT_SIZE_LARGE,
 } from '../../../modules/pivotTable/pivotTableConstants.js'
 
-export const table = css.global`
+export const table = css`
     div.pivot-table-container {
         font-family: 'Roboto', Arial, sans-serif;
         overflow: auto;
         color: ${colors.grey900};
     }
 
-    table {
+    div.pivot-table-container :global(table) {
         border-spacing: 0;
         white-space: nowrap;
         box-sizing: border-box;
@@ -26,35 +26,37 @@ export const table = css.global`
         border-width: 1px 1px 0 0;
     }
 
-    table.fixed-headers {
+    div.pivot-table-container :global(table.fixed-headers) {
         border-width: 0 0 0 1px;
     }
 
-    table.fixed-headers tr th,
-    table.fixed-headers tr td {
+    div.pivot-table-container :global(table.fixed-headers tr th),
+    div.pivot-table-container :global(table.fixed-headers tr td) {
         border-width: 0 1px 1px 0;
     }
 
-    table.fixed-column-headers {
+    div.pivot-table-container :global(table.fixed-column-headers) {
         border-width: 0 1px 0 0;
     }
 
-    table.fixed-column-headers tr th,
-    table.fixed-column-headers tr td {
+    div.pivot-table-container :global(table.fixed-column-headers tr th),
+    div.pivot-table-container :global(table.fixed-column-headers tr td) {
         border-width: 0 0 1px 1px;
     }
 
-    table.fixed-headers thead tr:first-of-type th,
-    table.fixed-column-headers thead tr:first-of-type th {
+    div.pivot-table-container
+        :global(table.fixed-headers thead tr:first-of-type th),
+    div.pivot-table-container
+        :global(table.fixed-column-headers thead tr:first-of-type th) {
         border-top: 1px solid ${BORDER_COLOR};
     }
 
-    table.fixed-row-headers {
+    div.pivot-table-container :global(table.fixed-row-headers) {
         border-width: 0 0 1px 1px;
     }
 
-    table.fixed-row-headers tr th,
-    table.fixed-row-headers tr td {
+    div.pivot-table-container :global(table.fixed-row-headers tr th),
+    div.pivot-table-container :global(table.fixed-row-headers tr td) {
         border-width: 1px 1px 0 0;
     }
 `