-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(web): time disappear on cancel timeline popup (#1220)
Co-authored-by: lby <[email protected]>
- Loading branch information
1 parent
3016a71
commit 6a96cb9
Showing
19 changed files
with
372 additions
and
404 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
web/src/beta/lib/reearth-ui/components/ClickAway/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import { FC, ReactNode, useEffect, useRef } from "react"; | ||
|
|
||
| type ClickAwayProps = { | ||
| children: ReactNode; | ||
| onClickAway?: () => void; | ||
| }; | ||
|
|
||
| export const ClickAway: FC<ClickAwayProps> = ({ children, onClickAway }) => { | ||
| const containerRef = useRef<HTMLDivElement>(null); | ||
|
|
||
| useEffect(() => { | ||
| if (!onClickAway) return; | ||
|
|
||
| const handleClickOutside = (event: MouseEvent | TouchEvent) => { | ||
| if ( | ||
| containerRef.current && | ||
| !containerRef.current.contains(event.target as Node) | ||
| ) { | ||
| onClickAway?.(); | ||
| } | ||
| }; | ||
|
|
||
| document.addEventListener("mousedown", handleClickOutside, { | ||
| passive: true | ||
| }); | ||
| document.addEventListener("touchstart", handleClickOutside, { | ||
| passive: true | ||
| }); | ||
|
|
||
| return () => { | ||
| document.removeEventListener("mousedown", handleClickOutside); | ||
| document.removeEventListener("touchstart", handleClickOutside); | ||
| }; | ||
| }, [onClickAway]); | ||
|
|
||
| return <div ref={containerRef}>{children}</div>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
107 changes: 107 additions & 0 deletions
107
web/src/beta/ui/fields/TimePeriodField/EditPanel/hooks.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| import { getTimeZone, isValidDateTimeFormat } from "@reearth/beta/utils/time"; | ||
| import { useCallback, useEffect, useMemo, useState } from "react"; | ||
|
|
||
| import { TimePeriodFieldProp } from ".."; | ||
|
|
||
| type Props = { | ||
| timePeriodValues?: TimePeriodFieldProp; | ||
| onChange?: (value?: TimePeriodFieldProp) => void; | ||
| onClose?: () => void; | ||
| }; | ||
|
|
||
| export default ({ timePeriodValues, onChange, onClose }: Props) => { | ||
| const [timeRangeInvalid, setTimeRangeInvalid] = useState(false); | ||
|
|
||
| const [localValue, setLocalValue] = useState(timePeriodValues); | ||
|
|
||
| useEffect(() => { | ||
| setLocalValue(timePeriodValues); | ||
| }, [timePeriodValues]); | ||
|
|
||
| const handleChange = useCallback( | ||
| (newValue: string, fieldId: string) => { | ||
| const updatedData: TimePeriodFieldProp = { | ||
| ...(localValue ?? {}), | ||
| currentTime: localValue?.currentTime || "", | ||
| startTime: localValue?.startTime || "", | ||
| endTime: localValue?.endTime || "" | ||
| }; | ||
|
|
||
| switch (fieldId) { | ||
| case "startTime": | ||
| updatedData.startTime = newValue || ""; | ||
| break; | ||
| case "currentTime": | ||
| updatedData.currentTime = newValue; | ||
| if ( | ||
| (updatedData.startTime && | ||
| new Date(updatedData.currentTime.substring(0, 19)) < | ||
| new Date(updatedData.startTime.substring(0, 19))) || | ||
| new Date(updatedData.currentTime.substring(0, 19)) > | ||
| new Date(updatedData.endTime.substring(0, 19)) | ||
| ) { | ||
| setTimeRangeInvalid(true); | ||
| } else { | ||
| setTimeRangeInvalid(false); | ||
| } | ||
| break; | ||
| case "endTime": | ||
| updatedData.endTime = newValue; | ||
| if ( | ||
| updatedData.endTime && | ||
| new Date(updatedData.currentTime.substring(0, 19)) > | ||
| new Date(updatedData?.endTime?.substring(0, 19)) | ||
| ) { | ||
| setTimeRangeInvalid(true); | ||
| } else { | ||
| setTimeRangeInvalid(false); | ||
| } | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| setLocalValue(updatedData); | ||
| }, | ||
| [localValue] | ||
| ); | ||
|
|
||
| const handleSubmit = useCallback(() => { | ||
| if ( | ||
| localValue && | ||
| isValidDateTimeFormat(localValue?.startTime) && | ||
| isValidDateTimeFormat(localValue?.currentTime) && | ||
| isValidDateTimeFormat(localValue?.endTime) | ||
| ) { | ||
| onChange?.(localValue); | ||
| } | ||
| onClose?.(); | ||
| }, [localValue, onChange, onClose]); | ||
|
|
||
| const submitDisabled = useMemo(() => { | ||
| if ( | ||
| !localValue?.startTime || | ||
| !localValue?.currentTime || | ||
| !localValue?.endTime || | ||
| timeRangeInvalid | ||
| ) { | ||
| return true; | ||
| } | ||
|
|
||
| const startTimezone = getTimeZone(localValue?.startTime); | ||
| const currentTimezone = getTimeZone(localValue?.currentTime); | ||
| const endTimezone = getTimeZone(localValue?.endTime); | ||
| if (startTimezone !== currentTimezone || currentTimezone !== endTimezone) { | ||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| }, [localValue, timeRangeInvalid]); | ||
|
|
||
| return { | ||
| timeRangeInvalid, | ||
| submitDisabled, | ||
| localValue, | ||
| handleChange, | ||
| handleSubmit | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.