@eturnity/eturnity_reusable_components 1.2.14 → 1.2.15-QA03-2092022.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "1.2.14",
+  "version": "1.2.15-QA03-2092022.0",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",
@@ -13,7 +13,8 @@
     "@vueform/slider": "1.0.5",
     "core-js": "^3.6.5",
     "vue": "^2.6.11",
-    "vue-styled-components": "^1.6.0"
+    "vue-styled-components": "^1.6.0",
+    "html-loader": "^0.5.5"
   },
   "devDependencies": {
     "@storybook/addon-actions": "^6.2.8",
@@ -28,8 +29,7 @@
     "babel-eslint": "^10.1.0",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",
-    "vue-template-compiler": "^2.6.11",
-    "html-loader": "^0.5.5"
+    "vue-template-compiler": "^2.6.11"
   },
   "eslintConfig": {
     "root": true,

package/src/App.vue

@@ -1,18 +1,20 @@
 <template>
   <ThemeProvider :theme="getTheme()" :style="{ height: '100%' }">
     <page-container>
-      <main-table titleText="My Table">
-        <thead>
-          <tr>
-            <th>Column 1</th>
-            <th>Column 2</th>
-            <th>Column 3</th>
-            <div />
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <!-- <table-dropdown
+      <br />
+      <modal backdrop="dark" :isLoading="false" :isOpen="true">
+        <main-table titleText="My Table">
+          <thead>
+            <tr>
+              <th>Column 1</th>
+              <th>Column 2</th>
+              <th>Column 3</th>
+              <div />
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <!-- <table-dropdown
               :colSpan="3"
               :tableItems="getDropdownValues()"
               @toggle-dropdown-open="toggleDropdownOpen()"
@@ -21,14 +23,14 @@
               :optionItems="itemOptions"
               :optionsDisplay="['display_name', 'company_item_number', 'model']"
             /> -->
-            <td>Test</td>
-            <div class="icons-container">
-              <three-dots :options="listOptions" :isLoading="false" />
-            </div>
-          </tr>
-        </tbody>
-      </main-table>
-      <br />
+              <td>Test</td>
+              <div class="icons-container">
+                <three-dots :options="listOptions" :isLoading="false" />
+              </div>
+            </tr>
+          </tbody>
+        </main-table>
+      </modal>
       <br />
       <toggle
         @on-toggle-change="onInputChange($event)"
@@ -41,34 +43,13 @@
       />
       <br />
       <input-number
-        placeholder="Enter distance"
-        :numberPrecision="2"
-        :value="inputValue"
-        @input-change="onInputChange($event)"
+        :value="num"
+        @input-change="num = $event"
+        unitName="t"
+        id="biebie"
+        test="koko"
+        @keydown="keydownHandler"
       />
-      <br />
-      <page-subtitle text="My Subtitle" infoText="My info Text" />
-      <spinner size="30px" />
-      <checkbox
-        label="Do you accept the Terms?"
-        :isChecked="true"
-        size="small"
-        :isDisabled="false"
-      />
-      <external-button text="Click me!" minWidth="500px" />
-      <icon name="Battery" />
-      <icon name="Bubble" color="red" hoveredColor="blue" size="60px" />
-      <icon name="Call" color="red" hoveredColor="blue" size="60px" />
-      <icon name="Camera" color="yellow" hoveredColor="green" size="60px" />
-      <icon name="House" color="red" hoveredColor="blue" size="20px" />
-      <icon name="House" color="red" hoveredColor="blue" size="40px" />
-      <icon name="House" color="red" hoveredColor="blue" size="80px" />
-      <icon name="House" color="red" hoveredColor="blue" size="120px" />
-      <icon name="Area_Active" color="red" hoveredColor="blue" size="150px" />
-      <icon name="Area_Active" color="red" hoveredColor="blue" size="120px" />
-      <icon name="Area_Active" color="red" hoveredColor="blue" size="80px" />
-      <icon name="Area_Active" color="red" hoveredColor="blue" size="40px" />
-      <collection />
     </page-container>
   </ThemeProvider>
 </template>
@@ -85,8 +66,7 @@ import Checkbox from '@/components/inputs/checkbox'
 import PageSubtitle from '@/components/pageSubtitle'
 import Spinner from '@/components/spinner'
 import ExternalButton from '@/components/buttons/externalButton'
-import icon from '@/components/icon'
-import collection from '@/components/icons/iconCollection'
+import Modal from '@/components/modals/modal'
 // import TableDropdown from "@/components/tableDropdown"
 
 const PageContainer = styled.div`
@@ -106,12 +86,11 @@ export default {
     Spinner,
     Checkbox,
     ExternalButton,
-    collection,
-    icon
-    // TableDropdown,
+    Modal
   },
   data() {
     return {
+      num: 42,
       inputValue: null,
       checkedOption: 'button_1',
       question: {
@@ -170,6 +149,9 @@ export default {
     }
   },
   methods: {
+    keydownHandler(e) {
+      console.log('test', e)
+    },
     getTheme() {
       return theme
     },

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

@@ -14,9 +14,10 @@
     </label-wrapper>
     <input-wrapper>
       <input-container
+        v-bind="$attrs"
         ref="inputField1"
         :hasUnit="unitName && !!unitName.length"
-        :placeholder="placeholder"
+        :placeholder="displayedPlaceholder"
         :isError="isError"
         :inputWidth="inputWidth"
         :minWidth="minWidth"
@@ -30,6 +31,7 @@
         :textAlign="textAlign"
         :fontSize="fontSize"
         :fontColor="fontColor"
+        v-on="$listeners"
       />
       <unit-container
         v-if="unitName && showLinearUnitName"
@@ -68,12 +70,12 @@
 //     :minNumber="0"
 //     fontColor="blue"
 // />
-import styled from "vue-styled-components"
+import styled from 'vue-styled-components'
 import {
   stringToNumber,
-  numberToString,
-} from "../../../helpers/numberConverter"
-import InfoText from "../../infoText"
+  numberToString
+} from '../../../helpers/numberConverter'
+import InfoText from '../../infoText'
 
 const Container = styled.div`
   width: 100%;
@@ -89,31 +91,31 @@ const inputProps = {
   noBorder: Boolean,
   textAlign: String,
   fontSize: String,
-  fontColor: String,
+  fontColor: String
 }
-const InputContainer = styled("input", inputProps)`
+const InputContainer = styled('input', inputProps)`
   border: ${(props) =>
     props.isError
-      ? "1px solid " + props.theme.colors.red
+      ? '1px solid ' + props.theme.colors.red
       : props.noBorder
-      ? "none"
-      : "1px solid " + props.theme.colors.mediumGray};
+      ? 'none'
+      : '1px solid ' + props.theme.colors.mediumGray};
   padding: ${(props) =>
-    props.hasUnit ? "11px 40px 11px 10px" : "11px 5px 11px 10px"};
+    props.hasUnit ? '11px 40px 11px 10px' : '11px 5px 11px 10px'};
   border-radius: 4px;
   text-align: ${(props) => props.textAlign};
-  cursor: ${(props) => (props.isDisabled ? "not-allowed" : "auto")};
-  font-size: ${(props) => (props.fontSize ? props.fontSize : "13px")};
+  cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'auto')};
+  font-size: ${(props) => (props.fontSize ? props.fontSize : '13px')};
   color: ${(props) =>
     props.isError
       ? props.theme.colors.red
       : props.fontColor
-      ? props.fontColor + " !important"
+      ? props.fontColor + ' !important'
       : props.theme.colors.black};
-  width: ${(props) => (props.inputWidth ? props.inputWidth : "100%")};
-  min-width: ${(props) => (props.minWidth ? props.minWidth : "unset")};
+  width: ${(props) => (props.inputWidth ? props.inputWidth : '100%')};
+  min-width: ${(props) => (props.minWidth ? props.minWidth : 'unset')};
   background-color: ${(props) =>
-    props.isDisabled ? props.theme.colors.grey5 : "#fff"};
+    props.isDisabled ? props.theme.colors.grey5 : '#fff'};
   box-sizing: border-box;
 
   &::placeholder {
@@ -130,7 +132,7 @@ const InputWrapper = styled.span`
   position: relative;
 `
 
-const UnitContainer = styled("span", inputProps)`
+const UnitContainer = styled('span', inputProps)`
   border-left: 1px solid
     ${(props) =>
       props.isError
@@ -169,7 +171,7 @@ const LabelText = styled.div`
 `
 
 export default {
-  name: "input-number",
+  name: 'input-number',
   components: {
     Container,
     InputContainer,
@@ -178,131 +180,138 @@ export default {
     ErrorMessage,
     LabelWrapper,
     LabelText,
-    InfoText,
+    InfoText
   },
+  inheritAttrs: false,
   data() {
     return {
-      textInput: "",
-      isFocused: false,
+      textInput: '',
+      isFocused: false
+    }
+  },
+  computed: {
+    displayedPlaceholder() {
+      if (this.placeholder) return this.placeholder
+      return `${this.minNumber || 0} ${this.unitName ? this.unitName : ''}`
     }
   },
   props: {
     placeholder: {
       required: false,
-      default: "",
+      default: ''
     },
     isError: {
       required: false,
-      default: false,
+      default: false
     },
     inputWidth: {
       required: false,
-      default: null,
+      default: null
     },
     minWidth: {
       required: false,
-      default: null,
+      default: null
     },
     value: {
       required: true,
-      default: null,
+      default: null
     },
     clearInput: {
       required: false,
-      default: false,
+      default: false
     },
     errorMessage: {
       required: false,
-      default: "Please insert a correct number",
+      default: 'Please insert a correct number'
     },
     numberPrecision: {
       required: false,
-      default: 0,
+      default: 0
     },
     unitName: {
       required: false,
-      default: "",
+      default: ''
     },
     showLinearUnitName: {
       required: false,
-      default: false,
+      default: false
     },
     disabled: {
       required: false,
-      default: false,
+      default: false
     },
     noBorder: {
       required: false,
-      default: false,
+      default: false
     },
     textAlign: {
       required: false,
-      default: "left",
+      default: 'left'
     },
     fontSize: {
       required: false,
-      default: "13px",
+      default: '13px'
     },
     labelText: {
       required: false,
-      default: null,
+      default: null
     },
     labelInfoText: {
       required: false,
-      default: null,
+      default: null
     },
     labelInfoAlign: {
       required: false,
-      default: "right",
+      default: 'right'
     },
     minNumber: {
       required: false,
-      default: null,
+      default: null
     },
     fontColor: {
       required: false,
-      default: null,
+      default: null
     },
     numberToStringEnabled: {
       required: false,
-      default: true,
-    },
+      default: true
+    }
   },
   methods: {
     onChangeHandler(event) {
       if (isNaN(event)) {
         event = this.minNumber || this.minNumber === 0 ? this.minNumber : event
       }
-      this.$emit("input-change", event)
+      this.$emit('input-change', event)
     },
     onEvaluateCode(val) {
       // function to perform math on the code
       // filter the string in case of any malicious content
-      let filtered = val.replace(/[^-()\d/*+.,]/g, "")
+      let filtered = val.replace(/[^-()\d/*+.,]/g, '')
       filtered = filtered.split(/([-+*/()])/)
       let formatted = filtered.map((item) => {
         if (
-          item === "+" ||
-          item === "-" ||
-          item === "*" ||
-          item === "/" ||
-          item === "(" ||
-          item === ")" ||
-          item === ""
+          item === '+' ||
+          item === '-' ||
+          item === '*' ||
+          item === '/' ||
+          item === '(' ||
+          item === ')' ||
+          item === ''
         ) {
           return item
         } else {
           let num = stringToNumber({
             value: item,
-            numberPrecision: false,
+            numberPrecision: false
           })
           return num
         }
       })
-      let evaluated = eval(formatted.join(""))
+      let evaluated = eval(formatted.join('')) || ''
       evaluated = stringToNumber({
         value: evaluated,
-        numberPrecision: this.numberPrecision,
+        numberPrecision: this.numberPrecision
       })
       return evaluated
     },
@@ -315,7 +324,7 @@ export default {
         this.textInput = numberToString({
           value:
             evaluatedInput && value.length ? evaluatedInput : this.minNumber,
-          numberPrecision: this.numberPrecision,
+          numberPrecision: this.numberPrecision
         })
       }
       let adjustedMinValue =
@@ -323,8 +332,8 @@ export default {
           ? value
           : this.minNumber || this.minNumber === 0
           ? this.minNumber
-          : ""
-      this.$emit("input-blur", adjustedMinValue)
+          : ''
+      this.$emit('input-blur', adjustedMinValue)
     },
     focusInput() {
       if (this.disabled) {
@@ -341,38 +350,38 @@ export default {
           ? value
           : this.minNumber || this.minNumber === 0
           ? this.minNumber
-          : ""
+          : ''
       if ((adjustedMinValue || adjustedMinValue === 0) && !this.isFocused) {
         let input = this.numberToStringEnabled
           ? numberToString({
               value: adjustedMinValue,
-              numberPrecision: this.numberPrecision,
+              numberPrecision: this.numberPrecision
             })
           : adjustedMinValue
-        let unit = this.showLinearUnitName ? "" : this.unitName
-        return input + " " + unit
+        let unit = this.showLinearUnitName ? '' : this.unitName
+        return input + ' ' + unit
       } else if (!adjustedMinValue && adjustedMinValue !== 0) {
-        return ""
+        return ''
       } else {
         return this.numberToStringEnabled
           ? numberToString({
               value: adjustedMinValue,
-              numberPrecision: this.numberPrecision,
+              numberPrecision: this.numberPrecision
             })
           : adjustedMinValue
       }
-    },
+    }
   },
   created() {
     if (this.value) {
       this.textInput = numberToString({
         value: this.value,
-        numberPrecision: this.numberPrecision,
+        numberPrecision: this.numberPrecision
       })
     } else if (this.minNumber !== null) {
       this.textInput = numberToString({
         value: this.minNumber,
-        numberPrecision: this.numberPrecision,
+        numberPrecision: this.numberPrecision
       })
     }
   },
@@ -380,9 +389,9 @@ export default {
     clearInput: function (value) {
       if (value) {
         // If the value is typed, then we should clear the textInput on Continue
-        this.textInput = ""
+        this.textInput = ''
       }
-    },
-  },
+    }
+  }
 }
-</script>
+</script>

package/src/components/modals/modal/index.vue

@@ -3,15 +3,18 @@
     :isOpen="isOpen"
     :class="{ visible: isOpen, hidden: !isOpen }"
     @click.native="onOutsideClose()"
+    :backdrop="backdrop"
   >
     <modal-container @click.stop>
-      <spinner v-if="isLoading" size="50px" :fullWidth="true" />
+      <spinner v-if="isLoading" size="50px" :limitedToModal="true" />
+      <content-container :visible="!isLoading">
+        <slot />
+      </content-container>
       <close-button
         v-if="!hideClose"
         @click.native="onCloseModal()"
         class="close"
       />
-      <slot />
     </modal-container>
   </page-wrapper>
 </template>
@@ -28,7 +31,12 @@ import styled from 'vue-styled-components'
 import CloseButton from '../../buttons/closeButton'
 import Spinner from '../../spinner'
 
-const pageAttrs = { isOpen: Boolean }
+const contentAttrs = { visible: Boolean }
+const ContentContainer = styled('div', contentAttrs)`
+  visibility: ${(props) => (props.visible ? 'inherit' : 'hidden')};
+`
+
+const pageAttrs = { isOpen: Boolean, backdrop: String }
 const PageWrapper = styled('div', pageAttrs)`
   position: fixed;
   display: grid;
@@ -36,7 +44,10 @@ const PageWrapper = styled('div', pageAttrs)`
   left: 0;
   width: 100%;
   height: 100%;
-  background-color: rgba(255, 255, 255, 0.9);
+  background-color: ${(props) =>
+    props.backdrop == 'dark'
+      ? 'rgba(0, 0, 0, 0.4)'
+      : 'rgba(255, 255, 255, 0.9)'};
   z-index: 99999;
   overflow: auto;
 
@@ -98,7 +109,8 @@ export default {
     PageWrapper,
     ModalContainer,
     CloseButton,
-    Spinner
+    Spinner,
+    ContentContainer
   },
   props: {
     isOpen: {
@@ -116,6 +128,10 @@ export default {
     hideClose: {
       required: false,
       default: false
+    },
+    backdrop: {
+      required: false,
+      default: 'white'
     }
   },
   methods: {
@@ -135,4 +151,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/src/components/modals/modal/modal.stories.js

@@ -26,5 +26,6 @@ export const Default = Template.bind({
   preventOutsideClose: true,
   isLoading: false,
   hideClose: false,
-});
+  backdrop: 'dark',
+})
 Default.args = {};

package/src/components/spinner/index.vue

@@ -7,7 +7,7 @@
       />
     </container>
   </spinner-container>
-  <container v-else>
+  <container v-else :limitedToModal="limitedToModal">
     <spinner-wrapper
       :size="size"
       :src="require('../../assets/icons/black_spinner.svg')"
@@ -18,7 +18,7 @@
 <script>
 // import Spinner from "@eturnity/eturnity_reusable_components/src/components/spinner"
 // <spinner size="30px" />
-import styled from "vue-styled-components"
+import styled from 'vue-styled-components'
 
 const SpinnerContainer = styled.div`
   position: fixed;
@@ -32,34 +32,41 @@ const SpinnerContainer = styled.div`
   justify-items: center;
   z-index: 100;
 `
-
-const Container = styled.div`
+const containerAttrs = { limitedToModal: Boolean }
+const Container = styled('div', containerAttrs)`
   display: grid;
   align-items: center;
   justify-items: center;
+  position: ${(props) => (props.limitedToModal ? 'absolute' : 'inherit')};
+  height: ${(props) => (props.limitedToModal ? '100%' : 'inherit')};
+  width: ${(props) => (props.limitedToModal ? '100%' : 'inherit')};
 `
 
 const spinnerAttrs = { size: String }
-const SpinnerWrapper = styled("img", spinnerAttrs)`
-  width: ${(props) => (props.size ? props.size : "60px")};
+const SpinnerWrapper = styled('img', spinnerAttrs)`
+  width: ${(props) => (props.size ? props.size : '60px')};
 `
 
 export default {
-  name: "spinner",
+  name: 'spinner',
   components: {
     Container,
     SpinnerWrapper,
-    SpinnerContainer,
+    SpinnerContainer
   },
   props: {
     fullWidth: {
       required: false,
-      default: false,
+      default: false
     },
-    size: {
+    limitedToModal: {
       required: false,
-      default: null,
+      default: false
     },
-  },
+    size: {
+      required: false,
+      default: null
+    }
+  }
 }
-</script>
+</script>