Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

style(RangeCalendarStyled): 💄 convert story to vanilla css #402

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

style(RangeCalendarStyled): 💄 convert story to vanilla css #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7f98c8c
style(calendarStyled): 💄 Convert calendarStyled Story to Vanilla CSS
mcnaveen Nov 7, 2022
3193476
style(styledCalender): 💄 Make cursor as pointer on chevron buttons
mcnaveen Nov 7, 2022
58158b9
style(calendarStyled): 💄 Changes
mcnaveen Nov 7, 2022
274c6e3
fix(styledCalendar): 🐛 fixes aria-selected and deleted attr
mcnaveen Nov 10, 2022
2f2e97e
chore(calendarStyled): :fire: remove tailwind.css
mcnaveen Nov 10, 2022
806eef0
style(RangeCalendarStyled): :lipstick: convert story to vanilla css
mcnaveen Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 9 additions & 19 deletions src/calendar/stories/CalendarStyled.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import {

import { ChevronLeft, ChevronRight } from "./Utils.component";

import "./CalendarStyled.css";

export type CalendarStyledProps = Omit<
CalendarBaseStateProps,
"locale" | "createCalendar"
Expand All @@ -34,26 +36,14 @@ export const CalendarStyled: React.FC<CalendarStyledProps> = props => {
const calendar = useCalendarState({ ...props, state });

return (
<Calendar
state={calendar}
className="p-3 bg-white rounded-md shadow-lg styled-datepicker calendar w-max"
>
<div className="flex justify-between">
<CalendarPreviousButton
state={calendar}
className="text-gray-700 px-2 py-1 rounded-md focus:outline-none focus:ring-2 focus:ring-border-400"
>
<ChevronLeft className="flex-shrink-0 w-4" />
<Calendar state={calendar} className="calendar">
<div className="calendar--wrapper">
<CalendarPreviousButton state={calendar} className="calendar__button">
<ChevronLeft className="calendar__button_chevron" />
</CalendarPreviousButton>
<CalendarTitle
state={calendar}
className="text-sm font-bold text-gray-700 px-2 py-1"
/>
<CalendarNextButton
state={calendar}
className="text-gray-700 px-2 py-1 rounded-md focus:outline-none focus:ring-2 focus:ring-border-400"
>
<ChevronRight className="flex-shrink-0 w-4" />
<CalendarTitle state={calendar} className="calendar__title" />
<CalendarNextButton state={calendar} className="calendar__button">
<ChevronRight className="calendar__button_chevron" />
</CalendarNextButton>
</div>
<CalendarGridComp state={state} />
Expand Down
82 changes: 82 additions & 0 deletions src/calendar/stories/CalendarStyled.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
.calendar {
padding: 1rem;
background-color: #ffffff;
width: max-content;
border-radius: 0.375rem;
box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1),
0 4px 6px -2px rgba(0, 0, 0, 0.05);
}

.calendar--wrapper {
display: flex;
justify-content: space-between;
}

.calendar__button {
padding-top: 0.25rem;
padding-bottom: 0.25rem;
padding-left: 0.5rem;
padding-right: 0.5rem;
color: #374151;
background-color: #ffffff !important;
border-radius: 0.375rem;
border: none !important;
}

.calendar__button:focus {
cursor: pointer;
outline: none;
}

.calendar__button_chevron {
flex-shrink: 0;
width: 1rem;
cursor: pointer;
}

.calendar__title {
padding-top: 0.25rem;
padding-bottom: 0.25rem;
padding-left: 0.5rem;
padding-right: 0.5rem;
color: #374151;
font-size: 0.875rem;
line-height: 1.25rem;
font-weight: 700;
}

.dates {
padding: 0.75rem;
}

.calendar [data-weekend] {
color: #dc2626;
}

.calendar [aria-selected="true"] {
color: #ffffff;
background-color: #3b82f6;
}

.calendar [aria-selected="true"] {
color: #ffffff;
background-color: #3b82f6;
}

.calendar [aria-selected]:focus-within {
background-color: #f3f4f6;
}

.calendar [aria-selected="true"]:focus-within {
color: #ffffff;
background-color: #3b82f6;
}

.calendar [aria-disabled="true"] {
color: #6b7280;
}

.calendar span {
outline: none;
cursor: pointer;
}
8 changes: 0 additions & 8 deletions src/calendar/stories/CalendarStyled.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import jsUtils from "./templates/UtilsJsx";
import tsUtils from "./templates/UtilsTsx";
import { CalendarStyled } from "./CalendarStyled.component";

import "./tailwind.css";

type Meta = ComponentMeta<typeof CalendarStyled>;
// type Story = ComponentStoryObj<typeof CalendarStyled>;

Expand All @@ -21,12 +19,6 @@ export default {
layout: "centered",
preview: createPreviewTabs({ js, ts, jsUtils, tsUtils }),
},
decorators: [
Story => {
document.body.id = "tailwind";
return <Story />;
},
],
} as Meta;

export const Default = () => {
Expand Down
53 changes: 0 additions & 53 deletions src/calendar/stories/tailwind.css
View file
Open in desktop

This file was deleted.

25 changes: 9 additions & 16 deletions src/range-calendar/stories/RangeCalendarStyled.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import {
useRangeCalendarState,
} from "../../index";

import "./RangeCalendarStyled.css";

export type RangeCalendarStyledProps = Omit<
RangeCalendarBaseStateProps,
"locale" | "createCalendar"
Expand All @@ -38,26 +40,17 @@ export const RangeCalendarStyled: React.FC<
const calendar = useRangeCalendarState({ ...props, state });

return (
<RangeCalendar
state={calendar}
className="p-3 bg-white rounded-md shadow-lg styled-datepicker calendar w-max"
>
<div className="flex justify-between">
<RangeCalendar state={calendar} className="rangecalendar">
<div className="rangecalendar--wrapper">
<CalendarPreviousButton
state={calendar}
className="text-gray-700 px-2 py-1 rounded-md focus:outline-none focus:ring-2 focus:ring-border-400"
className="rangecalendar__button"
>
<ChevronLeft className="flex-shrink-0 w-4" />
<ChevronLeft className="rangecalendar__button_chevron" />
</CalendarPreviousButton>
<CalendarTitle
state={calendar}
className="text-sm font-bold text-gray-700 px-2 py-1"
/>
<CalendarNextButton
state={calendar}
className="text-gray-700 px-2 py-1 rounded-md focus:outline-none focus:ring-2 focus:ring-border-400"
>
<ChevronRight className="flex-shrink-0 w-4" />
<CalendarTitle state={calendar} className="rangecalendar__title" />
<CalendarNextButton state={calendar} className="rangecalendar__button">
<ChevronRight className="rangecalendar__button_chevron" />
</CalendarNextButton>
</div>
<CalendarGridComp state={state} />
Expand Down
99 changes: 99 additions & 0 deletions src/range-calendar/stories/RangeCalendarStyled.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
.rangecalendar {
padding: 1rem;
background-color: #ffffff;
width: max-content;
border-radius: 0.375rem;
box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1),
0 4px 6px -2px rgba(0, 0, 0, 0.05);
}

.rangecalendar--wrapper {
display: flex;
justify-content: space-between;
}

.rangecalendar__button {
padding-top: 0.25rem;
padding-bottom: 0.25rem;
padding-left: 0.5rem;
padding-right: 0.5rem;
color: #374151;
background-color: #ffffff !important;
border-radius: 0.375rem;
border: none !important;
}

.rangecalendar__button:focus {
cursor: pointer;
outline: none;
}

.rangecalendar__button_chevron {
flex-shrink: 0;
width: 1rem;
cursor: pointer;
}

.rangecalendar__title {
padding-top: 0.25rem;
padding-bottom: 0.25rem;
padding-left: 0.5rem;
padding-right: 0.5rem;
color: #374151;
font-size: 0.875rem;
line-height: 1.25rem;
font-weight: 700;
}

.dates {
padding: 0.75rem;
}

.rangecalendar[data-is-range-selection] {
background-color: #dbeafe;
color: #1f2937;
border-radius: 0;
}
.rangecalendar[data-is-selection-start] {
color: #ffffff !important;
background-color: #3b82f6 !important;
}
.rangecalendar[data-is-selection-end] {
color: #ffffff !important;
background-color: #3b82f6 !important;
}

.rangecalendar[data-is-range-selection]:focus-within {
color: #ffffff !important;
background-color: #3b82f6 !important;
}
.rangecalendar:focus-within {
color: #6b7280;
}

.rangecalendar [data-weekend] {
color: #dc2626;
}

.rangecalendar [aria-selected="true"] {
color: #ffffff;
background-color: #3b82f6;
}

.rangecalendar [aria-selected]:focus-within {
color: #6b7280;
}

.rangecalendar [aria-selected="true"]:focus-within {
color: #ffffff;
background-color: #3b82f6;
}

.rangecalendar [aria-disabled="true"] {
color: #6b7280;
}

.rangecalendar span {
outline: none;
cursor: pointer;
}
8 changes: 0 additions & 8 deletions src/range-calendar/stories/RangeCalendarStyled.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import jsUtils from "./templates/UtilsJsx";
import tsUtils from "./templates/UtilsTsx";
import { RangeCalendarStyled } from "./RangeCalendarStyled.component";

import "./tailwind.css";

type Meta = ComponentMeta<typeof RangeCalendarStyled>;

export default {
Expand All @@ -20,12 +18,6 @@ export default {
layout: "centered",
preview: createPreviewTabs({ js, ts, jsUtils, tsUtils }),
},
decorators: [
Story => {
document.body.id = "tailwind";
return <Story />;
},
],
} as Meta;

export const Default = () => {
Expand Down
Loading