Skip to content

Commit 9db4adc

Browse files
authored
Merge pull request #53 from FluxityStellar/datepicker-button
fix datePicker bug
2 parents 4e318c5 + 995c658 commit 9db4adc

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/components/CDatePicker/datePickerStyles.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,13 @@ export const Wrapper = styled.div`
149149
.react-datepicker {
150150
box-shadow: none !important;
151151
width: 100%;
152+
padding: 0 0;
152153
}
153154
154155
.react-datepicker__day.react-datepicker__day {
155156
line-height: 2.1rem;
156157
font-size: 0.875rem;
157-
padding: 0 14px !important;
158+
padding: 0 13px !important;
158159
}
159160
}
160161
`;

src/components/CDatePicker/index.tsx

+5-3
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ const CDatePicker = ({
9595
};
9696

9797
const handleOpenSheet = () => {
98-
setIsOpenSheet(true);
98+
if (enabledDatePicker || readonly) {
99+
setIsOpenSheet(true);
100+
}
99101
};
100102

101103
const handleCloseSheetClick = () => {
@@ -176,7 +178,7 @@ const CDatePicker = ({
176178
</Wrapper>
177179

178180
<CBottomSheet
179-
contentClass="justify-center items-center"
181+
contentClass="justify-center items-center w-full"
180182
isSticky={isSticky}
181183
isModalOpen={isOpenSheet}
182184
setIsModalOpen={setIsOpenSheet}
@@ -210,7 +212,7 @@ const CDatePicker = ({
210212
<CButton
211213
variant="simple"
212214
color="blue"
213-
content="ok"
215+
content="Confirm"
214216
className="rounded-xl !py-5 !h-[60px]"
215217
onClick={handleConfirmSheetClick}
216218
/>

0 commit comments

Comments
 (0)