Skip to content

Commit e4b0c40

Browse files
Merge branch 'master' into docs/object-page-demo
2 parents 7179964 + 2a65a24 commit e4b0c40

File tree

15 files changed

+116
-652
lines changed

15 files changed

+116
-652
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @MarcusNotheis @vbersch @Lukas742

.github/workflows/compressed-size.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ jobs:
1414
with:
1515
repo-token: '${{ secrets.GITHUB_TOKEN }}'
1616
pattern: 'packages/**/lib/**/*.js'
17-
exlude: 'packages/**/src/lib/**'
17+
exclude: 'packages/**/src/lib/**'
1818
compression: 'gzip'

NOTICE.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.
Binary file not shown.

package.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
"license": "Apache-2.0",
77
"scripts": {
88
"start": "lerna run build:i18n && start-storybook -p 6006 -c .storybook",
9-
"build": "npm-run-all -s build:clean build:esm build:cjs",
9+
"build": "npm-run-all -s build:clean build:bundle",
1010
"build:clean": "yarn clean",
11-
"build:esm": "lerna run build --stream",
12-
"build:cjs": "node ./scripts/rollup/build.js",
11+
"build:bundle": "lerna run build --stream",
1312
"build:storybook": "lerna run build:i18n && build-storybook -c .storybook -o .out",
1413
"pretest": "rimraf coverage && lerna run build:i18n",
1514
"test": "jest --config=config/jest.config.js --coverage",
@@ -62,7 +61,6 @@
6261
"@typescript-eslint/eslint-plugin": "^3.7.0",
6362
"@typescript-eslint/parser": "^3.7.0",
6463
"@ui5/webcomponents-tools": "^1.0.0-rc.8",
65-
"babel-code-frame": "^6.26.0",
6664
"babel-jest": "^26.2.2",
6765
"babel-loader": "^8.1.0",
6866
"chalk": "^4.0.0",
@@ -78,7 +76,6 @@
7876
"eslint-plugin-react": "^7.20.3",
7977
"eslint-plugin-react-hooks": "^4.0.8",
8078
"glob": "^7.1.6",
81-
"google-closure-compiler": "^20200406.0.0",
8279
"husky": "^4.2.5",
8380
"identity-obj-proxy": "^3.0.0",
8481
"jest": "^26.2.2",
@@ -96,7 +93,7 @@
9693
"react-app-polyfill": "^1.0.6",
9794
"rimraf": "^3.0.1",
9895
"rollup": "^2.23.0",
99-
"rollup-plugin-strip-banner": "^2.0.0",
96+
"rollup-plugin-terser": "^6.1.0",
10097
"shelljs": "^0.8.3",
10198
"sinon": "^9.0.2",
10299
"targz": "^1.0.1",

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import { Ui5DialogDomRef } from '../../interfaces/Ui5DialogDomRef';
3131
import { stopPropagation } from '../../internal/stopPropagation';
3232
import styles from './FilterBarDialog.jss';
3333
import { filterValue, renderSearchWithValue } from './utils';
34+
import { createPortal } from 'react-dom';
3435

3536
const useStyles = createComponentStyles(styles, { name: 'FilterBarDialog' });
3637
export const FilterDialog = (props) => {
@@ -270,7 +271,7 @@ export const FilterDialog = (props) => {
270271
});
271272
}, [renderChildren, toggledFilters, handleCheckBoxChange]);
272273

273-
return (
274+
return createPortal(
274275
<Dialog ref={dialogRef} header={renderHeader()} footer={renderFooter()} onAfterClose={handleClose}>
275276
<div className={classes.dialog}>
276277
{renderFBSearch && (
@@ -281,6 +282,7 @@ export const FilterDialog = (props) => {
281282
)}
282283
{renderGroups()}
283284
</div>
284-
</Dialog>
285+
</Dialog>,
286+
document.body
285287
);
286288
};

scripts/rollup/build.js

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

0 commit comments

Comments
 (0)