Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

improvement

Ashish Viradiya3fa632788079
diff --git a/components/links/link-sheet/expiration-section.tsx b/components/links/link-sheet/expiration-section.tsx
index 53ea2768..a89ef1a2 100644
--- a/components/links/link-sheet/expiration-section.tsx
+++ b/components/links/link-sheet/expiration-section.tsx
@@ -38,13 +38,12 @@ export default function ExpirationSection({
>;
}) {
const { expiresAt } = data;
- console.log("expiresAt", expiresAt);
const [enabled, setEnabled] = useState<boolean>(false);
const [selectedPreset, setSelectedPreset] = useState<string>("");
const [error, setError] = useState<string | null>(null);
const [customDate, setCustomDate] = useState<Date | null>(null);
+ const [dataWasJustEnabled, setDataWasJustEnabled] = useState<boolean>(false);
- // Initialize state based on existing expiration
useEffect(() => {
setEnabled(!!expiresAt && !data.expiresIn);
@@ -64,12 +63,24 @@ export default function ExpirationSection({
if (matchingPreset) {
setSelectedPreset(matchingPreset.value.toString());
+ setCustomDate(null);
} else {
- setSelectedPreset("custom");
- setCustomDate(expirationDate);
+ if (!dataWasJustEnabled) {
+ setSelectedPreset("custom");
+ setCustomDate(expirationDate);
+ } else {
+ setSelectedPreset("");
+ setCustomDate(null);
+ }
}
}
- }, [expiresAt, data.expiresIn]);
+ }, [data, expiresAt, dataWasJustEnabled]);
+
+ useEffect(() => {
+ if (dataWasJustEnabled) {
+ setDataWasJustEnabled(false);
+ }
+ }, [dataWasJustEnabled]);
const handleEnableExpiration = () => {
if (enabled) {
@@ -78,6 +89,7 @@ export default function ExpirationSection({
setError(null);
setCustomDate(null);
setEnabled(false);
+ setDataWasJustEnabled(false);
} else {
const defaultExpiration = new Date();
defaultExpiration.setDate(defaultExpiration.getDate() + 7); // Default to 7 days
@@ -89,6 +101,7 @@ export default function ExpirationSection({
setSelectedPreset("86400"); // 1 day in seconds
setCustomDate(defaultExpiration);
setEnabled(true);
+ setDataWasJustEnabled(true);
}
};
@@ -183,7 +196,6 @@ export default function ExpirationSection({
value={customDate}
onChange={handleCustomDateChange}
placeholder='e.g. "in 2 days", "next Friday at 3pm", "December 25th at 9am"'
- showCalendarIcon={false}
/>
<div className="relative">
<div className="absolute inset-0 flex items-center">
diff --git a/components/links/link-sheet/expirationIn-section.tsx b/components/links/link-sheet/expirationIn-section.tsx
index c87a2edf..fc64ea09 100644
--- a/components/links/link-sheet/expirationIn-section.tsx
+++ b/components/links/link-sheet/expirationIn-section.tsx
@@ -1,6 +1,4 @@
-import { useEffect, useState } from "react";
-
-
+import { useCallback, useEffect, useState } from "react";
import { motion } from "motion/react";
@@ -39,12 +37,17 @@ export default function ExpirationInSection({
const [error, setError] = useState<string | null>(null);
const [customDate, setCustomDate] = useState<Date | null>(null);
+ const resetStates = useCallback(() => {
+ setSelectedPreset("");
+ setError(null);
+ setCustomDate(null);
+ }, []);
+
// Initialize state based on existing expiresIn data
useEffect(() => {
if (!data.expiresIn) {
setEnabled(false);
- setSelectedPreset("");
- setCustomDate(null);
+ resetStates();
return;
}
@@ -72,16 +75,14 @@ export default function ExpirationInSection({
}
}, [data.expiresIn]);
- const handleEnableExpiration = () => {
+ const handleEnableExpiration = useCallback(() => {
if (enabled) {
setData({
...data,
expiresIn: null,
expiresAt: null,
});
- setSelectedPreset("");
- setError(null);
- setCustomDate(null);
+ resetStates();
} else {
// Enable with default 7 days expiration
setData({
@@ -94,62 +95,66 @@ export default function ExpirationInSection({
setCustomDate(null);
}
setEnabled(!enabled);
- };
+ }, [enabled, data, resetStates]);
+
+ const handlePresetChange = useCallback(
+ (value: string) => {
+ const seconds = parseInt(value);
+ if (!isNaN(seconds)) {
+ setData({
+ ...data,
+ expiresIn: { value: seconds, type: "normal" },
+ expiresAt: null,
+ });
+ setCustomDate(null);
+ setSelectedPreset(value);
+ setError(null);
+ }
+ },
+ [data],
+ );
+ resetStates;
+
+ const handleCustomDateChange = useCallback(
+ (date: Date | null) => {
+ if (!date) {
+ setData({
+ ...data,
+ expiresIn: null,
+ expiresAt: null,
+ });
+ resetStates();
+ return;
+ }
- const handlePresetChange = (value: string) => {
- const seconds = parseInt(value);
- if (!isNaN(seconds)) {
- setData({
- ...data,
- expiresIn: { value: seconds, type: "normal" },
- expiresAt: null,
- });
- setCustomDate(null);
- setSelectedPreset(value);
- setError(null);
- }
- };
+ const now = new Date();
+ const diffMs = date.getTime() - now.getTime();
+ const diffSeconds = Math.ceil(diffMs / 1000);
+
+ if (diffSeconds <= 0) {
+ setError("Please enter a future duration");
+ return;
+ }
- const handleCustomDateChange = (date: Date | null) => {
- if (!date) {
setData({
...data,
- expiresIn: null,
+ expiresIn: { value: diffSeconds, type: "natural" },
expiresAt: null,
});
- setCustomDate(null);
- setSelectedPreset("");
- setError(null);
- return;
- }
-
- const now = new Date();
- const diffMs = date.getTime() - now.getTime();
- const diffSeconds = Math.ceil(diffMs / 1000);
-
- if (diffSeconds <= 0) {
- setError("Please enter a future duration");
- return;
- }
-
- setData({
- ...data,
- expiresIn: { value: diffSeconds, type: "natural" },
- expiresAt: null,
- });
- setCustomDate(date);
- setSelectedPreset("");
- setError(null);
- };
+ setCustomDate(date);
+ resetStates();
+ },
+ [data, resetStates],
+ );
// Custom formatter to show only the duration
- const formatValue = (date: Date | null) => {
+ const formatValue = useCallback((date: Date | null) => {
if (!date) return "";
const now = new Date();
const diffMs = date.getTime() - now.getTime();
const diffSeconds = Math.ceil(diffMs / 1000);
return "in " + formatExpirationTime(diffSeconds);
- };
+ }, []);
return (
<div className="pb-5">
diff --git a/components/ui/smart-date-time-picker.tsx b/components/ui/smart-date-time-picker.tsx
index 67aa2a9e..aabe63f5 100644
--- a/components/ui/smart-date-time-picker.tsx
+++ b/components/ui/smart-date-time-picker.tsx
@@ -10,6 +10,7 @@ import {
interface SmartDateTimePickerProps {
value: Date | null | undefined;
onChange: (date: Date | null) => void;
+ onComplete?: (date: Date | null) => void;
label?: string;
placeholder?: string;
className?: string;
@@ -23,6 +24,7 @@ interface SmartDateTimePickerProps {
export function SmartDateTimePicker({
value,
onChange,
+ onComplete,
label,
placeholder = 'E.g. "tomorrow at 5pm" or "in 2 hours"',
className,
@@ -66,12 +68,14 @@ export function SmartDateTimePicker({
const parsedDateTime = parseDateTime(e.target.value);
if (parsedDateTime) {
handleDateChange(parsedDateTime);
+ onComplete?.(parsedDateTime);
}
} else {
handleDateChange(null);
+ onComplete?.(null);
}
},
- [handleDateChange],
+ [handleDateChange, onComplete],
);
const handleKeyDown = useCallback(
@@ -81,10 +85,11 @@ export function SmartDateTimePicker({
const parsedDateTime = parseDateTime(inputRef.current.value);
if (parsedDateTime) {
handleDateChange(parsedDateTime);
+ onComplete?.(parsedDateTime);
}
}
},
- [handleDateChange],
+ [handleDateChange, onComplete],
);
const handleCalendarChange = useCallback(
@@ -92,9 +97,10 @@ export function SmartDateTimePicker({
const date = new Date(e.target.value);
if (!isNaN(date.getTime())) {
handleDateChange(date);
+ onComplete?.(date);
}
},
- [handleDateChange],
+ [handleDateChange, onComplete],
);
// Handle autofocus
@@ -152,4 +158,4 @@ export function SmartDateTimePicker({
</div>
</div>
);
-}
+}
\ No newline at end of file