@tamagui/web 3.0.0-beta.755.1 → 3.0.0-beta.804.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 (424) hide show
  1. package/dist/cjs/createComponent.cjs +83 -86
  2. package/dist/cjs/createComponent.native.cjs +96 -103
  3. package/dist/cjs/createComponent.native.js +96 -103
  4. package/dist/cjs/createComponent.native.js.map +1 -1
  5. package/dist/cjs/createTamagui.cjs +10 -8
  6. package/dist/cjs/createTamagui.native.cjs +10 -8
  7. package/dist/cjs/createTamagui.native.js +10 -8
  8. package/dist/cjs/createTamagui.native.js.map +1 -1
  9. package/dist/cjs/dom/htmlRuntime.native.cjs +1 -0
  10. package/dist/cjs/dom/htmlRuntime.native.js +1 -0
  11. package/dist/cjs/dom/htmlRuntime.native.js.map +1 -1
  12. package/dist/cjs/helpers/defaultAnimationDriver.cjs +0 -1
  13. package/dist/cjs/helpers/defaultAnimationDriver.native.cjs +0 -1
  14. package/dist/cjs/helpers/defaultAnimationDriver.native.js +0 -1
  15. package/dist/cjs/helpers/defaultAnimationDriver.native.js.map +1 -1
  16. package/dist/cjs/helpers/directStyleCSS.cjs +348 -0
  17. package/dist/cjs/helpers/directStyleCSS.native.cjs +20 -0
  18. package/dist/cjs/helpers/directStyleCSS.native.js +22 -0
  19. package/dist/cjs/helpers/directStyleCSS.native.js.map +1 -0
  20. package/dist/cjs/helpers/directStyleCSSCompiled.cjs +40 -0
  21. package/dist/cjs/helpers/directStyleCSSCompiled.native.cjs +46 -0
  22. package/dist/cjs/helpers/directStyleCSSCompiled.native.js +48 -0
  23. package/dist/cjs/helpers/directStyleCSSCompiled.native.js.map +1 -0
  24. package/dist/cjs/helpers/getCSSStylesAtomic.cjs +92 -74
  25. package/dist/cjs/helpers/{getFontLanguage.native.cjs → getCSSStylesAtomicCompiled.cjs} +12 -8
  26. package/dist/cjs/helpers/{getFontLanguage.native.js → getCSSStylesAtomicCompiled.native.cjs} +12 -8
  27. package/dist/cjs/helpers/getCSSStylesAtomicCompiled.native.js +36 -0
  28. package/dist/cjs/helpers/getCSSStylesAtomicCompiled.native.js.map +1 -0
  29. package/dist/cjs/helpers/getSplitStyles.cjs +2417 -548
  30. package/dist/cjs/helpers/getSplitStyles.native.cjs +2758 -621
  31. package/dist/cjs/helpers/getSplitStyles.native.js +2758 -621
  32. package/dist/cjs/helpers/getSplitStyles.native.js.map +1 -1
  33. package/dist/cjs/helpers/getVariantExtras.cjs +8 -3
  34. package/dist/cjs/helpers/getVariantExtras.native.cjs +8 -3
  35. package/dist/cjs/helpers/getVariantExtras.native.js +8 -3
  36. package/dist/cjs/helpers/getVariantExtras.native.js.map +1 -1
  37. package/dist/cjs/helpers/insertStyleRule.cjs +3 -2
  38. package/dist/cjs/helpers/insertStyleRule.native.cjs +70 -7
  39. package/dist/cjs/helpers/insertStyleRule.native.js +70 -7
  40. package/dist/cjs/helpers/insertStyleRule.native.js.map +1 -1
  41. package/dist/cjs/helpers/mediaState.cjs +12 -0
  42. package/dist/cjs/helpers/mediaState.native.cjs +12 -0
  43. package/dist/cjs/helpers/mediaState.native.js +12 -0
  44. package/dist/cjs/helpers/mediaState.native.js.map +1 -1
  45. package/dist/cjs/helpers/normalizeStyle.cjs +16 -2
  46. package/dist/cjs/helpers/normalizeStyle.native.cjs +16 -2
  47. package/dist/cjs/helpers/normalizeStyle.native.js +16 -2
  48. package/dist/cjs/helpers/normalizeStyle.native.js.map +1 -1
  49. package/dist/cjs/helpers/resolveRem.cjs +1 -1
  50. package/dist/cjs/helpers/skipProps.cjs +6 -1
  51. package/dist/cjs/helpers/skipProps.native.cjs +6 -1
  52. package/dist/cjs/helpers/skipProps.native.js +6 -1
  53. package/dist/cjs/helpers/skipProps.native.js.map +1 -1
  54. package/dist/cjs/helpers/styleFrontend.cjs +2 -8
  55. package/dist/cjs/helpers/styleFrontend.native.cjs +2 -10
  56. package/dist/cjs/helpers/styleFrontend.native.js +2 -10
  57. package/dist/cjs/helpers/styleFrontend.native.js.map +1 -1
  58. package/dist/cjs/helpers/styleToCSS.cjs +59 -0
  59. package/dist/cjs/helpers/{normalizeStylePropKeys.cjs → styleToCSS.native.cjs} +6 -4
  60. package/dist/cjs/helpers/{getFontLanguage.cjs → styleToCSS.native.js} +8 -4
  61. package/dist/cjs/helpers/styleToCSS.native.js.map +1 -0
  62. package/dist/cjs/helpers/subscribeToContextGroup.cjs +28 -1
  63. package/dist/cjs/helpers/subscribeToContextGroup.native.cjs +45 -1
  64. package/dist/cjs/helpers/subscribeToContextGroup.native.js +45 -1
  65. package/dist/cjs/helpers/subscribeToContextGroup.native.js.map +1 -1
  66. package/dist/cjs/helpers/variables.cjs +3 -2
  67. package/dist/cjs/helpers/variables.native.cjs +3 -2
  68. package/dist/cjs/helpers/variables.native.js +3 -2
  69. package/dist/cjs/helpers/variables.native.js.map +1 -1
  70. package/dist/cjs/helpers/wrapStyleTags.cjs +5 -3
  71. package/dist/cjs/helpers/wrapStyleTags.native.cjs +3 -1
  72. package/dist/cjs/helpers/wrapStyleTags.native.js +3 -1
  73. package/dist/cjs/helpers/wrapStyleTags.native.js.map +1 -1
  74. package/dist/cjs/hooks/useComponentState.cjs +70 -89
  75. package/dist/cjs/hooks/useComponentState.native.cjs +70 -88
  76. package/dist/cjs/hooks/useComponentState.native.js +70 -88
  77. package/dist/cjs/hooks/useComponentState.native.js.map +1 -1
  78. package/dist/cjs/hooks/useMedia.cjs +3 -15
  79. package/dist/cjs/hooks/useMedia.native.cjs +3 -15
  80. package/dist/cjs/hooks/useMedia.native.js +3 -15
  81. package/dist/cjs/hooks/useMedia.native.js.map +1 -1
  82. package/dist/cjs/hooks/useProps.cjs +7 -5
  83. package/dist/cjs/hooks/useProps.native.cjs +7 -5
  84. package/dist/cjs/hooks/useProps.native.js +7 -5
  85. package/dist/cjs/hooks/useProps.native.js.map +1 -1
  86. package/dist/cjs/hooks/useSplitStyles.cjs +42 -0
  87. package/dist/cjs/hooks/useSplitStyles.native.cjs +42 -0
  88. package/dist/cjs/hooks/useSplitStyles.native.js +44 -0
  89. package/dist/cjs/hooks/useSplitStyles.native.js.map +1 -0
  90. package/dist/cjs/index.cjs +184 -70
  91. package/dist/cjs/index.native.cjs +184 -70
  92. package/dist/cjs/index.native.js +184 -70
  93. package/dist/cjs/index.native.js.map +1 -1
  94. package/dist/cjs/insertFont.cjs +1 -1
  95. package/dist/cjs/insertFont.native.cjs +1 -0
  96. package/dist/cjs/insertFont.native.js +1 -0
  97. package/dist/cjs/insertFont.native.js.map +1 -1
  98. package/dist/cjs/internal-runtime.cjs +33 -6
  99. package/dist/cjs/internal-runtime.native.cjs +33 -6
  100. package/dist/cjs/internal-runtime.native.js +33 -6
  101. package/dist/cjs/internal-runtime.native.js.map +1 -1
  102. package/dist/cjs/setupReactNative.cjs +1 -29
  103. package/dist/cjs/setupReactNative.native.cjs +1 -3
  104. package/dist/cjs/setupReactNative.native.js +1 -3
  105. package/dist/cjs/setupReactNative.native.js.map +1 -1
  106. package/dist/cjs/static-resolve.cjs +229 -0
  107. package/dist/cjs/static-resolve.native.cjs +242 -0
  108. package/dist/cjs/static-resolve.native.js +244 -0
  109. package/dist/cjs/static-resolve.native.js.map +1 -0
  110. package/dist/cjs/styled.cjs +23 -37
  111. package/dist/cjs/styled.native.cjs +22 -37
  112. package/dist/cjs/styled.native.js +22 -37
  113. package/dist/cjs/styled.native.js.map +1 -1
  114. package/dist/cjs/views/TamaguiProvider.cjs +4 -8
  115. package/dist/cjs/views/TamaguiProvider.native.cjs +4 -8
  116. package/dist/cjs/views/TamaguiProvider.native.js +4 -8
  117. package/dist/cjs/views/TamaguiProvider.native.js.map +1 -1
  118. package/dist/cjs/views/ThemeUpdate.cjs +1 -1
  119. package/dist/cjs/views/ThemeUpdate.native.cjs +1 -1
  120. package/dist/cjs/views/ThemeUpdate.native.js +1 -1
  121. package/dist/cjs/views/ThemeUpdate.native.js.map +1 -1
  122. package/dist/esm/createComponent.mjs +85 -88
  123. package/dist/esm/createComponent.mjs.map +1 -1
  124. package/dist/esm/createComponent.native.js +98 -105
  125. package/dist/esm/createComponent.native.js.map +1 -1
  126. package/dist/esm/createTamagui.mjs +10 -8
  127. package/dist/esm/createTamagui.mjs.map +1 -1
  128. package/dist/esm/createTamagui.native.js +10 -8
  129. package/dist/esm/createTamagui.native.js.map +1 -1
  130. package/dist/esm/dom/htmlRuntime.native.js +1 -0
  131. package/dist/esm/dom/htmlRuntime.native.js.map +1 -1
  132. package/dist/esm/helpers/defaultAnimationDriver.mjs +0 -1
  133. package/dist/esm/helpers/defaultAnimationDriver.mjs.map +1 -1
  134. package/dist/esm/helpers/defaultAnimationDriver.native.js +0 -1
  135. package/dist/esm/helpers/defaultAnimationDriver.native.js.map +1 -1
  136. package/dist/esm/helpers/directStyleCSS.mjs +320 -0
  137. package/dist/esm/helpers/directStyleCSS.mjs.map +1 -0
  138. package/dist/esm/helpers/directStyleCSS.native.js +1 -0
  139. package/dist/esm/helpers/directStyleCSSCompiled.mjs +11 -0
  140. package/dist/esm/helpers/directStyleCSSCompiled.mjs.map +1 -0
  141. package/dist/esm/helpers/directStyleCSSCompiled.native.js +15 -0
  142. package/dist/esm/helpers/directStyleCSSCompiled.native.js.map +1 -0
  143. package/dist/esm/helpers/getCSSStylesAtomic.mjs +86 -72
  144. package/dist/esm/helpers/getCSSStylesAtomic.mjs.map +1 -1
  145. package/dist/esm/helpers/getCSSStylesAtomicCompiled.mjs +9 -0
  146. package/dist/esm/helpers/getCSSStylesAtomicCompiled.mjs.map +1 -0
  147. package/dist/esm/helpers/getCSSStylesAtomicCompiled.native.js +9 -0
  148. package/dist/esm/helpers/getCSSStylesAtomicCompiled.native.js.map +1 -0
  149. package/dist/esm/helpers/getSplitStyles.mjs +2406 -545
  150. package/dist/esm/helpers/getSplitStyles.mjs.map +1 -1
  151. package/dist/esm/helpers/getSplitStyles.native.js +2751 -618
  152. package/dist/esm/helpers/getSplitStyles.native.js.map +1 -1
  153. package/dist/esm/helpers/getVariantExtras.mjs +8 -3
  154. package/dist/esm/helpers/getVariantExtras.mjs.map +1 -1
  155. package/dist/esm/helpers/getVariantExtras.native.js +8 -3
  156. package/dist/esm/helpers/getVariantExtras.native.js.map +1 -1
  157. package/dist/esm/helpers/insertStyleRule.mjs +3 -2
  158. package/dist/esm/helpers/insertStyleRule.mjs.map +1 -1
  159. package/dist/esm/helpers/insertStyleRule.native.js +71 -5
  160. package/dist/esm/helpers/insertStyleRule.native.js.map +1 -1
  161. package/dist/esm/helpers/mediaState.mjs +12 -1
  162. package/dist/esm/helpers/mediaState.mjs.map +1 -1
  163. package/dist/esm/helpers/mediaState.native.js +12 -1
  164. package/dist/esm/helpers/mediaState.native.js.map +1 -1
  165. package/dist/esm/helpers/normalizeStyle.mjs +16 -2
  166. package/dist/esm/helpers/normalizeStyle.mjs.map +1 -1
  167. package/dist/esm/helpers/normalizeStyle.native.js +16 -2
  168. package/dist/esm/helpers/normalizeStyle.native.js.map +1 -1
  169. package/dist/esm/helpers/resolveRem.mjs +1 -1
  170. package/dist/esm/helpers/resolveRem.mjs.map +1 -1
  171. package/dist/esm/helpers/skipProps.mjs +3 -1
  172. package/dist/esm/helpers/skipProps.mjs.map +1 -1
  173. package/dist/esm/helpers/skipProps.native.js +3 -1
  174. package/dist/esm/helpers/skipProps.native.js.map +1 -1
  175. package/dist/esm/helpers/styleFrontend.mjs +2 -4
  176. package/dist/esm/helpers/styleFrontend.mjs.map +1 -1
  177. package/dist/esm/helpers/styleFrontend.native.js +2 -6
  178. package/dist/esm/helpers/styleFrontend.native.js.map +1 -1
  179. package/dist/esm/helpers/styleToCSS.mjs +40 -0
  180. package/dist/esm/helpers/styleToCSS.mjs.map +1 -0
  181. package/dist/esm/helpers/styleToCSS.native.js +4 -0
  182. package/dist/esm/helpers/styleToCSS.native.js.map +1 -0
  183. package/dist/esm/helpers/subscribeToContextGroup.mjs +25 -1
  184. package/dist/esm/helpers/subscribeToContextGroup.mjs.map +1 -1
  185. package/dist/esm/helpers/subscribeToContextGroup.native.js +42 -1
  186. package/dist/esm/helpers/subscribeToContextGroup.native.js.map +1 -1
  187. package/dist/esm/helpers/variables.mjs +2 -1
  188. package/dist/esm/helpers/variables.mjs.map +1 -1
  189. package/dist/esm/helpers/variables.native.js +2 -1
  190. package/dist/esm/helpers/variables.native.js.map +1 -1
  191. package/dist/esm/helpers/wrapStyleTags.mjs +5 -3
  192. package/dist/esm/helpers/wrapStyleTags.mjs.map +1 -1
  193. package/dist/esm/helpers/wrapStyleTags.native.js +3 -1
  194. package/dist/esm/helpers/wrapStyleTags.native.js.map +1 -1
  195. package/dist/esm/hooks/useComponentState.mjs +71 -90
  196. package/dist/esm/hooks/useComponentState.mjs.map +1 -1
  197. package/dist/esm/hooks/useComponentState.native.js +71 -89
  198. package/dist/esm/hooks/useComponentState.native.js.map +1 -1
  199. package/dist/esm/hooks/useMedia.mjs +2 -15
  200. package/dist/esm/hooks/useMedia.mjs.map +1 -1
  201. package/dist/esm/hooks/useMedia.native.js +2 -15
  202. package/dist/esm/hooks/useMedia.native.js.map +1 -1
  203. package/dist/esm/hooks/useProps.mjs +7 -5
  204. package/dist/esm/hooks/useProps.mjs.map +1 -1
  205. package/dist/esm/hooks/useProps.native.js +7 -5
  206. package/dist/esm/hooks/useProps.native.js.map +1 -1
  207. package/dist/esm/hooks/useSplitStyles.mjs +17 -0
  208. package/dist/esm/hooks/useSplitStyles.mjs.map +1 -0
  209. package/dist/esm/hooks/useSplitStyles.native.js +14 -0
  210. package/dist/esm/hooks/useSplitStyles.native.js.map +1 -0
  211. package/dist/esm/index.js +57 -137
  212. package/dist/esm/index.mjs +57 -137
  213. package/dist/esm/index.native.js +57 -137
  214. package/dist/esm/insertFont.mjs +1 -1
  215. package/dist/esm/insertFont.mjs.map +1 -1
  216. package/dist/esm/insertFont.native.js +1 -0
  217. package/dist/esm/insertFont.native.js.map +1 -1
  218. package/dist/esm/internal-runtime.mjs +23 -4
  219. package/dist/esm/internal-runtime.mjs.map +1 -1
  220. package/dist/esm/internal-runtime.native.js +23 -4
  221. package/dist/esm/internal-runtime.native.js.map +1 -1
  222. package/dist/esm/setupReactNative.mjs +1 -29
  223. package/dist/esm/setupReactNative.mjs.map +1 -1
  224. package/dist/esm/setupReactNative.native.js +1 -3
  225. package/dist/esm/setupReactNative.native.js.map +1 -1
  226. package/dist/esm/static-resolve.mjs +194 -0
  227. package/dist/esm/static-resolve.mjs.map +1 -0
  228. package/dist/esm/static-resolve.native.js +205 -0
  229. package/dist/esm/static-resolve.native.js.map +1 -0
  230. package/dist/esm/styled.mjs +24 -40
  231. package/dist/esm/styled.mjs.map +1 -1
  232. package/dist/esm/styled.native.js +23 -40
  233. package/dist/esm/styled.native.js.map +1 -1
  234. package/dist/esm/views/TamaguiProvider.mjs +4 -8
  235. package/dist/esm/views/TamaguiProvider.mjs.map +1 -1
  236. package/dist/esm/views/TamaguiProvider.native.js +4 -8
  237. package/dist/esm/views/TamaguiProvider.native.js.map +1 -1
  238. package/dist/esm/views/ThemeUpdate.mjs +1 -1
  239. package/dist/esm/views/ThemeUpdate.mjs.map +1 -1
  240. package/dist/esm/views/ThemeUpdate.native.js +1 -1
  241. package/dist/esm/views/ThemeUpdate.native.js.map +1 -1
  242. package/package.json +25 -15
  243. package/reset.css +3 -3
  244. package/src/createComponent.tsx +175 -192
  245. package/src/createTamagui.ts +13 -10
  246. package/src/dom/html.native.tsx +99 -92
  247. package/src/dom/html.tsx +105 -98
  248. package/src/dom/htmlRuntime.native.tsx +1 -0
  249. package/src/helpers/defaultAnimationDriver.tsx +0 -1
  250. package/src/helpers/directStyleCSS.native.ts +1 -0
  251. package/src/helpers/directStyleCSS.ts +534 -0
  252. package/src/helpers/directStyleCSSCompiled.ts +32 -0
  253. package/src/helpers/getCSSStylesAtomic.ts +168 -88
  254. package/src/helpers/getCSSStylesAtomicCompiled.ts +9 -0
  255. package/src/helpers/getSplitStyles.tsx +4653 -1003
  256. package/src/helpers/getVariantExtras.tsx +15 -3
  257. package/src/helpers/insertStyleRule.tsx +8 -3
  258. package/src/helpers/mediaState.ts +15 -0
  259. package/src/helpers/normalizeStyle.ts +27 -2
  260. package/src/helpers/resolveRem.ts +1 -1
  261. package/src/helpers/skipProps.ts +3 -0
  262. package/src/helpers/styleFrontend.ts +20 -27
  263. package/src/helpers/styleToCSS.native.ts +1 -0
  264. package/src/helpers/styleToCSS.ts +43 -0
  265. package/src/helpers/subscribeToContextGroup.tsx +30 -0
  266. package/src/helpers/variables.ts +2 -1
  267. package/src/helpers/warnOnce.ts +3 -4
  268. package/src/helpers/wrapStyleTags.tsx +1 -1
  269. package/src/hooks/useComponentState.ts +118 -158
  270. package/src/hooks/useMedia.tsx +2 -18
  271. package/src/hooks/useProps.tsx +19 -15
  272. package/src/hooks/useSplitStyles.tsx +26 -0
  273. package/src/index.ts +298 -73
  274. package/src/insertFont.ts +5 -1
  275. package/src/internal-runtime.ts +49 -24
  276. package/src/internalRuntimeTypes.ts +2 -7
  277. package/src/setupReactNative.ts +7 -30
  278. package/src/static-resolve.ts +396 -0
  279. package/src/styled.tsx +34 -11
  280. package/src/types.tsx +41 -31
  281. package/src/views/TamaguiProvider.tsx +23 -22
  282. package/src/views/ThemeUpdate.tsx +3 -1
  283. package/types/createComponent.d.ts.map +1 -1
  284. package/types/createTamagui.d.ts.map +1 -1
  285. package/types/dom/html.d.ts +54 -50
  286. package/types/dom/html.d.ts.map +1 -1
  287. package/types/dom/html.native.d.ts +51 -47
  288. package/types/dom/html.native.d.ts.map +1 -1
  289. package/types/dom/htmlRuntime.native.d.ts.map +1 -1
  290. package/types/helpers/defaultAnimationDriver.d.ts.map +1 -1
  291. package/types/helpers/directStyleCSS.d.ts +28 -0
  292. package/types/helpers/directStyleCSS.d.ts.map +1 -0
  293. package/types/helpers/directStyleCSS.native.d.ts +2 -0
  294. package/types/helpers/directStyleCSS.native.d.ts.map +1 -0
  295. package/types/helpers/directStyleCSSCompiled.d.ts +10 -0
  296. package/types/helpers/directStyleCSSCompiled.d.ts.map +1 -0
  297. package/types/helpers/getCSSStylesAtomic.d.ts +22 -1
  298. package/types/helpers/getCSSStylesAtomic.d.ts.map +1 -1
  299. package/types/helpers/getCSSStylesAtomicCompiled.d.ts +4 -0
  300. package/types/helpers/getCSSStylesAtomicCompiled.d.ts.map +1 -0
  301. package/types/helpers/getSplitStyles.d.ts +11 -4
  302. package/types/helpers/getSplitStyles.d.ts.map +1 -1
  303. package/types/helpers/getVariantExtras.d.ts.map +1 -1
  304. package/types/helpers/insertStyleRule.d.ts.map +1 -1
  305. package/types/helpers/mediaState.d.ts +4 -0
  306. package/types/helpers/mediaState.d.ts.map +1 -1
  307. package/types/helpers/normalizeStyle.d.ts +1 -1
  308. package/types/helpers/normalizeStyle.d.ts.map +1 -1
  309. package/types/helpers/skipProps.d.ts +2 -0
  310. package/types/helpers/skipProps.d.ts.map +1 -1
  311. package/types/helpers/styleFrontend.d.ts +13 -17
  312. package/types/helpers/styleFrontend.d.ts.map +1 -1
  313. package/types/helpers/styleToCSS.d.ts +2 -0
  314. package/types/helpers/styleToCSS.d.ts.map +1 -0
  315. package/types/helpers/styleToCSS.native.d.ts +2 -0
  316. package/types/helpers/styleToCSS.native.d.ts.map +1 -0
  317. package/types/helpers/subscribeToContextGroup.d.ts +1 -0
  318. package/types/helpers/subscribeToContextGroup.d.ts.map +1 -1
  319. package/types/helpers/variables.d.ts.map +1 -1
  320. package/types/helpers/warnOnce.d.ts.map +1 -1
  321. package/types/helpers/webPropsToSkip.native.d.ts +5 -0
  322. package/types/helpers/webPropsToSkip.native.d.ts.map +1 -1
  323. package/types/hooks/useComponentState.d.ts +3 -2
  324. package/types/hooks/useComponentState.d.ts.map +1 -1
  325. package/types/hooks/useMedia.d.ts +1 -5
  326. package/types/hooks/useMedia.d.ts.map +1 -1
  327. package/types/hooks/useProps.d.ts.map +1 -1
  328. package/types/hooks/useSplitStyles.d.ts +3 -0
  329. package/types/hooks/useSplitStyles.d.ts.map +1 -0
  330. package/types/index.d.ts +58 -72
  331. package/types/index.d.ts.map +1 -1
  332. package/types/insertFont.d.ts.map +1 -1
  333. package/types/internal-runtime.d.ts +24 -11
  334. package/types/internal-runtime.d.ts.map +1 -1
  335. package/types/internalRuntimeTypes.d.ts +1 -6
  336. package/types/internalRuntimeTypes.d.ts.map +1 -1
  337. package/types/setupReactNative.d.ts +2 -3
  338. package/types/setupReactNative.d.ts.map +1 -1
  339. package/types/static-resolve.d.ts +79 -0
  340. package/types/static-resolve.d.ts.map +1 -0
  341. package/types/styled.d.ts.map +1 -1
  342. package/types/types.d.ts +30 -23
  343. package/types/types.d.ts.map +1 -1
  344. package/types/views/TamaguiProvider.d.ts.map +1 -1
  345. package/types/views/ThemeUpdate.d.ts.map +1 -1
  346. package/dist/cjs/constants/accessibilityDirectMap.cjs +0 -34
  347. package/dist/cjs/constants/accessibilityDirectMap.native.cjs +0 -36
  348. package/dist/cjs/constants/accessibilityDirectMap.native.js +0 -38
  349. package/dist/cjs/constants/accessibilityDirectMap.native.js.map +0 -1
  350. package/dist/cjs/helpers/directStyle.cjs +0 -962
  351. package/dist/cjs/helpers/directStyle.native.cjs +0 -1165
  352. package/dist/cjs/helpers/directStyle.native.js +0 -1167
  353. package/dist/cjs/helpers/directStyle.native.js.map +0 -1
  354. package/dist/cjs/helpers/frontendProgram.cjs +0 -43
  355. package/dist/cjs/helpers/frontendProgram.native.cjs +0 -49
  356. package/dist/cjs/helpers/frontendProgram.native.js +0 -51
  357. package/dist/cjs/helpers/frontendProgram.native.js.map +0 -1
  358. package/dist/cjs/helpers/getFontLanguage.native.js.map +0 -1
  359. package/dist/cjs/helpers/normalizeStylePropKeys.native.cjs +0 -37
  360. package/dist/cjs/helpers/normalizeStylePropKeys.native.js +0 -39
  361. package/dist/cjs/helpers/normalizeStylePropKeys.native.js.map +0 -1
  362. package/dist/cjs/helpers/propMapper.cjs +0 -384
  363. package/dist/cjs/helpers/propMapper.native.cjs +0 -536
  364. package/dist/cjs/helpers/propMapper.native.js +0 -538
  365. package/dist/cjs/helpers/propMapper.native.js.map +0 -1
  366. package/dist/cjs/helpers/useRenderElement.cjs +0 -47
  367. package/dist/cjs/helpers/useRenderElement.native.cjs +0 -53
  368. package/dist/cjs/helpers/useRenderElement.native.js +0 -55
  369. package/dist/cjs/helpers/useRenderElement.native.js.map +0 -1
  370. package/dist/esm/constants/accessibilityDirectMap.mjs +0 -8
  371. package/dist/esm/constants/accessibilityDirectMap.mjs.map +0 -1
  372. package/dist/esm/constants/accessibilityDirectMap.native.js +0 -8
  373. package/dist/esm/constants/accessibilityDirectMap.native.js.map +0 -1
  374. package/dist/esm/helpers/directStyle.mjs +0 -929
  375. package/dist/esm/helpers/directStyle.mjs.map +0 -1
  376. package/dist/esm/helpers/directStyle.native.js +0 -1132
  377. package/dist/esm/helpers/directStyle.native.js.map +0 -1
  378. package/dist/esm/helpers/frontendProgram.mjs +0 -20
  379. package/dist/esm/helpers/frontendProgram.mjs.map +0 -1
  380. package/dist/esm/helpers/frontendProgram.native.js +0 -24
  381. package/dist/esm/helpers/frontendProgram.native.js.map +0 -1
  382. package/dist/esm/helpers/getFontLanguage.mjs +0 -4
  383. package/dist/esm/helpers/getFontLanguage.mjs.map +0 -1
  384. package/dist/esm/helpers/getFontLanguage.native.js +0 -6
  385. package/dist/esm/helpers/getFontLanguage.native.js.map +0 -1
  386. package/dist/esm/helpers/normalizeStylePropKeys.mjs +0 -4
  387. package/dist/esm/helpers/normalizeStylePropKeys.mjs.map +0 -1
  388. package/dist/esm/helpers/normalizeStylePropKeys.native.js +0 -15
  389. package/dist/esm/helpers/normalizeStylePropKeys.native.js.map +0 -1
  390. package/dist/esm/helpers/propMapper.mjs +0 -360
  391. package/dist/esm/helpers/propMapper.mjs.map +0 -1
  392. package/dist/esm/helpers/propMapper.native.js +0 -511
  393. package/dist/esm/helpers/propMapper.native.js.map +0 -1
  394. package/dist/esm/helpers/useRenderElement.mjs +0 -26
  395. package/dist/esm/helpers/useRenderElement.mjs.map +0 -1
  396. package/dist/esm/helpers/useRenderElement.native.js +0 -31
  397. package/dist/esm/helpers/useRenderElement.native.js.map +0 -1
  398. package/src/constants/accessibilityDirectMap.native.tsx +0 -10
  399. package/src/constants/accessibilityDirectMap.tsx +0 -11
  400. package/src/helpers/directStyle.ts +0 -2294
  401. package/src/helpers/frontendProgram.ts +0 -48
  402. package/src/helpers/getFontLanguage.ts +0 -2
  403. package/src/helpers/normalizeStylePropKeys.native.ts +0 -12
  404. package/src/helpers/normalizeStylePropKeys.ts +0 -3
  405. package/src/helpers/propMapper.ts +0 -721
  406. package/src/helpers/useRenderElement.tsx +0 -73
  407. package/types/constants/accessibilityDirectMap.d.ts +0 -6
  408. package/types/constants/accessibilityDirectMap.d.ts.map +0 -1
  409. package/types/constants/accessibilityDirectMap.native.d.ts +0 -6
  410. package/types/constants/accessibilityDirectMap.native.d.ts.map +0 -1
  411. package/types/helpers/directStyle.d.ts +0 -15
  412. package/types/helpers/directStyle.d.ts.map +0 -1
  413. package/types/helpers/frontendProgram.d.ts +0 -10
  414. package/types/helpers/frontendProgram.d.ts.map +0 -1
  415. package/types/helpers/getFontLanguage.d.ts +0 -2
  416. package/types/helpers/getFontLanguage.d.ts.map +0 -1
  417. package/types/helpers/normalizeStylePropKeys.d.ts +0 -2
  418. package/types/helpers/normalizeStylePropKeys.d.ts.map +0 -1
  419. package/types/helpers/normalizeStylePropKeys.native.d.ts +0 -13
  420. package/types/helpers/normalizeStylePropKeys.native.d.ts.map +0 -1
  421. package/types/helpers/propMapper.d.ts +0 -6
  422. package/types/helpers/propMapper.d.ts.map +0 -1
  423. package/types/helpers/useRenderElement.d.ts +0 -13
  424. package/types/helpers/useRenderElement.d.ts.map +0 -1
package/src/dom/html.tsx CHANGED
@@ -40,6 +40,13 @@ import { viewStaticConfig } from '../views/View'
40
40
  */
41
41
  const tag = (name: string) => name as unknown as StaticConfig['Component']
42
42
 
43
+ /** regular Tamagui non-style props win when the strict DOM contract names the same prop */
44
+ type MergeHTMLProps<DOMProps, TamaguiProps, TamaguiNonStyleProps> = Omit<
45
+ DOMProps,
46
+ keyof TamaguiNonStyleProps
47
+ > &
48
+ TamaguiProps
49
+
43
50
  /**
44
51
  * The semantic elements of the Tamagui DOM contract.
45
52
  *
@@ -52,9 +59,9 @@ const tag = (name: string) => name as unknown as StaticConfig['Component']
52
59
  */
53
60
  const a = setComponentDisplayName(
54
61
  createComponent<
55
- StrictDOMAnchorProps & TextProps,
62
+ MergeHTMLProps<StrictDOMAnchorProps, TextProps, TextNonStyleProps>,
56
63
  TamaguiTextElement,
57
- StrictDOMAnchorProps & TextNonStyleProps,
64
+ MergeHTMLProps<StrictDOMAnchorProps, TextNonStyleProps, TextNonStyleProps>,
58
65
  TextStylePropsBase
59
66
  >({
60
67
  ...textStaticConfig,
@@ -71,9 +78,9 @@ const a = setComponentDisplayName(
71
78
 
72
79
  const article = setComponentDisplayName(
73
80
  createComponent<
74
- StrictDOMProps & ViewProps,
81
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
75
82
  TamaguiElement,
76
- StrictDOMProps & StackNonStyleProps,
83
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
77
84
  StackStyleBase
78
85
  >({
79
86
  ...viewStaticConfig,
@@ -85,9 +92,9 @@ const article = setComponentDisplayName(
85
92
 
86
93
  const aside = setComponentDisplayName(
87
94
  createComponent<
88
- StrictDOMProps & ViewProps,
95
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
89
96
  TamaguiElement,
90
- StrictDOMProps & StackNonStyleProps,
97
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
91
98
  StackStyleBase
92
99
  >({
93
100
  ...viewStaticConfig,
@@ -99,9 +106,9 @@ const aside = setComponentDisplayName(
99
106
 
100
107
  const b = setComponentDisplayName(
101
108
  createComponent<
102
- StrictDOMProps & TextProps,
109
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
103
110
  TamaguiTextElement,
104
- StrictDOMProps & TextNonStyleProps,
111
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
105
112
  TextStylePropsBase
106
113
  >({
107
114
  ...textStaticConfig,
@@ -119,9 +126,9 @@ const b = setComponentDisplayName(
119
126
 
120
127
  const bdi = setComponentDisplayName(
121
128
  createComponent<
122
- StrictDOMProps & TextProps,
129
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
123
130
  TamaguiTextElement,
124
- StrictDOMProps & TextNonStyleProps,
131
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
125
132
  TextStylePropsBase
126
133
  >({
127
134
  ...textStaticConfig,
@@ -138,9 +145,9 @@ const bdi = setComponentDisplayName(
138
145
 
139
146
  const bdo = setComponentDisplayName(
140
147
  createComponent<
141
- StrictDOMProps & TextProps,
148
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
142
149
  TamaguiTextElement,
143
- StrictDOMProps & TextNonStyleProps,
150
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
144
151
  TextStylePropsBase
145
152
  >({
146
153
  ...textStaticConfig,
@@ -157,9 +164,9 @@ const bdo = setComponentDisplayName(
157
164
 
158
165
  const blockquote = setComponentDisplayName(
159
166
  createComponent<
160
- StrictDOMProps & ViewProps,
167
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
161
168
  TamaguiElement,
162
- StrictDOMProps & StackNonStyleProps,
169
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
163
170
  StackStyleBase
164
171
  >({
165
172
  ...viewStaticConfig,
@@ -171,9 +178,9 @@ const blockquote = setComponentDisplayName(
171
178
 
172
179
  const br = setComponentDisplayName(
173
180
  createComponent<
174
- StrictDOMVoidProps & TextProps,
181
+ MergeHTMLProps<StrictDOMVoidProps, TextProps, TextNonStyleProps>,
175
182
  TamaguiTextElement,
176
- StrictDOMVoidProps & TextNonStyleProps,
183
+ MergeHTMLProps<StrictDOMVoidProps, TextNonStyleProps, TextNonStyleProps>,
177
184
  TextStylePropsBase
178
185
  >({
179
186
  ...textStaticConfig,
@@ -190,9 +197,9 @@ const br = setComponentDisplayName(
190
197
 
191
198
  const button = setComponentDisplayName(
192
199
  createComponent<
193
- StrictDOMButtonProps & ViewProps,
200
+ MergeHTMLProps<StrictDOMButtonProps, ViewProps, StackNonStyleProps>,
194
201
  TamaguiElement,
195
- StrictDOMButtonProps & StackNonStyleProps,
202
+ MergeHTMLProps<StrictDOMButtonProps, StackNonStyleProps, StackNonStyleProps>,
196
203
  StackStyleBase
197
204
  >({
198
205
  ...viewStaticConfig,
@@ -210,9 +217,9 @@ const button = setComponentDisplayName(
210
217
 
211
218
  const code = setComponentDisplayName(
212
219
  createComponent<
213
- StrictDOMProps & TextProps,
220
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
214
221
  TamaguiTextElement,
215
- StrictDOMProps & TextNonStyleProps,
222
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
216
223
  TextStylePropsBase
217
224
  >({
218
225
  ...textStaticConfig,
@@ -231,9 +238,9 @@ const code = setComponentDisplayName(
231
238
 
232
239
  const del = setComponentDisplayName(
233
240
  createComponent<
234
- StrictDOMProps & TextProps,
241
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
235
242
  TamaguiTextElement,
236
- StrictDOMProps & TextNonStyleProps,
243
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
237
244
  TextStylePropsBase
238
245
  >({
239
246
  ...textStaticConfig,
@@ -250,9 +257,9 @@ const del = setComponentDisplayName(
250
257
 
251
258
  const div = setComponentDisplayName(
252
259
  createComponent<
253
- StrictDOMProps & ViewProps,
260
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
254
261
  TamaguiElement,
255
- StrictDOMProps & StackNonStyleProps,
262
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
256
263
  StackStyleBase
257
264
  >({
258
265
  ...viewStaticConfig,
@@ -264,9 +271,9 @@ const div = setComponentDisplayName(
264
271
 
265
272
  const em = setComponentDisplayName(
266
273
  createComponent<
267
- StrictDOMProps & TextProps,
274
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
268
275
  TamaguiTextElement,
269
- StrictDOMProps & TextNonStyleProps,
276
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
270
277
  TextStylePropsBase
271
278
  >({
272
279
  ...textStaticConfig,
@@ -284,9 +291,9 @@ const em = setComponentDisplayName(
284
291
 
285
292
  const fieldset = setComponentDisplayName(
286
293
  createComponent<
287
- StrictDOMProps & ViewProps,
294
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
288
295
  TamaguiElement,
289
- StrictDOMProps & StackNonStyleProps,
296
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
290
297
  StackStyleBase
291
298
  >({
292
299
  ...viewStaticConfig,
@@ -298,9 +305,9 @@ const fieldset = setComponentDisplayName(
298
305
 
299
306
  const footer = setComponentDisplayName(
300
307
  createComponent<
301
- StrictDOMProps & ViewProps,
308
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
302
309
  TamaguiElement,
303
- StrictDOMProps & StackNonStyleProps,
310
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
304
311
  StackStyleBase
305
312
  >({
306
313
  ...viewStaticConfig,
@@ -312,9 +319,9 @@ const footer = setComponentDisplayName(
312
319
 
313
320
  const form = setComponentDisplayName(
314
321
  createComponent<
315
- StrictDOMProps & ViewProps,
322
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
316
323
  TamaguiElement,
317
- StrictDOMProps & StackNonStyleProps,
324
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
318
325
  StackStyleBase
319
326
  >({
320
327
  ...viewStaticConfig,
@@ -326,9 +333,9 @@ const form = setComponentDisplayName(
326
333
 
327
334
  const h1 = setComponentDisplayName(
328
335
  createComponent<
329
- StrictDOMProps & TextProps,
336
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
330
337
  TamaguiTextElement,
331
- StrictDOMProps & TextNonStyleProps,
338
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
332
339
  TextStylePropsBase
333
340
  >({
334
341
  ...textStaticConfig,
@@ -346,9 +353,9 @@ const h1 = setComponentDisplayName(
346
353
 
347
354
  const h2 = setComponentDisplayName(
348
355
  createComponent<
349
- StrictDOMProps & TextProps,
356
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
350
357
  TamaguiTextElement,
351
- StrictDOMProps & TextNonStyleProps,
358
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
352
359
  TextStylePropsBase
353
360
  >({
354
361
  ...textStaticConfig,
@@ -366,9 +373,9 @@ const h2 = setComponentDisplayName(
366
373
 
367
374
  const h3 = setComponentDisplayName(
368
375
  createComponent<
369
- StrictDOMProps & TextProps,
376
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
370
377
  TamaguiTextElement,
371
- StrictDOMProps & TextNonStyleProps,
378
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
372
379
  TextStylePropsBase
373
380
  >({
374
381
  ...textStaticConfig,
@@ -386,9 +393,9 @@ const h3 = setComponentDisplayName(
386
393
 
387
394
  const h4 = setComponentDisplayName(
388
395
  createComponent<
389
- StrictDOMProps & TextProps,
396
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
390
397
  TamaguiTextElement,
391
- StrictDOMProps & TextNonStyleProps,
398
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
392
399
  TextStylePropsBase
393
400
  >({
394
401
  ...textStaticConfig,
@@ -406,9 +413,9 @@ const h4 = setComponentDisplayName(
406
413
 
407
414
  const h5 = setComponentDisplayName(
408
415
  createComponent<
409
- StrictDOMProps & TextProps,
416
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
410
417
  TamaguiTextElement,
411
- StrictDOMProps & TextNonStyleProps,
418
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
412
419
  TextStylePropsBase
413
420
  >({
414
421
  ...textStaticConfig,
@@ -426,9 +433,9 @@ const h5 = setComponentDisplayName(
426
433
 
427
434
  const h6 = setComponentDisplayName(
428
435
  createComponent<
429
- StrictDOMProps & TextProps,
436
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
430
437
  TamaguiTextElement,
431
- StrictDOMProps & TextNonStyleProps,
438
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
432
439
  TextStylePropsBase
433
440
  >({
434
441
  ...textStaticConfig,
@@ -446,9 +453,9 @@ const h6 = setComponentDisplayName(
446
453
 
447
454
  const header = setComponentDisplayName(
448
455
  createComponent<
449
- StrictDOMProps & ViewProps,
456
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
450
457
  TamaguiElement,
451
- StrictDOMProps & StackNonStyleProps,
458
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
452
459
  StackStyleBase
453
460
  >({
454
461
  ...viewStaticConfig,
@@ -460,9 +467,9 @@ const header = setComponentDisplayName(
460
467
 
461
468
  const hr = setComponentDisplayName(
462
469
  createComponent<
463
- StrictDOMVoidProps & ViewProps,
470
+ MergeHTMLProps<StrictDOMVoidProps, ViewProps, StackNonStyleProps>,
464
471
  TamaguiElement,
465
- StrictDOMVoidProps & StackNonStyleProps,
472
+ MergeHTMLProps<StrictDOMVoidProps, StackNonStyleProps, StackNonStyleProps>,
466
473
  StackStyleBase
467
474
  >({
468
475
  ...viewStaticConfig,
@@ -483,9 +490,9 @@ const hr = setComponentDisplayName(
483
490
 
484
491
  const i = setComponentDisplayName(
485
492
  createComponent<
486
- StrictDOMProps & TextProps,
493
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
487
494
  TamaguiTextElement,
488
- StrictDOMProps & TextNonStyleProps,
495
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
489
496
  TextStylePropsBase
490
497
  >({
491
498
  ...textStaticConfig,
@@ -503,9 +510,9 @@ const i = setComponentDisplayName(
503
510
 
504
511
  const img = setComponentDisplayName(
505
512
  createComponent<
506
- StrictDOMImageProps & ViewProps,
513
+ MergeHTMLProps<StrictDOMImageProps, ViewProps, StackNonStyleProps>,
507
514
  TamaguiElement,
508
- StrictDOMImageProps & StackNonStyleProps,
515
+ MergeHTMLProps<StrictDOMImageProps, StackNonStyleProps, StackNonStyleProps>,
509
516
  StackStyleBase
510
517
  >({
511
518
  ...viewStaticConfig,
@@ -525,9 +532,9 @@ const img = setComponentDisplayName(
525
532
 
526
533
  const input = setComponentDisplayName(
527
534
  createComponent<
528
- StrictDOMInputProps & TextProps,
535
+ MergeHTMLProps<StrictDOMInputProps, TextProps, TextNonStyleProps>,
529
536
  TamaguiTextElement,
530
- StrictDOMInputProps & TextNonStyleProps,
537
+ MergeHTMLProps<StrictDOMInputProps, TextNonStyleProps, TextNonStyleProps>,
531
538
  TextStylePropsBase
532
539
  >({
533
540
  ...textStaticConfig,
@@ -546,9 +553,9 @@ const input = setComponentDisplayName(
546
553
 
547
554
  const ins = setComponentDisplayName(
548
555
  createComponent<
549
- StrictDOMProps & TextProps,
556
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
550
557
  TamaguiTextElement,
551
- StrictDOMProps & TextNonStyleProps,
558
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
552
559
  TextStylePropsBase
553
560
  >({
554
561
  ...textStaticConfig,
@@ -565,9 +572,9 @@ const ins = setComponentDisplayName(
565
572
 
566
573
  const kbd = setComponentDisplayName(
567
574
  createComponent<
568
- StrictDOMProps & TextProps,
575
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
569
576
  TamaguiTextElement,
570
- StrictDOMProps & TextNonStyleProps,
577
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
571
578
  TextStylePropsBase
572
579
  >({
573
580
  ...textStaticConfig,
@@ -586,9 +593,9 @@ const kbd = setComponentDisplayName(
586
593
 
587
594
  const label = setComponentDisplayName(
588
595
  createComponent<
589
- StrictDOMLabelProps & TextProps,
596
+ MergeHTMLProps<StrictDOMLabelProps, TextProps, TextNonStyleProps>,
590
597
  TamaguiTextElement,
591
- StrictDOMLabelProps & TextNonStyleProps,
598
+ MergeHTMLProps<StrictDOMLabelProps, TextNonStyleProps, TextNonStyleProps>,
592
599
  TextStylePropsBase
593
600
  >({
594
601
  ...textStaticConfig,
@@ -605,9 +612,9 @@ const label = setComponentDisplayName(
605
612
 
606
613
  const li = setComponentDisplayName(
607
614
  createComponent<
608
- StrictDOMListItemProps & ViewProps,
615
+ MergeHTMLProps<StrictDOMListItemProps, ViewProps, StackNonStyleProps>,
609
616
  TamaguiElement,
610
- StrictDOMListItemProps & StackNonStyleProps,
617
+ MergeHTMLProps<StrictDOMListItemProps, StackNonStyleProps, StackNonStyleProps>,
611
618
  StackStyleBase
612
619
  >({
613
620
  ...viewStaticConfig,
@@ -619,9 +626,9 @@ const li = setComponentDisplayName(
619
626
 
620
627
  const main = setComponentDisplayName(
621
628
  createComponent<
622
- StrictDOMProps & ViewProps,
629
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
623
630
  TamaguiElement,
624
- StrictDOMProps & StackNonStyleProps,
631
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
625
632
  StackStyleBase
626
633
  >({
627
634
  ...viewStaticConfig,
@@ -633,9 +640,9 @@ const main = setComponentDisplayName(
633
640
 
634
641
  const mark = setComponentDisplayName(
635
642
  createComponent<
636
- StrictDOMProps & TextProps,
643
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
637
644
  TamaguiTextElement,
638
- StrictDOMProps & TextNonStyleProps,
645
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
639
646
  TextStylePropsBase
640
647
  >({
641
648
  ...textStaticConfig,
@@ -654,9 +661,9 @@ const mark = setComponentDisplayName(
654
661
 
655
662
  const nav = setComponentDisplayName(
656
663
  createComponent<
657
- StrictDOMProps & ViewProps,
664
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
658
665
  TamaguiElement,
659
- StrictDOMProps & StackNonStyleProps,
666
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
660
667
  StackStyleBase
661
668
  >({
662
669
  ...viewStaticConfig,
@@ -668,9 +675,9 @@ const nav = setComponentDisplayName(
668
675
 
669
676
  const ol = setComponentDisplayName(
670
677
  createComponent<
671
- StrictDOMProps & ViewProps,
678
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
672
679
  TamaguiElement,
673
- StrictDOMProps & StackNonStyleProps,
680
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
674
681
  StackStyleBase
675
682
  >({
676
683
  ...viewStaticConfig,
@@ -682,9 +689,9 @@ const ol = setComponentDisplayName(
682
689
 
683
690
  const optgroup = setComponentDisplayName(
684
691
  createComponent<
685
- StrictDOMOptionGroupProps & ViewProps,
692
+ MergeHTMLProps<StrictDOMOptionGroupProps, ViewProps, StackNonStyleProps>,
686
693
  TamaguiElement,
687
- StrictDOMOptionGroupProps & StackNonStyleProps,
694
+ MergeHTMLProps<StrictDOMOptionGroupProps, StackNonStyleProps, StackNonStyleProps>,
688
695
  StackStyleBase
689
696
  >({
690
697
  ...viewStaticConfig,
@@ -696,9 +703,9 @@ const optgroup = setComponentDisplayName(
696
703
 
697
704
  const option = setComponentDisplayName(
698
705
  createComponent<
699
- StrictDOMOptionProps & TextProps,
706
+ MergeHTMLProps<StrictDOMOptionProps, TextProps, TextNonStyleProps>,
700
707
  TamaguiTextElement,
701
- StrictDOMOptionProps & TextNonStyleProps,
708
+ MergeHTMLProps<StrictDOMOptionProps, TextNonStyleProps, TextNonStyleProps>,
702
709
  TextStylePropsBase
703
710
  >({
704
711
  ...textStaticConfig,
@@ -710,9 +717,9 @@ const option = setComponentDisplayName(
710
717
 
711
718
  const p = setComponentDisplayName(
712
719
  createComponent<
713
- StrictDOMProps & TextProps,
720
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
714
721
  TamaguiTextElement,
715
- StrictDOMProps & TextNonStyleProps,
722
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
716
723
  TextStylePropsBase
717
724
  >({
718
725
  ...textStaticConfig,
@@ -724,9 +731,9 @@ const p = setComponentDisplayName(
724
731
 
725
732
  const pre = setComponentDisplayName(
726
733
  createComponent<
727
- StrictDOMProps & TextProps,
734
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
728
735
  TamaguiTextElement,
729
- StrictDOMProps & TextNonStyleProps,
736
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
730
737
  TextStylePropsBase
731
738
  >({
732
739
  ...textStaticConfig,
@@ -745,9 +752,9 @@ const pre = setComponentDisplayName(
745
752
 
746
753
  const s = setComponentDisplayName(
747
754
  createComponent<
748
- StrictDOMProps & TextProps,
755
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
749
756
  TamaguiTextElement,
750
- StrictDOMProps & TextNonStyleProps,
757
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
751
758
  TextStylePropsBase
752
759
  >({
753
760
  ...textStaticConfig,
@@ -764,9 +771,9 @@ const s = setComponentDisplayName(
764
771
 
765
772
  const section = setComponentDisplayName(
766
773
  createComponent<
767
- StrictDOMProps & ViewProps,
774
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
768
775
  TamaguiElement,
769
- StrictDOMProps & StackNonStyleProps,
776
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
770
777
  StackStyleBase
771
778
  >({
772
779
  ...viewStaticConfig,
@@ -778,9 +785,9 @@ const section = setComponentDisplayName(
778
785
 
779
786
  const select = setComponentDisplayName(
780
787
  createComponent<
781
- StrictDOMSelectProps & ViewProps,
788
+ MergeHTMLProps<StrictDOMSelectProps, ViewProps, StackNonStyleProps>,
782
789
  TamaguiElement,
783
- StrictDOMSelectProps & StackNonStyleProps,
790
+ MergeHTMLProps<StrictDOMSelectProps, StackNonStyleProps, StackNonStyleProps>,
784
791
  StackStyleBase
785
792
  >({
786
793
  ...viewStaticConfig,
@@ -797,9 +804,9 @@ const select = setComponentDisplayName(
797
804
 
798
805
  const span = setComponentDisplayName(
799
806
  createComponent<
800
- StrictDOMProps & TextProps,
807
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
801
808
  TamaguiTextElement,
802
- StrictDOMProps & TextNonStyleProps,
809
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
803
810
  TextStylePropsBase
804
811
  >({
805
812
  ...textStaticConfig,
@@ -816,9 +823,9 @@ const span = setComponentDisplayName(
816
823
 
817
824
  const strong = setComponentDisplayName(
818
825
  createComponent<
819
- StrictDOMProps & TextProps,
826
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
820
827
  TamaguiTextElement,
821
- StrictDOMProps & TextNonStyleProps,
828
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
822
829
  TextStylePropsBase
823
830
  >({
824
831
  ...textStaticConfig,
@@ -836,9 +843,9 @@ const strong = setComponentDisplayName(
836
843
 
837
844
  const sub = setComponentDisplayName(
838
845
  createComponent<
839
- StrictDOMProps & TextProps,
846
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
840
847
  TamaguiTextElement,
841
- StrictDOMProps & TextNonStyleProps,
848
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
842
849
  TextStylePropsBase
843
850
  >({
844
851
  ...textStaticConfig,
@@ -855,9 +862,9 @@ const sub = setComponentDisplayName(
855
862
 
856
863
  const sup = setComponentDisplayName(
857
864
  createComponent<
858
- StrictDOMProps & TextProps,
865
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
859
866
  TamaguiTextElement,
860
- StrictDOMProps & TextNonStyleProps,
867
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
861
868
  TextStylePropsBase
862
869
  >({
863
870
  ...textStaticConfig,
@@ -874,9 +881,9 @@ const sup = setComponentDisplayName(
874
881
 
875
882
  const textarea = setComponentDisplayName(
876
883
  createComponent<
877
- StrictDOMTextAreaProps & TextProps,
884
+ MergeHTMLProps<StrictDOMTextAreaProps, TextProps, TextNonStyleProps>,
878
885
  TamaguiTextElement,
879
- StrictDOMTextAreaProps & TextNonStyleProps,
886
+ MergeHTMLProps<StrictDOMTextAreaProps, TextNonStyleProps, TextNonStyleProps>,
880
887
  TextStylePropsBase
881
888
  >({
882
889
  ...textStaticConfig,
@@ -895,9 +902,9 @@ const textarea = setComponentDisplayName(
895
902
 
896
903
  const u = setComponentDisplayName(
897
904
  createComponent<
898
- StrictDOMProps & TextProps,
905
+ MergeHTMLProps<StrictDOMProps, TextProps, TextNonStyleProps>,
899
906
  TamaguiTextElement,
900
- StrictDOMProps & TextNonStyleProps,
907
+ MergeHTMLProps<StrictDOMProps, TextNonStyleProps, TextNonStyleProps>,
901
908
  TextStylePropsBase
902
909
  >({
903
910
  ...textStaticConfig,
@@ -914,9 +921,9 @@ const u = setComponentDisplayName(
914
921
 
915
922
  const ul = setComponentDisplayName(
916
923
  createComponent<
917
- StrictDOMProps & ViewProps,
924
+ MergeHTMLProps<StrictDOMProps, ViewProps, StackNonStyleProps>,
918
925
  TamaguiElement,
919
- StrictDOMProps & StackNonStyleProps,
926
+ MergeHTMLProps<StrictDOMProps, StackNonStyleProps, StackNonStyleProps>,
920
927
  StackStyleBase
921
928
  >({
922
929
  ...viewStaticConfig,
package/src/dom/htmlRuntime.native.tsx CHANGED
@@ -91,6 +91,7 @@ function resolveDOMProps(
91
91
 
92
92
  for (const name in props) {
93
93
  const value = props[name]
94
+ if (value === undefined) continue
94
95
  if (name === 'display') {
95
96
  display = value
96
97
  continue
package/src/helpers/defaultAnimationDriver.tsx CHANGED
@@ -7,7 +7,6 @@ const noAnimationDriver = (method: string): any => {
7
7
  }
8
8
 
9
9
  const createEmptyAnimationDriver = (): AnimationDriver => ({
10
- isReactNative: false,
11
10
  inputStyle: 'css',
12
11
  outputStyle: 'css',
13
12
  isStub: true,
package/src/helpers/directStyleCSS.native.ts ADDED
@@ -0,0 +1 @@
1
+ export * from './directStyleCSSCompiled'