adata-ui 2.1.41-beta.7 → 2.1.41-beta.8

package/components/forms/toggle/AToggle.vue

@@ -1,157 +1,157 @@
-<script setup lang="ts">
-import type {Props} from "./types";
-import {twJoin, twMerge} from '#adata-ui/utils/twMerge';
-import {Switch} from "@headlessui/vue";
-
-const props = withDefaults(defineProps<Props>(), {
-  disabled: false,
-  size: 'md',
-  switchClass: '',
-  color: 'blue',
-  onIcon: null,
-  onIconClass: null,
-  offIcon: null,
-  offIconClass: null,
-  activeClass: '',
-  inactiveClass: '',
-  activeContainerClass: '',
-  inactiveContainerClass: ''
-})
-const active = defineModel<boolean>({required: true})
-const switchClass = computed(() => {
-  return twMerge(twJoin(
-    ui.base,
-    ui.size[props.size],
-    ui.rounded,
-    ui.ring,
-    props.disabled ? 'opacity-20' : '',
-    // color.value && (active.value ? ui.value.active : ui.value.inactive).replaceAll('{color}', color.value)
-    props.color && (active.value ? ui.active[props.color] : ui.inactive),
-    active.value ? props.activeClass : props.inactiveClass
-  ), props.switchClass)
-})
-const containerClass = computed(() => {
-  return twMerge(twJoin(
-    ui.container.base,
-    ui.container.size[props.size],
-    (active.value ? ui.container.active[props.size] : ui.container.inactive),
-    active.value ? props.activeContainerClass : props.inactiveContainerClass
-  ))
-})
-const onIconClassFormatted = computed(() => {
-  return twMerge(twJoin(
-    ui.icon.size[props.size],
-    props.onIconClass
-    // props.color && ui.icon.on
-  ))
-})
-const offIconClassFormatted = computed(() => {
-  return twMerge(twJoin(
-    ui.icon.size[props.size],
-    props.offIconClass
-    // color && ui.value.icon.off.replaceAll('{color}', color.value)
-  ))
-})
-
-
-const ui = {
-  "base": "relative inline-flex shrink-0 border-2 border-transparent disabled:cursor-not-allowed disabled:opacity-50 focus:outline-hidden transition ease-in-out",
-  "rounded": "rounded-full",
-  "ring": "focus-visible:ring-2 focus-visible:ring-brand-500 focus-visible:ring-offset-2 focus-visible:ring-offset-(--background-color-main)",
-  "active": {
-    "blue": "bg-action-primary",
-    "green": "bg-success"
-  },
-  "inactive": "bg-badge",
-  "size": {
-    "2xs": "h-3 w-5",
-    "xs": "h-3.5 w-6",
-    "sm": "h-4 w-7",
-    "md": "h-5 w-9",
-    "lg": "h-6 w-11",
-    "xl": "h-7 w-[3.25rem]",
-    "2xl": "h-8 w-[3.75rem]"
-  },
-  "container": {
-    /* осознанно константный белый бегунок на цветном треке: bg-white не флипается в тёмной теме */
-    "base": "pointer-events-none relative inline-block rounded-full bg-white shadow-sm transform ring-0 transition ease-in-out duration-200",
-    "active": {
-      "2xs": "translate-x-2 rtl:-translate-x-2",
-      "xs": "translate-x-2.5 rtl:-translate-x-2.5",
-      "sm": "translate-x-3 rtl:-translate-x-3",
-      "md": "translate-x-4 rtl:-translate-x-4",
-      "lg": "translate-x-5 rtl:-translate-x-5",
-      "xl": "translate-x-6 rtl:-translate-x-6",
-      "2xl": "translate-x-7 rtl:-translate-x-7"
-    },
-    "inactive": "translate-x-0 rtl:-translate-x-0",
-    "size": {
-      "2xs": "h-2 w-2",
-      "xs": "h-2.5 w-2.5",
-      "sm": "h-3 w-3",
-      "md": "h-4 w-4",
-      "lg": "h-5 w-5",
-      "xl": "h-6 w-6",
-      "2xl": "h-7 w-7"
-    }
-  },
-  "icon": {
-    "base": "absolute inset-0 h-full w-full flex items-center justify-center transition-opacity",
-    "active": "opacity-100 ease-in duration-200",
-    "inactive": "opacity-0 ease-out duration-100",
-    "size": {
-      "2xs": "h-2 w-2",
-      "xs": "h-2 w-2",
-      "sm": "h-2 w-2",
-      "md": "h-3 w-3",
-      "lg": "h-4 w-4",
-      "xl": "h-5 w-5",
-      "2xl": "h-6 w-6"
-    },
-    // "on": "text-{color}-500 dark:text-{color}-400",
-    // "off": "text-icon-disabled"
-  },
-}
-
-</script>
-
-<template>
-  <Switch
-    v-model="active"
-    :disabled="disabled"
-    :class="switchClass"
-    aria-label="Switch"
-    style="border-color: transparent"
-  >
-    <span :class="containerClass">
-      <span
-        v-if="onIcon"
-        :class="[active ? ui.icon.active : ui.icon.inactive, ui.icon.base]"
-        aria-hidden="true"
-      >
-        <component
-          :is="onIcon"
-          :class="onIconClassFormatted"
-          filled
-          :font-controlled="false"
-        />
-      </span>
-      <span
-        v-if="offIcon"
-        :class="[active ? ui.icon.inactive : ui.icon.active, ui.icon.base]"
-        aria-hidden="true"
-      >
-        <component
-          :is="offIcon"
-          :class="offIconClassFormatted"
-          filled
-          :font-controlled="false"
-        />
-      </span>
-    </span>
-  </Switch>
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+import type {Props} from "./types";
+import {twJoin, twMerge} from '#adata-ui/utils/twMerge';
+import {Switch} from "@headlessui/vue";
+
+const props = withDefaults(defineProps<Props>(), {
+  disabled: false,
+  size: 'md',
+  switchClass: '',
+  color: 'blue',
+  onIcon: null,
+  onIconClass: null,
+  offIcon: null,
+  offIconClass: null,
+  activeClass: '',
+  inactiveClass: '',
+  activeContainerClass: '',
+  inactiveContainerClass: ''
+})
+const active = defineModel<boolean>({required: true})
+const switchClass = computed(() => {
+  return twMerge(twJoin(
+    ui.base,
+    ui.size[props.size],
+    ui.rounded,
+    ui.ring,
+    props.disabled ? 'opacity-20' : '',
+    // color.value && (active.value ? ui.value.active : ui.value.inactive).replaceAll('{color}', color.value)
+    props.color && (active.value ? ui.active[props.color] : ui.inactive),
+    active.value ? props.activeClass : props.inactiveClass
+  ), props.switchClass)
+})
+const containerClass = computed(() => {
+  return twMerge(twJoin(
+    ui.container.base,
+    ui.container.size[props.size],
+    (active.value ? ui.container.active[props.size] : ui.container.inactive),
+    active.value ? props.activeContainerClass : props.inactiveContainerClass
+  ))
+})
+const onIconClassFormatted = computed(() => {
+  return twMerge(twJoin(
+    ui.icon.size[props.size],
+    props.onIconClass
+    // props.color && ui.icon.on
+  ))
+})
+const offIconClassFormatted = computed(() => {
+  return twMerge(twJoin(
+    ui.icon.size[props.size],
+    props.offIconClass
+    // color && ui.value.icon.off.replaceAll('{color}', color.value)
+  ))
+})
+
+
+const ui = {
+  "base": "relative inline-flex shrink-0 border-2 border-transparent disabled:cursor-not-allowed disabled:opacity-50 focus:outline-hidden transition ease-in-out",
+  "rounded": "rounded-full",
+  "ring": "focus-visible:ring-2 focus-visible:ring-brand-500 focus-visible:ring-offset-2 focus-visible:ring-offset-(--background-color-main)",
+  "active": {
+    "blue": "bg-action-primary",
+    "green": "bg-success"
+  },
+  "inactive": "bg-badge",
+  "size": {
+    "2xs": "h-3 w-5",
+    "xs": "h-3.5 w-6",
+    "sm": "h-4 w-7",
+    "md": "h-5 w-9",
+    "lg": "h-6 w-11",
+    "xl": "h-7 w-[3.25rem]",
+    "2xl": "h-8 w-[3.75rem]"
+  },
+  "container": {
+    /* осознанно константный белый бегунок на цветном треке: bg-white не флипается в тёмной теме */
+    "base": "pointer-events-none relative inline-block rounded-full bg-white shadow-sm transform ring-0 transition ease-in-out duration-200",
+    "active": {
+      "2xs": "translate-x-2 rtl:-translate-x-2",
+      "xs": "translate-x-2.5 rtl:-translate-x-2.5",
+      "sm": "translate-x-3 rtl:-translate-x-3",
+      "md": "translate-x-4 rtl:-translate-x-4",
+      "lg": "translate-x-5 rtl:-translate-x-5",
+      "xl": "translate-x-6 rtl:-translate-x-6",
+      "2xl": "translate-x-7 rtl:-translate-x-7"
+    },
+    "inactive": "translate-x-0 rtl:-translate-x-0",
+    "size": {
+      "2xs": "h-2 w-2",
+      "xs": "h-2.5 w-2.5",
+      "sm": "h-3 w-3",
+      "md": "h-4 w-4",
+      "lg": "h-5 w-5",
+      "xl": "h-6 w-6",
+      "2xl": "h-7 w-7"
+    }
+  },
+  "icon": {
+    "base": "absolute inset-0 h-full w-full flex items-center justify-center transition-opacity",
+    "active": "opacity-100 ease-in duration-200",
+    "inactive": "opacity-0 ease-out duration-100",
+    "size": {
+      "2xs": "h-2 w-2",
+      "xs": "h-2 w-2",
+      "sm": "h-2 w-2",
+      "md": "h-3 w-3",
+      "lg": "h-4 w-4",
+      "xl": "h-5 w-5",
+      "2xl": "h-6 w-6"
+    },
+    // "on": "text-{color}-500 dark:text-{color}-400",
+    // "off": "text-icon-disabled"
+  },
+}
+
+</script>
+
+<template>
+  <Switch
+    v-model="active"
+    :disabled="disabled"
+    :class="switchClass"
+    aria-label="Switch"
+    style="border-color: transparent"
+  >
+    <span :class="containerClass">
+      <span
+        v-if="onIcon"
+        :class="[active ? ui.icon.active : ui.icon.inactive, ui.icon.base]"
+        aria-hidden="true"
+      >
+        <component
+          :is="onIcon"
+          :class="onIconClassFormatted"
+          filled
+          :font-controlled="false"
+        />
+      </span>
+      <span
+        v-if="offIcon"
+        :class="[active ? ui.icon.inactive : ui.icon.active, ui.icon.base]"
+        aria-hidden="true"
+      >
+        <component
+          :is="offIcon"
+          :class="offIconClassFormatted"
+          filled
+          :font-controlled="false"
+        />
+      </span>
+    </span>
+  </Switch>
+</template>
+
+<style scoped>
+
+</style>

package/components/forms/toggle/AToggleV2.vue

@@ -1,72 +1,72 @@
-<script setup lang="ts">
-type Size = 'sm' | 'md'
-
-const props = withDefaults(defineProps<{
-  label?: string
-  labelSide?: 'left' | 'right'
-  size?: Size
-  disabled?: boolean
-}>(), {
-  labelSide: 'left',
-  size: 'md',
-  disabled: false,
-})
-
-const model = defineModel<boolean>({ default: false })
-
-const SIZE: Record<Size, { track: string, knob: string, on: string, off: string, text: string }> = {
-  sm: { track: 'h-5 w-9', knob: 'size-4', on: 'translate-x-4', off: 'translate-x-0.5', text: 'text-body-sm-medium' },
-  md: { track: 'h-6 w-11', knob: 'size-5', on: 'translate-x-5', off: 'translate-x-0.5', text: 'text-body-md-medium' },
-}
-const s = computed(() => SIZE[props.size])
-
-function toggle() {
-  if (props.disabled) return
-  model.value = !model.value
-}
-</script>
-
-<template>
-  <button
-    type="button"
-    role="switch"
-    :aria-checked="model"
-    :aria-disabled="disabled || undefined"
-    :disabled="disabled"
-    class="toggle-v2 group inline-flex select-none items-center gap-2 rounded-full focus:outline-hidden disabled:cursor-not-allowed disabled:opacity-50"
-    :class="labelSide === 'right' ? 'flex-row-reverse' : ''"
-    @click="toggle"
-  >
-    <span
-      v-if="label"
-      class="text-quaternary transition-colors group-hover:text-primary"
-      :class="s.text"
-    >
-      {{ label }}
-    </span>
-    <span
-      class="relative inline-flex shrink-0 items-center rounded-full ring-1 ring-inset transition-colors duration-200 group-focus-visible:ring-2 group-focus-visible:ring-brand-500/50"
-      :class="[
-        s.track,
-        model
-          ? 'bg-brand ring-brand-500/30'
-          : 'bg-badge ring-(--border-color-strong)/60',
-      ]"
-    >
-      <!-- осознанно константный: белый бегунок на цветном треке, bg-white не флипается в тёмной теме -->
-      <span
-        class="toggle-v2__knob inline-block rounded-full bg-white shadow-xs transition-transform duration-200 will-change-transform"
-        :class="[s.knob, model ? s.on : s.off]"
-      />
-    </span>
-  </button>
-</template>
-
-<style scoped>
-@media (prefers-reduced-motion: reduce) {
-  .toggle-v2,
-  .toggle-v2 * {
-    transition: none !important;
-  }
-}
-</style>
+<script setup lang="ts">
+type Size = 'sm' | 'md'
+
+const props = withDefaults(defineProps<{
+  label?: string
+  labelSide?: 'left' | 'right'
+  size?: Size
+  disabled?: boolean
+}>(), {
+  labelSide: 'left',
+  size: 'md',
+  disabled: false,
+})
+
+const model = defineModel<boolean>({ default: false })
+
+const SIZE: Record<Size, { track: string, knob: string, on: string, off: string, text: string }> = {
+  sm: { track: 'h-5 w-9', knob: 'size-4', on: 'translate-x-4', off: 'translate-x-0.5', text: 'text-body-sm-medium' },
+  md: { track: 'h-6 w-11', knob: 'size-5', on: 'translate-x-5', off: 'translate-x-0.5', text: 'text-body-md-medium' },
+}
+const s = computed(() => SIZE[props.size])
+
+function toggle() {
+  if (props.disabled) return
+  model.value = !model.value
+}
+</script>
+
+<template>
+  <button
+    type="button"
+    role="switch"
+    :aria-checked="model"
+    :aria-disabled="disabled || undefined"
+    :disabled="disabled"
+    class="toggle-v2 group inline-flex select-none items-center gap-2 rounded-full focus:outline-hidden disabled:cursor-not-allowed disabled:opacity-50"
+    :class="labelSide === 'right' ? 'flex-row-reverse' : ''"
+    @click="toggle"
+  >
+    <span
+      v-if="label"
+      class="text-quaternary transition-colors group-hover:text-primary"
+      :class="s.text"
+    >
+      {{ label }}
+    </span>
+    <span
+      class="relative inline-flex shrink-0 items-center rounded-full ring-1 ring-inset transition-colors duration-200 group-focus-visible:ring-2 group-focus-visible:ring-brand-500/50"
+      :class="[
+        s.track,
+        model
+          ? 'bg-brand ring-brand-500/30'
+          : 'bg-badge ring-(--border-color-strong)/60',
+      ]"
+    >
+      <!-- осознанно константный: белый бегунок на цветном треке, bg-white не флипается в тёмной теме -->
+      <span
+        class="toggle-v2__knob inline-block rounded-full bg-white shadow-xs transition-transform duration-200 will-change-transform"
+        :class="[s.knob, model ? s.on : s.off]"
+      />
+    </span>
+  </button>
+</template>
+
+<style scoped>
+@media (prefers-reduced-motion: reduce) {
+  .toggle-v2,
+  .toggle-v2 * {
+    transition: none !important;
+  }
+}
+</style>

package/components/forms/toggle/types.ts

@@ -1,16 +1,16 @@
-export type Size = '2xs' | 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl'
-export type Color = 'blue' | 'green'
-export interface Props {
-  disabled?: boolean
-  size?: Size
-  color?: Color
-  switchClass?: string
-  activeClass?: string
-  inactiveClass?: string
-  onIcon?: SVGElement | null
-  onIconClass?: string | null
-  offIcon?: SVGElement | null
-  offIconClass?: string | null
-  activeContainerClass?: string
-  inactiveContainerClass?: string
-}
+export type Size = '2xs' | 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl'
+export type Color = 'blue' | 'green'
+export interface Props {
+  disabled?: boolean
+  size?: Size
+  color?: Color
+  switchClass?: string
+  activeClass?: string
+  inactiveClass?: string
+  onIcon?: SVGElement | null
+  onIconClass?: string | null
+  offIcon?: SVGElement | null
+  offIconClass?: string | null
+  activeContainerClass?: string
+  inactiveContainerClass?: string
+}

package/components/modals/AConfirmationEmail.vue

@@ -1,40 +1,40 @@
-<script setup lang="ts">
-const emit = defineEmits<{
-  (e: 'resend'): void
-  (e: 'close'): void
-}>()
-</script>
-
-<template>
-  <div class="flex flex-col justify-center items-center gap-5">
-    <p class="text-h2">
-      {{ $t('login.modal.title') }}
-    </p>
-    <a-ill-mail />
-    <p class="text-body-md text-center">
-      {{ $t('login.modal.subtitle1') }}
-    </p>
-    <p class="text-body-md text-center">
-      {{ $t('login.modal.confirmationEmail') }}
-    </p>
-    <div class="flex flex-col gap-2 w-full">
-      <a-button
-        class="w-full"
-        view="outline"
-        @click="emit('close')"
-      >
-        {{ $t('login.modal.back') }}
-      </a-button>
-      <a-button
-        class="w-full"
-        @click="emit('resend')"
-      >
-        {{ $t('login.modal.resend') }}
-      </a-button>
-    </div>
-  </div>
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+const emit = defineEmits<{
+  (e: 'resend'): void
+  (e: 'close'): void
+}>()
+</script>
+
+<template>
+  <div class="flex flex-col justify-center items-center gap-5">
+    <p class="text-h2">
+      {{ $t('login.modal.title') }}
+    </p>
+    <a-ill-mail />
+    <p class="text-body-md text-center">
+      {{ $t('login.modal.subtitle1') }}
+    </p>
+    <p class="text-body-md text-center">
+      {{ $t('login.modal.confirmationEmail') }}
+    </p>
+    <div class="flex flex-col gap-2 w-full">
+      <a-button
+        class="w-full"
+        view="outline"
+        @click="emit('close')"
+      >
+        {{ $t('login.modal.back') }}
+      </a-button>
+      <a-button
+        class="w-full"
+        @click="emit('resend')"
+      >
+        {{ $t('login.modal.resend') }}
+      </a-button>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+
+</style>