diff --git a/packages/web/src/datagrid/DataGrid.svelte b/packages/web/src/datagrid/DataGrid.svelte index 41cbc916c..347b0cc43 100644 --- a/packages/web/src/datagrid/DataGrid.svelte +++ b/packages/web/src/datagrid/DataGrid.svelte @@ -275,6 +275,7 @@ onClose={() => { cellDataViewVisible = false; }} + selection={publishedCells} /> diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte index c3f1c07af..49a0d1793 100644 --- a/packages/web/src/datagrid/DataGridCore.svelte +++ b/packages/web/src/datagrid/DataGridCore.svelte @@ -388,7 +388,7 @@ import DataFilterControl from './DataFilterControl.svelte'; import createReducer from '../utility/createReducer'; import keycodes from '../utility/keycodes'; - import { copyRowsFormat, currentArchive, selectedCellsCallback } from '../stores'; + import { copyRowsFormat, currentArchive } from '../stores'; import { copyRowsFormatDefs, copyRowsToClipboard, @@ -1203,7 +1203,6 @@ if (rowIndexes.every(x => grider.getRowData(x))) { lastPublishledSelectedCellsRef.set(stringified); changeSetValueRef.set($changeSetStore?.value); - $selectedCellsCallback = () => getCellsPublished(selectedCells); if (onChangeSelectedColumns) { onChangeSelectedColumns(getSelectedColumns().map(x => x.columnName)); diff --git a/packages/web/src/stores.ts b/packages/web/src/stores.ts index 6b93b1147..96a56fe71 100644 --- a/packages/web/src/stores.ts +++ b/packages/web/src/stores.ts @@ -168,7 +168,6 @@ export const nullStore = readable(null, () => {}); export const currentArchive = writableWithStorage('default', 'currentArchive'); export const currentApplication = writableWithStorage(null, 'currentApplication'); export const isFileDragActive = writable(false); -export const selectedCellsCallback = writable(null); export const loadingPluginStore = writable({ loaded: false, loadingPackageName: null, diff --git a/packages/web/src/widgets/CellDataWidget.svelte b/packages/web/src/widgets/CellDataWidget.svelte index e418ea432..320f29e67 100644 --- a/packages/web/src/widgets/CellDataWidget.svelte +++ b/packages/web/src/widgets/CellDataWidget.svelte @@ -103,13 +103,13 @@ import ErrorInfo from '../elements/ErrorInfo.svelte'; import { selectionCouldBeShownOnMap } from '../elements/SelectionMapView.svelte'; import SelectField from '../forms/SelectField.svelte'; - import { selectedCellsCallback } from '../stores'; import WidgetTitle from './WidgetTitle.svelte'; import JsonExpandedCellView from '../celldata/JsonExpandedCellView.svelte'; import XmlCellView from '../celldata/XmlCellView.svelte'; import { _t } from '../translations'; export let onClose; + export let selection; let selectedFormatType = 'autodetect'; @@ -118,8 +118,6 @@ $: usedFormatType = selectedFormatType == 'autodetect' ? autodetectFormatType : selectedFormatType; $: usedFormat = formats.find(x => x.type == usedFormatType); - - $: selection = $selectedCellsCallback ? $selectedCellsCallback() : [];