@indielayer/ui 1.3.0 → 1.5.0

package/src/components/modal/theme/Modal.carbon.theme.ts

@@ -1,7 +1,60 @@
 import type { ModalTheme } from '../Modal.vue'
 
-import BaseTheme from './Modal.base.theme'
+const theme: ModalTheme = {
+  classes: {
+    wrapper: 'fixed z-40 inset-0 overflow-y-auto transition-all',
 
-const theme: ModalTheme = BaseTheme
+    backdrop: ({ data }) => {
+      const classes = ['fixed inset-0 bg-secondary-500 dark:bg-black transition-opacity']
+
+      if (data.visible) classes.push('ease-out duration-200 opacity-70 dark:opacity-70')
+      else classes.push('ease-in duration-100 opacity-0')
+
+      return classes
+    },
+
+    modal: ({ props, data }) => {
+      const classes = ['relative flex flex-col z-10 bg-secondary-200 dark:bg-secondary-900 shadow-lg transform transition-all overflow-hidden max-h-full w-full']
+
+      if (data.visible) classes.push('ease-out duration-200 opacity-100 translate-y-0 sm:scale-100')
+      else classes.push('ease-in duration-200 opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95')
+
+      if (props.size === 'xs') classes.push('sm:max-w-xs')
+      else if (props.size === 'sm') classes.push('sm:max-w-sm')
+      else if (props.size === 'lg') classes.push('sm:max-w-xl')
+      else if (props.size === 'xl') classes.push('sm:max-w-3xl')
+      else classes.push('sm:max-w-lg')
+
+      return classes
+    },
+
+    closeIcon: '!absolute top-0 z-10 right-0',
+
+    header: 'text-lg pl-4 pt-4 pr-12',
+
+    content: ({ props }) => {
+      const classes = ['pb-8']
+
+      if (!props.fluid) classes.push('px-4')
+
+      return classes
+    },
+
+    actions: ({ props, slots }) => {
+      const classes = ['grid grid-flow-col gap-[1px]']
+
+      if (slots['tertiary-action'] || slots['cancel-action']) classes.push('grid-cols-4')
+      else classes.push('grid-cols-2')
+
+      return classes
+    },
+
+    label: 'text-xs text-secondary-500 mb-1',
+
+    title: 'text-xl mb-4',
+
+    description: 'text-sm mb-4',
+  },
+}
 
 export default theme

package/src/components/notifications/Notifications.vue

@@ -286,29 +286,29 @@ defineExpose({ log, info, success, warn, warning: warn, error })
             viewBox="0 0 20 20"
           />
           <div class="flex items-center flex-wrap">
-            <span v-if="notification.title" class="font-semibold mr-2">{{ notification.title }}</span>
+            <span v-if="notification.title" class="font-medium mr-2">{{ notification.title }}</span>
             <span>{{ notification.message }}</span>
           </div>
           <x-spacer/>
-          <div
+          <button
             v-if="notification.action"
             class="
                 ml-3
-                font-semibold
+                font-medium
                 cursor-pointer
                 text-[color:var(--x-notification-action)]
                 hover:text-[color:var(--x-notification-action-hover)]
                 dark:text-[color:var(--x-notification-dark-action)]
                 dark:hover:text-[color:var(--x-notification-dark-action-hover)]
               "
-            @click="notification.action.onClick"
+            @click="() => { notification.action?.onClick(); remove(notification); }"
           >
             {{ notification.action.label }}
-          </div>
+          </button>
           <x-icon
             v-if="notification.removable"
             :icon="closeIcon"
-            class="text-gray-400 hover:text-gray-500 ml-3 cursor-pointer"
+            class="text-secondary-400 hover:text-secondary-500 ml-3 cursor-pointer"
             @click="() => {remove(notification)}"
           />
         </li>

package/src/components/notifications/theme/Notifications.base.theme.ts

@@ -2,11 +2,11 @@ import type { NotificationsTheme } from '../Notifications.vue'
 
 const theme: NotificationsTheme = {
   classes: {
-    wrapper: 'fixed z-40 w-full sm:w-auto overflow-y-auto max-h-screen',
+    wrapper: 'fixed z-50 w-full sm:w-auto overflow-y-auto max-h-screen',
 
     list: 'flex flex-col items-end w-full sm:w-[520px] px-4',
 
-    item: 'w-full flex items-center rounded-md px-4 py-3 bg-gray-800 dark:bg-gray-50 text-white dark:text-gray-900 border border-gray-700 dark:border-gray-100',
+    item: 'w-full flex items-center rounded-md px-4 py-3 bg-secondary-800 dark:bg-secondary-50 text-white dark:text-secondary-900 border border-secondary-700 dark:border-secondary-100',
   },
 }
 

package/src/components/notifications/theme/Notifications.carbon.theme.ts

@@ -1,7 +1,17 @@
 import type { NotificationsTheme } from '../Notifications.vue'
 
-import BaseTheme from './Notifications.base.theme'
+const theme: NotificationsTheme = {
+  classes: {
+    wrapper: 'fixed z-50 w-full sm:w-auto overflow-y-auto max-h-screen',
 
-const theme: NotificationsTheme = BaseTheme
+    list: 'flex flex-col items-end w-full sm:w-[520px] px-4',
+
+    item: () => {
+      const classes = ['w-full flex items-center px-4 py-3 bg-secondary-800 dark:bg-secondary-50 text-white dark:text-secondary-900 border-l-2 border-[color:var(--x-notification-icon)]']
+
+      return classes
+    },
+  },
+}
 
 export default theme

package/src/components/pagination/Pagination.vue

@@ -111,7 +111,7 @@ const { styles, classes, className } = useTheme('Pagination', {}, props)
         @click="prevPage"
       />
       <div class="mx-9 flex items-center">
-        <span class="text-gray-600 mr-2">Page</span>
+        <span class="text-secondary-600 mr-2">Page</span>
         <x-input
           v-model="quickInput"
           :size="size"
@@ -119,7 +119,7 @@ const { styles, classes, className } = useTheme('Pagination', {}, props)
           hide-footer
           @keydown.enter="onQuickInput"
         />
-        <span class="text-gray-600 ml-2">of {{ totalPages }}</span>
+        <span class="text-secondary-600 ml-2">of {{ totalPages }}</span>
       </div>
       <x-button
         :icon-left="nextIcon"
@@ -163,7 +163,7 @@ const { styles, classes, className } = useTheme('Pagination', {}, props)
         class="rounded-full cursor-pointer"
         :class="[
           classes.dots,
-          i === modelValue ? 'bg-[color:var(--x-pagination-bg)]': 'bg-gray-100 hover:bg-gray-200'
+          i === modelValue ? 'bg-[color:var(--x-pagination-bg)]': 'bg-secondary-100 hover:bg-secondary-200'
         ]"
         @click="$emit('update:modelValue', i)"
       ></li>

package/src/components/popover/Popover.vue

@@ -23,6 +23,10 @@ const popoverProps = {
     type: Array as PropType<Array<PopoverTriggerEvent>>,
     default: () => ['click'],
   },
+  hideArrow: {
+    type: Boolean,
+    default: true,
+  },
   showTriggers: [Array, Function] as PropType<Array<PopoverTriggerEvent> | ((triggers: Array<PopoverTriggerEvent>) => Array<PopoverTriggerEvent>)>,
   hideTriggers: [Array, Function] as PropType<Array<PopoverTriggerEvent> | ((triggers: Array<PopoverTriggerEvent>) => Array<PopoverTriggerEvent>)>,
   popperTriggers: Array as PropType<Array<PopoverTriggerEvent>>,
@@ -121,7 +125,8 @@ const { styles, classes, className } = useTheme('Popover', {}, props)
     :eager-mount="eagerMount"
     :popper-class="[
       classes.content,
-      popperClass
+      popperClass,
+      hideArrow ? 'v-popper__popper--no-arrow' : '',
     ]"
     :compute-transform-origin="computeTransformOrigin"
     @show="() => { isOpen = true; $emit('show') }"
@@ -142,6 +147,9 @@ const { styles, classes, className } = useTheme('Popover', {}, props)
 </template>
 
 <style lang="postcss">
+/* stylelint-disable no-duplicate-selectors */
+/* stylelint-disable no-descending-specificity */
+/* stylelint-disable selector-class-pattern */
 .resize-observer {
   position: absolute;
   top: 0;
@@ -168,7 +176,7 @@ const { styles, classes, className } = useTheme('Popover', {}, props)
     z-index: -1;
   }
 }
-/* stylelint-disable selector-class-pattern */
+
 .v-popper__popper {
   z-index: 10000;
   top: 0;
@@ -202,4 +210,71 @@ const { styles, classes, className } = useTheme('Popover', {}, props)
   height: 100%;
   display: none;
 }
+
+.v-popper__arrow-container {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+}
+
+.v-popper__arrow-inner {
+  border-style: solid;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 0;
+  height: 0;
+  visibility: hidden;
+  border-width: 7px;
+}
+.v-popper__arrow-outer { display: none; }
+
+.v-popper__popper[data-popper-placement^="top"] .v-popper__arrow-inner,
+.v-popper__popper[data-popper-placement^="bottom"] .v-popper__arrow-inner { left: -2px; }
+
+.v-popper__popper[data-popper-placement^="top"] .v-popper__arrow-inner {
+  border-bottom-width: 0;
+  border-left-color: transparent !important;
+  border-right-color: transparent !important;
+  border-bottom-color: transparent !important;
+}
+.v-popper__popper[data-popper-placement^="top"] .v-popper__arrow-inner { top: -2px; }
+.v-popper__popper[data-popper-placement^="bottom"] .v-popper__arrow-container { top: 0; }
+
+.v-popper__popper[data-popper-placement^="bottom"] .v-popper__arrow-inner {
+  border-top-width: 0;
+  border-left-color: transparent !important;
+  border-right-color: transparent !important;
+  border-top-color: transparent !important;
+}
+.v-popper__popper[data-popper-placement^="bottom"] .v-popper__arrow-inner { top: -4px; }
+
+.v-popper__popper[data-popper-placement^="left"] .v-popper__arrow-inner,
+.v-popper__popper[data-popper-placement^="right"] .v-popper__arrow-inner { top: -2px; }
+
+.v-popper__popper[data-popper-placement^="right"] .v-popper__arrow-inner {
+  border-left-width: 0;
+  border-left-color: transparent !important;
+  border-top-color: transparent !important;
+  border-bottom-color: transparent !important;
+}
+.v-popper__popper[data-popper-placement^="right"] .v-popper__arrow-inner { left: -4px; }
+.v-popper__popper[data-popper-placement^="left"] .v-popper__arrow-container { right: -10px; }
+
+.v-popper__popper[data-popper-placement^="left"] .v-popper__arrow-inner {
+  border-right-width: 0;
+  border-top-color: transparent !important;
+  border-right-color: transparent !important;
+  border-bottom-color: transparent !important;
+}
+.v-popper__popper[data-popper-placement^="left"] .v-popper__arrow-inner { left: -2px; }
+
+.v-popper--theme-dropdown .v-popper__arrow-inner {
+  visibility: visible;
+  border-color: #374151;
+}
+
+.v-popper__popper--no-arrow .v-popper__arrow-container {
+  display: none;
+}
 </style>

package/src/components/popover/theme/PopoverContainer.base.theme.ts

@@ -2,7 +2,7 @@ import type { PopoverContainerTheme } from '../PopoverContainer.vue'
 
 const theme: PopoverContainerTheme = {
   classes: {
-    wrapper: 'block w-full bg-white dark:bg-gray-700 shadow-lg rounded-md border  border-gray-200 dark:border-gray-800',
+    wrapper: 'block w-full bg-white dark:bg-secondary-700 shadow-lg rounded-md border border-secondary-200 dark:border-secondary-800',
   },
 }
 

package/src/components/popover/theme/PopoverContainer.carbon.theme.ts

@@ -2,7 +2,7 @@ import type { PopoverContainerTheme } from '../PopoverContainer.vue'
 
 const theme: PopoverContainerTheme = {
   classes: {
-    wrapper: 'block w-full bg-gray-100 dark:bg-gray-700 shadow-lg border border-gray-200 dark:border-gray-800 text-sm',
+    wrapper: 'block w-full bg-secondary-100 dark:bg-secondary-700 shadow-lg border border-secondary-200 dark:border-secondary-800 text-sm',
   },
 }
 

package/src/components/progress/Progress.vue

@@ -53,7 +53,7 @@ const { styles, classes, className } = useTheme('Progress', {}, props)
     </div>
     <div
       v-if="gradient"
-      class="absolute h-full bg-gray-100 dark:bg-gray-700 right-0 top-0"
+      class="absolute h-full bg-secondary-100 dark:bg-secondary-700 right-0 top-0"
       :class="{ 'duration-150 transition-[width]': animate }"
       :style="{
         width: `${100 - percentage}%`

package/src/components/progress/theme/Progress.base.theme.ts

@@ -2,11 +2,11 @@ import type { ProgressTheme } from '../Progress.vue'
 
 const theme: ProgressTheme = {
   classes: {
-    wrapper: ({ props }) => `relative rounded bg-gray-100 dark:bg-gray-700 overflow-hidden pointer-events-none ${props.thick ? 'h-1.5' : 'h-1'}`,
+    wrapper: ({ props }) => `relative rounded bg-secondary-100 dark:bg-secondary-700 overflow-hidden pointer-events-none ${props.thick ? 'h-1.5' : 'h-1'}`,
 
     list: 'flex flex-col items-end w-full sm:w-[520px] px-4',
 
-    item: 'w-full flex items-center rounded-md px-4 py-3 bg-gray-800 dark:bg-gray-50 text-white dark:text-gray-900',
+    item: 'w-full flex items-center rounded-md px-4 py-3 bg-secondary-800 dark:bg-secondary-50 text-white dark:text-secondary-900',
   },
 
   styles: ({ props, colors, css }) => {

package/src/components/radio/Radio.vue

@@ -4,16 +4,14 @@ const radioProps = {
   ...useColors.props('primary'),
   ...useInteractive.props(),
   ...useInputtable.props(),
-  value: [String, Number, Boolean, Function, Object, Array],
-  label: String,
-  helper: String,
+  value: [String, Number],
   glow: Boolean,
 }
 
 export type RadioProps = ExtractPublicPropTypes<typeof radioProps>
 
 type InternalClasses = 'wrapper' | 'circle' | 'circleIcon' | 'label' | 'content'
-type InternalExtraData = { selected: Ref<boolean>; }
+type InternalExtraData = { selected: Ref<boolean>; isInsideForm: boolean; isInsideFormGroup: boolean; }
 export interface RadioTheme extends ThemeComponent<RadioProps, InternalClasses, InternalExtraData> {}
 
 export default {
@@ -25,7 +23,7 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { computed, ref, type ExtractPublicPropTypes, type Ref } from 'vue'
+import { computed, ref, type ExtractPublicPropTypes, type Ref, unref } from 'vue'
 import { useCommon } from '../../composables/useCommon'
 import { useTheme, type ThemeComponent } from '../../composables/useTheme'
 import { useColors } from '../../composables/useColors'
@@ -41,25 +39,49 @@ const emit = defineEmits(useInputtable.emits(false))
 
 const elRef = ref<HTMLElement | null>(null)
 
+const { focus, blur } = useInteractive(elRef)
+
+const {
+  errorInternal,
+  hideFooterInternal,
+  isInsideForm,
+  isInsideFormGroup,
+  isFirstValidation,
+  formGroup,
+  reset,
+  validate,
+  setError,
+} = useInputtable(props, { focus, emit, withListeners: false })
+
 const selected = computed({
   get() {
+    const formGroupValue = unref(formGroup.value)
+
+    if (isInsideFormGroup) return formGroupValue === props.value
+
     return props.value === props.modelValue
   },
   set() {
     emit('update:modelValue', props.value)
+    formGroup.setValue(props.value as any)
   },
 })
 
-const { focus, blur } = useInteractive(elRef)
+function select() {
+  emit('update:modelValue', props.value)
+  formGroup.setValue(props.value as any)
+}
 
-const {
-  errorInternal,
-  reset,
-  validate,
-  setError,
-} = useInputtable(props, { focus, emit, withListeners: false })
+const listeners = {
+  input: () => {
+    if (isInsideFormGroup) return
+    setTimeout(() => {
+      if (props.validateOnInput && !isFirstValidation.value) validate(props.modelValue)
+    }, 0)
+  },
+}
 
-const { styles, classes, className } = useTheme('Radio', {}, props, { selected })
+const { styles, classes, className } = useTheme('Radio', {}, props, { selected, isInsideForm, isInsideFormGroup })
 
 defineExpose({ focus, blur, reset, validate, setError })
 </script>
@@ -75,19 +97,21 @@ defineExpose({ focus, blur, reset, validate, setError })
       className,
       classes.wrapper,
     ]"
-    @keypress.prevent.stop.space="$emit('update:modelValue', value)"
+    @keypress.prevent.stop.space="select"
   >
     <div
       class="flex items-center"
       :class="{ 'cursor-not-allowed': disabled }"
     >
       <input
+        :id="id"
         v-model="selected"
         :name="name"
         :required="required"
         :disabled="disabled || loading"
         type="radio"
         class="invisible absolute"
+        v-on="listeners"
       />
       <div
         :class="[
@@ -125,7 +149,7 @@ defineExpose({ focus, blur, reset, validate, setError })
       </div>
     </div>
 
-    <x-input-footer v-if="!hideFooter" :error="errorInternal" :helper="helper"/>
+    <x-input-footer v-if="!hideFooterInternal" :error="errorInternal" :helper="helper"/>
   </label>
 </template>
 

package/src/components/radio/theme/Radio.base.theme.ts

@@ -2,16 +2,22 @@ import type { RadioTheme } from '../Radio.vue'
 
 const theme: RadioTheme = {
   classes: {
-    wrapper: 'inline-block relative cursor-pointer focus:outline-none group',
+    wrapper: ({ data }) => {
+      const classes = ['inline-block relative cursor-pointer focus:outline-none group']
+
+      if (data.isInsideForm && !data.isInsideFormGroup) classes.push('mb-3')
+
+      return classes
+    },
 
     circle: ({ props }) => {
-      let c = 'rounded-full flex justify-center items-center shrink-0 border-2 outline-offset-2 outline-slate-300 dark:outline-slate-500 group-focus:outline-1 group-focus:outline'
+      const classes = ['rounded-full flex justify-center items-center shrink-0 border outline-offset-2 outline-slate-300 dark:outline-slate-500 group-focus:outline-1 group-focus:outline']
 
-      if (props.size === 'xs' || props.size === 'sm') c += ' h-4 w-4'
-      if (props.size === 'xl') c += ' h-6 w-6'
-      else c += ' h-5 w-5'
+      if (props.size === 'lg') classes.push('h-5 w-5')
+      else if (props.size === 'xl') classes.push('h-6 w-6')
+      else classes.push('h-4 w-4')
 
-      return c
+      return classes
     },
 
     circleIcon: ({ props, data }) => {
@@ -22,13 +28,13 @@ const theme: RadioTheme = {
       if (props.size === 'sm' || props.size === 'xs') c.push('h-2')
       else if (props.size === 'lg') c.push('h-2.5')
       else if (props.size === 'xl') c.push('h-3')
-      else c.push('h-[0.6rem]')
+      else c.push('h-2')
 
       return c
     },
 
     label: ({ props }) => {
-      let c = 'font-medium text-gray-800 dark:text-gray-200 pl-2'
+      let c = 'font-medium text-secondary-800 dark:text-secondary-200 pl-2'
 
       if (props.size === 'xs') c += ' text-xs'
       else if (props.size === 'sm') c += ' text-sm'
@@ -106,7 +112,7 @@ const theme: RadioTheme = {
           border: props.glow ? color[300] : gray[300],
           dark: {
             bg: gray[900],
-            border: props.glow ? color[300] : gray[300],
+            border: props.glow ? color[300] : gray[400],
           },
         }))
       }

package/src/components/radio/theme/Radio.carbon.theme.ts

@@ -2,16 +2,22 @@ import type { RadioTheme } from  '../Radio.vue'
 
 const theme: RadioTheme = {
   classes: {
-    wrapper: 'inline-block relative cursor-pointer focus:outline-none group',
+    wrapper: ({ data }) => {
+      const classes = ['inline-block relative cursor-pointer focus:outline-none group']
+
+      if (data.isInsideForm && !data.isInsideFormGroup) classes.push('mb-8')
+
+      return classes
+    },
 
     circle: ({ props }) => {
-      let c = 'rounded-full flex justify-center items-center shrink-0 border outline-offset-2 outline-slate-300 dark:outline-slate-500 group-focus:outline-1 group-focus:outline'
+      const classes = ['rounded-full flex justify-center items-center shrink-0 border outline-offset-2 outline-slate-300 dark:outline-slate-500 group-focus:outline-1 group-focus:outline']
 
-      if (props.size === 'xs' || props.size === 'sm') c += ' h-4 w-4'
-      if (props.size === 'xl') c += ' h-6 w-6'
-      else c += ' h-5 w-5'
+      if (props.size === 'xs' || props.size === 'sm') classes.push('h-3 w-3')
+      else if (props.size === 'xl') classes.push('h-5 w-5')
+      else classes.push('h-4 w-4')
 
-      return c
+      return classes
     },
 
     circleIcon: ({ props, data }) => {
@@ -26,7 +32,7 @@ const theme: RadioTheme = {
       return c
     },
 
-    label: 'text-sm text-gray-800 dark:text-gray-200 pl-2',
+    label: 'text-sm text-secondary-800 dark:text-secondary-200 pl-2',
 
     content: 'pl-2',
   },
@@ -84,7 +90,7 @@ const theme: RadioTheme = {
       } else {
         vars.push(css.variables({
           bg: '#fff',
-          border: props.glow ? color[300] : gray[300],
+          border: props.glow ? color[300] : gray[900],
           dark: {
             bg: gray[900],
             border: props.glow ? color[300] : gray[300],