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

Jump to bottom

fix: Endless loop when table value dependent on 'select' event #2069 #2082

Merged
merged 8 commits into from
Aug 17, 2023
Merged

fix: Endless loop when table value dependent on 'select' event #2069 #2082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
039abb2
fix: do not emit event when model value/values are changed programati…
marek-mihok Jul 18, 2023
97e83e3
fix: reverse order of selection and setting wave args inside useEffec…
marek-mihok Jul 18, 2023
2b33172
chore: minor refactor #2069
marek-mihok Jul 19, 2023
5081474
fix: prevent endless loop for multiple selections #2069
marek-mihok Jul 19, 2023
87611c3
chore: implement in clearer way #2069
marek-mihok Aug 15, 2023
bcf7ef6
chore: update unit tests to check if the infinite loop is prevented #…
marek-mihok Aug 15, 2023
0e18762
chore: revert to previous implementation #2069
marek-mihok Aug 16, 2023
2ae7f74
fix: Prevent infinite loop, make all tests pass, do not transpile d3 …
mturoci Aug 16, 2023
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
1 change: 1 addition & 0 deletions ui/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ module.exports = {
modulePaths: [],
moduleNameMapper: {
"^react-native$": "react-native-web",
'^d3$': '<rootDir>/node_modules/d3/dist/d3.min.js',
"^.+\\.module\\.(css|sass|scss)$": "identity-obj-proxy"
},
moduleFileExtensions: [
Expand Down
21 changes: 21 additions & 0 deletions ui/src/table.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,27 @@ describe('Table.tsx', () => {
expect(emitMock).toHaveBeenCalledTimes(1)
})

it('Fires event - single selection with initial value', async () => {
const
props = { ...tableProps, single: true, events: ['select'], value: 'rowname2' },
{ getAllByRole } = render(<XTable model={{ ...props }} />),
radioButtons = getAllByRole('radio')
fireEvent.click(radioButtons[0])
expect(emitMock).toHaveBeenCalledWith(tableProps.name, 'select', ['rowname1'])
expect(emitMock).toHaveBeenCalledTimes(1)
})

it('Fires event - multiple selection - select single with initial values', async () => {
const
values = ['rowname2', 'rowname3'],
props = { ...tableProps, multiple: true, events: ['select'], values },
{ getAllByRole } = render(<XTable model={{ ...props }} />),
checkboxes = getAllByRole('checkbox')
fireEvent.click(checkboxes[1])
expect(emitMock).toHaveBeenCalledWith(tableProps.name, 'select', ['rowname1', ...values])
expect(emitMock).toHaveBeenCalledTimes(1)
})

it('Clicks a column - link set on second col', () => {
tableProps = {
...tableProps,
Expand Down
7 changes: 6 additions & 1 deletion ui/src/table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,7 @@ export const
[groupByKey, setGroupByKey] = React.useState('*'),
contentRef = React.useRef<Fluent.IScrollablePane | null>(null),
tableRef = React.useRef<{ resetSortIcons: () => void } | null>(null),
skipNextEventEmit = React.useRef<B>(false),
groupByOptions: Fluent.IDropdownOption[] = React.useMemo(() =>
groupable ? [{ key: '*', text: '(No Grouping)' }, ...m.columns.map(col => ({ key: col.name, text: col.label }))] : [], [m.columns, groupable]
),
Expand Down Expand Up @@ -913,7 +914,7 @@ export const
onSelectionChanged: () => {
const selectedItemKeys = selection.getSelection().map(item => item.key as S)
wave.args[m.name] = selectedItemKeys
if (m.events?.includes('select')) wave.emit(m.name, 'select', selectedItemKeys)
if (!skipNextEventEmit.current && m.events?.includes('select')) wave.emit(m.name, 'select', selectedItemKeys)
}
}), [m.name, m.events]),
computeHeight = () => {
Expand Down Expand Up @@ -955,11 +956,15 @@ export const
React.useEffect(() => {
wave.args[m.name] = []
if (isSingle && m.value) {
skipNextEventEmit.current = true
selection.setKeySelected(m.value, true, false)
skipNextEventEmit.current = false
wave.args[m.name] = [m.value]
}
else if (isMultiple && m.values) {
skipNextEventEmit.current = true
m.values.forEach(v => selection.setKeySelected(v, true, false))
skipNextEventEmit.current = false
wave.args[m.name] = m.values
}
// eslint-disable-next-line react-hooks/exhaustive-deps
Expand Down