Skip to content

Commit ea3edc7

Browse files
committed
Merge remote-tracking branch 'origin/master' into feat/upgrade-webcomponents-rc9
2 parents 2b15c68 + 6c74e5d commit ea3edc7

File tree

40 files changed

+267
-239
lines changed

40 files changed

+267
-239
lines changed

.eslint-imports.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

.eslintignore

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,36 @@
11
packages/*/src/lib/
2-
packages/*/lib/
3-
packages/*/dist/
2+
3+
# build results for base package
4+
packages/base/cjs
5+
packages/base/Device
6+
packages/base/hooks
7+
packages/base/lib
8+
packages/base/polyfill
9+
packages/base/scripts
10+
packages/base/styling
11+
packages/base/types
12+
packages/base/utils
13+
14+
# build results for charts package
15+
packages/charts/cjs
16+
packages/charts/components
17+
packages/charts/hooks
18+
packages/charts/interfaces
19+
packages/charts/internal
20+
packages/charts/lib
21+
22+
# build results for main package
23+
packages/main/cjs
24+
packages/main/components
25+
packages/main/dist
26+
packages/main/enums
27+
packages/main/interfaces
28+
packages/main/internal
29+
packages/main/lib
30+
packages/main/scripts
31+
packages/main/webComponents
32+
33+
434
scripts
535
shared
636
.eslintrc.js
@@ -11,3 +41,4 @@ rollup.config.js
1141
index.cjs.js
1242
index.esm.js
1343
packages/cra-template
44+

.eslintrc.js

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ module.exports = {
66
'plugin:@typescript-eslint/recommended',
77
'plugin:@typescript-eslint/recommended-requiring-type-checking',
88
'plugin:react/recommended',
9-
'prettier',
10-
'./.eslint-imports.js'
9+
'plugin:import/errors',
10+
'plugin:import/warnings',
11+
'plugin:import/typescript',
12+
'prettier'
1113
],
1214
parser: '@typescript-eslint/parser',
1315
parserOptions: {
@@ -122,6 +124,17 @@ module.exports = {
122124
'react/self-closing-comp': 'error',
123125
'spaced-comment': 'error',
124126
'use-isnan': 'error',
125-
'valid-typeof': 'off'
127+
'valid-typeof': 'off',
128+
'import/order': [
129+
'error',
130+
{
131+
'newlines-between': 'never',
132+
alphabetize: {
133+
order: 'asc',
134+
caseInsensitive: true
135+
}
136+
}
137+
],
138+
'import/no-duplicates': 2
126139
}
127140
};

config/rules/noIndexImportsRule.js

Lines changed: 0 additions & 61 deletions
This file was deleted.

config/rules/noIndexImportsRule.ts

Lines changed: 0 additions & 30 deletions
This file was deleted.

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
"@types/jest": "^26.0.8",
5858
"@types/react": "^16.9.34",
5959
"@types/react-dom": "^16.9.6",
60-
"@typescript-eslint/eslint-plugin": "^3.7.0",
61-
"@typescript-eslint/parser": "^3.7.0",
60+
"@typescript-eslint/eslint-plugin": "^4.4.0",
61+
"@typescript-eslint/parser": "^4.4.0",
6262
"@ui5/webcomponents-tools": "^1.0.0-rc.9",
6363
"babel-loader": "^8.1.0",
6464
"chalk": "^4.0.0",
@@ -67,12 +67,12 @@
6767
"enzyme": "^3.11.0",
6868
"enzyme-adapter-react-16": "^1.15.2",
6969
"enzyme-to-json": "^3.4.4",
70-
"eslint": "^7.5.0",
71-
"eslint-config-prettier": "^6.11.0",
72-
"eslint-plugin-import": "^2.22.0",
70+
"eslint": "^7.10.0",
71+
"eslint-config-prettier": "^6.12.0",
72+
"eslint-plugin-import": "^2.22.1",
7373
"eslint-plugin-prefer-arrow": "^1.2.2",
74-
"eslint-plugin-react": "^7.20.3",
75-
"eslint-plugin-react-hooks": "^4.0.8",
74+
"eslint-plugin-react": "^7.21.3",
75+
"eslint-plugin-react-hooks": "^4.1.2",
7676
"glob": "^7.1.6",
7777
"husky": "^4.2.5",
7878
"identity-obj-proxy": "^3.0.0",

packages/main/scripts/create-web-components-wrapper.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,13 @@ const getEventParameters = (parameters) => {
344344

345345
const importStatements = [];
346346

347+
if (resolvedEventParameters.length === 0) {
348+
return {
349+
tsType: `(event: CustomEvent) => void`,
350+
importStatements
351+
};
352+
}
353+
347354
const detailPayload = resolvedEventParameters.map((parameter) => {
348355
if (parameter.importStatement) {
349356
importStatements.push(parameter.importStatement);

packages/main/src/components/AnalyticalTable/ColumnHeader/ColumnHeaderContainer.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ export const ColumnHeaderContainer = (props) => {
6767
<div {...headerProps} role="rowgroup" style={{ width: `${columnVirtualizer.totalSize}px` }}>
6868
{columnVirtualizer.virtualItems.map((virtualColumn: VirtualItem) => {
6969
const column = headerGroup.headers[virtualColumn.index];
70+
if (!column) {
71+
return null;
72+
}
7073
const isLastColumn = !column.disableResizing && virtualColumn.index + 1 === headerGroup.headers.length;
7174
return (
7275
<>

packages/main/src/components/AnalyticalTable/TableBody/VirtualTableBody.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,9 @@ export const VirtualTableBody = (props: VirtualTableBodyProps) => {
179179
>
180180
{columnVirtualizer.virtualItems.map((virtualColumn) => {
181181
const cell = row.cells[virtualColumn.index];
182+
if (!cell) {
183+
return null;
184+
}
182185
const cellProps = cell.getCellProps();
183186
if (row.original?.emptyRow) {
184187
return <div {...cellProps} />;

packages/main/src/webComponents/Button/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export interface ButtonPropTypes extends Omit<WithWebComponentPropTypes, 'onClic
3737
/**
3838
* Fired when the <code>Button</code> is activated either with a mouse/tap or by using the Enter or Space key. <br><br> <b>Note:</b> The event will not be fired if the <code>disabled</code> property is set to <code>true</code>.
3939
*/
40-
onClick?: (event: CustomEvent<{}>) => void;
40+
onClick?: (event: CustomEvent) => void;
4141
}
4242

4343
/**

packages/main/src/webComponents/Card/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export interface CardPropTypes extends WithWebComponentPropTypes {
3434
/**
3535
* Fired when the <code>Card</code> header is activated by mouse/tap or by using the Enter or Space key. <br><br> <b>Note:</b> The event would be fired only if the <code>headerInteractive</code> property is set to true.
3636
*/
37-
onHeaderClick?: (event: CustomEvent<{}>) => void;
37+
onHeaderClick?: (event: CustomEvent) => void;
3838
}
3939

4040
/**

packages/main/src/webComponents/Carousel/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export interface CarouselPropTypes extends WithWebComponentPropTypes {
4343
/**
4444
* Fired for the last items of the <code>Carousel</code> if it is scrolled and the direction of scrolling is to the end. The number of items for which the event is thrown is controlled by the <code>infiniteScrollOffset</code> property.
4545
*/
46-
onLoadMore?: (event: CustomEvent<{}>) => void;
46+
onLoadMore?: (event: CustomEvent) => void;
4747
/**
4848
* Fired whenever the <code>selectedIndex</code> changes due to user interaction, when the user clicks on the navigation arrows or while resizing, based on the <code>items-per-page-l</code>, <code>items-per-page-m</code> and <code>items-per-page-s</code> properties.
4949
*/

packages/main/src/webComponents/CheckBox/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export interface CheckBoxPropTypes extends Omit<WithWebComponentPropTypes, 'onCh
3939
/**
4040
* Fired when the <code>CheckBox</code> checked state changes.
4141
*/
42-
onChange?: (event: CustomEvent<{}>) => void;
42+
onChange?: (event: CustomEvent) => void;
4343
}
4444

4545
/**

packages/main/src/webComponents/ComboBox/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ export interface ComboBoxPropTypes extends Omit<WithWebComponentPropTypes, 'onCh
5959
/**
6060
* Fired when the input operation has finished by pressing Enter, focusout or an item is selected.
6161
*/
62-
onChange?: (event: CustomEvent<{}>) => void;
62+
onChange?: (event: CustomEvent) => void;
6363
/**
6464
* Fired when typing in input. <br><br> <b>Note:</b> filterValue property is updated, input is changed.
6565
*/
66-
onInput?: (event: CustomEvent<{}>) => void;
66+
onInput?: (event: CustomEvent) => void;
6767
}
6868

6969
/**

packages/main/src/webComponents/CustomListItem/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export interface CustomListItemPropTypes extends WithWebComponentPropTypes {
1919
/**
2020
* Fired when the user clicks on the detail button when type is <code>Detail</code>.
2121
*/
22-
onDetailClick?: (event: CustomEvent<{}>) => void;
22+
onDetailClick?: (event: CustomEvent) => void;
2323
}
2424

2525
/**

packages/main/src/webComponents/DatePicker/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ export interface DatePickerPropTypes extends Omit<WithWebComponentPropTypes, 'on
7070
/**
7171
* Fired when the input operation has finished by pressing Enter or on focusout.
7272
*/
73-
onChange?: (event: CustomEvent<{}>) => void;
73+
onChange?: (event: CustomEvent) => void;
7474
/**
7575
* Fired when the value of the <code>DatePicker</code> is changed at each key stroke.
7676
*/
77-
onInput?: (event: CustomEvent<{}>) => void;
77+
onInput?: (event: CustomEvent) => void;
7878
}
7979

8080
/**

packages/main/src/webComponents/DateRangePicker/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ export interface DateRangePickerPropTypes extends Omit<WithWebComponentPropTypes
7474
/**
7575
* Fired when the input operation has finished by pressing Enter or on focusout.
7676
*/
77-
onChange?: (event: CustomEvent<{}>) => void;
77+
onChange?: (event: CustomEvent) => void;
7878
/**
7979
* Fired when the value of the <code>DatePicker</code> is changed at each key stroke.
8080
*/
81-
onInput?: (event: CustomEvent<{}>) => void;
81+
onInput?: (event: CustomEvent) => void;
8282
}
8383

8484
/**

packages/main/src/webComponents/DateTimePicker/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ export interface DateTimePickerPropTypes extends Omit<WithWebComponentPropTypes,
7070
/**
7171
* Fired when the input operation has finished by pressing Enter or on focusout.
7272
*/
73-
onChange?: (event: CustomEvent<{}>) => void;
73+
onChange?: (event: CustomEvent) => void;
7474
/**
7575
* Fired when the value of the <code>DatePicker</code> is changed at each key stroke.
7676
*/
77-
onInput?: (event: CustomEvent<{}>) => void;
77+
onInput?: (event: CustomEvent) => void;
7878
}
7979

8080
/**

packages/main/src/webComponents/Dialog/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ export interface DialogPropTypes extends WithWebComponentPropTypes {
3838
/**
3939
* Fired after the component is closed. This event does not bubble.
4040
*/
41-
onAfterClose?: (event: CustomEvent<{}>) => void;
41+
onAfterClose?: (event: CustomEvent) => void;
4242
/**
4343
* Fired after the component is opened. This event does not bubble.
4444
*/
45-
onAfterOpen?: (event: CustomEvent<{}>) => void;
45+
onAfterOpen?: (event: CustomEvent) => void;
4646
/**
4747
* Fired before the component is closed. This event can be cancelled, which will prevent the popup from closing. This event does not bubble.
4848
*/
4949
onBeforeClose?: (event: CustomEvent<{ escPressed: boolean }>) => void;
5050
/**
5151
* Fired before the component is opened. This event can be cancelled, which will prevent the popup from opening. This event does not bubble.
5252
*/
53-
onBeforeOpen?: (event: CustomEvent<{}>) => void;
53+
onBeforeOpen?: (event: CustomEvent) => void;
5454
}
5555

5656
/**

packages/main/src/webComponents/DurationPicker/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export interface DurationPickerPropTypes extends Omit<WithWebComponentPropTypes,
5454
/**
5555
* Fired when the input operation has finished by pressing Enter or on focusout.
5656
*/
57-
onChange?: (event: CustomEvent<{}>) => void;
57+
onChange?: (event: CustomEvent) => void;
5858
}
5959

6060
/**

0 commit comments

Comments
 (0)