From 4f536ecd06636cae8fdec32a38ea4a9b82819c91 Mon Sep 17 00:00:00 2001 From: Gustav-Eikaas <89254170+Gustav-Eikaas@users.noreply.github.com> Date: Wed, 8 May 2024 09:52:28 +0200 Subject: [PATCH] fix: powerbi styling issues (#618) * fix: powerbi styling issues * add types * bump versions --- packages/power-bi/package.json | 48 +++---- .../filterItem/filterItem.styles.ts | 2 +- .../filterItemCheckbox.styles.ts | 2 +- .../filterItems/filterItems.styles.ts | 2 +- .../ToggleHideFilterPopover.tsx | 2 +- .../components/virtualList/VirtualList.tsx | 2 +- packages/workspace-fusion/package.json | 29 ++-- pnpm-lock.yaml | 127 +++++++----------- 8 files changed, 82 insertions(+), 132 deletions(-) diff --git a/packages/power-bi/package.json b/packages/power-bi/package.json index 19a345599..9c9150e8a 100644 --- a/packages/power-bi/package.json +++ b/packages/power-bi/package.json @@ -1,6 +1,6 @@ { "name": "@equinor/workspace-powerbi", - "version": "3.0.2", + "version": "3.0.3", "type": "module", "sideEffects": false, "license": "MIT", @@ -26,34 +26,27 @@ "dist" ], "dependencies": { - "@equinor/eds-core-react": "^0.28.0", - "@equinor/eds-icons": "^0.18.0", - "@equinor/eds-tokens": "^0.9.0", - "@tanstack/react-query": "^5.32.0", - "markdown-to-jsx": "^7.4.7", - "powerbi-client": "^2.23.1", - "powerbi-client-react": "^1.4.0", - "react-error-boundary": "^4.0.13", - "react-sortablejs": "^6.1.4", - "react-virtual": "^2.10.4", - "sortablejs": "^1.15.2" - }, - "peerDependencies": { - "react": ">= 16.8.0", - "react-dom": ">= 16.8.0", - "react-is": ">= 16.8.0", - "styled-components": "^5.3.5" + "@equinor/eds-core-react": "^0", + "@equinor/eds-icons": "^0", + "@equinor/eds-tokens": "^0", + "@tanstack/react-query": "^5", + "markdown-to-jsx": "^7", + "powerbi-client": "^2", + "powerbi-client-react": "^1", + "react-error-boundary": "^4", + "react-sortablejs": "^6", + "react-virtual": "^2", + "sortablejs": "^1", + "react": "^18", + "react-dom": "^18", + "react-is": "^18", + "styled-components": "^6" }, "devDependencies": { - "@types/react": "^18.3.1", - "@types/react-dom": "^18.3.0", - "@types/sortablejs": "^1.15.8", - "@types/styled-components": "^5.1.34", - "react": "^18.3.1", - "react-dom": "^18.3.1", - "react-is": "^18.3.1", - "styled-components": "^6.1.8", - "typescript": "^5.4.5" + "@types/sortablejs": "^1", + "@types/react": "^18", + "@types/react-dom": "^18", + "typescript": "^5" }, "repository": { "type": "git", @@ -62,3 +55,4 @@ }, "gitHead": "6407f12589214b96228ab87d32a211f7c1cd6ba4" } + diff --git a/packages/power-bi/src/lib/components/filterItem/filterItem.styles.ts b/packages/power-bi/src/lib/components/filterItem/filterItem.styles.ts index 798c18ef5..ca8b67437 100644 --- a/packages/power-bi/src/lib/components/filterItem/filterItem.styles.ts +++ b/packages/power-bi/src/lib/components/filterItem/filterItem.styles.ts @@ -15,7 +15,7 @@ export const StyledCheckboxItem = styled.div` white-space: nowrap; cursor: pointer; } - :hover { + &:hover { background-color: ${tokens.colors.interactive.primary__selected_hover.rgba}; } `; diff --git a/packages/power-bi/src/lib/components/filterItemCheckbox/filterItemCheckbox.styles.ts b/packages/power-bi/src/lib/components/filterItemCheckbox/filterItemCheckbox.styles.ts index be4ebaded..3db0c207c 100644 --- a/packages/power-bi/src/lib/components/filterItemCheckbox/filterItemCheckbox.styles.ts +++ b/packages/power-bi/src/lib/components/filterItemCheckbox/filterItemCheckbox.styles.ts @@ -33,7 +33,7 @@ export const StyledFilterItemWrap = styled.div` padding-right: 2px; } } - :hover { + &:hover { background-color: ${tokens.colors.interactive.primary__selected_hover.rgba}; } `; diff --git a/packages/power-bi/src/lib/components/filterItems/filterItems.styles.ts b/packages/power-bi/src/lib/components/filterItems/filterItems.styles.ts index e63aa5a74..3a6cd8982 100644 --- a/packages/power-bi/src/lib/components/filterItems/filterItems.styles.ts +++ b/packages/power-bi/src/lib/components/filterItems/filterItems.styles.ts @@ -10,7 +10,7 @@ export const StyledFilterGroupContainer = styled.div` export const StyledCheckboxWrap = styled.span` height: 100%; overflow-x: hidden; - overflow-y: scroll; + overflow-y: auto; width: 100%; span { padding: 2px; diff --git a/packages/power-bi/src/lib/components/toggleHideFilterPopover.tsx/ToggleHideFilterPopover.tsx b/packages/power-bi/src/lib/components/toggleHideFilterPopover.tsx/ToggleHideFilterPopover.tsx index 90b2384ab..885578ae4 100644 --- a/packages/power-bi/src/lib/components/toggleHideFilterPopover.tsx/ToggleHideFilterPopover.tsx +++ b/packages/power-bi/src/lib/components/toggleHideFilterPopover.tsx/ToggleHideFilterPopover.tsx @@ -54,7 +54,7 @@ export const ToggleHideFilterPopover = ({ Filter types - + = 18", - "react-dom": ">= 18" - }, - "peerDependencies": { - "styled-components": ">= 5" + "react-error-boundary": "^4", + "react": "^18", + "react-dom": "^18", + "styled-components": "^6" }, "devDependencies": { - "@types/jest": "29.5.12", - "@types/react": "^18.3.1", - "@types/react-dom": "^18.3.0", - "@types/styled-components": "^5.1.34", + "@types/react": "^18", + "@types/react-dom": "^18", "@vitejs/plugin-react": "^4.2.1", - "rollup-plugin-inject-process-env": "^1.3.1", - "styled-components": "^6.1.8", "typescript": "^5.4.5", "vite": "^5.2.10" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1939623c8..4b29596dc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -378,77 +378,74 @@ importers: packages/power-bi: dependencies: '@equinor/eds-core-react': - specifier: ^0.28.0 + specifier: ^0 version: 0.28.0(@babel/core@7.20.12)(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(styled-components@6.1.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)) '@equinor/eds-icons': - specifier: ^0.18.0 + specifier: ^0 version: 0.18.0 '@equinor/eds-tokens': - specifier: ^0.9.0 + specifier: ^0 version: 0.9.0 '@tanstack/react-query': - specifier: ^5.32.0 + specifier: ^5 version: 5.32.0(react@18.3.1) markdown-to-jsx: - specifier: ^7.4.7 + specifier: ^7 version: 7.4.7(react@18.3.1) powerbi-client: - specifier: ^2.23.1 + specifier: ^2 version: 2.23.1 powerbi-client-react: - specifier: ^1.4.0 + specifier: ^1 version: 1.4.0(react@18.3.1) + react: + specifier: ^18 + version: 18.3.1 + react-dom: + specifier: ^18 + version: 18.3.1(react@18.3.1) react-error-boundary: - specifier: ^4.0.13 + specifier: ^4 version: 4.0.13(react@18.3.1) + react-is: + specifier: ^18 + version: 18.3.1 react-sortablejs: - specifier: ^6.1.4 + specifier: ^6 version: 6.1.4(@types/sortablejs@1.15.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sortablejs@1.15.2) react-virtual: - specifier: ^2.10.4 + specifier: ^2 version: 2.10.4(react@18.3.1) sortablejs: - specifier: ^1.15.2 + specifier: ^1 version: 1.15.2 + styled-components: + specifier: ^6 + version: 6.1.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1) devDependencies: '@types/react': - specifier: ^18.3.1 + specifier: ^18 version: 18.3.1 '@types/react-dom': - specifier: ^18.3.0 + specifier: ^18 version: 18.3.0 '@types/sortablejs': - specifier: ^1.15.8 + specifier: ^1 version: 1.15.8 - '@types/styled-components': - specifier: ^5.1.34 - version: 5.1.34 - react: - specifier: ^18.3.1 - version: 18.3.1 - react-dom: - specifier: ^18.3.1 - version: 18.3.1(react@18.3.1) - react-is: - specifier: ^18.3.1 - version: 18.3.1 - styled-components: - specifier: ^6.1.8 - version: 6.1.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1) typescript: - specifier: ^5.4.5 + specifier: ^5 version: 5.4.5 packages/workspace-fusion: dependencies: '@equinor/eds-core-react': - specifier: 0.27.0 - version: 0.27.0(@babel/core@7.20.12)(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(styled-components@6.1.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)) + specifier: ^0 + version: 0.28.0(@babel/core@7.20.12)(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(styled-components@6.1.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)) '@equinor/eds-icons': - specifier: ^0.17.0 - version: 0.17.0 + specifier: ^0 + version: 0.18.0 '@equinor/eds-tokens': - specifier: 0.9.0 + specifier: ^0 version: 0.9.0 '@equinor/workspace-ag-grid': specifier: workspace:^ @@ -466,45 +463,33 @@ importers: specifier: workspace:^ version: link:../workspace-react '@tanstack/react-query': - specifier: ^5.32.0 + specifier: ^5 version: 5.32.0(react@18.3.1) re-resizable: specifier: ^6.9.16 version: 6.9.16(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: - specifier: '>= 18' + specifier: ^18 version: 18.3.1 react-dom: - specifier: '>= 18' + specifier: ^18 version: 18.3.1(react@18.3.1) react-error-boundary: - specifier: ^4.0.13 + specifier: ^4 version: 4.0.13(react@18.3.1) - vite-plugin-environment: - specifier: ^1.1.3 - version: 1.1.3(vite@5.2.10(@types/node@20.12.7)) + styled-components: + specifier: ^6 + version: 6.1.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1) devDependencies: - '@types/jest': - specifier: 29.5.12 - version: 29.5.12 '@types/react': - specifier: ^18.3.1 + specifier: ^18 version: 18.3.1 '@types/react-dom': - specifier: ^18.3.0 + specifier: ^18 version: 18.3.0 - '@types/styled-components': - specifier: ^5.1.34 - version: 5.1.34 '@vitejs/plugin-react': specifier: ^4.2.1 version: 4.2.1(vite@5.2.10(@types/node@20.12.7)) - rollup-plugin-inject-process-env: - specifier: ^1.3.1 - version: 1.3.1 - styled-components: - specifier: ^6.1.8 - version: 6.1.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1) typescript: specifier: ^5.4.5 version: 5.4.5 @@ -1085,10 +1070,6 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/runtime@7.20.1': - resolution: {integrity: sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==} - engines: {node: '>=6.9.0'} - '@babel/runtime@7.20.13': resolution: {integrity: sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==} engines: {node: '>=6.9.0'} @@ -4934,9 +4915,6 @@ packages: react: '>= 16.8.0' react-dom: '>= 16.8.0' - stylis@4.1.3: - resolution: {integrity: sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA==} - stylis@4.3.1: resolution: {integrity: sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ==} @@ -5312,11 +5290,6 @@ packages: vite-plugin-cdn-import@1.0.1: resolution: {integrity: sha512-lgjLxgwFSKvJLbqjVBirUZ0rQo00GpUGJzRpgQu8RyBw9LA7jaqG6fUMQzBC9qWmTGabPC3iOzwCcoi7PseRAQ==} - vite-plugin-environment@1.1.3: - resolution: {integrity: sha512-9LBhB0lx+2lXVBEWxFZC+WO7PKEyE/ykJ7EPWCq95NEcCpblxamTbs5Dm3DLBGzwODpJMEnzQywJU8fw6XGGGA==} - peerDependencies: - vite: '>= 2.7' - vite-plugin-externals@0.6.2: resolution: {integrity: sha512-R5oVY8xDJjLXLTs2XDYzvYbc/RTZuIwOx2xcFbYf+/VXB6eJuatDgt8jzQ7kZ+IrgwQhe6tU8U2fTyy72C25CQ==} engines: {node: ^14.18.0 || >=16.0.0} @@ -6273,10 +6246,6 @@ snapshots: '@babel/plugin-syntax-jsx': 7.24.1(@babel/core@7.24.5) '@babel/types': 7.24.0 - '@babel/runtime@7.20.1': - dependencies: - regenerator-runtime: 0.13.11 - '@babel/runtime@7.20.13': dependencies: regenerator-runtime: 0.13.11 @@ -6559,7 +6528,7 @@ snapshots: '@equinor/eds-core-react@0.28.0(@babel/core@7.20.12)(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(styled-components@6.1.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1))': dependencies: - '@babel/runtime': 7.20.1 + '@babel/runtime': 7.24.1 '@equinor/eds-icons': 0.17.0 '@equinor/eds-tokens': 0.9.0 '@equinor/eds-utils': 0.7.0(@babel/core@7.20.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(styled-components@6.1.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)) @@ -6586,7 +6555,7 @@ snapshots: '@equinor/eds-utils@0.7.0(@babel/core@7.20.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(styled-components@6.1.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1))': dependencies: - '@babel/runtime': 7.20.13 + '@babel/runtime': 7.24.1 '@equinor/eds-tokens': 0.9.0 '@popperjs/core': 2.11.6 babel-jest: 29.2.2(@babel/core@7.20.12) @@ -7815,7 +7784,7 @@ snapshots: dependencies: '@babel/core': 7.20.12 '@jest/transform': 29.2.2 - '@types/babel__core': 7.1.19 + '@types/babel__core': 7.20.5 babel-plugin-istanbul: 6.1.1 babel-preset-jest: 29.2.0(@babel/core@7.20.12) chalk: 4.1.2 @@ -9784,7 +9753,7 @@ snapshots: lodash-es: 4.17.21 moment-mini: 2.29.4 non-layered-tidy-tree-layout: 2.0.2 - stylis: 4.1.3 + stylis: 4.3.1 uuid: 9.0.0 micromark-core-commonmark@2.0.0: @@ -10939,8 +10908,6 @@ snapshots: stylis: 4.3.1 tslib: 2.5.0 - stylis@4.1.3: {} - stylis@4.3.1: {} sucrase@3.34.0: @@ -11338,10 +11305,6 @@ snapshots: - rollup - vite - vite-plugin-environment@1.1.3(vite@5.2.10(@types/node@20.12.7)): - dependencies: - vite: 5.2.10(@types/node@20.12.7) - vite-plugin-externals@0.6.2(vite@5.2.10(@types/node@20.12.7)): dependencies: acorn: 8.11.3