DRY up daysFromNow and isWeekend

WordPress · May 12, 2022 · 176fe23 · 176fe23
1 parent aca93e6
commit 176fe23
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/packages/components/src/date-time/stories/date.tsx b/packages/components/src/date-time/stories/date.tsx
@@ -7,6 +7,7 @@ import type { ComponentMeta, ComponentStory } from '@storybook/react';
  * Internal dependencies
  */
 import DatePicker from '../date';
+import { daysFromNow, isWeekend } from './utils';
 
 const meta: ComponentMeta< typeof DatePicker > = {
 	title: 'Components/DatePicker',
@@ -28,12 +29,6 @@ const Template: ComponentStory< typeof DatePicker > = ( args ) => (
 
 export const Default: ComponentStory< typeof DatePicker > = Template.bind( {} );
 
-function daysFromNow( days: number ) {
-	const date = new Date();
-	date.setDate( date.getDate() + days );
-	return date;
-}
-
 export const WithEvents: ComponentStory< typeof DatePicker > = Template.bind(
 	{}
 );
@@ -52,6 +47,5 @@ export const WithInvalidDates: ComponentStory<
 > = Template.bind( {} );
 WithInvalidDates.args = {
 	currentDate: new Date(),
-	// Mark Saturdays and Sundays as invalid.
-	isInvalidDate: ( date ) => date.getDay() === 0 || date.getDay() === 6,
+	isInvalidDate: isWeekend,
 };
diff --git a/packages/components/src/date-time/stories/index.tsx b/packages/components/src/date-time/stories/index.tsx
@@ -7,6 +7,7 @@ import type { ComponentMeta, ComponentStory } from '@storybook/react';
  * Internal dependencies
  */
 import DateTimePicker from '..';
+import { daysFromNow, isWeekend } from './utils';
 
 const meta: ComponentMeta< typeof DateTimePicker > = {
 	title: 'Components/DateTimePicker',
@@ -30,12 +31,6 @@ export const Default: ComponentStory< typeof DateTimePicker > = Template.bind(
 	{}
 );
 
-function daysFromNow( days: number ) {
-	const date = new Date();
-	date.setDate( date.getDate() + days );
-	return date;
-}
-
 export const WithEvents: ComponentStory<
 	typeof DateTimePicker
 > = Template.bind( {} );
@@ -54,6 +49,5 @@ export const WithInvalidDates: ComponentStory<
 > = Template.bind( {} );
 WithInvalidDates.args = {
 	currentDate: new Date(),
-	// Mark Saturdays and Sundays as invalid.
-	isInvalidDate: ( date ) => date.getDay() === 0 || date.getDay() === 6,
+	isInvalidDate: isWeekend,
 };
diff --git a/packages/components/src/date-time/stories/utils.ts b/packages/components/src/date-time/stories/utils.ts
@@ -0,0 +1,9 @@
+export function daysFromNow( days: number ) {
+	const date = new Date();
+	date.setDate( date.getDate() + days );
+	return date;
+}
+
+export function isWeekend( date: Date ) {
+	return date.getDay() === 0 || date.getDay() === 6;
+}