@mui/x-charts 7.0.0-beta.0 → 7.0.0-beta.2

package/ChartsXAxis/ChartsXAxis.js

@@ -22,7 +22,7 @@ var _geometry = require("../internals/geometry");
 var _useMounted = require("../hooks/useMounted");
 var _getWordsByLines = require("../internals/getWordsByLines");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["scale", "tickNumber"];
+const _excluded = ["scale", "tickNumber", "reverse"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const useUtilityClasses = ownerState => {
@@ -43,6 +43,7 @@ const useUtilityClasses = ownerState => {
 function addLabelDimension(xTicks, {
   tickLabelStyle: style,
   tickLabelInterval,
+  reverse,
   isMounted
 }) {
   const withDimension = xTicks.map(tick => {
@@ -69,8 +70,9 @@ function addLabelDimension(xTicks, {
   }
 
   // Filter label to avoid overlap
-  let textStart = 0;
-  let textEnd = 0;
+  let currentTextLimit = 0;
+  let previouseTextLimit = 0;
+  const direction = reverse ? -1 : 1;
   return withDimension.map((item, labelIndex) => {
     const {
       width,
@@ -82,15 +84,15 @@ function addLabelDimension(xTicks, {
     const textPosition = offset + labelOffset;
     const gapRatio = 1.2; // Ratio applied to the minimal distance to add some margin.
 
-    textStart = textPosition - gapRatio * distance / 2;
-    if (labelIndex > 0 && textStart < textEnd) {
+    currentTextLimit = textPosition - direction * (gapRatio * distance) / 2;
+    if (labelIndex > 0 && direction * currentTextLimit < direction * previouseTextLimit) {
       // Except for the first label, we skip all label that overlap with the last accepted.
-      // Notice that the early return prevents `textEnd` from being updated.
+      // Notice that the early return prevents `previouseTextLimit` from being updated.
       return (0, _extends2.default)({}, item, {
         skipLabel: true
       });
     }
-    textEnd = textPosition + gapRatio * distance / 2;
+    previouseTextLimit = textPosition + direction * (gapRatio * distance) / 2;
     return item;
   });
 }
@@ -124,7 +126,8 @@ function ChartsXAxis(inProps) {
       xAxis: {
         [_ref]: {
           scale: xScale,
-          tickNumber
+          tickNumber,
+          reverse
         }
       }
     } = _React$useContext,
@@ -186,6 +189,7 @@ function ChartsXAxis(inProps) {
   const xTicksWithDimension = addLabelDimension(xTicks, {
     tickLabelStyle: axisTickLabelProps.style,
     tickLabelInterval,
+    reverse,
     isMounted
   });
   const labelRefPoint = {
@@ -249,7 +253,7 @@ process.env.NODE_ENV !== "production" ? ChartsXAxis.propTypes = {
    * The id of the axis to render.
    * If undefined, it will be the first defined axis.
    */
-  axisId: _propTypes.default.string,
+  axisId: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
   /**
    * Override or extend the styles applied to the component.
    */

package/ChartsYAxis/ChartsYAxis.js

@@ -183,7 +183,7 @@ process.env.NODE_ENV !== "production" ? ChartsYAxis.propTypes = {
    * The id of the axis to render.
    * If undefined, it will be the first defined axis.
    */
-  axisId: _propTypes.default.string,
+  axisId: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
   /**
    * Override or extend the styles applied to the component.
    */