fix conflict

Author: acharyakavita

.changeset/eleven-dogs-laugh.md

@@ -0,0 +1,5 @@
+---
+"victory-core": patch
+---
+
+Refactor victory-accessible-group to a function component

.eslintrc.js

@@ -67,7 +67,6 @@ module.exports = {
         "no-undef": "off",
         "max-nested-callbacks": "off",
         "@typescript-eslint/no-empty-function": "off",
-        "react/prop-types": "off",
       },
     },
     {
@@ -86,6 +85,7 @@ module.exports = {
         "plugin:@typescript-eslint/recommended-requiring-type-checking",
       ],
       rules: {
+        "react/prop-types": "off",
         "no-use-before-define": "off",
         "valid-jsdoc": "off",
         "@typescript-eslint/no-use-before-define": [

.github/workflows/ci.yml

@@ -14,21 +14,16 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [16.x, 18.x]
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
-        with:
-          node-version: ${{ matrix.node-version }}
 
       - name: Check all package.json's and tsconfig.json's are in sync.
         run: |
           pnpm sync
           git diff --no-ext-diff --quiet --exit-code
 
-      - name: Build libraries and distributions ${{ matrix.node-version }}
+      - name: Build libraries and distributions
         run: pnpm build
 
   format:
@@ -37,8 +32,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
-        with:
-          node-version: 18.x
 
       - name: Format
         run: pnpm format
@@ -49,38 +42,26 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
-        with:
-          node-version: 18.x
 
       - name: Lint
         run: pnpm lint
 
   types:
     needs: [build]
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [16.x, 18.x]
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
-        with:
-          node-version: ${{ matrix.node-version }}
 
-      - name: Types Check ${{ matrix.node-version }}
+      - name: Types Check
         run: pnpm types:check
 
   test:
     needs: [build]
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [16.x, 18.x]
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
-        with:
-          node-version: ${{ matrix.node-version }}
 
-      - name: Test ${{ matrix.node-version }}
+      - name: Test
         run: pnpm jest

docs/package.json

@@ -28,7 +28,6 @@
     "fuse.js": "^3.2.1",
     "lodash": "^4.17.19",
     "prismjs": "^1.15.0",
-    "prop-types": "^15.8.1",
     "react": "^16.8.0",
     "react-cool-inview": "^0.5.14",
     "react-copy-to-clipboard": "^5.0.2",

docs/src/content/introduction/index.md

@@ -23,7 +23,7 @@ In this guide, we’ll show you how to get started with Victory and walk you thr
 
 You can do this on your own if you'd like, or you can...
 
-* Clone down [this project we've started for you](https://github.com/FormidableLabs/victory-tutorial) using ```git clone git@github.com:FormidableLabs/victory-tutorial.git```
+* Clone down [this project we've started for you](https://github.com/FormidableLabs/victory-tutorial) using `git clone git@github.com:FormidableLabs/victory-tutorial.git`
 * `cd victory-tutorial`
 * Replace the existing code in the `client.js` file with:
 
@@ -153,6 +153,8 @@ class App extends React.Component {
 ReactDOM.render(<App/>, mountNode);
 ```
 
+While the axes defaults are great, you can see there's some overlap with the y-axis and first bar. Let's fix that in the next section.
+
 #### 6. Customize the axes
 
 Next, let's modify the tick labels on the axes to be a little more descriptive. We can do this by adding and configuring `VictoryAxis` components to our chart, so let's import `VictoryAxis`. Import statements should now look like this:

docs/src/content/introduction/ssr.md

@@ -0,0 +1,37 @@
+---
+id: 1
+title: Server Side Rendering
+category: introduction
+type: docs
+scope: null
+---
+
+# Server Side Rendering
+
+In frameworks such as Next.js 13+, context is fully supported within Client Components, but it cannot be created or consumed directly within Server Components. This is because Server Components have no React state (since they're not interactive), and context is primarily used for rerendering interactive components deep in the tree after some React state has been updated.
+Victory uses `createContext` to perform its operations and it must be rendered client side by adding the `use client` directive in your components when used in a framework with Server Side Component support.
+
+```jsx
+"use client";
+import React from 'react';
+import { VictoryBar, VictoryChart, VictoryTheme } from "victory";
+
+const data = [
+  { quarter: 1, earnings: 13000 },
+  { quarter: 2, earnings: 16500 },
+  { quarter: 3, earnings: 14250 },
+  { quarter: 4, earnings: 19000 }
+];
+
+const App = ()=>{
+  return (
+    <div style={styles.container}>
+      <VictoryChart width={350} theme={VictoryTheme.material}>
+        <VictoryBar data={data} x="quarter" y="earnings" />
+      </VictoryChart>
+    </div>
+  );
+}
+
+export default App;
+```

docs/src/partials/markdown/index.js

@@ -113,6 +113,7 @@ export function renderHeading(props) {
   const slug = text
     .trim()
     .toLowerCase()
+    .replace(/^\d+\.\s*/, "") // remove leading numbers and periods
     .replace(/[^\w\- ]/g, "") // Remove punctuation
     .replace(/\s+/g, "-"); // Replace spaces with a dash
 
@@ -144,7 +145,6 @@ renderHeading.propTypes = {
  * @param {Object} meta - meta
  * @returns {Object} link element
  */
-// eslint-disable-next-line react/no-multi-comp
 export const renderLink = ({ href, children }) => {
   if (/^\w+:/.test(href)) {
     return (
@@ -161,7 +161,7 @@ renderLink.propTypes = {
   href: PropTypes.string,
 };
 
-/* eslint-enable react/prop-types, no-magic-numbers */
+/* eslint-enable no-magic-numbers */
 const Markdown = (props) => {
   const { className, source, scope, theme } = props;
   /* eslint-disable react/prop-types, no-magic-numbers */

packages/victory-area/CHANGELOG.md

@@ -1,5 +1,13 @@
 # victory-area
 
+## 36.9.1
+
+## 36.9.0
+
+### Minor Changes
+
+- Remove prop-types definitions and dependency ([#2758](https://github.com/FormidableLabs/victory/pull/2758))
+
 ## 36.8.6
 
 ### Patch Changes

packages/victory-area/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-area",
-  "version": "36.8.6",
+  "version": "36.9.1",
   "description": "Area Component for Victory",
   "keywords": [
     "data visualization",
@@ -21,9 +21,8 @@
   "license": "MIT",
   "dependencies": {
     "lodash": "^4.17.19",
-    "prop-types": "^15.8.1",
-    "victory-core": "^36.8.6",
-    "victory-vendor": "^36.8.6"
+    "victory-core": "^36.9.1",
+    "victory-vendor": "^36.9.1"
   },
   "peerDependencies": {
     "react": ">=16.6.0"

packages/victory-area/src/area.tsx

@@ -1,10 +1,8 @@
 /* eslint no-magic-numbers: ["error", { "ignore": [-1, 0, 1, 2] }]*/
 import React from "react";
-import PropTypes from "prop-types";
 import * as d3Shape from "victory-vendor/d3-shape";
 import {
   Helpers,
-  CommonProps,
   Path,
   UserProps,
   VictoryCommonPrimitiveProps,
@@ -176,13 +174,6 @@ export const Area: React.FC<AreaProps> = (initialProps) => {
     : area;
 };
 
-Area.propTypes = {
-  ...CommonProps.primitiveProps,
-  groupComponent: PropTypes.element,
-  interpolation: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
-  pathComponent: PropTypes.element,
-};
-
 export interface AreaProps extends VictoryCommonPrimitiveProps {
   horizontal?: VictoryCommonThemeProps["horizontal"];
   groupComponent?: React.ReactElement;

packages/victory-area/src/victory-area.tsx

@@ -1,13 +1,10 @@
-import PropTypes from "prop-types";
 import React from "react";
 import { getBaseProps } from "./helper-methods";
 import { Area } from "./area";
 import {
-  PropTypes as CustomPropTypes,
   Helpers,
   VictoryLabel,
   VictoryContainer,
-  CommonProps,
   DefaultTransitions,
   VictoryClipContainer,
   addEvents,
@@ -71,30 +68,6 @@ class VictoryAreaBase extends React.Component<VictoryAreaProps> {
     "width",
   ];
 
-  static propTypes = {
-    ...CommonProps.baseProps,
-    ...CommonProps.dataProps,
-    interpolation: PropTypes.oneOfType([
-      PropTypes.oneOf([
-        "basis",
-        "cardinal",
-        "catmullRom",
-        "linear",
-        "monotoneX",
-        "monotoneY",
-        "natural",
-        "step",
-        "stepAfter",
-        "stepBefore",
-      ]),
-      PropTypes.func,
-    ]),
-    label: CustomPropTypes.deprecated(
-      PropTypes.string,
-      "Use `labels` instead for individual data labels",
-    ),
-  };
-
   static defaultProps: VictoryAreaProps = {
     containerComponent: <VictoryContainer />,
     dataComponent: <Area />,

packages/victory-axis/CHANGELOG.md

@@ -1,5 +1,13 @@
 # victory-axis
 
+## 36.9.1
+
+## 36.9.0
+
+### Minor Changes
+
+- Remove prop-types definitions and dependency ([#2758](https://github.com/FormidableLabs/victory/pull/2758))
+
 ## 36.8.6
 
 ## 36.8.5

packages/victory-axis/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-axis",
-  "version": "36.8.6",
+  "version": "36.9.1",
   "description": "Axis Component for Victory",
   "keywords": [
     "data visualization",
@@ -21,8 +21,7 @@
   "license": "MIT",
   "dependencies": {
     "lodash": "^4.17.19",
-    "prop-types": "^15.8.1",
-    "victory-core": "^36.8.6"
+    "victory-core": "^36.9.1"
   },
   "peerDependencies": {
     "react": ">=16.6.0"