amalia/23-okt-25 #1

Merged
amaliadwiy merged 203 commits from amalia/23-okt-25 into join 2025-10-27 11:19:44 +08:00
230 changed files with 8462 additions and 2549 deletions
Showing only changes of commit 7d5ec511f5 - Show all commits

View File

@@ -28,7 +28,7 @@ type Props = {
export function InputDate({ label, value, placeholder, onChange, info, disable, error, errorText, required, mode, round, width, }: Props) { export function InputDate({ label, value, placeholder, onChange, info, disable, error, errorText, required, mode, round, width, }: Props) {
const [modal, setModal] = useState(false); const [modal, setModal] = useState(false);
const [valueFix, setValueFix] = useState(new Date()) const [valueFix, setValueFix] = useState(new Date())
const [valueFirst, setValueFirst] = useState("") const [valueFirst, setValueFirst] = useState(mode == "date" ? dayjs(new Date()).format("DD-MM-YYYY") : mode == "time" ? dayjs(new Date()).format("HH:mm") : "")
const onChangeDate = (type: string, selectedDate: any) => { const onChangeDate = (type: string, selectedDate: any) => {
if (type === "set") { if (type === "set") {
@@ -45,6 +45,8 @@ export function InputDate({ label, value, placeholder, onChange, info, disable,
onChange(formatted) onChange(formatted)
setModal(false) setModal(false)
} }
} else if (type === "dismissed") {
setModal(false)
} }
}; };
@@ -100,11 +102,8 @@ export function InputDate({ label, value, placeholder, onChange, info, disable,
value={valueFix} value={valueFix}
mode={mode} mode={mode}
display="spinner" display="spinner"
onChange={(event, date) => { onChange={(event, date) => { onChangeDate(event.type, date) }}
onChangeDate(event.type, date)
}}
onTouchCancel={() => setModal(false)} onTouchCancel={() => setModal(false)}
/> />
</ModalFloat> </ModalFloat>
) )
@@ -115,7 +114,7 @@ export function InputDate({ label, value, placeholder, onChange, info, disable,
mode={mode} mode={mode}
display="inline" display="inline"
onChange={(event, date) => { onChangeDate(event.type, date) }} onChange={(event, date) => { onChangeDate(event.type, date) }}
onTouchCancel={() => setModal(false)} onTouchCancel={() => { setModal(false) }}
/> />
) )
) )