@eturnity/eturnity_reusable_components 7.8.6-EPDM-7951.0 → 7.10.0-EPDM-10163.0

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

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

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

@@ -34,6 +34,7 @@
             :value="value"
             @input="onChangeHandler"
             @blur="onInputBlur"
+            @keyup.enter="onEnterPress"
             :noBorder="noBorder"
             :disabled="disabled"
             :isDisabled="disabled"
@@ -66,7 +67,7 @@
 </template>
 
 <script>
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import InfoText from '../../infoText'
 import Icon from '../../icon'
 import ErrorMessage from '../../errorMessage'
@@ -328,8 +329,12 @@ export default {
     }
   },
   methods: {
-    onChangeHandler(event) {
-      this.$emit('input-change', event.target.value)
+    onEnterPress(event){
+      this.$emit('on-enter-click')
+      this.$refs.inputElement.$el.blur()
+    },
+    onChangeHandler($event) {
+      this.$emit('input-change', $event)
     },
     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 '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

@@ -30,9 +30,7 @@
       <select-button-wrapper :disabled="disabled">
         <selectButton
           ref="select"
-          class="select-button"
           @click="toggleDropdown"
-          :selectWidth="selectWidth"
           :selectHeight="selectHeight"
           :height="height"
           :selectMinHeight="selectMinHeight"
@@ -43,17 +41,14 @@
             buttonFontColor || colorMode == 'dark' ? 'white' : 'black'
           "
           :hasError="hasError"
-          :hasNoPadding="isSearchBarVisible || !hasSelectButtonPadding"
+          :isSearchBarVisible="isSearchBarVisible"
           :disabled="disabled"
-          @keydown="onKeyDown"
+          @keydown.native="onKeyDown"
           :showBorder="showBorder"
           :data-id="dataId"
           :isDraggable="isDraggable"
-        >
-          <draggableInputHandle
-            v-if="isDraggable && !isSearchBarVisible"
-            :height="selectHeight"
-          />
+        > 
+          <draggableInputHandle v-if="isDraggable && !isSearchBarVisible" :height="selectHeight" />
           <inputText
             v-if="isSearchBarVisible"
             ref="searchInput"
@@ -68,9 +63,9 @@
             :value="textSearch"
             @keydown.stop="onKeyDown"
             @input-change="searchChange"
-            @click.stop
+            @click.native.stop
           />
-          <selector :selectWidth="selectWidth" v-else>
+          <selector v-else>
             <slot name="selector" :selectedValue="selectedValue"></slot>
           </selector>
           <Caret @click.stop="toggleCaretDropdown">
@@ -96,33 +91,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>
@@ -137,9 +125,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}}
@@ -152,8 +139,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'
@@ -166,18 +152,13 @@ const Caret = styled.div`
   width: 30px;
   min-width: 30px;
   height: 100%;
+  align-items: stretch
   cursor: pointer;
   margin-left: auto;
 `
 
-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 Selector = styled.div`
+  width: 100%;
 `
 
 const labelAttrs = { fontSize: String, fontColor: String }
@@ -186,16 +167,13 @@ const InputLabel = styled('div', labelAttrs)`
     props.theme.colors[props.fontColor]
       ? props.theme.colors[props.fontColor]
       : props.fontColor};
-  font-size: ${(props) => props.fontSize};
+  font-size: ${(props) => (props.fontSize ? props.fontSize : '13px')};
   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;
@@ -222,22 +200,19 @@ const selectButtonAttrs = {
   hasError: Boolean,
   disabled: Boolean,
   selectHeight: String,
-  selectWidth: String,
   height: String,
   selectMinHeight: String,
-  hasNoPadding: Boolean,
+  isSearchBarVisible: Boolean,
   showBorder: Boolean,
-  isDraggable: Boolean
+  isDraggable: Boolean,
 }
 const selectButton = styled('div', selectButtonAttrs)`
   position: relative;
   box-sizing: border-box;
   border-radius: 4px;
-  padding-left: ${(props) =>
-    props.hasNoPadding ? '0' : props.isDraggable ? '30px' : '15px'};
+  padding-left:${(props) => (props.isSearchBarVisible ? '0' : props.isDraggable?'30px':'15px')};
   text-align: left;
   border-radius: 4px;
-  max-width: ${(props) => (props.selectWidth ? props.selectWidth : '100%')};
   min-height: ${(props) =>
     props.selectHeight
       ? props.selectHeight
@@ -248,7 +223,7 @@ const selectButton = styled('div', selectButtonAttrs)`
       : '36px'};
   display: flex;
   align-items: center;
-  height: ${(props) => props.selectHeight};
+  max-height: ${(props) => props.selectHeight};
   ${({ showBorder, theme, hasError }) =>
     showBorder &&
     `
@@ -266,10 +241,8 @@ const selectButton = styled('div', selectButtonAttrs)`
       : props.fontColor};
   ${(props) => (props.disabled ? 'pointer-events: none' : '')};
   overflow: hidden;
-  & > .handle {
-    border-right: ${(props) =>
-        props.hasError ? props.theme.colors.red : props.theme.colors.grey4}
-      1px solid;
+  & >.handle{
+    border-right:${(props) =>props.hasError ? props.theme.colors.red : props.theme.colors.grey4} 1px solid;
   }
 `
 const selectDropdownAttrs = {
@@ -279,17 +252,14 @@ 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' : '99999')};
-    position: absolute;
-    top: ${(props) => props.dropdownPosition?.top}px;
-    left: ${(props) => props.dropdownPosition?.left}px;
+    z-index:${(props) => (props.isActive ? '2' : '1')};
+    position:absolute;
+    top:5px;
     border:1px solid ${(props) => props.theme.colors.grey4}
     border-radius:4px;
     display: flex;
@@ -297,7 +267,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};
+    width: ${(props) => (props.optionWidth ? props.optionWidth : '100%')};
     background-color:${(props) =>
       props.theme.colors[props.bgColor]
         ? props.theme.colors[props.bgColor]
@@ -314,9 +284,7 @@ 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;
 `
@@ -329,10 +297,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',
 
@@ -343,7 +307,7 @@ export default {
     },
     fontSize: {
       required: false,
-      default: '13px'
+      default: null
     },
     label: {
       required: false
@@ -446,10 +410,6 @@ export default {
       type: String,
       default: ''
     },
-    hasSelectButtonPadding: {
-      type: Boolean,
-      default: true
-    },
     isDraggable: {
       type: Boolean,
       default: false
@@ -471,7 +431,6 @@ export default {
     Caret,
     Selector,
     inputText,
-    Teleport,
     draggableInputHandle
   },
 
@@ -482,38 +441,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
@@ -529,9 +473,6 @@ export default {
       this.blur()
       this.isDropdownOpen = false
     },
-    clearSearch() {
-      this.textSearch = ''
-    },
     optionSelected(e) {
       this.selectedValue = e
       this.closeDropdown()
@@ -560,15 +501,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'
+          }
+        })
     },
     onSelectSlotClick() {
       this.toggleDropdown()
@@ -581,7 +522,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
@@ -595,92 +535,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(
@@ -703,36 +564,34 @@ export default {
   computed: {
     optionLength() {
       if (this.isDropdownOpen) {
-        return this.$refs.dropdown.$el.childElementCount
+        // 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
       } 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
     },
-    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() {