Merge pull request #245 from patternfly/v6Update

feat: Updated to PatternFly v6
patternfly · Oct 24, 2024 · dab2de2 · dab2de2
2 parents 02f6fbe + 9468daa
commit dab2de2
Show file tree

Hide file tree

Showing 4 changed files with 171 additions and 219 deletions.
diff --git a/packages/demo-app-ts/package.json b/packages/demo-app-ts/package.json
@@ -1,46 +1,46 @@
 {
-  "name": "demo-app-ts",
-  "private": true,
-  "version": "4.210.7",
-  "scripts": {
-    "build:demo-app": "webpack --mode production",
-    "start:demo-app": "webpack-dev-server",
-    "start:demo-app:hot": "webpack-dev-server --hot=true",
-    "serve:demo-app": "node scripts/serve"
-  },
-  "dependencies": {
-    "@patternfly/react-core": "6.0.0-alpha.100",
-    "@patternfly/react-icons": "6.0.0-alpha.35",
-    "@patternfly/react-styles": "6.0.0-alpha.34",
-    "react": "^18",
-    "react-dom": "^18",
-    "react-router": "^5.3.3",
-    "react-router-dom": "^5.3.3"
-  },
-  "devDependencies": {
-    "@pmmmwh/react-refresh-webpack-plugin": "0.5.7",
-    "@types/react": "^18",
-    "@types/react-dom": "^18",
-    "@types/react-router": "^5.1.18",
-    "@types/react-router-dom": "^5.3.3",
-    "classnames": "^2.2.6",
-    "clean-webpack-plugin": "^3.0.0",
-    "copy-webpack-plugin": "^6.1.0",
-    "css-loader": "^4.3.0",
-    "file-loader": "^6.1.0",
-    "fork-ts-checker-webpack-plugin": "6.5.2",
-    "html-webpack-plugin": "^5.5.0",
-    "local-web-server": "^2.6.1",
-    "mini-css-extract-plugin": "^0.11.1",
-    "react-hot-loader": "4.13.0",
-    "react-refresh": "0.14.0",
-    "react-refresh-typescript": "2.0.7",
-    "style-loader": "3.3.1",
-    "ts-loader": "^8.3.0",
-    "typescript": "^4.7.4",
-    "url-loader": "^4.1.0",
-    "webpack": "5.73.0",
-    "webpack-cli": "4.10.0",
-    "webpack-dev-server": "4.9.3"
-  }
-}
+    "name": "demo-app-ts",
+    "private": true,
+    "version": "4.210.7",
+    "scripts": {
+        "build:demo-app": "webpack --mode production",
+        "start:demo-app": "webpack-dev-server",
+        "start:demo-app:hot": "webpack-dev-server --hot=true",
+        "serve:demo-app": "node scripts/serve"
+    },
+    "dependencies": {
+        "@patternfly/react-core": "^6.0.0",
+        "@patternfly/react-icons": "^6.0.0",
+        "@patternfly/react-styles": "^6.0.0",
+        "react": "^18",
+        "react-dom": "^18",
+        "react-router": "^5.3.3",
+        "react-router-dom": "^5.3.3"
+    },
+    "devDependencies": {
+        "@pmmmwh/react-refresh-webpack-plugin": "0.5.7",
+        "@types/react": "^18",
+        "@types/react-dom": "^18",
+        "@types/react-router": "^5.1.18",
+        "@types/react-router-dom": "^5.3.3",
+        "classnames": "^2.2.6",
+        "clean-webpack-plugin": "^3.0.0",
+        "copy-webpack-plugin": "^6.1.0",
+        "css-loader": "^4.3.0",
+        "file-loader": "^6.1.0",
+        "fork-ts-checker-webpack-plugin": "6.5.2",
+        "html-webpack-plugin": "^5.5.0",
+        "local-web-server": "^2.6.1",
+        "mini-css-extract-plugin": "^0.11.1",
+        "react-hot-loader": "4.13.0",
+        "react-refresh": "0.14.0",
+        "react-refresh-typescript": "2.0.7",
+        "style-loader": "3.3.1",
+        "ts-loader": "^8.3.0",
+        "typescript": "^4.7.4",
+        "url-loader": "^4.1.0",
+        "webpack": "5.73.0",
+        "webpack-cli": "4.10.0",
+        "webpack-dev-server": "4.9.3"
+    }
+}
diff --git a/packages/module/package.json b/packages/module/package.json
@@ -1,76 +1,76 @@
 {
-  "name": "@patternfly/react-topology",
-  "version": "6.0.0-prerelease.0",
-  "description": "Provide patternfly components, styles, and utilities for displaying a topology view",
-  "main": "dist/js/index.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/esm/index.d.ts",
-  "scripts": {
-    "build": "yarn generate && yarn build:esm && yarn build:cjs",
-    "build:esm": "tsc --build --verbose ./tsconfig.json",
-    "build:cjs": "tsc --build --verbose ./tsconfig.cjs.json",
-    "clean": "rimraf dist css",
-    "docs:develop": "pf-docs-framework start",
-    "docs:build": "pf-docs-framework build all --output public",
-    "docs:serve": "pf-docs-framework serve public --port 5000",
-    "docs:screenshots": "pf-docs-framework screenshots --urlPrefix http://localhost:5000",
-    "generate": "rimraf css && node scripts/writeClassMaps.js",
-    "test:a11y": "patternfly-a11y --config patternfly-a11y.config",
-    "serve:a11y": "yarn serve coverage"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/patternfly/react-topology.git"
-  },
-  "author": "Red Hat",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/patternfly/react-topology/issues"
-  },
-  "homepage": "https://github.com/patternfly/react-topology#readme",
-  "publishConfig": {
-    "access": "public",
-    "tag": "prerelease"
-  },
-  "dependencies": {
-    "@patternfly/react-core": "6.0.0-prerelease.21",
-    "@patternfly/react-icons": "6.0.0-prerelease.7",
-    "@patternfly/react-styles": "6.0.0-prerelease.6",
-    "@types/d3": "^7.4.0",
-    "@types/d3-force": "^1.2.1",
-    "@types/react-measure": "^2.0.6",
-    "d3": "^7.8.0",
-    "@dagrejs/dagre": "1.1.2",
-    "mobx": "^6.9.0",
-    "mobx-react": "^7.6.0",
-    "point-in-svg-path": "^1.0.1",
-    "popper.js": "^1.16.1",
-    "react-measure": "^2.3.0",
-    "tslib": "^2.0.0",
-    "webcola": "3.4.0"
-  },
-  "peerDependencies": {
-    "react": "^17 || ^18",
-    "react-dom": "^17 || ^18"
-  },
-  "devDependencies": {
-    "@patternfly/documentation-framework": "6.0.0-alpha.108",
-    "@patternfly/patternfly": "6.0.0-prerelease.15",
-    "@patternfly/patternfly-a11y": "^4.3.1",
-    "@patternfly/react-code-editor": "6.0.0-prerelease.21",
-    "@patternfly/react-table": "6.0.0-prerelease.22",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "camel-case": "^3.0.0",
-    "css": "^2.2.3",
-    "fs-extra": "^6.0.1",
-    "glob": "^7.1.2",
-    "jsdom": "^15.1.0",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "rimraf": "^2.6.2",
-    "typescript": "^4.7.4",
-    "react-monaco-editor": "^0.51.0",
-    "monaco-editor": "^0.34.1"
-  }
-}
+    "name": "@patternfly/react-topology",
+    "version": "6.0.0-prerelease.0",
+    "description": "Provide patternfly components, styles, and utilities for displaying a topology view",
+    "main": "dist/js/index.js",
+    "module": "dist/esm/index.js",
+    "types": "dist/esm/index.d.ts",
+    "scripts": {
+        "build": "yarn generate && yarn build:esm && yarn build:cjs",
+        "build:esm": "tsc --build --verbose ./tsconfig.json",
+        "build:cjs": "tsc --build --verbose ./tsconfig.cjs.json",
+        "clean": "rimraf dist css",
+        "docs:develop": "pf-docs-framework start",
+        "docs:build": "pf-docs-framework build all --output public",
+        "docs:serve": "pf-docs-framework serve public --port 5000",
+        "docs:screenshots": "pf-docs-framework screenshots --urlPrefix http://localhost:5000",
+        "generate": "rimraf css && node scripts/writeClassMaps.js",
+        "test:a11y": "patternfly-a11y --config patternfly-a11y.config",
+        "serve:a11y": "yarn serve coverage"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/patternfly/react-topology.git"
+    },
+    "author": "Red Hat",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/patternfly/react-topology/issues"
+    },
+    "homepage": "https://github.com/patternfly/react-topology#readme",
+    "publishConfig": {
+        "access": "public",
+        "tag": "prerelease"
+    },
+    "dependencies": {
+        "@patternfly/react-core": "^6.0.0",
+        "@patternfly/react-icons": "^6.0.0",
+        "@patternfly/react-styles": "^6.0.0",
+        "@types/d3": "^7.4.0",
+        "@types/d3-force": "^1.2.1",
+        "@types/react-measure": "^2.0.6",
+        "d3": "^7.8.0",
+        "@dagrejs/dagre": "1.1.2",
+        "mobx": "^6.9.0",
+        "mobx-react": "^7.6.0",
+        "point-in-svg-path": "^1.0.1",
+        "popper.js": "^1.16.1",
+        "react-measure": "^2.3.0",
+        "tslib": "^2.0.0",
+        "webcola": "3.4.0"
+    },
+    "peerDependencies": {
+        "react": "^17 || ^18",
+        "react-dom": "^17 || ^18"
+    },
+    "devDependencies": {
+        "@patternfly/documentation-framework": "6.0.0-alpha.120",
+        "@patternfly/patternfly": "^6.0.0",
+        "@patternfly/patternfly-a11y": "^4.3.1",
+        "@patternfly/react-code-editor": "^6.0.0",
+        "@patternfly/react-table": "^6.0.0",
+        "@types/react": "^18.0.0",
+        "@types/react-dom": "^18.0.0",
+        "camel-case": "^3.0.0",
+        "css": "^2.2.3",
+        "fs-extra": "^6.0.1",
+        "glob": "^7.1.2",
+        "jsdom": "^15.1.0",
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0",
+        "rimraf": "^2.6.2",
+        "typescript": "^4.7.4",
+        "react-monaco-editor": "^0.51.0",
+        "monaco-editor": "^0.34.1"
+    }
+}
diff --git a/packages/module/src/components/contextmenu/ContextMenu.tsx b/packages/module/src/components/contextmenu/ContextMenu.tsx
@@ -31,6 +31,7 @@ const ContextMenu: React.FunctionComponent<ContextMenuProps> = ({
         onSelect={handleOnRequestClose}
         toggle={() => <></>}
         className={css(topologyStyles.topologyContextMenuCDropdownMenu)}
+        popperProps={{ appendTo: 'inline' }}
       >
         {children}
       </Dropdown>