@eturnity/eturnity_reusable_components 7.18.0 → 7.20.0--EPDM-10564.2

package/.storybook/preview.js

@@ -1,4 +1,4 @@
-import { ThemeProvider } from "vue-styled-components"
+import { ThemeProvider } from "vue3-styled-components"
 
 const theme = {
   colors: {

package/babel.config.js

@@ -1,5 +1,3 @@
 module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ]
-}
+  presets: ['@vue/cli-plugin-babel/preset']
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.18.0",
+  "version": "7.20.0--EPDM-10564.2",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",
@@ -10,30 +10,25 @@
     "build-storybook": "build-storybook"
   },
   "dependencies": {
-    "@vueform/slider": "1.0.5",
+    "@storybook/vue3": "7.0.18",
+    "@vue/compat": "3.3.4",
+    "@vueform/slider": "2.1.10",
+    "@vuepic/vue-datepicker": "6.1.0",
+    "click-outside-vue3": "4.0.1",
     "html-loader": "0.5.5",
-    "postcss": "^8.4.25",
-    "v-click-outside": "2.1.4",
-    "vue": "2.6.11",
-    "vue-styled-components": "1.6.0",
-    "vue2-datepicker": "3.11.1",
-    "vuedraggable": "2.24.3",
-    "core-js": "3.31.1"
+    "postcss": "8.4.25",
+    "vue": "3.3.4",
+    "vue3-styled-components": "1.2.1",
+    "vuedraggable": "4.1.0"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "6.2.8",
-    "@storybook/addon-docs": "6.4.19",
-    "@storybook/addon-essentials": "6.2.8",
-    "@storybook/addon-links": "6.2.8",
-    "@storybook/vue": "6.4.19",
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-eslint": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
-    "@vue/composition-api": "1.0.0-rc.10",
-    "babel-eslint": "10.1.0",
-    "eslint": "6.7.2",
-    "eslint-plugin-vue": "6.2.2",
-    "vue-template-compiler": "2.6.11"
+    "@babel/core": "7.12.16",
+    "@vue/cli-plugin-babel": "5.0.8",
+    "@vue/cli-plugin-eslint": "5.0.8",
+    "@vue/cli-service": "5.0.8",
+    "@vue/compiler-sfc": "3.3.4",
+    "eslint": "7.32.0",
+    "eslint-plugin-vue": "8.0.3"
   },
   "eslintConfig": {
     "root": true,
@@ -45,7 +40,7 @@
       "eslint:recommended"
     ],
     "parserOptions": {
-      "parser": "babel-eslint"
+      "parser": "@babel/eslint-parser"
     },
     "rules": {}
   },

package/src/App.vue

@@ -55,9 +55,9 @@
 </template>
 
 <script>
-import { ThemeProvider } from 'vue-styled-components'
+import { ThemeProvider } from 'vue3-styled-components'
 import theme from './assets/theme'
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
 import InputNumber from '@/components/inputs/inputNumber'
 
 const PageContainer = styled.div`

package/src/components/addNewButton/index.vue

@@ -1,14 +1,15 @@
 <template>
   <page-container :shouldPosition="shouldPosition">
     <button-container :data-id="dataId">
-      <plus-button :src="require('../../assets/icons/plus_button.svg')" />
+      <PlusButtonSvg />
     </button-container>
   </page-container>
 </template>
 
 <script>
 // import AddNewButton from "@eturnity/eturnity_reusable_components/src/components/addNewButton"
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
+import PlusButtonSvg from '../../assets/icons/plus_button.svg'
 
 const pageAttrs = { shouldPosition: Boolean }
 const PageContainer = styled('div', pageAttrs)`
@@ -46,7 +47,8 @@ export default {
   components: {
     PageContainer,
     ButtonContainer,
-    PlusButton
+    PlusButton,
+    PlusButtonSvg
   },
   props: {
     shouldPosition: {

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

@@ -32,7 +32,7 @@
 // />
 
 import Icon from "../../icon"
-import styled from "vue-styled-components"
+import styled from "vue3-styled-components"
 import Theme from "@/assets/theme";
 
 const PageContainer = styled.div``

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

@@ -13,7 +13,7 @@
 // <close-button
 //   color="#fff"
 // />
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
 
 const Container = styled.div`
   position: relative;

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

@@ -1,6 +1,7 @@
 <template>
   <page-container>
     <button-container
+      :id="id"
       :type="type"
       :minWidth="minWidth"
       :isDisabled="isDisabled"
@@ -25,7 +26,7 @@
 //   :data-id="test_data_id"
 // />
 
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
 
 const PageContainer = styled.div``
 
@@ -98,6 +99,10 @@ export default {
       required: false,
       default: null
     },
+    id: {
+      required: false,
+      default: null
+    },
     dataId: {
       type: String,
       default: ''

package/src/components/card/index.vue

@@ -1,26 +1,26 @@
 <template>
-    <Wrapper
-      v-show="!isLoading"
-      :class="viewCardClass"
-      :width="width"
-      :minWidth="minWidth"
-    >
-      <Spinner v-if="isLoading" size="50px" :limitedToModal="true" />
-      <CardWrapper v-else>
-        <CardTitle :class="titleClass" >
-          {{ $gettext(title) }}
-          <et-popover
-            v-if="showPopover && popoverText !== ''"
-            :text="popoverText"
-          ></et-popover>
-        </CardTitle>
-        <slot></slot>
-      </CardWrapper>
-    </Wrapper>
+  <Wrapper
+    v-show="!isLoading"
+    :class="viewCardClass"
+    :width="width"
+    :minWidth="minWidth"
+  >
+    <Spinner v-if="isLoading" size="50px" :limitedToModal="true" />
+    <CardWrapper v-else>
+      <CardTitle :class="titleClass">
+        {{ $gettext(title) }}
+        <et-popover
+          v-if="showPopover && popoverText !== ''"
+          :text="popoverText"
+        ></et-popover>
+      </CardTitle>
+      <slot></slot>
+    </CardWrapper>
+  </Wrapper>
 </template>
 
 <script>
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
 import Spinner from '../spinner'
 
 const WrapperProps = { width: [Number, String], minWidth: [Number, String] }
@@ -28,9 +28,10 @@ const Wrapper = styled('div', WrapperProps)`
   max-width: ${(props) => props.width};
   min-width: ${(props) => props.minWidth};
   padding: 20px;
-  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14),
+    0 1px 5px 0 rgba(0, 0, 0, 0.12);
   border-radius: 4px;
-  background-color: ${props => props.theme.colors.white};
+  background-color: ${(props) => props.theme.colors.white};
   height: 100%;
 `
 
@@ -42,7 +43,7 @@ const CardWrapper = styled('div')`
 const CardTitle = styled('p')`
   font-size: 14px;
   line-height: 1;
-  color: ${props => props.theme.colors.black};
+  color: ${(props) => props.theme.colors.black};
   font-weight: 700;
   margin-bottom: 10px;
 `
@@ -89,7 +90,7 @@ export default {
     Spinner,
     Wrapper,
     CardTitle,
-    CardWrapper,
+    CardWrapper
   }
 }
-</script>
+</script>

package/src/components/deleteIcon/DeleteIcon.stories.js

@@ -1,8 +1,8 @@
-import DeleteIcon from "./index.vue"
+import DeleteIcon from './index.vue'
 
 export default {
-  title: "DeleteIcon",
-  component: DeleteIcon,
+  title: 'DeleteIcon',
+  component: DeleteIcon
   // argTypes: {},
 }
 
@@ -11,19 +11,19 @@ const Template = (args, { argTypes }) => ({
   components: { DeleteIcon },
   // The story's `args` need to be mapped into the template through the `setup()` method
   props: Object.keys(argTypes),
-  template: '<delete-icon v-bind="$props" />',
+  template: '<delete-icon v-bind="$props" />'
 
   // import DeleteIcon from "@eturnity/eturnity_reusable_components/src/components/deleteIcon"
   // To use:
-  // <delete-icon color="gray" @click.native="onDeleteItem(item)" :isDisabled="true" />
+  // <delete-icon color="gray" @click="onDeleteItem(item)" :isDisabled="true" />
 })
 
 export const Default = Template.bind({})
 Default.args = {
-  isDisabled: false,
+  isDisabled: false
 }
 
 export const Disabled = Template.bind({})
 Disabled.args = {
-  isDisabled: true,
+  isDisabled: true
 }

package/src/components/deleteIcon/index.vue

@@ -1,61 +1,78 @@
 <template>
-  <wrapper
-    @mouseover="isHovered = true"
-    @mouseleave="isHovered = false"
-    :isDisabled="isDisabled"
-  >
-    <icon-image
-      v-if="isHovered && !isDisabled"
-      :hoverBg="hoverBg"
-      :src="require('../../assets/icons/delete_icon.svg')"
-    />
-    <icon-image
-      v-else
-      :src="require('../../assets/icons/delete_icon_gray.svg')"
-    />
+  <wrapper :isDisabled="isDisabled">
+    <delete-icon-red class="icon-red" :hoverBg="hoverBg" />
+    <delete-icon-gray class="icon-gray" />
   </wrapper>
 </template>
 
 <script>
 // To use:
-// <delete-icon @click.native="onDeleteItem(item)" :isDisabled="true" />
-import styled from "vue-styled-components"
+// <delete-icon @click="onDeleteItem(item)" :isDisabled="true" />
+import styled from 'vue3-styled-components'
+import SvgDelete from '../../assets/icons/delete_icon.svg'
+import SvgDeleteGray from '../../assets/icons/delete_icon_gray.svg'
 
 const wrapperAttrs = { isDisabled: Boolean }
-const Wrapper = styled("div", wrapperAttrs)`
+const Wrapper = styled('div', wrapperAttrs)`
   width: 30px;
   height: 30px;
-  cursor: ${(props) => (props.isDisabled ? "not-allowed" : "pointer")};
+  cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'pointer')};
+
+  .icon-red {
+    display: none;
+  }
+
+  .icon-gray {
+    display: inline;
+  }
+
+  ${(props) =>
+    !props.isDisabled &&
+    `
+      &:hover {
+        .icon-red {
+          display: inline;
+        }
+
+        .icon-gray {
+          display: none;
+        }
+      }
+    `}
 `
 
 const IconImageAttrs = { hoverBg: String }
-const IconImage = styled('img', IconImageAttrs)`
+const DeleteIconRed = styled(SvgDelete, IconImageAttrs)`
   &:hover {
-    background-color: ${(props) => props.hoverBg ? props.hoverBg : props.theme.colors.grey5};
+    background-color: ${(props) =>
+      props.hoverBg ? props.hoverBg : props.theme.colors.grey5};
+    border-radius: 4px;
+  }
+`
+
+const DeleteIconGray = styled(SvgDeleteGray, IconImageAttrs)`
+  &:hover {
+    background-color: ${(props) => props.theme.colors.grey5};
     border-radius: 4px;
   }
 `
 
 export default {
-  name: "delete-icon",
+  name: 'delete-icon',
   components: {
     Wrapper,
-    IconImage,
+    DeleteIconRed,
+    DeleteIconGray
   },
   props: {
     isDisabled: {
       required: false,
-      default: false,
+      default: false
     },
     hoverBg: {
       required: false,
-      default: '',
+      default: ''
     }
-  },
-  data() {
-    return {
-      isHovered: false,
-    }
-  },
+  }
 }
 </script>

package/src/components/draggableInputHandle/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <Handle :height = "height" class="handle">
+  <Handle :height="height" class="handle">
     <Dot></Dot>
     <Dot></Dot>
     <Dot></Dot>
@@ -7,35 +7,34 @@
 </template>
 
 <script>
+import styled from 'vue3-styled-components'
 
-import styled from 'vue-styled-components'
-
-const Handle = styled('div',{ height : String })`
-  position:absolute;
-  left:0;
-  margin-right:10px;
-    display: flex;
-    align-items: stretch;
-    flex-direction: column;
-    justify-content: center;
-    width: 14px;
-    height:${props=> props.height};
-    padding: 0 5px;
-    background-color: #f3f3f7;
-    cursor: pointer;
-    align-items: center;
-  `
+const Handle = styled('div', { height: String })`
+  position: absolute;
+  left: 0;
+  margin-right: 10px;
+  display: flex;
+  align-items: stretch;
+  flex-direction: column;
+  justify-content: center;
+  width: 14px;
+  height: ${(props) => props.height};
+  padding: 0 5px;
+  background-color: #f3f3f7;
+  cursor: pointer;
+  align-items: center;
+`
 const Dot = styled.div`
-    display: inline-block;
-    width: 4px;
-    height: 4px;
-    margin:2px;
-    background-color: #0068de;
-  `
+  display: inline-block;
+  width: 4px;
+  height: 4px;
+  margin: 2px;
+  background-color: #0068de;
+`
 
 export default {
   name: 'draggableInputHandle',
-  props:['height'],
+  props: ['height'],
   components: {
     Handle,
     Dot