@skbkontur/react-ui-validations 1.5.5 → 1.6.0

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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)
+
+
+### Features
+
+* **react-ui-validations:** add independent validation ([#2632](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/issues/2632)) ([f1f2a9a](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/commit/f1f2a9adf61e2b9b096f9e1f4dbeb04c4046e582))
+
+
+
+
+
+## [1.5.7](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/compare/react-ui-validations@1.5.6...react-ui-validations@1.5.7) (2021-10-25)
+
+**Note:** Version bump only for package react-ui-validations
+
+
+
+
+
+## [1.5.6](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/compare/react-ui-validations@1.5.5...react-ui-validations@1.5.6) (2021-10-06)
+
+
+### Bug Fixes
+
+* **validations:** update package name ([b5e4741](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/commit/b5e4741b157c2ab6f37188b356376f0fddf1e7cf))
+
+
+
+
+
 ## [1.5.5](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/compare/react-ui-validations@1.5.4...react-ui-validations@1.5.5) (2021-09-16)
 
 

package/README.md

@@ -1,4 +1,4 @@
-# react-ui-validations
+# React UI validations
 
 [![npm](https://img.shields.io/npm/v/react-ui-validations.svg?maxAge=300&style=flat-square)](https://www.npmjs.com/package/react-ui-validations)
 
@@ -6,13 +6,13 @@
 
 ## Документация
 
-- [Docs & Demos](http://tech.skbkontur.ru/react-ui-validations/)
+- [Docs & Demos](https://tech.skbkontur.ru/react-ui-validations/)
 - [Validation guides](https://guides.kontur.ru/principles/validation/)
 
 ## Использование
 
 ```shell
-npm install --save react-ui-validations
+npm install --save @skbkontur/react-ui-validations
 ```
 
 ```jsx

package/index.d.ts

@@ -117,6 +117,7 @@ declare module '@skbkontur/react-ui-validations/src/ValidationWrapperInternal' {
         level: ValidationLevel;
         behaviour: ValidationBehaviour;
         message: React.ReactNode;
+        independent: boolean;
     }
     export type RenderErrorMessage = (control: React.ReactElement<any>, hasError: boolean, validation: Nullable<Validation>) => React.ReactElement<any>;
     export interface ValidationWrapperInternalProps {
@@ -150,6 +151,7 @@ declare module '@skbkontur/react-ui-validations/src/ValidationWrapperInternal' {
         processBlur(): Promise<void>;
         processSubmit(): Promise<void>;
         hasError(): boolean;
+        isIndependent(): boolean;
     }
     export {};
 }
@@ -162,6 +164,7 @@ declare module '@skbkontur/react-ui-validations/src/ValidationWrapper' {
         type?: Nullable<ValidationBehaviour>;
         level?: Nullable<ValidationLevel>;
         message: React.ReactNode;
+        independent?: boolean;
     }
     export interface ValidationWrapperProps {
         children?: React.ReactElement<any>;
@@ -192,6 +195,7 @@ declare module '@skbkontur/react-ui-validations/typings/Types' {
 declare module '@skbkontur/react-ui-validations/src/Validations/ValidationBuilder' {
     import React from 'react';
     import { ValidationBehaviour, ValidationLevel } from '@skbkontur/react-ui-validations/src/ValidationWrapperInternal';
+    import { ValidationInfo } from '@skbkontur/react-ui-validations/src/ValidationWrapper';
     import { LambdaPath, PathTokensCache } from '@skbkontur/react-ui-validations/src/Validations/PathHelper';
     import { ValidationWriter } from '@skbkontur/react-ui-validations/src/Validations/ValidationWriter';
     import { ItemValidationRule, ValidationRule } from '@skbkontur/react-ui-validations/src/Validations/Types';
@@ -199,7 +203,8 @@ declare module '@skbkontur/react-ui-validations/src/Validations/ValidationBuilde
         constructor(writer: ValidationWriter<TRoot>, tokens: PathTokensCache, path: string[], data: T);
         prop<TChild>(lambdaPath: LambdaPath<T, TChild>, rule: ValidationRule<TRoot, TChild>): void;
         array<TChild>(lambdaPath: LambdaPath<T, TChild[]>, rule: ItemValidationRule<TRoot, TChild>): void;
-        invalid(isInvalid: (value: T) => boolean, message: React.ReactNode, type?: ValidationBehaviour, level?: ValidationLevel): void;
+        invalid(isInvalid: (value: T) => boolean, validationInfo: ValidationInfo): void;
+        invalid(isInvalid: (value: T) => boolean, message: React.ReactNode, type?: ValidationBehaviour, level?: ValidationLevel, independent?: boolean): void;
     }
 }
 

package/index.js

@@ -229,7 +229,7 @@ var ValidationContext = /** @class */ (function (_super) {
         this.onValidationRemoved();
     };
     ValidationContext.prototype.instanceProcessBlur = function (instance) {
-        for (var _i = 0, _a = this.childWrappers.filter(function (x) { return x !== instance; }); _i < _a.length; _i++) {
+        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();
         }
@@ -523,11 +523,19 @@ function getType(validation) {
 function getLevel(validation) {
     return validation ? validation.level : null;
 }
+function getIndependent(validation) {
+    return validation ? validation.independent : null;
+}
 function isEqual(a, b) {
     if (a === b) {
         return true;
     }
-    return !!a && !!b && a.behaviour === b.behaviour && a.level === a.level && a.message === b.message;
+    return (!!a &&
+        !!b &&
+        a.behaviour === b.behaviour &&
+        a.level === a.level &&
+        a.message === b.message &&
+        a.independent === b.independent);
 }
 
 if (isBrowser && typeof HTMLElement === 'undefined') {
@@ -549,7 +557,7 @@ var ValidationWrapperInternal = /** @class */ (function (_super) {
     };
     ValidationWrapperInternal.prototype.componentDidMount = function () {
         warning__default['default'](this.context.validationContext, 'ValidationWrapper should appears as child of ValidationContext.\n' +
-            'http://tech.skbkontur.ru/react-ui-validations/#/getting-started');
+            'https://tech.skbkontur.ru/react-ui-validations/#/getting-started');
         if (this.context.validationContext) {
             this.context.validationContext.register(this);
         }
@@ -684,11 +692,16 @@ var ValidationWrapperInternal = /** @class */ (function (_super) {
     ValidationWrapperInternal.prototype.hasError = function () {
         return getLevel(this.state.validation) === 'error';
     };
+    ValidationWrapperInternal.prototype.isIndependent = function () {
+        return getIndependent(this.state.validation || this.props.validation) === true;
+    };
     ValidationWrapperInternal.prototype.handleBlur = function () {
         var _this = this;
         setTimeout(function () {
             _this.processBlur();
-            _this.context.validationContext.instanceProcessBlur(_this);
+            if (!_this.isIndependent()) {
+                _this.context.validationContext.instanceProcessBlur(_this);
+            }
             _this.setState({});
         });
     };
@@ -743,6 +756,7 @@ var ValidationWrapper = /** @class */ (function (_super) {
                 level: validationInfo.level || 'error',
                 behaviour: validationInfo.type || 'lostfocus',
                 message: validationInfo.message,
+                independent: validationInfo.independent || false,
             }
             : null;
         return (React__default['default'].createElement(ValidationWrapperInternal, { errorMessage: renderMessage || tooltip('right top'), validation: validation }, children));
@@ -778,7 +792,7 @@ var ValidationBuilder = /** @class */ (function () {
             rule(builder, builder.data, i, array);
         }
     };
-    ValidationBuilder.prototype.invalid = function (isInvalid, message, type, level) {
+    ValidationBuilder.prototype.invalid = function (isInvalid, messageOrValidationInfo, type, level, independent) {
         var validationWriter = this.writer.getNode(this.path);
         if (validationWriter.isValidated()) {
             return;
@@ -787,7 +801,12 @@ var ValidationBuilder = /** @class */ (function () {
         if (!invalid) {
             return;
         }
-        validationWriter.set({ message: message, type: type, level: level });
+        if (isValidationInfo(messageOrValidationInfo)) {
+            validationWriter.set(messageOrValidationInfo);
+        }
+        else {
+            validationWriter.set({ message: messageOrValidationInfo, type: type, level: level, independent: independent });
+        }
     };
     ValidationBuilder.prototype.getPathInfo = function (lambdaPath) {
         var path = this.tokens.getOrAdd(lambdaPath);
@@ -802,7 +821,10 @@ var ValidationBuilder = /** @class */ (function () {
         return { data: data, path: __spreadArrays(this.path, path) };
     };
     return ValidationBuilder;
-}());
+}());
+var isValidationInfo = function (argument) {
+    return typeof argument === 'object' && Object.prototype.hasOwnProperty.call(argument, 'message');
+};
 
 var ValidationReader = /** @class */ (function () {
     function ValidationReader(node, tokens) {

package/package.json

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