Skip to content

Commit 95fdfac

Browse files
authored
Merge pull request #443 from protomors/dev
Alternative fixes to App.vue
2 parents 687ab3e + fb9eff1 commit 95fdfac

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

src/App.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@
133133

134134
<h5 class="mt-3">None</h5>
135135
<b-card>
136-
<b-skeleton width="85%"></b-skeleton>
137-
<b-skeleton width="55%"></b-skeleton>
138-
<b-skeleton width="70%"></b-skeleton>
136+
<b-skeleton animation width="85%"></b-skeleton>
137+
<b-skeleton animation width="55%"></b-skeleton>
138+
<b-skeleton animation width="70%"></b-skeleton>
139139
</b-card>
140140
<b-table-simple responsive>
141141
<b-thead>
@@ -2087,8 +2087,8 @@ export default defineComponent({
20872087
)
20882088
}
20892089

2090-
const tagValidator = (tag: string | undefined) =>
2091-
!!tag && tag === tag.toLowerCase() && tag.length > 2 && tag.length < 6
2090+
const tagValidator = (tag: string) =>
2091+
tag === tag.toLowerCase() && tag.length > 2 && tag.length < 6
20922092

20932093
function onTagState(valid: string[], invalid: string[], duplicate: string[]) {
20942094
// console.log({

src/components/BFormTags/BFormTags.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ interface BFormTagsProps {
141141
tagPills?: boolean
142142
tagRemoveLabel?: string
143143
tagRemovedLabel?: string
144-
tagValidator?: (t?: string) => boolean
144+
tagValidator?: (t: string) => boolean
145145
tagVariant?: ColorVariant
146146
}
147147

src/components/BSkeleton/BSkeleton.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ const props = withDefaults(defineProps<BSkeletonProps>(), {
2323
2424
const classes = computed(() => [
2525
`b-skeleton-${props.type}`,
26-
`b-skeleton-animate-${props.animation}`,
2726
{
27+
[`b-skeleton-animate-${props.animation}`]:
28+
typeof props.animation === 'boolean' ? undefined : props.animation,
2829
[`bg-${props.variant}`]: props.variant,
2930
},
3031
])

src/types/SkeletonAnimation.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
type SkeletonAnimation = 'wave' | 'fade' | 'throb'
1+
type SkeletonAnimation = boolean | 'wave' | 'fade' | 'throb'
22

33
export default SkeletonAnimation

src/types/components/BFormTags/BFormTags.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export interface Props {
3030
tagPills?: boolean
3131
tagRemoveLabel?: string
3232
tagRemovedLabel?: string
33-
tagValidator?: (t: unknown) => boolean
33+
tagValidator?: (t: string) => boolean
3434
tagVariant?: ColorVariant
3535
}
3636
// Emits

0 commit comments

Comments
 (0)