srcdev-nuxt-forms 2.4.22 → 2.4.24

package/assets/styles/forms/themes/_primary.css

@@ -42,6 +42,8 @@
     --theme-form-toggle-bg-off: light-dark(var(--gray-1), var(--gray-4));
     --theme-form-toggle-bg-on: light-dark(var(--gray-1), var(--gray-6));
 
+    --theme-form-toggle-border-color: light-dark(var(--blue-12), var(--blue-1));
+    --theme-form-toggle-border-width: 0.2rem;
     --theme-form-toggle-border: var(--form-element-border-width) solid light-dark(var(--blue-12), var(--blue-1));
 
     --theme-form-toggle-outline: var(--form-element-outline-width) solid light-dark(var(--blue-1), var(--blue-1));

package/components/forms/toggle-switch/ToggleSwitchCore.vue

@@ -1,15 +1,19 @@
 <template>
   <div class="toggle-switch-core" :class="elementClasses" :data-size="size" :data-form-theme="formTheme">
-    <div @click="toggleSwitchValue" class="toggle-switch-input" :class="[{ round }]" :for="inputId">
-      <input type="checkbox" v-model="modelValue" :true-value :false-value :aria-invalid="fieldHasError" :id="inputId" :aria-describedby="`${id}-description`" :name :required />
+    <div @click="toggleSwitchValue" class="toggle-switch-wrapper" :class="[{ round }, { 'use-default-icons': useDefaultIcons }]" :for="inputId">
+      <input type="checkbox" v-model="modelValue" :true-value :false-value :aria-invalid="fieldHasError" :id="inputId" :aria-describedby="`${id}-description`" :name :required :checked="isChecked" />
       <div class="symbol-wrapper" :class="[{ round }]">
         <div class="symbol" :class="[{ round }]">
-          <div v-if="hasIconOnSlot" class="symbol-icon icon-on">
-            <slot name="iconOn"></slot>
+          <div class="symbol-icon icon-on">
+            <slot name="iconOn">
+              <Icon name="material-symbols:circle-outline" class="icon" />
+            </slot>
           </div>
 
-          <div v-if="hasIconOffSlot" class="symbol-icon icon-off">
-            <slot name="iconOff"></slot>
+          <div class="symbol-icon icon-off">
+            <slot name="iconOff">
+              <Icon name="material-symbols:circle-outline" class="icon" />
+            </slot>
           </div>
         </div>
       </div>
@@ -76,6 +80,7 @@ const props = defineProps({
 const slots = useSlots();
 const hasIconOnSlot = computed(() => slots.iconOn !== undefined);
 const hasIconOffSlot = computed(() => slots.iconOff !== undefined);
+const useDefaultIcons = computed(() => !hasIconOnSlot.value && !hasIconOffSlot.value);
 
 const formTheme = computed(() => {
   return props.fieldHasError ? 'error' : props.theme;
@@ -86,131 +91,108 @@ const { elementClasses } = useStyleClassPassthrough(props.styleClassPassthrough)
 
 const inputId = computed(() => `toggle-sitch-${props.id}`);
 
+const isChecked = computed(() => {
+  return modelValue.value === props.trueValue;
+});
+
 const toggleSwitchValue = () => {
   modelValue.value = modelValue.value === props.trueValue ? props.falseValue : props.trueValue;
+  console.log(`toggleSwitchValue(${modelValue.value})`);
 };
 </script>
 
 <style lang="css">
 .toggle-switch-core {
-  --_transition-duration: 0.4s;
-
   .toggle-switch-label {
     display: block;
   }
 
-  .toggle-switch-input {
-    position: relative;
-    display: inline-block;
-    height: calc(var(--form-toggle-symbol-size) + calc(var(--form-element-border-width) * 2) + calc(var(--form-element-outline-width) * 2));
-    width: calc(var(--form-toggle-symbol-size) * 2 - calc(var(--form-element-border-width) * 2) + calc(var(--form-element-outline-width) * 2) + var(--form-toggle-switch-width-adjustment));
+  .toggle-switch-wrapper {
+    --theme-form-toggle-border-color: var(--blue-12);
+    --theme-form-toggle-border-width: 0.1rem;
+    --theme-form-toggle-outline-color: var(--gray-2);
+    --theme-form-toggle-outline-width: 0.1rem;
+
+    --_transition-duration: 0.4s;
+    --_switch-padding: 0.2rem;
+    --_icon-color: inherit;
+    --_icon-on-opacity: 0;
+    --_icon-off-opacity: 1;
+    --_icon-font-size: 2.4rem;
+    --_symbol-size: 3.4rem;
+    --_symbol-background-color: var(--blue-12);
+    --_symbol-outline-color: transparent;
+    --_symbol-outline-width: 1px;
+    --_symbol-margin-inline-start: 0;
+    --_symbol-checked-offset: calc(var(--_symbol-size) * 0.75);
+
+    &.use-default-icons {
+      --_icon-color: transparent;
+    }
+
+    display: flex;
+    flex-direction: column;
 
     input {
-      opacity: 0;
-      width: 0;
       height: 0;
+      width: 0;
+      visibility: hidden;
     }
-    input:checked {
+
+    &:has(input:checked) {
       --_icon-on-opacity: 1;
       --_icon-off-opacity: 0;
+      --_symbol-margin-inline-start: var(--_symbol-checked-offset);
     }
 
     .symbol-wrapper {
-      position: absolute;
-      cursor: pointer;
-      top: 0;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      overflow: clip;
+      /* background: blue; */
+      border: var(--theme-form-toggle-border-width) solid var(--theme-form-toggle-border-color);
+      outline: var(--theme-form-toggle-outline-width) solid var(--theme-form-toggle-outline-color);
+      border-radius: calc(var(--_symbol-size) + calc(var(--theme-form-toggle-border-width) * 2) + calc(var(--_switch-padding) * 2));
+      display: inline-flex;
+      align-items: center;
+      justify-content: start;
+      width: calc(var(--_symbol-size) + var(--_symbol-checked-offset) + calc(var(--theme-form-toggle-border-width) * 2) + calc(var(--_switch-padding) * 2));
+      padding: var(--_switch-padding);
 
       .symbol {
-        display: grid;
-        grid-template-areas: 'icon-stack';
-        overflow: clip;
-        position: absolute;
+        display: inline-grid;
+        grid-template-areas: 'icon';
+        place-content: center;
 
-        .symbol-icon {
-          grid-area: icon-stack;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-        }
-      }
-    }
-  }
-}
+        aspect-ratio: 1/1;
+        /* width: var(--_symbol-size); */
+        padding: calc(calc(var(--_symbol-size) - var(--_icon-font-size)) / 2);
 
-/*
-* ToggleSwitch configurable
-**/
-.toggle-switch-core {
-  .toggle-switch-input {
-    &.round {
-      border-radius: calc(var(--form-toggle-symbol-size) + calc(var(--form-element-border-width) * 2));
-    }
+        outline: var(--_symbol-outline-width) solid var(--_symbol-outline-color);
+        border-radius: 50%;
+        margin-inline-start: var(--_symbol-margin-inline-start);
 
-    .symbol-wrapper {
-      border: var(--theme-form-toggle-border);
-      background-color: var(--theme-form-toggle-bg-off);
-      outline: var(--theme-form-toggle-outline);
-      transition: 0.4s;
+        background-color: var(--_symbol-background-color);
 
-      &.round {
-        border-radius: var(--form-toggle-symbol-size);
-      }
-      .symbol {
-        height: calc(var(--form-toggle-symbol-size) - 0.6rem);
-        width: calc(var(--form-toggle-symbol-size) - 0.6rem);
-        left: 0.4rem;
-        bottom: 0.4rem;
-        background-color: var(--theme-form-toggle-symbol-off);
-        transition: var(--_transition-duration);
-
-        &.round {
-          border-radius: 50%;
-        }
+        overflow: clip;
+
+        transition: margin var(--_transition-duration);
 
         .symbol-icon {
-          transition: var(--_transition-duration);
+          display: grid;
+          grid-area: icon;
+          place-content: center;
+
+          color: var(--_icon-color);
+          font-size: var(--_icon-font-size);
+          transition: opacity var(--_transition-duration);
 
           &.icon-on {
-            color: var(--theme-form-toggle-icon-stroke-colour-on);
-            opacity: 0;
+            opacity: var(--_icon-on-opacity);
           }
           &.icon-off {
-            color: var(--theme-form-toggle-icon-stroke-colour-off);
-            opacity: 1;
-          }
-
-          .icon {
-            --_icon-size: var(--form-icon-size);
-            height: var(--_icon-size);
-            width: var(--_icon-size);
+            opacity: var(--_icon-off-opacity);
           }
         }
       }
     }
-
-    input:focus-visible + .symbol-wrapper {
-      box-shadow: var(--box-shadow-on);
-      outline: var(--form-element-outline-width) solid hsl(from var(--theme-form-input-outline-focus) h s 90%);
-    }
-
-    input:checked + .symbol-wrapper .symbol {
-      --_on-position: calc(var(--form-toggle-symbol-size) * 0.8);
-      background-color: var(--theme-form-toggle-symbol-on);
-      transform: translateX(var(--_on-position));
-
-      .symbol-icon {
-        &.icon-on {
-          opacity: 1;
-        }
-        &.icon-off {
-          opacity: 0;
-        }
-      }
-    }
   }
 }
 </style>

package/components/forms/toggle-switch/ToggleSwitchCoreOld.vue

@@ -0,0 +1,216 @@
+<template>
+  <div class="toggle-switch-core" :class="elementClasses" :data-size="size" :data-form-theme="formTheme">
+    <div @click="toggleSwitchValue" class="toggle-switch-input" :class="[{ round }]" :for="inputId">
+      <input type="checkbox" v-model="modelValue" :true-value :false-value :aria-invalid="fieldHasError" :id="inputId" :aria-describedby="`${id}-description`" :name :required />
+      <div class="symbol-wrapper" :class="[{ round }]">
+        <div class="symbol" :class="[{ round }]">
+          <div v-if="hasIconOnSlot" class="symbol-icon icon-on">
+            <slot name="iconOn"></slot>
+          </div>
+
+          <div v-if="hasIconOffSlot" class="symbol-icon icon-off">
+            <slot name="iconOff"></slot>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import propValidators from '../c12/prop-validators';
+
+const props = defineProps({
+  id: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+  required: {
+    type: Boolean,
+    default: false,
+  },
+  fieldHasError: {
+    type: Boolean,
+    default: false,
+  },
+  trueValue: {
+    type: [String, Number, Boolean],
+    default: true,
+  },
+  falseValue: {
+    type: [String, Number, Boolean],
+    default: false,
+  },
+  styleClassPassthrough: {
+    type: Array as PropType<string[]>,
+    default: () => [],
+  },
+  theme: {
+    type: String as PropType<string>,
+    default: 'primary',
+    validator(value: string) {
+      return propValidators.theme.includes(value);
+    },
+  },
+  round: {
+    type: Boolean,
+    default: true,
+  },
+  size: {
+    type: String as PropType<string>,
+    default: 'normal',
+    validator(value: string) {
+      return propValidators.size.includes(value);
+    },
+  },
+  ariaDescribedby: {
+    type: String,
+    default: null,
+  },
+});
+
+const slots = useSlots();
+const hasIconOnSlot = computed(() => slots.iconOn !== undefined);
+const hasIconOffSlot = computed(() => slots.iconOff !== undefined);
+
+const formTheme = computed(() => {
+  return props.fieldHasError ? 'error' : props.theme;
+});
+
+const modelValue = defineModel();
+const { elementClasses } = useStyleClassPassthrough(props.styleClassPassthrough);
+
+const inputId = computed(() => `toggle-sitch-${props.id}`);
+
+const toggleSwitchValue = () => {
+  modelValue.value = modelValue.value === props.trueValue ? props.falseValue : props.trueValue;
+};
+</script>
+
+<style lang="css">
+.toggle-switch-core {
+  --_transition-duration: 0.4s;
+
+  .toggle-switch-label {
+    display: block;
+  }
+
+  .toggle-switch-input {
+    position: relative;
+    display: inline-block;
+    height: calc(var(--form-toggle-symbol-size) + calc(var(--form-element-border-width) * 2) + calc(var(--form-element-outline-width) * 2));
+    width: calc(var(--form-toggle-symbol-size) * 2 - calc(var(--form-element-border-width) * 2) + calc(var(--form-element-outline-width) * 2) + var(--form-toggle-switch-width-adjustment));
+
+    input {
+      opacity: 0;
+      width: 0;
+      height: 0;
+    }
+    input:checked {
+      --_icon-on-opacity: 1;
+      --_icon-off-opacity: 0;
+    }
+
+    .symbol-wrapper {
+      position: absolute;
+      cursor: pointer;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      overflow: clip;
+
+      .symbol {
+        display: grid;
+        grid-template-areas: 'icon-stack';
+        overflow: clip;
+        position: absolute;
+
+        .symbol-icon {
+          grid-area: icon-stack;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
+      }
+    }
+  }
+}
+
+/*
+* ToggleSwitch configurable
+**/
+.toggle-switch-core {
+  .toggle-switch-input {
+    &.round {
+      border-radius: calc(var(--form-toggle-symbol-size) + calc(var(--form-element-border-width) * 2));
+    }
+
+    .symbol-wrapper {
+      border: var(--theme-form-toggle-border);
+      background-color: var(--theme-form-toggle-bg-off);
+      outline: var(--theme-form-toggle-outline);
+      transition: 0.4s;
+
+      &.round {
+        border-radius: var(--form-toggle-symbol-size);
+      }
+      .symbol {
+        height: calc(var(--form-toggle-symbol-size) - 0.6rem);
+        width: calc(var(--form-toggle-symbol-size) - 0.6rem);
+        left: 0.4rem;
+        bottom: 0.4rem;
+        background-color: var(--theme-form-toggle-symbol-off);
+        transition: var(--_transition-duration);
+
+        &.round {
+          border-radius: 50%;
+        }
+
+        .symbol-icon {
+          transition: var(--_transition-duration);
+
+          &.icon-on {
+            color: var(--theme-form-toggle-icon-stroke-colour-on);
+            opacity: 0;
+          }
+          &.icon-off {
+            color: var(--theme-form-toggle-icon-stroke-colour-off);
+            opacity: 1;
+          }
+
+          .icon {
+            --_icon-size: var(--form-icon-size);
+            height: var(--_icon-size);
+            width: var(--_icon-size);
+          }
+        }
+      }
+    }
+
+    input:focus-visible + .symbol-wrapper {
+      box-shadow: var(--box-shadow-on);
+      outline: var(--form-element-outline-width) solid hsl(from var(--theme-form-input-outline-focus) h s 90%);
+    }
+
+    input:checked + .symbol-wrapper .symbol {
+      --_on-position: calc(var(--form-toggle-symbol-size) * 0.8);
+      background-color: var(--theme-form-toggle-symbol-on);
+      transform: translateX(var(--_on-position));
+
+      .symbol-icon {
+        &.icon-on {
+          opacity: 1;
+        }
+        &.icon-off {
+          opacity: 0;
+        }
+      }
+    }
+  }
+}
+</style>

package/composables/useColourScheme.ts

@@ -13,15 +13,9 @@ export const useColourScheme = () => {
 
   watch(currentColourScheme, (newVal) => {
     if (import.meta.client && newVal !== null) {
-      if (newVal === 'auto') {
-        delete document.documentElement.dataset.colorScheme;
-        localStorage.removeItem('colourScheme');
-        currentColourScheme.value = 'auto';
-      } else {
-        localStorage.setItem('colourScheme', newVal);
-        document.documentElement.dataset.colorScheme = newVal;
-        currentColourScheme.value = newVal;
-      }
+      localStorage.setItem('colourScheme', newVal);
+      document.documentElement.dataset.colorScheme = newVal;
+      currentColourScheme.value = newVal;
     }
   });
 

package/nuxt.config.ts

@@ -15,6 +15,7 @@ export default defineNuxtConfig({
     head: {
       htmlAttrs: {
         lang: 'en',
+        'data-color-scheme': 'auto',
       },
       titleTemplate: '%s - Website name',
       meta: [{ charset: 'utf-8' }, { name: 'viewport', content: 'width=device-width, initial-scale=1' }],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "srcdev-nuxt-forms",
   "type": "module",
-  "version": "2.4.22",
+  "version": "2.4.24",
   "main": "nuxt.config.ts",
   "scripts": {
     "clean": "rm -rf .nuxt && rm -rf .output && rm -rf .playground/.nuxt && rm -rf .playground/.output",