Skip to content

Commit 371bd27

Browse files
MarcusNotheisMarcusNotheis
authored
Merge branch 'master' into master
2 parents 4684988 + d877eb7 commit 371bd27

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1439
-376
lines changed

‎config/jest.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ module.exports = {
2626
transformIgnorePatterns: ['node_modules/(?!(@ui5|lit-html))'],
2727
moduleNameMapper: {
2828
'^@shared/(.*)$': '<rootDir>/shared/$1',
29+
'^@tests/(.*)$': '<rootDir>/shared/tests/$1',
2930
'^@ui5/webcomponents-react/dist/(.*)$': '<rootDir>/packages/main/dist/$1',
3031
'^@ui5/webcomponents-react/(.*)$': '<rootDir>/packages/main/src/$1',
3132
'^@ui5/webcomponents-react-base/third-party/(.*)$': '<rootDir>/packages/base/third-party/$1',

‎config/jestsetup.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import ResizeObserver from 'resize-observer-polyfill';
77
import 'intersection-observer';
88
import '@ui5/webcomponents/dist/generated/json-imports/i18n';
99
import 'whatwg-fetch';
10+
import '@testing-library/jest-dom';
1011

1112
// React 16 Enzyme adapter
1213
Enzyme.configure({ adapter: new Adapter() });

‎package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
"@ui5/webcomponents": "1.0.0-rc.7",
3232
"@ui5/webcomponents-fiori": "1.0.0-rc.7",
3333
"@ui5/webcomponents-icons": "1.0.0-rc.7",
34+
"react": "16.8.0",
35+
"react-dom": "16.8.0",
3436
"react-docgen-typescript-loader": "3.7.2"
3537
},
3638
"devDependencies": {
@@ -50,6 +52,7 @@
5052
"@rollup/plugin-node-resolve": "^7.1.3",
5153
"@rollup/plugin-replace": "^2.3.2",
5254
"@storybook/storybook-deployer": "^2.8.5",
55+
"@testing-library/jest-dom": "^5.8.0",
5356
"@testing-library/react": "^10.0.4",
5457
"@types/enzyme": "^3.10.5",
5558
"@types/jest": "^25.2.3",
@@ -90,9 +93,7 @@
9093
"ncp": "^2.0.0",
9194
"npm-run-all": "^4.1.5",
9295
"prettier": "^2.0.4",
93-
"react": "^16.8.6",
9496
"react-app-polyfill": "^1.0.6",
95-
"react-dom": "^16.8.6",
9697
"rimraf": "^3.0.1",
9798
"rollup": "^2.6.1",
9899
"rollup-plugin-strip-banner": "^2.0.0",

‎packages/base/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@
4242
"react": "^16.8.0",
4343
"react-jss": "^10.0.4"
4444
},
45+
"peerDependenciesMeta": {
46+
"@ui5/webcomponents-base": {
47+
"optional": true
48+
}
49+
},
4550
"publishConfig": {
4651
"access": "public"
4752
}

‎packages/base/src/styling/CssSizeVariables.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ export enum CssSizeVariablesNames {
1515
sapWcrAnalyticalTableTreePaddingLevel2 = 'sapWcrAnalyticalTableTreePaddingLevel2',
1616
sapWcrAnalyticalTableTreePaddingLevel3 = 'sapWcrAnalyticalTableTreePaddingLevel3',
1717
sapWcrCheckBoxWidthHeight = 'sapWcrCheckBoxWidthHeight',
18-
sapWcrAnalyticalTableSelectionColumnWidth = 'sapWcrAnalyticalTableSelectionColumnWidth'
18+
sapWcrAnalyticalTableSelectionColumnWidth = 'sapWcrAnalyticalTableSelectionColumnWidth',
19+
sapWcrToolbarHeight = 'sapWcrToolbarHeight',
20+
sapWcrToolbarPopoverContentPadding = 'sapWcrToolbarPopoverContentPadding',
21+
sapWcrToolbarSeparatorHeight = 'sapWcrToolbarSeparatorHeight'
1922
}
2023

2124
export const CssSizeVariables: Record<CssSizeVariablesNames, string> = Object.values(CssSizeVariablesNames).reduce(
@@ -45,7 +48,9 @@ export const cssVariablesStyles = `
4548
--${CssSizeVariablesNames.sapWcrAnalyticalTableTreePaddingLevel3}:2.75rem;
4649
--${CssSizeVariablesNames.sapWcrCheckBoxWidthHeight}:2.75rem;
4750
--${CssSizeVariablesNames.sapWcrAnalyticalTableSelectionColumnWidth}:55px;
48-
51+
--${CssSizeVariablesNames.sapWcrToolbarHeight}:2.75rem;
52+
--${CssSizeVariablesNames.sapWcrToolbarPopoverContentPadding}:0.25rem 0.5rem;
53+
--${CssSizeVariablesNames.sapWcrToolbarSeparatorHeight}: 2rem;
4954
}
5055
5156
[data-ui5-compact-size],
@@ -67,5 +72,8 @@ export const cssVariablesStyles = `
6772
--${CssSizeVariablesNames.sapWcrAnalyticalTableTreePaddingLevel3}:2rem;
6873
--${CssSizeVariablesNames.sapWcrCheckBoxWidthHeight}:2rem;
6974
--${CssSizeVariablesNames.sapWcrAnalyticalTableSelectionColumnWidth}:40px;
75+
--${CssSizeVariablesNames.sapWcrToolbarHeight}:2rem;
76+
--${CssSizeVariablesNames.sapWcrToolbarPopoverContentPadding}:0.1875rem 0.375rem;
77+
--${CssSizeVariablesNames.sapWcrToolbarSeparatorHeight}: 1.5rem;
7078
}
7179
`;

‎packages/base/src/styling/spacing.ts

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,30 @@ export const sapUiResponsiveMargin = {
152152
'@media (min-width:600px) and (max-width:1023px)': {
153153
margin: '1rem !important'
154154
},
155-
'@media (min-width:1024px)': {
155+
'@media (min-width:1024px) and (max-width: 1439px)': {
156156
margin: '1rem 2rem !important'
157+
},
158+
'@media (min-width:1440px)': {
159+
margin: '1rem 3rem !important'
157160
}
158161
};
159162

163+
export const sapUiTinyNegativeMarginBeginEnd = {
164+
margin: '0 -0.5rem !important'
165+
};
166+
167+
export const sapUiSmallNegativeMarginBeginEnd = {
168+
margin: '0 -1rem !important'
169+
};
170+
171+
export const sapUiMediumNegativeMarginBeginEnd = {
172+
margin: '0 -2rem !important'
173+
};
174+
175+
export const sapUiLargeNegativeMarginBeginEnd = {
176+
margin: '0 -3rem !important'
177+
};
178+
160179
/*
161180
* ###################################################
162181
* Padding Classes
@@ -171,14 +190,38 @@ export const sapUiContentPadding = {
171190
padding: '1rem'
172191
};
173192

193+
// Two Sided Padding
194+
export const sapUiTinyPaddingBeginEnd = {
195+
paddingLeft: '0.5rem !important',
196+
paddingRight: '0.5rem !important'
197+
};
198+
199+
export const sapUiSmallPaddingBeginEnd = {
200+
paddingLeft: '1rem !important',
201+
paddingRight: '1rem !important'
202+
};
203+
204+
export const sapUiMediumPaddingBeginEnd = {
205+
paddingLeft: '2rem !important',
206+
paddingRight: '2rem !important'
207+
};
208+
209+
export const sapUiLargePaddingBeginEnd = {
210+
paddingLeft: '3rem !important',
211+
paddingRight: '3rem !important'
212+
};
213+
174214
export const sapUiResponsiveContentPadding = {
175215
'@media(max-width:599px)': {
176-
padding: '0'
216+
padding: '0 1rem'
177217
},
178218
'@media (min-width:600px) and (max-width:1023px)': {
179-
padding: '1rem'
219+
padding: '0 2rem'
220+
},
221+
'@media (min-width:1024px) and (max-width: 1439px)': {
222+
padding: '0 2rem !important'
180223
},
181-
'@media (min-width:1024px)': {
182-
padding: '1rem 2rem !important'
224+
'@media (min-width:1440px)': {
225+
padding: '0 3rem !important'
183226
}
184227
};

‎packages/main/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@
4747
"react": "^16.8.0",
4848
"react-dom": "^16.8.0"
4949
},
50+
"peerDependenciesMeta": {
51+
"@ui5/webcomponents-base": {
52+
"optional": true
53+
},
54+
"@ui5/webcomponents-icons": {
55+
"optional": true
56+
}
57+
},
5058
"publishConfig": {
5159
"access": "public"
5260
}

‎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)