Merge branch 'mui:master' into skeleton-loading-overlay

mui · Jul 5, 2024 · ba615d4 · ba615d4
2 parents c92a3a3 + 6429e24
commit ba615d4
Show file tree

Hide file tree

Showing 65 changed files with 2,581 additions and 952 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,8 +5,8 @@ parameters:
     description: Whether to force browserstack usage. We have limited resources on browserstack so the pipeline might decide to skip browserstack if this parameter isn't set to true.
     type: boolean
     default: false
-  react-dist-tag:
-    description: The dist-tag of react to be used
+  react-version:
+    description: The version of react to be used
     type: string
     default: stable
   workflow:
@@ -20,10 +20,10 @@ parameters:
 
 default-job: &default-job
   parameters:
-    react-dist-tag:
-      description: The dist-tag of react to be used
+    react-version:
+      description: The version of react to be used
       type: string
-      default: << pipeline.parameters.react-dist-tag >>
+      default: << pipeline.parameters.react-version >>
     e2e-base-url:
       description: The base url for running end-to-end test
       type: string
@@ -33,7 +33,7 @@ default-job: &default-job
     PLAYWRIGHT_BROWSERS_PATH: /tmp/pw-browsers
     # expose it globally otherwise we have to thread it from each job to the install command
     BROWSERSTACK_FORCE: << pipeline.parameters.browserstack-force >>
-    REACT_DIST_TAG: << parameters.react-dist-tag >>
+    REACT_VERSION: << parameters.react-version >>
   working_directory: /tmp/mui
   docker:
     - image: cimg/node:18.20
@@ -59,6 +59,13 @@ commands:
         description: 'Set to true if you intend to any browser (for example with playwright).'
 
     steps:
+      - run:
+          name: Resolve React version
+          command: |
+            node scripts/useReactVersion.mjs
+            # log a patch for maintainers who want to check out this change
+            git --no-pager diff HEAD
+
       - when:
           condition: << parameters.browsers >>
           steps:
@@ -90,7 +97,17 @@ commands:
             pnpm --version
       - run:
           name: Install js dependencies
-          command: pnpm install
+          command: |
+            echo "React version $REACT_VERSION"
+            if [ $REACT_VERSION == "stable" ];
+            then
+              echo "pnpm install"
+              pnpm install
+            else
+              echo "pnpm install --no-frozen-lockfile"
+              pnpm install --no-frozen-lockfile
+            fi
+
       - when:
           condition: << parameters.browsers >>
           steps:
@@ -146,7 +163,7 @@ jobs:
           command: |
             curl -Os https://uploader.codecov.io/latest/linux/codecov
             chmod +x codecov
-            ./codecov -t ${CODECOV_TOKEN} -Z -F "$REACT_DIST_TAG-jsdom"
+            ./codecov -t ${CODECOV_TOKEN} -Z -F "$REACT_VERSION-jsdom"
   test_lint:
     <<: *default-job
     steps:
@@ -330,3 +347,31 @@ workflows:
       - test_e2e_website:
           requires:
             - checkout
+
+  react-next:
+    when:
+      equal: [react-next, << pipeline.parameters.workflow >>]
+    # triggers:
+    #   - schedule:
+    #       cron: '0 0 * * *'
+    #       filters:
+    #         branches:
+    #           only:
+    #             - master
+    jobs:
+      - test_unit:
+          <<: *default-context
+          react-version: next
+          name: test_unit-react@next
+      - test_browser:
+          <<: *default-context
+          react-version: next
+          name: test_browser-react@next
+      - test_regressions:
+          <<: *default-context
+          react-version: next
+          name: test_regressions-react@next
+      - test_e2e:
+          <<: *default-context
+          react-version: next
+          name: test_e2e-react@next
diff --git a/docs/data/charts/gauge/gauge.md b/docs/data/charts/gauge/gauge.md
@@ -11,7 +11,7 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/meter/
 
 <p class="description">Gauge charts let the user evaluate metrics.</p>
 
-{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
+{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}
 
 ## Basics
 

diff --git a/docs/data/charts/overview/overview.md b/docs/data/charts/overview/overview.md
@@ -9,7 +9,7 @@ packageName: '@mui/x-charts'
 
 <p class="description">A fast and extendable library of react chart components for data visualization.</p>
 
-{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
+{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}
 
 ## Overview
 

diff --git a/docs/data/charts/tooltip/tooltip.md b/docs/data/charts/tooltip/tooltip.md
@@ -17,6 +17,7 @@ The tooltip can be triggered by two kinds of events:
 
 - `'item'`—when the user's mouse hovers over an item on the chart, the tooltip will display data about this specific item.
 - `'axis'`—the user's mouse position is associated with a value of the x-axis. The tooltip will display data about all series at this specific x value.
+- `'none'`—disable the tooltip.
 
 {{"demo": "Interaction.js"}}
 

diff --git a/docs/data/charts/zoom-and-pan/ZoomBarChart.js b/docs/data/charts/zoom-and-pan/ZoomBarChart.js
@@ -0,0 +1,117 @@
+import * as React from 'react';
+import { BarChartPro } from '@mui/x-charts-pro/BarChartPro';
+
+export default function ZoomBarChart() {
+  return (
+    <BarChartPro
+      width={600}
+      height={300}
+      zoom
+      series={[
+        {
+          label: 'Series A',
+          data: data.map((v) => v.y1),
+        },
+        {
+          label: 'Series B',
+          data: data.map((v) => v.y2),
+        },
+      ]}
+    />
+  );
+}
+
+const data = [
+  {
+    y1: 443.28,
+    y2: 153.9,
+  },
+  {
+    y1: 110.5,
+    y2: 217.8,
+  },
+  {
+    y1: 175.23,
+    y2: 286.32,
+  },
+  {
+    y1: 195.97,
+    y2: 325.12,
+  },
+  {
+    y1: 351.77,
+    y2: 144.58,
+  },
+  {
+    y1: 43.253,
+    y2: 146.51,
+  },
+  {
+    y1: 376.34,
+    y2: 309.69,
+  },
+  {
+    y1: 31.514,
+    y2: 236.38,
+  },
+  {
+    y1: 231.31,
+    y2: 440.72,
+  },
+  {
+    y1: 108.04,
+    y2: 20.29,
+  },
+  {
+    y1: 321.77,
+    y2: 484.17,
+  },
+  {
+    y1: 120.18,
+    y2: 54.962,
+  },
+  {
+    y1: 366.2,
+    y2: 418.5,
+  },
+  {
+    y1: 451.45,
+    y2: 181.32,
+  },
+  {
+    y1: 294.8,
+    y2: 440.9,
+  },
+  {
+    y1: 121.83,
+    y2: 273.52,
+  },
+  {
+    y1: 287.7,
+    y2: 346.7,
+  },
+  {
+    y1: 134.06,
+    y2: 74.528,
+  },
+  {
+    y1: 104.5,
+    y2: 150.9,
+  },
+  {
+    y1: 413.07,
+    y2: 26.483,
+  },
+  {
+    y1: 74.68,
+    y2: 333.2,
+  },
+  {
+    y1: 360.6,
+    y2: 422.0,
+  },
+  {
+    y1: 330.72,
+    y2: 488.06,
+  },
+];
diff --git a/docs/data/charts/zoom-and-pan/ZoomBarChart.tsx b/docs/data/charts/zoom-and-pan/ZoomBarChart.tsx
@@ -0,0 +1,117 @@
+import * as React from 'react';
+import { BarChartPro } from '@mui/x-charts-pro/BarChartPro';
+
+export default function ZoomBarChart() {
+  return (
+    <BarChartPro
+      width={600}
+      height={300}
+      zoom
+      series={[
+        {
+          label: 'Series A',
+          data: data.map((v) => v.y1),
+        },
+        {
+          label: 'Series B',
+          data: data.map((v) => v.y2),
+        },
+      ]}
+    />
+  );
+}
+
+const data = [
+  {
+    y1: 443.28,
+    y2: 153.9,
+  },
+  {
+    y1: 110.5,
+    y2: 217.8,
+  },
+  {
+    y1: 175.23,
+    y2: 286.32,
+  },
+  {
+    y1: 195.97,
+    y2: 325.12,
+  },
+  {
+    y1: 351.77,
+    y2: 144.58,
+  },
+  {
+    y1: 43.253,
+    y2: 146.51,
+  },
+  {
+    y1: 376.34,
+    y2: 309.69,
+  },
+  {
+    y1: 31.514,
+    y2: 236.38,
+  },
+  {
+    y1: 231.31,
+    y2: 440.72,
+  },
+  {
+    y1: 108.04,
+    y2: 20.29,
+  },
+  {
+    y1: 321.77,
+    y2: 484.17,
+  },
+  {
+    y1: 120.18,
+    y2: 54.962,
+  },
+  {
+    y1: 366.2,
+    y2: 418.5,
+  },
+  {
+    y1: 451.45,
+    y2: 181.32,
+  },
+  {
+    y1: 294.8,
+    y2: 440.9,
+  },
+  {
+    y1: 121.83,
+    y2: 273.52,
+  },
+  {
+    y1: 287.7,
+    y2: 346.7,
+  },
+  {
+    y1: 134.06,
+    y2: 74.528,
+  },
+  {
+    y1: 104.5,
+    y2: 150.9,
+  },
+  {
+    y1: 413.07,
+    y2: 26.483,
+  },
+  {
+    y1: 74.68,
+    y2: 333.2,
+  },
+  {
+    y1: 360.6,
+    y2: 422.0,
+  },
+  {
+    y1: 330.72,
+    y2: 488.06,
+  },
+];
diff --git a/docs/data/charts/zoom-and-pan/ZoomBarChart.tsx.preview b/docs/data/charts/zoom-and-pan/ZoomBarChart.tsx.preview
@@ -0,0 +1,15 @@
+<BarChartPro
+  width={600}
+  height={300}
+  zoom
+  series={[
+    {
+      label: 'Series A',
+      data: data.map((v) => v.y1),
+    },
+    {
+      label: 'Series B',
+      data: data.map((v) => v.y2),
+    },
+  ]}
+/>