feat: change error type to ReactNode (#825)

core-ds · Sep 10, 2021 · c6d95c1 · c6d95c1
1 parent 1b2d94a
commit c6d95c1
Show file tree

Hide file tree

Showing 25 changed files with 12 additions and 71 deletions.
diff --git a/packages/amount-input/src/__snapshots__/Component.test.tsx.snap b/packages/amount-input/src/__snapshots__/Component.test.tsx.snap
@@ -47,7 +47,6 @@ Object {
               </div>
             </div>
           </div>
-          
         </div>
       </div>
     </div>
@@ -95,7 +94,6 @@ Object {
             </div>
           </div>
         </div>
-        
       </div>
     </div>
   </div>,
@@ -200,7 +198,6 @@ Object {
               </div>
             </div>
           </div>
-          
         </div>
       </div>
     </div>
@@ -250,7 +247,6 @@ Object {
               </div>
             </div>
           </div>
-          
         </div>
       </div>
     </div>
@@ -301,7 +297,6 @@ Object {
             </div>
           </div>
         </div>
-        
       </div>
     </div>
   </div>,

diff --git a/packages/bank-card/src/__snapshots__/Component.test.tsx.snap b/packages/bank-card/src/__snapshots__/Component.test.tsx.snap
@@ -92,7 +92,6 @@ exports[`BankCard Snapshots tests should match snapshots 1`] = `
               </button>
             </div>
           </div>
-          
         </div>
         <div
           class="brandLogo"
@@ -210,7 +209,6 @@ exports[`BankCard Snapshots tests should match snapshots 2`] = `
               </button>
             </div>
           </div>
-          
         </div>
         <div
           class="brandLogo"
@@ -326,7 +324,6 @@ exports[`BankCard Snapshots tests should match snapshots 3`] = `
               </button>
             </div>
           </div>
-          
         </div>
         <div
           class="brandLogo"
@@ -442,7 +439,6 @@ exports[`BankCard Snapshots tests should match snapshots 4`] = `
               </button>
             </div>
           </div>
-          
         </div>
       </div>
     </div>

diff --git a/packages/calendar-input/src/__snapshots__/Component.test.tsx.snap b/packages/calendar-input/src/__snapshots__/Component.test.tsx.snap
@@ -33,7 +33,6 @@ exports[`CalendarInput Display tests should match snapshot 1`] = `
           />
         </div>
       </div>
-      
     </div>
   </div>
 </div>

diff --git a/packages/calendar-range/src/__snapshots__/Component.test.tsx.snap b/packages/calendar-range/src/__snapshots__/Component.test.tsx.snap
@@ -36,7 +36,6 @@ exports[`CalendarRange Display tests should match snapshot 1`] = `
             />
           </div>
         </div>
-        
       </div>
       <div>
         <div
@@ -597,7 +596,6 @@ exports[`CalendarRange Display tests should match snapshot 1`] = `
               />
             </div>
           </div>
-          
         </div>
         <div>
           <div

diff --git a/packages/checkbox-group/src/Component.tsx b/packages/checkbox-group/src/Component.tsx
@@ -39,7 +39,7 @@ export type CheckboxGroupProps = {
     /**
      * Отображение ошибки
      */
-    error?: string | boolean;
+    error?: ReactNode | boolean;
 
     /**
      * Текст подсказки снизу
@@ -129,7 +129,7 @@ export const CheckboxGroup: FC<CheckboxGroupProps> = ({
         );
     };
 
-    const errorMessage = typeof error === 'string' ? error : '';
+    const errorMessage = typeof error === 'boolean' ? '' : error;
 
     return (
         <div

diff --git a/packages/checkbox-group/src/__snapshots__/Component.test.tsx.snap b/packages/checkbox-group/src/__snapshots__/Component.test.tsx.snap
@@ -74,7 +74,6 @@ Object {
             </span>
           </label>
         </div>
-        
       </div>
     </div>
   </body>,
@@ -148,7 +147,6 @@ Object {
           </span>
         </label>
       </div>
-      
     </div>
   </div>,
   "debug": [Function],
@@ -454,7 +452,6 @@ Object {
             </span>
           </label>
         </div>
-        
       </div>
     </div>
   </body>,
@@ -490,7 +487,6 @@ Object {
           </span>
         </label>
       </div>
-      
     </div>
   </div>,
   "debug": [Function],
@@ -615,7 +611,6 @@ Object {
             />
           </label>
         </div>
-        
       </div>
     </div>
   </body>,
@@ -683,7 +678,6 @@ Object {
           />
         </label>
       </div>
-      
     </div>
   </div>,
   "debug": [Function],
@@ -756,7 +750,6 @@ Object {
         <div
           class="checkboxList"
         />
-        
       </div>
     </div>
   </body>,
@@ -772,7 +765,6 @@ Object {
       <div
         class="checkboxList"
       />
-      
     </div>
   </div>,
   "debug": [Function],

diff --git a/packages/date-input/src/__snapshots__/Component.test.tsx.snap b/packages/date-input/src/__snapshots__/Component.test.tsx.snap
@@ -25,7 +25,6 @@ exports[`DateInput Display tests should match snapshot 1`] = `
         class="addons rightAddons"
       />
     </div>
-    
   </div>
 </div>
 `;
diff --git a/packages/file-upload-item/src/Component.tsx b/packages/file-upload-item/src/Component.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEvent, useCallback } from 'react';
+import React, { MouseEvent, ReactNode, useCallback } from 'react';
 import cn from 'classnames';
 
 import { IconButton } from '@alfalab/core-components-icon-button';
@@ -68,7 +68,7 @@ export type FileUploadItemProps = {
     /**
      * Сообщение об ошибке
      */
-    error?: string;
+    error?: ReactNode;
 
     /**
      * Дочерние элементы

diff --git a/packages/form-control/src/Component.tsx b/packages/form-control/src/Component.tsx
@@ -44,7 +44,7 @@ export type FormControlProps = HTMLAttributes<HTMLDivElement> & {
     /**
      * Отображение ошибки
      */
-    error?: string | boolean;
+    error?: ReactNode | boolean;
 
     /**
      * Текст подсказки
@@ -127,7 +127,7 @@ export const FormControl = React.forwardRef<HTMLDivElement, FormControlProps>(
         },
         ref,
     ) => {
-        const errorMessage = typeof error === 'string' ? error : '';
+        const errorMessage = typeof error === 'boolean' ? '' : error;
 
         return (
             <div

diff --git a/packages/form-control/src/__snapshots__/Component.test.tsx.snap b/packages/form-control/src/__snapshots__/Component.test.tsx.snap
@@ -19,7 +19,6 @@ Object {
             />
           </div>
         </div>
-        
       </div>
     </div>
   </body>,
@@ -38,7 +37,6 @@ Object {
           />
         </div>
       </div>
-      
     </div>
   </div>,
   "debug": [Function],
@@ -220,7 +218,6 @@ Object {
         <div>
           Bottom addons
         </div>
-        
       </div>
     </div>
   </body>,
@@ -242,7 +239,6 @@ Object {
       <div>
         Bottom addons
       </div>
-      
     </div>
   </div>,
   "debug": [Function],
@@ -421,7 +417,6 @@ Object {
             />
           </div>
         </div>
-        
         <span
           class="sub hint"
         >
@@ -445,7 +440,6 @@ Object {
           />
         </div>
       </div>
-      
       <span
         class="sub hint"
       >
@@ -545,7 +539,6 @@ Object {
             />
           </div>
         </div>
-        
       </div>
     </div>
   </body>,
@@ -583,7 +576,6 @@ Object {
           />
         </div>
       </div>
-      
     </div>
   </div>,
   "debug": [Function],
@@ -666,7 +658,6 @@ Object {
             />
           </div>
         </div>
-        
       </div>
     </div>
   </body>,
@@ -692,7 +683,6 @@ Object {
           />
         </div>
       </div>
-      
     </div>
   </div>,
   "debug": [Function],
@@ -775,7 +765,6 @@ Object {
             </div>
           </div>
         </div>
-        
       </div>
     </div>
   </body>,
@@ -801,7 +790,6 @@ Object {
           </div>
         </div>
       </div>
-      
     </div>
   </div>,
   "debug": [Function],

diff --git a/packages/input/src/Component.tsx b/packages/input/src/Component.tsx
@@ -61,7 +61,7 @@ export type InputProps = Omit<
     /**
      * Отображение ошибки
      */
-    error?: string | boolean;
+    error?: ReactNode | boolean;
 
     /**
      * Отображение иконки успеха

diff --git a/packages/input/src/__snapshots__/Component.test.tsx.snap b/packages/input/src/__snapshots__/Component.test.tsx.snap
@@ -25,7 +25,6 @@ Object {
             </div>
           </div>
         </div>
-        
       </div>
     </div>
   </body>,
@@ -50,7 +49,6 @@ Object {
           </div>
         </div>
       </div>
-      
     </div>
   </div>,
   "debug": [Function],

diff --git a/packages/intl-phone-input/src/__snapshots__/component.test.tsx.snap b/packages/intl-phone-input/src/__snapshots__/component.test.tsx.snap
@@ -76,7 +76,6 @@ exports[`IntlPhoneInput should match snapshot 1`] = `
           </div>
         </div>
       </div>
-      
     </div>
   </div>
 </div>

diff --git a/packages/masked-input/src/__snapshots__/Component.test.tsx.snap b/packages/masked-input/src/__snapshots__/Component.test.tsx.snap
@@ -25,7 +25,6 @@ Object {
             </div>
           </div>
         </div>
-        
       </div>
     </div>
   </body>,
@@ -50,7 +49,6 @@ Object {
           </div>
         </div>
       </div>
-      
     </div>
   </div>,
   "debug": [Function],

diff --git a/packages/password-input/src/__snapshots__/component.test.tsx.snap b/packages/password-input/src/__snapshots__/component.test.tsx.snap
@@ -58,7 +58,6 @@ exports[`PasswordInput snapshots tests should match snapshot 1`] = `
           </button>
         </div>
       </div>
-      
     </div>
   </div>
 </body>

diff --git a/packages/phone-input/src/__snapshots__/Component.test.tsx.snap b/packages/phone-input/src/__snapshots__/Component.test.tsx.snap
@@ -25,7 +25,6 @@ Object {
             </div>
           </div>
         </div>
-        
       </div>
     </div>
   </body>,
@@ -50,7 +49,6 @@ Object {
           </div>
         </div>
       </div>
-      
     </div>
   </div>,
   "debug": [Function],