@eturnity/eturnity_reusable_components 7.35.1-EPDM-10576.6 → 7.35.1-EPDM-11386.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.35.1-EPDM-10576.6",
+  "version": "7.35.1-EPDM-11386.0",
   "files": [
     "dist",
     "src"

package/src/App.vue

@@ -1,13 +1,10 @@
 <template>
-  <ThemeProvider :style="{ height: '100%' }" :theme="getTheme()">
-    <RouterView />
-  </ThemeProvider>
+  <ThemeProvider :style="{ height: '100%' }" :theme="getTheme()" />
 </template>
 
 <script>
   import { ThemeProvider } from 'vue3-styled-components'
   import theme from './assets/theme'
-
   export default {
     name: 'App',
     components: {

package/src/assets/theme.js

@@ -35,6 +35,9 @@ const theme = {
     tablet: '768px',
     tabletLarge: '950px',
   },
+  fonts: {
+    mainFont: '"Figtree", sans-serif',
+  },
   borderRadius: '4px',
 }
 

package/src/components/filter/filterSettings.vue

@@ -87,10 +87,7 @@
             :key="index + '_field'"
           >
             <SelectComponent
-              v-if="
-                isMultipleSelector(filter.filter_type) ||
-                isSingleSelector(filter.filter_type)
-              "
+              v-if="isMultipleSelector(filter.filter_type)"
               align-items="vertical"
               :disabled="!filter.choices.length"
               font-size="13px"
@@ -105,12 +102,16 @@
                 <OptionTitle> {{ filter.selectedText }} </OptionTitle>
               </template>
               <template #dropdown>
-                <template v-if="isSingleSelector(filter.filter_type)">
-                  <Option
-                    v-for="(filterOption, optionIdx) in filter.choices"
-                    :key="optionIdx + 'optionIdx'"
-                    :value="filterOption.text"
-                    @click="
+                <DropdownCheckboxContainer
+                  v-for="(filterOption, optionIdx) in filter.choices"
+                  :key="optionIdx + 'optionIdx'"
+                  @click.stop
+                >
+                  <Checkbox
+                    :is-checked="filterOption.selected"
+                    :label="filterOption.text"
+                    size="small"
+                    @on-event-handler="
                       onChange({
                         dataType: item.type,
                         value: $event,
@@ -118,31 +119,8 @@
                         field: filter.field,
                       })
                     "
-                  >
-                    {{ filterOption.text }}
-                  </Option>
-                </template>
-                <template v-else>
-                  <DropdownCheckboxContainer
-                    v-for="(filterOption, optionIdx) in filter.choices"
-                    :key="optionIdx + 'optionIdx'"
-                    @click.stop
-                  >
-                    <Checkbox
-                      :is-checked="filterOption.selected"
-                      :label="filterOption.text"
-                      size="small"
-                      @on-event-handler="
-                        onChange({
-                          dataType: item.type,
-                          value: $event,
-                          choice: filterOption.choice,
-                          field: filter.field,
-                        })
-                      "
-                    />
-                  </DropdownCheckboxContainer>
-                </template>
+                  />
+                </DropdownCheckboxContainer>
               </template>
             </SelectComponent>
             <SectionContainer v-else-if="isRangeSelector(filter.filter_type)">
@@ -327,29 +305,25 @@
   const ContainerWrapper = styled.div`
     position: absolute;
     margin-top: 4px;
-    max-height: 70vh;
-    overflow-y: auto;
     background-color: ${(props) => props.theme.colors.white};
     min-width: 100%;
     width: max-content;
     border: 1px solid ${(props) => props.theme.colors.grey4};
     border-radius: 4px;
-    z-index: 1;
+    z-index: 99999;
     font-size: 13px;
   `
 
   const ColAttrs = { numCols: Number, hasActiveView: Boolean }
   const ColumnWrapper = styled('div', ColAttrs)`
     display: grid;
-    max-height: 50vh;
-    overflow-y: auto;
     grid-template-columns: repeat(${(props) => props.numCols}, auto);
 
     ${({ hasActiveView, theme }) =>
       hasActiveView &&
       `
-      border-top: 1px solid ${theme.colors.grey4};
-    `}
+    border-top: 1px solid ${theme.colors.grey4};
+  `}
   `
 
   const TitleAttrs = { showBorder: Boolean }
@@ -361,8 +335,8 @@
     ${({ showBorder, theme }) =>
       showBorder &&
       `
-      border-right: 1px solid ${theme.colors.grey4};
-    `}
+    border-right: 1px solid ${theme.colors.grey4};
+  `}
   `
 
   const ButtonContainer = styled.div`
@@ -398,8 +372,8 @@
     ${({ showBorder, theme }) =>
       showBorder &&
       `
-      border-right: 1px solid ${theme.colors.grey4};
-    `}
+    border-right: 1px solid ${theme.colors.grey4};
+  `}
 
     .ghost {
       opacity: 0.5;
@@ -428,7 +402,6 @@
     display: grid;
     gap: 6px;
     width: 100%;
-    overflow-wrap: anywhere;
     padding: 7px 10px;
     background: ${(props) => props.theme.colors.grey5};
   `
@@ -462,11 +435,11 @@
   `
 
   const UpperContainer = styled.div`
-    display: grid;
-    grid-gap: 20px
-    grid-template-columns: 1fr 1fr;
-    padding: 10px 14px;
-  `
+  display: grid;
+  grid-gap: 20px
+  grid-template-columns: 1fr 1fr;
+  padding: 10px 14px;
+`
 
   const ResetButton = styled.div`
     display: inline-flex;
@@ -649,9 +622,6 @@
         const foundItem = options.find((item) => item.choice === value)
         return foundItem ? foundItem.text : value ? value : filter.selectedText
       },
-      isSingleSelector(type) {
-        return type === 'boolean'
-      },
       isMultipleSelector(type) {
         return type === 'multi_select_integer' || type === 'multi_select_string'
       },

package/src/components/filter/index.vue

@@ -92,7 +92,7 @@
     mounted() {
       document.addEventListener('click', this.clickOutside)
     },
-    beforeUnmount() {
+    beforeDestroy() {
       document.removeEventListener('click', this.clickOutside)
     },
     methods: {

package/src/components/roundTabs/index.vue

@@ -0,0 +1,103 @@
+<template>
+  <Container>
+    <RoundedTabLeft
+      :background-color="backgroundColor"
+      :border-radius="borderRadius"
+    />
+    <Tab
+      :background-color="backgroundColor"
+      :border-radius="borderRadius"
+      :height="height"
+      :width="width"
+    >
+      <slot></slot>
+    </Tab>
+    <RoundedTabRight
+      :background-color="backgroundColor"
+      :border-radius="borderRadius"
+    />
+  </Container>
+</template>
+<script>
+  import styled from 'vue3-styled-components'
+
+  const Container = styled.div`
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  `
+  const RoundedTabLeft = styled('div', {
+    backgroundColor: String,
+    borderRadius: String,
+  })`
+    position:absolute;
+    bottom:0;
+    left:-${(prop) => prop.borderRadius}
+    background-color: ${(prop) => prop.backgroundColor};
+    width: ${(prop) => prop.borderRadius};
+    height: ${(prop) => prop.borderRadius};
+    -webkit-mask-image: radial-gradient(
+      circle at top left,
+      transparent 71%,
+      black 71%
+    );
+  `
+  const RoundedTabRight = styled('div', {
+    backgroundColor: String,
+    borderRadius: String,
+  })`
+  position:absolute;
+  bottom:0;
+    right:-${(prop) => prop.borderRadius}
+    background-color: ${(prop) => prop.backgroundColor};
+    width: ${(prop) => prop.borderRadius};
+    height: ${(prop) => prop.borderRadius};
+    -webkit-mask-image: radial-gradient(
+      circle at top right,
+      transparent 71%,
+      black 71%
+    );`
+  const Tab = styled('div', {
+    width: String,
+    height: String,
+    backgroundColor: String,
+    borderRadius: String,
+  })`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: ${(prop) => prop.backgroundColor};
+    width: ${(prop) => prop.width};
+    height: ${(prop) => prop.height};
+    border-radius: ${(prop) => prop.borderRadius} ${(prop) => prop.borderRadius}
+      0 0;
+  `
+  export default {
+    name: 'SelectedOptions',
+    components: {
+      Container,
+      Tab,
+      RoundedTabLeft,
+      RoundedTabRight,
+    },
+    props: {
+      height: {
+        required: false,
+        default: '40px',
+      },
+      width: {
+        required: false,
+        default: '200px',
+      },
+      backgroundColor: {
+        required: false,
+        default: 'blue',
+      },
+      borderRadius: {
+        required: false,
+        default: '20px',
+      },
+    },
+  }
+</script>