@eturnity/eturnity_reusable_components 7.6.1-EPDM-9777.6 → 7.6.1-EPDM-7951

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

@@ -44,7 +44,7 @@
 //   number_max_allowed: 10,
 //   unit_short_name: "cm",
 // },
-import styled from "vue-styled-components"
+import styled from "vue3-styled-components"
 import {
   stringToNumber,
   numberToString,

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

@@ -66,7 +66,7 @@
 </template>
 
 <script>
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
 import InfoText from '../../infoText'
 import Icon from '../../icon'
 import ErrorMessage from '../../errorMessage'
@@ -328,8 +328,8 @@ export default {
     }
   },
   methods: {
-    onChangeHandler($event) {
-      this.$emit('input-change', $event)
+    onChangeHandler(event) {
+      this.$emit('input-change', event.target.value)
     },
     onInputBlur($event) {
       this.$emit('input-blur', $event.target.value)

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

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

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

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

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

@@ -30,7 +30,9 @@
       <select-button-wrapper :disabled="disabled">
         <selectButton
           ref="select"
+          class="select-button"
           @click="toggleDropdown"
+          :selectWidth="selectWidth"
           :selectHeight="selectHeight"
           :height="height"
           :selectMinHeight="selectMinHeight"
@@ -41,9 +43,9 @@
             buttonFontColor || colorMode == 'dark' ? 'white' : 'black'
           "
           :hasError="hasError"
-          :isSearchBarVisible="isSearchBarVisible"
+          :hasNoPadding="isSearchBarVisible || !hasSelectButtonPadding"
           :disabled="disabled"
-          @keydown.native="onKeyDown"
+          @keydown="onKeyDown"
           :showBorder="showBorder"
           :data-id="dataId"
         >
@@ -61,9 +63,9 @@
             :value="textSearch"
             @keydown.stop="onKeyDown"
             @input-change="searchChange"
-            @click.native.stop
+            @click.stop
           />
-          <selector v-else>
+          <selector :selectWidth="selectWidth" v-else>
             <slot name="selector" :selectedValue="selectedValue"></slot>
           </selector>
           <Caret @click.stop="toggleCaretDropdown">
@@ -89,26 +91,33 @@
             />
           </Caret>
         </selectButton>
-        <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 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>
       </select-button-wrapper>
     </input-wrapper>
@@ -123,8 +132,9 @@
 //     optionWidth="50%"
 //     label="that is a label"
 //     alignItems="vertical"
-//     label-data-id="test-label0data-id"
+//     label-data-id="test-label-data-id"
 //     data-id="test-data-id"
+//     :hasSelectButtonPadding="false"
 //     >
 //     <template #selector="{selectedValue}">
 //     value selected: {{selectedValue}}
@@ -137,7 +147,8 @@
 //     </template>
 // </Select>
 
-import styled from 'vue-styled-components'
+import { Teleport } from 'vue'
+import styled from 'vue3-styled-components'
 import InfoText from '../../infoText'
 import icon from '../../icon'
 import inputText from '../inputText'
@@ -149,13 +160,18 @@ const Caret = styled.div`
   width: 30px;
   min-width: 30px;
   height: 100%;
-  align-items: stretch
   cursor: pointer;
   margin-left: auto;
 `
 
-const Selector = styled.div`
-  width: 100%;
+const Selector = styled('div', { selectWidth: String })`
+  max-width: ${(props) =>
+    props.selectWidth
+      ? props.selectWidth
+      : '100%'}; // set to same width as the select
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
 `
 
 const labelAttrs = { fontSize: String, fontColor: String }
@@ -164,13 +180,16 @@ const InputLabel = styled('div', labelAttrs)`
     props.theme.colors[props.fontColor]
       ? props.theme.colors[props.fontColor]
       : props.fontColor};
-  font-size: ${(props) => (props.fontSize ? props.fontSize : '13px')};
+  font-size: ${(props) => props.fontSize};
   font-weight: 700;
 `
 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 ? props.selectWidth : '100%')};
   position: relative;
@@ -197,18 +216,20 @@ const selectButtonAttrs = {
   hasError: Boolean,
   disabled: Boolean,
   selectHeight: String,
+  selectWidth: String,
   height: String,
   selectMinHeight: String,
-  isSearchBarVisible: Boolean,
+  hasNoPadding: Boolean,
   showBorder: Boolean
 }
 const selectButton = styled('div', selectButtonAttrs)`
   position: relative;
   box-sizing: border-box;
   border-radius: 4px;
-  padding: ${(props) => (props.isSearchBarVisible ? '0' : '0px 0px 0 15px')};
+  padding: ${(props) => (props.hasNoPadding ? '0' : '0px 0px 0 15px')};
   text-align: left;
   border-radius: 4px;
+  max-width: ${(props) => (props.selectWidth ? props.selectWidth : '100%')};
   min-height: ${(props) =>
     props.selectHeight
       ? props.selectHeight
@@ -219,7 +240,7 @@ const selectButton = styled('div', selectButtonAttrs)`
       : '36px'};
   display: flex;
   align-items: center;
-  max-height: ${(props) => props.selectHeight};
+  height: ${(props) => props.selectHeight};
   ${({ showBorder, theme, hasError }) =>
     showBorder &&
     `
@@ -244,14 +265,17 @@ const selectDropdownAttrs = {
   selectWidth: 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' : '1')};
-    position:absolute;
-    top:5px;
+    z-index:${(props) => (props.isActive ? '2' : '99999')};
+    position: absolute;
+    top: ${(props) => props.dropdownPosition?.top}px;
+    left: ${(props) => props.dropdownPosition?.left}px;
     border:1px solid ${(props) => props.theme.colors.grey4}
     border-radius:4px;
     display: flex;
@@ -259,7 +283,7 @@ const selectDropdown = styled('div', selectDropdownAttrs)`
     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%')};
+    width: ${(props) => props.optionWidth};
     background-color:${(props) =>
       props.theme.colors[props.bgColor]
         ? props.theme.colors[props.bgColor]
@@ -276,7 +300,9 @@ const selectDropdown = styled('div', selectDropdownAttrs)`
             ? props.theme.colors[props.hoveredBgColor]
             : props.hoveredBgColor};
     }
+    font-size: ${(props) => props.fontSize}
 `
+selectDropdown.emits = ['option-hovered', 'option-selected']
 const DropdownWrapper = styled('div')`
   position: relative;
 `
@@ -289,6 +315,10 @@ 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',
 
@@ -299,7 +329,7 @@ export default {
     },
     fontSize: {
       required: false,
-      default: null
+      default: '13px'
     },
     label: {
       required: false
@@ -401,6 +431,10 @@ export default {
     dataId: {
       type: String,
       default: ''
+    },
+    hasSelectButtonPadding: {
+      type: Boolean,
+      default: true
     }
   },
 
@@ -418,7 +452,8 @@ export default {
     icon,
     Caret,
     Selector,
-    inputText
+    inputText,
+    Teleport
   },
 
   data() {
@@ -428,23 +463,38 @@ export default {
       isActive: false,
       textSearch: '',
       hoveredIndex: 0,
-      hoveredValue: null,
-      isClickOutsideActive: false
+      isClickOutsideActive: false,
+      dropdownPosition: {
+        left: null,
+        top: null
+      },
+      dropdownWidth: null,
+      hoveredValue: null
     }
   },
   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()
   },
-  beforeDestroy() {
+  unmounted() {
     document.removeEventListener('click', this.clickOutside)
   },
   methods: {
     focus() {
       this.isActive = true
     },
-    blur() {
+    blur(e) {
       this.isActive = false
+      this.$emit('blur', e)
     },
     toggleDropdown() {
       this.isDropdownOpen = !this.isDropdownOpen
@@ -460,6 +510,9 @@ export default {
       this.blur()
       this.isDropdownOpen = false
     },
+    clearSearch() {
+      this.textSearch = ''
+    },
     optionSelected(e) {
       this.selectedValue = e
       this.closeDropdown()
@@ -488,15 +541,15 @@ export default {
     searchChange(value) {
       this.textSearch = value
       this.$emit('search-change', value)
-      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'
-          }
-        })
+      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'
+      })
     },
     onSelectSlotClick() {
       this.toggleDropdown()
@@ -509,6 +562,7 @@ 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
@@ -522,13 +576,92 @@ export default {
       } else if (e.key == 'ArrowUp') {
         this.onArrowPress(-1)
       } else if (e.key == 'Enter') {
-        const optionHoveredComponent =
-          this.$refs.dropdown.$children[
-            (this.hoveredIndex - 1 + this.optionLength) % this.optionLength
-          ]
+        const optionHoveredComponent = [...this.$refs.dropdown.$el.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(
@@ -551,34 +684,36 @@ export default {
   computed: {
     optionLength() {
       if (this.isDropdownOpen) {
-        // this filterRef is needed to check for the # of children on Filter dropdowns
-        const filterRef =
-          this.$refs.dropdown.$children &&
-          this.$refs.dropdown.$children.length > 1
-            ? this.$refs.dropdown.$children
-            : this.$refs.dropdown.$children[0].$children
-            ? this.$refs.dropdown.$children[0].$children
-            : this.$refs.dropdown.$children
-        return filterRef.length
+        return this.$refs.dropdown.$el.childElementCount
       } else {
         return 0
       }
     },
     isSearchBarVisible() {
       return this.isSearchable && this.optionLength >= 5 && this.isDropdownOpen
+    },
+    getOptionWidth() {
+      if (this.optionWidth) return this.optionWidth
+
+      return this.dropdownWidth
+    },
+    isSelectDropdownShown() {
+      return this.isDropdownOpen && this.dropdownPosition.left !== null
     }
   },
   watch: {
     value(val) {
       this.selectedValue = val
     },
-    isDropdownOpen(val) {
-      this.$emit('is-dropdown-open', val)
+    async isDropdownOpen(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 'vue-styled-components'
+import styled from 'vue3-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: 'cursor'
+      default: 'pointer'
     },
     backgroundColor: {
       required: false,
@@ -94,12 +94,12 @@ export default {
     return {}
   },
   methods: {
-    clickHandler() {
+    clickHandler(e) {
       if (this.isDisabled) {
         // prevent emitter if the option is disabled
         return
       } else {
-        this.$parent.$emit('option-selected', this.value)
+        this.$parent.$emit('option-selected', this.value, e)
       }
     },
     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/dist/slider.vue2.js"
-import styled from "vue-styled-components"
+import Slider from '@vueform/slider'
+import styled from 'vue3-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>