Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: powerbi styling issues #618

Merged
merged 4 commits into from
May 8, 2024
Merged

fix: powerbi styling issues #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
404d066
fix: powerbi styling issues
Gustav-Eikaas May 6, 2024
d8133d0
add types
Gustav-Eikaas May 6, 2024
3d1356e
Merge branch 'main' into fix/powerbi-styling-issues
Gustav-Eikaas May 8, 2024
3aabb1b
bump versions
Gustav-Eikaas May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 21 additions & 27 deletions packages/power-bi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@equinor/workspace-powerbi",
"version": "3.0.2",
"version": "3.0.3",
"type": "module",
"sideEffects": false,
"license": "MIT",
Expand All @@ -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",
Expand All @@ -62,3 +55,4 @@
},
"gitHead": "6407f12589214b96228ab87d32a211f7c1cd6ba4"
}

2 changes: 1 addition & 1 deletion packages/power-bi/src/lib/components/filterItem/filterItem.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
}
`;
2 changes: 1 addition & 1 deletion packages/power-bi/src/lib/components/filterItemCheckbox/filterItemCheckbox.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const StyledFilterItemWrap = styled.div`
padding-right: 2px;
}
}
:hover {
&:hover {
background-color: ${tokens.colors.interactive.primary__selected_hover.rgba};
}
`;
2 changes: 1 addition & 1 deletion packages/power-bi/src/lib/components/filterItems/filterItems.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/power-bi/src/lib/components/toggleHideFilterPopover.tsx/ToggleHideFilterPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const ToggleHideFilterPopover = ({
<Popover.Header>
<Popover.Title>Filter types</Popover.Title>
</Popover.Header>
<Popover.Content style={{ maxHeight: '60vh', overflowY: 'scroll', overflowX: 'hidden' }}>
<Popover.Content style={{ maxHeight: '60vh', overflowY: 'auto', overflowX: 'hidden' }}>
<PopoverList>
<ReactSortable
animation={200}
Expand Down
2 changes: 1 addition & 1 deletion packages/power-bi/src/lib/components/virtualList/VirtualList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const FilterItemValue = memo(VirtualFilterItemCheckbox);

const Parent = styled.div`
height: 100%;
overflow-y: scroll;
overflow-y: auto;
overflow-x: hidden;
::-webkit-scrollbar-thumb {
background: ${tokens.colors.ui.background__medium.hex};
Expand Down
29 changes: 11 additions & 18 deletions packages/workspace-fusion/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@equinor/workspace-fusion",
"version": "9.0.5",
"version": "9.0.6",
"type": "module",
"sideEffects": false,
"license": "MIT",
Expand Down Expand Up @@ -105,32 +105,25 @@
}
},
"dependencies": {
"@equinor/eds-core-react": "0.27.0",
"@equinor/eds-icons": "^0.17.0",
"@equinor/eds-tokens": "0.9.0",
"@equinor/eds-core-react": "^0",
"@equinor/eds-icons": "^0",
"@equinor/eds-tokens": "^0",
"@equinor/workspace-ag-grid": "workspace:^",
"@equinor/workspace-filter": "workspace:^",
"@equinor/workspace-garden": "workspace:^",
"@equinor/workspace-powerbi": "workspace:^",
"@equinor/workspace-react": "workspace:^",
"@tanstack/react-query": "^5.32.0",
"@tanstack/react-query": "^5",
"re-resizable": "^6.9.16",
"react-error-boundary": "^4.0.13",
"vite-plugin-environment": "^1.1.3",
"react": ">= 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"
},
Expand Down
Loading
Loading