@saasmakers/ui 2.1.2 → 2.1.4

package/app/components/fields/FieldInput.vue

@@ -46,7 +46,18 @@ const id = useId()
 const modelValue = defineModel<FieldInput['modelValue']>({ default: '' })
 const input = ref<HTMLInputElement>()
 const showPassword = ref(false)
-const { isDesktopBrowser } = useDevice()
+const focused = ref(false)
+const { isDesktopBrowser, isIos } = useDevice()
+
+const iosUppercaseTyping = computed(() => {
+  const isProseField = props.type === 'text' || props.type === 'search'
+
+  return props.uppercase && isIos.value && isProseField && !props.lowercaseOnly && !props.slugOnly
+})
+
+const hideCssUppercase = computed(() => {
+  return iosUppercaseTyping.value && focused.value
+})
 
 onMounted(() => {
   if (props.autofocus && input.value && isDesktopBrowser.value) {
@@ -67,6 +78,8 @@ function focus() {
 }
 
 function onFieldBlur(event: FocusEvent) {
+  focused.value = false
+
   syncModelValueFromTarget(event.target)
 
   if (props.trim) {
@@ -77,6 +90,16 @@ function onFieldBlur(event: FocusEvent) {
 }
 
 function onFieldFocus(event: FocusEvent) {
+  if (iosUppercaseTyping.value) {
+    const uppercased = modelValue.value.toString().toUpperCase()
+
+    if (uppercased !== modelValue.value) {
+      modelValue.value = uppercased
+    }
+  }
+
+  focused.value = true
+
   emit('focus', event)
 }
 
@@ -193,10 +216,12 @@ defineExpose({
           :id="id"
           ref="input"
           :autocomplete="autocomplete ? 'on' : 'off'"
+          :autocapitalize="iosUppercaseTyping ? 'characters' : undefined"
           v-bind="autofocus ? { 'data-autofocus': '' } : {}"
           class="h-full w-full appearance-none items-center rounded-lg font-medium tracking-tight outline-none placeholder-gray-600 dark:placeholder-gray-400"
           :class="{
-            'uppercase': uppercase,
+            'uppercase': uppercase && !hideCssUppercase,
+            'placeholder:uppercase': hideCssUppercase,
             'field-disabled': disabled,
             'focus:placeholder-gray-900 hover:placeholder-gray-900 dark:focus:placeholder-gray-100 dark:hover:placeholder-gray-100': !disabled,
             'text-gray-900 dark:text-gray-100': !lineThrough,

package/app/components/fields/FieldTextarea.vue

@@ -30,7 +30,16 @@ const emit = defineEmits<{
 const id = useId()
 const modelValue = defineModel<FieldTextarea['modelValue']>({ default: '' })
 const textarea = ref<HTMLTextAreaElement>()
-const { isDesktopBrowser } = useDevice()
+const focused = ref(false)
+const { isDesktopBrowser, isIos } = useDevice()
+
+const iosUppercaseTyping = computed(() => {
+  return props.uppercase && isIos.value
+})
+
+const hideCssUppercase = computed(() => {
+  return iosUppercaseTyping.value && focused.value
+})
 
 onMounted(() => {
   if (props.autofocus && textarea.value && isDesktopBrowser.value) {
@@ -39,6 +48,8 @@ onMounted(() => {
 })
 
 function onFieldBlur(event: FocusEvent) {
+  focused.value = false
+
   syncModelValueFromTarget(event.target)
   emit('blur', event, modelValue.value || '')
 }
@@ -47,6 +58,18 @@ function onFieldClick(event: MouseEvent) {
   emit('click', event, modelValue.value || '')
 }
 
+function onFieldFocus() {
+  if (iosUppercaseTyping.value) {
+    const uppercased = modelValue.value.toString().toUpperCase()
+
+    if (uppercased !== modelValue.value) {
+      modelValue.value = uppercased
+    }
+  }
+
+  focused.value = true
+}
+
 function syncModelValueFromTarget(target: EventTarget | null) {
   if (!(target instanceof HTMLTextAreaElement)) {
     return
@@ -77,9 +100,11 @@ function syncModelValueFromTarget(target: EventTarget | null) {
       ref="textarea"
       v-model="modelValue"
       v-bind="{ 'data-enable-grammarly': 'false' }"
+      :autocapitalize="iosUppercaseTyping ? 'characters' : undefined"
       class="w-full flex-1 appearance-none rounded-lg text-gray-900 font-medium tracking-tight outline-none dark:text-gray-100 placeholder-gray-600 dark:placeholder-gray-400"
       :class="{
-        'uppercase': uppercase,
+        'uppercase': uppercase && !hideCssUppercase,
+        'placeholder:uppercase': hideCssUppercase,
         'field-disabled': disabled,
         'focus:placeholder-gray-900 hover:placeholder-gray-900 dark:focus:placeholder-gray-100 dark:hover:placeholder-gray-100': !disabled,
         'px-sm py-2.5': padding && size === 'sm',
@@ -102,6 +127,7 @@ function syncModelValueFromTarget(target: EventTarget | null) {
       spellcheck="false"
       @blur="onFieldBlur"
       @click="onFieldClick"
+      @focus="onFieldFocus"
     />
 
     <FieldMessage

package/app/composables/useDevice.ts

@@ -1,5 +1,6 @@
 export default function useDevice() {
-  const { isNative } = useCapacitor()
+  const { isIOS, isNative } = useCapacitor()
+  const isIos = ref(false)
 
   const isDesktopBrowser = computed(() => {
     if (typeof navigator === 'undefined') {
@@ -18,5 +19,29 @@ export default function useDevice() {
     return !/Android|iPad|iPhone|iPod|Mobile/i.test(navigator.userAgent)
   })
 
-  return { isDesktopBrowser }
+  onMounted(() => {
+    isIos.value = detectIosDevice(isIOS.value)
+  })
+
+  return {
+    isDesktopBrowser,
+    isIos,
+  }
+}
+
+function detectIosDevice(isNativeIos: boolean) {
+  if (isNativeIos) {
+    return true
+  }
+
+  if (typeof navigator === 'undefined') {
+    return false
+  }
+
+  if (/iPad|iPhone|iPod/.test(navigator.userAgent)) {
+    return true
+  }
+
+  // iPadOS 13+ uses a Macintosh user agent. Several touch points separate it from a Mac.
+  return navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saasmakers/ui",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "private": false,
   "description": "Reusable Nuxt UI components for SaaS Makers projects",
   "license": "MIT",