@solidjs/h 2.0.0-beta.3 → 2.0.0-beta.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -165,8 +165,7 @@ export namespace JSX {
165
165
  > = EHandler | BoundEventHandler<T, E, EHandler>;
166
166
 
167
167
  interface EventHandlerWithOptions<T, E extends Event, EHandler = EventHandler<T, E>>
168
- extends AddEventListenerOptions,
169
- EventListenerOptions {
168
+ extends AddEventListenerOptions, EventListenerOptions {
170
169
  handleEvent: EHandler;
171
170
  }
172
171
 
@@ -235,40 +234,19 @@ export namespace JSX {
235
234
  [SERIALIZABLE]: never;
236
235
  }
237
236
 
237
+ type RefCallback<T> = (el: T) => void;
238
+ type Ref<T> = T | RefCallback<T> | (RefCallback<T> | Ref<T>)[];
239
+
238
240
  interface IntrinsicAttributes {
239
- ref?: unknown | ((e: unknown) => void) | undefined;
241
+ ref?: Ref<unknown> | undefined;
240
242
  }
241
243
  interface CustomAttributes<T> {
242
- ref?: T | ((el: T) => void) | undefined;
244
+ ref?: Ref<T> | undefined;
243
245
  children?: FunctionMaybe<Element | undefined>;
244
246
  $ServerOnly?: boolean | undefined;
245
247
  }
246
- type Accessor<T> = () => T;
247
- interface Directives {}
248
- interface DirectiveFunctions {
249
- [x: string]: (el: DOMElement, accessor: Accessor<any>) => void;
250
- }
251
248
  interface ExplicitProperties {}
252
249
  interface CustomEvents {}
253
- type DirectiveAttributes = {
254
- [Key in keyof Directives as `use:${Key}`]?: Directives[Key];
255
- };
256
- type DirectiveFunctionAttributes<T> = {
257
- [K in keyof DirectiveFunctions as string extends K
258
- ? never
259
- : `use:${K}`]?: DirectiveFunctions[K] extends (
260
- el: infer E, // will be unknown if not provided
261
- ...rest: infer R // use rest so that we can check whether it's provided or not
262
- ) => void
263
- ? T extends E // everything extends unknown if E is unknown
264
- ? R extends [infer A] // check if has accessor provided
265
- ? A extends Accessor<infer V>
266
- ? V // it's an accessor
267
- : never // it isn't, type error
268
- : true // no accessor provided
269
- : never // T is the wrong element
270
- : never; // it isn't a function
271
- };
272
250
  type PropAttributes = {
273
251
  [Key in keyof ExplicitProperties as `prop:${Key}`]?: ExplicitProperties[Key];
274
252
  };
@@ -1005,23 +983,36 @@ export namespace JSX {
1005
983
  "on:wheel"?: EventHandlerWithOptionsUnion<T, WheelEvent> | undefined;
1006
984
  }
1007
985
 
1008
- type EventType =
986
+ // EventName = "click" | "mousedown" ...
987
+
988
+ type EventName =
1009
989
  | (keyof EventHandlersWindow<any> extends infer K
1010
990
  ? K extends `on:${infer T}`
1011
991
  ? T
1012
992
  : K extends `on${infer T}`
1013
- ? Lowercase<T>
1014
- : never
993
+ ? Lowercase<T>
994
+ : never
1015
995
  : never)
1016
996
  | (keyof EventHandlersElement<any> extends infer K
1017
997
  ? K extends `on:${infer T}`
1018
998
  ? T
1019
999
  : K extends `on${infer T}`
1020
- ? Lowercase<T>
1021
- : never
1000
+ ? Lowercase<T>
1001
+ : never
1022
1002
  : never)
1023
1003
  | (string & {});
1024
1004
 
1005
+ type ExtractEventType<T> = {
1006
+ [K in keyof T as K extends `on:${infer Name}`
1007
+ ? Name
1008
+ : never]: T[K] extends EventHandlerWithOptionsUnion<Element, infer E> ? E : never;
1009
+ };
1010
+
1011
+ // EventType["click"] = MouseEvent
1012
+
1013
+ type EventType = ExtractEventType<EventHandlersElement<Element>> &
1014
+ ExtractEventType<EventHandlersWindow<Element>>;
1015
+
1025
1016
  // GLOBAL ATTRIBUTES
1026
1017
 
1027
1018
  /**
@@ -1031,9 +1022,8 @@ export namespace JSX {
1031
1022
  * 2. Includes `keys` defined by `Element` and `Node` interfaces.
1032
1023
  */
1033
1024
  interface ElementAttributes<T>
1034
- extends CustomAttributes<T>,
1035
- DirectiveAttributes,
1036
- DirectiveFunctionAttributes<T>,
1025
+ extends
1026
+ CustomAttributes<T>,
1037
1027
  PropAttributes,
1038
1028
  OnAttributes<T>,
1039
1029
  EventHandlersElement<T>,
@@ -1251,7 +1241,7 @@ export namespace JSX {
1251
1241
  | "worker";
1252
1242
 
1253
1243
  interface AnchorHTMLAttributes<T> extends HTMLAttributes<T> {
1254
- download?: FunctionMaybe<string | RemoveAttribute>;
1244
+ download?: FunctionMaybe<string | EnumeratedAcceptsEmpty | RemoveAttribute>;
1255
1245
  href?: FunctionMaybe<string | RemoveAttribute>;
1256
1246
  hreflang?: FunctionMaybe<string | RemoveAttribute>;
1257
1247
  ping?: FunctionMaybe<string | RemoveAttribute>;
@@ -1280,7 +1270,7 @@ export namespace JSX {
1280
1270
  interface AreaHTMLAttributes<T> extends HTMLAttributes<T> {
1281
1271
  alt?: FunctionMaybe<string | RemoveAttribute>;
1282
1272
  coords?: FunctionMaybe<string | RemoveAttribute>;
1283
- download?: FunctionMaybe<string | RemoveAttribute>;
1273
+ download?: FunctionMaybe<string | EnumeratedAcceptsEmpty | RemoveAttribute>;
1284
1274
  href?: FunctionMaybe<string | RemoveAttribute>;
1285
1275
  ping?: FunctionMaybe<string | RemoveAttribute>;
1286
1276
  referrerpolicy?: FunctionMaybe<HTMLReferrerPolicy | RemoveAttribute>;
@@ -2233,9 +2223,7 @@ export namespace JSX {
2233
2223
  visibility?: FunctionMaybe<"visible" | "hidden" | "collapse" | "inherit" | RemoveAttribute>;
2234
2224
  }
2235
2225
  interface AnimationElementSVGAttributes<T>
2236
- extends SVGAttributes<T>,
2237
- ExternalResourceSVGAttributes,
2238
- ConditionalProcessingSVGAttributes {
2226
+ extends SVGAttributes<T>, ExternalResourceSVGAttributes, ConditionalProcessingSVGAttributes {
2239
2227
  // TODO TimeEvent is currently undefined on TS
2240
2228
  onBegin?: EventHandlerUnion<T, Event> | undefined;
2241
2229
  "on:begin"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
@@ -2249,7 +2237,8 @@ export namespace JSX {
2249
2237
  "on:repeat"?: EventHandlerWithOptionsUnion<T, Event> | undefined;
2250
2238
  }
2251
2239
  interface ContainerElementSVGAttributes<T>
2252
- extends SVGAttributes<T>,
2240
+ extends
2241
+ SVGAttributes<T>,
2253
2242
  ShapeElementSVGAttributes<T>,
2254
2243
  Pick<
2255
2244
  PresentationSVGAttributes,
@@ -2263,8 +2252,7 @@ export namespace JSX {
2263
2252
  | "color-rendering"
2264
2253
  > {}
2265
2254
  interface FilterPrimitiveElementSVGAttributes<T>
2266
- extends SVGAttributes<T>,
2267
- Pick<PresentationSVGAttributes, "color-interpolation-filters"> {
2255
+ extends SVGAttributes<T>, Pick<PresentationSVGAttributes, "color-interpolation-filters"> {
2268
2256
  height?: FunctionMaybe<number | string | RemoveAttribute>;
2269
2257
  result?: FunctionMaybe<string | RemoveAttribute>;
2270
2258
  width?: FunctionMaybe<number | string | RemoveAttribute>;
@@ -2283,16 +2271,15 @@ export namespace JSX {
2283
2271
  viewBox?: FunctionMaybe<string | RemoveAttribute>;
2284
2272
  }
2285
2273
  interface GradientElementSVGAttributes<T>
2286
- extends SVGAttributes<T>,
2287
- ExternalResourceSVGAttributes,
2288
- StylableSVGAttributes {
2274
+ extends SVGAttributes<T>, ExternalResourceSVGAttributes, StylableSVGAttributes {
2289
2275
  gradientTransform?: FunctionMaybe<string | RemoveAttribute>;
2290
2276
  gradientUnits?: FunctionMaybe<SVGUnits | RemoveAttribute>;
2291
2277
  href?: FunctionMaybe<string | RemoveAttribute>;
2292
2278
  spreadMethod?: FunctionMaybe<"pad" | "reflect" | "repeat" | RemoveAttribute>;
2293
2279
  }
2294
2280
  interface GraphicsElementSVGAttributes<T>
2295
- extends SVGAttributes<T>,
2281
+ extends
2282
+ SVGAttributes<T>,
2296
2283
  Pick<
2297
2284
  PresentationSVGAttributes,
2298
2285
  | "clip-rule"
@@ -2308,12 +2295,12 @@ export namespace JSX {
2308
2295
  > {}
2309
2296
  interface LightSourceElementSVGAttributes<T> extends SVGAttributes<T> {}
2310
2297
  interface NewViewportSVGAttributes<T>
2311
- extends SVGAttributes<T>,
2312
- Pick<PresentationSVGAttributes, "overflow" | "clip"> {
2298
+ extends SVGAttributes<T>, Pick<PresentationSVGAttributes, "overflow" | "clip"> {
2313
2299
  viewBox?: FunctionMaybe<string | RemoveAttribute>;
2314
2300
  }
2315
2301
  interface ShapeElementSVGAttributes<T>
2316
- extends SVGAttributes<T>,
2302
+ extends
2303
+ SVGAttributes<T>,
2317
2304
  Pick<
2318
2305
  PresentationSVGAttributes,
2319
2306
  | "color"
@@ -2332,7 +2319,8 @@ export namespace JSX {
2332
2319
  | "pathLength"
2333
2320
  > {}
2334
2321
  interface TextContentElementSVGAttributes<T>
2335
- extends SVGAttributes<T>,
2322
+ extends
2323
+ SVGAttributes<T>,
2336
2324
  Pick<
2337
2325
  PresentationSVGAttributes,
2338
2326
  | "font-family"
@@ -2373,14 +2361,16 @@ export namespace JSX {
2373
2361
  zoomAndPan?: FunctionMaybe<"disable" | "magnify" | RemoveAttribute>;
2374
2362
  }
2375
2363
  interface AnimateSVGAttributes<T>
2376
- extends AnimationElementSVGAttributes<T>,
2364
+ extends
2365
+ AnimationElementSVGAttributes<T>,
2377
2366
  AnimationAttributeTargetSVGAttributes,
2378
2367
  AnimationTimingSVGAttributes,
2379
2368
  AnimationValueSVGAttributes,
2380
2369
  AnimationAdditionSVGAttributes,
2381
2370
  Pick<PresentationSVGAttributes, "color-interpolation" | "color-rendering"> {}
2382
2371
  interface AnimateMotionSVGAttributes<T>
2383
- extends AnimationElementSVGAttributes<T>,
2372
+ extends
2373
+ AnimationElementSVGAttributes<T>,
2384
2374
  AnimationTimingSVGAttributes,
2385
2375
  AnimationValueSVGAttributes,
2386
2376
  AnimationAdditionSVGAttributes {
@@ -2390,7 +2380,8 @@ export namespace JSX {
2390
2380
  rotate?: FunctionMaybe<number | string | "auto" | "auto-reverse" | RemoveAttribute>;
2391
2381
  }
2392
2382
  interface AnimateTransformSVGAttributes<T>
2393
- extends AnimationElementSVGAttributes<T>,
2383
+ extends
2384
+ AnimationElementSVGAttributes<T>,
2394
2385
  AnimationAttributeTargetSVGAttributes,
2395
2386
  AnimationTimingSVGAttributes,
2396
2387
  AnimationValueSVGAttributes,
@@ -2398,7 +2389,8 @@ export namespace JSX {
2398
2389
  type?: FunctionMaybe<"translate" | "scale" | "rotate" | "skewX" | "skewY" | RemoveAttribute>;
2399
2390
  }
2400
2391
  interface CircleSVGAttributes<T>
2401
- extends GraphicsElementSVGAttributes<T>,
2392
+ extends
2393
+ GraphicsElementSVGAttributes<T>,
2402
2394
  ShapeElementSVGAttributes<T>,
2403
2395
  ConditionalProcessingSVGAttributes,
2404
2396
  StylableSVGAttributes,
@@ -2409,7 +2401,8 @@ export namespace JSX {
2409
2401
  r?: FunctionMaybe<number | string | RemoveAttribute>;
2410
2402
  }
2411
2403
  interface ClipPathSVGAttributes<T>
2412
- extends SVGAttributes<T>,
2404
+ extends
2405
+ SVGAttributes<T>,
2413
2406
  ConditionalProcessingSVGAttributes,
2414
2407
  ExternalResourceSVGAttributes,
2415
2408
  StylableSVGAttributes,
@@ -2418,14 +2411,16 @@ export namespace JSX {
2418
2411
  clipPathUnits?: FunctionMaybe<SVGUnits | RemoveAttribute>;
2419
2412
  }
2420
2413
  interface DefsSVGAttributes<T>
2421
- extends ContainerElementSVGAttributes<T>,
2414
+ extends
2415
+ ContainerElementSVGAttributes<T>,
2422
2416
  ConditionalProcessingSVGAttributes,
2423
2417
  ExternalResourceSVGAttributes,
2424
2418
  StylableSVGAttributes,
2425
2419
  TransformableSVGAttributes {}
2426
2420
  interface DescSVGAttributes<T> extends SVGAttributes<T>, StylableSVGAttributes {}
2427
2421
  interface EllipseSVGAttributes<T>
2428
- extends GraphicsElementSVGAttributes<T>,
2422
+ extends
2423
+ GraphicsElementSVGAttributes<T>,
2429
2424
  ShapeElementSVGAttributes<T>,
2430
2425
  ConditionalProcessingSVGAttributes,
2431
2426
  ExternalResourceSVGAttributes,
@@ -2438,13 +2433,15 @@ export namespace JSX {
2438
2433
  ry?: FunctionMaybe<number | string | RemoveAttribute>;
2439
2434
  }
2440
2435
  interface FeBlendSVGAttributes<T>
2441
- extends FilterPrimitiveElementSVGAttributes<T>,
2436
+ extends
2437
+ FilterPrimitiveElementSVGAttributes<T>,
2442
2438
  DoubleInputFilterSVGAttributes,
2443
2439
  StylableSVGAttributes {
2444
2440
  mode?: FunctionMaybe<"normal" | "multiply" | "screen" | "darken" | "lighten" | RemoveAttribute>;
2445
2441
  }
2446
2442
  interface FeColorMatrixSVGAttributes<T>
2447
- extends FilterPrimitiveElementSVGAttributes<T>,
2443
+ extends
2444
+ FilterPrimitiveElementSVGAttributes<T>,
2448
2445
  SingleInputFilterSVGAttributes,
2449
2446
  StylableSVGAttributes {
2450
2447
  type?: FunctionMaybe<
@@ -2453,11 +2450,13 @@ export namespace JSX {
2453
2450
  values?: FunctionMaybe<string | RemoveAttribute>;
2454
2451
  }
2455
2452
  interface FeComponentTransferSVGAttributes<T>
2456
- extends FilterPrimitiveElementSVGAttributes<T>,
2453
+ extends
2454
+ FilterPrimitiveElementSVGAttributes<T>,
2457
2455
  SingleInputFilterSVGAttributes,
2458
2456
  StylableSVGAttributes {}
2459
2457
  interface FeCompositeSVGAttributes<T>
2460
- extends FilterPrimitiveElementSVGAttributes<T>,
2458
+ extends
2459
+ FilterPrimitiveElementSVGAttributes<T>,
2461
2460
  DoubleInputFilterSVGAttributes,
2462
2461
  StylableSVGAttributes {
2463
2462
  k1?: FunctionMaybe<number | string | RemoveAttribute>;
@@ -2469,7 +2468,8 @@ export namespace JSX {
2469
2468
  >;
2470
2469
  }
2471
2470
  interface FeConvolveMatrixSVGAttributes<T>
2472
- extends FilterPrimitiveElementSVGAttributes<T>,
2471
+ extends
2472
+ FilterPrimitiveElementSVGAttributes<T>,
2473
2473
  SingleInputFilterSVGAttributes,
2474
2474
  StylableSVGAttributes {
2475
2475
  bias?: FunctionMaybe<number | string | RemoveAttribute>;
@@ -2483,7 +2483,8 @@ export namespace JSX {
2483
2483
  targetY?: FunctionMaybe<number | string | RemoveAttribute>;
2484
2484
  }
2485
2485
  interface FeDiffuseLightingSVGAttributes<T>
2486
- extends FilterPrimitiveElementSVGAttributes<T>,
2486
+ extends
2487
+ FilterPrimitiveElementSVGAttributes<T>,
2487
2488
  SingleInputFilterSVGAttributes,
2488
2489
  StylableSVGAttributes,
2489
2490
  Pick<PresentationSVGAttributes, "color" | "lighting-color"> {
@@ -2492,7 +2493,8 @@ export namespace JSX {
2492
2493
  surfaceScale?: FunctionMaybe<number | string | RemoveAttribute>;
2493
2494
  }
2494
2495
  interface FeDisplacementMapSVGAttributes<T>
2495
- extends FilterPrimitiveElementSVGAttributes<T>,
2496
+ extends
2497
+ FilterPrimitiveElementSVGAttributes<T>,
2496
2498
  DoubleInputFilterSVGAttributes,
2497
2499
  StylableSVGAttributes {
2498
2500
  scale?: FunctionMaybe<number | string | RemoveAttribute>;
@@ -2504,7 +2506,8 @@ export namespace JSX {
2504
2506
  elevation?: FunctionMaybe<number | string | RemoveAttribute>;
2505
2507
  }
2506
2508
  interface FeDropShadowSVGAttributes<T>
2507
- extends SVGAttributes<T>,
2509
+ extends
2510
+ SVGAttributes<T>,
2508
2511
  FilterPrimitiveElementSVGAttributes<T>,
2509
2512
  StylableSVGAttributes,
2510
2513
  Pick<PresentationSVGAttributes, "color" | "flood-color" | "flood-opacity"> {
@@ -2513,7 +2516,8 @@ export namespace JSX {
2513
2516
  stdDeviation?: FunctionMaybe<number | string | RemoveAttribute>;
2514
2517
  }
2515
2518
  interface FeFloodSVGAttributes<T>
2516
- extends FilterPrimitiveElementSVGAttributes<T>,
2519
+ extends
2520
+ FilterPrimitiveElementSVGAttributes<T>,
2517
2521
  StylableSVGAttributes,
2518
2522
  Pick<PresentationSVGAttributes, "color" | "flood-color" | "flood-opacity"> {}
2519
2523
  interface FeFuncSVGAttributes<T> extends SVGAttributes<T> {
@@ -2526,31 +2530,34 @@ export namespace JSX {
2526
2530
  type?: FunctionMaybe<"identity" | "table" | "discrete" | "linear" | "gamma" | RemoveAttribute>;
2527
2531
  }
2528
2532
  interface FeGaussianBlurSVGAttributes<T>
2529
- extends FilterPrimitiveElementSVGAttributes<T>,
2533
+ extends
2534
+ FilterPrimitiveElementSVGAttributes<T>,
2530
2535
  SingleInputFilterSVGAttributes,
2531
2536
  StylableSVGAttributes {
2532
2537
  stdDeviation?: FunctionMaybe<number | string | RemoveAttribute>;
2533
2538
  }
2534
2539
  interface FeImageSVGAttributes<T>
2535
- extends FilterPrimitiveElementSVGAttributes<T>,
2540
+ extends
2541
+ FilterPrimitiveElementSVGAttributes<T>,
2536
2542
  ExternalResourceSVGAttributes,
2537
2543
  StylableSVGAttributes {
2538
2544
  href?: FunctionMaybe<string | RemoveAttribute>;
2539
2545
  preserveAspectRatio?: FunctionMaybe<SVGPreserveAspectRatio | RemoveAttribute>;
2540
2546
  }
2541
2547
  interface FeMergeSVGAttributes<T>
2542
- extends FilterPrimitiveElementSVGAttributes<T>,
2543
- StylableSVGAttributes {}
2548
+ extends FilterPrimitiveElementSVGAttributes<T>, StylableSVGAttributes {}
2544
2549
  interface FeMergeNodeSVGAttributes<T> extends SVGAttributes<T>, SingleInputFilterSVGAttributes {}
2545
2550
  interface FeMorphologySVGAttributes<T>
2546
- extends FilterPrimitiveElementSVGAttributes<T>,
2551
+ extends
2552
+ FilterPrimitiveElementSVGAttributes<T>,
2547
2553
  SingleInputFilterSVGAttributes,
2548
2554
  StylableSVGAttributes {
2549
2555
  operator?: FunctionMaybe<"erode" | "dilate" | RemoveAttribute>;
2550
2556
  radius?: FunctionMaybe<number | string | RemoveAttribute>;
2551
2557
  }
2552
2558
  interface FeOffsetSVGAttributes<T>
2553
- extends FilterPrimitiveElementSVGAttributes<T>,
2559
+ extends
2560
+ FilterPrimitiveElementSVGAttributes<T>,
2554
2561
  SingleInputFilterSVGAttributes,
2555
2562
  StylableSVGAttributes {
2556
2563
  dx?: FunctionMaybe<number | string | RemoveAttribute>;
@@ -2562,7 +2569,8 @@ export namespace JSX {
2562
2569
  z?: FunctionMaybe<number | string | RemoveAttribute>;
2563
2570
  }
2564
2571
  interface FeSpecularLightingSVGAttributes<T>
2565
- extends FilterPrimitiveElementSVGAttributes<T>,
2572
+ extends
2573
+ FilterPrimitiveElementSVGAttributes<T>,
2566
2574
  SingleInputFilterSVGAttributes,
2567
2575
  StylableSVGAttributes,
2568
2576
  Pick<PresentationSVGAttributes, "color" | "lighting-color"> {
@@ -2582,12 +2590,12 @@ export namespace JSX {
2582
2590
  z?: FunctionMaybe<number | string | RemoveAttribute>;
2583
2591
  }
2584
2592
  interface FeTileSVGAttributes<T>
2585
- extends FilterPrimitiveElementSVGAttributes<T>,
2593
+ extends
2594
+ FilterPrimitiveElementSVGAttributes<T>,
2586
2595
  SingleInputFilterSVGAttributes,
2587
2596
  StylableSVGAttributes {}
2588
2597
  interface FeTurbulanceSVGAttributes<T>
2589
- extends FilterPrimitiveElementSVGAttributes<T>,
2590
- StylableSVGAttributes {
2598
+ extends FilterPrimitiveElementSVGAttributes<T>, StylableSVGAttributes {
2591
2599
  baseFrequency?: FunctionMaybe<number | string | RemoveAttribute>;
2592
2600
  numOctaves?: FunctionMaybe<number | string | RemoveAttribute>;
2593
2601
  seed?: FunctionMaybe<number | string | RemoveAttribute>;
@@ -2595,9 +2603,7 @@ export namespace JSX {
2595
2603
  type?: FunctionMaybe<"fractalNoise" | "turbulence" | RemoveAttribute>;
2596
2604
  }
2597
2605
  interface FilterSVGAttributes<T>
2598
- extends SVGAttributes<T>,
2599
- ExternalResourceSVGAttributes,
2600
- StylableSVGAttributes {
2606
+ extends SVGAttributes<T>, ExternalResourceSVGAttributes, StylableSVGAttributes {
2601
2607
  filterRes?: FunctionMaybe<number | string | RemoveAttribute>;
2602
2608
  filterUnits?: FunctionMaybe<SVGUnits | RemoveAttribute>;
2603
2609
  height?: FunctionMaybe<number | string | RemoveAttribute>;
@@ -2607,7 +2613,8 @@ export namespace JSX {
2607
2613
  y?: FunctionMaybe<number | string | RemoveAttribute>;
2608
2614
  }
2609
2615
  interface ForeignObjectSVGAttributes<T>
2610
- extends NewViewportSVGAttributes<T>,
2616
+ extends
2617
+ NewViewportSVGAttributes<T>,
2611
2618
  ConditionalProcessingSVGAttributes,
2612
2619
  ExternalResourceSVGAttributes,
2613
2620
  StylableSVGAttributes,
@@ -2619,14 +2626,16 @@ export namespace JSX {
2619
2626
  y?: FunctionMaybe<number | string | RemoveAttribute>;
2620
2627
  }
2621
2628
  interface GSVGAttributes<T>
2622
- extends ContainerElementSVGAttributes<T>,
2629
+ extends
2630
+ ContainerElementSVGAttributes<T>,
2623
2631
  ConditionalProcessingSVGAttributes,
2624
2632
  ExternalResourceSVGAttributes,
2625
2633
  StylableSVGAttributes,
2626
2634
  TransformableSVGAttributes,
2627
2635
  Pick<PresentationSVGAttributes, "clip-path" | "display" | "visibility"> {}
2628
2636
  interface ImageSVGAttributes<T>
2629
- extends NewViewportSVGAttributes<T>,
2637
+ extends
2638
+ NewViewportSVGAttributes<T>,
2630
2639
  GraphicsElementSVGAttributes<T>,
2631
2640
  ConditionalProcessingSVGAttributes,
2632
2641
  StylableSVGAttributes,
@@ -2640,7 +2649,8 @@ export namespace JSX {
2640
2649
  y?: FunctionMaybe<number | string | RemoveAttribute>;
2641
2650
  }
2642
2651
  interface LineSVGAttributes<T>
2643
- extends GraphicsElementSVGAttributes<T>,
2652
+ extends
2653
+ GraphicsElementSVGAttributes<T>,
2644
2654
  ShapeElementSVGAttributes<T>,
2645
2655
  ConditionalProcessingSVGAttributes,
2646
2656
  ExternalResourceSVGAttributes,
@@ -2659,7 +2669,8 @@ export namespace JSX {
2659
2669
  y2?: FunctionMaybe<number | string | RemoveAttribute>;
2660
2670
  }
2661
2671
  interface MarkerSVGAttributes<T>
2662
- extends ContainerElementSVGAttributes<T>,
2672
+ extends
2673
+ ContainerElementSVGAttributes<T>,
2663
2674
  ExternalResourceSVGAttributes,
2664
2675
  StylableSVGAttributes,
2665
2676
  FitToViewBoxSVGAttributes,
@@ -2672,7 +2683,8 @@ export namespace JSX {
2672
2683
  refY?: FunctionMaybe<number | string | RemoveAttribute>;
2673
2684
  }
2674
2685
  interface MaskSVGAttributes<T>
2675
- extends Omit<ContainerElementSVGAttributes<T>, "opacity" | "filter">,
2686
+ extends
2687
+ Omit<ContainerElementSVGAttributes<T>, "opacity" | "filter">,
2676
2688
  ConditionalProcessingSVGAttributes,
2677
2689
  ExternalResourceSVGAttributes,
2678
2690
  StylableSVGAttributes,
@@ -2687,7 +2699,8 @@ export namespace JSX {
2687
2699
  interface MetadataSVGAttributes<T> extends SVGAttributes<T> {}
2688
2700
  interface MPathSVGAttributes<T> extends SVGAttributes<T> {}
2689
2701
  interface PathSVGAttributes<T>
2690
- extends GraphicsElementSVGAttributes<T>,
2702
+ extends
2703
+ GraphicsElementSVGAttributes<T>,
2691
2704
  ShapeElementSVGAttributes<T>,
2692
2705
  ConditionalProcessingSVGAttributes,
2693
2706
  ExternalResourceSVGAttributes,
@@ -2698,7 +2711,8 @@ export namespace JSX {
2698
2711
  pathLength?: FunctionMaybe<number | string | RemoveAttribute>;
2699
2712
  }
2700
2713
  interface PatternSVGAttributes<T>
2701
- extends ContainerElementSVGAttributes<T>,
2714
+ extends
2715
+ ContainerElementSVGAttributes<T>,
2702
2716
  ConditionalProcessingSVGAttributes,
2703
2717
  ExternalResourceSVGAttributes,
2704
2718
  StylableSVGAttributes,
@@ -2714,7 +2728,8 @@ export namespace JSX {
2714
2728
  y?: FunctionMaybe<number | string | RemoveAttribute>;
2715
2729
  }
2716
2730
  interface PolygonSVGAttributes<T>
2717
- extends GraphicsElementSVGAttributes<T>,
2731
+ extends
2732
+ GraphicsElementSVGAttributes<T>,
2718
2733
  ShapeElementSVGAttributes<T>,
2719
2734
  ConditionalProcessingSVGAttributes,
2720
2735
  ExternalResourceSVGAttributes,
@@ -2724,7 +2739,8 @@ export namespace JSX {
2724
2739
  points?: FunctionMaybe<string | RemoveAttribute>;
2725
2740
  }
2726
2741
  interface PolylineSVGAttributes<T>
2727
- extends GraphicsElementSVGAttributes<T>,
2742
+ extends
2743
+ GraphicsElementSVGAttributes<T>,
2728
2744
  ShapeElementSVGAttributes<T>,
2729
2745
  ConditionalProcessingSVGAttributes,
2730
2746
  ExternalResourceSVGAttributes,
@@ -2741,7 +2757,8 @@ export namespace JSX {
2741
2757
  r?: FunctionMaybe<number | string | RemoveAttribute>;
2742
2758
  }
2743
2759
  interface RectSVGAttributes<T>
2744
- extends GraphicsElementSVGAttributes<T>,
2760
+ extends
2761
+ GraphicsElementSVGAttributes<T>,
2745
2762
  ShapeElementSVGAttributes<T>,
2746
2763
  ConditionalProcessingSVGAttributes,
2747
2764
  ExternalResourceSVGAttributes,
@@ -2756,17 +2773,17 @@ export namespace JSX {
2756
2773
  y?: FunctionMaybe<number | string | RemoveAttribute>;
2757
2774
  }
2758
2775
  interface SetSVGAttributes<T>
2759
- extends AnimationElementSVGAttributes<T>,
2760
- StylableSVGAttributes,
2761
- AnimationTimingSVGAttributes {}
2776
+ extends AnimationElementSVGAttributes<T>, StylableSVGAttributes, AnimationTimingSVGAttributes {}
2762
2777
  interface StopSVGAttributes<T>
2763
- extends SVGAttributes<T>,
2778
+ extends
2779
+ SVGAttributes<T>,
2764
2780
  StylableSVGAttributes,
2765
2781
  Pick<PresentationSVGAttributes, "color" | "stop-color" | "stop-opacity"> {
2766
2782
  offset?: FunctionMaybe<number | string | RemoveAttribute>;
2767
2783
  }
2768
2784
  interface SvgSVGAttributes<T>
2769
- extends ContainerElementSVGAttributes<T>,
2785
+ extends
2786
+ ContainerElementSVGAttributes<T>,
2770
2787
  NewViewportSVGAttributes<T>,
2771
2788
  ConditionalProcessingSVGAttributes,
2772
2789
  ExternalResourceSVGAttributes,
@@ -2789,14 +2806,16 @@ export namespace JSX {
2789
2806
  version?: FunctionMaybe<string | RemoveAttribute>;
2790
2807
  }
2791
2808
  interface SwitchSVGAttributes<T>
2792
- extends ContainerElementSVGAttributes<T>,
2809
+ extends
2810
+ ContainerElementSVGAttributes<T>,
2793
2811
  ConditionalProcessingSVGAttributes,
2794
2812
  ExternalResourceSVGAttributes,
2795
2813
  StylableSVGAttributes,
2796
2814
  TransformableSVGAttributes,
2797
2815
  Pick<PresentationSVGAttributes, "display" | "visibility"> {}
2798
2816
  interface SymbolSVGAttributes<T>
2799
- extends ContainerElementSVGAttributes<T>,
2817
+ extends
2818
+ ContainerElementSVGAttributes<T>,
2800
2819
  NewViewportSVGAttributes<T>,
2801
2820
  ExternalResourceSVGAttributes,
2802
2821
  StylableSVGAttributes,
@@ -2812,7 +2831,8 @@ export namespace JSX {
2812
2831
  y?: FunctionMaybe<number | string | RemoveAttribute>;
2813
2832
  }
2814
2833
  interface TextSVGAttributes<T>
2815
- extends TextContentElementSVGAttributes<T>,
2834
+ extends
2835
+ TextContentElementSVGAttributes<T>,
2816
2836
  GraphicsElementSVGAttributes<T>,
2817
2837
  ConditionalProcessingSVGAttributes,
2818
2838
  ExternalResourceSVGAttributes,
@@ -2828,7 +2848,8 @@ export namespace JSX {
2828
2848
  y?: FunctionMaybe<number | string | RemoveAttribute>;
2829
2849
  }
2830
2850
  interface TextPathSVGAttributes<T>
2831
- extends TextContentElementSVGAttributes<T>,
2851
+ extends
2852
+ TextContentElementSVGAttributes<T>,
2832
2853
  ConditionalProcessingSVGAttributes,
2833
2854
  ExternalResourceSVGAttributes,
2834
2855
  StylableSVGAttributes,
@@ -2842,7 +2863,8 @@ export namespace JSX {
2842
2863
  startOffset?: FunctionMaybe<number | string | RemoveAttribute>;
2843
2864
  }
2844
2865
  interface TSpanSVGAttributes<T>
2845
- extends TextContentElementSVGAttributes<T>,
2866
+ extends
2867
+ TextContentElementSVGAttributes<T>,
2846
2868
  ConditionalProcessingSVGAttributes,
2847
2869
  ExternalResourceSVGAttributes,
2848
2870
  StylableSVGAttributes,
@@ -2860,7 +2882,8 @@ export namespace JSX {
2860
2882
  }
2861
2883
  /** @see https://developer.mozilla.org/en-US/docs/Web/SVG/Element/use */
2862
2884
  interface UseSVGAttributes<T>
2863
- extends SVGAttributes<T>,
2885
+ extends
2886
+ SVGAttributes<T>,
2864
2887
  StylableSVGAttributes,
2865
2888
  ConditionalProcessingSVGAttributes,
2866
2889
  GraphicsElementSVGAttributes<T>,
@@ -2874,7 +2897,8 @@ export namespace JSX {
2874
2897
  y?: FunctionMaybe<number | string | RemoveAttribute>;
2875
2898
  }
2876
2899
  interface ViewSVGAttributes<T>
2877
- extends SVGAttributes<T>,
2900
+ extends
2901
+ SVGAttributes<T>,
2878
2902
  ExternalResourceSVGAttributes,
2879
2903
  FitToViewBoxSVGAttributes,
2880
2904
  ZoomAndPanSVGAttributes {
@@ -4159,8 +4183,5 @@ export namespace JSX {
4159
4183
  }
4160
4184
 
4161
4185
  interface IntrinsicElements
4162
- extends HTMLElementTags,
4163
- HTMLElementDeprecatedTags,
4164
- SVGElementTags,
4165
- MathMLElementTags {}
4186
+ extends HTMLElementTags, HTMLElementDeprecatedTags, SVGElementTags, MathMLElementTags {}
4166
4187
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@solidjs/h",
3
3
  "description": "A standard (less-optimal) JSX factory for Solid",
4
- "version": "2.0.0-beta.3",
4
+ "version": "2.0.0-beta.4",
5
5
  "author": "Ryan Carniato",
6
6
  "license": "MIT",
7
7
  "homepage": "https://solidjs.com",
@@ -46,10 +46,10 @@
46
46
  "./types/*": "./types/*"
47
47
  },
48
48
  "peerDependencies": {
49
- "@solidjs/web": "^2.0.0-beta.3"
49
+ "@solidjs/web": "^2.0.0-beta.4"
50
50
  },
51
51
  "devDependencies": {
52
- "@solidjs/web": "2.0.0-beta.3"
52
+ "@solidjs/web": "2.0.0-beta.4"
53
53
  },
54
54
  "scripts": {
55
55
  "build": "npm-run-all -nl build:*",