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.

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

Conditional slot wrapper rendering #27

Merged
merged 2 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/ninety-otters-brake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@d0rich/esprit-design': patch
---

Conditional slot wrapper rendering
26 changes: 13 additions & 13 deletions packages/esprit-design/src/components/lists/DActionsList.vue
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
<script lang="ts">
<script setup lang="ts">
import DWrapFocusHighlight, {
type HighlightVariant
} from '../utils/DWrapFocusHighlight.vue'
import DWrapShape from '../utils/DWrapShape.vue'

export default {
name: 'DActionsList',
components: {
DWrapFocusHighlight,
DWrapShape
}
}

export type ActionListItem<TEmit = any> = {
title: string
emit?: TEmit
Expand All @@ -23,9 +15,13 @@ export type ActionListItem<TEmit = any> = {
[k: string]: any
}
}
</script>

<script setup lang="ts">
defineOptions({
name: 'DActionsList',
components: {
DWrapFocusHighlight,
DWrapShape
}
})
defineEmits(['actionFocus', 'actionUnfocus', 'actionChoose'])

defineProps({
Expand All @@ -43,12 +39,16 @@ function getCurrentHighlightVariant(action: ActionListItem): HighlightVariant {
if (action.attrs?.highlightVariant) return action.attrs.highlightVariant
return 'negative-list-item'
}

const slots = defineSlots<{
header?: () => {}
}>()
</script>

<template>
<DWrapShape shape-class="d-actions-list__shape">
<div class="d-actions-list__body">
<div class="d-actions-list__header">
<div v-if="slots.header" class="d-actions-list__header">
<slot name="header" />
</div>

Expand Down
42 changes: 30 additions & 12 deletions packages/esprit-design/src/components/utils/DWrapBackground.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
<script lang="ts">
import { type StyleValue } from 'vue'
<script setup lang="ts">
import { type StyleValue, computed } from 'vue'

export default {
defineOptions({
name: 'DWrapBackground'
}
</script>

<script setup lang="ts">
defineProps({
})
const props = defineProps({
overlayClass: {
type: [String, Object as () => Record<string, boolean>],
default: ''
Expand All @@ -33,13 +30,34 @@ defineProps({
default: 'div'
}
})

const slots = defineSlots<{
svg?: () => {}
default?: () => {}
}>()

const isOverlayStyleEmpty = computed(() => {
if (typeof props.overlayStyle === 'string') return !props.overlayStyle.trim()
if (Array.isArray(props.overlayStyle)) return props.overlayStyle.length === 0
if (props.overlayStyle === null) return true
if (props.overlayStyle === undefined) return true
return Object.keys(props.overlayStyle).length === 0
})
</script>

<template>
<Component :is="tag" class="mbg__main-container">
<div class="mbg__relative-container">
<div class="mbg__layer" :class="overlayClass" :style="overlayStyle" />
<div class="mbg__layer">
<div
v-if="overlayClass || !isOverlayStyleEmpty || slots.svg || slots.default"
class="mbg__relative-container"
>
<div
v-if="overlayClass || !isOverlayStyleEmpty"
class="mbg__layer"
:class="overlayClass"
:style="overlayStyle"
/>
<div v-if="slots.svg" class="mbg__layer">
<slot name="svg" />
</div>
<div
Expand All @@ -48,7 +66,7 @@ defineProps({
:class="dotsClass"
:style="dotsStyle"
/>
<div class="mbg__content">
<div v-if="slots.default" class="mbg__content">
<slot />
</div>
</div>
Expand Down
64 changes: 53 additions & 11 deletions packages/esprit-design/src/components/utils/DWrapShape.vue
Original file line number Diff line number Diff line change
@@ -1,27 +1,69 @@
<script lang="ts">
import { type StyleValue } from 'vue'
<script setup lang="ts">
import { type StyleValue, computed } from 'vue'

export default {
defineOptions({
name: 'DWrapShape'
}
</script>

<script setup lang="ts">
defineProps<{
})
const props = defineProps<{
shapeClass?: string | Record<string, boolean>
shapeStyle?: StyleValue
filterClass?: string | Record<string, boolean>
filterStyle?: StyleValue
tag?: string
}>()

const slots = defineSlots<{
'shape-content'?: () => {}
'bg-overlay'?: () => {}
default?: () => {}
}>()

function isClassEmpty(
cls: string | Record<string, boolean> | undefined
): boolean {
if (!cls) return true
if (typeof cls === 'string') return !cls.trim()
return Object.keys(cls).length === 0
}

function isStyleEmpty(style: StyleValue): boolean {
if (typeof style === 'string') return !style.trim()
if (Array.isArray(style)) return style.length === 0
if (style === null) return true
if (style === undefined) return true
return Object.keys(style).length === 0
}

const isShapeCustomized = computed(() => {
if (slots['shape-content']) return true
if (!isClassEmpty(props.shapeClass)) return true
return !isStyleEmpty(props.shapeStyle)
})
const isFilterCustomized = computed(() => {
if (!isClassEmpty(props.filterClass)) return true
return !isStyleEmpty(props.filterStyle)
})
</script>

<template>
<Component :is="tag ?? 'div'">
<div class="d-shape">
<div class="d-shape__bg-filter" :class="filterClass" :style="filterStyle">
<div class="d-shape__bg-wrapper">
<div class="d-shape__bg" :class="shapeClass" :style="shapeStyle">
<div
v-if="isShapeCustomized || slots['bg-overlay'] || isFilterCustomized"
class="d-shape__bg-filter"
:class="filterClass"
:style="filterStyle"
>
<div
v-if="isShapeCustomized || slots['bg-overlay']"
class="d-shape__bg-wrapper"
>
<div
v-if="isShapeCustomized"
class="d-shape__bg"
:class="shapeClass"
:style="shapeStyle"
>
<slot name="shape-content" />
</div>
<slot name="bg-overlay" />
Expand Down
Loading