ui-ingredients 0.4.3 → 0.4.4

package/dist/field/create-field.svelte.js

@@ -37,19 +37,6 @@ export function createField(props) {
         }
         return l.join(' ');
     });
-    $effect(() => {
-        const rootNode = environment?.getRootNode() ?? document;
-        const doc = getDocument(rootNode);
-        const win = getWindow(rootNode);
-        function handler() {
-            hasErrorText = invalid && doc.getElementById(ids.errorText) !== null;
-            hasHelperText = doc.getElementById(ids.helperText) !== null;
-        }
-        handler();
-        const observer = new win.MutationObserver(handler);
-        observer.observe(rootNode, { childList: true, subtree: true });
-        return () => observer.disconnect();
-    });
     function getRootProps() {
         return {
             ...parts.root.attrs,
@@ -72,6 +59,16 @@ export function createField(props) {
             'data-readonly': dataAttr(readOnly),
         };
     }
+    function getRequiredIndicatorProps() {
+        return {
+            ...parts.requiredIndicator.attrs,
+            hidden: !required,
+            'aria-hidden': true,
+            'data-invalid': dataAttr(invalid),
+            'data-disabled': dataAttr(disabled),
+            'data-readonly': dataAttr(readOnly),
+        };
+    }
     function getErrorTextProps() {
         return {
             ...parts.errorText.attrs,
@@ -94,60 +91,55 @@ export function createField(props) {
             'data-readonly': dataAttr(readOnly),
         };
     }
-    function getInputProps() {
+    function getControlProps() {
         return {
-            ...parts.input.attrs,
             id: ids.control,
             disabled,
             required,
-            readonly: readOnly,
-            'aria-invalid': ariaAttr(invalid),
             'aria-describedby': ariaDescribedby,
+            'aria-invalid': ariaAttr(invalid),
+            'aria-disabled': ariaAttr(disabled),
+            'aria-required': ariaAttr(required),
+            'aria-readonly': ariaAttr(readOnly),
             'data-invalid': dataAttr(invalid),
             'data-disabled': dataAttr(disabled),
             'data-required': dataAttr(required),
             'data-readonly': dataAttr(readOnly),
         };
     }
-    function getSelectProps() {
+    function getInputProps() {
         return {
-            ...parts.select.attrs,
-            id: ids.control,
-            disabled,
-            required,
-            'aria-invalid': ariaAttr(invalid),
-            'aria-readonly': ariaAttr(readOnly),
-            'aria-describedby': ariaDescribedby,
-            'data-invalid': dataAttr(invalid),
-            'data-disabled': dataAttr(disabled),
-            'data-required': dataAttr(required),
-            'data-readonly': dataAttr(readOnly),
+            readonly: readOnly,
+            ...getControlProps(),
+            ...parts.input.attrs,
         };
     }
     function getTextareaProps() {
         return {
-            ...parts.textarea.attrs,
-            id: ids.control,
-            disabled,
-            required,
             readonly: readOnly,
-            'aria-describedby': ariaDescribedby,
-            'data-invalid': dataAttr(invalid),
-            'data-disabled': dataAttr(disabled),
-            'data-required': dataAttr(required),
-            'data-readonly': dataAttr(readOnly),
+            ...getControlProps(),
+            ...parts.textarea.attrs,
         };
     }
-    function getRequiredIndicatorProps() {
+    function getSelectProps() {
         return {
-            ...parts.requiredIndicator.attrs,
-            hidden: !required,
-            'aria-hidden': true,
-            'data-invalid': dataAttr(invalid),
-            'data-disabled': dataAttr(disabled),
-            'data-readonly': dataAttr(readOnly),
+            ...getControlProps(),
+            ...parts.select.attrs,
         };
     }
+    $effect(() => {
+        const rootNode = environment?.getRootNode() ?? document;
+        const doc = getDocument(rootNode);
+        const win = getWindow(rootNode);
+        function handler() {
+            hasErrorText = invalid && doc.getElementById(ids.errorText) !== null;
+            hasHelperText = doc.getElementById(ids.helperText) !== null;
+        }
+        handler();
+        const observer = new win.MutationObserver(handler);
+        observer.observe(rootNode, { childList: true, subtree: true });
+        return () => observer.disconnect();
+    });
     return reflect(() => ({
         ids,
         disabled,

package/package.json

@@ -2,7 +2,7 @@
   "name": "ui-ingredients",
   "type": "module",
   "license": "MIT",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "packageManager": "pnpm@9.7.0",
   "svelte": "./dist/index.js",
   "types": "./dist/index.d.ts",