@solidjs/html 2.0.0-beta.12 → 2.0.0-beta.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@solidjs/html",
   "description": "Tagged-template-literal templating for Solid — write components with no build step.",
-  "version": "2.0.0-beta.12",
+  "version": "2.0.0-beta.13",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -37,11 +37,11 @@
     }
   },
   "peerDependencies": {
-    "@solidjs/web": "^2.0.0-beta.12"
+    "@solidjs/web": "^2.0.0-beta.13"
   },
   "devDependencies": {
-    "@solidjs/web": "2.0.0-beta.12",
-    "solid-js": "2.0.0-beta.12"
+    "@solidjs/web": "2.0.0-beta.13",
+    "solid-js": "2.0.0-beta.13"
   },
   "scripts": {
     "build": "npm-run-all -nl build:*",

package/types/sld.d.ts

@@ -9360,10 +9360,9 @@ type PropKey<T, K extends keyof T> = K extends keyof SkipPropsFrom ? never : K e
  *
  * - Event handlers use `camelCase` such `onClick` and will be delegated when possible, bubbling
  *   through the component tree, not the dom tree.
- * - Native event handlers use the namespace `on:` such `on:click`, and wont be delegated. bubbling
- *   the dom tree.
+ * - Event handlers use camelCase attributes; native listener options should be handled with `ref`
+ *   callbacks that call `addEventListener` directly.
  * - A global case-insensitive event handler can be added by extending `EventHandlersElement<T>`
- * - A native `on:` event handler can be added by extending `CustomEvents<T>` interface
  *
  * ## Boolean Attributes (property setter that accepts `true | false`):
  *
@@ -9479,10 +9478,6 @@ declare namespace JSX {
     1: any;
   }
   type EventHandlerUnion<T, E extends Event, EHandler extends EventHandler<T, any> = EventHandler<T, E>> = EHandler | BoundEventHandler<T, E, EHandler>;
-  interface EventHandlerWithOptions<T, E extends Event, EHandler = EventHandler<T, E>> extends AddEventListenerOptions, EventListenerOptions {
-    handleEvent: EHandler;
-  }
-  type EventHandlerWithOptionsUnion<T, E extends Event, EHandler extends EventHandler<T, any> = EventHandler<T, E>> = EHandler | EventHandlerWithOptions<T, E, EHandler>;
   interface InputEventHandler<T, E extends InputEvent> {
     (e: E & {
       currentTarget: T;
@@ -9521,9 +9516,7 @@ declare namespace JSX {
     $ServerOnly?: boolean | undefined;
   }
   interface ExplicitProperties {}
-  interface CustomEvents {}
   type PropAttributes = { [Key in keyof ExplicitProperties as `prop:${Key}`]?: ExplicitProperties[Key] };
-  type OnAttributes<T> = { [Key in keyof CustomEvents as `on:${Key}`]?: EventHandlerWithOptionsUnion<T, CustomEvents[Key]> };
   /**
    * Writable, element-specific DOM properties exposed as `prop:*` attributes, auto-derived
    * from the element interface `T`. See `./jsx-properties.d.ts` for the filtering rules.
@@ -9870,31 +9863,7 @@ declare namespace JSX {
     onStorage?: EventHandlerUnion<T, StorageEvent> | undefined;
     onUnhandledRejection?: EventHandlerUnion<T, PromiseRejectionEvent> | undefined;
     onUnload?: EventHandlerUnion<T, Event> | undefined;
-    "on:afterprint"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:beforeprint"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:beforeunload"?: EventHandlerWithOptionsUnion<T, BeforeUnloadEvent> | undefined;
-    "on:devicemotion"?: EventHandlerWithOptionsUnion<T, DeviceMotionEvent> | undefined;
-    "on:deviceorientation"?: EventHandlerWithOptionsUnion<T, DeviceOrientationEvent> | undefined;
-    "on:deviceorientationabsolute"?: EventHandlerWithOptionsUnion<T, DeviceOrientationEvent> | undefined;
-    "on:gamepadconnected"?: EventHandlerWithOptionsUnion<T, GamepadEvent> | undefined;
-    "on:gamepaddisconnected"?: EventHandlerWithOptionsUnion<T, GamepadEvent> | undefined;
-    "on:hashchange"?: EventHandlerWithOptionsUnion<T, HashChangeEvent> | undefined;
-    "on:languagechange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:message"?: EventHandlerWithOptionsUnion<T, MessageEvent> | undefined;
-    "on:messageerror"?: EventHandlerWithOptionsUnion<T, MessageEvent> | undefined;
-    "on:offline"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:online"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
     /** @deprecated Use `screen.orientation` (`ScreenOrientation.change`) instead. */
-    "on:orientationchange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:pagehide"?: EventHandlerWithOptionsUnion<T, PageTransitionEvent> | undefined;
-    "on:pagereveal"?: EventHandlerWithOptionsUnion<T, PageRevealEvent> | undefined;
-    "on:pageshow"?: EventHandlerWithOptionsUnion<T, PageTransitionEvent> | undefined;
-    "on:pageswap"?: EventHandlerWithOptionsUnion<T, PageSwapEvent> | undefined;
-    "on:popstate"?: EventHandlerWithOptionsUnion<T, PopStateEvent> | undefined;
-    "on:rejectionhandled"?: EventHandlerWithOptionsUnion<T, PromiseRejectionEvent> | undefined;
-    "on:storage"?: EventHandlerWithOptionsUnion<T, StorageEvent> | undefined;
-    "on:unhandledrejection"?: EventHandlerWithOptionsUnion<T, PromiseRejectionEvent> | undefined;
-    "on:unload"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
   }
   /**
    * Global `EventHandlersElement`, defined for all tags.
@@ -10017,129 +9986,15 @@ declare namespace JSX {
     onVolumeChange?: EventHandlerUnion<T, Event> | undefined;
     onWaiting?: EventHandlerUnion<T, Event> | undefined;
     onWheel?: EventHandlerUnion<T, WheelEvent> | undefined;
-    "on:abort"?: EventHandlerWithOptionsUnion<T, UIEvent> | undefined;
-    "on:animationcancel"?: EventHandlerWithOptionsUnion<T, AnimationEvent> | undefined;
-    "on:animationend"?: EventHandlerWithOptionsUnion<T, AnimationEvent> | undefined;
-    "on:animationiteration"?: EventHandlerWithOptionsUnion<T, AnimationEvent> | undefined;
-    "on:animationstart"?: EventHandlerWithOptionsUnion<T, AnimationEvent> | undefined;
-    "on:auxclick"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:beforecopy"?: EventHandlerWithOptionsUnion<T, ClipboardEvent> | undefined;
-    "on:beforecut"?: EventHandlerWithOptionsUnion<T, ClipboardEvent> | undefined;
-    "on:beforeinput"?: EventHandlerWithOptionsUnion<T, InputEvent, InputEventHandler<T, InputEvent>> | undefined;
-    "on:beforematch"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:beforepaste"?: EventHandlerWithOptionsUnion<T, ClipboardEvent> | undefined;
-    "on:beforetoggle"?: EventHandlerWithOptionsUnion<T, ToggleEvent> | undefined;
-    "on:beforexrselect"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:blur"?: EventHandlerWithOptionsUnion<T, FocusEvent, FocusEventHandler<T, FocusEvent>> | undefined;
-    "on:cancel"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:canplay"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:canplaythrough"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:change"?: EventHandlerWithOptionsUnion<T, Event, ChangeEventHandler<T, Event>> | undefined;
-    "on:click"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:close"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:command"?: EventHandlerWithOptionsUnion<T, CommandEvent> | undefined;
-    "on:compositionend"?: EventHandlerWithOptionsUnion<T, CompositionEvent> | undefined;
-    "on:compositionstart"?: EventHandlerWithOptionsUnion<T, CompositionEvent> | undefined;
-    "on:compositionupdate"?: EventHandlerWithOptionsUnion<T, CompositionEvent> | undefined;
-    "on:contentvisibilityautostatechange"?: EventHandlerWithOptionsUnion<T, ContentVisibilityAutoStateChangeEvent> | undefined;
-    "on:contextlost"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:contextmenu"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:contextrestored"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:copy"?: EventHandlerWithOptionsUnion<T, ClipboardEvent> | undefined;
-    "on:cuechange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:cut"?: EventHandlerWithOptionsUnion<T, ClipboardEvent> | undefined;
-    "on:dblclick"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:drag"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:dragend"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:dragenter"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:dragexit"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:dragleave"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:dragover"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:dragstart"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:drop"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:durationchange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:emptied"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:ended"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:error"?: EventHandlerWithOptionsUnion<T, ErrorEvent> | undefined;
-    "on:focus"?: EventHandlerWithOptionsUnion<T, FocusEvent, FocusEventHandler<T, FocusEvent>> | undefined;
-    "on:focusin"?: EventHandlerWithOptionsUnion<T, FocusEvent, FocusEventHandler<T, FocusEvent>> | undefined;
-    "on:focusout"?: EventHandlerWithOptionsUnion<T, FocusEvent, FocusEventHandler<T, FocusEvent>> | undefined;
-    "on:formdata"?: EventHandlerWithOptionsUnion<T, FormDataEvent> | undefined;
-    "on:fullscreenchange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:fullscreenerror"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:gotpointercapture"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:input"?: EventHandlerWithOptionsUnion<T, InputEvent, InputEventHandler<T, InputEvent>> | undefined;
-    "on:invalid"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:keydown"?: EventHandlerWithOptionsUnion<T, KeyboardEvent> | undefined;
-    "on:keypress"?: EventHandlerWithOptionsUnion<T, KeyboardEvent> | undefined;
-    "on:keyup"?: EventHandlerWithOptionsUnion<T, KeyboardEvent> | undefined;
-    "on:load"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:loadeddata"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:loadedmetadata"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:loadstart"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:lostpointercapture"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:mousedown"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:mouseenter"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:mouseleave"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:mousemove"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:mouseout"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:mouseover"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:mouseup"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:paste"?: EventHandlerWithOptionsUnion<T, ClipboardEvent> | undefined;
-    "on:pause"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:play"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:playing"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:pointercancel"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointerdown"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointerenter"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointerleave"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointermove"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointerout"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointerover"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointerrawupdate"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointerup"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:progress"?: EventHandlerWithOptionsUnion<T, ProgressEvent> | undefined;
-    "on:ratechange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:reset"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:resize"?: EventHandlerWithOptionsUnion<T, UIEvent> | undefined;
-    "on:scroll"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:scrollend"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:scrollsnapchange"?: EventHandlerWithOptionsUnion<T, SnapEvent> | undefined;
-    "on:scrollsnapchanging"?: EventHandlerWithOptionsUnion<T, SnapEvent> | undefined;
-    "on:securitypolicyviolation"?: EventHandlerWithOptionsUnion<T, SecurityPolicyViolationEvent> | undefined;
-    "on:seeked"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:seeking"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:select"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:selectionchange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:selectstart"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:slotchange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:stalled"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:submit"?: EventHandlerWithOptionsUnion<T, SubmitEvent> | undefined;
-    "on:suspend"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:timeupdate"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:toggle"?: EventHandlerWithOptionsUnion<T, ToggleEvent> | undefined;
-    "on:touchcancel"?: EventHandlerWithOptionsUnion<T, TouchEvent> | undefined;
-    "on:touchend"?: EventHandlerWithOptionsUnion<T, TouchEvent> | undefined;
-    "on:touchmove"?: EventHandlerWithOptionsUnion<T, TouchEvent> | undefined;
-    "on:touchstart"?: EventHandlerWithOptionsUnion<T, TouchEvent> | undefined;
-    "on:transitioncancel"?: EventHandlerWithOptionsUnion<T, TransitionEvent> | undefined;
-    "on:transitionend"?: EventHandlerWithOptionsUnion<T, TransitionEvent> | undefined;
-    "on:transitionrun"?: EventHandlerWithOptionsUnion<T, TransitionEvent> | undefined;
-    "on:transitionstart"?: EventHandlerWithOptionsUnion<T, TransitionEvent> | undefined;
-    "on:volumechange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:waiting"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:wheel"?: EventHandlerWithOptionsUnion<T, WheelEvent> | undefined;
   } // EventName = "click" | "mousedown" ...
-  type EventName = (keyof EventHandlersWindow<any> extends infer K ? K extends `on:${infer T}` ? T : K extends `on${infer T}` ? Lowercase<T> : never : never) | (keyof EventHandlersElement<any> extends infer K ? K extends `on:${infer T}` ? T : K extends `on${infer T}` ? Lowercase<T> : never : never) | (string & {});
-  type ExtractEventType<T> = { [K in keyof T as K extends `on:${infer Name}` ? Name : never]: T[K] extends EventHandlerWithOptionsUnion<Element, infer E> ? E : never }; // EventType["click"] = MouseEvent
-  type EventType = ExtractEventType<EventHandlersElement<Element>> & ExtractEventType<EventHandlersWindow<Element>>; // GLOBAL ATTRIBUTES
+  type EventName = (keyof EventHandlersWindow<any> extends infer K ? K extends `on${infer T}` ? Lowercase<T> : never : never) | (keyof EventHandlersElement<any> extends infer K ? K extends `on${infer T}` ? Lowercase<T> : never : never) | (string & {}); // GLOBAL ATTRIBUTES
   /**
    * Global `Element` + `Node` interface keys, shared by all tags regardless of their namespace:
    *
    * 1. That's `keys` that are defined BY ALL `HTMLElement/SVGElement/MathMLElement` interfaces.
    * 2. Includes `keys` defined by `Element` and `Node` interfaces.
    */
-  interface ElementAttributes<T> extends CustomAttributes<T>, PropAttributes, OnAttributes<T>, EventHandlersElement<T>, AriaAttributes {
+  interface ElementAttributes<T> extends CustomAttributes<T>, PropAttributes, EventHandlersElement<T>, AriaAttributes {
     // [key: ClassKeys]: boolean;
     // properties
     innerHTML?: string;
@@ -10600,12 +10455,7 @@ declare namespace JSX {
     loop?: BooleanAttribute | RemoveAttribute;
     preload?: "none" | "metadata" | "auto" | EnumeratedAcceptsEmpty | RemoveAttribute;
     src?: string | RemoveAttribute;
-    onEncrypted?: EventHandlerUnion<T, MediaEncryptedEvent> | undefined;
-    "on:encrypted"?: EventHandlerWithOptionsUnion<T, MediaEncryptedEvent> | undefined;
-    onWaitingForKey?: EventHandlerUnion<T, Event> | undefined;
-    "on:waitingforkey"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    /** @deprecated */
-    mediagroup?: string | RemoveAttribute; // special cases locked to properties
+    onEncrypted?: EventHandlerUnion<T, MediaEncryptedEvent> | undefined; // special cases locked to properties
     muted?: BooleanProperty | RemoveProperty;
     /** @error use `<video/audio muted={..}/>` instead */
     "prop:muted"?: never;
@@ -10888,12 +10738,6 @@ declare namespace JSX {
     poster?: string | RemoveAttribute;
     width?: number | string | RemoveAttribute;
     onEnterPictureInPicture?: EventHandlerUnion<T, PictureInPictureEvent> | undefined;
-    "on:enterpictureinpicture"?: EventHandlerWithOptionsUnion<T, PictureInPictureEvent> | undefined;
-    onLeavePictureInPicture?: EventHandlerUnion<T, PictureInPictureEvent> | undefined;
-    "on:leavepictureinpicture"?: EventHandlerWithOptionsUnion<T, PictureInPictureEvent> | undefined;
-  }
-  interface WebViewHTMLAttributes<T> extends HTMLAttributes<T> {
-    allowpopups?: BooleanAttribute | RemoveAttribute;
     disableblinkfeatures?: string | RemoveAttribute;
     disablewebsecurity?: BooleanAttribute | RemoveAttribute;
     enableblinkfeatures?: string | RemoveAttribute;
@@ -11039,15 +10883,6 @@ declare namespace JSX {
   }
   interface AnimationElementSVGAttributes<T> extends SVGAttributes<T>, ExternalResourceSVGAttributes, ConditionalProcessingSVGAttributes {
     onBegin?: EventHandlerUnion<T, TimeEvent> | undefined;
-    "on:begin"?: EventHandlerWithOptionsUnion<T, TimeEvent> | undefined;
-    onEnd?: EventHandlerUnion<T, TimeEvent> | undefined;
-    "on:end"?: EventHandlerWithOptionsUnion<T, TimeEvent> | undefined;
-    onRepeat?: EventHandlerUnion<T, TimeEvent> | undefined;
-    "on:repeat"?: EventHandlerWithOptionsUnion<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?: number | string | RemoveAttribute;
     result?: string | RemoveAttribute;
     width?: number | string | RemoveAttribute;
     x?: number | string | RemoveAttribute;

package/types-cjs/sld.d.cts

@@ -9360,10 +9360,9 @@ type PropKey<T, K extends keyof T> = K extends keyof SkipPropsFrom ? never : K e
  *
  * - Event handlers use `camelCase` such `onClick` and will be delegated when possible, bubbling
  *   through the component tree, not the dom tree.
- * - Native event handlers use the namespace `on:` such `on:click`, and wont be delegated. bubbling
- *   the dom tree.
+ * - Event handlers use camelCase attributes; native listener options should be handled with `ref`
+ *   callbacks that call `addEventListener` directly.
  * - A global case-insensitive event handler can be added by extending `EventHandlersElement<T>`
- * - A native `on:` event handler can be added by extending `CustomEvents<T>` interface
  *
  * ## Boolean Attributes (property setter that accepts `true | false`):
  *
@@ -9479,10 +9478,6 @@ declare namespace JSX {
     1: any;
   }
   type EventHandlerUnion<T, E extends Event, EHandler extends EventHandler<T, any> = EventHandler<T, E>> = EHandler | BoundEventHandler<T, E, EHandler>;
-  interface EventHandlerWithOptions<T, E extends Event, EHandler = EventHandler<T, E>> extends AddEventListenerOptions, EventListenerOptions {
-    handleEvent: EHandler;
-  }
-  type EventHandlerWithOptionsUnion<T, E extends Event, EHandler extends EventHandler<T, any> = EventHandler<T, E>> = EHandler | EventHandlerWithOptions<T, E, EHandler>;
   interface InputEventHandler<T, E extends InputEvent> {
     (e: E & {
       currentTarget: T;
@@ -9521,9 +9516,7 @@ declare namespace JSX {
     $ServerOnly?: boolean | undefined;
   }
   interface ExplicitProperties {}
-  interface CustomEvents {}
   type PropAttributes = { [Key in keyof ExplicitProperties as `prop:${Key}`]?: ExplicitProperties[Key] };
-  type OnAttributes<T> = { [Key in keyof CustomEvents as `on:${Key}`]?: EventHandlerWithOptionsUnion<T, CustomEvents[Key]> };
   /**
    * Writable, element-specific DOM properties exposed as `prop:*` attributes, auto-derived
    * from the element interface `T`. See `./jsx-properties.d.ts` for the filtering rules.
@@ -9870,31 +9863,7 @@ declare namespace JSX {
     onStorage?: EventHandlerUnion<T, StorageEvent> | undefined;
     onUnhandledRejection?: EventHandlerUnion<T, PromiseRejectionEvent> | undefined;
     onUnload?: EventHandlerUnion<T, Event> | undefined;
-    "on:afterprint"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:beforeprint"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:beforeunload"?: EventHandlerWithOptionsUnion<T, BeforeUnloadEvent> | undefined;
-    "on:devicemotion"?: EventHandlerWithOptionsUnion<T, DeviceMotionEvent> | undefined;
-    "on:deviceorientation"?: EventHandlerWithOptionsUnion<T, DeviceOrientationEvent> | undefined;
-    "on:deviceorientationabsolute"?: EventHandlerWithOptionsUnion<T, DeviceOrientationEvent> | undefined;
-    "on:gamepadconnected"?: EventHandlerWithOptionsUnion<T, GamepadEvent> | undefined;
-    "on:gamepaddisconnected"?: EventHandlerWithOptionsUnion<T, GamepadEvent> | undefined;
-    "on:hashchange"?: EventHandlerWithOptionsUnion<T, HashChangeEvent> | undefined;
-    "on:languagechange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:message"?: EventHandlerWithOptionsUnion<T, MessageEvent> | undefined;
-    "on:messageerror"?: EventHandlerWithOptionsUnion<T, MessageEvent> | undefined;
-    "on:offline"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:online"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
     /** @deprecated Use `screen.orientation` (`ScreenOrientation.change`) instead. */
-    "on:orientationchange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:pagehide"?: EventHandlerWithOptionsUnion<T, PageTransitionEvent> | undefined;
-    "on:pagereveal"?: EventHandlerWithOptionsUnion<T, PageRevealEvent> | undefined;
-    "on:pageshow"?: EventHandlerWithOptionsUnion<T, PageTransitionEvent> | undefined;
-    "on:pageswap"?: EventHandlerWithOptionsUnion<T, PageSwapEvent> | undefined;
-    "on:popstate"?: EventHandlerWithOptionsUnion<T, PopStateEvent> | undefined;
-    "on:rejectionhandled"?: EventHandlerWithOptionsUnion<T, PromiseRejectionEvent> | undefined;
-    "on:storage"?: EventHandlerWithOptionsUnion<T, StorageEvent> | undefined;
-    "on:unhandledrejection"?: EventHandlerWithOptionsUnion<T, PromiseRejectionEvent> | undefined;
-    "on:unload"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
   }
   /**
    * Global `EventHandlersElement`, defined for all tags.
@@ -10017,129 +9986,15 @@ declare namespace JSX {
     onVolumeChange?: EventHandlerUnion<T, Event> | undefined;
     onWaiting?: EventHandlerUnion<T, Event> | undefined;
     onWheel?: EventHandlerUnion<T, WheelEvent> | undefined;
-    "on:abort"?: EventHandlerWithOptionsUnion<T, UIEvent> | undefined;
-    "on:animationcancel"?: EventHandlerWithOptionsUnion<T, AnimationEvent> | undefined;
-    "on:animationend"?: EventHandlerWithOptionsUnion<T, AnimationEvent> | undefined;
-    "on:animationiteration"?: EventHandlerWithOptionsUnion<T, AnimationEvent> | undefined;
-    "on:animationstart"?: EventHandlerWithOptionsUnion<T, AnimationEvent> | undefined;
-    "on:auxclick"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:beforecopy"?: EventHandlerWithOptionsUnion<T, ClipboardEvent> | undefined;
-    "on:beforecut"?: EventHandlerWithOptionsUnion<T, ClipboardEvent> | undefined;
-    "on:beforeinput"?: EventHandlerWithOptionsUnion<T, InputEvent, InputEventHandler<T, InputEvent>> | undefined;
-    "on:beforematch"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:beforepaste"?: EventHandlerWithOptionsUnion<T, ClipboardEvent> | undefined;
-    "on:beforetoggle"?: EventHandlerWithOptionsUnion<T, ToggleEvent> | undefined;
-    "on:beforexrselect"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:blur"?: EventHandlerWithOptionsUnion<T, FocusEvent, FocusEventHandler<T, FocusEvent>> | undefined;
-    "on:cancel"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:canplay"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:canplaythrough"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:change"?: EventHandlerWithOptionsUnion<T, Event, ChangeEventHandler<T, Event>> | undefined;
-    "on:click"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:close"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:command"?: EventHandlerWithOptionsUnion<T, CommandEvent> | undefined;
-    "on:compositionend"?: EventHandlerWithOptionsUnion<T, CompositionEvent> | undefined;
-    "on:compositionstart"?: EventHandlerWithOptionsUnion<T, CompositionEvent> | undefined;
-    "on:compositionupdate"?: EventHandlerWithOptionsUnion<T, CompositionEvent> | undefined;
-    "on:contentvisibilityautostatechange"?: EventHandlerWithOptionsUnion<T, ContentVisibilityAutoStateChangeEvent> | undefined;
-    "on:contextlost"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:contextmenu"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:contextrestored"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:copy"?: EventHandlerWithOptionsUnion<T, ClipboardEvent> | undefined;
-    "on:cuechange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:cut"?: EventHandlerWithOptionsUnion<T, ClipboardEvent> | undefined;
-    "on:dblclick"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:drag"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:dragend"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:dragenter"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:dragexit"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:dragleave"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:dragover"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:dragstart"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:drop"?: EventHandlerWithOptionsUnion<T, DragEvent> | undefined;
-    "on:durationchange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:emptied"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:ended"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:error"?: EventHandlerWithOptionsUnion<T, ErrorEvent> | undefined;
-    "on:focus"?: EventHandlerWithOptionsUnion<T, FocusEvent, FocusEventHandler<T, FocusEvent>> | undefined;
-    "on:focusin"?: EventHandlerWithOptionsUnion<T, FocusEvent, FocusEventHandler<T, FocusEvent>> | undefined;
-    "on:focusout"?: EventHandlerWithOptionsUnion<T, FocusEvent, FocusEventHandler<T, FocusEvent>> | undefined;
-    "on:formdata"?: EventHandlerWithOptionsUnion<T, FormDataEvent> | undefined;
-    "on:fullscreenchange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:fullscreenerror"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:gotpointercapture"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:input"?: EventHandlerWithOptionsUnion<T, InputEvent, InputEventHandler<T, InputEvent>> | undefined;
-    "on:invalid"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:keydown"?: EventHandlerWithOptionsUnion<T, KeyboardEvent> | undefined;
-    "on:keypress"?: EventHandlerWithOptionsUnion<T, KeyboardEvent> | undefined;
-    "on:keyup"?: EventHandlerWithOptionsUnion<T, KeyboardEvent> | undefined;
-    "on:load"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:loadeddata"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:loadedmetadata"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:loadstart"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:lostpointercapture"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:mousedown"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:mouseenter"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:mouseleave"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:mousemove"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:mouseout"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:mouseover"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:mouseup"?: EventHandlerWithOptionsUnion<T, MouseEvent> | undefined;
-    "on:paste"?: EventHandlerWithOptionsUnion<T, ClipboardEvent> | undefined;
-    "on:pause"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:play"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:playing"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:pointercancel"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointerdown"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointerenter"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointerleave"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointermove"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointerout"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointerover"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointerrawupdate"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:pointerup"?: EventHandlerWithOptionsUnion<T, PointerEvent> | undefined;
-    "on:progress"?: EventHandlerWithOptionsUnion<T, ProgressEvent> | undefined;
-    "on:ratechange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:reset"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:resize"?: EventHandlerWithOptionsUnion<T, UIEvent> | undefined;
-    "on:scroll"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:scrollend"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:scrollsnapchange"?: EventHandlerWithOptionsUnion<T, SnapEvent> | undefined;
-    "on:scrollsnapchanging"?: EventHandlerWithOptionsUnion<T, SnapEvent> | undefined;
-    "on:securitypolicyviolation"?: EventHandlerWithOptionsUnion<T, SecurityPolicyViolationEvent> | undefined;
-    "on:seeked"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:seeking"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:select"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:selectionchange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:selectstart"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:slotchange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:stalled"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:submit"?: EventHandlerWithOptionsUnion<T, SubmitEvent> | undefined;
-    "on:suspend"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:timeupdate"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:toggle"?: EventHandlerWithOptionsUnion<T, ToggleEvent> | undefined;
-    "on:touchcancel"?: EventHandlerWithOptionsUnion<T, TouchEvent> | undefined;
-    "on:touchend"?: EventHandlerWithOptionsUnion<T, TouchEvent> | undefined;
-    "on:touchmove"?: EventHandlerWithOptionsUnion<T, TouchEvent> | undefined;
-    "on:touchstart"?: EventHandlerWithOptionsUnion<T, TouchEvent> | undefined;
-    "on:transitioncancel"?: EventHandlerWithOptionsUnion<T, TransitionEvent> | undefined;
-    "on:transitionend"?: EventHandlerWithOptionsUnion<T, TransitionEvent> | undefined;
-    "on:transitionrun"?: EventHandlerWithOptionsUnion<T, TransitionEvent> | undefined;
-    "on:transitionstart"?: EventHandlerWithOptionsUnion<T, TransitionEvent> | undefined;
-    "on:volumechange"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:waiting"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    "on:wheel"?: EventHandlerWithOptionsUnion<T, WheelEvent> | undefined;
   } // EventName = "click" | "mousedown" ...
-  type EventName = (keyof EventHandlersWindow<any> extends infer K ? K extends `on:${infer T}` ? T : K extends `on${infer T}` ? Lowercase<T> : never : never) | (keyof EventHandlersElement<any> extends infer K ? K extends `on:${infer T}` ? T : K extends `on${infer T}` ? Lowercase<T> : never : never) | (string & {});
-  type ExtractEventType<T> = { [K in keyof T as K extends `on:${infer Name}` ? Name : never]: T[K] extends EventHandlerWithOptionsUnion<Element, infer E> ? E : never }; // EventType["click"] = MouseEvent
-  type EventType = ExtractEventType<EventHandlersElement<Element>> & ExtractEventType<EventHandlersWindow<Element>>; // GLOBAL ATTRIBUTES
+  type EventName = (keyof EventHandlersWindow<any> extends infer K ? K extends `on${infer T}` ? Lowercase<T> : never : never) | (keyof EventHandlersElement<any> extends infer K ? K extends `on${infer T}` ? Lowercase<T> : never : never) | (string & {}); // GLOBAL ATTRIBUTES
   /**
    * Global `Element` + `Node` interface keys, shared by all tags regardless of their namespace:
    *
    * 1. That's `keys` that are defined BY ALL `HTMLElement/SVGElement/MathMLElement` interfaces.
    * 2. Includes `keys` defined by `Element` and `Node` interfaces.
    */
-  interface ElementAttributes<T> extends CustomAttributes<T>, PropAttributes, OnAttributes<T>, EventHandlersElement<T>, AriaAttributes {
+  interface ElementAttributes<T> extends CustomAttributes<T>, PropAttributes, EventHandlersElement<T>, AriaAttributes {
     // [key: ClassKeys]: boolean;
     // properties
     innerHTML?: string;
@@ -10600,12 +10455,7 @@ declare namespace JSX {
     loop?: BooleanAttribute | RemoveAttribute;
     preload?: "none" | "metadata" | "auto" | EnumeratedAcceptsEmpty | RemoveAttribute;
     src?: string | RemoveAttribute;
-    onEncrypted?: EventHandlerUnion<T, MediaEncryptedEvent> | undefined;
-    "on:encrypted"?: EventHandlerWithOptionsUnion<T, MediaEncryptedEvent> | undefined;
-    onWaitingForKey?: EventHandlerUnion<T, Event> | undefined;
-    "on:waitingforkey"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
-    /** @deprecated */
-    mediagroup?: string | RemoveAttribute; // special cases locked to properties
+    onEncrypted?: EventHandlerUnion<T, MediaEncryptedEvent> | undefined; // special cases locked to properties
     muted?: BooleanProperty | RemoveProperty;
     /** @error use `<video/audio muted={..}/>` instead */
     "prop:muted"?: never;
@@ -10888,12 +10738,6 @@ declare namespace JSX {
     poster?: string | RemoveAttribute;
     width?: number | string | RemoveAttribute;
     onEnterPictureInPicture?: EventHandlerUnion<T, PictureInPictureEvent> | undefined;
-    "on:enterpictureinpicture"?: EventHandlerWithOptionsUnion<T, PictureInPictureEvent> | undefined;
-    onLeavePictureInPicture?: EventHandlerUnion<T, PictureInPictureEvent> | undefined;
-    "on:leavepictureinpicture"?: EventHandlerWithOptionsUnion<T, PictureInPictureEvent> | undefined;
-  }
-  interface WebViewHTMLAttributes<T> extends HTMLAttributes<T> {
-    allowpopups?: BooleanAttribute | RemoveAttribute;
     disableblinkfeatures?: string | RemoveAttribute;
     disablewebsecurity?: BooleanAttribute | RemoveAttribute;
     enableblinkfeatures?: string | RemoveAttribute;
@@ -11039,15 +10883,6 @@ declare namespace JSX {
   }
   interface AnimationElementSVGAttributes<T> extends SVGAttributes<T>, ExternalResourceSVGAttributes, ConditionalProcessingSVGAttributes {
     onBegin?: EventHandlerUnion<T, TimeEvent> | undefined;
-    "on:begin"?: EventHandlerWithOptionsUnion<T, TimeEvent> | undefined;
-    onEnd?: EventHandlerUnion<T, TimeEvent> | undefined;
-    "on:end"?: EventHandlerWithOptionsUnion<T, TimeEvent> | undefined;
-    onRepeat?: EventHandlerUnion<T, TimeEvent> | undefined;
-    "on:repeat"?: EventHandlerWithOptionsUnion<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?: number | string | RemoveAttribute;
     result?: string | RemoveAttribute;
     width?: number | string | RemoveAttribute;
     x?: number | string | RemoveAttribute;