|
1 | | -import React, { useEffect, useState } from 'react' |
| 1 | +import { useEffect, useState } from 'react' |
2 | 2 | import { ViewPort } from '../../types/ViewPort' |
3 | 3 | import Footnotes from '../../types/Footnotes' |
4 | 4 | import EditorWrapper from '../EditorWrapper/EditorWrapper' |
@@ -30,23 +30,20 @@ const DataTableStandAlone: React.FC<StandAloneProps> = ({ |
30 | 30 | datasets, |
31 | 31 | interactionLabel = '' |
32 | 32 | }) => { |
33 | | - |
34 | | - |
35 | | - // Use config.data (which may be filtered by multiVizColumn) over formattedData |
36 | | - const baseData = config.data || config.formattedData || [] |
37 | 33 | const [filteredData, setFilteredData] = useState<Record<string, any>[]>( |
38 | | - filterVizData(config.filters, baseData) |
| 34 | + filterVizData(config.filters, config.formattedData || config.data) |
39 | 35 | ) |
40 | 36 |
|
41 | 37 | 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]) |
45 | 42 |
|
46 | 43 | const setFilters = (newFilters: any) => { |
47 | | - const filters = addValuesToFilters(newFilters, baseData) |
| 44 | + const filters = addValuesToFilters(newFilters, config.data) |
48 | 45 | updateConfig({ ...config, filters }) |
49 | | - setFilteredData(filterVizData(filters, baseData)) |
| 46 | + setFilteredData(filterVizData(filters, config?.formattedData?.length > 0 ? config.formattedData : config.data)) |
50 | 47 | } |
51 | 48 |
|
52 | 49 | if (isEditor) |
|
0 commit comments