Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/ui/app/toolbar/viewOptions/color/ColorOptions.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
NumberInput,
ColorInput,
Checkbox,
DateInput,
// DateInput,
// DatetimeInput,
} from "obsidian-svelte";
import DateInput from "src/ui/components/DateInput.svelte";
import DatetimeInput from "src/ui/components/DatetimeInput.svelte";
import { TagsInput } from "src/ui/components/TagsInput";
import HorizontalGroup from "src/ui/components/HorizontalGroup/HorizontalGroup.svelte";
Expand Down
3 changes: 2 additions & 1 deletion src/ui/app/toolbar/viewOptions/filter/FilterOptions.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
TextInput,
NumberInput,
Checkbox,
DateInput,
// DateInput,
// DatetimeInput,
} from "obsidian-svelte";
import DateInput from "src/ui/components/DateInput.svelte";
import DatetimeInput from "src/ui/components/DatetimeInput.svelte";
import { TagsInput } from "src/ui/components/TagsInput";
import HorizontalGroup from "src/ui/components/HorizontalGroup/HorizontalGroup.svelte";
Expand Down
66 changes: 66 additions & 0 deletions src/ui/components/DateInput.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<script lang="ts">
import { createEventDispatcher } from "svelte";
import dayjs from "dayjs";

/**
* Specifies the date value.
*/
export let value: Date | null;

/**
* Specifies whether to remove decorations so that it can be embedded in other
* components.
*/
export let embed: boolean = false;

const dispatch = createEventDispatcher<{
change: Date | null;
input: Date | null;
}>();

function handleChange(event: Event) {
if (event.currentTarget instanceof HTMLInputElement) {
dispatch(
"change",
event.currentTarget.value
? dayjs(event.currentTarget.value).toDate()
: null
);
}
}

function handleInput(event: Event) {
if (event.currentTarget instanceof HTMLInputElement) {
dispatch(
"input",
event.currentTarget.value
? dayjs(event.currentTarget.value).toDate()
: null
);
}
}
</script>

<input
type="date"
class:embed
value={value ? dayjs(value).format("YYYY-MM-DD") : null}
max="9999-12-31"
on:change={handleChange}
on:input={handleInput}
on:blur
/>

<style>
input {
border-radius: 9999px;
border: 0;
background-color: var(--background-modifier-hover);
font-family: var(--font-default);
padding-left: var(--size-4-6);
}

.embed {
margin: 0 8px;
}
</style>
7 changes: 4 additions & 3 deletions src/ui/components/FieldControl/FieldControl.svelte
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<script lang="ts">
import {
Autocomplete,
DateInput,
// DateInput,
// DatetimeInput,
NumberInput,
Switch,
TextInput,
} from "obsidian-svelte";
import DateInput from "../DateInput.svelte";
import DatetimeInput from "../DatetimeInput.svelte";
import dayjs from "dayjs";

Expand Down Expand Up @@ -75,12 +76,12 @@
value={isDate(value) ? value : null}
on:change={({ detail: value }) => (cachedValue = value)}
on:blur={() => {
if (!cachedValue) {
if (!cachedValue || !isDate(value)) {
onChange(cachedValue);
return;
}
const cachedDate = dayjs(cachedValue);
const newDatetime = dayjs(isDate(value) ? value : null)
const newDatetime = dayjs(value)
.set("year", cachedDate.year())
.set("month", cachedDate.month())
.set("date", cachedDate.date());
Expand Down
3 changes: 2 additions & 1 deletion src/ui/modals/components/CreateField.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
SettingItem,
TextInput,
NumberInput,
DateInput,
// DateInput,
// DatetimeInput,
Switch,
} from "obsidian-svelte";
Expand All @@ -23,6 +23,7 @@
} from "src/lib/dataframe/dataframe";
import { i18n } from "src/lib/stores/i18n";
import { onMount } from "svelte";
import DateInput from "src/ui/components/DateInput.svelte";
import DatetimeInput from "src/ui/components/DatetimeInput.svelte";

export let existingFields: DataField[];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<script lang="ts">
import { DateInput } from "obsidian-svelte";
// import { DateInput } from "obsidian-svelte";
import { isDate } from "src/lib/dataframe/dataframe";
import DateInput from "src/ui/components/DateInput.svelte";
import type { Optional } from "src/lib/dataframe/dataframe";
import dayjs from "dayjs";

Expand Down Expand Up @@ -54,11 +56,11 @@
</svelte:fragment>
<svelte:fragment slot="edit">
<DateInput
value={value != undefined ? value : null}
on:change={({ detail: value }) => (cachedValue = value)}
value={value ?? null}
on:change={({ detail }) => (cachedValue = detail)}
on:blur={() => {
edit = false;
if (!cachedValue) {
if (!cachedValue || !isDate(value)) {
onChange(cachedValue);
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
</svelte:fragment>
<svelte:fragment slot="edit">
<DatetimeInput
value={value != undefined ? value : null}
on:input={({ detail: value }) => (cachedValue = value)}
value={value ?? null}
on:input={({ detail }) => (cachedValue = detail)}
on:blur={() => {
edit = false;
onChange(cachedValue);
Expand Down
Loading