Skip to content

Commit dab2de2

Browse files
kmcfaulkmcfaul
authored
Merge pull request patternfly#245 from patternfly/v6Update
feat: Updated to PatternFly v6
2 parents 02f6fbe + 9468daa commit dab2de2

4 files changed

Lines changed: 171 additions & 219 deletions

File tree

‎packages/demo-app-ts/package.json‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
{
2-
"name": "demo-app-ts",
3-
"private": true,
4-
"version": "4.210.7",
5-
"scripts": {
6-
"build:demo-app": "webpack --mode production",
7-
"start:demo-app": "webpack-dev-server",
8-
"start:demo-app:hot": "webpack-dev-server --hot=true",
9-
"serve:demo-app": "node scripts/serve"
10-
},
11-
"dependencies": {
12-
"@patternfly/react-core": "6.0.0-alpha.100",
13-
"@patternfly/react-icons": "6.0.0-alpha.35",
14-
"@patternfly/react-styles": "6.0.0-alpha.34",
15-
"react": "^18",
16-
"react-dom": "^18",
17-
"react-router": "^5.3.3",
18-
"react-router-dom": "^5.3.3"
19-
},
20-
"devDependencies": {
21-
"@pmmmwh/react-refresh-webpack-plugin": "0.5.7",
22-
"@types/react": "^18",
23-
"@types/react-dom": "^18",
24-
"@types/react-router": "^5.1.18",
25-
"@types/react-router-dom": "^5.3.3",
26-
"classnames": "^2.2.6",
27-
"clean-webpack-plugin": "^3.0.0",
28-
"copy-webpack-plugin": "^6.1.0",
29-
"css-loader": "^4.3.0",
30-
"file-loader": "^6.1.0",
31-
"fork-ts-checker-webpack-plugin": "6.5.2",
32-
"html-webpack-plugin": "^5.5.0",
33-
"local-web-server": "^2.6.1",
34-
"mini-css-extract-plugin": "^0.11.1",
35-
"react-hot-loader": "4.13.0",
36-
"react-refresh": "0.14.0",
37-
"react-refresh-typescript": "2.0.7",
38-
"style-loader": "3.3.1",
39-
"ts-loader": "^8.3.0",
40-
"typescript": "^4.7.4",
41-
"url-loader": "^4.1.0",
42-
"webpack": "5.73.0",
43-
"webpack-cli": "4.10.0",
44-
"webpack-dev-server": "4.9.3"
45-
}
46-
}
2+
"name": "demo-app-ts",
3+
"private": true,
4+
"version": "4.210.7",
5+
"scripts": {
6+
"build:demo-app": "webpack --mode production",
7+
"start:demo-app": "webpack-dev-server",
8+
"start:demo-app:hot": "webpack-dev-server --hot=true",
9+
"serve:demo-app": "node scripts/serve"
10+
},
11+
"dependencies": {
12+
"@patternfly/react-core": "^6.0.0",
13+
"@patternfly/react-icons": "^6.0.0",
14+
"@patternfly/react-styles": "^6.0.0",
15+
"react": "^18",
16+
"react-dom": "^18",
17+
"react-router": "^5.3.3",
18+
"react-router-dom": "^5.3.3"
19+
},
20+
"devDependencies": {
21+
"@pmmmwh/react-refresh-webpack-plugin": "0.5.7",
22+
"@types/react": "^18",
23+
"@types/react-dom": "^18",
24+
"@types/react-router": "^5.1.18",
25+
"@types/react-router-dom": "^5.3.3",
26+
"classnames": "^2.2.6",
27+
"clean-webpack-plugin": "^3.0.0",
28+
"copy-webpack-plugin": "^6.1.0",
29+
"css-loader": "^4.3.0",
30+
"file-loader": "^6.1.0",
31+
"fork-ts-checker-webpack-plugin": "6.5.2",
32+
"html-webpack-plugin": "^5.5.0",
33+
"local-web-server": "^2.6.1",
34+
"mini-css-extract-plugin": "^0.11.1",
35+
"react-hot-loader": "4.13.0",
36+
"react-refresh": "0.14.0",
37+
"react-refresh-typescript": "2.0.7",
38+
"style-loader": "3.3.1",
39+
"ts-loader": "^8.3.0",
40+
"typescript": "^4.7.4",
41+
"url-loader": "^4.1.0",
42+
"webpack": "5.73.0",
43+
"webpack-cli": "4.10.0",
44+
"webpack-dev-server": "4.9.3"
45+
}
46+
}

‎packages/module/package.json‎

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
11
{
2-
"name": "@patternfly/react-topology",
3-
"version": "6.0.0-prerelease.0",
4-
"description": "Provide patternfly components, styles, and utilities for displaying a topology view",
5-
"main": "dist/js/index.js",
6-
"module": "dist/esm/index.js",
7-
"types": "dist/esm/index.d.ts",
8-
"scripts": {
9-
"build": "yarn generate && yarn build:esm && yarn build:cjs",
10-
"build:esm": "tsc --build --verbose ./tsconfig.json",
11-
"build:cjs": "tsc --build --verbose ./tsconfig.cjs.json",
12-
"clean": "rimraf dist css",
13-
"docs:develop": "pf-docs-framework start",
14-
"docs:build": "pf-docs-framework build all --output public",
15-
"docs:serve": "pf-docs-framework serve public --port 5000",
16-
"docs:screenshots": "pf-docs-framework screenshots --urlPrefix http://localhost:5000",
17-
"generate": "rimraf css && node scripts/writeClassMaps.js",
18-
"test:a11y": "patternfly-a11y --config patternfly-a11y.config",
19-
"serve:a11y": "yarn serve coverage"
20-
},
21-
"repository": {
22-
"type": "git",
23-
"url": "https://github.com/patternfly/react-topology.git"
24-
},
25-
"author": "Red Hat",
26-
"license": "MIT",
27-
"bugs": {
28-
"url": "https://github.com/patternfly/react-topology/issues"
29-
},
30-
"homepage": "https://github.com/patternfly/react-topology#readme",
31-
"publishConfig": {
32-
"access": "public",
33-
"tag": "prerelease"
34-
},
35-
"dependencies": {
36-
"@patternfly/react-core": "6.0.0-prerelease.21",
37-
"@patternfly/react-icons": "6.0.0-prerelease.7",
38-
"@patternfly/react-styles": "6.0.0-prerelease.6",
39-
"@types/d3": "^7.4.0",
40-
"@types/d3-force": "^1.2.1",
41-
"@types/react-measure": "^2.0.6",
42-
"d3": "^7.8.0",
43-
"@dagrejs/dagre": "1.1.2",
44-
"mobx": "^6.9.0",
45-
"mobx-react": "^7.6.0",
46-
"point-in-svg-path": "^1.0.1",
47-
"popper.js": "^1.16.1",
48-
"react-measure": "^2.3.0",
49-
"tslib": "^2.0.0",
50-
"webcola": "3.4.0"
51-
},
52-
"peerDependencies": {
53-
"react": "^17 || ^18",
54-
"react-dom": "^17 || ^18"
55-
},
56-
"devDependencies": {
57-
"@patternfly/documentation-framework": "6.0.0-alpha.108",
58-
"@patternfly/patternfly": "6.0.0-prerelease.15",
59-
"@patternfly/patternfly-a11y": "^4.3.1",
60-
"@patternfly/react-code-editor": "6.0.0-prerelease.21",
61-
"@patternfly/react-table": "6.0.0-prerelease.22",
62-
"@types/react": "^18.0.0",
63-
"@types/react-dom": "^18.0.0",
64-
"camel-case": "^3.0.0",
65-
"css": "^2.2.3",
66-
"fs-extra": "^6.0.1",
67-
"glob": "^7.1.2",
68-
"jsdom": "^15.1.0",
69-
"react": "^18.0.0",
70-
"react-dom": "^18.0.0",
71-
"rimraf": "^2.6.2",
72-
"typescript": "^4.7.4",
73-
"react-monaco-editor": "^0.51.0",
74-
"monaco-editor": "^0.34.1"
75-
}
76-
}
2+
"name": "@patternfly/react-topology",
3+
"version": "6.0.0-prerelease.0",
4+
"description": "Provide patternfly components, styles, and utilities for displaying a topology view",
5+
"main": "dist/js/index.js",
6+
"module": "dist/esm/index.js",
7+
"types": "dist/esm/index.d.ts",
8+
"scripts": {
9+
"build": "yarn generate && yarn build:esm && yarn build:cjs",
10+
"build:esm": "tsc --build --verbose ./tsconfig.json",
11+
"build:cjs": "tsc --build --verbose ./tsconfig.cjs.json",
12+
"clean": "rimraf dist css",
13+
"docs:develop": "pf-docs-framework start",
14+
"docs:build": "pf-docs-framework build all --output public",
15+
"docs:serve": "pf-docs-framework serve public --port 5000",
16+
"docs:screenshots": "pf-docs-framework screenshots --urlPrefix http://localhost:5000",
17+
"generate": "rimraf css && node scripts/writeClassMaps.js",
18+
"test:a11y": "patternfly-a11y --config patternfly-a11y.config",
19+
"serve:a11y": "yarn serve coverage"
20+
},
21+
"repository": {
22+
"type": "git",
23+
"url": "https://github.com/patternfly/react-topology.git"
24+
},
25+
"author": "Red Hat",
26+
"license": "MIT",
27+
"bugs": {
28+
"url": "https://github.com/patternfly/react-topology/issues"
29+
},
30+
"homepage": "https://github.com/patternfly/react-topology#readme",
31+
"publishConfig": {
32+
"access": "public",
33+
"tag": "prerelease"
34+
},
35+
"dependencies": {
36+
"@patternfly/react-core": "^6.0.0",
37+
"@patternfly/react-icons": "^6.0.0",
38+
"@patternfly/react-styles": "^6.0.0",
39+
"@types/d3": "^7.4.0",
40+
"@types/d3-force": "^1.2.1",
41+
"@types/react-measure": "^2.0.6",
42+
"d3": "^7.8.0",
43+
"@dagrejs/dagre": "1.1.2",
44+
"mobx": "^6.9.0",
45+
"mobx-react": "^7.6.0",
46+
"point-in-svg-path": "^1.0.1",
47+
"popper.js": "^1.16.1",
48+
"react-measure": "^2.3.0",
49+
"tslib": "^2.0.0",
50+
"webcola": "3.4.0"
51+
},
52+
"peerDependencies": {
53+
"react": "^17 || ^18",
54+
"react-dom": "^17 || ^18"
55+
},
56+
"devDependencies": {
57+
"@patternfly/documentation-framework": "6.0.0-alpha.120",
58+
"@patternfly/patternfly": "^6.0.0",
59+
"@patternfly/patternfly-a11y": "^4.3.1",
60+
"@patternfly/react-code-editor": "^6.0.0",
61+
"@patternfly/react-table": "^6.0.0",
62+
"@types/react": "^18.0.0",
63+
"@types/react-dom": "^18.0.0",
64+
"camel-case": "^3.0.0",
65+
"css": "^2.2.3",
66+
"fs-extra": "^6.0.1",
67+
"glob": "^7.1.2",
68+
"jsdom": "^15.1.0",
69+
"react": "^18.0.0",
70+
"react-dom": "^18.0.0",
71+
"rimraf": "^2.6.2",
72+
"typescript": "^4.7.4",
73+
"react-monaco-editor": "^0.51.0",
74+
"monaco-editor": "^0.34.1"
75+
}
76+
}

‎packages/module/src/components/contextmenu/ContextMenu.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ const ContextMenu: React.FunctionComponent<ContextMenuProps> = ({
3131
onSelect={handleOnRequestClose}
3232
toggle={() => <></>}
3333
className={css(topologyStyles.topologyContextMenuCDropdownMenu)}
34+
popperProps={{ appendTo: 'inline' }}
3435
>
3536
{children}
3637
</Dropdown>

0 commit comments

Comments
 (0)