@eturnity/eturnity_reusable_components 7.45.5-EPDM-11313-EPDM-11314.2 → 7.45.5-EPDM-12680.0

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

@@ -1,64 +1,64 @@
-<template>
-  <Modal :is-open="isOpen" @on-close="closeModal">
-    <ModalContainer>
-      <ModalTitle v-if="$slots.title">
-        <slot name="title"></slot>
-      </ModalTitle>
-      <TextContainer v-if="$slots.body">
-        <slot name="body"></slot>
-      </TextContainer>
-      <ButtonContainer v-if="$slots.buttons">
-        <slot name="buttons"></slot>
-      </ButtonContainer>
-    </ModalContainer>
-  </Modal>
-</template>
-<script>
-  import styled from 'vue3-styled-components'
-  import Modal from '../modal'
-  const ModalContainer = styled.div`
-    width: 450px;
-    min-height: 205px;
-    padding: 40px 40px 30px 40px;
-  `
-  const ModalTitle = styled.div`
-    color: ${(props) => props.theme.colors.black};
-    font-family: ${(props) => props.theme.fonts.mainFont};
-    font-size: 18px;
-    font-style: normal;
-    font-weight: 700;
-    line-height: 120%;
-    text-transform: uppercase;
-  `
-  const ButtonContainer = styled.div`
-    display: inline-flex;
-    align-items: flex-start;
-    gap: 20px;
-  `
-  const TextContainer = styled.div`
-    color: ${(props) => props.theme.colors.black};
-    font-family: ${(props) => props.theme.fonts.mainFont};
-    font-size: 13px;
-    font-style: normal;
-    font-weight: 400;
-    line-height: normal;
-    padding: 30px 0px;
-    white-space: pre-wrap;
-  `
-  export default {
-    name: 'ActionModal',
-    components: {
-      Modal,
-      ModalContainer,
-      ModalTitle,
-      ButtonContainer,
-      TextContainer,
-    },
-    props: ['isOpen'],
-    methods: {
-      closeModal() {
-        this.$emit('on-close')
-      },
-    },
-  }
-</script>
+<template>
+  <Modal :is-open="isOpen" @on-close="closeModal">
+    <ModalContainer>
+      <ModalTitle v-if="$slots.title">
+        <slot name="title"></slot>
+      </ModalTitle>
+      <TextContainer v-if="$slots.body">
+        <slot name="body"></slot>
+      </TextContainer>
+      <ButtonContainer v-if="$slots.buttons">
+        <slot name="buttons"></slot>
+      </ButtonContainer>
+    </ModalContainer>
+  </Modal>
+</template>
+<script>
+  import styled from 'vue3-styled-components'
+  import Modal from '../modal'
+  const ModalContainer = styled.div`
+    width: 450px;
+    min-height: 205px;
+    padding: 40px 40px 30px 40px;
+  `
+  const ModalTitle = styled.div`
+    color: ${(props) => props.theme.colors.black};
+    font-family: ${(props) => props.theme.fonts.mainFont};
+    font-size: 18px;
+    font-style: normal;
+    font-weight: 700;
+    line-height: 120%;
+    text-transform: uppercase;
+  `
+  const ButtonContainer = styled.div`
+    display: inline-flex;
+    align-items: flex-start;
+    gap: 20px;
+  `
+  const TextContainer = styled.div`
+    color: ${(props) => props.theme.colors.black};
+    font-family: ${(props) => props.theme.fonts.mainFont};
+    font-size: 13px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: normal;
+    padding: 30px 0px;
+    white-space: pre-wrap;
+  `
+  export default {
+    name: 'ActionModal',
+    components: {
+      Modal,
+      ModalContainer,
+      ModalTitle,
+      ButtonContainer,
+      TextContainer,
+    },
+    props: ['isOpen'],
+    methods: {
+      closeModal() {
+        this.$emit('on-close')
+      },
+    },
+  }
+</script>

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

@@ -1,52 +1,52 @@
-<template>
-  <ActionModal :is-open="isOpen" @on-close="closeModal">
-    <ModalContainer>
-      <template #title>
-        <slot name="title"></slot>
-      </template>
-      <template #body>
-        <slot name="body"></slot>
-      </template>
-      <template #buttons>
-        <ButtonContainer>
-          <RCMainButton
-            min-width="150px"
-            :text="$gettext('Got it')"
-            type="primary"
-            @click="closeModal"
-          />
-        </ButtonContainer>
-      </template>
-    </ModalContainer>
-  </ActionModal>
-</template>
-<script>
-  import styled from 'vue3-styled-components'
-  import ActionModal from '../actionModal'
-  import RCMainButton from '../../buttons/mainButton'
-  const ModalContainer = styled.div`
-    width: 450px;
-    min-height: 205px;
-    padding: 40px 40px 30px 40px;
-  `
-  const ButtonContainer = styled.div`
-    display: inline-flex;
-    align-items: flex-start;
-    gap: 20px;
-  `
-  export default {
-    name: 'InfoModal',
-    components: {
-      ModalContainer,
-      ButtonContainer,
-      ActionModal,
-      RCMainButton,
-    },
-    props: ['isOpen'],
-    methods: {
-      closeModal() {
-        this.$emit('on-close')
-      },
-    },
-  }
-</script>
+<template>
+  <ActionModal :is-open="isOpen" @on-close="closeModal">
+    <ModalContainer>
+      <template #title>
+        <slot name="title"></slot>
+      </template>
+      <template #body>
+        <slot name="body"></slot>
+      </template>
+      <template #buttons>
+        <ButtonContainer>
+          <RCMainButton
+            min-width="150px"
+            :text="$gettext('Got it')"
+            type="primary"
+            @click="closeModal"
+          />
+        </ButtonContainer>
+      </template>
+    </ModalContainer>
+  </ActionModal>
+</template>
+<script>
+  import styled from 'vue3-styled-components'
+  import ActionModal from '../actionModal'
+  import RCMainButton from '../../buttons/mainButton'
+  const ModalContainer = styled.div`
+    width: 450px;
+    min-height: 205px;
+    padding: 40px 40px 30px 40px;
+  `
+  const ButtonContainer = styled.div`
+    display: inline-flex;
+    align-items: flex-start;
+    gap: 20px;
+  `
+  export default {
+    name: 'InfoModal',
+    components: {
+      ModalContainer,
+      ButtonContainer,
+      ActionModal,
+      RCMainButton,
+    },
+    props: ['isOpen'],
+    methods: {
+      closeModal() {
+        this.$emit('on-close')
+      },
+    },
+  }
+</script>

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

@@ -1,196 +1,190 @@
-<template>
-  <PageWrapper
-    :backdrop="backdrop"
-    :class="{ visible: isOpen, hidden: !isOpen }"
-    :is-open="isOpen"
-    :position="position"
-  >
-    <ModalContainer :overflow="overflowRule" @click="onClickModalContainer">
-      <Spinner v-if="isLoading" :limited-to-modal="true" size="50px" />
-      <ContentContainer :visible="!isLoading">
-        <slot></slot>
-      </ContentContainer>
-      <CloseButton v-if="!hideClose" class="close" @click="onCloseModal()" />
-    </ModalContainer>
-  </PageWrapper>
-</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:
-  // <modal :isOpen="isOpen" @on-close="$emit('on-close-summary')" :isLoading="true" :hideClose="true" :stopPropagation="false">
-  //   <div>Data....</div>
-  // </modal>
-
-  import styled from 'vue3-styled-components'
-  import CloseButton from '../../buttons/closeButton'
-  import Spinner from '../../spinner'
-
-  const contentAttrs = { visible: Boolean }
-  const ContentContainer = styled('div', contentAttrs)`
-    visibility: ${(props) => (props.visible ? 'inherit' : 'hidden')};
-  `
-
-  const pageAttrs = { isOpen: Boolean, backdrop: String, position: String }
-  const PageWrapper = styled('div', pageAttrs)`
-  position: ${(props) => props.position}
-  display: grid;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background-color: ${(props) =>
-    props.backdrop == 'dark'
-      ? 'rgba(0, 0, 0, 0.4)'
-      : 'rgba(255, 255, 255, 0.9)'};
-  z-index: 99999;
-  overflow: auto;
-
-  &.visible {
-    visibility: visible;
-    opacity: 1;
-    transition: visibility 0s linear 0s, opacity 300ms;
-  }
-
-  &.hidden {
-    visibility: hidden;
-    opacity: 0;
-    transition: visibility 0s linear 300ms, opacity 300ms;
-  }
-
-  @media (max-width: 425px) {
-    background: white;
-  }
-`
-
-  const modalContainerAttrs = { overflow: String }
-  const ModalContainer = styled('div', modalContainerAttrs)`
-    align-self: center;
-    justify-self: center;
-    position: relative;
-    box-shadow: 0px 4px 4px 3px rgba(0, 0, 0, 0.1);
-    border-radius: 4px;
-    background: white;
-    margin: 0 auto;
-    overflow: ${(props) => props.overflow};
-    max-width: 95%;
-    max-height: 95%;
-    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;
-      top: 20px;
-
-      @media (max-width: 425px) {
-        right: 14px;
-        top: 12px;
-        background: white;
-        position: fixed;
-        z-index: 99;
-      }
-    }
-
-    @media (max-width: 425px) {
-      width: 100%;
-      height: 100%;
-      box-shadow: none;
-    }
-  `
-
-  export default {
-    name: 'Modal',
-    components: {
-      PageWrapper,
-      ModalContainer,
-      CloseButton,
-      Spinner,
-      ContentContainer,
-    },
-    props: {
-      isOpen: {
-        required: true,
-        default: false,
-      },
-      isLoading: {
-        required: false,
-        default: false,
-      },
-      hideClose: {
-        required: false,
-        default: false,
-      },
-      backdrop: {
-        required: false,
-        default: 'white',
-      },
-      position: {
-        required: false,
-        default: 'fixed',
-      },
-      stopPropagation: {
-        type: Boolean,
-        default: true,
-      },
-      overflowRule: {
-        required: false,
-        type: String,
-        default: 'auto',
-      },
-    },
-    watch: {
-      isOpen: {
-        immediate: true,
-        handler(isOpen) {
-          document.body.style.overflow = isOpen ? 'hidden' : null
-          if (isOpen) {
-            window.addEventListener('keydown', this.handleKeyDown)
-          } else {
-            window.removeEventListener('keydown', this.handleKeyDown)
-          }
-        },
-      },
-    },
-    beforeUnmount() {
-      document.body.style.overflow = null
-      window.removeEventListener('keydown', this.handleKeyDown)
-    },
-    methods: {
-      onCloseModal() {
-        document.body.style.overflow = null
-        this.$emit('on-close')
-      },
-      handleKeyDown({ key }) {
-        if (key === 'Escape') {
-          this.onCloseModal()
-        }
-      },
-      onClickModalContainer(event) {
-        if (this.stopPropagation) {
-          event.stopPropagation()
-        }
-      },
-    },
-  }
-</script>
+<template>
+  <PageWrapper
+    :backdrop="backdrop"
+    :class="{ visible: isOpen, hidden: !isOpen }"
+    :is-open="isOpen"
+    :position="position"
+  >
+    <ModalContainer @click="onClickModalContainer">
+      <Spinner v-if="isLoading" :limited-to-modal="true" size="50px" />
+      <ContentContainer :visible="!isLoading">
+        <slot></slot>
+      </ContentContainer>
+      <CloseButton v-if="!hideClose" class="close" @click="onCloseModal()" />
+    </ModalContainer>
+  </PageWrapper>
+</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:
+  // <modal :isOpen="isOpen" @on-close="$emit('on-close-summary')" :isLoading="true" :hideClose="true" :stopPropagation="false">
+  //   <div>Data....</div>
+  // </modal>
+
+  import styled from 'vue3-styled-components'
+  import CloseButton from '../../buttons/closeButton'
+  import Spinner from '../../spinner'
+
+  const contentAttrs = { visible: Boolean }
+  const ContentContainer = styled('div', contentAttrs)`
+    visibility: ${(props) => (props.visible ? 'inherit' : 'hidden')};
+  `
+
+  const pageAttrs = { isOpen: Boolean, backdrop: String, position: String }
+  const PageWrapper = styled('div', pageAttrs)`
+  position: ${(props) => props.position}
+  display: grid;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: ${(props) =>
+    props.backdrop == 'dark'
+      ? 'rgba(0, 0, 0, 0.4)'
+      : 'rgba(255, 255, 255, 0.9)'};
+  z-index: 99999;
+  overflow: auto;
+
+  &.visible {
+    visibility: visible;
+    opacity: 1;
+    transition: visibility 0s linear 0s, opacity 300ms;
+  }
+
+  &.hidden {
+    visibility: hidden;
+    opacity: 0;
+    transition: visibility 0s linear 300ms, opacity 300ms;
+  }
+
+  @media (max-width: 425px) {
+    background: white;
+  }
+`
+
+  const ModalContainer = styled.div`
+    align-self: center;
+    justify-self: center;
+    position: relative;
+    box-shadow: 0px 4px 4px 3px rgba(0, 0, 0, 0.1);
+    border-radius: 4px;
+    background: white;
+    margin: 0 auto;
+    overflow: auto;
+    max-width: 95%;
+    max-height: 95%;
+    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;
+      top: 20px;
+
+      @media (max-width: 425px) {
+        right: 14px;
+        top: 12px;
+        background: white;
+        position: fixed;
+        z-index: 99;
+      }
+    }
+
+    @media (max-width: 425px) {
+      width: 100%;
+      height: 100%;
+      box-shadow: none;
+    }
+  `
+
+  export default {
+    name: 'Modal',
+    components: {
+      PageWrapper,
+      ModalContainer,
+      CloseButton,
+      Spinner,
+      ContentContainer,
+    },
+    props: {
+      isOpen: {
+        required: true,
+        default: false,
+      },
+      isLoading: {
+        required: false,
+        default: false,
+      },
+      hideClose: {
+        required: false,
+        default: false,
+      },
+      backdrop: {
+        required: false,
+        default: 'white',
+      },
+      position: {
+        required: false,
+        default: 'fixed',
+      },
+      stopPropagation: {
+        type: Boolean,
+        default: true,
+      },
+    },
+    watch: {
+      isOpen: {
+        immediate: true,
+        handler(isOpen) {
+          document.body.style.overflow = isOpen ? 'hidden' : null
+          if (isOpen) {
+            window.addEventListener('keydown', this.handleKeyDown)
+          } else {
+            window.removeEventListener('keydown', this.handleKeyDown)
+          }
+        },
+      },
+    },
+    beforeUnmount() {
+      document.body.style.overflow = null
+      window.removeEventListener('keydown', this.handleKeyDown)
+    },
+    methods: {
+      onCloseModal() {
+        document.body.style.overflow = null
+        this.$emit('on-close')
+      },
+      handleKeyDown({ key }) {
+        if (key === 'Escape') {
+          this.onCloseModal()
+        }
+      },
+      onClickModalContainer(event) {
+        if (this.stopPropagation) {
+          event.stopPropagation()
+        }
+      },
+    },
+  }
+</script>