@eturnity/eturnity_reusable_components 1.1.97 → 1.2.0

package/.prettierrc

@@ -0,0 +1,7 @@
+{
+    "semi": false,
+    "singleQuote": true,
+    "useTabs": false,
+    "trailingComma": "none",
+    "printWidth": 80
+  }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "1.1.97",
+  "version": "1.2.00",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",

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

@@ -13,7 +13,7 @@
 // <close-button
 //   color="#fff"
 // />
-import styled from "vue-styled-components"
+import styled from 'vue-styled-components'
 
 const Container = styled.div`
   position: relative;
@@ -27,8 +27,8 @@ const Wrapper = styled.div`
 `
 
 const lineAttrs = { color: String }
-const Line = styled("div", lineAttrs)`
-  width: 26px;
+const Line = styled('div', lineAttrs)`
+  width: 20px;
   height: 2px;
   background-color: ${(props) =>
     props.color ? props.color : props.theme.colors.red};
@@ -45,17 +45,17 @@ const RightLine = styled(Line)`
 `
 
 export default {
-  name: "close-button",
+  name: 'close-button',
   components: {
     Container,
     Wrapper,
     LeftLine,
-    RightLine,
+    RightLine
   },
   props: {
     color: {
-      required: false,
-    },
-  },
+      required: false
+    }
+  }
 }
 </script>

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

@@ -265,8 +265,8 @@ export default {
     },
     numberToStringEnabled: {
       required: false,
-      default: true
-    }
+      default: true,
+    },
   },
   methods: {
     onChangeHandler(event) {
@@ -294,12 +294,16 @@ export default {
         } else {
           let num = stringToNumber({
             value: item,
-            numberPrecision: this.numberPrecision,
+            numberPrecision: false,
           })
           return num
         }
       })
       let evaluated = eval(formatted.join(""))
+      evaluated = stringToNumber({
+        value: evaluated,
+        numberPrecision: this.numberPrecision,
+      })
       return evaluated
     },
     onInputBlur(e) {
@@ -309,7 +313,8 @@ export default {
       this.onChangeHandler(evaluatedInput ? evaluatedInput : value)
       if ((evaluatedInput && value.length) || this.minNumber !== null) {
         this.textInput = numberToString({
-          value: evaluatedInput && value.length ? evaluatedInput : this.minNumber,
+          value:
+            evaluatedInput && value.length ? evaluatedInput : this.minNumber,
           numberPrecision: this.numberPrecision,
         })
       }
@@ -338,19 +343,23 @@ export default {
           ? this.minNumber
           : ""
       if ((adjustedMinValue || adjustedMinValue === 0) && !this.isFocused) {
-        let input =  this.numberToStringEnabled ? numberToString({
-          value: adjustedMinValue,
-          numberPrecision: this.numberPrecision,
-        }) : adjustedMinValue
+        let input = this.numberToStringEnabled
+          ? numberToString({
+              value: adjustedMinValue,
+              numberPrecision: this.numberPrecision,
+            })
+          : adjustedMinValue
         let unit = this.showLinearUnitName ? "" : this.unitName
         return input + " " + unit
       } else if (!adjustedMinValue && adjustedMinValue !== 0) {
         return ""
       } else {
-        return  this.numberToStringEnabled ? numberToString({
-          value: adjustedMinValue,
-          numberPrecision: this.numberPrecision,
-        }) : adjustedMinValue
+        return this.numberToStringEnabled
+          ? numberToString({
+              value: adjustedMinValue,
+              numberPrecision: this.numberPrecision,
+            })
+          : adjustedMinValue
       }
     },
   },

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

@@ -24,12 +24,12 @@
 //   <div>Data....</div>
 // </modal>
 
-import styled from "vue-styled-components"
-import CloseButton from "../../buttons/closeButton"
-import Spinner from "../../spinner"
+import styled from 'vue-styled-components'
+import CloseButton from '../../buttons/closeButton'
+import Spinner from '../../spinner'
 
 const pageAttrs = { isOpen: Boolean }
-const PageWrapper = styled("div", pageAttrs)`
+const PageWrapper = styled('div', pageAttrs)`
   position: fixed;
   display: grid;
   top: 0;
@@ -73,8 +73,8 @@ const ModalContainer = styled.div`
 
   .close {
     position: absolute;
-    right: 10px;
-    top: 10px;
+    right: 20px;
+    top: 20px;
 
     @media (max-width: 425px) {
       right: 14px;
@@ -93,46 +93,46 @@ const ModalContainer = styled.div`
 `
 
 export default {
-  name: "modal",
+  name: 'modal',
   components: {
     PageWrapper,
     ModalContainer,
     CloseButton,
-    Spinner,
+    Spinner
   },
   props: {
     isOpen: {
       required: true,
-      default: false,
+      default: false
     },
     preventOutsideClose: {
       required: false,
-      default: false,
+      default: false
     },
     isLoading: {
       required: false,
-      default: false,
+      default: false
     },
     hideClose: {
       required: false,
-      default: false,
-    },
+      default: false
+    }
   },
   methods: {
     onCloseModal() {
-      this.$emit("on-close")
+      this.$emit('on-close')
     },
     onOutsideClose() {
       // If true, then only allow closing to come from clicking the X or wherever the onCloseModal is called
       if (!this.preventOutsideClose) {
-        this.$emit("on-close")
+        this.$emit('on-close')
       }
-    },
+    }
   },
   watch: {
     isOpen: function (newVal) {
-      document.body.style.overflow = newVal ? "hidden" : ""
-    },
-  },
+      document.body.style.overflow = newVal ? 'hidden' : ''
+    }
+  }
 }
 </script>

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

@@ -0,0 +1,30 @@
+import Modal from "./index.vue";
+
+export default {
+  title: "Modal",
+  component: Modal,
+  // argTypes: {},
+};
+
+const Template = (args, { argTypes }) => ({
+  // Components used in your story `template` are defined in the `components` object
+  components: { Modal },
+  // The story's `args` need to be mapped into the template through the `setup()` method
+  props: Object.keys(argTypes),
+  template: '<modal v-bind="$props" />',
+
+  // import Modal from "@eturnity/eturnity_reusable_components/src/components/modals/modal"
+  // This is a more flexible modal box, where the parent can decide how the body of the modal looks
+  // To use:
+  // <modal :isOpen="isOpen" @on-close="$emit('on-close-summary')" :preventOutsideClose="true" :isLoading="true" :hideClose="true">
+  //   <div>Data....</div>
+  // </modal>
+});
+
+export const Default = Template.bind({
+  isOpen: true,
+  preventOutsideClose: true,
+  isLoading: false,
+  hideClose: false,
+});
+Default.args = {};

package/src/components/tableDropdown/index.vue

@@ -218,6 +218,7 @@ const ComponentItem = styled("td", ItemAttrs)`
   &.table-dropdown-item {
     background-clip: content-box;
     padding: 8px 0 7px 0 !important;
+    vertical-align: middle;
 
     @media not all and (min-resolution: 0.001dpcm) {
       @supports (-webkit-appearance: none) {

package/src/helpers/numberConverter.js

@@ -1,79 +1,88 @@
-export const stringToNumber = ({ value, numberPrecision, allowNegative }) => {
+export const stringToNumber = ({
+  value,
+  numberPrecision = false,
+  allowNegative
+}) => {
   // This is for saving. It converts our input string to a readable number
   let newVal = value.toString()
-  const selectedLang = localStorage.getItem("lang")
+  const selectedLang = localStorage.getItem('lang')
   // The first replace will replace not allowed characters with a blank
   if (
-    selectedLang === "de-DE" ||
-    selectedLang === "no-no" ||
-    selectedLang === "da-dk" ||
-    selectedLang === "de-lu" ||
-    selectedLang === "de-be" ||
-    selectedLang === "es-es" ||
-    selectedLang === "de"
+    selectedLang === 'de-DE' ||
+    selectedLang === 'no-no' ||
+    selectedLang === 'da-dk' ||
+    selectedLang === 'de-lu' ||
+    selectedLang === 'de-be' ||
+    selectedLang === 'es-es' ||
+    selectedLang === 'de'
   ) {
     // replace dots with blank, and commas with a dot: 1.234,56 --> 1234.56
     if (allowNegative) {
       newVal = newVal
-        .replace(/[^\d-.,']/g, "")
-        .replace(/[.\s]/g, "")
-        .replace(/[,\s]/, ".")
+        .replace(/[^\d-.,']/g, '')
+        .replace(/[.\s]/g, '')
+        .replace(/[,\s]/, '.')
     } else {
       newVal = newVal
-        .replace(/[^\d.,']/g, "")
-        .replace(/[.\s]/g, "")
-        .replace(/[,\s]/, ".")
+        .replace(/[^\d.,']/g, '')
+        .replace(/[.\s]/g, '')
+        .replace(/[,\s]/, '.')
     }
-  } else if (selectedLang === "en-us") {
+  } else if (selectedLang === 'en-us') {
     // replace commas with blank: 1,234.56 --> 1234.56
     if (allowNegative) {
-      newVal = newVal.replace(/[^\d-.,']/g, "").replace(/[,\s]/g, "")
+      newVal = newVal.replace(/[^\d-.,']/g, '').replace(/[,\s]/g, '')
     } else {
-      newVal = newVal.replace(/[^\d.,']/g, "").replace(/[,\s]/g, "")
+      newVal = newVal.replace(/[^\d.,']/g, '').replace(/[,\s]/g, '')
     }
   } else if (
-    selectedLang === "de-ch" ||
-    selectedLang === "fr-ch" ||
-    selectedLang === "it-ch"
+    selectedLang === 'de-ch' ||
+    selectedLang === 'fr-ch' ||
+    selectedLang === 'it-ch'
   ) {
     // replace ' with blank: 1'234.56 --> 1234.56
     if (allowNegative) {
-      newVal = newVal.replace(/[^\d-.,']/g, "").replace(/['\s]/g, "")
+      newVal = newVal.replace(/[^\d-.,']/g, '').replace(/['\s]/g, '')
     } else {
-      newVal = newVal.replace(/[^\d.,']/g, "").replace(/['\s]/g, "")
+      newVal = newVal.replace(/[^\d.,']/g, '').replace(/['\s]/g, '')
     }
   } else if (
-    selectedLang === "fr-fr" ||
-    selectedLang === "fr-be" ||
-    selectedLang === "fr-lu" ||
-    selectedLang === "sv-se" ||
-    selectedLang === "pt-pt" ||
-    selectedLang === "fr"
+    selectedLang === 'fr-fr' ||
+    selectedLang === 'fr-be' ||
+    selectedLang === 'fr-lu' ||
+    selectedLang === 'sv-se' ||
+    selectedLang === 'pt-pt' ||
+    selectedLang === 'fr'
   ) {
     // replace space with blank, and commas with dot: 1 234,56 --> 1234.56
     if (allowNegative) {
-      newVal = newVal.replace(/[^\d-.,']/g, "").replace(/[,\s]/g, ".")
+      newVal = newVal.replace(/[^\d-.,']/g, '').replace(/[,\s]/g, '.')
     } else {
-      newVal = newVal.replace(/[^\d.,']/g, "").replace(/[,\s]/g, ".")
+      newVal = newVal.replace(/[^\d.,']/g, '').replace(/[,\s]/g, '.')
     }
   } else {
     // en-US as default: 1,234.56 --> 1234.56
     if (allowNegative) {
-      newVal = newVal.replace(/[^\d-.,']/g, "").replace(/[,\s]/g, "")
+      newVal = newVal.replace(/[^\d-.,']/g, '').replace(/[,\s]/g, '')
     } else {
-      newVal = newVal.replace(/[^\d.,']/g, "").replace(/[,\s]/g, "")
+      newVal = newVal.replace(/[^\d.,']/g, '').replace(/[,\s]/g, '')
     }
   }
-  newVal = parseFloat(newVal).toFixed(numberPrecision)
+  newVal = parseFloat(newVal)
+  if (numberPrecision !== false) {
+    newVal = newVal.toFixed(numberPrecision)
+  }
   return parseFloat(newVal)
 }
 
 export const numberToString = ({ value, numberPrecision }) => {
-  let selectedLang = localStorage.getItem("lang")
-    ? localStorage.getItem("lang") === 'fr-lu' ? 'fr-fr' : localStorage.getItem("lang")
-    : "en-US"
+  let selectedLang = localStorage.getItem('lang')
+    ? localStorage.getItem('lang') === 'fr-lu'
+      ? 'fr-fr'
+      : localStorage.getItem('lang')
+    : 'en-US'
   return value.toLocaleString(selectedLang, {
     minimumFractionDigits: numberPrecision,
-    maximumFractionDigits: numberPrecision,
+    maximumFractionDigits: numberPrecision
   })
 }