Revert "Merge remote-tracking branch 'upstream/main' into v6" (#9791)

This reverts commit 45fa441. Co-authored-by: Titani <[email protected]>
patternfly · Nov 1, 2023 · b7e8065 · b7e8065
1 parent 45fa441
commit b7e8065
Show file tree

Hide file tree

Showing 336 changed files with 9,416 additions and 11,116 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -10,8 +10,7 @@ module.exports = {
   ],
   roots: ['<rootDir>/packages'],
   transform: {
-    '^.+\\.[jt]sx?$': 'babel-jest',
-    '^.+\\.svg$': 'jest-transform-stub'
+    '^.+\\.[jt]sx?$': 'babel-jest'
   },
   setupFilesAfterEnv: ['<rootDir>/packages/testSetup.ts'],
   transformIgnorePatterns: ['node_modules/(?!@patternfly|@novnc|@popperjs|lodash|monaco-editor|react-monaco-editor)'],

diff --git a/package.json b/package.json
@@ -37,14 +37,13 @@
     "@octokit/rest": "^20.0.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
-    "@testing-library/user-event": "14.5.1",
-    "@types/jest": "29.5.5",
+    "@testing-library/user-event": "14.4.3",
+    "@types/jest": "29.5.3",
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "@typescript-eslint/eslint-plugin": "^5.59.2",
     "@typescript-eslint/parser": "^5.59.2",
     "babel-jest": "^27.2.5",
-    "jest-transform-stub": "^2.0.0",
     "concurrently": "^7.6.0",
     "eslint": "^8.39.0",
     "eslint-plugin-markdown": "^3.0.0",

diff --git a/packages/eslint-plugin-patternfly-react/CHANGELOG.md b/packages/eslint-plugin-patternfly-react/CHANGELOG.md
@@ -9,14 +9,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 - Release alphas from v6 and rebase from main ([#9692](https://github.com/patternfly/patternfly-react/issues/9692)) ([bb022ff](https://github.com/patternfly/patternfly-react/commit/bb022ffc65da8e8c5b5c984412f936cea9424676)), closes [#9651](https://github.com/patternfly/patternfly-react/issues/9651) [#9627](https://github.com/patternfly/patternfly-react/issues/9627) [#9555](https://github.com/patternfly/patternfly-react/issues/9555) [#9543](https://github.com/patternfly/patternfly-react/issues/9543) [#9578](https://github.com/patternfly/patternfly-react/issues/9578) [#9519](https://github.com/patternfly/patternfly-react/issues/9519) [#9603](https://github.com/patternfly/patternfly-react/issues/9603) [#9655](https://github.com/patternfly/patternfly-react/issues/9655) [#9614](https://github.com/patternfly/patternfly-react/issues/9614) [#9606](https://github.com/patternfly/patternfly-react/issues/9606) [#9628](https://github.com/patternfly/patternfly-react/issues/9628) [#9635](https://github.com/patternfly/patternfly-react/issues/9635) [#9649](https://github.com/patternfly/patternfly-react/issues/9649) [#9642](https://github.com/patternfly/patternfly-react/issues/9642) [#9633](https://github.com/patternfly/patternfly-react/issues/9633) [#9637](https://github.com/patternfly/patternfly-react/issues/9637) [#9584](https://github.com/patternfly/patternfly-react/issues/9584) [#9284](https://github.com/patternfly/patternfly-react/issues/9284)
 
-# [5.2.0-prerelease.0](https://github.com/patternfly/patternfly-react/compare/eslint-plugin-patternfly-react@[email protected]) (2023-10-05)
-
-**Note:** Version bump only for package eslint-plugin-patternfly-react
-
-## 5.1.1 (2023-10-05)
-
-**Note:** Version bump only for package eslint-plugin-patternfly-react
-
 ## 5.1.1-prerelease.1 (2023-08-29)
 
 ### Bug Fixes

diff --git a/packages/eslint-plugin-patternfly-react/package.json b/packages/eslint-plugin-patternfly-react/package.json
@@ -1,7 +1,6 @@
 {
   "name": "eslint-plugin-patternfly-react",
   "version": "6.0.0-alpha.1",
-  "version": "5.2.0-prerelease.0",
   "private": false,
   "main": "./lib/index.js",
   "license": "MIT",

diff --git a/packages/react-charts/CHANGELOG.md b/packages/react-charts/CHANGELOG.md
@@ -19,52 +19,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @patternfly/react-charts
 
-# 7.2.0-prerelease.5 (2023-10-26)
-
-**Note:** Version bump only for package @patternfly/react-charts
-
-# 7.2.0-prerelease.4 (2023-10-10)
-
-**Note:** Version bump only for package @patternfly/react-charts
-
-# [7.2.0-prerelease.3](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-10)
-
-**Note:** Version bump only for package @patternfly/react-charts
-
-# 7.2.0-prerelease.2 (2023-10-09)
-
-**Note:** Version bump only for package @patternfly/react-charts
-
-# [7.2.0-prerelease.1](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-09)
-
-### Bug Fixes
-
-- **charts:** legendAllowWrap function generates an null error ([#9719](https://github.com/patternfly/patternfly-react/issues/9719)) ([5b4cbf4](https://github.com/patternfly/patternfly-react/commit/5b4cbf41bf11785ffe66dc263c7c26e61d25cacd))
-
-# [7.2.0-prerelease.0](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-05)
-
-**Note:** Version bump only for package @patternfly/react-charts
-
-## [7.1.1](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-05)
-
-**Note:** Version bump only for package @patternfly/react-charts
-
-## 7.1.1-prerelease.10 (2023-10-03)
-
-### Bug Fixes
-
-- whitespace changes to trigger prereleases ([#9702](https://github.com/patternfly/patternfly-react/issues/9702)) ([741c248](https://github.com/patternfly/patternfly-react/commit/741c24825b503e116c77cf304aa3e4e3a9ff7841))
-
-## [7.1.1-prerelease.9](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-09-22)
-
-### Features
-
-- **charts:** add RTL legend support ([#9570](https://github.com/patternfly/patternfly-react/issues/9570)) ([99d8d97](https://github.com/patternfly/patternfly-react/commit/99d8d975eeb2d562357cdcaa37502748d5794564))
-
-## 7.1.1-prerelease.8 (2023-09-21)
-
-**Note:** Version bump only for package @patternfly/react-charts
-
 ## [7.1.1-prerelease.7](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-09-18)
 
 **Note:** Version bump only for package @patternfly/react-charts

diff --git a/packages/react-charts/README.md b/packages/react-charts/README.md
@@ -89,4 +89,4 @@ yarn test packages/react-charts
 ```
 
 [patternfly-4]: https://github.com/patternfly/patternfly
-[docs]: https://react-staging.patternfly.org/
+[docs]: https://patternfly-react.surge.sh/
diff --git a/packages/react-charts/src/components/Chart/Chart.tsx b/packages/react-charts/src/components/Chart/Chart.tsx
@@ -627,7 +627,7 @@ export const Chart: React.FunctionComponent<ChartProps> = ({
   // Callback to compliment legendAllowWrap
   const computedLegend = getLegend();
   useEffect(() => {
-    if (computedLegend?.props && typeof legendAllowWrap === 'function') {
+    if (typeof legendAllowWrap === 'function') {
       const extraHeight = getLegendItemsExtraHeight({
         legendData: computedLegend.props.data,
         legendOrientation: computedLegend.props.orientation,

diff --git a/packages/react-charts/src/components/ChartPie/ChartPie.tsx b/packages/react-charts/src/components/ChartPie/ChartPie.tsx
@@ -651,7 +651,7 @@ export const ChartPie: React.FunctionComponent<ChartPieProps> = ({
   // Callback to compliment legendAllowWrap
   const computedLegend = getLegend();
   useEffect(() => {
-    if (computedLegend?.props && typeof legendAllowWrap === 'function') {
+    if (typeof legendAllowWrap === 'function') {
       const extraHeight = getLegendItemsExtraHeight({
         legendData: computedLegend.props.data,
         legendOrientation: computedLegend.props.orientation,

diff --git a/packages/react-charts/src/components/ResizeObserver/examples/resizeObserver.md b/packages/react-charts/src/components/ResizeObserver/examples/resizeObserver.md
@@ -161,24 +161,6 @@ class MultiColorChart extends React.Component {
         this.setState({ width: this.containerRef.current.clientWidth });
       }
     };
-    this.handleLegendAllowWrap = (extraHeight) => {
-      if (extraHeight !== this.state.extraHeight) {
-        this.setState({ extraHeight });
-      }
-    }
-    this.getHeight = (baseHeight) => {
-      const { extraHeight } = this.state;
-      return baseHeight + extraHeight;
-    };
-    this.getPadding = () => {
-      const { extraHeight } = this.state;
-      return {
-        bottom: 100 + extraHeight, // Adjusted to accomodate legend
-        left: 50,
-        right: 50,
-        top: 50,
-      };
-    };
   }
 
   componentDidMount() {
@@ -192,11 +174,11 @@ class MultiColorChart extends React.Component {
 
   render() {
     const { width } = this.state;
-    const height = this.getHeight(250);
+    const itemsPerRow = width > 650 ? 4 : 2;
 
     return (
       <div ref={this.containerRef}>
-        <div style={{ height: height + 'px' }}>
+        <div style={{ height: '250px' }}>
           <Chart
             ariaDesc="Average number of pets"
             ariaTitle="Area chart example"
@@ -206,27 +188,32 @@ class MultiColorChart extends React.Component {
                 constrainToVisibleArea
               />
             }
-            legendAllowWrap={this.handleLegendAllowWrap}
             legendPosition="bottom-left"
             legendComponent={
               <ChartLegend
                 data={[
                   { name: 'Cats' },
+                  { name: 'Birds' },
                   {
                     name: 'Cats Threshold',
                     symbol: { fill: chart_color_blue_300.var, type: 'threshold' }
                   },
-                  { name: 'Birds' },
                   {
                     name: 'Birds Threshold',
                     symbol: { fill: chart_color_orange_300.var, type: 'threshold' }
                   }
                 ]}
+                itemsPerRow={itemsPerRow}
               />
             }
-            height={height}
+            height={250}
             name="chart2"
-            padding={this.getPadding()}
+            padding={{
+              bottom: 100, // Adjusted to accomodate legend
+              left: 50,
+              right: 50,
+              top: 50
+            }}
             maxDomain={{ y: 9 }}
             themeColor={ChartThemeColor.multiUnordered}
             width={width}

diff --git a/packages/react-code-editor/CHANGELOG.md b/packages/react-code-editor/CHANGELOG.md
@@ -45,134 +45,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @patternfly/react-code-editor
 
-# [5.2.0-prerelease.19](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-30)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.18](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-27)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.17](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-27)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.16](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-27)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.15](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-26)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.14](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-23)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.13](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-20)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.12](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-18)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.11](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-17)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.10](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-16)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.9](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-16)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.8](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-16)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.7](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-16)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.6](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-12)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.5](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-10)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.4](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-10)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.3](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-10)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# 5.2.0-prerelease.2 (2023-10-09)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-# [5.2.0-prerelease.1](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-09)
-
-### Bug Fixes
-
-- **CodeEditor:** hide button and link when read-only ([#9668](https://github.com/patternfly/patternfly-react/issues/9668)) ([0346933](https://github.com/patternfly/patternfly-react/commit/0346933cb61a3b11a2591acbde4760f58abffbcb))
-
-# [5.2.0-prerelease.0](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-05)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-## [5.1.1](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-10-05)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-## 5.1.1-prerelease.23 (2023-10-03)
-
-### Bug Fixes
-
-- whitespace changes to trigger prereleases ([#9702](https://github.com/patternfly/patternfly-react/issues/9702)) ([741c248](https://github.com/patternfly/patternfly-react/commit/741c24825b503e116c77cf304aa3e4e3a9ff7841))
-
-## [5.1.1-prerelease.22](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-09-25)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-## [5.1.1-prerelease.21](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-09-25)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-## [5.1.1-prerelease.20](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-09-22)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-## [5.1.1-prerelease.19](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-09-21)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-## [5.1.1-prerelease.18](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-09-21)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-## [5.1.1-prerelease.17](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-09-21)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-## [5.1.1-prerelease.16](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-09-21)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-## [5.1.1-prerelease.15](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-09-21)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
-## [5.1.1-prerelease.14](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-09-20)
-
-**Note:** Version bump only for package @patternfly/react-code-editor
-
 ## [5.1.1-prerelease.13](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2023-09-19)
 
 ### Bug Fixes