@skbkontur/react-ui-validations 1.6.0 → 1.7.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.7.0](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/compare/react-ui-validations@1.6.0...react-ui-validations@1.7.0) (2022-01-27)
+
+
+### Bug Fixes
+
+* **react-ui:** [StrictMode] give up findDomNode ([#2518](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/issues/2518)) ([8028cdd](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/commit/8028cdd3c2289fd48816bdaf92da6a28892f40a7))
+* **react-ui:** [StrictMode] give up legacy context ([#2694](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/issues/2694)) ([d0253cc](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/commit/d0253ccc089764a317ccaa79aa00cc96fbb7aa0a))
+* **react-ui:** [StrictMode] give up unsafe methods ([#2514](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/issues/2514)) ([6cc2201](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/commit/6cc2201f0e8f711441e6c63229b703c03d4b6953))
+* **react-ui:** call original refs while replacing them ([#2736](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/issues/2736)) ([01ff2ab](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/commit/01ff2ab3243082c9347d20e844368ac775e54449))
+
+
+### Features
+
+* support React.StrictMode ([04a4bc9](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/commit/04a4bc9f2dd35fa98ea4d9526ddd775dd1017b71))
+
+
+
+
+
 # [1.6.0](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/compare/react-ui-validations@1.5.7...react-ui-validations@1.6.0) (2021-12-27)
 
 

package/README.md

@@ -39,3 +39,7 @@ export default class DataEditor extends React.Component {
 ```shell
 yarn start:docs
 ```
+
+## StrictMode
+
+Библиотека поддерживает работу в React.StrictMode начиная с версии `1.7.0`. [Подробнее](https://github.com/skbkontur/retail-ui/blob/master/packages/react-ui/README.md#strictmode).

package/index.d.ts

@@ -1,16 +1,15 @@
 // Generated by dts-bundle v0.7.3
 // Dependencies for this module:
 //   ../../react
-//   ../../prop-types
 
 declare module '@skbkontur/react-ui-validations' {
     import { text, tooltip } from '@skbkontur/react-ui-validations/src/ErrorRenderer';
     import { ValidationContainer, ValidationContainerProps } from '@skbkontur/react-ui-validations/src/ValidationContainer';
-    import { ValidationContext, ValidationContextProps } from '@skbkontur/react-ui-validations/src/ValidationContext';
     import { TooltipPosition, ValidationTooltip, ValidationTooltipProps } from '@skbkontur/react-ui-validations/src/ValidationTooltip';
     import { RenderErrorMessage, Validation, ValidationBehaviour } from '@skbkontur/react-ui-validations/src/ValidationWrapperInternal';
     import { ValidationWrapper, ValidationInfo, ValidationWrapperProps } from '@skbkontur/react-ui-validations/src/ValidationWrapper';
-    export { ValidationContainer, ValidationContainerProps, ValidationContext, ValidationContextProps, ValidationWrapper as ValidationWrapperV1, ValidationWrapperProps as ValidationWrapperV1Props, RenderErrorMessage, ValidationBehaviour, Validation, ValidationWrapper, ValidationWrapperProps, ValidationInfo, ValidationTooltip, ValidationTooltipProps, TooltipPosition, tooltip, text, };
+    import { ValidationContext, ValidationContextType, ValidationContextWrapper, ValidationContextWrapperProps } from '@skbkontur/react-ui-validations/src/ValidationContextWrapper';
+    export { ValidationContainer, ValidationContainerProps, ValidationContext, ValidationContextType, ValidationContextWrapper, ValidationContextWrapperProps, ValidationWrapper as ValidationWrapperV1, ValidationWrapperProps as ValidationWrapperV1Props, RenderErrorMessage, ValidationBehaviour, Validation, ValidationWrapper, ValidationWrapperProps, ValidationInfo, ValidationTooltip, ValidationTooltipProps, TooltipPosition, tooltip, text, };
     export * from '@skbkontur/react-ui-validations/src/Validations';
 }
 
@@ -48,50 +47,6 @@ declare module '@skbkontur/react-ui-validations/src/ValidationContainer' {
     }
 }
 
-declare module '@skbkontur/react-ui-validations/src/ValidationContext' {
-    import * as PropTypes from 'prop-types';
-    import React from 'react';
-    import { ValidationWrapperInternal } from '@skbkontur/react-ui-validations/src/ValidationWrapperInternal';
-    import { ScrollOffset } from '@skbkontur/react-ui-validations/src/ValidationContainer';
-    export interface ValidationContextSettings {
-        scrollOffset: ScrollOffset;
-        disableSmoothScroll: boolean;
-    }
-    export interface IValidationContext {
-        register(wrapper: ValidationWrapperInternal): void;
-        unregister(wrapper: ValidationWrapperInternal): void;
-        instanceProcessBlur(wrapper: ValidationWrapperInternal): void;
-        onValidationUpdated(wrapper: ValidationWrapperInternal, isValid: boolean): void;
-        getSettings(): ValidationContextSettings;
-        isAnyWrapperInChangingMode(): boolean;
-    }
-    export interface ValidationContextProps {
-        children?: React.ReactNode;
-        onValidationUpdated?: (isValid?: boolean) => void;
-        scrollOffset?: number | ScrollOffset;
-        disableSmoothScroll: boolean;
-    }
-    export class ValidationContext extends React.Component<ValidationContextProps> implements IValidationContext {
-        static childContextTypes: {
-            validationContext: PropTypes.Requireable<any>;
-        };
-        childWrappers: ValidationWrapperInternal[];
-        getChildContext(): {
-            validationContext: IValidationContext;
-        };
-        getSettings(): ValidationContextSettings;
-        register(wrapper: ValidationWrapperInternal): void;
-        unregister(wrapper: ValidationWrapperInternal): void;
-        instanceProcessBlur(instance: ValidationWrapperInternal): void;
-        onValidationUpdated(wrapper: ValidationWrapperInternal, isValid?: boolean): void;
-        isAnyWrapperInChangingMode(): boolean;
-        onValidationRemoved(): void;
-        getChildWrappersSortedByPosition(): ValidationWrapperInternal[];
-        validate(withoutFocus: boolean): Promise<boolean>;
-        render(): JSX.Element;
-    }
-}
-
 declare module '@skbkontur/react-ui-validations/src/ValidationTooltip' {
     import React from 'react';
     export type TooltipPosition = 'top left' | 'top center' | 'top right' | 'bottom left' | 'bottom center' | 'bottom right' | 'left top' | 'left middle' | 'left bottom' | 'right top' | 'right middle' | 'right bottom';
@@ -107,10 +62,9 @@ declare module '@skbkontur/react-ui-validations/src/ValidationTooltip' {
 }
 
 declare module '@skbkontur/react-ui-validations/src/ValidationWrapperInternal' {
-    import * as PropTypes from 'prop-types';
     import React from 'react';
     import { Nullable } from '@skbkontur/react-ui-validations/typings/Types';
-    import { IValidationContext } from '@skbkontur/react-ui-validations/src/ValidationContext';
+    import { ValidationContextType } from '@skbkontur/react-ui-validations/src/ValidationContextWrapper';
     export type ValidationBehaviour = 'immediate' | 'lostfocus' | 'submit';
     export type ValidationLevel = 'error' | 'warning';
     export interface Validation {
@@ -133,20 +87,16 @@ declare module '@skbkontur/react-ui-validations/src/ValidationWrapperInternal' {
         y: number;
     }
     export class ValidationWrapperInternal extends React.Component<ValidationWrapperInternalProps, ValidationWrapperInternalState> {
-        static contextTypes: {
-            validationContext: PropTypes.Requireable<any>;
-        };
         state: ValidationWrapperInternalState;
-        context: {
-            validationContext: IValidationContext;
-        };
         isChanging: boolean;
-        UNSAFE_componentWillMount(): void;
+        static contextType: React.Context<ValidationContextType>;
+        context: ValidationContextType;
         componentDidMount(): void;
         componentWillUnmount(): void;
-        UNSAFE_componentWillReceiveProps(nextProps: ValidationWrapperInternalProps): void;
+        componentDidUpdate(): void;
         focus(): Promise<void>;
         render(): React.ReactElement<any, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)>;
+        getRootNode: () => Nullable<HTMLElement>;
         getControlPosition(): Nullable<Point>;
         processBlur(): Promise<void>;
         processSubmit(): Promise<void>;
@@ -177,6 +127,44 @@ declare module '@skbkontur/react-ui-validations/src/ValidationWrapper' {
     }
 }
 
+declare module '@skbkontur/react-ui-validations/src/ValidationContextWrapper' {
+    import React from 'react';
+    import { ValidationWrapperInternal } from '@skbkontur/react-ui-validations/src/ValidationWrapperInternal';
+    import { ScrollOffset } from '@skbkontur/react-ui-validations/src/ValidationContainer';
+    export interface ValidationContextSettings {
+        scrollOffset: ScrollOffset;
+        disableSmoothScroll: boolean;
+    }
+    export interface ValidationContextWrapperProps {
+        children?: React.ReactNode;
+        onValidationUpdated?: (isValid?: boolean) => void;
+        scrollOffset?: number | ScrollOffset;
+        disableSmoothScroll: boolean;
+    }
+    export interface ValidationContextType {
+        register: (wrapper: ValidationWrapperInternal) => void;
+        unregister: (wrapper: ValidationWrapperInternal) => void;
+        instanceProcessBlur: (wrapper: ValidationWrapperInternal) => void;
+        onValidationUpdated: (wrapper: ValidationWrapperInternal, isValid: boolean) => void;
+        getSettings: () => ValidationContextSettings;
+        isAnyWrapperInChangingMode: () => boolean;
+    }
+    export const ValidationContext: React.Context<ValidationContextType>;
+    export class ValidationContextWrapper extends React.Component<ValidationContextWrapperProps> {
+        childWrappers: ValidationWrapperInternal[];
+        getSettings(): ValidationContextSettings;
+        register(wrapper: ValidationWrapperInternal): void;
+        unregister(wrapper: ValidationWrapperInternal): void;
+        instanceProcessBlur(instance: ValidationWrapperInternal): void;
+        onValidationUpdated(wrapper: ValidationWrapperInternal, isValid?: boolean): void;
+        isAnyWrapperInChangingMode(): boolean;
+        onValidationRemoved(): void;
+        getChildWrappersSortedByPosition(): ValidationWrapperInternal[];
+        validate(withoutFocus: boolean): Promise<boolean>;
+        render(): JSX.Element;
+    }
+}
+
 declare module '@skbkontur/react-ui-validations/src/Validations' {
     import { ValidationBuilder } from '@skbkontur/react-ui-validations/src/Validations/ValidationBuilder';
     import { RootValidationRule, ValidationRule, ItemValidationRule } from '@skbkontur/react-ui-validations/src/Validations/Types';

package/index.js

@@ -3,8 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var PropTypes = require('prop-types');
-var ReactDom = require('react-dom');
 var warning = require('warning');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -192,19 +190,26 @@ var isReactUITestEnv = Boolean(REACT_UI_TEST) || // for cases when NODE_ENV is n
 var isTestEnv = NODE_ENV === 'test' || isReactUITestEnv;
 var isBrowser = typeof window !== 'undefined';
 
-var ValidationContext = /** @class */ (function (_super) {
-    __extends(ValidationContext, _super);
-    function ValidationContext() {
+var ValidationContext = React__default['default'].createContext({
+    register: function () { return undefined; },
+    unregister: function () { return undefined; },
+    instanceProcessBlur: function () { return undefined; },
+    onValidationUpdated: function () { return undefined; },
+    getSettings: function () { return ({
+        scrollOffset: {},
+        disableSmoothScroll: false,
+    }); },
+    isAnyWrapperInChangingMode: function () { return false; },
+});
+ValidationContext.displayName = 'ValidationContext';
+var ValidationContextWrapper = /** @class */ (function (_super) {
+    __extends(ValidationContextWrapper, _super);
+    function ValidationContextWrapper() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.childWrappers = [];
         return _this;
     }
-    ValidationContext.prototype.getChildContext = function () {
-        return {
-            validationContext: this,
-        };
-    };
-    ValidationContext.prototype.getSettings = function () {
+    ValidationContextWrapper.prototype.getSettings = function () {
         var scrollOffset = {};
         if (typeof this.props.scrollOffset === 'number') {
             scrollOffset = { top: this.props.scrollOffset };
@@ -221,20 +226,20 @@ var ValidationContext = /** @class */ (function (_super) {
             disableSmoothScroll: this.props.disableSmoothScroll,
         };
     };
-    ValidationContext.prototype.register = function (wrapper) {
+    ValidationContextWrapper.prototype.register = function (wrapper) {
         this.childWrappers.push(wrapper);
     };
-    ValidationContext.prototype.unregister = function (wrapper) {
+    ValidationContextWrapper.prototype.unregister = function (wrapper) {
         this.childWrappers.splice(this.childWrappers.indexOf(wrapper), 1);
         this.onValidationRemoved();
     };
-    ValidationContext.prototype.instanceProcessBlur = function (instance) {
+    ValidationContextWrapper.prototype.instanceProcessBlur = function (instance) {
         for (var _i = 0, _a = this.childWrappers.filter(function (x) { return x !== instance && !x.isIndependent(); }); _i < _a.length; _i++) {
             var wrapper = _a[_i];
             wrapper.processBlur();
         }
     };
-    ValidationContext.prototype.onValidationUpdated = function (wrapper, isValid) {
+    ValidationContextWrapper.prototype.onValidationUpdated = function (wrapper, isValid) {
         var onValidationUpdated = this.props.onValidationUpdated;
         if (onValidationUpdated) {
             var isValidResult = !this.childWrappers.find(function (x) {
@@ -246,17 +251,17 @@ var ValidationContext = /** @class */ (function (_super) {
             onValidationUpdated(isValidResult);
         }
     };
-    ValidationContext.prototype.isAnyWrapperInChangingMode = function () {
+    ValidationContextWrapper.prototype.isAnyWrapperInChangingMode = function () {
         return this.childWrappers.some(function (x) { return x.isChanging; });
     };
-    ValidationContext.prototype.onValidationRemoved = function () {
+    ValidationContextWrapper.prototype.onValidationRemoved = function () {
         var onValidationUpdated = this.props.onValidationUpdated;
         if (onValidationUpdated) {
             var isValidResult = !this.childWrappers.find(function (x) { return x.hasError(); });
             onValidationUpdated(isValidResult);
         }
     };
-    ValidationContext.prototype.getChildWrappersSortedByPosition = function () {
+    ValidationContextWrapper.prototype.getChildWrappersSortedByPosition = function () {
         var wrappersWithPosition = __spreadArrays(this.childWrappers).map(function (x) { return ({
             target: x,
             position: x.getControlPosition(),
@@ -280,7 +285,7 @@ var ValidationContext = /** @class */ (function (_super) {
         });
         return wrappersWithPosition.map(function (x) { return x.target; });
     };
-    ValidationContext.prototype.validate = function (withoutFocus) {
+    ValidationContextWrapper.prototype.validate = function (withoutFocus) {
         return __awaiter(this, void 0, void 0, function () {
             var firstInvalid;
             return __generator(this, function (_a) {
@@ -302,13 +307,11 @@ var ValidationContext = /** @class */ (function (_super) {
             });
         });
     };
-    ValidationContext.prototype.render = function () {
-        return React__default['default'].createElement("span", null, this.props.children);
+    ValidationContextWrapper.prototype.render = function () {
+        return (React__default['default'].createElement(ValidationContext.Provider, { value: this },
+            React__default['default'].createElement("span", null, this.props.children)));
     };
-    ValidationContext.childContextTypes = {
-        validationContext: PropTypes.any,
-    };
-    return ValidationContext;
+    return ValidationContextWrapper;
 }(React__default['default'].Component));
 
 var ValidationContainer = /** @class */ (function (_super) {
@@ -344,7 +347,7 @@ var ValidationContainer = /** @class */ (function (_super) {
         return this.childContext.validate(withoutFocus);
     };
     ValidationContainer.prototype.render = function () {
-        return (React__default['default'].createElement(ValidationContext, { ref: this.refChildContext, scrollOffset: this.props.scrollOffset, disableSmoothScroll: this.props.disableSmoothScroll, onValidationUpdated: this.props.onValidationUpdated }, this.props.children));
+        return (React__default['default'].createElement(ValidationContextWrapper, { ref: this.refChildContext, scrollOffset: this.props.scrollOffset, disableSmoothScroll: this.props.disableSmoothScroll, onValidationUpdated: this.props.onValidationUpdated }, this.props.children));
     };
     ValidationContainer.__KONTUR_REACT_UI__ = 'ValidationContainer';
     ValidationContainer.defaultProps = {
@@ -550,25 +553,28 @@ var ValidationWrapperInternal = /** @class */ (function (_super) {
             validation: null,
         };
         _this.isChanging = false;
+        _this.context = _this.context;
+        _this.setRootNode = function (element) {
+            _this.rootNode = element;
+        };
+        _this.getRootNode = function () {
+            return _this.rootNode;
+        };
         return _this;
     }
-    ValidationWrapperInternal.prototype.UNSAFE_componentWillMount = function () {
-        this.applyValidation(this.props.validation);
-    };
     ValidationWrapperInternal.prototype.componentDidMount = function () {
-        warning__default['default'](this.context.validationContext, 'ValidationWrapper should appears as child of ValidationContext.\n' +
+        warning__default['default'](this.context, 'ValidationWrapper should appears as child of ValidationContainer.\n' +
             'https://tech.skbkontur.ru/react-ui-validations/#/getting-started');
-        if (this.context.validationContext) {
-            this.context.validationContext.register(this);
+        if (this.context) {
+            this.context.register(this);
         }
+        this.applyValidation(this.props.validation);
     };
     ValidationWrapperInternal.prototype.componentWillUnmount = function () {
-        if (this.context.validationContext) {
-            this.context.validationContext.unregister(this);
-        }
+        this.context.unregister(this);
     };
-    ValidationWrapperInternal.prototype.UNSAFE_componentWillReceiveProps = function (nextProps) {
-        this.applyValidation(nextProps.validation);
+    ValidationWrapperInternal.prototype.componentDidUpdate = function () {
+        this.applyValidation(this.props.validation);
     };
     ValidationWrapperInternal.prototype.focus = function () {
         return __awaiter(this, void 0, void 0, function () {
@@ -576,9 +582,9 @@ var ValidationWrapperInternal = /** @class */ (function (_super) {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        htmlElement = ReactDom.findDOMNode(this);
+                        htmlElement = this.getRootNode();
                         if (!(htmlElement instanceof HTMLElement)) return [3 /*break*/, 3];
-                        _a = this.context.validationContext.getSettings(), disableSmoothScroll = _a.disableSmoothScroll, scrollOffset = _a.scrollOffset;
+                        _a = this.context.getSettings(), disableSmoothScroll = _a.disableSmoothScroll, scrollOffset = _a.scrollOffset;
                         if (!!disableSmoothScroll) return [3 /*break*/, 2];
                         return [4 /*yield*/, smoothScrollIntoView(htmlElement, scrollOffset)];
                     case 1:
@@ -665,10 +671,10 @@ var ValidationWrapperInternal = /** @class */ (function (_super) {
                 },
             });
         }
-        return this.props.errorMessage(React__default['default'].createElement("span", null, clonedChild), !!validation, validation);
+        return this.props.errorMessage(React__default['default'].createElement("span", { ref: this.setRootNode }, clonedChild), !!validation, validation);
     };
     ValidationWrapperInternal.prototype.getControlPosition = function () {
-        var htmlElement = ReactDom.findDOMNode(this);
+        var htmlElement = this.getRootNode();
         if (htmlElement instanceof HTMLElement) {
             var rect = htmlElement.getBoundingClientRect();
             return { x: rect.top, y: rect.left };
@@ -700,7 +706,7 @@ var ValidationWrapperInternal = /** @class */ (function (_super) {
         setTimeout(function () {
             _this.processBlur();
             if (!_this.isIndependent()) {
-                _this.context.validationContext.instanceProcessBlur(_this);
+                _this.context.instanceProcessBlur(_this);
             }
             _this.setState({});
         });
@@ -718,7 +724,7 @@ var ValidationWrapperInternal = /** @class */ (function (_super) {
         return new Promise(function (resolve) {
             _this.setState({ validation: validation }, resolve);
             if (Boolean(current) !== Boolean(validation)) {
-                _this.context.validationContext.onValidationUpdated(_this, !validation);
+                _this.context.onValidationUpdated(_this, !validation);
             }
         });
     };
@@ -735,12 +741,10 @@ var ValidationWrapperInternal = /** @class */ (function (_super) {
         if (isEqual(visible, actual)) {
             return visible;
         }
-        var changing = this.context.validationContext.isAnyWrapperInChangingMode();
+        var changing = this.context.isAnyWrapperInChangingMode();
         return getVisibleValidation(visible, actual, changing);
     };
-    ValidationWrapperInternal.contextTypes = {
-        validationContext: PropTypes.any,
-    };
+    ValidationWrapperInternal.contextType = ValidationContext;
     return ValidationWrapperInternal;
 }(React__default['default'].Component));
 
@@ -954,6 +958,7 @@ function createValidator(rule) {
 exports.ValidationBuilder = ValidationBuilder;
 exports.ValidationContainer = ValidationContainer;
 exports.ValidationContext = ValidationContext;
+exports.ValidationContextWrapper = ValidationContextWrapper;
 exports.ValidationReader = ValidationReader;
 exports.ValidationTooltip = ValidationTooltip;
 exports.ValidationWrapper = ValidationWrapper;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skbkontur/react-ui-validations",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Validations for @skbkontur/react-ui",
   "main": "./index.js",
   "types": "./index.d.ts",