From 0718c8e0c628f92c5213f10d94c55b3ef303d9bc Mon Sep 17 00:00:00 2001 From: Xylight Date: Wed, 23 Oct 2024 19:55:20 -0700 Subject: [PATCH] prep: replace $$props.class with props --- .../components/error/ErrorContainer.svelte | 4 +- src/lib/components/input/FreeTextInput.svelte | 4 +- src/lib/components/input/Link.svelte | 7 +- src/lib/components/input/Switch.svelte | 8 ++- src/lib/components/lemmy/SiteCard.svelte | 4 +- .../components/lemmy/comment/Comment.svelte | 8 ++- .../lemmy/comment/CommentItem.svelte | 4 +- .../lemmy/community/CommunityCard.svelte | 6 +- .../lemmy/community/CommunityHeader.svelte | 4 +- .../lemmy/community/CommunityItem.svelte | 7 +- .../lemmy/community/CommunityLink.svelte | 9 ++- .../components/lemmy/dropdowns/Sort.svelte | 5 +- .../lemmy/inbox/PrivateMessage.svelte | 4 +- .../lemmy/moderation/ShieldIcon.svelte | 7 +- src/lib/components/lemmy/post/Post.svelte | 8 ++- .../components/lemmy/post/PostActions.svelte | 4 +- src/lib/components/lemmy/post/PostBody.svelte | 9 ++- src/lib/components/lemmy/post/PostMeta.svelte | 7 +- .../lemmy/post/media/PostIframe.svelte | 7 +- .../lemmy/post/media/PostMediaCompact.svelte | 9 +-- src/lib/components/lemmy/user/UserItem.svelte | 8 +-- src/lib/components/lemmy/user/UserLink.svelte | 9 ++- .../components/lemmy/util/SearchBar.svelte | 6 +- src/lib/components/markdown/Markdown.svelte | 8 ++- .../components/markdown/MarkdownEditor.svelte | 7 +- src/lib/components/ui/Avatar.svelte | 9 ++- src/lib/components/ui/EndPlaceholder.svelte | 8 ++- src/lib/components/ui/EntityHeader.svelte | 5 +- src/lib/components/ui/Expandable.svelte | 7 +- src/lib/components/ui/ExpandableImage.svelte | 4 +- src/lib/components/ui/LabelStat.svelte | 17 +++-- src/lib/components/ui/Placeholder.svelte | 6 +- src/lib/components/ui/SectionTitle.svelte | 4 +- src/lib/components/ui/StickyCard.svelte | 7 +- src/lib/components/ui/layout/Shell.svelte | 5 +- .../components/ui/layout/pages/Header.svelte | 10 +-- .../components/ui/layout/pages/Tabs.svelte | 4 +- .../components/ui/list/EditableList.svelte | 4 +- src/lib/components/ui/navbar/NavButton.svelte | 4 +- src/lib/components/ui/navbar/Navbar.svelte | 7 +- src/lib/components/ui/navbar/Profile.svelte | 4 +- .../ui/navbar/commands/CommandItem.svelte | 4 +- src/lib/components/ui/sidebar/Sidebar.svelte | 8 ++- .../ui/sidebar/SidebarButton.svelte | 4 +- src/lib/components/ui/text/TextProps.svelte | 4 +- .../components/util/FormattedNumber.svelte | 5 +- src/lib/components/util/RelativeDate.svelte | 10 ++- src/lib/mono/badge/Badge.svelte | 69 ++++++++++--------- src/lib/mono/button/Button.svelte | 5 +- src/lib/mono/code/Codeblock.svelte | 5 +- src/lib/mono/code/Snippet.svelte | 5 +- src/lib/mono/disclosure/Disclosure.svelte | 4 +- src/lib/mono/forms/ChoiceboxGroup.svelte | 8 +-- src/lib/mono/forms/FileInput.svelte | 5 +- src/lib/mono/forms/Form.svelte | 31 +++++---- src/lib/mono/forms/Label.svelte | 33 +++++---- src/lib/mono/forms/RadioGroup.svelte | 6 +- src/lib/mono/forms/Select.svelte | 6 +- src/lib/mono/forms/Switch.svelte | 8 ++- src/lib/mono/forms/TextArea.svelte | 8 ++- src/lib/mono/forms/TextInput.svelte | 8 ++- src/lib/mono/materials/Material.svelte | 4 +- src/lib/mono/popover/Menu.svelte | 4 +- src/lib/mono/popover/MenuButton.svelte | 4 +- src/lib/mono/popover/Popover.svelte | 10 +-- src/lib/mono/popover/Portal.svelte | 47 +++++++------ src/routes/about/Profile.svelte | 5 +- src/routes/settings/Setting.svelte | 14 ++-- src/routes/theme/ColorSwatch.svelte | 5 +- 69 files changed, 383 insertions(+), 214 deletions(-) diff --git a/src/lib/components/error/ErrorContainer.svelte b/src/lib/components/error/ErrorContainer.svelte index db74cc06..938b233d 100644 --- a/src/lib/components/error/ErrorContainer.svelte +++ b/src/lib/components/error/ErrorContainer.svelte @@ -33,11 +33,13 @@ onDestroy(() => { clearErrorScope(scope) }) + let clazz: string = '' + export { clazz as class } {#if scopedErrors.length > 0}
diff --git a/src/lib/components/input/FreeTextInput.svelte b/src/lib/components/input/FreeTextInput.svelte index 1519501c..6313d6b5 100644 --- a/src/lib/components/input/FreeTextInput.svelte +++ b/src/lib/components/input/FreeTextInput.svelte @@ -16,6 +16,8 @@ textarea.style.height = `${textarea.scrollHeight}px` // Set height to the scrollHeight } } + let clazz: string = '' + export { clazz as class } diff --git a/src/lib/components/input/Link.svelte b/src/lib/components/input/Link.svelte index f8f8d9fb..facb9e6b 100644 --- a/src/lib/components/input/Link.svelte +++ b/src/lib/components/input/Link.svelte @@ -14,6 +14,9 @@ export let nowrap: boolean = false $: richURL = $$slots.default ? undefined : parseURL(href) + + let clazz: string = '' + export { clazz as class } {#if richURL} diff --git a/src/lib/components/input/Switch.svelte b/src/lib/components/input/Switch.svelte index 41a3e7d0..f90625a1 100644 --- a/src/lib/components/input/Switch.svelte +++ b/src/lib/components/input/Switch.svelte @@ -10,6 +10,10 @@ export let selected: T export let headless: boolean = false + let clazz: string = '' + export let buttonClazz: string = '' + export { clazz as class } + const dispatcher = createEventDispatcher<{ select: T }>() $: { @@ -19,7 +23,7 @@ let containerClass = ` flex flex-row rtl:flex-row-reverse items-center w-max max-w-full overflow-auto ${headless ? 'pb-1 gap-1' : ''} - ${$$props.class} + ${clazz} ` const buttonClass = (selected: boolean) => ` @@ -27,7 +31,7 @@ last:rounded-r-lg last:border-r last:dark:border-r-transparent rounded-l-none rounded-r-none - px-3 py-1.5 text-sm hover:brightness-110 ${$$props.buttonClass || ''} + px-3 py-1.5 text-sm hover:brightness-110 ${buttonClazz || ''} ${ !selected ? `hover:dark:bg-zinc-800 border-slate-100 border-t border-b border-b-slate-300 dark:border-b-0 diff --git a/src/lib/components/lemmy/SiteCard.svelte b/src/lib/components/lemmy/SiteCard.svelte index 9d2d793c..2e573b6a 100644 --- a/src/lib/components/lemmy/SiteCard.svelte +++ b/src/lib/components/lemmy/SiteCard.svelte @@ -26,9 +26,11 @@ export let taglines: Tagline[] | undefined = undefined export let admins: PersonView[] | undefined = undefined export let version: string | undefined = undefined + let clazz: string = '' + export { clazz as class } - + {#if site.site.banner}
{#if meta} @@ -194,7 +198,7 @@ {/if} {#if open}
diff --git a/src/lib/components/lemmy/community/CommunityCard.svelte b/src/lib/components/lemmy/community/CommunityCard.svelte index eb1b98f9..b8e73691 100644 --- a/src/lib/components/lemmy/community/CommunityCard.svelte +++ b/src/lib/components/lemmy/community/CommunityCard.svelte @@ -140,11 +140,11 @@ loading.subscribing = false } + let clazz: string = '' + export { clazz as class } - + @@ -42,7 +45,7 @@ {#if showInstance} @{new URL(community.actor_id).hostname} diff --git a/src/lib/components/lemmy/dropdowns/Sort.svelte b/src/lib/components/lemmy/dropdowns/Sort.svelte index 5fd4283a..96056701 100644 --- a/src/lib/components/lemmy/dropdowns/Sort.svelte +++ b/src/lib/components/lemmy/dropdowns/Sort.svelte @@ -37,9 +37,12 @@ $: changeDefault ? ($userSettings.defaultSort.sort = selected as SortType) : undefined + + let clazz: string = '' + export { clazz as class } -
+