fix(kit): fix by review

taiga-family · Jul 20, 2023 · 2cc73ff · 2cc73ff
1 parent a3376a3
commit 2cc73ff
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/...ts/demo-integrations/cypress/tests/kit/date-range/date-range-custom-range-separator.cy.ts b/...ts/demo-integrations/cypress/tests/kit/date-range/date-range-custom-range-separator.cy.ts
@@ -11,7 +11,7 @@ describe('DateRange | CustomRangeSeparator', () => {
                 .as('input');
         });
 
-        it.only('14.12.1997~09.07.2015', () => {
+        it('14.12.1997~09.07.2015', () => {
             cy.get('@input')
                 .type('14121997972015')
                 .should('have.value', '14.12.1997~09.07.2015');

diff --git a/projects/demo/src/pages/kit/date-range/date-range-mask-doc.component.ts b/projects/demo/src/pages/kit/date-range/date-range-mask-doc.component.ts
@@ -8,8 +8,7 @@ import {
     MaskitoDateSegments,
 } from '@maskito/kit';
 import {TuiDocExample} from '@taiga-ui/addon-doc';
-import {CHAR_EN_DASH, CHAR_NO_BREAK_SPACE, tuiPure} from '@taiga-ui/cdk';
-import {DEFAULT_DATE_RANGE_SEPARATOR} from 'projects/kit/src/lib/masks/date-range';
+import {tuiPure} from '@taiga-ui/cdk';
 
 type GeneratorOptions = Required<
     NonNullable<Parameters<typeof maskitoDateRangeOptionsGenerator>[0]>
@@ -66,15 +65,17 @@ export class DateRangeMaskDocComponent implements GeneratorOptions {
     max = new Date(this.maxStr);
     minLength: Partial<MaskitoDateSegments<number>> = {};
     maxLength: Partial<MaskitoDateSegments<number>> = {};
-    rangeSeparator = DEFAULT_DATE_RANGE_SEPARATOR;
+    rangeSeparator = ' – ';
 
     maskitoOptions: MaskitoOptions = maskitoDateRangeOptionsGenerator(this);
 
     @tuiPure
-    getPlaceholder(mode: MaskitoDateMode, separator: string): string {
-        const datesSep = `${CHAR_NO_BREAK_SPACE}${CHAR_EN_DASH}${CHAR_NO_BREAK_SPACE}`;
-
-        return `${mode.replace(/\//g, separator)}${datesSep}${mode.replace(
+    getPlaceholder(
+        mode: MaskitoDateMode,
+        separator: string,
+        rangeSeparator: string,
+    ): string {
+        return `${mode.replace(/\//g, separator)}${rangeSeparator}${mode.replace(
             /\//g,
             separator,
         )}`;

diff --git a/projects/demo/src/pages/kit/date-range/date-range-mask-doc.template.html b/projects/demo/src/pages/kit/date-range/date-range-mask-doc.template.html
@@ -86,7 +86,9 @@
             <ng-template>
                 <tui-input
                     tuiTextfieldCustomContent="tuiIconCalendarLarge"
-                    [tuiTextfieldFiller]="getPlaceholder(mode, separator)"
+                    [tuiTextfieldFiller]="
+                        getPlaceholder(mode, separator, rangeSeparator)
+                    "
                     [formControl]="apiPageControl"
                 >
                     Enter dates
@@ -172,7 +174,7 @@
                 [(documentationPropertyValue)]="rangeSeparator"
                 (documentationPropertyValueChange)="updateOptions()"
             >
-                Range separator
+                Separator between dates of the date range.
                 <p>
                     <strong>Default:</strong>
                     <code> – </code>

diff --git a/projects/demo/src/pages/kit/date-range/examples/4-range-separator/component.ts b/projects/demo/src/pages/kit/date-range/examples/4-range-separator/component.ts
@@ -7,7 +7,6 @@ import mask from './mask';
     template: `
         <tui-input
             tuiTextfieldCustomContent="tuiIconCalendarLarge"
-            [tuiHintContent]="hint"
             [tuiTextfieldLabelOutside]="true"
             [tuiTextfieldFiller]="filler"
             [style.max-width.rem]="30"

diff --git a/projects/demo/src/pages/kit/date-range/examples/4-range-separator/mask.ts b/projects/demo/src/pages/kit/date-range/examples/4-range-separator/mask.ts
@@ -2,7 +2,5 @@ import {maskitoDateRangeOptionsGenerator} from '@maskito/kit';
 
 export default maskitoDateRangeOptionsGenerator({
     mode: 'dd/mm/yyyy',
-    minLength: {day: 3},
-    maxLength: {month: 1},
     rangeSeparator: ' ~ ',
 });
diff --git a/projects/kit/src/lib/masks/date-range/date-range-mask.ts b/projects/kit/src/lib/masks/date-range/date-range-mask.ts
@@ -10,16 +10,14 @@ import {MaskitoDateMode, MaskitoDateSegments} from '../../types';
 import {createMinMaxRangeLengthPostprocessor} from './processors/min-max-range-length-postprocessor';
 import {createSwapDatesPostprocessor} from './processors/swap-dates-postprocessor';
 
-export const DEFAULT_DATE_RANGE_SEPARATOR = `${CHAR_NO_BREAK_SPACE}${CHAR_EN_DASH}${CHAR_NO_BREAK_SPACE}`;
-
 export function maskitoDateRangeOptionsGenerator({
     mode,
     separator = '.',
     min,
     max,
     minLength,
     maxLength,
-    rangeSeparator = DEFAULT_DATE_RANGE_SEPARATOR,
+    rangeSeparator = `${CHAR_NO_BREAK_SPACE}${CHAR_EN_DASH}${CHAR_NO_BREAK_SPACE}`,
 }: {
     mode: MaskitoDateMode;
     separator?: string;