@eturnity/eturnity_reusable_components 7.35.1-EPDM-10620.6 → 7.35.1-EPDM-10620.8

package/package.json

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

package/src/components/selectedOptions/index.vue

@@ -15,27 +15,30 @@
           >
             {{ item.name }}
           </ListItem>
-          <ButtonContainer
-            v-if="optionsList.length > optionLimit || hasComponent"
-            name="more_options,_tool_tips"
-            @click="expandOptions"
-          >
-            <DotItem />
-            <DotItem />
-            <DotItem />
-          </ButtonContainer>
+          <IconContainer @click="expandOptions">
+            <ButtonContainer
+              v-if="optionsList.length > optionLimit || hasComponent"
+              name="more_options,_tool_tips"
+            >
+              <DotItem />
+              <DotItem />
+              <DotItem />
+            </ButtonContainer>
+          </IconContainer>
         </ListContainer>
         <EmptyText v-if="!optionsList.length">
           {{ $gettext('no_batch_actions_available') }}
         </EmptyText>
-        <IconContainer @click="$emit('on-close')">
-          <Icon
-            color="white"
-            cursor="pointer"
-            name="close_for_modals,_tool_tips"
-            size="14px"
-          />
-        </IconContainer>
+        <CloseContainer>
+          <IconContainer @click="$emit('on-close')">
+            <Icon
+              color="white"
+              cursor="pointer"
+              name="close_for_modals,_tool_tips"
+              size="14px"
+            />
+          </IconContainer>
+        </CloseContainer>
       </BoxContainer>
     </PageContainer>
     <CenterPageContainer v-else>
@@ -60,14 +63,9 @@
             :key="item.type"
             :disabled="item.disabled || false"
             :hover-color="item.hoverColor"
-            @click="
-              !item?.component && !item.disabled && $emit('on-' + item.type)
-            "
+            @click="handleExpandedOptionClick(item)"
           >
-            <ListItemWrapper
-              v-if="item?.component"
-              @click="!item.disabled && toggleElement(item.type)"
-            >
+            <ListItemWrapper v-if="item?.component">
               <ListItemTitle>
                 {{ item.name }}
                 <InfoText
@@ -195,6 +193,10 @@
   const BoxTitle = styled.div`
     font-size: 13px;
     color: ${(props) => props.theme.colors.white};
+    transform: translateZ(0);
+    backface-visibility: hidden;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
   `
 
   const BoxContainer = styled.div`
@@ -204,9 +206,9 @@
     opacity: 90%;
     color: ${(props) => props.theme.colors.white};
     border-radius: 4px;
-    padding: 8px 10px 8px 20px;
+    padding: 0px 10px 0px 20px;
     font-size: 13px;
-    height: 40px;
+    height: 45px;
   `
 
   const CenterBox = styled(BoxContainer)`
@@ -232,6 +234,11 @@
       background: ${(props) => props.theme.colors.white};
     }
   `
+
+  const CloseContainer = styled.div`
+    margin-left: 20px;
+  `
+
   const DotItem = styled.div`
     width: 4px;
     height: 4px;
@@ -240,10 +247,9 @@
   `
 
   const ListContainer = styled.div`
-    padding: 0 20px;
+    height: 100%;
     display: flex;
     align-items: center;
-    gap: 20px;
     color: ${(props) => props.theme.colors.white};
   `
 
@@ -254,16 +260,21 @@
 
   const ListItem = styled('div', ListAttrs)`
     width: max-content;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    padding: 0 10px;
     cursor: ${(props) => (props.disabled ? 'not-allowed' : 'pointer')};
     color: ${(props) => props.disabled && props.theme.colors.grey3};
 
     &:hover {
+      background: rgba(255, 255, 255, 0.1);
       color: ${(props) =>
         props.disabled
           ? props.theme.colors.grey3
           : props.hoverColor
           ? props.theme.colors[props.hoverColor]
-          : props.theme.colors.green};
+          : props.theme.colors.white};
     }
   `
 
@@ -274,7 +285,7 @@
     height: 30px;
     width: 30px;
     cursor: pointer;
-    margin-left: 15px;
+    margin-left: 8px;
 
     &:hover {
       background: rgba(255, 255, 255, 0.1);
@@ -288,12 +299,14 @@
     flex-direction: column;
   `
 
-  const ExpandedListItem = styled(ListItem)`
-    display: flex;
+  const ExpandedListItem = styled('div', ListAttrs)`
     width: 100%;
+    display: flex;
     justify-content: space-between;
     align-items: center;
     padding: 13px 15px;
+    cursor: ${(props) => (props.disabled ? 'not-allowed' : 'pointer')};
+    color: ${(props) => props.disabled && props.theme.colors.grey3};
 
     &:hover {
       background: rgba(255, 255, 255, 0.1);
@@ -347,6 +360,7 @@
       Divider,
       DividerContainer,
       ExpandedList,
+      CloseContainer,
     },
     props: {
       optionsList: {
@@ -408,6 +422,17 @@
         this.expanded = !this.expanded
         this.expandedOptions = this.optionsList
       },
+      handleExpandedOptionClick(item) {
+        if (item.disabled) return
+
+        if (!item.component) {
+          this.$emit('on-' + item.type)
+
+          return
+        }
+
+        this.toggleElement(item.type)
+      },
     },
   }
 </script>