victory-core 36.6.7 → 36.6.10

package/es/v37/victory-state/victory-provider.js

@@ -144,5 +144,5 @@ export function useVictoryProviderSync(props) {
 
   React.useEffect(function () {
     updateChildProps(myId, props);
-  }, [updateChildProps, props]);
+  }, [updateChildProps, props, myId]);
 }

package/es/victory-util/textsize.d.ts

@@ -7,14 +7,13 @@
 export declare const convertLengthToPixels: (length: string, fontSize?: number) => number;
 export interface TextSizeStyleInterface {
     angle?: number;
-    characterConstant?: string;
     fontFamily?: string;
     fontSize?: number | string;
     letterSpacing?: string;
     lineHeight?: number;
 }
 export declare const _approximateTextSizeInternal: {
-    impl: (text: string | string[], style?: TextSizeStyleInterface) => {
+    impl: (text: string | string[], style?: TextSizeStyleInterface, __debugForceApproximate?: boolean) => {
         width: number;
         height: number;
     };

package/es/victory-util/textsize.js

@@ -1,6 +1,15 @@
+import _memoize from "lodash/memoize";
 import _defaults from "lodash/defaults";
 import _assign from "lodash/assign";
 
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -253,21 +262,99 @@ var _approximateTextHeightInternal = function (text, style) {
   }, 0);
 };
 
+var _approximateDimensionsInternal = function (text, style) {
+  var angle = Array.isArray(style) ? style[0] && style[0].angle : style && style.angle;
+
+  var height = _approximateTextHeightInternal(text, style);
+
+  var width = _approximateTextWidthInternal(text, style);
+
+  var widthWithRotate = angle ? _getSizeWithRotate(width, height, angle) : width;
+  var heightWithRotate = angle ? _getSizeWithRotate(height, width, angle) : height;
+  return {
+    width: widthWithRotate,
+    height: heightWithRotate * coefficients.heightOverlapCoef
+  };
+};
+
+var _getMeasurementContainer = _memoize(function () {
+  var element = document.createElementNS("http://www.w3.org/2000/svg", "svg");
+  element.setAttribute("xlink", "http://www.w3.org/1999/xlink");
+  var containerElement = document.createElementNS("http://www.w3.org/2000/svg", "text");
+  element.appendChild(containerElement);
+  element.style.position = "fixed";
+  element.style.top = "-9999px";
+  element.style.left = "-9999px";
+  document.body.appendChild(element);
+  return containerElement;
+});
+
+var styleToKeyComponent = function (style) {
+  if (!style) {
+    return "null";
+  }
+
+  return "".concat(style.angle, ":").concat(style.fontFamily, ":").concat(style.fontSize, ":").concat(style.letterSpacing, ":").concat(style.lineHeight);
+};
+
+var _measureDimensionsInternal = _memoize(function (text, style) {
+  var containerElement = _getMeasurementContainer();
+
+  var lines = _splitToLines(text);
+
+  var heightAcc = 0;
+
+  for (var _ref of lines.entries()) {
+    var _ref2 = _slicedToArray(_ref, 2);
+
+    var i = _ref2[0];
+    var line = _ref2[1];
+    var textElement = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
+
+    var params = _prepareParams(style, i);
+
+    textElement.style.fontFamily = params.fontFamily;
+    textElement.style.transform = "rotate(".concat(params.angle, ")");
+    textElement.style.fontSize = "".concat(params.fontSize, "px");
+    textElement.style.lineHeight = params.lineHeight;
+    textElement.style.fontFamily = params.fontFamily;
+    textElement.style.letterSpacing = params.letterSpacing;
+    textElement.textContent = line;
+    textElement.setAttribute("x", "0");
+    textElement.setAttribute("y", "".concat(heightAcc));
+    heightAcc += params.lineHeight * params.fontSize;
+    containerElement.appendChild(textElement);
+  }
+
+  var _containerElement$get = containerElement.getBoundingClientRect(),
+      width = _containerElement$get.width,
+      height = _containerElement$get.height;
+
+  containerElement.innerHTML = "";
+  return {
+    width: width,
+    height: height
+  };
+}, function (text, style) {
+  var totalText = Array.isArray(text) ? text.join() : text;
+  var totalStyle = Array.isArray(style) ? style.map(styleToKeyComponent).join() : styleToKeyComponent(style);
+  return "".concat(totalText, "::").concat(totalStyle);
+});
+
 // Stubbable implementation.
 export var _approximateTextSizeInternal = {
   impl: function (text, style) {
-    var angle = Array.isArray(style) ? style[0] && style[0].angle : style && style.angle;
+    var __debugForceApproximate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
 
-    var height = _approximateTextHeightInternal(text, style);
+    // Attempt to first measure the element in DOM. If there is no DOM, fallback
+    // to the less accurate approximation algorithm.
+    var isClient = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 
-    var width = _approximateTextWidthInternal(text, style);
+    if (!isClient || __debugForceApproximate) {
+      return _approximateDimensionsInternal(text, style);
+    }
 
-    var widthWithRotate = angle ? _getSizeWithRotate(width, height, angle) : width;
-    var heightWithRotate = angle ? _getSizeWithRotate(height, width, angle) : height;
-    return {
-      width: widthWithRotate,
-      height: heightWithRotate * coefficients.heightOverlapCoef
-    };
+    return _measureDimensionsInternal(text, style);
   }
 };
 /**

package/lib/v37/victory-state/victory-provider.js

@@ -171,5 +171,5 @@ function useVictoryProviderSync(props) {
 
   React.useEffect(function () {
     updateChildProps(myId, props);
-  }, [updateChildProps, props]);
+  }, [updateChildProps, props, myId]);
 }

package/lib/victory-util/textsize.d.ts

@@ -7,14 +7,13 @@
 export declare const convertLengthToPixels: (length: string, fontSize?: number) => number;
 export interface TextSizeStyleInterface {
     angle?: number;
-    characterConstant?: string;
     fontFamily?: string;
     fontSize?: number | string;
     letterSpacing?: string;
     lineHeight?: number;
 }
 export declare const _approximateTextSizeInternal: {
-    impl: (text: string | string[], style?: TextSizeStyleInterface) => {
+    impl: (text: string | string[], style?: TextSizeStyleInterface, __debugForceApproximate?: boolean) => {
         width: number;
         height: number;
     };

package/lib/victory-util/textsize.js

@@ -5,12 +5,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.convertLengthToPixels = exports.approximateTextSize = exports._approximateTextSizeInternal = void 0;
 
+var _memoize2 = _interopRequireDefault(require("lodash/memoize"));
+
 var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
 
 var _assign2 = _interopRequireDefault(require("lodash/assign"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -263,21 +273,99 @@ var _approximateTextHeightInternal = function (text, style) {
   }, 0);
 };
 
+var _approximateDimensionsInternal = function (text, style) {
+  var angle = Array.isArray(style) ? style[0] && style[0].angle : style && style.angle;
+
+  var height = _approximateTextHeightInternal(text, style);
+
+  var width = _approximateTextWidthInternal(text, style);
+
+  var widthWithRotate = angle ? _getSizeWithRotate(width, height, angle) : width;
+  var heightWithRotate = angle ? _getSizeWithRotate(height, width, angle) : height;
+  return {
+    width: widthWithRotate,
+    height: heightWithRotate * coefficients.heightOverlapCoef
+  };
+};
+
+var _getMeasurementContainer = (0, _memoize2.default)(function () {
+  var element = document.createElementNS("http://www.w3.org/2000/svg", "svg");
+  element.setAttribute("xlink", "http://www.w3.org/1999/xlink");
+  var containerElement = document.createElementNS("http://www.w3.org/2000/svg", "text");
+  element.appendChild(containerElement);
+  element.style.position = "fixed";
+  element.style.top = "-9999px";
+  element.style.left = "-9999px";
+  document.body.appendChild(element);
+  return containerElement;
+});
+
+var styleToKeyComponent = function (style) {
+  if (!style) {
+    return "null";
+  }
+
+  return "".concat(style.angle, ":").concat(style.fontFamily, ":").concat(style.fontSize, ":").concat(style.letterSpacing, ":").concat(style.lineHeight);
+};
+
+var _measureDimensionsInternal = (0, _memoize2.default)(function (text, style) {
+  var containerElement = _getMeasurementContainer();
+
+  var lines = _splitToLines(text);
+
+  var heightAcc = 0;
+
+  for (var _ref of lines.entries()) {
+    var _ref2 = _slicedToArray(_ref, 2);
+
+    var i = _ref2[0];
+    var line = _ref2[1];
+    var textElement = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
+
+    var params = _prepareParams(style, i);
+
+    textElement.style.fontFamily = params.fontFamily;
+    textElement.style.transform = "rotate(".concat(params.angle, ")");
+    textElement.style.fontSize = "".concat(params.fontSize, "px");
+    textElement.style.lineHeight = params.lineHeight;
+    textElement.style.fontFamily = params.fontFamily;
+    textElement.style.letterSpacing = params.letterSpacing;
+    textElement.textContent = line;
+    textElement.setAttribute("x", "0");
+    textElement.setAttribute("y", "".concat(heightAcc));
+    heightAcc += params.lineHeight * params.fontSize;
+    containerElement.appendChild(textElement);
+  }
+
+  var _containerElement$get = containerElement.getBoundingClientRect(),
+      width = _containerElement$get.width,
+      height = _containerElement$get.height;
+
+  containerElement.innerHTML = "";
+  return {
+    width: width,
+    height: height
+  };
+}, function (text, style) {
+  var totalText = Array.isArray(text) ? text.join() : text;
+  var totalStyle = Array.isArray(style) ? style.map(styleToKeyComponent).join() : styleToKeyComponent(style);
+  return "".concat(totalText, "::").concat(totalStyle);
+});
+
 // Stubbable implementation.
 var _approximateTextSizeInternal = {
   impl: function (text, style) {
-    var angle = Array.isArray(style) ? style[0] && style[0].angle : style && style.angle;
+    var __debugForceApproximate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
 
-    var height = _approximateTextHeightInternal(text, style);
+    // Attempt to first measure the element in DOM. If there is no DOM, fallback
+    // to the less accurate approximation algorithm.
+    var isClient = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 
-    var width = _approximateTextWidthInternal(text, style);
+    if (!isClient || __debugForceApproximate) {
+      return _approximateDimensionsInternal(text, style);
+    }
 
-    var widthWithRotate = angle ? _getSizeWithRotate(width, height, angle) : width;
-    var heightWithRotate = angle ? _getSizeWithRotate(height, width, angle) : height;
-    return {
-      width: widthWithRotate,
-      height: heightWithRotate * coefficients.heightOverlapCoef
-    };
+    return _measureDimensionsInternal(text, style);
   }
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-core",
-  "version": "36.6.7",
+  "version": "36.6.10",
   "description": "Victory Core",
   "keywords": [
     "data visualization",
@@ -10,7 +10,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/formidablelabs/victory.git"
+    "url": "https://github.com/FormidableLabs/victory"
   },
   "homepage": "https://formidable.com/open-source/victory",
   "sideEffects": false,
@@ -23,7 +23,7 @@
     "lodash": "^4.17.21",
     "prop-types": "^15.8.1",
     "react-fast-compare": "^3.2.0",
-    "victory-vendor": "^36.6.7"
+    "victory-vendor": "^36.6.10"
   },
   "peerDependencies": {
     "react": ">=16.6.0"
@@ -34,6 +34,9 @@
     "victory-core": "*",
     "victory-line": "*"
   },
+  "publishConfig": {
+    "provenance": true
+  },
   "wireit": {
     "###            THESE WIREIT CONFIGS ARE GENERATED        ####": {},
     "###            DO NOT MODIFY THESE MANUALLY              ####": {},

package/src/v37/victory-state/helpers/get-data.ts

@@ -1,4 +1,3 @@
-import * as React from "react";
 import { get, isNil, orderBy } from "lodash";
 import { Datum, DatumValue } from "../../../types/prop-types";
 import { isKeyValueObject } from "../../../victory-util/type-helpers";

package/src/v37/victory-state/victory-provider.tsx

@@ -99,6 +99,8 @@ function useNormalizedProps(): ContextType {
 
 export function VictoryProvider({
   children,
+  // Disabled due to TODO below which will require this obj. spread
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   ...providerProps
 }: VictoryProviderProps) {
   const value = useNormalizedProps();
@@ -146,5 +148,5 @@ export function useVictoryProviderSync(props: VictoryCalculatedStateProps) {
 
   React.useEffect(() => {
     updateChildProps(myId, props);
-  }, [updateChildProps, props]);
+  }, [updateChildProps, props, myId]);
 }

package/src/victory-util/textsize.ts

@@ -1,6 +1,6 @@
 // http://www.pearsonified.com/2012/01/characters-per-line.php
 /* eslint-disable no-magic-numbers */
-import { assign, defaults } from "lodash";
+import { assign, defaults, memoize } from "lodash";
 
 // Based on measuring specific character widths
 // as in the following example https://bl.ocks.org/tophtucker/62f93a4658387bb61e4510c37e2e97cf
@@ -243,9 +243,97 @@ const _approximateTextHeightInternal = (text: string | string[], style) => {
   }, 0);
 };
 
+const _approximateDimensionsInternal = (
+  text: string | string[],
+  style?: TextSizeStyleInterface,
+) => {
+  const angle = Array.isArray(style)
+    ? style[0] && style[0].angle
+    : style && style.angle;
+  const height = _approximateTextHeightInternal(text, style);
+  const width = _approximateTextWidthInternal(text, style);
+  const widthWithRotate = angle
+    ? _getSizeWithRotate(width, height, angle)
+    : width;
+  const heightWithRotate = angle
+    ? _getSizeWithRotate(height, width, angle)
+    : height;
+  return {
+    width: widthWithRotate,
+    height: heightWithRotate * coefficients.heightOverlapCoef,
+  };
+};
+
+const _getMeasurementContainer = memoize(() => {
+  const element = document.createElementNS("http://www.w3.org/2000/svg", "svg");
+  element.setAttribute("xlink", "http://www.w3.org/1999/xlink");
+
+  const containerElement = document.createElementNS(
+    "http://www.w3.org/2000/svg",
+    "text",
+  );
+  element.appendChild(containerElement);
+
+  element.style.position = "fixed";
+  element.style.top = "-9999px";
+  element.style.left = "-9999px";
+
+  document.body.appendChild(element);
+
+  return containerElement;
+});
+
+const styleToKeyComponent = (style) => {
+  if (!style) {
+    return "null";
+  }
+
+  return `${style.angle}:${style.fontFamily}:${style.fontSize}:${style.letterSpacing}:${style.lineHeight}`;
+};
+
+const _measureDimensionsInternal = memoize(
+  (text: string | string[], style?: TextSizeStyleInterface) => {
+    const containerElement = _getMeasurementContainer();
+
+    const lines = _splitToLines(text);
+    let heightAcc = 0;
+    for (const [i, line] of lines.entries()) {
+      const textElement = document.createElementNS(
+        "http://www.w3.org/2000/svg",
+        "tspan",
+      );
+      const params = _prepareParams(style, i);
+      textElement.style.fontFamily = params.fontFamily;
+      textElement.style.transform = `rotate(${params.angle})`;
+      textElement.style.fontSize = `${params.fontSize}px`;
+      textElement.style.lineHeight = params.lineHeight;
+      textElement.style.fontFamily = params.fontFamily;
+      textElement.style.letterSpacing = params.letterSpacing;
+      textElement.textContent = line;
+      textElement.setAttribute("x", "0");
+      textElement.setAttribute("y", `${heightAcc}`);
+      heightAcc += params.lineHeight * params.fontSize;
+
+      containerElement.appendChild(textElement);
+    }
+
+    const { width, height } = containerElement.getBoundingClientRect();
+
+    containerElement.innerHTML = "";
+
+    return { width, height };
+  },
+  (text, style) => {
+    const totalText = Array.isArray(text) ? text.join() : text;
+    const totalStyle = Array.isArray(style)
+      ? style.map(styleToKeyComponent).join()
+      : styleToKeyComponent(style);
+    return `${totalText}::${totalStyle}`;
+  },
+);
+
 export interface TextSizeStyleInterface {
   angle?: number;
-  characterConstant?: string;
   fontFamily?: string;
   fontSize?: number | string;
   letterSpacing?: string;
@@ -254,22 +342,23 @@ export interface TextSizeStyleInterface {
 
 // Stubbable implementation.
 export const _approximateTextSizeInternal = {
-  impl: (text: string | string[], style?: TextSizeStyleInterface) => {
-    const angle = Array.isArray(style)
-      ? style[0] && style[0].angle
-      : style && style.angle;
-    const height = _approximateTextHeightInternal(text, style);
-    const width = _approximateTextWidthInternal(text, style);
-    const widthWithRotate = angle
-      ? _getSizeWithRotate(width, height, angle)
-      : width;
-    const heightWithRotate = angle
-      ? _getSizeWithRotate(height, width, angle)
-      : height;
-    return {
-      width: widthWithRotate,
-      height: heightWithRotate * coefficients.heightOverlapCoef,
-    };
+  impl: (
+    text: string | string[],
+    style?: TextSizeStyleInterface,
+    __debugForceApproximate = false,
+  ) => {
+    // Attempt to first measure the element in DOM. If there is no DOM, fallback
+    // to the less accurate approximation algorithm.
+    const isClient =
+      typeof window !== "undefined" &&
+      typeof window.document !== "undefined" &&
+      typeof window.document.createElement !== "undefined";
+
+    if (!isClient || __debugForceApproximate) {
+      return _approximateDimensionsInternal(text, style);
+    }
+
+    return _measureDimensionsInternal(text, style);
   },
 };