@tamagui/web 3.0.0-beta.753.1 → 3.0.0-beta.765.1

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.
Files changed (37) hide show
  1. package/dist/cjs/createTamagui.cjs +1 -1
  2. package/dist/cjs/createTamagui.native.cjs +1 -1
  3. package/dist/cjs/createTamagui.native.js +1 -1
  4. package/dist/cjs/createTamagui.native.js.map +1 -1
  5. package/dist/cjs/dom/htmlRuntime.native.cjs +1 -0
  6. package/dist/cjs/dom/htmlRuntime.native.js +1 -0
  7. package/dist/cjs/dom/htmlRuntime.native.js.map +1 -1
  8. package/dist/cjs/helpers/insertStyleRule.cjs +1 -1
  9. package/dist/cjs/helpers/insertStyleRule.native.cjs +2 -2
  10. package/dist/cjs/helpers/insertStyleRule.native.js +2 -2
  11. package/dist/cjs/helpers/insertStyleRule.native.js.map +1 -1
  12. package/dist/esm/createTamagui.mjs +1 -1
  13. package/dist/esm/createTamagui.mjs.map +1 -1
  14. package/dist/esm/createTamagui.native.js +1 -1
  15. package/dist/esm/createTamagui.native.js.map +1 -1
  16. package/dist/esm/dom/htmlRuntime.native.js +1 -0
  17. package/dist/esm/dom/htmlRuntime.native.js.map +1 -1
  18. package/dist/esm/helpers/insertStyleRule.mjs +1 -1
  19. package/dist/esm/helpers/insertStyleRule.mjs.map +1 -1
  20. package/dist/esm/helpers/insertStyleRule.native.js +2 -2
  21. package/dist/esm/helpers/insertStyleRule.native.js.map +1 -1
  22. package/package.json +15 -15
  23. package/src/createTamagui.ts +3 -1
  24. package/src/dom/html.native.tsx +99 -92
  25. package/src/dom/html.tsx +105 -98
  26. package/src/dom/htmlRuntime.native.tsx +1 -0
  27. package/src/helpers/insertStyleRule.tsx +4 -1
  28. package/src/types.tsx +1 -1
  29. package/types/createTamagui.d.ts.map +1 -1
  30. package/types/dom/html.d.ts +54 -50
  31. package/types/dom/html.d.ts.map +1 -1
  32. package/types/dom/html.native.d.ts +51 -47
  33. package/types/dom/html.native.d.ts.map +1 -1
  34. package/types/dom/htmlRuntime.native.d.ts.map +1 -1
  35. package/types/helpers/insertStyleRule.d.ts.map +1 -1
  36. package/types/types.d.ts +1 -1
  37. package/types/types.d.ts.map +1 -1
package/src/dom/html.native.tsx CHANGED
@@ -177,12 +177,19 @@ const domValidStyles = {
177
177
  */
178
178
  const primitive = (component: unknown) => component as StaticConfig['Component']
179
179
 
180
+ /** regular Tamagui non-style props win when the strict DOM contract names the same prop */
181
+ type MergeHTMLProps<DOMProps, TamaguiProps, TamaguiNonStyleProps> = Omit<
182
+ DOMProps,
183
+ keyof TamaguiNonStyleProps
184
+ > &
185
+ TamaguiProps
186
+
180
187
  const a = domTag(
181
188
  'a',
182
189
  createComponent<
183
- StrictDOMAnchorProps & TextProps,
190
+ MergeHTMLProps<StrictDOMAnchorProps, TextProps, TextNonStyleProps>,
184
191
  TamaguiTextElement,
185
- StrictDOMAnchorProps & TextNonStyleProps,
192
+ MergeHTMLProps<StrictDOMAnchorProps, TextNonStyleProps, TextNonStyleProps>,
186
193
  TextStylePropsBase
187
194
  >({
188
195
  ...textStaticConfig,
@@ -201,9 +208,9 @@ const a = domTag(
201
208
  const article = domTag(
202
209
  'article',
203
210
  createComponent<
204
- StrictDOMProps & ViewProps,
211
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
205
212
  TamaguiElement,
206
- StrictDOMProps & StackNonStyleProps,
213
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
207
214
  StackStyleBase
208
215
  >({
209
216
  ...viewStaticConfig,
@@ -229,9 +236,9 @@ const article = domTag(
229
236
  const aside = domTag(
230
237
  'aside',
231
238
  createComponent<
232
- StrictDOMProps & ViewProps,
239
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
233
240
  TamaguiElement,
234
- StrictDOMProps & StackNonStyleProps,
241
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
235
242
  StackStyleBase
236
243
  >({
237
244
  ...viewStaticConfig,
@@ -257,9 +264,9 @@ const aside = domTag(
257
264
  const b = domTag(
258
265
  'b',
259
266
  createComponent<
260
- StrictDOMProps & TextProps,
267
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
261
268
  TamaguiTextElement,
262
- StrictDOMProps & TextNonStyleProps,
269
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
263
270
  TextStylePropsBase
264
271
  >({
265
272
  ...textStaticConfig,
@@ -279,9 +286,9 @@ const b = domTag(
279
286
  const bdi = domTag(
280
287
  'bdi',
281
288
  createComponent<
282
- StrictDOMProps & TextProps,
289
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
283
290
  TamaguiTextElement,
284
- StrictDOMProps & TextNonStyleProps,
291
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
285
292
  TextStylePropsBase
286
293
  >({
287
294
  ...textStaticConfig,
@@ -300,9 +307,9 @@ const bdi = domTag(
300
307
  const bdo = domTag(
301
308
  'bdo',
302
309
  createComponent<
303
- StrictDOMProps & TextProps,
310
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
304
311
  TamaguiTextElement,
305
- StrictDOMProps & TextNonStyleProps,
312
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
306
313
  TextStylePropsBase
307
314
  >({
308
315
  ...textStaticConfig,
@@ -321,9 +328,9 @@ const bdo = domTag(
321
328
  const blockquote = domTag(
322
329
  'blockquote',
323
330
  createComponent<
324
- StrictDOMProps & ViewProps,
331
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
325
332
  TamaguiElement,
326
- StrictDOMProps & StackNonStyleProps,
333
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
327
334
  StackStyleBase
328
335
  >({
329
336
  ...viewStaticConfig,
@@ -349,9 +356,9 @@ const blockquote = domTag(
349
356
  const br = domTag(
350
357
  'br',
351
358
  createComponent<
352
- StrictDOMVoidProps & TextProps,
359
+ MergeHTMLProps<StrictDOMVoidProps, TextProps, TextNonStyleProps>,
353
360
  TamaguiTextElement,
354
- StrictDOMVoidProps & TextNonStyleProps,
361
+ MergeHTMLProps<StrictDOMVoidProps, TextNonStyleProps, TextNonStyleProps>,
355
362
  TextStylePropsBase
356
363
  >({
357
364
  ...textStaticConfig,
@@ -370,9 +377,9 @@ const br = domTag(
370
377
  const button = domTag(
371
378
  'button',
372
379
  createComponent<
373
- StrictDOMButtonProps & ViewProps,
380
+ MergeHTMLProps<StrictDOMButtonProps, ViewProps, StackNonStyleProps>,
374
381
  TamaguiElement,
375
- StrictDOMButtonProps & StackNonStyleProps,
382
+ MergeHTMLProps<StrictDOMButtonProps, StackNonStyleProps, StackNonStyleProps>,
376
383
  StackStyleBase
377
384
  >({
378
385
  ...viewStaticConfig,
@@ -392,9 +399,9 @@ const button = domTag(
392
399
  const code = domTag(
393
400
  'code',
394
401
  createComponent<
395
- StrictDOMProps & TextProps,
402
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
396
403
  TamaguiTextElement,
397
- StrictDOMProps & TextNonStyleProps,
404
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
398
405
  TextStylePropsBase
399
406
  >({
400
407
  ...textStaticConfig,
@@ -414,9 +421,9 @@ const code = domTag(
414
421
  const del = domTag(
415
422
  'del',
416
423
  createComponent<
417
- StrictDOMProps & TextProps,
424
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
418
425
  TamaguiTextElement,
419
- StrictDOMProps & TextNonStyleProps,
426
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
420
427
  TextStylePropsBase
421
428
  >({
422
429
  ...textStaticConfig,
@@ -436,9 +443,9 @@ const del = domTag(
436
443
  const div = domTag(
437
444
  'div',
438
445
  createComponent<
439
- StrictDOMProps & ViewProps,
446
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
440
447
  TamaguiElement,
441
- StrictDOMProps & StackNonStyleProps,
448
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
442
449
  StackStyleBase
443
450
  >({
444
451
  ...viewStaticConfig,
@@ -464,9 +471,9 @@ const div = domTag(
464
471
  const em = domTag(
465
472
  'em',
466
473
  createComponent<
467
- StrictDOMProps & TextProps,
474
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
468
475
  TamaguiTextElement,
469
- StrictDOMProps & TextNonStyleProps,
476
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
470
477
  TextStylePropsBase
471
478
  >({
472
479
  ...textStaticConfig,
@@ -486,9 +493,9 @@ const em = domTag(
486
493
  const fieldset = domTag(
487
494
  'fieldset',
488
495
  createComponent<
489
- StrictDOMProps & ViewProps,
496
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
490
497
  TamaguiElement,
491
- StrictDOMProps & StackNonStyleProps,
498
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
492
499
  StackStyleBase
493
500
  >({
494
501
  ...viewStaticConfig,
@@ -514,9 +521,9 @@ const fieldset = domTag(
514
521
  const footer = domTag(
515
522
  'footer',
516
523
  createComponent<
517
- StrictDOMProps & ViewProps,
524
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
518
525
  TamaguiElement,
519
- StrictDOMProps & StackNonStyleProps,
526
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
520
527
  StackStyleBase
521
528
  >({
522
529
  ...viewStaticConfig,
@@ -542,9 +549,9 @@ const footer = domTag(
542
549
  const form = domTag(
543
550
  'form',
544
551
  createComponent<
545
- StrictDOMProps & ViewProps,
552
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
546
553
  TamaguiElement,
547
- StrictDOMProps & StackNonStyleProps,
554
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
548
555
  StackStyleBase
549
556
  >({
550
557
  ...viewStaticConfig,
@@ -570,9 +577,9 @@ const form = domTag(
570
577
  const h1 = domTag(
571
578
  'h1',
572
579
  createComponent<
573
- StrictDOMProps & TextProps,
580
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
574
581
  TamaguiTextElement,
575
- StrictDOMProps & TextNonStyleProps,
582
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
576
583
  TextStylePropsBase
577
584
  >({
578
585
  ...textStaticConfig,
@@ -600,9 +607,9 @@ const h1 = domTag(
600
607
  const h2 = domTag(
601
608
  'h2',
602
609
  createComponent<
603
- StrictDOMProps & TextProps,
610
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
604
611
  TamaguiTextElement,
605
- StrictDOMProps & TextNonStyleProps,
612
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
606
613
  TextStylePropsBase
607
614
  >({
608
615
  ...textStaticConfig,
@@ -630,9 +637,9 @@ const h2 = domTag(
630
637
  const h3 = domTag(
631
638
  'h3',
632
639
  createComponent<
633
- StrictDOMProps & TextProps,
640
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
634
641
  TamaguiTextElement,
635
- StrictDOMProps & TextNonStyleProps,
642
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
636
643
  TextStylePropsBase
637
644
  >({
638
645
  ...textStaticConfig,
@@ -660,9 +667,9 @@ const h3 = domTag(
660
667
  const h4 = domTag(
661
668
  'h4',
662
669
  createComponent<
663
- StrictDOMProps & TextProps,
670
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
664
671
  TamaguiTextElement,
665
- StrictDOMProps & TextNonStyleProps,
672
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
666
673
  TextStylePropsBase
667
674
  >({
668
675
  ...textStaticConfig,
@@ -690,9 +697,9 @@ const h4 = domTag(
690
697
  const h5 = domTag(
691
698
  'h5',
692
699
  createComponent<
693
- StrictDOMProps & TextProps,
700
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
694
701
  TamaguiTextElement,
695
- StrictDOMProps & TextNonStyleProps,
702
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
696
703
  TextStylePropsBase
697
704
  >({
698
705
  ...textStaticConfig,
@@ -720,9 +727,9 @@ const h5 = domTag(
720
727
  const h6 = domTag(
721
728
  'h6',
722
729
  createComponent<
723
- StrictDOMProps & TextProps,
730
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
724
731
  TamaguiTextElement,
725
- StrictDOMProps & TextNonStyleProps,
732
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
726
733
  TextStylePropsBase
727
734
  >({
728
735
  ...textStaticConfig,
@@ -750,9 +757,9 @@ const h6 = domTag(
750
757
  const header = domTag(
751
758
  'header',
752
759
  createComponent<
753
- StrictDOMProps & ViewProps,
760
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
754
761
  TamaguiElement,
755
- StrictDOMProps & StackNonStyleProps,
762
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
756
763
  StackStyleBase
757
764
  >({
758
765
  ...viewStaticConfig,
@@ -778,9 +785,9 @@ const header = domTag(
778
785
  const hr = domTag(
779
786
  'hr',
780
787
  createComponent<
781
- StrictDOMVoidProps & ViewProps,
788
+ MergeHTMLProps<StrictDOMVoidProps, ViewProps, StackNonStyleProps>,
782
789
  TamaguiElement,
783
- StrictDOMVoidProps & StackNonStyleProps,
790
+ MergeHTMLProps<StrictDOMVoidProps, StackNonStyleProps, StackNonStyleProps>,
784
791
  StackStyleBase
785
792
  >({
786
793
  ...viewStaticConfig,
@@ -808,9 +815,9 @@ const hr = domTag(
808
815
  const i = domTag(
809
816
  'i',
810
817
  createComponent<
811
- StrictDOMProps & TextProps,
818
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
812
819
  TamaguiTextElement,
813
- StrictDOMProps & TextNonStyleProps,
820
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
814
821
  TextStylePropsBase
815
822
  >({
816
823
  ...textStaticConfig,
@@ -830,9 +837,9 @@ const i = domTag(
830
837
  const img = domTag(
831
838
  'img',
832
839
  createComponent<
833
- StrictDOMImageProps & ViewProps,
840
+ MergeHTMLProps<StrictDOMImageProps, ViewProps, StackNonStyleProps>,
834
841
  TamaguiElement,
835
- StrictDOMImageProps & StackNonStyleProps,
842
+ MergeHTMLProps<StrictDOMImageProps, StackNonStyleProps, StackNonStyleProps>,
836
843
  StackStyleBase
837
844
  >({
838
845
  ...viewStaticConfig,
@@ -851,9 +858,9 @@ const img = domTag(
851
858
  const input = domTag(
852
859
  'input',
853
860
  createComponent<
854
- StrictDOMInputProps & TextProps,
861
+ MergeHTMLProps<StrictDOMInputProps, TextProps, TextNonStyleProps>,
855
862
  TamaguiTextElement,
856
- StrictDOMInputProps & TextNonStyleProps,
863
+ MergeHTMLProps<StrictDOMInputProps, TextNonStyleProps, TextNonStyleProps>,
857
864
  TextStylePropsBase
858
865
  >({
859
866
  ...textStaticConfig,
@@ -874,9 +881,9 @@ const input = domTag(
874
881
  const ins = domTag(
875
882
  'ins',
876
883
  createComponent<
877
- StrictDOMProps & TextProps,
884
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
878
885
  TamaguiTextElement,
879
- StrictDOMProps & TextNonStyleProps,
886
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
880
887
  TextStylePropsBase
881
888
  >({
882
889
  ...textStaticConfig,
@@ -896,9 +903,9 @@ const ins = domTag(
896
903
  const kbd = domTag(
897
904
  'kbd',
898
905
  createComponent<
899
- StrictDOMProps & TextProps,
906
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
900
907
  TamaguiTextElement,
901
- StrictDOMProps & TextNonStyleProps,
908
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
902
909
  TextStylePropsBase
903
910
  >({
904
911
  ...textStaticConfig,
@@ -918,9 +925,9 @@ const kbd = domTag(
918
925
  const label = domTag(
919
926
  'label',
920
927
  createComponent<
921
- StrictDOMLabelProps & TextProps,
928
+ MergeHTMLProps<StrictDOMLabelProps, TextProps, TextNonStyleProps>,
922
929
  TamaguiTextElement,
923
- StrictDOMLabelProps & TextNonStyleProps,
930
+ MergeHTMLProps<StrictDOMLabelProps, TextNonStyleProps, TextNonStyleProps>,
924
931
  TextStylePropsBase
925
932
  >({
926
933
  ...textStaticConfig,
@@ -939,9 +946,9 @@ const label = domTag(
939
946
  const li = domTag(
940
947
  'li',
941
948
  createComponent<
942
- StrictDOMListItemProps & ViewProps,
949
+ MergeHTMLProps<StrictDOMListItemProps, ViewProps, StackNonStyleProps>,
943
950
  TamaguiElement,
944
- StrictDOMListItemProps & StackNonStyleProps,
951
+ MergeHTMLProps<StrictDOMListItemProps, StackNonStyleProps, StackNonStyleProps>,
945
952
  StackStyleBase
946
953
  >({
947
954
  ...viewStaticConfig,
@@ -967,9 +974,9 @@ const li = domTag(
967
974
  const main = domTag(
968
975
  'main',
969
976
  createComponent<
970
- StrictDOMProps & ViewProps,
977
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
971
978
  TamaguiElement,
972
- StrictDOMProps & StackNonStyleProps,
979
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
973
980
  StackStyleBase
974
981
  >({
975
982
  ...viewStaticConfig,
@@ -995,9 +1002,9 @@ const main = domTag(
995
1002
  const mark = domTag(
996
1003
  'mark',
997
1004
  createComponent<
998
- StrictDOMProps & TextProps,
1005
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
999
1006
  TamaguiTextElement,
1000
- StrictDOMProps & TextNonStyleProps,
1007
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
1001
1008
  TextStylePropsBase
1002
1009
  >({
1003
1010
  ...textStaticConfig,
@@ -1018,9 +1025,9 @@ const mark = domTag(
1018
1025
  const nav = domTag(
1019
1026
  'nav',
1020
1027
  createComponent<
1021
- StrictDOMProps & ViewProps,
1028
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
1022
1029
  TamaguiElement,
1023
- StrictDOMProps & StackNonStyleProps,
1030
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
1024
1031
  StackStyleBase
1025
1032
  >({
1026
1033
  ...viewStaticConfig,
@@ -1046,9 +1053,9 @@ const nav = domTag(
1046
1053
  const ol = domTag(
1047
1054
  'ol',
1048
1055
  createComponent<
1049
- StrictDOMProps & ViewProps,
1056
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
1050
1057
  TamaguiElement,
1051
- StrictDOMProps & StackNonStyleProps,
1058
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
1052
1059
  StackStyleBase
1053
1060
  >({
1054
1061
  ...viewStaticConfig,
@@ -1084,9 +1091,9 @@ const option = unsupportedDOMTag(
1084
1091
  const p = domTag(
1085
1092
  'p',
1086
1093
  createComponent<
1087
- StrictDOMProps & TextProps,
1094
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
1088
1095
  TamaguiTextElement,
1089
- StrictDOMProps & TextNonStyleProps,
1096
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
1090
1097
  TextStylePropsBase
1091
1098
  >({
1092
1099
  ...textStaticConfig,
@@ -1112,9 +1119,9 @@ const p = domTag(
1112
1119
  const pre = domTag(
1113
1120
  'pre',
1114
1121
  createComponent<
1115
- StrictDOMProps & TextProps,
1122
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
1116
1123
  TamaguiTextElement,
1117
- StrictDOMProps & TextNonStyleProps,
1124
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
1118
1125
  TextStylePropsBase
1119
1126
  >({
1120
1127
  ...textStaticConfig,
@@ -1141,9 +1148,9 @@ const pre = domTag(
1141
1148
  const s = domTag(
1142
1149
  's',
1143
1150
  createComponent<
1144
- StrictDOMProps & TextProps,
1151
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
1145
1152
  TamaguiTextElement,
1146
- StrictDOMProps & TextNonStyleProps,
1153
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
1147
1154
  TextStylePropsBase
1148
1155
  >({
1149
1156
  ...textStaticConfig,
@@ -1163,9 +1170,9 @@ const s = domTag(
1163
1170
  const section = domTag(
1164
1171
  'section',
1165
1172
  createComponent<
1166
- StrictDOMProps & ViewProps,
1173
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
1167
1174
  TamaguiElement,
1168
- StrictDOMProps & StackNonStyleProps,
1175
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
1169
1176
  StackStyleBase
1170
1177
  >({
1171
1178
  ...viewStaticConfig,
@@ -1196,9 +1203,9 @@ const select = unsupportedDOMTag(
1196
1203
  const span = domTag(
1197
1204
  'span',
1198
1205
  createComponent<
1199
- StrictDOMProps & TextProps,
1206
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
1200
1207
  TamaguiTextElement,
1201
- StrictDOMProps & TextNonStyleProps,
1208
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
1202
1209
  TextStylePropsBase
1203
1210
  >({
1204
1211
  ...textStaticConfig,
@@ -1217,9 +1224,9 @@ const span = domTag(
1217
1224
  const strong = domTag(
1218
1225
  'strong',
1219
1226
  createComponent<
1220
- StrictDOMProps & TextProps,
1227
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
1221
1228
  TamaguiTextElement,
1222
- StrictDOMProps & TextNonStyleProps,
1229
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
1223
1230
  TextStylePropsBase
1224
1231
  >({
1225
1232
  ...textStaticConfig,
@@ -1239,9 +1246,9 @@ const strong = domTag(
1239
1246
  const sub = domTag(
1240
1247
  'sub',
1241
1248
  createComponent<
1242
- StrictDOMProps & TextProps,
1249
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
1243
1250
  TamaguiTextElement,
1244
- StrictDOMProps & TextNonStyleProps,
1251
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
1245
1252
  TextStylePropsBase
1246
1253
  >({
1247
1254
  ...textStaticConfig,
@@ -1260,9 +1267,9 @@ const sub = domTag(
1260
1267
  const sup = domTag(
1261
1268
  'sup',
1262
1269
  createComponent<
1263
- StrictDOMProps & TextProps,
1270
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
1264
1271
  TamaguiTextElement,
1265
- StrictDOMProps & TextNonStyleProps,
1272
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
1266
1273
  TextStylePropsBase
1267
1274
  >({
1268
1275
  ...textStaticConfig,
@@ -1281,9 +1288,9 @@ const sup = domTag(
1281
1288
  const textarea = domTag(
1282
1289
  'textarea',
1283
1290
  createComponent<
1284
- StrictDOMTextAreaProps & TextProps,
1291
+ MergeHTMLProps<StrictDOMTextAreaProps, TextProps, TextNonStyleProps>,
1285
1292
  TamaguiTextElement,
1286
- StrictDOMTextAreaProps & TextNonStyleProps,
1293
+ MergeHTMLProps<StrictDOMTextAreaProps, TextNonStyleProps, TextNonStyleProps>,
1287
1294
  TextStylePropsBase
1288
1295
  >({
1289
1296
  ...textStaticConfig,
@@ -1305,9 +1312,9 @@ const textarea = domTag(
1305
1312
  const u = domTag(
1306
1313
  'u',
1307
1314
  createComponent<
1308
- StrictDOMProps & TextProps,
1315
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
1309
1316
  TamaguiTextElement,
1310
- StrictDOMProps & TextNonStyleProps,
1317
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
1311
1318
  TextStylePropsBase
1312
1319
  >({
1313
1320
  ...textStaticConfig,
@@ -1327,9 +1334,9 @@ const u = domTag(
1327
1334
  const ul = domTag(
1328
1335
  'ul',
1329
1336
  createComponent<
1330
- StrictDOMProps & ViewProps,
1337
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
1331
1338
  TamaguiElement,
1332
- StrictDOMProps & StackNonStyleProps,
1339
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
1333
1340
  StackStyleBase
1334
1341
  >({
1335
1342
  ...viewStaticConfig,