Skip to content

Commit bb0d9d4

Browse files
authored
fix(FilterBar/ObjectPage): add toolbar for making action bars responsive (#546)
Closes #533
1 parent 7230d8e commit bb0d9d4

File tree

14 files changed

+553
-370
lines changed

14 files changed

+553
-370
lines changed

packages/main/src/components/FilterBar/FilterBar.jss.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ const styles = {
1818
boxShadow: 'none',
1919
flexWrap: 'wrap'
2020
},
21-
vLine: {
22-
borderLeft: '1px solid gray',
23-
paddingLeft: '0.5rem'
24-
},
2521
filterArea: {
2622
display: 'flex',
2723
flexWrap: 'wrap',

packages/main/src/components/FilterBar/FilterBar.test.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { Select } from '@ui5/webcomponents-react/lib/Select';
1212
import { Switch } from '@ui5/webcomponents-react/lib/Switch';
1313
import { VariantManagement } from '@ui5/webcomponents-react/lib/VariantManagement';
1414
import { MultiComboBoxItem } from '@ui5/webcomponents-react/lib/MultiComboBoxItem';
15+
import { Toolbar } from '@ui5/webcomponents-react/lib/Toolbar';
1516
import { mount } from 'enzyme';
1617
import React from 'react';
1718
import { act } from 'react-dom/test-utils';
@@ -198,7 +199,8 @@ describe('FilterBar', () => {
198199
</FilterGroupItem>
199200
</FilterBar>
200201
);
201-
const openFiltersDialogBtn = wrapper.find('.FilterBar-headerRowRight-0-2-7').childAt(3);
202+
const openFiltersDialogBtn = wrapper.find(Toolbar).find(Button).at(5);
203+
202204
act(() => {
203205
openFiltersDialogBtn.prop('onClick')();
204206
});
@@ -266,7 +268,7 @@ describe('FilterBar', () => {
266268
);
267269

268270
const filterItemsFB = wrapper.find(FilterGroupItem);
269-
const openFiltersDialogBtn = wrapper.find('.FilterBar-headerRowRight-0-2-7').childAt(3);
271+
const openFiltersDialogBtn = wrapper.find(Toolbar).find(Button).at(3);
270272
act(() => {
271273
openFiltersDialogBtn.prop('onClick')();
272274
});

0 commit comments

Comments
 (0)