@solidjs/h 2.0.0-beta.13 → 2.0.0-beta.15

package/jsx-runtime/types/jsx-properties.d.ts

@@ -31,6 +31,7 @@ export type PropValue =
   | MediaSource
   | Blob
   | File
+  | Date
   | Element;
 
 /**

package/jsx-runtime/types/jsx.d.ts

@@ -219,9 +219,14 @@ export namespace JSX {
   >;
   // end event handlers
 
-  type ClassList =
+  export type ClassValue =
+    | string
+    | number
+    | boolean
+    | null
+    | undefined
     | Record<string, boolean>
-    | Array<string | number | boolean | null | undefined | Record<string, boolean>>;
+    | ClassValue[];
 
   const SERIALIZABLE: unique symbol;
   interface SerializableAttributeValue {
@@ -264,11 +269,6 @@ export namespace JSX {
 
   // TODO: Should we allow this?
   // type ClassKeys = `class:${string}`;
-  // type CSSKeys = Exclude<keyof csstype.PropertiesHyphen, `-${string}`>;
-
-  // type CSSAttributes = {
-  //   [key in CSSKeys as `style:${key}`]: csstype.PropertiesHyphen[key];
-  // };
 
   // BOOLEAN
 
@@ -850,6 +850,20 @@ export namespace JSX {
         : never)
     | (string & {});
 
+  type ExtractEventType<T> = {
+    [K in keyof T as K extends `on${infer Name}` ? Name : never]: T[K] extends EventHandlerUnion<
+      Element,
+      infer E
+    >
+      ? E
+      : never;
+  };
+
+  // EventType["click"] = MouseEvent
+
+  type EventType = ExtractEventType<EventHandlersElement<Element>> &
+    ExtractEventType<EventHandlersWindow<Element>>;
+
   // GLOBAL ATTRIBUTES
 
   /**
@@ -881,7 +895,7 @@ export namespace JSX {
      * with reactive values directly; manually-built strings re-run the whole
      * concatenation on every change instead of toggling the affected classes.
      */
-    class?: FunctionMaybe<string | ClassList | RemoveAttribute>;
+    class?: FunctionMaybe<ClassValue | RemoveAttribute>;
     elementtiming?: FunctionMaybe<string | RemoveAttribute>;
     id?: FunctionMaybe<string | RemoveAttribute>;
     nonce?: FunctionMaybe<string | RemoveAttribute>;
@@ -1528,6 +1542,10 @@ export namespace JSX {
     src?: FunctionMaybe<string | RemoveAttribute>;
 
     onEncrypted?: EventHandlerUnion<T, MediaEncryptedEvent> | undefined;
+    onWaitingForKey?: EventHandlerUnion<T, Event> | undefined;
+
+    /** @deprecated */
+    mediagroup?: FunctionMaybe<string | RemoveAttribute>;
 
     // special cases locked to properties
 
@@ -1866,6 +1884,11 @@ export namespace JSX {
     width?: FunctionMaybe<number | string | RemoveAttribute>;
 
     onEnterPictureInPicture?: EventHandlerUnion<T, PictureInPictureEvent> | undefined;
+    onLeavePictureInPicture?: EventHandlerUnion<T, PictureInPictureEvent> | undefined;
+  }
+
+  interface WebViewHTMLAttributes<T> extends HTMLAttributes<T> {
+    allowpopups?: FunctionMaybe<BooleanAttribute | RemoveAttribute>;
     disableblinkfeatures?: FunctionMaybe<string | RemoveAttribute>;
     disablewebsecurity?: FunctionMaybe<BooleanAttribute | RemoveAttribute>;
     enableblinkfeatures?: FunctionMaybe<string | RemoveAttribute>;
@@ -1968,7 +1991,7 @@ export namespace JSX {
      * with reactive values directly; manually-built strings re-run the whole
      * concatenation on every change instead of toggling the affected classes.
      */
-    class?: FunctionMaybe<string | ClassList | RemoveAttribute>;
+    class?: FunctionMaybe<ClassValue | RemoveAttribute>;
     style?: FunctionMaybe<CSSProperties | string | RemoveAttribute>;
   }
   interface TransformableSVGAttributes {
@@ -2142,6 +2165,29 @@ export namespace JSX {
   interface AnimationElementSVGAttributes<T>
     extends SVGAttributes<T>, ExternalResourceSVGAttributes, ConditionalProcessingSVGAttributes {
     onBegin?: EventHandlerUnion<T, TimeEvent> | undefined;
+    onEnd?: EventHandlerUnion<T, TimeEvent> | undefined;
+    onRepeat?: EventHandlerUnion<T, TimeEvent> | undefined;
+  }
+
+  interface ContainerElementSVGAttributes<T>
+    extends
+      SVGAttributes<T>,
+      ShapeElementSVGAttributes<T>,
+      Pick<
+        PresentationSVGAttributes,
+        | "clip-path"
+        | "mask"
+        | "cursor"
+        | "opacity"
+        | "filter"
+        | "enable-background"
+        | "color-interpolation"
+        | "color-rendering"
+      > {}
+
+  interface FilterPrimitiveElementSVGAttributes<T>
+    extends SVGAttributes<T>, Pick<PresentationSVGAttributes, "color-interpolation-filters"> {
+    height?: FunctionMaybe<number | string | RemoveAttribute>;
     result?: FunctionMaybe<string | RemoveAttribute>;
     width?: FunctionMaybe<number | string | RemoveAttribute>;
     x?: FunctionMaybe<number | string | RemoveAttribute>;

package/jsx-runtime/types-cjs/jsx-properties.d.cts

@@ -31,6 +31,7 @@ export type PropValue =
   | MediaSource
   | Blob
   | File
+  | Date
   | Element;
 
 /**

package/jsx-runtime/types-cjs/jsx.d.cts

@@ -219,9 +219,14 @@ export namespace JSX {
   >;
   // end event handlers
 
-  type ClassList =
+  export type ClassValue =
+    | string
+    | number
+    | boolean
+    | null
+    | undefined
     | Record<string, boolean>
-    | Array<string | number | boolean | null | undefined | Record<string, boolean>>;
+    | ClassValue[];
 
   const SERIALIZABLE: unique symbol;
   interface SerializableAttributeValue {
@@ -264,11 +269,6 @@ export namespace JSX {
 
   // TODO: Should we allow this?
   // type ClassKeys = `class:${string}`;
-  // type CSSKeys = Exclude<keyof csstype.PropertiesHyphen, `-${string}`>;
-
-  // type CSSAttributes = {
-  //   [key in CSSKeys as `style:${key}`]: csstype.PropertiesHyphen[key];
-  // };
 
   // BOOLEAN
 
@@ -850,6 +850,20 @@ export namespace JSX {
         : never)
     | (string & {});
 
+  type ExtractEventType<T> = {
+    [K in keyof T as K extends `on${infer Name}` ? Name : never]: T[K] extends EventHandlerUnion<
+      Element,
+      infer E
+    >
+      ? E
+      : never;
+  };
+
+  // EventType["click"] = MouseEvent
+
+  type EventType = ExtractEventType<EventHandlersElement<Element>> &
+    ExtractEventType<EventHandlersWindow<Element>>;
+
   // GLOBAL ATTRIBUTES
 
   /**
@@ -881,7 +895,7 @@ export namespace JSX {
      * with reactive values directly; manually-built strings re-run the whole
      * concatenation on every change instead of toggling the affected classes.
      */
-    class?: FunctionMaybe<string | ClassList | RemoveAttribute>;
+    class?: FunctionMaybe<ClassValue | RemoveAttribute>;
     elementtiming?: FunctionMaybe<string | RemoveAttribute>;
     id?: FunctionMaybe<string | RemoveAttribute>;
     nonce?: FunctionMaybe<string | RemoveAttribute>;
@@ -1528,6 +1542,10 @@ export namespace JSX {
     src?: FunctionMaybe<string | RemoveAttribute>;
 
     onEncrypted?: EventHandlerUnion<T, MediaEncryptedEvent> | undefined;
+    onWaitingForKey?: EventHandlerUnion<T, Event> | undefined;
+
+    /** @deprecated */
+    mediagroup?: FunctionMaybe<string | RemoveAttribute>;
 
     // special cases locked to properties
 
@@ -1866,6 +1884,11 @@ export namespace JSX {
     width?: FunctionMaybe<number | string | RemoveAttribute>;
 
     onEnterPictureInPicture?: EventHandlerUnion<T, PictureInPictureEvent> | undefined;
+    onLeavePictureInPicture?: EventHandlerUnion<T, PictureInPictureEvent> | undefined;
+  }
+
+  interface WebViewHTMLAttributes<T> extends HTMLAttributes<T> {
+    allowpopups?: FunctionMaybe<BooleanAttribute | RemoveAttribute>;
     disableblinkfeatures?: FunctionMaybe<string | RemoveAttribute>;
     disablewebsecurity?: FunctionMaybe<BooleanAttribute | RemoveAttribute>;
     enableblinkfeatures?: FunctionMaybe<string | RemoveAttribute>;
@@ -1968,7 +1991,7 @@ export namespace JSX {
      * with reactive values directly; manually-built strings re-run the whole
      * concatenation on every change instead of toggling the affected classes.
      */
-    class?: FunctionMaybe<string | ClassList | RemoveAttribute>;
+    class?: FunctionMaybe<ClassValue | RemoveAttribute>;
     style?: FunctionMaybe<CSSProperties | string | RemoveAttribute>;
   }
   interface TransformableSVGAttributes {
@@ -2142,6 +2165,29 @@ export namespace JSX {
   interface AnimationElementSVGAttributes<T>
     extends SVGAttributes<T>, ExternalResourceSVGAttributes, ConditionalProcessingSVGAttributes {
     onBegin?: EventHandlerUnion<T, TimeEvent> | undefined;
+    onEnd?: EventHandlerUnion<T, TimeEvent> | undefined;
+    onRepeat?: EventHandlerUnion<T, TimeEvent> | undefined;
+  }
+
+  interface ContainerElementSVGAttributes<T>
+    extends
+      SVGAttributes<T>,
+      ShapeElementSVGAttributes<T>,
+      Pick<
+        PresentationSVGAttributes,
+        | "clip-path"
+        | "mask"
+        | "cursor"
+        | "opacity"
+        | "filter"
+        | "enable-background"
+        | "color-interpolation"
+        | "color-rendering"
+      > {}
+
+  interface FilterPrimitiveElementSVGAttributes<T>
+    extends SVGAttributes<T>, Pick<PresentationSVGAttributes, "color-interpolation-filters"> {
+    height?: FunctionMaybe<number | string | RemoveAttribute>;
     result?: FunctionMaybe<string | RemoveAttribute>;
     width?: FunctionMaybe<number | string | RemoveAttribute>;
     x?: FunctionMaybe<number | string | RemoveAttribute>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@solidjs/h",
   "description": "Hyperscript / h() factory for Solid — write components without compiled JSX.",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.15",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -63,11 +63,11 @@
     "./types/*": "./types/*"
   },
   "peerDependencies": {
-    "@solidjs/web": "^2.0.0-beta.13"
+    "@solidjs/web": "^2.0.0-beta.15"
   },
   "devDependencies": {
-    "@solidjs/web": "2.0.0-beta.13",
-    "solid-js": "2.0.0-beta.13"
+    "solid-js": "2.0.0-beta.15",
+    "@solidjs/web": "2.0.0-beta.15"
   },
   "scripts": {
     "build": "npm-run-all -nl build:clean types:copy build:js",