Skip to content

Commit 8ea35e7

Browse files
committed
Revert "resolve multiviz filters"
This reverts commit 5a8f22b.
1 parent 55a7cd8 commit 8ea35e7

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

packages/core/components/DataTable/DataTableStandAlone.tsx

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useEffect, useState } from 'react'
1+
import { useEffect, useState } from 'react'
22
import { ViewPort } from '../../types/ViewPort'
33
import Footnotes from '../../types/Footnotes'
44
import EditorWrapper from '../EditorWrapper/EditorWrapper'
@@ -30,23 +30,20 @@ const DataTableStandAlone: React.FC<StandAloneProps> = ({
3030
datasets,
3131
interactionLabel = ''
3232
}) => {
33-
34-
35-
// Use config.data (which may be filtered by multiVizColumn) over formattedData
36-
const baseData = config.data || config.formattedData || []
3733
const [filteredData, setFilteredData] = useState<Record<string, any>[]>(
38-
filterVizData(config.filters, baseData)
34+
filterVizData(config.filters, config.formattedData || config.data)
3935
)
4036

4137
useEffect(() => {
42-
const filters = addValuesToFilters(config.filters, baseData)
43-
setFilteredData(filterVizData(filters, baseData))
44-
}, [config.filters, config.data, config.formattedData])
38+
// when using editor changes to filter should update the data
39+
const filters = addValuesToFilters(config.filters, config.data)
40+
setFilteredData(filterVizData(filters, config?.formattedData?.length > 0 ? config.formattedData : config.data))
41+
}, [config.filters])
4542

4643
const setFilters = (newFilters: any) => {
47-
const filters = addValuesToFilters(newFilters, baseData)
44+
const filters = addValuesToFilters(newFilters, config.data)
4845
updateConfig({ ...config, filters })
49-
setFilteredData(filterVizData(filters, baseData))
46+
setFilteredData(filterVizData(filters, config?.formattedData?.length > 0 ? config.formattedData : config.data))
5047
}
5148

5249
if (isEditor)

0 commit comments

Comments
 (0)