Merge pull request #2280 from epam/e2e/improvements

E2e/improvements

app/src/docs/TextInput.doc.tsx

@@ -57,11 +57,9 @@ export class TextInputDoc extends BaseDocsBlock {
             const w180_h80: TPreviewCellSize = '180-80';
             const w180_h50: TPreviewCellSize = '180-50';
             const formBaseMatrix: TMatrixLocal = { mode: { examples: ['form'] }, ...baseMatrix };
-            docPreview.add(TTextInputPreview['Form'], formBaseMatrix, w180_h80);
-            docPreview.add(TTextInputPreview['Form States'], { ...formBaseMatrix, ...statesBaseMatrix }, w180_h50);
-            const inlineBaseMatrix: TMatrixLocal = { mode: { examples: ['inline'] }, ...baseMatrix };
-            docPreview.add(TTextInputPreview['Inline'], inlineBaseMatrix, w180_h80);
-            docPreview.add(TTextInputPreview['Inline States'], { ...inlineBaseMatrix, ...statesBaseMatrix }, w180_h50);
+            docPreview.add(TTextInputPreview['Form Size Variants'], formBaseMatrix, w180_h80);
+            docPreview.add(TTextInputPreview['Inline Size Variants'], { mode: { examples: ['inline'] }, ...baseMatrix }, w180_h80);
+            docPreview.add(TTextInputPreview['Color Variants'], { mode: { examples: ['form', 'inline'] }, ...baseMatrix, ...statesBaseMatrix }, w180_h50);
         },
     };
 

app/src/docs/_types/previewIds.ts

@@ -20,13 +20,6 @@ export enum TAvatarStackPreview {
     'Bigger size' = 'Bigger size'
 }
 
-export enum TTextInputPreview {
-    'Form'= 'Form',
-    'Form States'= 'Form States',
-    'Inline'= 'Inline',
-    'Inline States'= 'Inline States'
-}
-
 export enum TAccordionPreview {
     Expanded = 'Expanded',
     Collapsed = 'Collapsed'
@@ -61,16 +54,6 @@ export enum TPickerInputPreview {
     'Cell MultiSelect Multiline States'= 'Cell MultiSelect Multiline States'
 }
 
-export enum TDatePickerPreview {
-    Form = 'Form',
-    'Form Opened' = 'Form Opened',
-    'Form States' = 'Form States',
-    Cell = 'Cell',
-    'Cell States' = 'Cell States',
-    Inline = 'Inline',
-    'Inline States' = 'Inline States'
-}
-
 export const TBadgePreview = { ...UTILS.SizeVariants, ...UTILS.ColorVariants };
 export const TCheckboxPreview = { ...UTILS.CommonVariants };
 export const TCountIndicatorPreview = { ...UTILS.SizeVariants, ...UTILS.ColorVariants };
@@ -117,3 +100,13 @@ export const TRangeDatePickerPreview = {
     Opened: 'Opened' as const,
     'Opened With Presets': 'Opened With Presets' as const,
 };
+export const TTextInputPreview = {
+    'Form Size Variants': 'Form Size Variants' as const,
+    'Inline Size Variants': 'Inline Size Variants' as const,
+    ...UTILS.ColorVariants,
+};
+export const TDatePickerPreview = {
+    ...UTILS.SizeVariants,
+    ...UTILS.ColorVariants,
+    'Form Opened': 'Form Opened' as const,
+};

app/src/docs/datePicker/DatePicker.doc.tsx

@@ -57,26 +57,13 @@ export class DatePickerDoc extends BaseDocsBlock {
             };
             const w180_h60: TPreviewCellSize = '180-60';
             const w320_h400: TPreviewCellSize = '320-400';
-            /**
-             * Form
-             */
-            docPreview.add(TDatePickerPreview.Form, { mode: { values: ['form'] }, ...baseMatrix }, w180_h60);
-            docPreview.add(TDatePickerPreview['Form States'], { mode: { values: ['form'] }, ...baseMatrix, ...statesBaseMatrix }, w180_h60);
+            docPreview.add(TDatePickerPreview['Size Variants'], { mode: { values: ['form', 'inline', 'cell'] }, ...baseMatrix }, w180_h60);
+            docPreview.add(TDatePickerPreview['Color Variants'], { mode: { values: ['form', 'inline', 'cell'] }, ...baseMatrix, ...statesBaseMatrix }, w180_h60);
             docPreview.add({
                 id: TDatePickerPreview['Form Opened'],
                 matrix: { value: { values: [TEST_DATA.value] } },
                 cellSize: w320_h400,
             });
-            /**
-             * Inline
-             */
-            docPreview.add(TDatePickerPreview.Inline, { mode: { values: ['inline'] }, ...baseMatrix }, w180_h60);
-            docPreview.add(TDatePickerPreview['Inline States'], { mode: { values: ['inline'] }, ...baseMatrix, ...statesBaseMatrix }, w180_h60);
-            /**
-             * Cell
-             */
-            docPreview.add(TDatePickerPreview.Cell, { mode: { values: ['cell'] }, ...baseMatrix }, w180_h60);
-            docPreview.add(TDatePickerPreview['Cell States'], { mode: { values: ['cell'] }, ...baseMatrix, ...statesBaseMatrix }, w180_h60);
         },
     };
 

uui-e2e-tests/src/data/previewIds.ts

@@ -20,13 +20,6 @@ export enum TAvatarStackPreview {
     'Bigger size' = 'Bigger size'
 }
 
-export enum TTextInputPreview {
-    'Form'= 'Form',
-    'Form States'= 'Form States',
-    'Inline'= 'Inline',
-    'Inline States'= 'Inline States'
-}
-
 export enum TAccordionPreview {
     Expanded = 'Expanded',
     Collapsed = 'Collapsed'
@@ -61,16 +54,6 @@ export enum TPickerInputPreview {
     'Cell MultiSelect Multiline States'= 'Cell MultiSelect Multiline States'
 }
 
-export enum TDatePickerPreview {
-    Form = 'Form',
-    'Form Opened' = 'Form Opened',
-    'Form States' = 'Form States',
-    Cell = 'Cell',
-    'Cell States' = 'Cell States',
-    Inline = 'Inline',
-    'Inline States' = 'Inline States'
-}
-
 export const TBadgePreview = { ...UTILS.SizeVariants, ...UTILS.ColorVariants };
 export const TCheckboxPreview = { ...UTILS.CommonVariants };
 export const TCountIndicatorPreview = { ...UTILS.SizeVariants, ...UTILS.ColorVariants };
@@ -117,3 +100,13 @@ export const TRangeDatePickerPreview = {
     Opened: 'Opened' as const,
     'Opened With Presets': 'Opened With Presets' as const,
 };
+export const TTextInputPreview = {
+    'Form Size Variants': 'Form Size Variants' as const,
+    'Inline Size Variants': 'Inline Size Variants' as const,
+    ...UTILS.ColorVariants,
+};
+export const TDatePickerPreview = {
+    ...UTILS.SizeVariants,
+    ...UTILS.ColorVariants,
+    'Form Opened': 'Form Opened' as const,
+};

uui-e2e-tests/src/data/testData.ts

@@ -118,7 +118,7 @@ export type TPreviewIdByComponentId = {
     [TComponentId.button]: TPreviewIds<typeof TButtonPreview>,
     [TComponentId.checkbox]: TPreviewIds<typeof TCheckboxPreview>,
     [TComponentId.countIndicator]: TPreviewIds<typeof TCountIndicatorPreview>,
-    [TComponentId.datePicker]: TDatePickerPreview[],
+    [TComponentId.datePicker]: TPreviewIds<typeof TDatePickerPreview>,
     [TComponentId.iconButton]: TPreviewIds<typeof TIconButtonPreview>,
     [TComponentId.linkButton]: TPreviewIds<typeof TLinkButtonPreview>,
     [TComponentId.pickerInput]: TPickerInputPreview[],
@@ -128,7 +128,7 @@ export type TPreviewIdByComponentId = {
     [TComponentId.tag]: TPreviewIds<typeof TTagPreview>,
     [TComponentId.text]: TPreviewIds<typeof TTextPreview>,
     [TComponentId.textArea]: TPreviewIds<typeof TTextAreaPreview>,
-    [TComponentId.textInput]: TTextInputPreview[],
+    [TComponentId.textInput]: TPreviewIds<typeof TTextInputPreview>,
     [TComponentId.verticalTabButton]: TPreviewIds<typeof TVerticalTabButtonPreview>,
     [TComponentId.numericInput]: TPreviewIds<typeof TNumericInputPreview>,
     [TComponentId.radioInput]: TPreviewIds<typeof TRadioInputPreview>,