@eturnity/eturnity_reusable_components 7.4.1 → 7.4.3-EPDM-9677.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.4.1",
+  "version": "7.4.3-EPDM-9677.0",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",

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

@@ -23,7 +23,7 @@
           v-if="infoTextMessage"
           :text="infoTextMessage"
           borderColor="#ccc"
-          :size="fontSize ? fontSize : '16px'"
+          :size="infoTextSize"
           :alignText="infoTextAlign"
         />
       </label-wrapper>
@@ -394,6 +394,10 @@ export default {
       required: false,
       default: true
     },
+    infoTextSize: {
+      required: false,
+      default: '14px'
+    },
     dataId: {
       type: String,
       default: ''
@@ -547,7 +551,15 @@ export default {
   computed: {
     optionLength() {
       if (this.isDropdownOpen) {
-        return this.$refs.dropdown.$children.length
+        // 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
       }

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

@@ -21,6 +21,9 @@
 </template>
 
 <script>
+// Rules: (as defined in https://e-turnity.atlassian.net/browse/EPDM-9694)
+// 1. On clicking the “escape” key, close the modal onCloseModal()
+// 2. Always prevent outside close
 // 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:
@@ -83,6 +86,22 @@ const ModalContainer = styled.div`
   min-width: 100px;
   min-height: 100px;
 
+  ::-webkit-scrollbar {
+    width: 0.3em;
+    height: 100%;
+    background-color: ${(props) => props.theme.colors.grey5};
+  }
+
+  /* Make scrollbar visible when needed */
+  ::-webkit-scrollbar-thumb {
+    background-color: ${(props) => props.theme.colors.grey3};
+  }
+
+  /* Make scrollbar track visible when needed */
+  ::-webkit-scrollbar-track {
+    background-color: ${(props) => props.theme.colors.grey5};
+  }
+
   .close {
     position: absolute;
     right: 20px;