Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #310 - Toast shadow not visible #340

Merged
merged 12 commits into from
Jan 21, 2025
Merged

Fix #310 - Toast shadow not visible #340

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5fb6267
button class property type fixed
Sqrcz Jan 16, 2025
edb408e
added support for custom classes in dropdown component
Sqrcz Jan 16, 2025
3c898e3
.vscode added to .gitignore
Sqrcz Jan 16, 2025
f1a1104
Merge branch 'main' into feature/custom-dropdown-classes
Sqrcz Jan 16, 2025
92012f7
fix: triggerClass added to trigger element
Sqrcz Jan 16, 2025
2bfefab
trigger button dynamic classes simplified
Sqrcz Jan 16, 2025
7136592
dropdown documentation updated
Sqrcz Jan 16, 2025
400e837
aria attributes added to dropdown trigger button
Sqrcz Jan 16, 2025
ab626db
list group content wrapper class fixed
Sqrcz Jan 16, 2025
ed80d7b
wording fixed in API descriptions
Sqrcz Jan 16, 2025
a01cb60
fix toast shadows
Sqrcz Jan 16, 2025
405a91a
Merge branch 'main' into fix-toast-shadows
Sqrcz Jan 21, 2025
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
8 changes: 4 additions & 4 deletions src/components/FwbToast/composables/useToastClasses.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { computed, type Ref } from 'vue'
import type { ToastAlign, ToastType } from '../types'
import { simplifyTailwindClasses } from '@/utils/simplifyTailwindClasses'
import { useMergeClasses } from '@/composables/useMergeClasses'

type UseToastClassesReturns = {
typeClasses: Ref<string>
Expand Down Expand Up @@ -36,15 +36,15 @@ export function useToastClasses (props: UseToastClassesProps): UseToastClassesRe
const wrapperClasses = computed(() => {
const alignmentClass = wrapperAlignmentClasses[props.alignment.value]
if (props.divide.value) {
return simplifyTailwindClasses(defaultWrapperClasses, 'dark:divide-gray-700 divide-x divide-gray-200', alignmentClass)
return useMergeClasses([defaultWrapperClasses, 'dark:divide-gray-700 divide-x divide-gray-200', alignmentClass])
}

return simplifyTailwindClasses(defaultWrapperClasses, alignmentClass)
return useMergeClasses([defaultWrapperClasses, alignmentClass])
})

const contentClasses = computed(() => {
if (props.type.value !== 'empty' && props.divide.value) {
return simplifyTailwindClasses(defaultContentClasses, 'pl-3')
return useMergeClasses([defaultContentClasses, 'pl-3'])
}

return defaultContentClasses
Expand Down
Loading