@eturnity/eturnity_reusable_components 7.12.6-EPDM-7951.1 → 7.12.6-EPDM-10310.1

package/src/components/inputs/radioButton/index.vue

@@ -60,7 +60,7 @@
 //   { label: 'Button 4', value: 'button_4', disabled: true }
 // ]
 
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import Modal from '../../modals/modal'
 import InfoText from '../../infoText'
 

package/src/components/inputs/searchInput/index.vue

@@ -13,7 +13,10 @@
         :hasFocus="hasFocus"
         :data-id="dataId"
       />
-      <SearchIconSvg class="search-icn" />
+      <img
+        class="search-icn"
+        :src="require('../../../assets/icons/search_icon_black.svg')"
+      />
     </input-wrapper>
   </container>
 </template>
@@ -30,8 +33,7 @@
 //   :isFilter="true" // to set the height at 30px
 //   data-id="test-data-id"
 // />
-import styled from 'vue3-styled-components'
-import SearchIconSvg from '../../../assets/icons/search_icon_black.svg'
+import styled from 'vue-styled-components'
 
 const inputAttrs = {
   isDisabled: Boolean,
@@ -66,7 +68,7 @@ const InputContainer = styled('input', inputAttrs)`
 const InputWrapper = styled.span`
   position: relative;
 
-  svg {
+  img {
     position: absolute;
     right: 10px;
     top: 50%;
@@ -79,8 +81,7 @@ export default {
   components: {
     InputContainer,
     InputWrapper,
-    Container,
-    SearchIconSvg
+    Container
   },
   props: {
     value: {
@@ -113,7 +114,7 @@ export default {
   },
   methods: {
     onChangeHandler(event) {
-      this.$emit('on-change', event.target.value)
+      this.$emit('on-change', event)
     },
     focusInputElement() {
       this.$nextTick(() => {

package/src/components/inputs/select/index.vue

@@ -28,9 +28,7 @@
       <select-button-wrapper :disabled="disabled">
         <selectButton
           ref="select"
-          class="select-button"
           @click="toggleDropdown"
-          :selectWidth="selectWidth"
           :selectHeight="selectHeight"
           :height="height"
           :selectMinHeight="selectMinHeight"
@@ -41,14 +39,17 @@
             buttonFontColor || colorMode == 'dark' ? 'white' : 'black'
           "
           :hasError="hasError"
-          :hasNoPadding="isSearchBarVisible || !hasSelectButtonPadding"
+          :isSearchBarVisible="isSearchBarVisible"
           :disabled="disabled"
-          @keydown="onKeyDown"
+          @keydown.native="onKeyDown"
           :showBorder="showBorder"
           :data-id="dataId"
           :paddingLeft="paddingLeft"
         >
-          <draggableInputHandle v-if="isDraggable && !isSearchBarVisible" :height="selectHeight" />
+          <draggableInputHandle
+            v-if="isDraggable && !isSearchBarVisible"
+            :height="selectHeight"
+          />
           <inputText
             v-if="isSearchBarVisible"
             ref="searchInput"
@@ -63,9 +64,14 @@
             :value="textSearch"
             @keydown.stop="onKeyDown"
             @input-change="searchChange"
-            @click.stop
+            @click.native.stop
           />
-          <selector v-else :selectWidth="selectWidth" :paddingLeft="paddingLeft">
+          <selector
+            v-else
+            :showBorder="showBorder"
+            :selectWidth="selectWidth"
+            :paddingLeft="paddingLeft"
+          >
             <slot name="selector" :selectedValue="selectedValue"></slot>
           </selector>
           <Caret @click.stop="toggleCaretDropdown">
@@ -91,33 +97,26 @@
             />
           </Caret>
         </selectButton>
-        <DropdownWrapper ref="dropdownWrapperRef">
-          <Teleport to="#portal-target">
-            <selectDropdown
-              ref="dropdown"
-              v-show="isSelectDropdownShown"
-              :dropdownPosition="dropdownPosition"
-              :hoveredIndex="hoveredIndex"
-              :hoveredValue="hoveredValue"
-              :isActive="isActive"
-              :optionWidth="getOptionWidth"
-              :hoveredBgColor="
-                colorMode == 'dark' ? '#000000' : dropdownBgColor
-              "
-              :bgColor="
-                dropdownBgColor || colorMode == 'dark' ? 'black' : 'white'
-              "
-              :fontColor="
-                dropdownFontColor || colorMode == 'dark' ? 'white' : 'black'
-              "
-              :fontSize="fontSize"
-              :selectedValue="selectedValue"
-              @option-selected="optionSelected"
-              @option-hovered="optionHovered"
-            >
-              <slot name="dropdown"></slot>
-            </selectDropdown>
-          </Teleport>
+        <DropdownWrapper>
+          <selectDropdown
+            ref="dropdown"
+            v-show="isDropdownOpen"
+            :hoveredIndex="hoveredIndex"
+            :hoveredValue="hoveredValue"
+            :isActive="isActive"
+            :optionWidth="optionWidth"
+            :hoveredBgColor="colorMode == 'dark' ? '#000000' : dropdownBgColor"
+            :bgColor="colorMode == 'dark' ? 'black' : dropdownBgColor"
+            :fontColor="
+              dropdownFontColor || colorMode == 'dark' ? 'white' : 'black'
+            "
+            :selectedValue="selectedValue"
+            @option-selected="optionSelected"
+            @option-hovered="optionHovered"
+            @mouseleave="optionLeave"
+          >
+            <slot name="dropdown"></slot>
+          </selectDropdown>
         </DropdownWrapper>
       </select-button-wrapper>
     </input-wrapper>
@@ -132,9 +131,8 @@
 //     optionWidth="50%"
 //     label="that is a label"
 //     alignItems="vertical"
-//     label-data-id="test-label-data-id"
+//     label-data-id="test-label0data-id"
 //     data-id="test-data-id"
-//     :hasSelectButtonPadding="false"
 //     >
 //     <template #selector="{selectedValue}">
 //     value selected: {{selectedValue}}
@@ -147,8 +145,7 @@
 //     </template>
 // </Select>
 
-import { Teleport } from 'vue'
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import InfoText from '../../infoText'
 import icon from '../../icon'
 import inputText from '../inputText'
@@ -169,8 +166,21 @@ const Caret = styled.div`
   margin-left: auto;
 `
 
-const Selector = styled('div', { selectWidth: String, paddingLeft: String })`
-  width: ${(props) => `calc(${props.selectWidth} - (${CARET_WIDTH} + ${props.paddingLeft} + (${BORDER_WIDTH} * 2)))`};
+const selectorProps = {
+  selectWidth: String,
+  paddingLeft: String,
+  showBorder: Boolean
+}
+const Selector = styled('div', selectorProps)`
+  width: ${(props) =>
+    props.selectWidth === '100%' ? props.selectWidth :
+    `calc(${props.selectWidth} -
+      (
+        ${CARET_WIDTH} +
+        ${props.paddingLeft}
+        ${props.showBorder ? `+ (${BORDER_WIDTH} * 2)` : ''}
+      )
+    )`};
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
@@ -188,10 +198,7 @@ const InputLabel = styled('div', labelAttrs)`
 const optionalLabel = styled.span`
   font-weight: 300;
 `
-const inputProps = {
-  selectWidth: String,
-  optionWidth: String
-}
+const inputProps = { selectWidth: String, optionWidth: String }
 const Container = styled('div', inputProps)`
   width: ${(props) => props.selectWidth};
   position: relative;
@@ -218,10 +225,9 @@ const selectButtonAttrs = {
   hasError: Boolean,
   disabled: Boolean,
   selectHeight: String,
-  selectWidth: String,
   height: String,
   selectMinHeight: String,
-  hasNoPadding: Boolean,
+  isSearchBarVisible: Boolean,
   showBorder: Boolean,
   paddingLeft: String
 }
@@ -229,8 +235,8 @@ const selectButton = styled('div', selectButtonAttrs)`
   position: relative;
   box-sizing: border-box;
   border-radius: 4px;
-  max-width: ${(props) => (props.selectWidth ? props.selectWidth : '100%')};
-  ${(props) => (props.hasNoPadding ? '' : `padding-left: ${props.paddingLeft}` )};
+  ${(props) =>
+    props.isSearchBarVisible ? '' : `padding-left: ${props.paddingLeft}`};
   text-align: left;
   min-height: ${(props) =>
     props.selectHeight
@@ -242,11 +248,13 @@ const selectButton = styled('div', selectButtonAttrs)`
       : '36px'};
   display: flex;
   align-items: center;
-  height: ${(props) => props.selectHeight};
+  max-height: ${(props) => props.selectHeight};
   ${({ showBorder, theme, hasError }) =>
     showBorder &&
     `
-    border: ${BORDER_WIDTH} solid ${hasError ? theme.colors.red : theme.colors.grey4}
+    border: ${BORDER_WIDTH} solid ${
+      hasError ? theme.colors.red : theme.colors.grey4
+    }
   `}
   background-color:${(props) =>
     props.disabled
@@ -272,44 +280,39 @@ const selectDropdownAttrs = {
   fontColor: String,
   optionWidth: String,
   hoveredIndex: Number,
-  fontSize: String,
-  dropdownPosition: Object,
   hoveredValue: Number | String,
   selectedValue: Number | String
 }
 const selectDropdown = styled('div', selectDropdownAttrs)`
-    box-sizing: border-box;
-    z-index:${(props) => (props.isActive ? '2' : '99999')};
-    position:absolute;
-    top: ${(props) => props.dropdownPosition?.top}px;
-    left: ${(props) => props.dropdownPosition?.left}px;
-    border: ${BORDER_WIDTH} solid ${(props) => props.theme.colors.grey4};
-    border-radius:4px;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    padding: 0px;
-    box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
-    width: ${(props) => props.optionWidth};
-    background-color:${(props) =>
-      props.theme.colors[props.bgColor]
-        ? props.theme.colors[props.bgColor]
-        : props.bgColor};
-    color:${(props) =>
-      props.theme.colors[props.fontColor]
-        ? props.theme.colors[props.fontColor]
-        : props.fontColor};
-    max-height:300px;
-    overflow-y:auto;
-    &>div[data-value="${(props) => props.hoveredValue}"]{
-        background-color:${(props) =>
-          props.theme.colors[props.hoveredBgColor]
-            ? props.theme.colors[props.hoveredBgColor]
-            : props.hoveredBgColor};
-    }
-    font-size: ${(props) => props.fontSize}
+  box-sizing: border-box;
+  z-index: ${(props) => (props.isActive ? '2' : '1')};
+  position: absolute;
+  top: 5px;
+  border: ${BORDER_WIDTH} solid ${(props) => props.theme.colors.grey4};
+  border-radius: 4px;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  padding: 0px;
+  box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
+  width: ${(props) => (props.optionWidth ? props.optionWidth : '100%')};
+  background-color: ${(props) =>
+    props.theme.colors[props.bgColor]
+      ? props.theme.colors[props.bgColor]
+      : props.bgColor};
+  color: ${(props) =>
+    props.theme.colors[props.fontColor]
+      ? props.theme.colors[props.fontColor]
+      : props.fontColor};
+  max-height: 300px;
+  overflow-y: auto;
+  & > div[data-value='${(props) => props.hoveredValue}'] {
+    background-color: ${(props) =>
+      props.theme.colors[props.hoveredBgColor]
+        ? props.theme.colors[props.hoveredBgColor]
+        : props.hoveredBgColor};
+  }
 `
-selectDropdown.emits = ['option-hovered', 'option-selected']
 const DropdownWrapper = styled('div')`
   position: relative;
 `
@@ -322,10 +325,6 @@ const InputWrapper = styled('div', inputAttrs)`
   grid-template-columns: ${(props) =>
     props.alignItems === 'vertical' || !props.hasLabel ? '1fr' : 'auto 1fr'};
 `
-
-const DROPDOWN_HEIGHT_OFFSET = 4
-const DROPDOWN_TOP_OFFSET = 21
-
 export default {
   name: 'RCselect',
 
@@ -437,10 +436,6 @@ export default {
       type: String,
       default: ''
     },
-    hasSelectButtonPadding: {
-      type: Boolean,
-      default: true
-    },
     isDraggable: {
       type: Boolean,
       default: false
@@ -462,7 +457,6 @@ export default {
     Caret,
     Selector,
     inputText,
-    Teleport,
     draggableInputHandle
   },
 
@@ -474,38 +468,23 @@ export default {
       isActive: false,
       textSearch: '',
       hoveredIndex: 0,
-      isClickOutsideActive: false,
-      dropdownPosition: {
-        left: null,
-        top: null
-      },
-      dropdownWidth: null,
-      hoveredValue: null
+      hoveredValue: null,
+      isClickOutsideActive: false
     }
   },
   mounted() {
-    this.observeDropdownHeight()
-    this.observeSelectWidth()
-    window.addEventListener('resize', this.handleSetDropdownOffet)
-  },
-  beforeMount() {
     this.selectedValue = this.value
     document.addEventListener('click', this.clickOutside)
-    this.getDropdownPosition()
-    window.removeEventListener('resize', this.handleSetDropdownOffet)
-    if (this.dropdownResizeObserver) this.dropdownResizeObserver.disconnect()
-    if (this.selectResizeObserver) this.selectResizeObserver.disconnect()
   },
-  unmounted() {
+  beforeDestroy() {
     document.removeEventListener('click', this.clickOutside)
   },
   methods: {
     focus() {
       this.isActive = true
     },
-    blur(e) {
+    blur() {
       this.isActive = false
-      this.$emit('blur', e)
     },
     toggleDropdown() {
       this.isDropdownOpen = !this.isDropdownOpen
@@ -521,9 +500,6 @@ export default {
       this.blur()
       this.isDropdownOpen = false
     },
-    clearSearch() {
-      this.textSearch = ''
-    },
     optionSelected(e) {
       this.selectedValue = e
       this.closeDropdown()
@@ -552,15 +528,15 @@ export default {
     searchChange(value) {
       this.textSearch = value
       this.$emit('search-change', value)
-      const dropdownChildren = [...this.$refs.dropdown.$el.children]
-      dropdownChildren.forEach((el) => {
-        if (!el.textContent.toLowerCase().includes(value.toLowerCase())) {
-          el.style.display = 'none'
-
-          return
-        }
-        el.style.display = 'inherit'
-      })
+      this.$refs.dropdown.$children
+        .map((component) => component.$el)
+        .forEach((el) => {
+          if (!el.textContent.toLowerCase().includes(value.toLowerCase())) {
+            el.style.display = 'none'
+          } else {
+            el.style.display = 'inherit'
+          }
+        })
     },
     clickOutside(event) {
       const dropdownRef = this.$refs.dropdown
@@ -570,7 +546,6 @@ export default {
       if (
         this.$refs.select.$el == event.target ||
         this.$refs.select.$el.contains(event.target) ||
-        event.target.id === 'more-button' ||
         event.target.parentNode === dropdownRef.$el
       ) {
         return
@@ -584,92 +559,13 @@ export default {
       } else if (e.key == 'ArrowUp') {
         this.onArrowPress(-1)
       } else if (e.key == 'Enter') {
-        const optionHoveredComponent = [...this.$refs.dropdown.$el.children][
-          (this.hoveredIndex - 1 + this.optionLength) % this.optionLength
-        ]
+        const optionHoveredComponent =
+          this.$refs.dropdown.$children[
+            (this.hoveredIndex - 1 + this.optionLength) % this.optionLength
+          ]
         this.optionSelected(optionHoveredComponent.$el.dataset.value)
       }
     },
-    // If some part of the dropdown menu is outside viewport of the bottom of the screen,
-    // we need to offset it and display it at the top of the select dropdown instead
-    async getDropdownPosition() {
-      if (
-        !this.$refs.dropdownWrapperRef ||
-        !this.$refs.select ||
-        !this.$refs.dropdown
-      ) {
-        return
-      }
-      await this.$nextTick()
-      const isDisplayedAtBottom = await this.generateDropdownPosition()
-      await this.$nextTick()
-      // If the dropdown menu is going to be displayed at the bottom,
-      // we need reverify its position after a dom update (nextTick)
-      if (isDisplayedAtBottom) this.generateDropdownPosition()
-    },
-    async generateDropdownPosition() {
-      const isDropdownNotCompletelyVisible =
-        await this.isBottomOfDropdownOutOfViewport()
-      const dropdownWrapperEl = this.$refs.dropdownWrapperRef.$el
-      const selectButtonHeight = this.$refs.select.$el.clientHeight
-      const dropdownHeight = this.$refs.dropdown.$el.clientHeight
-      const dropdownWrapperRelativeHeight =
-        dropdownWrapperEl.getBoundingClientRect().top +
-        window.scrollY +
-        DROPDOWN_HEIGHT_OFFSET
-
-      const top = isDropdownNotCompletelyVisible
-        ? dropdownWrapperRelativeHeight
-        : dropdownWrapperRelativeHeight -
-          dropdownHeight -
-          selectButtonHeight -
-          DROPDOWN_TOP_OFFSET
-      const left = this.dropdownPosition.left
-        ? this.dropdownPosition.left
-        : dropdownWrapperEl.getBoundingClientRect().left + window.scrollX
-
-      this.dropdownPosition = { left: Math.floor(left), top: Math.floor(top) }
-
-      return isDropdownNotCompletelyVisible
-    },
-    async isBottomOfDropdownOutOfViewport() {
-      if (!this.$refs.dropdown) {
-        return false
-      }
-      await this.$nextTick()
-      const rect = this.$refs.dropdown.$el.getBoundingClientRect()
-      const windowHeight =
-        window.innerHeight || document.documentElement.clientHeight
-
-      // using Math.floor because the offsets may contain decimals we are not going to consider here
-      return Math.floor(rect.top) + Math.floor(rect.height) <= windowHeight
-    },
-    observeDropdownHeight() {
-      if (!this.$refs.dropdown) return
-      this.dropdownResizeObserver = new ResizeObserver(() => {
-        this.$nextTick(() => this.getDropdownPosition())
-      })
-      this.dropdownResizeObserver.observe(this.$refs.dropdown.$el)
-    },
-    handleSetDropdownOffet() {
-      if (!this.$refs.select) return
-      this.dropdownPosition.left = Math.floor(
-        this.$refs.select.$el.getBoundingClientRect().left
-      )
-      this.getDropdownWidth()
-    },
-    observeSelectWidth() {
-      if (!this.$refs.select) return
-      this.selectResizeObserver = new ResizeObserver(() =>
-        this.$nextTick(() => this.getDropdownWidth())
-      )
-      this.selectResizeObserver.observe(this.$refs.dropdown.$el)
-    },
-    async getDropdownWidth() {
-      if (!this.$refs.select) return
-      await this.$nextTick()
-      this.dropdownWidth = `${this.$refs.select.$el.clientWidth}px`
-    },
     onArrowPress(dir) {
       let newHoveredElem
       const currentHoveredElem = this.$refs.dropdown.$el.querySelector(
@@ -701,30 +597,20 @@ export default {
       return 0
     },
     isSearchBarVisible() {
-      return this.isSearchable && this.optionLength >= 5 && this.isDropdownOpen
-    },
-    getOptionWidth() {
-      if (this.optionWidth) return this.optionWidth
-
-      return this.dropdownWidth
-    },
-    isSelectDropdownShown() {
-      return this.isSearchable && this.isDropdownOpen && this.dropdownPosition.left !== null
+      return this.isSearchable && this.isDropdownOpen
     }
   },
   watch: {
     value(val) {
       this.selectedValue = val
     },
-    async isDropdownOpen(val) {
+    isDropdownOpen(val) {
+      this.$emit('is-dropdown-open', val)
       if (val) {
         setTimeout(() => {
           this.isClickOutsideActive = true
         }, 10)
-        await this.$nextTick()
-        this.handleSetDropdownOffet()
       } else {
-        this.dropdownPosition.left = null
         setTimeout(() => {
           this.isClickOutsideActive = false
         }, 10)

package/src/components/inputs/select/option/index.vue

@@ -22,7 +22,7 @@
 <script>
 //   import selectButton from './selectButton'
 //   import selectDropdown from './selectDropDown'
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 const optionProps = {
   isDisabled: Boolean,
   hoveredBgColor: String,
@@ -59,7 +59,7 @@ const optionContainer = styled('div', optionProps)`
 
 export default {
   name: 'RCoption',
-  emits: ['option-hovered', 'option-selected'],
+
   props: {
     value: {
       required: true
@@ -73,7 +73,7 @@ export default {
     },
     cursorType: {
       required: false,
-      default: 'pointer'
+      default: 'cursor'
     },
     backgroundColor: {
       required: false,
@@ -94,12 +94,12 @@ export default {
     return {}
   },
   methods: {
-    clickHandler(e) {
+    clickHandler() {
       if (this.isDisabled) {
         // prevent emitter if the option is disabled
         return
       } else {
-        this.$parent.$emit('option-selected', this.value, e)
+        this.$parent.$emit('option-selected', this.value)
       }
     },
     hoverHandler() {

package/src/components/inputs/slider/index.vue

@@ -21,8 +21,8 @@
 //     :minValue="10" //default is 0 if not specified
 //     :maxValue="500" //default is 100 if not specified
 // />
-import Slider from '@vueform/slider'
-import styled from 'vue3-styled-components'
+import Slider from "@vueform/slider/dist/slider.vue2.js"
+import styled from "vue-styled-components"
 
 const Container = styled.div`
   margin: 16px 0 16px 21px;
@@ -81,45 +81,45 @@ const NumberText = styled.div`
 `
 
 export default {
-  name: 'slider',
+  name: "slider",
   components: {
     Slider,
     Container,
-    NumberText
+    NumberText,
   },
   props: {
     value: {
       required: false,
-      default: 0
+      default: 0,
     },
     unit: {
       required: false,
-      default: ''
+      default: "",
     },
     minValue: {
       required: false,
-      default: 0
+      default: 0,
     },
     maxValue: {
       required: false,
-      default: 100
-    }
+      default: 100,
+    },
   },
   methods: {
     onChange(value) {
-      this.$emit('change', value)
-    }
+      this.$emit("change", value)
+    },
   },
   mounted() {
     // This is to add the 3 white lines to the slider button
-    let slider = document.querySelector('.slider-touch-area')
-    let span1 = document.createElement('span')
-    let span2 = document.createElement('span')
-    let span3 = document.createElement('span')
+    let slider = document.querySelector(".slider-touch-area")
+    let span1 = document.createElement("span")
+    let span2 = document.createElement("span")
+    let span3 = document.createElement("span")
     slider.appendChild(span1)
     slider.appendChild(span2)
     slider.appendChild(span3)
-  }
+  },
 }
 </script>