manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-book-tracker",
 	"name": "Book Tracker",
-	"version": "1.7.1",
+	"version": "1.7.0",
 	"minAppVersion": "0.15.0",
 	"description": "Simplifies tracking your reading progress and managing your book collection in Obsidian.",
 	"author": "FiFiTiDo",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-book-tracker",
-	"version": "1.7.1",
+	"version": "1.7.0",
 	"description": "Simplifies tracking your reading progress and managing your book collection in Obsidian.",
 	"main": "main.js",
 	"scripts": {

src/ui/components/form/TextControl.svelte

@@ -1,11 +0,0 @@
-<script lang="ts">
-	interface Props {
-		id?: string;
-		name?: string;
-		value?: string;
-	}
-
-	let { id, name, value = $bindable() }: Props = $props();
-</script>
-
-<input {id} {name} type="text" bind:value />

src/ui/components/form/ToggleControl.svelte

@@ -1,21 +0,0 @@
-<script lang="ts">
-	interface Props {
-		id?: string;
-		name?: string;
-		checked?: boolean;
-	}
-
-	let { id, name, checked = $bindable() }: Props = $props();
-</script>
-
-<div
-	class="checkbox-container"
-	class:is-enabled={checked}
-	onclick={() => (checked = !checked)}
-	onkeypress={(e) => e.key === "Space" && (checked = !checked)}
-	role="switch"
-	aria-checked={checked}
-	tabindex="0"
->
-	<input {id} {name} type="checkbox" bind:checked tabindex="0" />
-</div>

src/ui/components/setting/FileSuggestItem.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { ComponentProps } from "svelte";
 	import Item from "./Item.svelte";
-	import FileSuggest from "../form/suggesters/FileSuggest.svelte";
+	import FileSuggest from "../suggesters/FileSuggest.svelte";
 
 	type Props = Omit<ComponentProps<typeof Item>, "control"> & {
 		id: string;

src/ui/components/setting/FolderSuggestItem.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { ComponentProps } from "svelte";
 	import Item from "./Item.svelte";
-	import FolderSuggest from "../form/suggesters/FolderSuggest.svelte";
+	import FolderSuggest from "../suggesters/FolderSuggest.svelte";
 
 	type Props = Omit<ComponentProps<typeof Item>, "control"> & {
 		id: string;

src/ui/components/setting/PropertySuggestItem.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { ComponentProps } from "svelte";
 	import Item from "./Item.svelte";
-	import PropertySuggest from "../form/suggesters/PropertySuggest.svelte";
+	import PropertySuggest from "../suggesters/PropertySuggest.svelte";
 
 	type Props = Omit<ComponentProps<typeof Item>, "control"> & {
 		id: string;

src/ui/components/setting/TextInputItem.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
 	import type { ComponentProps } from "svelte";
 	import Item from "./Item.svelte";
-	import TextControl from "../form/TextControl.svelte";
 
 	type Props = Omit<ComponentProps<typeof Item>, "control"> & {
 		id?: string;
@@ -13,6 +12,6 @@
 
 <Item {name} {description}>
 	{#snippet control()}
-		<TextControl {id} bind:value />
+		<input {id} type="text" bind:value />
 	{/snippet}
 </Item>

src/ui/components/setting/ToggleItem.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
 	import type { ComponentProps } from "svelte";
 	import Item from "./Item.svelte";
-	import ToggleControl from "../form/ToggleControl.svelte";
 
 	type Props = Omit<ComponentProps<typeof Item>, "control"> & {
 		id?: string;
@@ -13,6 +12,15 @@
 
 <Item {name} {description}>
 	{#snippet control()}
-		<ToggleControl {id} bind:checked />
+		<!-- svelte-ignore a11y_no_static_element_interactions -->
+		<!-- svelte-ignore a11y_click_events_have_key_events -->
+		<!-- input only covers part of the toggle element. onclick here covers the rest -->
+		<div
+			class="checkbox-container"
+			class:is-enabled={checked}
+			onclick={() => (checked = !checked)}
+		>
+			<input {id} type="checkbox" bind:checked tabindex="0" />
+		</div>
 	{/snippet}
 </Item>

src/ui/modals/ReadingLogEntryEditModalView.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type BookTrackerPlugin from "@src/main";
 	import type { ReadingLogEntry } from "@utils/ReadingLog";
-	import FileSuggest from "@ui/components/form/suggesters/FileSuggest.svelte";
+	import FileSuggest from "@ui/components/suggesters/FileSuggest.svelte";
 	import { v4 as uuidv4 } from "uuid";
 	import { createPrevious } from "@ui/stores/previous.svelte";
 	import { createMetadata } from "@ui/stores/metadata.svelte";
@@ -16,7 +16,6 @@
 		setReadingLogContext,
 	} from "@ui/stores/reading-log.svelte";
 	import { onDestroy } from "svelte";
-	import ToggleControl from "@ui/components/form/ToggleControl.svelte";
 
 	const INPUT_DATETIME_FORMAT = "YYYY-MM-DDTHH:mm";
 
@@ -44,24 +43,13 @@
 	const bookMetadata = $derived(
 		metadataStore.metadata.find((m) => m.file.basename === book),
 	);
-	const previousEntry = $derived.by(() => {
-		const index = readingLogStore.entries.findIndex(
-			(e) => e.id === entry?.id,
-		);
+	const lastEntryIndex = $derived(
+		readingLogStore.entries.findLastIndex((e) => e.book === book),
+	);
+	const lastEntry = $derived(
+		lastEntryIndex !== -1 ? readingLogStore.entries[lastEntryIndex] : null,
+	);
 
-		let data = readingLogStore.entries;
-		if (index !== -1) {
-			data = data.slice(0, index);
-		}
-
-		const previousEntryIndex = data.findLastIndex((e) => e.book === book);
-
-		return previousEntryIndex !== -1
-			? readingLogStore.entries[previousEntryIndex]
-			: null;
-	});
-
-	let syncPageCounts = $state(true);
 	const pageCount = $derived(bookMetadata?.book.pageCount ?? 0);
 	let pagesRead = $state(entry?.pagesRead ?? 0);
 	const pagesReadPrev = createPrevious(() => pagesRead);
@@ -73,24 +61,20 @@
 	);
 
 	$effect(() => {
-		if (!syncPageCounts) return;
-		pagesReadTotal = (previousEntry?.pagesReadTotal ?? 0) + pagesRead;
+		pagesReadTotal = (lastEntry?.pagesReadTotal ?? 0) + pagesRead;
 	});
 
 	$effect(() => {
-		if (!syncPageCounts) return;
 		const diff = pagesRead - (pagesReadPrev.value ?? 0);
 		pagesRead = pagesRead;
 		pagesReadTotal = pagesReadTotal + diff;
 	});
 
 	$effect(() => {
-		if (!syncPageCounts) return;
 		pagesRemaining = pageCount - pagesReadTotal;
 	});
 
 	$effect(() => {
-		if (!syncPageCounts) return;
 		pagesReadTotal = Math.max(pagesReadTotal, pagesRead);
 	});
 
@@ -154,12 +138,6 @@
 				id="pagesRemaining"
 				bind:value={pagesRemaining}
 			/>
-			<label for="syncPageCounts">Sync Page Counts</label>
-			<ToggleControl
-				name="syncPageCounts"
-				id="syncPageCounts"
-				bind:checked={syncPageCounts}
-			/>
 			<label for="createdAt">Created At</label>
 			<input
 				type="datetime-local"

versions.json

@@ -11,6 +11,5 @@
 	"1.5.0": "0.15.0",
 	"1.6.0": "0.15.0",
 	"1.6.1": "0.15.0",
-	"1.7.0": "0.15.0",
-	"1.7.1": "0.15.0"
+	"1.7.0": "0.15.0"
 }