@globalbrain/sefirot 2.0.0-draft.3 → 2.0.0-draft.4

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [2.0.0-draft.4](https://github.com/globalbrain/sefirot/compare/v2.0.0-draft.3...v2.0.0-draft.4) (2021-12-22)
+
+### Features
+
+* refactor modals ([36d0d1e](https://github.com/globalbrain/sefirot/commit/36d0d1e7747935aff4d909d4023751002875d6c8))
+
 # [2.0.0-draft.3](https://github.com/globalbrain/sefirot/compare/v2.0.0-draft.2...v2.0.0-draft.3) (2021-12-17)
 
 ### Features

package/lib/components/SModal.vue

@@ -1,7 +1,7 @@
 <template>
-  <div v-show="show" class="SModal" ref="el" @click="closeIfClosable">
-    <div class="content" @click="closeIfClosable">
-      <component :is="component" v-bind="data" @close="close" />
+  <div v-show="show" class="SModal" ref="el">
+    <div class="content">
+      <component :is="component" v-bind="data ?? {}" @close="close" />
     </div>
   </div>
 </template>
@@ -10,15 +10,16 @@
 import { ref, onMounted, onBeforeUnmount } from 'vue'
 import { disableBodyScroll, enableBodyScroll } from 'body-scroll-lock'
 
-const props = defineProps({
-  id: { type: Number, default: null },
-  component: { type: Object, default: () => ({}) },
-  data: { type: Object, default: () => ({}) },
-  show: { type: Boolean, required: true },
-  closable: { type: Boolean, default: true }
-})
+const props = defineProps<{
+  id?: number
+  component: any
+  data?: Record<string, any>
+  show: boolean
+}>()
 
-const emit = defineEmits(['close'])
+const emit = defineEmits<{
+  (e: 'close', id?: number): void
+}>()
 
 const el = ref<any>(null)
 
@@ -29,34 +30,16 @@ function close() {
   emit('close', props.id)
 }
 
-function closeIfClosable(e: any): void {
-  if (props.closable) {
-    if (!isDescendant(e.target)) {
-      close()
-    }
-  }
-}
-
-function isDescendant(el: any): boolean {
-  if (el.classList && el.classList.contains('content')) {
-    return false
-  }
-
-  const parent = document.getElementsByClassName('content')[0]
-
-  return parent && parent.contains(el)
-}
-
-function lock(): void {
+function lock() {
   disableBodyScroll(el.value!, { reserveScrollBarGap: true })
 }
 
-function release(): void {
+function release() {
   enableBodyScroll(el.value!)
 }
 </script>
 
-<style lang="postcss" scoped>
+<style scoped lang="postcss">
 .SModal {
   position: absolute;
   top: 0;
@@ -64,13 +47,8 @@ function release(): void {
   bottom: 0;
   left: 0;
   height: 100vh;
-  padding: 32px 16px 96px;
   overflow: hidden;
   overflow-y: auto;
-
-  @media (min-width: 768px) {
-    padding: 48px 24px 96px;
-  }
 }
 
 .SModal.fade-enter-active .content,

package/lib/components/SPortalModals.vue

@@ -9,7 +9,6 @@
           :show="index === items.length - 1"
           :component="item.component"
           :data="item.data"
-          :closable="item.options && item.options.closable"
           @close="id => close(id)"
         />
       </transition-group>
@@ -43,7 +42,7 @@ watch(hasItem, (value) => {
 
 watch(route, closeAll)
 
-function close(id: number) {
+function close(id?: number) {
   store.dispatch('modal/close', id)
 }
 
@@ -52,7 +51,7 @@ function closeAll() {
 }
 </script>
 
-<style lang="postcss" scoped>
+<style scoped lang="postcss">
 .SPortalModals {
   position: fixed;
   top: 0;

package/lib/components/SSheet.vue

@@ -1,34 +1,92 @@
 <template>
-  <article class="SSheet" :class="[size ?? 'medium']">
-    <slot :close="close" />
-  </article>
+  <div class="SSheet" :class="[size ?? 'medium']" @click="closeIfClosable">
+    <article class="box" @click.stop>
+      <div v-if="closable !== false" class="close">
+        <button class="close-button" @click="$emit('close')">
+          <SIconX class="close-icon" />
+        </button>
+      </div>
+
+      <slot :close="() => emit('close')" />
+    </article>
+  </div>
 </template>
 
 <script setup lang="ts">
-import { useStore } from 'vuex'
+import SIconX from './icons/SIconX.vue'
 
-defineProps<{
+const props = defineProps<{
   size?: 'small' | 'medium' | 'large'
+  closable?: boolean
 }>()
 
-const store = useStore()
+const emit = defineEmits<{
+  (e: 'close'): void
+}>()
 
-function close() {
-  store.dispatch('modal/close')
+function closeIfClosable() {
+  if (props.closable !== false) {
+    emit('close')
+  }
 }
 </script>
 
-<style lang="postcss" scoped>
+<style scoped lang="postcss">
 .SSheet {
+  padding: 16px 16px 96px;
+  min-height: 100vh;
+
+  @media (min-width: 512px) {
+    padding: 32px 24px 96px;
+  }
+
+  @media (min-width: 768px) {
+    padding: 48px 32px 128px;
+  }
+}
+
+.SSheet.small .box  { max-width: 392px; }
+.SSheet.medium .box { max-width: 512px; }
+.SSheet.large .box  { max-width: 768px; }
+
+.box {
+  position: relative;
   margin: 0 auto;
   border: 1px solid var(--c-divider-light);
   border-radius: 8px;
   background-color: var(--c-bg);
   box-shadow: var(--shadow-depth-3);
-  overflow: hidden;
 }
 
-.SSheet.small  { max-width: 392px; }
-.SSheet.medium { max-width: 512px; }
-.SSheet.large  { max-width: 768px; }
+.close {
+  position: absolute;
+  top: 10px;
+  right: 4px;
+  z-index: 10;
+
+  @media (min-width: 512px) {
+    top: 14px;
+    right: 12px;
+  }
+}
+
+.close-button {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 48px;
+  height: 48px;
+  color: var(--c-text-3);
+  transition: color .25s;
+
+  &:hover {
+    color: var(--c-text-1);
+  }
+}
+
+.close-icon {
+  width: 20px;
+  height: 20px;
+  fill: currentColor;
+}
 </style>

package/lib/components/SSheetFooter.vue

@@ -4,9 +4,13 @@
   </footer>
 </template>
 
-<style lang="postcss" scoped>
+<style scoped lang="postcss">
 .SSheetFooter {
   border-top: 1px solid var(--c-divider-light);
   padding: 0 16px;
+
+  @media (min-width: 512px) {
+    padding: 0 24px;
+  }
 }
 </style>

package/lib/components/SSheetFooterAction.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="SSheetFooterAction">
     <SButton
-      size="medium"
+      size="small"
       :type="type ?? 'primary'"
       :mode="mode ?? 'neutral'"
       :label="label"

package/lib/components/SSheetFooterActions.vue

@@ -8,7 +8,7 @@
 .SSheetFooterActions {
   display: flex;
   justify-content: flex-end;
-  padding: 12px 0 11px;
+  padding: 16px 0 15px;
 }
 
 .SSheetFooterActions :deep(.SSheetFooterAction + .SSheetFooterAction) {

package/lib/components/SSheetMedium.vue

@@ -6,17 +6,11 @@
 
 <style lang="postcss" scoped>
 .SSheetMedium {
-  padding: 16px;
-}
+  padding: 12px 16px 20px;
 
-.SSheetMedium :deep(h1) {
-  line-height: 32px;
-  font-size: 20px;
-  font-weight: 500;
-}
-
-.SSheetMedium :deep(h1 + p) {
-  margin-top: 8px;
+  @media (min-width: 512px) {
+    padding: 16px 24px 26px;
+  }
 }
 
 .SSheetMedium :deep(p) {

package/lib/components/SSheetTitle.vue

@@ -0,0 +1,20 @@
+<template>
+  <header class="SSheetTitle">
+    <h1 class="title">
+      <slot />
+    </h1>
+  </header>
+</template>
+
+<style lang="postcss" scoped>
+.title {
+  padding: 20px 48px 0 16px;
+  line-height: 28px;
+  font-size: 20px;
+  font-weight: 500;
+
+  @media (min-width: 512px) {
+    padding: 24px 64px 0 24px;
+  }
+}
+</style>

package/lib/composables/Modal.ts

@@ -1,29 +1,21 @@
 import { useStore } from 'vuex'
-import { Options as ModalOptions } from '../store/modal'
 
 export interface Modal {
-  open(item?: OpenOptions): Promise<any>
+  open(data?: Record<string, any>): Promise<any>
   close(): Promise<any>
 }
 
-export interface OpenOptions {
-  id?: number
-  component?: any
-  data?: Record<string, any>
-  options?: ModalOptions
-}
-
 let modalId = 0
 
 export function useModal(component: any): Modal {
   const store = useStore()
   const id = useModalId()
 
-  function open(item: OpenOptions = {}) {
+  function open(data: Record<string, any> = {}): Promise<any> {
     return store.dispatch('modal/open', {
       id,
       component,
-      ...item
+      data
     })
   }
 

package/lib/mixins/Sheet.ts

@@ -1,7 +1,6 @@
 import { App } from 'vue'
 import SSheet from '../components/SSheet.vue'
-import SSheetHeader from '../components/SSheetHeader.vue'
-import SSheetHeaderTitle from '../components/SSheetHeaderTitle.vue'
+import SSheetTitle from '../components/SSheetTitle.vue'
 import SSheetMedium from '../components/SSheetMedium.vue'
 import SSheetFooter from '../components/SSheetFooter.vue'
 import SSheetFooterActions from '../components/SSheetFooterActions.vue'
@@ -11,8 +10,7 @@ export function mixin(app: App): void {
   app.mixin({
     components: {
       SSheet,
-      SSheetHeader,
-      SSheetHeaderTitle,
+      SSheetTitle,
       SSheetMedium,
       SSheetFooter,
       SSheetFooterActions,

package/lib/store/modal/index.ts

@@ -9,11 +9,6 @@ export interface Item {
   id?: number
   component: any
   data?: Record<string, any>
-  options?: Options
-}
-
-export interface Options {
-  closable?: boolean
 }
 
 function state(): State {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globalbrain/sefirot",
-  "version": "2.0.0-draft.3",
+  "version": "2.0.0-draft.4",
   "description": "Vue Components for Global Brain Design System.",
   "files": [
     "lib"

package/lib/components/SSheetHeader.vue

@@ -1,60 +0,0 @@
-<template>
-  <header class="SSheetHeader">
-    <slot />
-
-    <div v-if="closable" class="close">
-      <button class="close-button" @click="close">
-        <SIconX class="close-icon" />
-      </button>
-    </div>
-  </header>
-</template>
-
-<script setup lang="ts">
-import { useStore } from 'vuex'
-import SIconX from './icons/SIconX.vue'
-
-defineProps({
-  closable: { type: Boolean, default: true }
-})
-
-const store = useStore()
-
-function close() {
-  store.dispatch('modal/close')
-}
-</script>
-
-<style lang="postcss" scoped>
-.SSheetHeader {
-  display: flex;
-  justify-content: space-between;
-  border-bottom: 1px solid var(--c-divider-light);
-  min-height: 48px;
-  background-color: var(--c-bg-soft);
-}
-
-.close {
-  margin: 0 0 0 auto;
-}
-
-.close-button {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 48px;
-  height: 47px;
-  color: var(--c-text-3);
-  transition: color .25s;
-
-  &:hover {
-    color: var(--c-text-1);
-  }
-}
-
-.close-icon {
-  width: 20px;
-  height: 20px;
-  fill: currentColor;
-}
-</style>

package/lib/components/SSheetHeaderTitle.vue

@@ -1,15 +0,0 @@
-<template>
-  <h1 class="SSheetHeaderTitle">
-    <slot />
-  </h1>
-</template>
-
-<style lang="postcss" scoped>
-.SSheetHeaderTitle {
-  margin: 0;
-  padding: 14px 16px 10px;
-  line-height: 20px;
-  font-size: 14px;
-  font-weight: 500;
-}
-</style>