From 44b753a5dc618d20e92a056691819ea5cee351b3 Mon Sep 17 00:00:00 2001
From: Hendrik de Graaf <HendrikThePendric@users.noreply.github.com>
Date: Thu, 20 Jun 2024 12:51:14 +0200
Subject: [PATCH 1/2] fix(pivot-table): use a scoped base selector and global
 sub selectors (#1681)

Co-authored-by: Jen Jones Arnesen <jennifer@dhis2.org>
---
 .../PivotTable/styles/PivotTable.style.js     | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/components/PivotTable/styles/PivotTable.style.js b/src/components/PivotTable/styles/PivotTable.style.js
index 88c817042..60466810a 100644
--- 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;
     }
 `

From 6d73f146f605b3163f105272b3939616893f3996 Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Thu, 20 Jun 2024 10:54:49 +0000
Subject: [PATCH 2/2] chore(release): cut 26.7.4 [skip ci]

## [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))
---
 CHANGELOG.md | 7 +++++++
 package.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd83ffbd3..d4a911d2c 100644
--- 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
index d1220c973..046712a78 100644
--- 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": {