Merge pull request #168 from uvarov-frontend/fix/types_css_classes

Fixing CSS Class Types
uvarov-frontend · Dec 9, 2023 · f0c48db · f0c48db
2 parents 79352ca + 3bd2df4
commit f0c48db
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 85 deletions.
diff --git a/package/index.d.ts b/package/index.d.ts
@@ -10,7 +10,7 @@ export type Visibility = T.IVisibility;
 export type Locale = T.ILocale;
 export type Actions = T.IActions;
 export type Popups = T.IPopups;
-export type CSSClasses = T.ICSSClasses;
+export type CSSClasses = T.CSSClasses;
 export type DOMTemplates = T.IDOMTemplates;
 export type FormatDateString = T.FormatDateString;
 export type Reset = T.IReset;
@@ -34,7 +34,7 @@ export default class VanillaCalendar implements T.IVanillaCalendar {
 	locale: T.ILocale;
 	actions: T.IActions;
 	popups: T.IPopups;
-	CSSClasses: T.ICSSClasses;
+	CSSClasses: T.CSSClasses;
 	DOMTemplates: T.IDOMTemplates;
 
 	init: () => void;

diff --git a/package/src/scripts/default.ts b/package/src/scripts/default.ts
@@ -75,7 +75,7 @@ export default class DefaultOptionsCalendar {
 		showCalendar: null,
 	};
 	popups: T.IPopups = {};
-	CSSClasses: T.ICSSClasses = { ...classes };
+	CSSClasses: T.CSSClasses = { ...classes };
 	DOMTemplates: T.IDOMTemplates = {
 		default: DOMDefault(this.CSSClasses),
 		multiple: DOMMultiple(this.CSSClasses),

diff --git a/package/src/scripts/templates/DOMDefault.ts b/package/src/scripts/templates/DOMDefault.ts
@@ -1,6 +1,6 @@
-import { ICSSClasses } from '@package/types';
+import { CSSClasses } from '@package/types';
 
-const DOMDefault = (styles: ICSSClasses) => (`
+const DOMDefault = (styles: CSSClasses) => (`
 	<div class="${styles.header}">
 		<#ArrowPrev />
 		<div class="${styles.headerContent}">

diff --git a/package/src/scripts/templates/DOMMonth.ts b/package/src/scripts/templates/DOMMonth.ts
@@ -1,6 +1,6 @@
-import { ICSSClasses } from '@package/types';
+import { CSSClasses } from '@package/types';
 
-const DOMMonths = (styles: ICSSClasses) => (`
+const DOMMonths = (styles: CSSClasses) => (`
 	<div class="${styles.header}">
 		<div class="${styles.headerContent}">
 			<#Month />

diff --git a/package/src/scripts/templates/DOMMultiple.ts b/package/src/scripts/templates/DOMMultiple.ts
@@ -1,6 +1,6 @@
-import { ICSSClasses } from '@package/types';
+import { CSSClasses } from '@package/types';
 
-const DOMMultiple = (styles: ICSSClasses) => (`
+const DOMMultiple = (styles: CSSClasses) => (`
 	<div class="${styles.controls}">
 		<#ArrowPrev />
 		<#ArrowNext />

diff --git a/package/src/scripts/templates/DOMYear.ts b/package/src/scripts/templates/DOMYear.ts
@@ -1,6 +1,6 @@
-import { ICSSClasses } from '@package/types';
+import { CSSClasses } from '@package/types';
 
-const DOMYears = (styles: ICSSClasses) => (`
+const DOMYears = (styles: CSSClasses) => (`
 	<div class="${styles.header}">
 		<#ArrowPrev />
 		<div class="${styles.headerContent}">

diff --git a/package/types.ts b/package/types.ts
@@ -1,10 +1,14 @@
+import classes from './classes';
+
 type LeadingZero = `${0}${1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9}`;
 type MM = LeadingZero | 10 | 11 | 12;
 type DD = LeadingZero | `${1 | 2}${0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9}` | 30 | 31;
 export type FormatDateString = `${number}-${MM}-${DD}`;
 
 export type TypesCalendar = 'default' | 'multiple' | 'month' | 'year';
 
+export type CSSClasses = typeof classes;
+
 export interface IDates {
 	min: FormatDateString;
 	max: FormatDateString;
@@ -103,78 +107,6 @@ export interface IDOMTemplates {
 	year: string;
 }
 
-export interface ICSSClasses {
-	calendar: string;
-	calendarDefault: string;
-	calendarMultiple: string;
-	calendarMonth: string;
-	calendarYear: string;
-	calendarHidden: string;
-	calendarToInput: string;
-	controls: string;
-	grid: string;
-	gridDisabled: string;
-	column: string;
-	columnMonth: string;
-	columnYear: string;
-	header: string;
-	headerContent: string;
-	month: string;
-	monthDisabled: string;
-	year: string;
-	yearDisabled: string;
-	arrow: string;
-	arrowPrev: string;
-	arrowNext: string;
-	wrapper: string;
-	content: string;
-	week: string;
-	weekDay: string;
-	weekDayWeekend: string;
-	days: string;
-	daysSelecting: string;
-	months: string;
-	monthsSelecting: string;
-	monthsMonth: string;
-	monthsMonthSelected: string;
-	monthsMonthDisabled: string;
-	years: string;
-	yearsSelecting: string;
-	yearsYear: string;
-	yearsYearSelected: string;
-	yearsYearDisabled: string;
-	time: string;
-	timeContent: string;
-	timeHours: string;
-	timeMinutes: string;
-	timeKeeping: string;
-	timeRanges: string;
-	timeRange: string;
-	day: string;
-	daySelected: string;
-	daySelectedFirst: string;
-	daySelectedLast: string;
-	daySelectedIntermediate: string;
-	dayPopup: string;
-	dayBtn: string;
-	dayBtnPrev: string;
-	dayBtnNext: string;
-	dayBtnSelected: string;
-	dayBtnSelectedFirst: string;
-	dayBtnSelectedLast: string;
-	dayBtnSelectedIntermediate: string;
-	dayBtnHover: string;
-	dayBtnDisabled: string;
-	dayBtnToday: string;
-	dayBtnWeekend: string;
-	dayBtnHoliday: string;
-	weekNumbers: string;
-	weekNumbersTitle: string;
-	weekNumbersContent: string;
-	weekNumber: string;
-	isFocus: string;
-}
-
 export interface IReset {
 	year?: boolean;
 	month?: boolean;
@@ -200,7 +132,7 @@ export interface IOptions {
 	locale?: Partial<ILocale>;
 	actions?: Partial<IActions>;
 	popups?: IPopups;
-	CSSClasses?: Partial<ICSSClasses>;
+	CSSClasses?: Partial<CSSClasses>;
 	DOMTemplates?: Partial<IDOMTemplates>;
 }
 
@@ -221,7 +153,7 @@ export interface IVanillaCalendar {
 	locale: ILocale;
 	actions: IActions;
 	popups: IPopups;
-	CSSClasses: ICSSClasses;
+	CSSClasses: CSSClasses;
 	DOMTemplates: IDOMTemplates;
 
 	init: () => void;