@solidjs/web 2.0.0-beta.11 → 2.0.0-beta.13

package/dist/web.js

@@ -125,7 +125,6 @@ function reconcileArrays(parentNode, a, b) {
 const $$EVENTS = "_$DX_DELEGATE";
 const INNER_OWNED = {};
 function render$1(code, element, init, options = {}) {
-  const renderRoot = getChildRoot(element);
   let disposer;
   createRoot(dispose => {
     disposer = dispose;
@@ -134,14 +133,14 @@ function render$1(code, element, init, options = {}) {
       effect(() => flatten(tree), () => {});
     } else {
       const tree = code();
-      insert(element, () => tree, renderRoot.firstChild ? null : undefined, init, options.insertOptions);
+      insert(element, () => tree, element.firstChild ? null : undefined, init, options.insertOptions);
     }
   }, {
     id: options.renderId
   });
   return () => {
     disposer();
-    renderRoot.textContent = "";
+    element.textContent = "";
   };
 }
 function create(html, bypassGuard, flag) {
@@ -278,11 +277,10 @@ function ref(fn, element) {
   runWithOwner(null, () => applyRef(resolved, element));
 }
 function insert(parent, accessor, marker, initial, options) {
-  const childRoot = getChildRoot(parent);
   const multi = marker !== undefined;
   if (multi && !initial) initial = [];
   if (isHydrating(parent)) {
-    if (!multi && initial === undefined && parent) initial = [...childRoot.childNodes];
+    if (!multi && initial === undefined && parent) initial = [...parent.childNodes];
     if (Array.isArray(initial)) {
       let j = 0;
       for (let i = 0; i < initial.length; i++) {
@@ -297,7 +295,7 @@ function insert(parent, accessor, marker, initial, options) {
   }
   if (multi && initial.length === 0) {
     const placeholder = document.createTextNode("");
-    childRoot.insertBefore(placeholder, marker);
+    parent.insertBefore(placeholder, marker);
     initial = [placeholder];
   }
   let current = initial;
@@ -352,7 +350,7 @@ function loadModuleAssets(mapping) {
   return pending.length ? Promise.all(pending).then(() => {}) : undefined;
 }
 function hydrate$1(code, element, options = {}) {
-  if (globalThis._$HY.done) return render$1(code, element, [...getChildRoot(element).childNodes], options);
+  if (globalThis._$HY.done) return render$1(code, element, [...element.childNodes], options);
   options.renderId ||= "";
   if (!globalThis._$HY.modules) globalThis._$HY.modules = {};
   if (!globalThis._$HY.loading) globalThis._$HY.loading = {};
@@ -388,7 +386,7 @@ function hydrate$1(code, element, options = {}) {
       let disposer;
       p.then(() => {
         try {
-          disposer = render$1(code, element, [...getChildRoot(element).childNodes], options);
+          disposer = render$1(code, element, [...element.childNodes], options);
         } finally {
           sharedConfig.hydrating = false;
         }
@@ -400,7 +398,7 @@ function hydrate$1(code, element, options = {}) {
   }
   try {
     gatherHydratable(element, options.renderId);
-    return render$1(code, element, [...getChildRoot(element).childNodes], options);
+    return render$1(code, element, [...element.childNodes], options);
   } finally {
     sharedConfig.hydrating = false;
   }
@@ -443,7 +441,7 @@ function getNextMarker(start) {
   return [end, current];
 }
 function getFirstChild(node, expectedTag) {
-  const child = getChildRoot(node).firstChild;
+  const child = node.firstChild;
   return child;
 }
 function getNextSibling(node, expectedTag) {
@@ -476,9 +474,6 @@ function runHydrationEvents() {
 function isHydrating(node) {
   return sharedConfig.hydrating && (!node || node.isConnected);
 }
-function getChildRoot(node) {
-  return node && node.localName === "template" ? node.content : node;
-}
 function classListToObject(classList) {
   if (Array.isArray(classList)) {
     const result = {};
@@ -513,11 +508,7 @@ function assignProp(node, prop, value, prev, skipRef, nodeName) {
     return value;
   }
   const hasNamespace = prop.indexOf(":") > -1;
-  if (hasNamespace && prop.slice(0, 3) === "on:") {
-    const e = prop.slice(3);
-    prev && node.removeEventListener(e, prev, typeof prev !== "function" && prev);
-    value && node.addEventListener(e, value, typeof value !== "function" && value);
-  } else if (!hasNamespace && prop.slice(0, 2) === "on") {
+  if (!hasNamespace && prop.slice(0, 2) === "on") {
     const name = prop.slice(2).toLowerCase();
     const delegate = DelegatedEvents.has(name);
     if (!delegate && prev) {
@@ -590,22 +581,21 @@ function eventHandler(e) {
 function insertExpression(parent, value, current, marker) {
   if (isHydrating(parent)) return;
   if (value === current) return;
-  const childRoot = getChildRoot(parent);
   const t = typeof value,
     multi = marker !== undefined;
   if (t === "string" || t === "number") {
     const tc = typeof current;
     if (tc === "string" || tc === "number") {
-      childRoot.firstChild.data = value;
-    } else childRoot.textContent = value;
+      parent.firstChild.data = value;
+    } else parent.textContent = value;
   } else if (value === undefined) {
     cleanChildren(parent, current, marker);
   } else if (value.nodeType) {
     if (Array.isArray(current)) {
       cleanChildren(parent, current, multi ? marker : null, value);
-    } else if (current === undefined || !childRoot.firstChild) {
-      childRoot.appendChild(value);
-    } else childRoot.replaceChild(value, childRoot.firstChild);
+    } else if (current === undefined || !parent.firstChild) {
+      parent.appendChild(value);
+    } else parent.replaceChild(value, parent.firstChild);
   } else if (Array.isArray(value)) {
     const currentArray = current && Array.isArray(current);
     if (value.length === 0) {
@@ -613,7 +603,7 @@ function insertExpression(parent, value, current, marker) {
     } else if (currentArray) {
       if (current.length === 0) {
         appendNodes(parent, value, marker);
-      } else reconcileArrays(childRoot, current, value);
+      } else reconcileArrays(parent, current, value);
     } else {
       current && cleanChildren(parent);
       appendNodes(parent, value);
@@ -638,11 +628,9 @@ function normalize(value, current, multi, doNotUnwrap) {
   return value;
 }
 function appendNodes(parent, array, marker = null) {
-  parent = getChildRoot(parent);
   for (let i = 0, len = array.length; i < len; i++) parent.insertBefore(array[i], marker);
 }
 function cleanChildren(parent, current, marker, replacement) {
-  parent = getChildRoot(parent);
   if (marker === undefined) return parent.textContent = "";
   if (current.length) {
     let inserted = false;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@solidjs/web",
   "description": "Solid's web runtime: client rendering, hydration, SSR, and DOM-specific control flow (Portal, Dynamic).",
-  "version": "2.0.0-beta.11",
+  "version": "2.0.0-beta.13",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -137,10 +137,10 @@
     "seroval-plugins": "^1.1.0"
   },
   "peerDependencies": {
-    "solid-js": "^2.0.0-beta.11"
+    "solid-js": "^2.0.0-beta.13"
   },
   "devDependencies": {
-    "solid-js": "2.0.0-beta.11"
+    "solid-js": "2.0.0-beta.13"
   },
   "scripts": {
     "build": "npm-run-all -nl build:clean types:copy-jsx build:js",

package/types/jsx.d.ts

@@ -35,10 +35,9 @@ import type { Element as SolidElement } from "solid-js";
  *
  * - 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`):
  *
@@ -176,17 +175,6 @@ export namespace JSX {
     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 & {
@@ -258,13 +246,9 @@ export 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
@@ -732,33 +716,7 @@ export namespace JSX {
     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;
   }
 
   /**
@@ -884,167 +842,23 @@ export 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
+        ? 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
+        ? 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
 
   /**
@@ -1054,12 +868,7 @@ export namespace JSX {
    * 2. Includes `keys` defined by `Element` and `Node` interfaces.
    */
   interface ElementAttributes<T>
-    extends
-      CustomAttributes<T>,
-      PropAttributes,
-      OnAttributes<T>,
-      EventHandlersElement<T>,
-      AriaAttributes {
+    extends CustomAttributes<T>, PropAttributes, EventHandlersElement<T>, AriaAttributes {
     // [key: ClassKeys]: boolean;
 
     // properties
@@ -1723,13 +1532,6 @@ export namespace JSX {
     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
 
@@ -2064,14 +1866,6 @@ export namespace JSX {
     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;
@@ -2346,32 +2140,6 @@ export 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;