@wishbone-media/spark 0.2.1 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wishbone-media/spark",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/src/components/SparkButton.vue

@@ -0,0 +1,162 @@
+<template>
+  <button
+    type="button"
+    ref="buttonRef"
+    :class="computedButtonClass"
+    :disabled="disabled"
+    @click="$emit('click')"
+  >
+    <slot></slot>
+  </button>
+</template>
+
+<script setup>
+import { computed, inject, ref } from 'vue'
+
+const props = defineProps({
+  size: {
+    type: String,
+    default: 'md',
+    validator: (value) => ['xs', 'sm', 'md', 'lg', 'xl'].includes(value),
+  },
+  variant: {
+    type: String,
+    default: 'primary',
+  },
+  buttonClass: {
+    type: String,
+    default: '',
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+})
+
+const buttonRef = ref(null)
+const buttonGroup = inject('buttonGroup', null)
+
+const groupPosition = computed(() => {
+  if (!buttonGroup?.isInGroup || !buttonRef.value) return null
+
+  const index = buttonGroup.getButtonIndex(buttonRef.value)
+  const total = buttonGroup.getButtonCount()
+
+  return {
+    isFirst: index === 0,
+    isLast: index === total - 1,
+    index,
+    total,
+  }
+})
+
+const CONFLICT_GROUPS = {
+  paddingX: /^px-/,
+  paddingY: /^py-/,
+  paddingAll: /^p-/,
+  marginX: /^mx-/,
+  marginY: /^my-/,
+  marginAll: /^m-/,
+  borderRadius: /^rounded-/,
+  background: /^bg-/,
+  text: /^text-(?!white|black)/,
+}
+
+const mergeClasses = (baseClasses, overrideClasses) => {
+  if (!overrideClasses) return baseClasses
+
+  const base = baseClasses.split(' ').filter(Boolean)
+  const overrides = overrideClasses.split(' ').filter(Boolean)
+
+  const filtered = base.filter((baseClass) => {
+    return !overrides.some((override) => {
+      const baseGroup = Object.entries(CONFLICT_GROUPS).find(([_, regex]) =>
+        regex.test(baseClass),
+      )?.[0]
+
+      const overrideGroup = Object.entries(CONFLICT_GROUPS).find(([_, regex]) =>
+        regex.test(override),
+      )?.[0]
+
+      return baseGroup && baseGroup === overrideGroup
+    })
+  })
+
+  return [...filtered, ...overrides].join(' ')
+}
+
+const computedButtonClass = computed(() => {
+  let classes = ''
+  let roundingSize = ''
+
+  switch (props.size) {
+    case 'xs':
+      classes += ' px-2 py-1 text-xs'
+      roundingSize = 'sm'
+      break
+    case 'sm':
+      classes += ' px-2 py-1 text-sm'
+      roundingSize = 'sm'
+      break
+    case 'md':
+      classes += ' px-2.5 py-1.5 text-sm'
+      roundingSize = 'md'
+      break
+    case 'lg':
+      classes += ' px-3 py-2 text-sm'
+      roundingSize = 'md'
+      break
+    case 'xl':
+      classes += ' px-3.5 py-2.5 text-sm'
+      roundingSize = 'md'
+      break
+  }
+
+  if (buttonGroup?.isInGroup && groupPosition.value) {
+    const { isFirst, isLast } = groupPosition.value
+
+    classes += ` relative inline-flex items-center focus:z-10`
+
+    if (isFirst && isLast) {
+      // Single button in group
+      classes += ` rounded-${roundingSize}`
+    } else if (isFirst) {
+      classes += ` rounded-l-${roundingSize} rounded-r-none`
+    } else if (isLast) {
+      classes += ` rounded-r-${roundingSize} rounded-l-none -ml-px`
+    } else {
+      classes += ' rounded-none -ml-px'
+    }
+  } else {
+    classes += ` shadow-xs rounded-${roundingSize}`
+  }
+
+  switch (props.variant) {
+    case 'primary':
+      classes += ' bg-primary-600 hover:bg-primary-500 text-white'
+      break
+    case 'secondary':
+      classes += '  ring-1 ring-gray-300 ring-inset bg-white hover:bg-gray-50 text-gray-900'
+      break
+    case 'success':
+      classes += ' bg-green-600 hover:bg-green-500 text-white'
+      break
+    case 'warning':
+      classes += ' bg-amber-600 hover:bg-amber-500 text-white'
+      break
+    case 'danger':
+      classes += ' bg-red-600 hover:bg-red-500 text-white'
+      break
+    case 'info':
+      classes += ' bg-cyan-600 hover:bg-cyan-500 text-white'
+      break
+
+    default:
+      classes += ` bg-${props.variant}-600 hover:bg-${props.variant}-500 text-white`
+  }
+
+  classes = mergeClasses(classes, props.buttonClass)
+
+  return classes
+})
+</script>

package/src/components/SparkButtonGroup.vue

@@ -0,0 +1,27 @@
+<template>
+  <div class="inline-flex rounded-md shadow-xs" ref="groupRef">
+    <slot></slot>
+  </div>
+</template>
+
+<script setup>
+import { provide, ref } from 'vue'
+
+const groupRef = ref(null)
+
+const getButtonIndex = (buttonElement) => {
+  if (!groupRef.value) return -1
+  const buttons = Array.from(groupRef.value.children)
+  return buttons.indexOf(buttonElement)
+}
+
+const getButtonCount = () => {
+  return groupRef.value?.children.length || 0
+}
+
+provide('buttonGroup', {
+  isInGroup: true,
+  getButtonIndex,
+  getButtonCount,
+})
+</script>

package/src/components/SparkModalContainer.vue

@@ -0,0 +1,45 @@
+<template>
+  <TransitionRoot as="template" :show="sparkModalService.state.isVisible">
+    <Dialog class="relative z-50" @close="sparkModalService.hide">
+      <TransitionChild
+          as="template"
+          enter="ease-out duration-300"
+          enter-from="opacity-0"
+          enter-to="opacity-100"
+          leave="ease-in duration-200"
+          leave-from="opacity-100"
+          leave-to="opacity-0"
+      >
+        <div class="fixed inset-0 bg-gray-500/75 transition-opacity" />
+      </TransitionChild>
+
+      <div class="fixed inset-0 z-10 w-screen overflow-y-auto">
+        <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
+          <TransitionChild
+              as="template"
+              enter="ease-out duration-300"
+              enter-from="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+              enter-to="opacity-100 translate-y-0 sm:scale-100"
+              leave="ease-in duration-200"
+              leave-from="opacity-100 translate-y-0 sm:scale-100"
+              leave-to="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+          >
+            <DialogPanel class="relative transform overflow-hidden rounded-lg bg-white text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg">
+              <!-- Render dynamic component -->
+              <component
+                  :is="sparkModalService.state.content"
+                  v-bind="sparkModalService.state.props"
+                  v-on="sparkModalService.state.eventHandlers"
+              />
+            </DialogPanel>
+          </TransitionChild>
+        </div>
+      </div>
+    </Dialog>
+  </TransitionRoot>
+</template>
+
+<script setup>
+import { Dialog, DialogPanel, TransitionChild, TransitionRoot } from '@headlessui/vue'
+import { sparkModalService } from '@/composables/sparkModalService'
+</script>

package/src/components/SparkModalDialog.vue

@@ -0,0 +1,121 @@
+<template>
+  <div class="px-4 pt-5 pb-4 sm:p-6">
+    <!-- Icon -->
+    <div v-if="iconToUse" class="mx-auto flex size-12 items-center justify-center rounded-full" :class="iconBgClass">
+      <font-awesome-icon :icon="Icons[iconToUse]" class="h-5 w-5" :class="iconTextClass" />
+    </div>
+
+    <!-- Content -->
+    <div class="text-center" :class="{ 'mt-3 sm:mt-5': iconToUse }">
+      <!-- Title -->
+      <h3 v-if="title" class="text-lg font-medium text-gray-900">
+        {{ title }}
+      </h3>
+
+      <!-- Message -->
+      <div v-if="message" :class="{ 'mt-2': title }" class="text-sm text-gray-500">
+        {{ message }}
+      </div>
+    </div>
+
+    <!-- Actions -->
+    <div class="mt-5 sm:mt-6" :class="buttonContainerClass">
+      <spark-button
+          v-for="(button, index) in buttonsToShow"
+          :key="index"
+          :variant="button.variant"
+          @click="$emit(button.event, button)"
+      >
+        {{ button.text }}
+      </spark-button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import { Icons } from '@/plugins/fontawesome'
+import { SparkButton } from "./index.js";
+
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  message: {
+    type: String,
+    default: '',
+  },
+  type: {
+    type: String,
+    default: 'info',
+    validator: (value) => ['info', 'success', 'warning', 'danger'].includes(value),
+  },
+  icon: {
+    type: String,
+    default: null,
+  },
+  buttons: {
+    type: Array,
+    default: () => [
+      { text: 'OK', variant: 'primary', event: 'ok' }
+    ],
+  },
+})
+
+defineEmits([
+  'ok', 'confirm', 'cancel', 'close', 'save', 'discard', 'delete',
+  'approve', 'reject', 'submit', 'reset', 'continue', 'retry',
+  'edit', 'view', 'download', 'upload', 'share', 'copy', 'input'
+])
+
+const buttonsToShow = computed(() => {
+  // Default to single OK button if no buttons provided
+  if (!props.buttons || props.buttons.length === 0) {
+    return [{ text: 'OK', variant: 'primary', event: 'ok' }]
+  }
+  return props.buttons
+})
+
+const buttonContainerClass = computed(() => {
+  switch (buttonsToShow.value.length) {
+    case 1:
+      return 'sm:grid sm:grid-flow-row-dense'
+    case 2:
+      return 'sm:grid sm:grid-cols-2 sm:gap-3';
+    case 3:
+      return 'sm:grid sm:grid-cols-3 sm:gap-3';
+    default:
+      return 'flex flex-col gap-3';
+  }
+})
+
+const defaultIcons = {
+  info: 'farInfoCircle',
+  success: 'farCheckCircle',
+  warning: 'farExclamationTriangle',
+  danger: 'farCircleXmark',
+}
+
+const iconToUse = computed(() => props.icon || defaultIcons[props.type])
+
+const iconBgClass = computed(() => {
+  const colors = {
+    info: 'bg-blue-100',
+    success: 'bg-green-100',
+    warning: 'bg-yellow-100',
+    danger: 'bg-red-100',
+  }
+  return colors[props.type]
+})
+
+const iconTextClass = computed(() => {
+  const colors = {
+    info: 'text-blue-400',
+    success: 'text-green-400',
+    warning: 'text-yellow-400',
+    danger: 'text-red-400',
+  }
+  return colors[props.type]
+})
+</script>

package/src/components/index.js

@@ -1,7 +1,8 @@
-import SparkAlert from './SparkAlert.vue'
-import SparkAppSelector from './SparkAppSelector.vue'
-import SparkBrandSelector from './SparkBrandSelector.vue'
-import SparkModal from './SparkModal.vue'
-import SparkOverlay from './SparkOverlay.vue'
-
-export { SparkAlert, SparkAppSelector, SparkBrandSelector, SparkModal, SparkOverlay }
+export { default as SparkAlert } from './SparkAlert.vue'
+export { default as SparkAppSelector } from './SparkAppSelector.vue'
+export { default as SparkBrandSelector } from './SparkBrandSelector.vue'
+export { default as SparkButton } from './SparkButton.vue'
+export { default as SparkButtonGroup } from './SparkButtonGroup.vue'
+export { default as SparkModalContainer } from './SparkModalContainer.vue'
+export { default as SparkModalDialog } from './SparkModalDialog.vue'
+export { default as SparkOverlay } from './SparkOverlay.vue'

package/src/composables/index.js

@@ -1,2 +1,3 @@
-export { useSparkOverlay } from './useSparkOverlay.js'
-export { sparkOverlayService } from './sparkOverlayService.js'
+export { sparkModalService } from './sparkModalService.js'
+export { sparkOverlayService } from './sparkOverlayService.js'
+export { useSparkOverlay } from './useSparkOverlay.js'

package/src/composables/sparkModalService.js

@@ -0,0 +1,26 @@
+import { reactive, markRaw } from 'vue'
+
+class SparkModalService {
+    constructor() {
+        this.state = reactive({
+            isVisible: false,
+            content: null,
+            props: {},
+            eventHandlers: {},
+        })
+    }
+
+    show = (component, props = {}, eventHandlers = {}) => {
+        this.state.content = markRaw(component)
+        this.state.props = props
+        this.state.eventHandlers = eventHandlers
+        this.state.isVisible = true
+    }
+
+    hide = () => {
+        this.state.isVisible = false
+        this.state.eventHandlers = {}
+    }
+}
+
+export const sparkModalService = new SparkModalService()

package/src/components/SparkModal.vue

@@ -1,109 +0,0 @@
-<template>
-  <TransitionRoot as="template" :show="open">
-    <Dialog class="relative z-50" @close="$emit('close')">
-      <TransitionChild
-        as="template"
-        enter="ease-out duration-300"
-        enter-from="opacity-0"
-        enter-to="opacity-100"
-        leave="ease-in duration-200"
-        leave-from="opacity-100"
-        leave-to="opacity-0"
-      >
-        <div class="fixed inset-0 bg-gray-500/75 transition-opacity" />
-      </TransitionChild>
-
-      <div class="fixed inset-0 z-10 w-screen overflow-y-auto">
-        <div
-          class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0"
-        >
-          <TransitionChild
-            as="template"
-            enter="ease-out duration-300"
-            enter-from="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
-            enter-to="opacity-100 translate-y-0 sm:scale-100"
-            leave="ease-in duration-200"
-            leave-from="opacity-100 translate-y-0 sm:scale-100"
-            leave-to="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
-          >
-            <DialogPanel
-              :class="[
-                'relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:p-6',
-                sizeClasses,
-              ]"
-            >
-              <div>
-                <!-- Icon -->
-                <div v-if="$slots.icon">
-                  <slot name="icon" />
-                </div>
-
-                <div class="text-center sm:mt-5">
-                  <!-- Header with title -->
-                  <template v-if="$slots.title">
-                    <DialogTitle as="div" class="text-base font-semibold text-gray-900">
-                      <slot name="title" />
-                    </DialogTitle>
-                  </template>
-
-                  <!-- Main content -->
-                  <div :class="{ 'mt-2': $slots.title }">
-                    <slot />
-                  </div>
-                </div>
-              </div>
-
-              <!-- Actions/Buttons -->
-              <div
-                v-if="$slots.actions"
-                class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2 sm:gap-3"
-              >
-                <slot name="actions" />
-              </div>
-            </DialogPanel>
-          </TransitionChild>
-        </div>
-      </div>
-    </Dialog>
-  </TransitionRoot>
-</template>
-
-<script setup>
-import { computed } from 'vue'
-import { Dialog, DialogPanel, DialogTitle, TransitionChild, TransitionRoot } from '@headlessui/vue'
-
-const props = defineProps({
-  open: {
-    type: Boolean,
-    required: true,
-  },
-
-  size: {
-    type: String,
-    default: 'md',
-    validator: (value) => ['sm', 'md', 'lg', 'xl', '2xl'].includes(value),
-  },
-
-  icon: {
-    type: String,
-  },
-
-  iconColor: {
-    type: String,
-  },
-})
-
-defineEmits(['close'])
-
-const sizeClasses = computed(() => {
-  const sizes = {
-    sm: 'sm:max-w-sm',
-    md: 'sm:max-w-lg',
-    lg: 'sm:max-w-2xl',
-    xl: 'sm:max-w-4xl',
-    '2xl': 'sm:max-w-6xl',
-  }
-
-  return sizes[props.size]
-})
-</script>