victory-core 37.3.1 → 37.3.3

package/lib/victory-util/user-props.d.ts

@@ -1,5 +1,5 @@
 import * as React from "react";
-declare type SafeAttribute = string;
+type SafeAttribute = string;
 /**
  * Asserts that value is not null or undefined, throwing an error if it is.
  * @param value The value to assert
@@ -14,7 +14,7 @@ export declare function assert<T>(value: T, message?: string): asserts value is
  * @param {Object} props: props to be filtered against USER_PROPS_SAFELIST
  * @returns {Object}: object containing remaining acceptable props
  */
-export declare const getSafeUserProps: <T>(props: T) => Record<SafeAttribute, string>;
+export declare const getSafeUserProps: <T>(props: T extends Record<string, any> ? T : never) => Record<SafeAttribute, string>;
 /**
  * Wraps a component and adds safe user props
  *

package/lib/victory-util/wrapper.js

@@ -20,11 +20,11 @@ exports.getStringsFromChildrenCategories = getStringsFromChildrenCategories;
 exports.getStringsFromData = getStringsFromData;
 exports.getStyle = getStyle;
 exports.getWidth = getWidth;
-var _uniqBy2 = _interopRequireDefault(require("lodash/uniqBy"));
-var _groupBy2 = _interopRequireDefault(require("lodash/groupBy"));
-var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
-var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
 var _react = _interopRequireDefault(require("react"));
+var _defaults = _interopRequireDefault(require("lodash/defaults"));
+var _uniq = _interopRequireDefault(require("lodash/uniq"));
+var _groupBy = _interopRequireDefault(require("lodash/groupBy"));
+var _uniqBy = _interopRequireDefault(require("lodash/uniqBy"));
 var Axis = _interopRequireWildcard(require("./axis"));
 var Style = _interopRequireWildcard(require("./style"));
 var Data = _interopRequireWildcard(require("./data"));
@@ -133,10 +133,10 @@ function getDataFromChildren(props, childComponents) {
     }, datum));
   };
   const stacked = children.filter(c => c.type && c.type.role === "stack").length;
-  const combine = (memo, val) => memo.concat((0, _uniqBy2.default)(val, "_group"));
+  const combine = (memo, val) => memo.concat((0, _uniqBy.default)(val, "_group"));
   const datasets = Helpers.reduceChildren(children, iteratee, props, [], combine);
   const group = stacked ? "_group" : "_stack";
-  return Object.values((0, _groupBy2.default)(datasets, group));
+  return Object.values((0, _groupBy.default)(datasets, group));
 }
 function getData(props, childComponents) {
   if (props.data) {
@@ -194,7 +194,6 @@ function getDefaultDomainPadding(props, axis, childComponents) {
   };
 }
 function getDomainFromChildren(props, axis, childComponents) {
-  // eslint-disable-line max-statements, complexity, max-len
   const children = childComponents ? childComponents.slice(0) : _react.default.Children.toArray(props.children);
   const parentData = props.data ? Data.getData(props) : undefined;
   const {
@@ -264,7 +263,7 @@ function getScale(props, axis, childComponents) {
     });
     return Scale.getScaleType(sharedProps, axis);
   };
-  const childScale = (0, _uniq2.default)(Helpers.reduceChildren(children, iteratee, props));
+  const childScale = (0, _uniq.default)(Helpers.reduceChildren(children, iteratee, props));
 
   // default to linear scale if more than one uniq scale type is given by children
   return childScale.length > 1 ? Scale.getScaleFromName("linear") : Scale.getScaleFromName(childScale[0]);
@@ -326,8 +325,8 @@ function getChildStyle(child, index, calculatedProps, theme) {
   const dataWidth = role === "stack" ? {} : {
     width: getWidth(calculatedProps)
   };
-  const dataStyle = (0, _defaults2.default)({}, childStyle.data, Object.assign({}, dataWidth, style.data, defaultColor));
-  const labelsStyle = (0, _defaults2.default)({}, childStyle.labels, style.labels);
+  const dataStyle = (0, _defaults.default)({}, childStyle.data, Object.assign({}, dataWidth, style.data, defaultColor));
+  const labelsStyle = (0, _defaults.default)({}, childStyle.labels, style.labels);
   return {
     ...childStyle,
     parent: style.parent,
@@ -380,7 +379,7 @@ function getCategoryAndAxisStringsFromChildren(props, axis, childComponents) {
   const axisComponent = Axis.getAxisComponent(childComponents, axis);
   const axisStrings = axisComponent ? Data.getStringsFromAxes(axisComponent.props, axis) : [];
   const categoryStrings = categories.length ? categories : getStringsFromChildrenCategories(childComponents, axis);
-  return (0, _uniq2.default)([...categoryStrings, ...axisStrings].flat());
+  return (0, _uniq.default)([...categoryStrings, ...axisStrings].flat());
 }
 function getStringsFromChildren(props, childComponents) {
   const children = childComponents || _react.default.Children.toArray(props.children);
@@ -388,8 +387,8 @@ function getStringsFromChildren(props, childComponents) {
   const yStrings = getCategoryAndAxisStringsFromChildren(props, "y", children);
   const dataStrings = getStringsFromData(children);
   return {
-    x: (0, _uniq2.default)([...xStrings, ...dataStrings.x].flat()),
-    y: (0, _uniq2.default)([...yStrings, ...dataStrings.y].flat())
+    x: (0, _uniq.default)([...xStrings, ...dataStrings.x].flat()),
+    y: (0, _uniq.default)([...yStrings, ...dataStrings.y].flat())
   };
 }
 function getCategories(props, childComponents, allStrings) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-core",
-  "version": "37.3.1",
+  "version": "37.3.3",
   "description": "Victory Core",
   "keywords": [
     "data visualization",
@@ -22,7 +22,7 @@
   "dependencies": {
     "lodash": "^4.17.21",
     "react-fast-compare": "^3.2.0",
-    "victory-vendor": "37.3.1"
+    "victory-vendor": "37.3.3"
   },
   "peerDependencies": {
     "react": ">=16.6.0"
@@ -180,38 +180,10 @@
         "pnpm-lock.yaml"
       ]
     },
-    "format": {
-      "command": "nps format:pkg",
-      "files": [
-        "src/**",
-        "*.json",
-        "../../.prettierignore",
-        "../../.prettierrc.json"
-      ],
-      "output": [],
-      "packageLocks": [
-        "pnpm-lock.yaml"
-      ]
-    },
-    "format:fix": {
-      "command": "pnpm run format || nps format:pkg:fix",
-      "files": [
-        "src/**",
-        "*.json",
-        "../../.prettierignore",
-        "../../.prettierrc.json"
-      ],
-      "output": [],
-      "packageLocks": [
-        "pnpm-lock.yaml"
-      ]
-    },
     "lint": {
-      "command": "nps lint:pkg",
+      "command": "eslint src",
       "files": [
-        "src/**",
-        "../../.eslintignore",
-        "../../.eslintrc.js"
+        "src/**"
       ],
       "output": [],
       "dependencies": [
@@ -224,11 +196,9 @@
       ]
     },
     "lint:fix": {
-      "command": "pnpm run lint || nps lint:pkg:fix",
+      "command": "eslint --fix src",
       "files": [
-        "src/**",
-        "../../.eslintignore",
-        "../../.eslintrc.js"
+        "src/**"
       ],
       "output": [],
       "dependencies": [
@@ -271,8 +241,6 @@
     "check": "wireit",
     "types:check": "wireit",
     "types:create": "wireit",
-    "format": "wireit",
-    "format:fix": "wireit",
     "lint": "wireit",
     "lint:fix": "wireit",
     "jest": "wireit"

package/src/victory-animation/util.ts

@@ -1,5 +1,7 @@
+import isPlainObject from "lodash/isPlainObject";
+import orderBy from "lodash/orderBy";
+
 import { interpolate } from "victory-vendor/d3-interpolate";
-import { isPlainObject, orderBy } from "lodash";
 
 export const isInterpolatable = function (obj) {
   // d3 turns null into 0 and undefined into NaN, which we don't want.
@@ -83,7 +85,7 @@ export const interpolateFunction = function (a, b) {
       return b;
     }
     return function (this: unknown) {
-      /* eslint-disable no-invalid-this, prefer-rest-params */
+      /* eslint-disable prefer-rest-params */
       const aval = typeof a === "function" ? a.apply(this, arguments) : a;
       const bval = typeof b === "function" ? b.apply(this, arguments) : b;
       return interpolate(aval, bval)(t);

package/src/victory-clip-container/victory-clip-container.tsx

@@ -1,7 +1,9 @@
 import React from "react";
+import defaults from "lodash/defaults";
+import uniqueId from "lodash/uniqueId";
+
 import * as Helpers from "../victory-util/helpers";
 import * as UserProps from "../victory-util/user-props";
-import { defaults, isObject, uniqueId } from "lodash";
 import { ClipPath } from "../victory-primitives/clip-path";
 import { Circle } from "../victory-primitives/circle";
 import { Rect } from "../victory-primitives/rect";
@@ -29,7 +31,14 @@ export interface VictoryClipContainerProps {
   translateY?: number;
 }
 
-export class VictoryClipContainer extends React.Component<VictoryClipContainerProps> {
+interface VictoryClipContainerState {
+  clipId?: number | string;
+}
+
+export class VictoryClipContainer extends React.Component<
+  VictoryClipContainerProps,
+  VictoryClipContainerState
+> {
   static displayName = "VictoryClipContainer";
   static role = "container";
 
@@ -43,10 +52,18 @@ export class VictoryClipContainer extends React.Component<VictoryClipContainerPr
 
   constructor(props: VictoryClipContainerProps) {
     super(props);
-    this.clipId =
-      !isObject(props) || props.clipId === undefined
-        ? uniqueId("victory-clip-")
-        : props.clipId;
+    this.state = {
+      clipId: props?.clipId,
+    };
+  }
+
+  // The clipId state is used to prevent hydration mismatches between the server and client (issue #2941).
+  // A better alternative would be to utilize React 18's useId hook instead of uniqueId, which would avoid needing state for this purpose.
+  // However, this component currently supports React 16 at the time of writing, so this workaround is necessary.
+  componentDidMount() {
+    if (!this.state.clipId) {
+      this.setState({ clipId: uniqueId("victory-clip-") });
+    }
   }
 
   calculateAttributes(props) {
@@ -58,7 +75,7 @@ export class VictoryClipContainer extends React.Component<VictoryClipContainerPr
       translateX = 0,
       translateY = 0,
     } = props;
-    const clipPadding = Helpers.getPadding({ padding: props.clipPadding });
+    const clipPadding = Helpers.getPadding(props.clipPadding);
     const radius = props.radius || Helpers.getRadius(props);
     return {
       x: (polar ? origin.x : translateX) - clipPadding.left,
@@ -141,9 +158,7 @@ export class VictoryClipContainer extends React.Component<VictoryClipContainerPr
       rectComponent,
       clipPathComponent,
     } = props;
-    const { top, bottom, left, right } = Helpers.getPadding({
-      padding: props.clipPadding,
-    });
+    const { top, bottom, left, right } = Helpers.getPadding(props.clipPadding);
     let child;
     if (polar) {
       const radius = props.radius || Helpers.getRadius(props);
@@ -201,6 +216,6 @@ export class VictoryClipContainer extends React.Component<VictoryClipContainerPr
       translateX,
       translateY,
     });
-    return this.renderClippedGroup(clipProps, this.clipId);
+    return this.renderClippedGroup(clipProps, this.state.clipId);
   }
 }

package/src/victory-container/victory-container.tsx

@@ -1,5 +1,5 @@
 import React, { useRef } from "react";
-import { uniqueId } from "lodash";
+import uniqueId from "lodash/uniqueId";
 import { Portal } from "../victory-portal/portal";
 import * as UserProps from "../victory-util/user-props";
 import { OriginType } from "../victory-label/victory-label";
@@ -155,9 +155,9 @@ export const VictoryContainer = (initialProps: VictoryContainerProps) => {
         ...style,
         width: responsive ? style?.width : dimensions.width,
         height: responsive ? style?.height : dimensions.height,
-        pointerEvents: "none",
-        touchAction: "none",
-        position: "relative",
+        pointerEvents: style?.pointerEvents ?? "none",
+        touchAction: style?.touchAction ?? "none",
+        position: style?.position ?? "relative",
       }}
       data-ouia-component-id={ouiaId}
       data-ouia-component-type={ouiaType}

package/src/victory-label/victory-label.tsx

@@ -1,6 +1,8 @@
 /* eslint no-magic-numbers: ["error", { "ignore": [-0.5, 0.5, 0, 1, 2] }]*/
-import { defaults, isEmpty } from "lodash";
 import React from "react";
+import defaults from "lodash/defaults";
+import isEmpty from "lodash/isEmpty";
+
 import { VictoryPortal } from "../victory-portal/victory-portal";
 import { Rect } from "../victory-primitives/rect";
 import { Text } from "../victory-primitives/text";
@@ -144,11 +146,11 @@ const getBackgroundPadding = (props) => {
   if (props.backgroundPadding && Array.isArray(props.backgroundPadding)) {
     return props.backgroundPadding.map((backgroundPadding) => {
       const padding = Helpers.evaluateProp(backgroundPadding, props);
-      return Helpers.getPadding({ padding });
+      return Helpers.getPadding(padding);
     });
   }
   const padding = Helpers.evaluateProp(props.backgroundPadding, props);
-  return Helpers.getPadding({ padding });
+  return Helpers.getPadding(padding);
 };
 
 const getLineHeight = (props) => {

package/src/victory-portal/victory-portal.tsx

@@ -1,5 +1,7 @@
 import React, { useState } from "react";
-import { defaults, uniqueId } from "lodash";
+import defaults from "lodash/defaults";
+import uniqueId from "lodash/uniqueId";
+
 import * as Log from "../victory-util/log";
 import * as Helpers from "../victory-util/helpers";
 import { usePortalContext } from "./portal-context";

package/src/victory-primitives/arc.tsx

@@ -1,6 +1,6 @@
 /* eslint no-magic-numbers: ["error", { "ignore": [0, 1, 2, 180] }]*/
 import React from "react";
-import { defaults } from "lodash";
+import defaults from "lodash/defaults";
 
 import * as Helpers from "../victory-util/helpers";
 import { VictoryCommonPrimitiveProps } from "../victory-util/common-props";

package/src/victory-primitives/background.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { defaults } from "lodash";
+import defaults from "lodash/defaults";
 
 import * as Helpers from "../victory-util/helpers";
 import { VictoryCommonPrimitiveProps } from "../victory-util/common-props";

package/src/victory-primitives/border.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { defaults } from "lodash";
+import defaults from "lodash/defaults";
 
 import * as Helpers from "../victory-util/helpers";
 import { VictoryCommonPrimitiveProps } from "../victory-util/common-props";

package/src/victory-primitives/line-segment.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { defaults } from "lodash";
+import defaults from "lodash/defaults";
 
 import * as Helpers from "../victory-util/helpers";
 import { VictoryCommonPrimitiveProps } from "../victory-util/common-props";

package/src/victory-primitives/point.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { defaults } from "lodash";
+import defaults from "lodash/defaults";
 
 import * as Helpers from "../victory-util/helpers";
 import * as pathHelpers from "../victory-util/point-path-helpers";
@@ -12,9 +12,9 @@ export interface PointProps extends VictoryCommonPrimitiveProps {
   datum?: any;
   getPath?: (x: number, y: number, size: number) => string;
   pathComponent?: React.ReactElement;
-  // eslint-disable-next-line @typescript-eslint/ban-types
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
   size?: number | Function;
-  // eslint-disable-next-line @typescript-eslint/ban-types
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
   symbol?: ScatterSymbolType | Function;
   x?: number;
   y?: number;

package/src/victory-primitives/whisker.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { defaults } from "lodash";
+import defaults from "lodash/defaults";
 
 import * as Helpers from "../victory-util/helpers";
 import { VictoryCommonPrimitiveProps } from "../victory-util/common-props";

package/src/victory-transition/victory-transition.tsx

@@ -1,11 +1,13 @@
 import React from "react";
+import defaults from "lodash/defaults";
+import pick from "lodash/pick";
+import isEqual from "react-fast-compare";
+
 import { VictoryAnimation } from "../victory-animation/victory-animation";
 import * as Collection from "../victory-util/collection";
 import * as Helpers from "../victory-util/helpers";
 import TimerContext from "../victory-util/timer-context";
 import * as Transitions from "../victory-util/transitions";
-import { defaults, pick } from "lodash";
-import isEqual from "react-fast-compare";
 import Timer from "../victory-util/timer";
 
 type VictoryTransitionChild = React.ReactElement<
@@ -66,7 +68,7 @@ export class VictoryTransition extends React.Component<
   }
 
   componentDidMount() {
-    this.setState({ nodesShouldLoad: true }); // eslint-disable-line react/no-did-mount-set-state
+    this.setState({ nodesShouldLoad: true });
   }
 
   shouldComponentUpdate(nextProps: VictoryTransitionProps) {

package/src/victory-util/add-events.tsx

@@ -1,5 +1,8 @@
 import React from "react";
-import { defaults, isEmpty, pick } from "lodash";
+import defaults from "lodash/defaults";
+import isEmpty from "lodash/isEmpty";
+import pick from "lodash/pick";
+
 import isEqual from "react-fast-compare";
 
 import { VictoryLabelableProps } from "../types/prop-types";
@@ -54,7 +57,7 @@ export interface EventsMixinClass<TProps> {
   ): React.ReactElement;
   cacheValues<TThis>(this: TThis, obj: Partial<TThis>): void;
   getEventState: typeof Events.getEventState;
-  renderData(props: TProps);
+  renderData(props: TProps, shouldRenderDatum?: () => boolean);
   renderContinuousData(props: TProps);
   animateComponent(
     props: TProps,
@@ -127,7 +130,7 @@ export function addEvents<
   TBase extends WrappedComponentClass<TProps>,
   TProps extends EventMixinCommonProps,
 >(WrappedComponent: TBase, options: MixinOptions = {}) {
-  // eslint-disable-next-line @typescript-eslint/no-empty-interface
+  // eslint-disable-next-line @typescript-eslint/no-empty-object-type
   interface AddEventsMixin extends EventMixinCalculatedValues {}
 
   // @ts-expect-error "TS2545: A mixin class must have a constructor with a single rest parameter of type 'any[]'."

package/src/victory-util/axis.tsx

@@ -1,5 +1,9 @@
 import React from "react";
-import { defaults, isObject, uniq, orderBy } from "lodash";
+import defaults from "lodash/defaults";
+import isObject from "lodash/isObject";
+import uniq from "lodash/uniq";
+import orderBy from "lodash/orderBy";
+
 import * as Collection from "./collection";
 import * as Domain from "./domain";
 import * as Helpers from "./helpers";
@@ -214,8 +218,8 @@ function getTickArray(props) {
       arr.forEach((t, index) => {
         if (Array.isArray(domain)) {
           if (
-            t >= Collection.getMinValue(domain) &&
-            t <= Collection.getMaxValue(domain)
+            t >= Collection.getMinValue(domain).valueOf() &&
+            t <= Collection.getMaxValue(domain).valueOf()
           ) {
             newTickArray.push({
               value: t,
@@ -313,7 +317,7 @@ export function getTicks(props, scale: D3Scale, filterZero = false) {
  * @param {String} axis: either x or y
  * @returns {Array} returns a domain from tickValues
  */
-// eslint-disable-next-line max-statements
+
 function getDomainFromData(props, axis) {
   const { polar, startAngle = 0, endAngle = 360 } = props;
   const tickArray = getTickArray(props);

package/src/victory-util/common-props.tsx

@@ -57,7 +57,7 @@ export interface VictoryCommonThemeProps {
         x?: ScalePropType | D3Scale;
         y?: ScalePropType | D3Scale;
       };
-  // eslint-disable-next-line @typescript-eslint/ban-types
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
   sharedEvents?: { events: any[]; getEventState: Function };
   singleQuadrantDomainPadding?: boolean | { x?: boolean; y?: boolean };
   standalone?: boolean;
@@ -72,11 +72,11 @@ export interface VictoryCommonPrimitiveProps {
   className?: string;
   clipPath?: string;
   data?: any;
-  // eslint-disable-next-line @typescript-eslint/ban-types
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
   desc?: string | Function;
   disableInlineStyles?: boolean;
   events?: object;
-  // eslint-disable-next-line @typescript-eslint/ban-types
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
   id?: number | string | Function;
   index?: number | string;
   origin?: OriginType;

package/src/victory-util/data.ts

@@ -1,15 +1,13 @@
-/* eslint-disable no-use-before-define */
 import React from "react";
-import {
-  uniq,
-  isPlainObject,
-  property,
-  orderBy,
-  isEmpty,
-  isEqual,
-  isUndefined,
-  omitBy,
-} from "lodash";
+import isEmpty from "lodash/isEmpty";
+import isEqual from "lodash/isEqual";
+import isPlainObject from "lodash/isPlainObject";
+import isUndefined from "lodash/isUndefined";
+import omitBy from "lodash/omitBy";
+import orderBy from "lodash/orderBy";
+import property from "lodash/property";
+import uniq from "lodash/uniq";
+
 import * as Helpers from "./helpers";
 import * as Collection from "./collection";
 import * as Scale from "./scale";
@@ -141,7 +139,6 @@ export function formatDataFromDomain(dataset, domain, defaultBaseline?) {
   const isOverMaxX = overMax(maxDomainX);
   const isOverMaxY = overMax(maxDomainY);
 
-  // eslint-disable-next-line complexity
   return dataset.map((datum) => {
     let { _x, _y, _y0, _y1 } = datum;
 
@@ -283,7 +280,6 @@ export function formatData(
   const data = preformattedData
     ? dataset
     : dataset.reduce((dataArr, datum, index) => {
-        // eslint-disable-line complexity
         const parsedDatum = parseDatum(datum);
         const fallbackValues = { x: index, y: parsedDatum };
         const processedValues = expectedKeys!.reduce((memo, type) => {

package/src/victory-util/domain.ts

@@ -1,6 +1,8 @@
-/* eslint-disable no-use-before-define */
 import React from "react";
-import { isPlainObject, sortedUniq, isDate } from "lodash";
+import isDate from "lodash/isDate";
+import isPlainObject from "lodash/isPlainObject";
+import sortedUniq from "lodash/sortedUniq";
+
 import * as Data from "./data";
 import * as Scale from "./scale";
 import * as Helpers from "./helpers";
@@ -67,7 +69,6 @@ function getExtremeFromData(dataset, axis, type = "min") {
   return containsDate ? new Date(result) : result;
 }
 
-// eslint-disable-next-line max-statements
 function padDomain(domain, props, axis) {
   if (!props.domainPadding) {
     return domain;
@@ -110,12 +111,13 @@ function padDomain(domain, props, axis) {
     : props.singleQuadrantDomainPadding;
 
   const addsQuadrants =
-    (min >= 0 && paddedDomain.min <= 0) || (max <= 0 && paddedDomain.max >= 0);
+    (min.valueOf() >= 0 && paddedDomain.min <= 0) ||
+    (max.valueOf() <= 0 && paddedDomain.max >= 0);
 
   const adjust = (val, type) => {
     const coerce =
-      (type === "min" && min >= 0 && val <= 0) ||
-      (type === "max" && max <= 0 && val >= 0);
+      (type === "min" && min.valueOf() >= 0 && val <= 0) ||
+      (type === "max" && max.valueOf() <= 0 && val >= 0);
     return coerce ? 0 : val;
   };
 

package/src/victory-util/events.ts

@@ -1,5 +1,9 @@
-/* eslint-disable no-use-before-define */
-import { isEmpty, pickBy, omitBy, uniq } from "lodash";
+import React from "react";
+import isEmpty from "lodash/isEmpty";
+import pickBy from "lodash/pickBy";
+import omitBy from "lodash/omitBy";
+import uniq from "lodash/uniq";
+
 import type { EventMixinCalculatedValues } from "./add-events";
 import { isFunction } from "./helpers";
 
@@ -72,9 +76,12 @@ export function getEvents(
     const selectedEvents = getSelectedEvents();
     return (
       Array.isArray(selectedEvents) &&
-      selectedEvents.reduce((memo, event) => {
-        return event ? Object.assign(memo, event.eventHandlers) : memo;
-      }, {} as ComponentEvent["eventHandlers"])
+      selectedEvents.reduce(
+        (memo, event) => {
+          return event ? Object.assign(memo, event.eventHandlers) : memo;
+        },
+        {} as ComponentEvent["eventHandlers"],
+      )
     );
   };
 
@@ -84,13 +91,13 @@ export function getEvents(
    */
   const getAllEvents = () => {
     // Mandatory usage: `getEvents.bind(this)`
-    /* eslint-disable no-invalid-this */
+
     if (Array.isArray(this.componentEvents)) {
       return Array.isArray(props.events)
         ? this.componentEvents.concat(...props.events)
         : this.componentEvents;
     }
-    /* eslint-enable no-invalid-this */
+
     return props.events;
   };
 
@@ -127,12 +134,12 @@ export function getScopedEvents(
   }
 
   // Mandatory usage: `getScopedEvents.bind(this)`
-  // eslint-disable-next-line no-invalid-this
+
   const newBaseProps = baseProps || this.baseProps;
   // returns the original base props or base state of a given target element
   const getTargetProps = (identifier, type) => {
     const { childName, target, key } = identifier;
-    // eslint-disable-next-line no-invalid-this
+
     const baseType = type === "props" ? newBaseProps : this.state || {};
     const base =
       childName === undefined || childName === null || !baseType[childName]
@@ -173,7 +180,6 @@ export function getScopedEvents(
 
     // returns the state object with mutated props applied for a single key
     const getMutationObject = (key, childName) => {
-      // eslint-disable-next-line no-invalid-this
       const baseState = this.state || {};
       if (!isFunction(eventReturn.mutation)) {
         return baseState;
@@ -270,11 +276,10 @@ export function getScopedEvents(
   // into a state mutation, and calls setState
   // eslint-disable-next-line max-params
   const onEvent = (evt, childProps, eventKey, eventName) => {
-    // eslint-disable-next-line no-invalid-this
     const eventReturn = events[eventName](evt, childProps, eventKey, this);
     if (!isEmpty(eventReturn)) {
       const callbacks = compileCallbacks(eventReturn);
-      // eslint-disable-next-line no-invalid-this
+
       this.setState(parseEventReturn(eventReturn, eventKey), callbacks);
     }
   };
@@ -319,7 +324,7 @@ export function getEventState(
   childType?: string,
 ) {
   // Mandatory usage: `getEventState.bind(this)`
-  // eslint-disable-next-line no-invalid-this
+
   const state = this.state || {};
   if (!childType) {
     return eventKey === "parent"