bfg-common 1.0.52 → 1.0.53

package/components/atoms/tooltip/Signpost.vue

@@ -1,224 +1,224 @@
-<template>
-  <div
-    id="signpost"
-    :class="['signpost', signpostClass]"
-    :style="signpostStyles"
-    @click.stop
-    @mouseenter="hovered = true"
-    @mouseleave="hovered = false"
-  >
-    <div class="signpost-wrap">
-      <div class="popover-pointer" />
-      <div class="signpost-content-header">
-        <button
-          :id="`${props.testId}-close-icon`"
-          class="signpost-action close"
-          @click="hide"
-        >
-          <atoms-the-icon class="close-icon" name="close" />
-        </button>
-      </div>
-      <div class="signpost-content-body">
-        <slot />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { UI_I_ElPosition } from '~/components/atoms/tooltip/Models/interfaces'
-const props = withDefaults(
-  defineProps<{
-    elemId: string
-    testId?: string
-  }>(),
-  { testId: 'ui-signpost' }
-)
-const emits = defineEmits<{
-  (event: 'hide'): void
-}>()
-const hide = (): void => {
-  emits('hide')
-}
-
-const signpostStyles = ref<UI_I_ElPosition | null>(null)
-watch(
-  () => props.elemId,
-  (id: string) => {
-    const elem = (document.getElementById(id) as HTMLDivElement) || null
-    const { width, x, y } = elem.getBoundingClientRect()
-
-    signpostStyles.value = {
-      top: `${y}px`,
-      left: `${x + width / 2}px`,
-    }
-    setTimeout(() => {
-      setSignpostPosition()
-    }, 0)
-  },
-  { immediate: true }
-)
-const signpostClass = ref<string[]>([])
-const setSignpostPosition = (): void => {
-  const signpost =
-    (document.getElementById('signpost') as HTMLDivElement) || null
-  const signpostRect = (signpost?.getBoundingClientRect() as DOMRect) || null
-
-  type PositionX = 'right' | 'left'
-  let positionX: PositionX = 'right'
-
-  type PositionY = 'top' | 'middle'
-  let positionY: PositionY = 'middle'
-
-  const isOutRight = signpostRect.left + signpostRect.width > window.innerWidth
-  const isOutTop = signpostRect.top < 0
-
-  if (isOutTop) {
-    positionY = 'top'
-  }
-  if (isOutRight) {
-    positionX = 'left'
-  }
-
-  signpostClass.value.push(positionY)
-  signpostClass.value.push(positionX)
-  signpostClass.value.push('show')
-}
-
-const hovered = ref(false)
-const windowClick = (): void => {
-  hide()
-}
-const windowScroll = (): void => {
-  if (hovered.value) {
-    return
-  }
-  hide()
-}
-onMounted(() => {
-  setTimeout(() => {
-    window.addEventListener('click', windowClick)
-    window.addEventListener('scroll', windowScroll, true)
-  })
-})
-onUnmounted(() => {
-  window.removeEventListener('click', windowClick)
-  window.removeEventListener('scroll', windowScroll, true)
-})
-</script>
-
-<style scoped lang="scss">
-.signpost {
-  opacity: 0;
-  position: fixed;
-  cursor: default;
-  transform: translateY(calc(-50% + 14px)) translateX(20px);
-  z-index: 1000000000;
-
-  &.show {
-    opacity: 1;
-  }
-  &.left {
-    transform: translateY(calc(-50% + 14px)) translateX(calc(-100% - 20px));
-
-    .signpost-wrap {
-      .popover-pointer {
-        left: 100%;
-        border-right: unset;
-        border-left: 12px solid var(--signpost-border-color);
-
-        &::before {
-          border-right: unset;
-          border-left: 12px solid var(--signpost-bgcolor);
-          left: unset;
-          right: 2px;
-        }
-      }
-    }
-  }
-  &.top {
-    transform: translateY(calc(0% + 10px)) translateX(20px);
-
-    &.left {
-      transform: translateY(calc(0% + 10px)) translateX(calc(-100% - 20px));
-
-      .popover-pointer {
-        top: 5px;
-      }
-    }
-
-    .signpost-wrap {
-      .popover-pointer {
-        top: 5px;
-      }
-    }
-  }
-
-  .signpost-wrap {
-    border-radius: 3px;
-    border: 1px solid var(--signpost-border-color);
-    background-color: var(--signpost-bgcolor);
-    position: relative;
-
-    .popover-pointer {
-      border-bottom: 12px solid transparent;
-      top: 50%;
-      transform: translateY(-50%);
-      border-right: 12px solid var(--signpost-border-color);
-      left: -12px;
-      height: 0;
-      width: 0;
-      position: absolute;
-
-      &::before {
-        border-bottom: 12px solid transparent;
-        top: 1px;
-        border-right: 12px solid var(--signpost-bgcolor);
-        left: 2px;
-        content: '';
-        height: 0;
-        width: 0;
-        position: absolute;
-      }
-    }
-
-    .signpost-content-header {
-      display: flex;
-      justify-content: flex-end;
-      position: absolute;
-      width: 100%;
-      background-color: inherit;
-      top: 0;
-
-      button {
-        line-height: 24px;
-
-        .close-icon {
-          width: 16px;
-          height: 16px;
-        }
-      }
-    }
-
-    .signpost-content-body {
-      padding: 24px;
-      max-height: 480px;
-      overflow-y: auto;
-      text-transform: none;
-    }
-  }
-}
-</style>
-
-<style>
-:root {
-  --signpost-bgcolor: #fff;
-  --signpost-border-color: #b3b3b3;
-  --signpost-color: #acbac3;
-}
-:root.dark-theme {
-  --signpost-bgcolor: #21333b;
-  --signpost-border-color: #000;
-  --signpost-color: #acbac3;
-}
-</style>
+<template>
+  <div
+    id="signpost"
+    :class="['signpost', signpostClass]"
+    :style="signpostStyles"
+    @click.stop
+    @mouseenter="hovered = true"
+    @mouseleave="hovered = false"
+  >
+    <div class="signpost-wrap">
+      <div class="popover-pointer" />
+      <div class="signpost-content-header">
+        <button
+          :id="`${props.testId}-close-icon`"
+          class="signpost-action close"
+          @click="hide"
+        >
+          <atoms-the-icon class="close-icon" name="close" />
+        </button>
+      </div>
+      <div class="signpost-content-body">
+        <slot />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { UI_I_ElPosition } from '~/components/atoms/tooltip/Models/interfaces'
+const props = withDefaults(
+  defineProps<{
+    elemId: string
+    testId?: string
+  }>(),
+  { testId: 'ui-signpost' }
+)
+const emits = defineEmits<{
+  (event: 'hide'): void
+}>()
+const hide = (): void => {
+  emits('hide')
+}
+
+const signpostStyles = ref<UI_I_ElPosition | null>(null)
+watch(
+  () => props.elemId,
+  (id: string) => {
+    const elem = (document.getElementById(id) as HTMLDivElement) || null
+    const { width, x, y } = elem.getBoundingClientRect()
+
+    signpostStyles.value = {
+      top: `${y}px`,
+      left: `${x + width / 2}px`,
+    }
+    setTimeout(() => {
+      setSignpostPosition()
+    }, 0)
+  },
+  { immediate: true }
+)
+const signpostClass = ref<string[]>([])
+const setSignpostPosition = (): void => {
+  const signpost =
+    (document.getElementById('signpost') as HTMLDivElement) || null
+  const signpostRect = (signpost?.getBoundingClientRect() as DOMRect) || null
+
+  type PositionX = 'right' | 'left'
+  let positionX: PositionX = 'right'
+
+  type PositionY = 'top' | 'middle'
+  let positionY: PositionY = 'middle'
+
+  const isOutRight = signpostRect.left + signpostRect.width > window.innerWidth
+  const isOutTop = signpostRect.top < 0
+
+  if (isOutTop) {
+    positionY = 'top'
+  }
+  if (isOutRight) {
+    positionX = 'left'
+  }
+
+  signpostClass.value.push(positionY)
+  signpostClass.value.push(positionX)
+  signpostClass.value.push('show')
+}
+
+const hovered = ref(false)
+const windowClick = (): void => {
+  hide()
+}
+const windowScroll = (): void => {
+  if (hovered.value) {
+    return
+  }
+  hide()
+}
+onMounted(() => {
+  setTimeout(() => {
+    window.addEventListener('click', windowClick)
+    window.addEventListener('scroll', windowScroll, true)
+  })
+})
+onUnmounted(() => {
+  window.removeEventListener('click', windowClick)
+  window.removeEventListener('scroll', windowScroll, true)
+})
+</script>
+
+<style scoped lang="scss">
+.signpost {
+  opacity: 0;
+  position: fixed;
+  cursor: default;
+  transform: translateY(calc(-50% + 14px)) translateX(20px);
+  z-index: 1000000000;
+
+  &.show {
+    opacity: 1;
+  }
+  &.left {
+    transform: translateY(calc(-50% + 14px)) translateX(calc(-100% - 20px));
+
+    .signpost-wrap {
+      .popover-pointer {
+        left: 100%;
+        border-right: unset;
+        border-left: 12px solid var(--signpost-border-color);
+
+        &::before {
+          border-right: unset;
+          border-left: 12px solid var(--signpost-bgcolor);
+          left: unset;
+          right: 2px;
+        }
+      }
+    }
+  }
+  &.top {
+    transform: translateY(calc(0% + 10px)) translateX(20px);
+
+    &.left {
+      transform: translateY(calc(0% + 10px)) translateX(calc(-100% - 20px));
+
+      .popover-pointer {
+        top: 5px;
+      }
+    }
+
+    .signpost-wrap {
+      .popover-pointer {
+        top: 5px;
+      }
+    }
+  }
+
+  .signpost-wrap {
+    border-radius: 3px;
+    border: 1px solid var(--signpost-border-color);
+    background-color: var(--signpost-bgcolor);
+    position: relative;
+
+    .popover-pointer {
+      border-bottom: 12px solid transparent;
+      top: 50%;
+      transform: translateY(-50%);
+      border-right: 12px solid var(--signpost-border-color);
+      left: -12px;
+      height: 0;
+      width: 0;
+      position: absolute;
+
+      &::before {
+        border-bottom: 12px solid transparent;
+        top: 1px;
+        border-right: 12px solid var(--signpost-bgcolor);
+        left: 2px;
+        content: '';
+        height: 0;
+        width: 0;
+        position: absolute;
+      }
+    }
+
+    .signpost-content-header {
+      display: flex;
+      justify-content: flex-end;
+      position: absolute;
+      width: 100%;
+      background-color: inherit;
+      top: 0;
+
+      button {
+        line-height: 24px;
+
+        .close-icon {
+          width: 16px;
+          height: 16px;
+        }
+      }
+    }
+
+    .signpost-content-body {
+      padding: 24px;
+      max-height: 480px;
+      overflow-y: auto;
+      text-transform: none;
+    }
+  }
+}
+</style>
+
+<style>
+:root {
+  --signpost-bgcolor: #fff;
+  --signpost-border-color: #b3b3b3;
+  --signpost-color: #acbac3;
+}
+:root.dark-theme {
+  --signpost-bgcolor: #21333b;
+  --signpost-border-color: #000;
+  --signpost-color: #acbac3;
+}
+</style>

package/components/common/accordion/Accordion.vue

@@ -19,8 +19,8 @@
     <common-accordion-recursion
       v-for="(item, key) in accordionLocal"
       :id="`${props.testId}-${key}`"
-      :key="item.id"
       :test-id="`${props.testId}-${key}`"
+      :key="item.id"
       :accordion="item"
       @change="onSelect"
     />
@@ -30,12 +30,10 @@
 <script setup lang="ts">
 import { vOnClickOutside } from '@vueuse/components'
 import { UI_I_AccordionRecursion } from '~/components/common/accordion/models/interfaces'
-import { constructItems } from '~/components/common/accordion/utils/accordion'
 
 const props = defineProps<{
   testId: string
   accordion: UI_I_AccordionRecursion[]
-  isAllCollapsed?: boolean
 }>()
 
 const emits = defineEmits<{
@@ -44,9 +42,8 @@ const emits = defineEmits<{
 
 const parentName = ref<string>('')
 const childName = ref<string>('')
-const isAllCollapsedLocal = ref<boolean | null>(null)
-const accordionLocal = computed<UI_I_AccordionRecursion[]>(() =>
-  constructItems(props.accordion, isAllCollapsedLocal.value)
+const accordionLocal = computed<UI_I_AccordionRecursion[]>(
+  () => props.accordion
 )
 
 const closeDropMenuMobile = (): void => {
@@ -94,13 +91,6 @@ const onSelect = (item: UI_I_AccordionRecursion): void => {
     }
   })
 }
-
-watch(
-  () => props.isAllCollapsed,
-  (newValue) => {
-    isAllCollapsedLocal.value = newValue
-  }
-)
 </script>
 
 <style lang="scss">

package/components/common/accordion/Recursion.vue

@@ -1,10 +1,13 @@
 <template>
-  <div class="accordion" :class="{ disabled: props.accordion.disabled }">
-    <nuxt-link
+  <div
+    class="accordion"
+    :class="{ isOpen, disabled: props.accordion.disabled }"
+  >
+    <NuxtLink
       class="accordion-item"
-      :to="accordionLocal.path"
+      :to="accordion.path"
       active-class="active"
-      @click.prevent="onSelect(accordionLocal)"
+      @click.prevent="onSelect(accordion)"
     >
       <div
         :class="['heading-wrap', { group: props.accordion.hasChild }]"
@@ -25,18 +28,10 @@
           :id="`${props.testId}-trigger-button`"
           class="btn-trigger"
         >
-          <atoms-the-icon
-            :class="[
-              'trigger-icon',
-              {
-                isOpen: accordionLocal.isOpen,
-              },
-            ]"
-            name="angle"
-          />
+          <atoms-the-icon class="trigger-icon" name="angle" />
         </button>
       </div>
-    </nuxt-link>
+    </NuxtLink>
 
     <transition
       v-if="props.accordion.hasChild"
@@ -46,11 +41,11 @@
       @before-leave="start"
       @leave="end"
     >
-      <div v-show="accordionLocal.isOpen" class="accordion__content">
+      <div v-show="isOpen" class="accordion__content">
         <common-accordion-recursion
           v-for="(item, key) in props.accordion.children"
-          :key="item.id"
           :test-id="`${props.testId}-${key}`"
+          :key="item.id"
           :accordion="item"
           :level="props.level + 1"
           @change="onSelect"
@@ -78,16 +73,14 @@ const emits = defineEmits<{
   (event: 'change', value: UI_I_AccordionRecursion): void
 }>()
 
-const accordionLocal = ref<UI_I_AccordionRecursion>(props.accordion)
-
+const isOpen = ref<boolean>(true)
 const toggle = (): void => {
   if (!props.accordion.hasChild) return
-
-  accordionLocal.value.isOpen = !accordionLocal.value.isOpen
+  isOpen.value = !isOpen.value
 }
 
 const start = (element: any): void => {
-  element.style.height = 'auto'
+  element.style.height = element.scrollHeight + 'px'
 }
 const end = (el: any): void => {
   el.style.height = 0
@@ -100,7 +93,7 @@ const headingClass = computed<UI_I_HeadingClass>(() => {
   }
 })
 
-const onSelect = (item: UI_I_AccordionRecursion): void => {
+const onSelect = (item: UI_I_AccordionRecursion) => {
   emits('change', item)
 }
 </script>
@@ -194,7 +187,7 @@ const onSelect = (item: UI_I_AccordionRecursion): void => {
     transform: rotate(90deg);
     margin-left: auto;
     fill: var(--triger-icon-color);
-    &.isOpen {
+    .isOpen & {
       transform: rotate(180deg);
     }
   }

package/components/common/accordion/models/interfaces.ts

@@ -6,7 +6,6 @@ export interface UI_I_AccordionRecursion {
   path?: string
   iconClassName?: string
   children?: UI_I_AccordionRecursion[]
-  isOpen?: boolean
 }
 
 export interface UI_I_HeadingClass {