Skip to content

Commit 828c145

Browse files
committed
CR feedback
1 parent 76a98cd commit 828c145

9 files changed

Lines changed: 18 additions & 29 deletions

File tree

src/lib/components/BookTabs.svelte

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,7 @@ A component that displays the book tabs and allows the user to switch between th
44
-->
55
<script lang="ts">
66
import { scriptureConfig } from '$assets/config';
7-
import {
8-
convertStyle,
9-
language,
10-
languageDefault,
11-
monoIconColor,
12-
refs,
13-
s,
14-
theme
15-
} from '$lib/data/stores';
7+
import { convertStyle, language, monoIconColor, refs, s, theme } from '$lib/data/stores';
168
179
const tabIcons = import.meta.glob('./*', {
1810
import: 'default',
@@ -31,13 +23,10 @@ A component that displays the book tabs and allows the user to switch between th
3123
refs.setBookTab(newTab);
3224
}
3325
function getImageName(tabType?: string) {
34-
return (tabType && scriptureConfig.tabTypes?.[tabType]?.images?.[0].file) || '';
26+
return (tabType && scriptureConfig.tabTypes?.[tabType]?.images?.[0]?.file) || '';
3527
}
3628
function getTabTypeName(tabType?: string) {
37-
return (
38-
scriptureConfig.tabTypes?.[tabType ?? '']?.name?.[$language] ||
39-
scriptureConfig.tabTypes?.[tabType ?? '']?.name?.[$language]
40-
);
29+
return scriptureConfig.tabTypes?.[tabType ?? '']?.name?.[$language];
4130
}
4231
</script>
4332

src/lib/components/BottomNavigationBar.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<script lang="ts">
55
import config, { scriptureConfig } from '$assets/config';
66
import contents from '$assets/contents';
7-
import { language, languageDefault, refs, s, theme } from '$lib/data/stores';
7+
import { language, refs, s, theme } from '$lib/data/stores';
88
import { gotoRoute } from '$lib/navigate';
99
1010
const menuIcons = import.meta.glob('./*', {
@@ -135,7 +135,7 @@
135135
<picture class:invert={$theme === 'Dark'}>
136136
<!-- Image Icon -->
137137
<img
138-
src={menuIcons[`./${item.images?.[0].file}`]}
138+
src={menuIcons[`./${item.images?.[0]?.file}`]}
139139
alt=""
140140
class={selectedLink(item.type, item.link?.['default'])
141141
? 'opacity-100'
@@ -149,7 +149,7 @@
149149
? barTextSelectedColor
150150
: barTextColor}"
151151
>
152-
{item.title[$language] || item.title[$language]}
152+
{item.title[$language]}
153153
</span>
154154
</button>
155155
{/if}

src/lib/components/ContentSingle.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
item: ContentItem;
88
imageFolder: string;
99
onClick?: (target: HTMLElement, item: ContentItem) => void;
10-
checkImageSize?: (item: ContentItem) => void;
10+
checkImageSize?: (item: ContentItem) => string;
1111
features?: FeatureConfig;
1212
}
1313
@@ -25,6 +25,7 @@
2525
2626
function checkImageSizeFallback(item: ContentItem) {
2727
console.warn('USING checkImageSizeFallback');
28+
return '';
2829
}
2930
3031
function renderLastTextBox(layout?: FeatureValue): boolean {

src/lib/components/FontSelector.svelte

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,10 @@ Font Selector component.
2929
<Modal bind:this={modal} id={modalId}>
3030
<FontList bind:this={fontList} selectedFont={$currentFont ?? ''} />
3131
<div class="flex w-full justify-between dy-modal-action">
32-
<!-- svelte-ignore a11y-click-events-have-key-events -->
3332
<button
3433
style={convertStyle($s?.['ui.dialog.button'])}
3534
class="dy-btn dy-btn-sm dy-btn-ghost no-animation">{$t['Button_Cancel']}</button
3635
>
37-
<!-- svelte-ignore a11y-click-events-have-key-events -->
3836
<button
3937
style={convertStyle($s?.['ui.dialog.button'])}
4038
class="dy-btn dy-btn-sm dy-btn-ghost no-animation"

src/lib/components/SearchResultList.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
// Changes to signal when to clear results
2525
const showSpinner = $derived(!queryDone && results.length === 0);
2626
let resultsShown = $state<SearchResult[]>([]);
27-
let displayQueryId = $derived(queryId);
27+
// svelte-ignore state_referenced_locally
28+
let displayQueryId = $state(queryId);
2829
2930
const resultCountText = $derived(formatResultCount(results.length));
3031

src/lib/components/Settings.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
);
1717
</script>
1818

19-
<!--Interfacerough the different settings types -->
19+
<!-- loops through the different settings types -->
2020
{#each Object.keys(categories) as category}
2121
<div class="settings-category">
2222
{$t[category]}

src/lib/components/Sidebar.svelte

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ The sidebar/drawer.
1515
isDAB,
1616
isSAB,
1717
language,
18-
languageDefault,
1918
modal,
2019
ModalType,
2120
refs,
@@ -88,7 +87,7 @@ The sidebar/drawer.
8887
);
8988
9089
function imageSrcSet(images: MenuItemConfig['images']) {
91-
const baseSize = Number(images?.[0].width);
90+
const baseSize = Number(images?.[0]?.width);
9291
return images
9392
?.map((image) => {
9493
const size = Number(image.width);
@@ -266,12 +265,12 @@ The sidebar/drawer.
266265
<source srcset={imageSrcSet(item.images)} />
267266
{/if}
268267
<img
269-
src={menuIcons[`./${item.images?.[0].file}`] ?? ''}
268+
src={menuIcons[`./${item.images?.[0]?.file}`] ?? ''}
270269
height="24"
271270
width="24"
272-
alt={item.title[$language] || item.title[languageDefault]}
271+
alt={item.title[$language]}
273272
/>
274-
</picture>{item.title[$language] || item.title[languageDefault]}
273+
</picture>{item.title[$language]}
275274
</a>
276275
</li>
277276
{/each}

src/lib/components/TabsMenu.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ A component to display tabbed menus.
3737
}
3838
active = tab;
3939
};
40-
const ActiveComponent = $derived(options[active].snippet);
40+
const ActiveComponent = $derived(options[active]?.snippet);
4141
</script>
4242

4343
{#if hasTabs}

src/routes/notes/edit/[noteid]/+page.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
let textarea: HTMLTextAreaElement | undefined = $state();
1616
const note = $derived(data.note);
1717
const isNew = $derived(note ? false : true);
18-
let text = $derived(note?.text ?? '');
18+
// svelte-ignore state_referenced_locally
19+
let text = $state(note?.text ?? '');
1920
const reference = $derived(note?.reference ?? $selectedVerses[0]?.reference);
2021
const title = $derived(isNew ? 'Annotation_Note_Add' : 'Annotation_Note_Edit');
2122

0 commit comments

Comments
 (0)