refactor(CSidebar): update mobile behavior

Author: mrholek

Diff for: src/components/backdrop/CBackdrop.ts

@@ -13,6 +13,9 @@ const CBackdrop = defineComponent({
     },
   },
   setup(props) {
+    const handleBeforeEnter = (el: RendererElement) => {
+      el.classList.remove('d-none')
+    }
     const handleEnter = (el: RendererElement, done: () => void) => {
       el.addEventListener('transitionend', () => {
         done()
@@ -28,12 +31,17 @@ const CBackdrop = defineComponent({
       })
       el.classList.remove('show')
     }
+    const handleAfterLeave = (el: RendererElement) => {
+      el.classList.add('d-none')
+    }
     return () =>
       h(
         Transition,
         {
+          onBeforeEnter: (el) => handleBeforeEnter(el),
           onEnter: (el, done) => handleEnter(el, done),
           onLeave: (el, done) => handleLeave(el, done),
+          onAfterLeave: (el) => handleAfterLeave(el),
         },
         () =>
           props.visible &&

Diff for: src/components/sidebar/CSidebar.ts

@@ -1,4 +1,5 @@
-import { defineComponent, h, onBeforeUnmount, onMounted, ref } from 'vue'
+import { defineComponent, h, onBeforeUnmount, onMounted, onUpdated, ref, watch } from 'vue'
+import { CBackdrop } from '../backdrop'
 
 const CSidebar = defineComponent({
   name: 'CSidebar',
@@ -66,16 +67,22 @@ const CSidebar = defineComponent({
     /**
      * Toggle the visibility of sidebar component.
      */
-    visible: {
-      type: Boolean,
-      default: undefined,
-    },
+    visible: Boolean,
   },
   emits: ['visible-change'],
-  setup(props, { slots, emit }) {
+  setup(props, { attrs, slots, emit }) {
+    const mobile = ref()
+    const inViewport = ref()
     const sidebarRef = ref()
     const visible = ref()
 
+    const handleClick = (event: Event) => {
+      const target = event.target as HTMLElement
+      target.closest('a.nav-link:not(.nav-group-toggle)')
+        ? (visible.value = false)
+        : (visible.value = true)
+    }
+
     const options = {
       rootMargin: '0px',
       threshold: 1.0,
@@ -86,22 +93,44 @@ const CSidebar = defineComponent({
     onMounted(() => {
       const callback = (entries: IntersectionObserverEntry[]) => {
         entries.forEach((entry) => {
-          if (entry.isIntersecting !== props.visible || typeof visible.value === 'undefined') {
-            visible.value = entry.isIntersecting
-            emit('visible-change', visible.value)
-          }
+          inViewport.value = entry.isIntersecting
+          emit('visible-change', entry.isIntersecting)
         })
       }
 
       observer = new IntersectionObserver(callback, options)
       observer.observe(sidebarRef.value)
+
+      mobile.value = Boolean(getComputedStyle(sidebarRef.value).getPropertyValue('--cui-is-mobile'))
+    })
+
+    onUpdated(() => {
+      mobile.value = Boolean(getComputedStyle(sidebarRef.value).getPropertyValue('--cui-is-mobile'))
+
+      if (mobile.value) {
+        window.addEventListener('click', handleClick)
+      } else {
+        window.removeEventListener('click', handleClick)
+      }
     })
 
     onBeforeUnmount(() => {
       observer.disconnect()
     })
 
-    return () =>
+    watch(
+      () => props.visible,
+      () => {
+        if (props.visible === true && inViewport.value === false) {
+          visible.value = true
+        }
+        if (props.visible === false && inViewport.value === true) {
+          visible.value = false
+        }
+      },
+    )
+
+    return () => [
       h(
         'div',
         {
@@ -116,14 +145,24 @@ const CSidebar = defineComponent({
               }`]: props.selfHiding,
               [`sidebar-${props.size}`]: props.size,
               'sidebar-narrow-unfoldable': props.unfoldable,
-              show: props.visible === true && visible.value === false,
-              hide: props.visible === false && visible.value === true,
+              show: visible.value === true,
+              hide: visible.value === false,
             },
+            attrs.class,
           ],
           ref: sidebarRef,
         },
         slots.default && slots.default(),
-      )
+      ),
+      mobile.value &&
+        h(CBackdrop, {
+          class: 'sidebar-backdrop d-none',
+          visible: props.visible,
+          onClick: () => {
+            visible.value = false
+          },
+        }),
+    ]
   },
 })