@eturnity/eturnity_reusable_components 7.24.1-EPDM-10528.0 → 7.24.1-EPDM-10647.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.24.1-EPDM-10528.0",
+  "version": "7.24.1-EPDM-10647.0",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",

package/src/components/buttons/mainButton/index.vue

@@ -8,7 +8,6 @@
       :customColor="customColor"
       :noWrap="noWrap"
       :data-id="dataId"
-      :fontColor="fontColor"
     >
       {{ text }}
     </button-container>
@@ -36,14 +35,12 @@ const ButtonAttrs = {
   isDisabled: Boolean,
   minWidth: String,
   customColor: String,
-  fontColor: String,
   noWrap: Boolean
 }
 const ButtonContainer = styled('div', ButtonAttrs)`
   padding: 7px 15px;
   font-size: 13px;
-  color: ${(props) =>
-    props.fontColor ? props.fontColor : props.theme.colors.white};
+  color: ${(props) => props.theme.colors.white};
   background-color: ${(props) =>
     props.isDisabled
       ? props.theme.colors.disabled
@@ -94,9 +91,6 @@ export default {
       required: false,
       default: null
     },
-    fontColor: {
-      required: false
-    },
     noWrap: {
       required: false,
       default: false

package/src/components/iconWrapper/index.vue

@@ -9,7 +9,6 @@
     :hoveredBackgroundColor="hoveredBackgroundColor"
     :isHovered="isHovered"
     :data-id="dataId"
-    :noCursor="noCursor"
   >
     <icon
       :disabled="disabled"
@@ -31,9 +30,6 @@
         borderRadius="1px"
       />
     </caret>
-    <lockContainer v-if="hasLock">
-      <icon size="9px" name="lock" color="yellow" />
-    </lockContainer>
   </Wrapper>
 </template>
 
@@ -58,14 +54,8 @@ const wrapperAttrs = {
   size: String,
   backgroundColor: String,
   hoveredBackgroundColor: String,
-  hasBorder: Boolean,
-  noCursor: Boolean
+  hasBorder: Boolean
 }
-const lockContainer = styled.div`
-  position: absolute;
-  bottom: 6px;
-  right: 6px;
-`
 const Wrapper = styled('div', wrapperAttrs)`
   position: relative;
   display: inline-flex;
@@ -77,8 +67,7 @@ const Wrapper = styled('div', wrapperAttrs)`
       : ''};
   justify-content: center;
   align-items: center;
-  cursor: ${(props) =>
-    props.noCursor ? 'auto' : props.disabled ? 'not-allowed' : 'pointer'};
+  cursor: ${(props) => (props.disabled ? 'not-allowed' : 'pointer')};
   background-color: ${(props) =>
     props.theme.colors[props.backgroundColor] || props.backgroundColor};
   border-radius: ${(props) => props.borderRadius};
@@ -106,8 +95,7 @@ export default {
   components: {
     Wrapper,
     icon,
-    caret,
-    lockContainer
+    caret
   },
   props: {
     disabled: {
@@ -165,14 +153,6 @@ export default {
     isLoading: {
       required: false,
       default: false
-    },
-    noCursor: {
-      required: false,
-      default: false
-    },
-    hasLock: {
-      required: false,
-      default: false
     }
   }
 }

package/src/components/infoText/index.vue

@@ -14,6 +14,7 @@
         :halfComputedTextInfoWidth="halfComputedTextInfoWidth"
         :alignArrow="alignArrow"
         :iconSize="size"
+        :maxWidth="maxWidth"
         ><slot />
         <span v-html="text"></span>
       </text-overlay>
@@ -52,7 +53,7 @@ const TextOverlay = styled('div', textAttrs)`
   background: ${(props) => props.theme.colors.black};
   padding: 10px;
   width: ${(props) => props.width};
-  max-width: 400px;
+  max-width: ${(props) => props.maxWidth};
   font-size: 13px;
   font-weight: 400;
   line-height: normal;
@@ -124,6 +125,10 @@ export default {
     width: {
       required: false,
       default: '165px'
+    },
+    maxWidth: {
+      type: String,
+      default: '400px'
     }
   },
   methods: {

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

@@ -1,5 +1,5 @@
 <template>
-  <component-wrapper>
+  <component-wrapper @click.stop>
     <container
       :checkColor="checkColor"
       :size="size"

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

@@ -63,9 +63,34 @@
         :isError="isError"
         >{{ unitName }}</unit-container
       >
-      <icon-wrapper v-if="isError && !showLinearUnitName" size="16px">
+      <icon-wrapper
+        v-if="isError && !showLinearUnitName"
+        size="16px"
+        :marginRight="showSelect ? selectWidth : 0"
+      >
         <icon name="warning" size="16px" cursor="default" />
       </icon-wrapper>
+      <select-wrapper v-if="showSelect">
+        <divider />
+        <Select
+          :showBorder="false"
+          :selectWidth="`${selectWidth}px`"
+          @input-change="$emit('select-change', $event)"
+        >
+          <template #selector>
+            <select-text>{{ getSelectValue }}</select-text>
+          </template>
+          <template #dropdown>
+            <Option
+              v-for="item in selectOptions"
+              :key="item.value"
+              :value="item.value"
+            >
+              {{ item.label }}
+            </Option>
+          </template>
+        </Select>
+      </select-wrapper>
     </input-wrapper>
     <error-message v-if="isError">{{ errorMessage }}</error-message>
   </container>
@@ -107,6 +132,8 @@ import {
 } from '../../../helpers/numberConverter'
 import InfoText from '../../infoText'
 import ErrorMessage from '../../errorMessage'
+import Select from '../select'
+import Option from '../select/option'
 import warningIcon from '../../../assets/icons/error_icon.png'
 import Icon from '../../icon'
 
@@ -282,16 +309,35 @@ const LabelText = styled('div', inputProps)`
   font-weight: 700;
 `
 
-const IconAttrs = { size: String }
+const IconAttrs = { size: String, marginRight: Number }
 const IconWrapper = styled('div', IconAttrs)`
   position: absolute;
   top: 0;
   bottom: 0;
   margin: auto;
-  right: 5px;
+  right: ${(props) => props.marginRight + 10}px;
   height: ${(props) => (props.size ? props.size : 'auto')};
 `
 
+const SelectText = styled.div`
+  font-size: 13px;
+`
+
+const SelectWrapper = styled.div`
+  position: absolute;
+  top: 2px;
+  right: 2px;
+  display: flex;
+  height: 100%;
+`
+
+const Divider = styled.div`
+  margin-top: 6px;
+  height: calc(100% - 16px);
+  width: 1px;
+  background-color: ${({ theme }) => theme.colors.grey4};
+`
+
 export default {
   name: 'input-number',
   components: {
@@ -306,7 +352,12 @@ export default {
     InfoText,
     Icon,
     SlotContainer,
-    IconWrapper
+    IconWrapper,
+    Select,
+    Option,
+    SelectWrapper,
+    SelectText,
+    Divider
   },
   inheritAttrs: false,
   data() {
@@ -450,6 +501,22 @@ export default {
     inputDataId: {
       required: false,
       default: ''
+    },
+    showSelect: {
+      type: Boolean,
+      default: false
+    },
+    selectWidth: {
+      type: Number,
+      default: 70
+    },
+    selectOptions: {
+      type: Array,
+      default: () => []
+    },
+    selectValue: {
+      type: [String, Number],
+      default: null
     }
   },
   computed: {
@@ -464,6 +531,13 @@ export default {
     },
     hasLabelSlot() {
       return !!this.$slots.label
+    },
+    getSelectValue() {
+      const item = this.selectOptions.find(
+        ({ value }) => value === this.selectValue
+      )
+
+      return item ? item.label : '-'
     }
   },
   methods: {

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

@@ -22,10 +22,15 @@
           >
         </input-label>
         <info-text
-          v-if="infoTextMessage"
+          v-if="infoTextMessage || !!this.$slots.infoText"
           :text="infoTextMessage"
           :size="infoTextSize"
-        />
+          :alignArrow="infoTextAlignArrow"
+          :width="infoTextWidth"
+          :max-width="infoTextWidth"
+        >
+          <slot name="infoText" />
+        </info-text>
       </label-wrapper>
       <select-button-wrapper :disabled="disabled">
         <selectButton
@@ -531,6 +536,14 @@ export default {
     dropdownMenuPosition: {
       type: String,
       default: DROPDOWN_MENU_POSITIONS.Automatic // options: ['automatic', bottom]
+    },
+    infoTextWidth: {
+      type: String,
+      required: false
+    },
+    infoTextAlignArrow: {
+      type: String,
+      required: false
     }
   },
 

package/src/assets/svgIcons/house_3d-1.svg

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" fill="none">
-  <mask id="path-1-inside-1_57915_53334" fill="white">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M4.0303 2.75757L0 5.30302V11.2424L3.41022 12.4091V8.96996L4.53143 9.41845V12.7926L8.0606 14V8.0606L4.0303 2.75757Z"/>
-  </mask>
-  <path d="M0 5.30302L-0.694191 4.20389L-1.3 4.5865V5.30302H0ZM4.0303 2.75757L5.06531 1.97096L4.344 1.02187L3.33611 1.65843L4.0303 2.75757ZM0 11.2424H-1.3V12.1716L-0.420794 12.4724L0 11.2424ZM3.41022 12.4091L2.98943 13.6391L4.71022 14.2278V12.4091H3.41022ZM3.41022 8.96996L3.89303 7.76294L2.11022 7.04982V8.96996H3.41022ZM4.53143 9.41845H5.83143V8.5383L5.01424 8.21143L4.53143 9.41845ZM4.53143 12.7926H3.23143V13.7219L4.11064 14.0227L4.53143 12.7926ZM8.0606 14L7.63981 15.23L9.3606 15.8187V14H8.0606ZM8.0606 8.0606H9.3606V7.62266L9.09561 7.27399L8.0606 8.0606ZM0.694191 6.40216L4.72449 3.8567L3.33611 1.65843L-0.694191 4.20389L0.694191 6.40216ZM1.3 11.2424V5.30302H-1.3V11.2424H1.3ZM3.83102 11.1791L0.420794 10.0124L-0.420794 12.4724L2.98943 13.6391L3.83102 11.1791ZM4.71022 12.4091V8.96996H2.11022V12.4091H4.71022ZM2.92741 10.177L4.04862 10.6255L5.01424 8.21143L3.89303 7.76294L2.92741 10.177ZM3.23143 9.41845V12.7926H5.83143V9.41845H3.23143ZM8.48139 12.77L4.95223 11.5626L4.11064 14.0227L7.63981 15.23L8.48139 12.77ZM6.7606 8.0606V14H9.3606V8.0606H6.7606ZM2.99529 3.54418L7.02559 8.8472L9.09561 7.27399L5.06531 1.97096L2.99529 3.54418Z" fill="#0068DE" mask="url(#path-1-inside-1_57915_53334)"/>
-  <path d="M8.55859 13.2165V8.37967L13.498 6.08638V10.9232L8.55859 13.2165Z" fill="#0068DE" stroke="#0068DE"/>
-  <path d="M8.21608 7.43759L4.80515 2.94953L9.81611 0.623007L13.227 5.11107L8.21608 7.43759Z" fill="#0068DE" stroke="#0068DE"/>
-</svg>

package/src/assets/svgIcons/house_3d.svg

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16" fill="none">
-  <mask id="path-1-inside-1_57915_3657" fill="white">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M4.03081 3.71851L0 6.28736V12.2814L3.41065 13.4587V9.98801L4.532 10.4406V13.8458L8.06161 15.0643V9.07028L4.03081 3.71851Z"/>
-  </mask>
-  <path d="M0 6.28736L-0.698673 5.19107L-1.3 5.5743V6.28736H0ZM4.03081 3.71851L5.06922 2.9364L4.34595 1.9761L3.33213 2.62221L4.03081 3.71851ZM0 12.2814H-1.3V13.2079L-0.424205 13.5102L0 12.2814ZM3.41065 13.4587L2.98645 14.6876L4.71065 15.2828V13.4587H3.41065ZM3.41065 9.98801L3.89722 8.78251L2.11065 8.0614V9.98801H3.41065ZM4.532 10.4406H5.832V9.56343L5.01858 9.23511L4.532 10.4406ZM4.532 13.8458H3.232V14.7723L4.1078 15.0747L4.532 13.8458ZM8.06161 15.0643L7.63741 16.2931L9.36161 16.8883V15.0643H8.06161ZM8.06161 9.07028H9.36161V8.63549L9.10003 8.28818L8.06161 9.07028ZM0.698673 7.38365L4.72948 4.8148L3.33213 2.62221L-0.698673 5.19107L0.698673 7.38365ZM1.3 12.2814V6.28736H-1.3V12.2814H1.3ZM3.83485 12.2299L0.424205 11.0525L-0.424205 13.5102L2.98645 14.6876L3.83485 12.2299ZM4.71065 13.4587V9.98801H2.11065V13.4587H4.71065ZM2.92408 11.1935L4.04543 11.6461L5.01858 9.23511L3.89722 8.78251L2.92408 11.1935ZM3.232 10.4406V13.8458H5.832V10.4406H3.232ZM8.48582 13.8354L4.95621 12.617L4.1078 15.0747L7.63741 16.2931L8.48582 13.8354ZM6.76161 9.07028V15.0643H9.36161V9.07028H6.76161ZM2.99239 4.50061L7.0232 9.85239L9.10003 8.28818L5.06922 2.9364L2.99239 4.50061Z" fill="white" mask="url(#path-1-inside-1_57915_3657)"/>
-  <path d="M8.5625 14.2779V9.38818L13.5026 7.07375V11.9634L8.5625 14.2779Z" fill="white" stroke="white"/>
-  <path d="M8.21735 8.44534L4.80134 3.90984L9.81609 1.56045L13.2321 6.09596L8.21735 8.44534Z" fill="white" stroke="white"/>
-</svg>