From 2fe4475d365cf8d7b11fe2459d9f561fcf2d7ff3 Mon Sep 17 00:00:00 2001 From: Gustav-Eikaas <89254170+Gustav-Eikaas@users.noreply.github.com> Date: Fri, 17 Nov 2023 13:08:22 +0100 Subject: [PATCH] feature: enable text selection ag grid (#698) --- .../src/defaultGridOptions.tsx | 2 + package.json | 2 +- pnpm-lock.yaml | 90 +++++++++++++++++-- 3 files changed, 87 insertions(+), 7 deletions(-) diff --git a/libs/shared/src/packages/workspace-config/src/defaultGridOptions.tsx b/libs/shared/src/packages/workspace-config/src/defaultGridOptions.tsx index 9309c9515..3b52627f7 100644 --- a/libs/shared/src/packages/workspace-config/src/defaultGridOptions.tsx +++ b/libs/shared/src/packages/workspace-config/src/defaultGridOptions.tsx @@ -12,6 +12,8 @@ export const defaultGridOptions: GridOptions = { defaultColDef: defaultColDef, serverSideInitialRowCount: 100, enableBrowserTooltips: true, + enableCellTextSelection: true, + ensureDomOrder: true, onFirstDataRendered: (e) => { e.columnApi.autoSizeColumns( e.columnApi.getAllDisplayedColumns().filter((s) => s.getColId() !== 'description') diff --git a/package.json b/package.json index ba8cf970f..6535004d2 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@equinor/fusion-framework-module-ag-grid": "30.2.0", "@equinor/fusion-framework-react-app": "^4.1.8", "@equinor/fusion-framework-react-module-context": "^6.0.14", - "@equinor/workspace-fusion": "6.0.0", + "@equinor/workspace-fusion": "6.0.1", "@equinor/fusion-observable": "8.1.2", "@equinor/workspace-sidesheet": "^0.1.6", "@microsoft/applicationinsights-web": "^3.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8ff4c857a..440eea79e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,8 +32,8 @@ importers: specifier: 8.1.2 version: 8.1.2(@types/react@18.2.22)(react@18.2.0) '@equinor/workspace-fusion': - specifier: 6.0.0 - version: 6.0.0(@ag-grid-enterprise/core@30.2.1)(@types/react@18.2.22)(react-dom@18.2.0)(react-is@18.2.0)(styled-components@5.3.6)(vite@4.4.9) + specifier: 6.0.1 + version: 6.0.1(@ag-grid-enterprise/core@30.2.1)(@types/react@18.2.22)(react-dom@18.2.0)(react-is@18.2.0)(styled-components@5.3.6)(vite@4.4.9) '@equinor/workspace-sidesheet': specifier: ^0.1.6 version: 0.1.6(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(styled-components@5.3.6) @@ -4415,6 +4415,49 @@ packages: - '@types/react' dev: false + /@equinor/workspace-ag-grid@2.0.4(@ag-grid-enterprise/core@30.2.1)(@types/react@18.2.22)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(styled-components@5.3.6): + resolution: {integrity: sha512-g1IldpPMQr7IlH4+U8+w5ZeMFj1OCewktKnU91RF69xUL41AudLP83Pv4VLcgupKHlS83HnSnL15BkW/c2Lc1g==} + peerDependencies: + '@ag-grid-enterprise/core': 30.2.1 + react: '>= 16.8.0 || 18' + react-dom: '>= 16.8.0 || 18' + react-is: '>= 16.8.0' + styled-components: '>= 5.0.0' + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + dependencies: + '@ag-grid-community/client-side-row-model': 30.2.1 + '@ag-grid-community/core': 30.2.1 + '@ag-grid-community/react': 30.2.1(@ag-grid-community/core@30.2.1)(react-dom@18.2.0)(react@18.2.0) + '@ag-grid-enterprise/column-tool-panel': 30.2.1 + '@ag-grid-enterprise/core': 30.2.1 + '@ag-grid-enterprise/excel-export': 30.2.1 + '@ag-grid-enterprise/filter-tool-panel': 30.2.1 + '@ag-grid-enterprise/master-detail': 30.2.1 + '@ag-grid-enterprise/menu': 30.2.1 + '@ag-grid-enterprise/multi-filter': 30.2.1 + '@ag-grid-enterprise/range-selection': 30.2.1 + '@ag-grid-enterprise/rich-select': 30.2.1 + '@ag-grid-enterprise/row-grouping': 30.2.1 + '@ag-grid-enterprise/server-side-row-model': 30.2.1 + '@ag-grid-enterprise/set-filter': 30.2.1 + '@ag-grid-enterprise/side-bar': 30.2.1 + '@ag-grid-enterprise/status-bar': 30.2.1 + '@equinor/eds-tokens': 0.9.2 + '@equinor/fusion-react-ag-grid-styles': 30.2.0(@equinor/fusion-react-styles@0.6.0) + '@equinor/fusion-react-styles': 0.6.0(@types/react@18.2.22)(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + react-is: 18.2.0 + styled-components: 5.3.6(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) + transitivePeerDependencies: + - '@ag-grid-community/styles' + - '@types/react' + dev: false + /@equinor/workspace-core@0.1.4: resolution: {integrity: sha512-3B+OxAy69k+tMO4A8Sf78kwjqM+mQn5UmyfW60Diry7eTklocBsqaTXxvY9wV/c06bsDpMZUKHG5YuxtIfsUtg==} dependencies: @@ -4590,8 +4633,8 @@ packages: - vite dev: false - /@equinor/workspace-fusion@6.0.0(@ag-grid-enterprise/core@30.2.1)(@types/react@18.2.22)(react-dom@18.2.0)(react-is@18.2.0)(styled-components@5.3.6)(vite@4.4.9): - resolution: {integrity: sha512-rKQr548ZgIa90q+kwK2Ly9Uf+GCDDcPKi0pCFrSmKHlPqnptx7H3yqR2KBdMK+C4HqV1vPdfS1O5EMIuqLUHUw==} + /@equinor/workspace-fusion@6.0.1(@ag-grid-enterprise/core@30.2.1)(@types/react@18.2.22)(react-dom@18.2.0)(react-is@18.2.0)(styled-components@5.3.6)(vite@4.4.9): + resolution: {integrity: sha512-eweFtCrjDLP+S31TBeGNrmldax3FjqUvcK1b93voz6CGsQyu8WH9CduynihmiwK+4TTkWFZeAa36J4WXTUUZiw==} peerDependencies: react-dom: '>= 16.8.0 || 18' react-is: '>= 16.8.0' @@ -4603,10 +4646,10 @@ packages: '@equinor/eds-core-react': 0.27.0(react-dom@18.2.0)(react@18.2.0)(styled-components@5.3.6) '@equinor/eds-icons': 0.17.0 '@equinor/eds-tokens': 0.9.0 - '@equinor/workspace-ag-grid': 2.0.3(@ag-grid-enterprise/core@30.2.1)(@types/react@18.2.22)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(styled-components@5.3.6) + '@equinor/workspace-ag-grid': 2.0.4(@ag-grid-enterprise/core@30.2.1)(@types/react@18.2.22)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(styled-components@5.3.6) '@equinor/workspace-filter': 3.0.0(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(styled-components@5.3.6) '@equinor/workspace-garden': 6.0.0(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(styled-components@5.3.6) - '@equinor/workspace-powerbi': 1.0.7(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(styled-components@5.3.6) + '@equinor/workspace-powerbi': 1.0.8(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(styled-components@5.3.6) '@equinor/workspace-react': 1.0.4(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(styled-components@5.3.6) '@tanstack/react-query': 4.35.3(react-dom@18.2.0)(react@18.2.0) '@types/react-dom': 18.2.7 @@ -4791,6 +4834,41 @@ packages: - supports-color dev: false + /@equinor/workspace-powerbi@1.0.8(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(styled-components@5.3.6): + resolution: {integrity: sha512-FsR4DdBKLwDYBrpsVK2+SNbBKWbzpj96RwIjdd1uyt2dP1I1q7kEzMoCKCIMzadrOKm1pwtHmAHc/UEr2ucCfw==} + peerDependencies: + react: '>= 16.8.0 || 18' + react-dom: '>= 16.8.0 || 18' + react-is: '>= 16.8.0' + styled-components: ^5.3.5 + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + dependencies: + '@equinor/eds-core-react': 0.28.0(react-dom@18.2.0)(react@18.2.0)(styled-components@5.3.6) + '@equinor/eds-icons': 0.18.0 + '@equinor/eds-tokens': 0.9.2 + '@tanstack/react-query': 4.35.3(react-dom@18.2.0)(react@18.2.0) + markdown-to-jsx: 7.2.0(react@18.2.0) + powerbi-client: 2.22.2 + powerbi-client-react: 1.3.5(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + react-error-boundary: 3.1.4(react@18.2.0) + react-is: 18.2.0 + react-sortablejs: 6.1.4(react-dom@18.2.0)(react@18.2.0)(sortablejs@1.15.0) + react-virtual: 2.10.4(react@18.2.0) + sortablejs: 1.15.0 + styled-components: 5.3.6(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) + transitivePeerDependencies: + - '@babel/core' + - '@types/sortablejs' + - react-native + - supports-color + dev: false + /@equinor/workspace-react@0.6.6(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(styled-components@5.3.6): resolution: {integrity: sha512-6j/bOzUvSaM+RGI8irOWawlxGdEhS7cb+qgN+xbxMasN7VFdGGYg5LVTQ+2UMT0lECb/xwkLpdokcNpLPgbvTw==} peerDependencies: