@esportsplus/ui 0.24.1 → 0.24.3

package/build/components/field/select.d.ts

@@ -1,5 +1,14 @@
 import { type Attributes, type Renderable } from '@esportsplus/template';
-import { Attributes as A } from '../../components/scrollbar/index.js';
+import { Attributes as Attr } from '../../components/scrollbar/index.js';
+import template from '../../components/template/index.js';
+type A = {
+    'field-mask-arrow'?: Attributes;
+    'field-mask-tag'?: Attributes;
+    'field-mask-text'?: Attributes;
+    'tooltip-content'?: Attributes & {
+        direction?: string;
+    };
+} & Attributes & Attr;
 declare const _default: {
     (): ReturnType<(this: {
         attributes?: ({
@@ -131,14 +140,7 @@ declare const _default: {
                 selected?: number | string;
             };
         })))) | undefined;
-        content?: ((mask: (attributes: {
-            "field-mask-arrow"?: Attributes;
-            "field-mask-tag"?: Attributes;
-            "field-mask-text"?: Attributes;
-            "tooltip-content"?: Attributes & {
-                direction?: string;
-            };
-        } & Attributes & A, content: Renderable<unknown>) => Renderable<unknown>) => Renderable<unknown>) | undefined;
+        content?: ((mask: ReturnType<typeof template.factory<A>>) => Renderable<unknown>) | undefined;
     }, attributes: Readonly<{
         [key: `aria-${string}`]: string | number | boolean | undefined;
         [key: `data-${string}`]: string | undefined;
@@ -267,14 +269,7 @@ declare const _default: {
             render: boolean;
             selected?: number | string;
         };
-    })))>, content: (mask: (attributes: {
-        "field-mask-arrow"?: Attributes;
-        "field-mask-tag"?: Attributes;
-        "field-mask-text"?: Attributes;
-        "tooltip-content"?: Attributes & {
-            direction?: string;
-        };
-    } & Attributes & A, content: Renderable<unknown>) => Renderable<unknown>) => Renderable<unknown>) => Renderable<any>>;
+    })))>, content: (mask: ReturnType<typeof template.factory<A>>) => Renderable<unknown>) => Renderable<any>>;
     <T extends {
         [key: `aria-${string}`]: string | number | boolean | undefined;
         [key: `data-${string}`]: string | undefined;
@@ -533,14 +528,7 @@ declare const _default: {
                 selected?: number | string;
             };
         })))) | undefined;
-        content?: ((mask: (attributes: {
-            "field-mask-arrow"?: Attributes;
-            "field-mask-tag"?: Attributes;
-            "field-mask-text"?: Attributes;
-            "tooltip-content"?: Attributes & {
-                direction?: string;
-            };
-        } & Attributes & A, content: Renderable<unknown>) => Renderable<unknown>) => Renderable<unknown>) | undefined;
+        content?: ((mask: ReturnType<typeof template.factory<A>>) => Renderable<unknown>) | undefined;
     }, attributes: Readonly<{
         [key: `aria-${string}`]: string | number | boolean | undefined;
         [key: `data-${string}`]: string | undefined;
@@ -669,22 +657,8 @@ declare const _default: {
             render: boolean;
             selected?: number | string;
         };
-    })))>, content: (mask: (attributes: {
-        "field-mask-arrow"?: Attributes;
-        "field-mask-tag"?: Attributes;
-        "field-mask-text"?: Attributes;
-        "tooltip-content"?: Attributes & {
-            direction?: string;
-        };
-    } & Attributes & A, content: Renderable<unknown>) => Renderable<unknown>) => Renderable<unknown>) => Renderable<any>>;
-    <T extends (mask: (attributes: {
-        "field-mask-arrow"?: Attributes;
-        "field-mask-tag"?: Attributes;
-        "field-mask-text"?: Attributes;
-        "tooltip-content"?: Attributes & {
-            direction?: string;
-        };
-    } & Attributes & A, content: Renderable<unknown>) => Renderable<unknown>) => Renderable<unknown>>(content: T): ReturnType<(this: {
+    })))>, content: (mask: ReturnType<typeof template.factory<A>>) => Renderable<unknown>) => Renderable<any>>;
+    <T extends (mask: ReturnType<typeof template.factory<A>>) => Renderable<unknown>>(content: T): ReturnType<(this: {
         attributes?: ({
             [key: `aria-${string}`]: string | number | boolean | undefined;
             [key: `data-${string}`]: string | undefined;
@@ -814,14 +788,7 @@ declare const _default: {
                 selected?: number | string;
             };
         })))) | undefined;
-        content?: ((mask: (attributes: {
-            "field-mask-arrow"?: Attributes;
-            "field-mask-tag"?: Attributes;
-            "field-mask-text"?: Attributes;
-            "tooltip-content"?: Attributes & {
-                direction?: string;
-            };
-        } & Attributes & A, content: Renderable<unknown>) => Renderable<unknown>) => Renderable<unknown>) | undefined;
+        content?: ((mask: ReturnType<typeof template.factory<A>>) => Renderable<unknown>) | undefined;
     }, attributes: Readonly<{
         [key: `aria-${string}`]: string | number | boolean | undefined;
         [key: `data-${string}`]: string | undefined;
@@ -950,14 +917,7 @@ declare const _default: {
             render: boolean;
             selected?: number | string;
         };
-    })))>, content: (mask: (attributes: {
-        "field-mask-arrow"?: Attributes;
-        "field-mask-tag"?: Attributes;
-        "field-mask-text"?: Attributes;
-        "tooltip-content"?: Attributes & {
-            direction?: string;
-        };
-    } & Attributes & A, content: Renderable<unknown>) => Renderable<unknown>) => Renderable<unknown>) => Renderable<any>>;
+    })))>, content: (mask: ReturnType<typeof template.factory<A>>) => Renderable<unknown>) => Renderable<any>>;
     (attributes: {
         [key: `aria-${string}`]: string | number | boolean | undefined;
         [key: `data-${string}`]: string | undefined;
@@ -1086,14 +1046,7 @@ declare const _default: {
             render: boolean;
             selected?: number | string;
         };
-    }))), content: (mask: (attributes: {
-        "field-mask-arrow"?: Attributes;
-        "field-mask-tag"?: Attributes;
-        "field-mask-text"?: Attributes;
-        "tooltip-content"?: Attributes & {
-            direction?: string;
-        };
-    } & Attributes & A, content: Renderable<unknown>) => Renderable<unknown>) => Renderable<unknown>): ReturnType<(this: {
+    }))), content: (mask: ReturnType<typeof template.factory<A>>) => Renderable<unknown>): ReturnType<(this: {
         attributes?: ({
             [key: `aria-${string}`]: string | number | boolean | undefined;
             [key: `data-${string}`]: string | undefined;
@@ -1223,14 +1176,7 @@ declare const _default: {
                 selected?: number | string;
             };
         })))) | undefined;
-        content?: ((mask: (attributes: {
-            "field-mask-arrow"?: Attributes;
-            "field-mask-tag"?: Attributes;
-            "field-mask-text"?: Attributes;
-            "tooltip-content"?: Attributes & {
-                direction?: string;
-            };
-        } & Attributes & A, content: Renderable<unknown>) => Renderable<unknown>) => Renderable<unknown>) | undefined;
+        content?: ((mask: ReturnType<typeof template.factory<A>>) => Renderable<unknown>) | undefined;
     }, attributes: Readonly<{
         [key: `aria-${string}`]: string | number | boolean | undefined;
         [key: `data-${string}`]: string | undefined;
@@ -1359,13 +1305,6 @@ declare const _default: {
             render: boolean;
             selected?: number | string;
         };
-    })))>, content: (mask: (attributes: {
-        "field-mask-arrow"?: Attributes;
-        "field-mask-tag"?: Attributes;
-        "field-mask-text"?: Attributes;
-        "tooltip-content"?: Attributes & {
-            direction?: string;
-        };
-    } & Attributes & A, content: Renderable<unknown>) => Renderable<unknown>) => Renderable<unknown>) => Renderable<any>>;
+    })))>, content: (mask: ReturnType<typeof template.factory<A>>) => Renderable<unknown>) => Renderable<any>>;
 };
 export default _default;

package/package.json

@@ -4,7 +4,7 @@
     "@esportsplus/action": "^0.0.58",
     "@esportsplus/queue": "^0.1.0",
     "@esportsplus/reactivity": "^0.16.7",
-    "@esportsplus/template": "^0.22.5",
+    "@esportsplus/template": "^0.23.0",
     "@esportsplus/utilities": "^0.22.1",
     "modern-normalize": "^3.0.1"
   },
@@ -48,7 +48,7 @@
   "private": false,
   "sideEffects": false,
   "type": "module",
-  "version": "0.24.1",
+  "version": "0.24.3",
   "scripts": {
     "build": "run-s build:vite build:ts",
     "build:ts": "tsc && tsc-alias",

package/src/components/field/select.ts

@@ -3,7 +3,7 @@ import { html, type Attributes, type Renderable } from '@esportsplus/template';
 import { isObject, omit, toArray } from '@esportsplus/utilities';
 import form from '~/components/form';
 import root from '~/components/root';
-import scrollbar, { Attributes as A } from '~/components/scrollbar';
+import scrollbar, { Attributes as Attr } from '~/components/scrollbar';
 import template from '~/components/template';
 import error from './error';
 
@@ -22,6 +22,14 @@ const OMIT_MASK = [
 const OMIT_OPTION = ['content'];
 
 
+type A = {
+    'field-mask-arrow'?: Attributes;
+    'field-mask-tag'?: Attributes;
+    'field-mask-text'?: Attributes;
+    'tooltip-content'?: Attributes & { direction?: string };
+} & Attributes & Attr;
+
+
 let field: { active: boolean } | null = null;
 
 
@@ -54,12 +62,7 @@ const select = function(
             selected: string | number;
         }
     },
-    attributes: {
-        'field-mask-arrow'?: Attributes;
-        'field-mask-tag'?: Attributes;
-        'field-mask-text'?: Attributes;
-        'tooltip-content'?: Attributes & { direction?: string };
-    } & Attributes & A,
+    attributes: A,
     content: Renderable<unknown>
 ) {
     let { option, options, state } = this;
@@ -176,13 +179,7 @@ export default template.factory<
             }
         }
     ),
-    (mask: (attributes: {
-        'field-mask-arrow'?: Attributes;
-        'field-mask-tag'?: Attributes;
-        'field-mask-text'?: Attributes;
-        'tooltip-content'?: Attributes & { direction?: string };
-    } & Attributes & A,
-    content: Renderable<unknown>) => Renderable<unknown>) => Renderable<unknown>
+    (mask: ReturnType<typeof template.factory<A>>) => Renderable<unknown>
 >((attributes, content) => {
     let options = attributes.options,
         state = attributes.state || reactive({