@tamagui/core 1.84.2 → 1.85.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "1.84.2",
+  "version": "1.85.1",
   "source": "src/index.tsx",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -35,16 +35,16 @@
     "native-test.d.ts"
   ],
   "dependencies": {
-    "@tamagui/react-native-use-pressable": "1.84.2",
-    "@tamagui/react-native-use-responder-events": "1.84.2",
-    "@tamagui/use-event": "1.84.2",
-    "@tamagui/web": "1.84.2"
+    "@tamagui/react-native-use-pressable": "1.85.1",
+    "@tamagui/react-native-use-responder-events": "1.85.1",
+    "@tamagui/use-event": "1.85.1",
+    "@tamagui/web": "1.85.1"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.84.2",
+    "@tamagui/build": "1.85.1",
     "@testing-library/react": "^14.0.0",
     "csstype": "^3.0.10",
     "react": "^18.2.0",

package/src/helpers/getBoundingClientRect.tsx

@@ -1,4 +1,4 @@
-export const getBoundingClientRect = (node: HTMLElement | null): void | DOMRect => {
+export const getBoundingClientRect = (node: HTMLElement | null): undefined | DOMRect => {
   if (!node || node.nodeType !== 1) return
   return node.getBoundingClientRect?.()
 }

package/src/index.tsx

@@ -24,36 +24,30 @@ import { usePlatformMethods } from './hooks/usePlatformMethods'
 import { RNTextProps, RNViewProps } from './reactNativeTypes'
 import { usePressability } from './vendor/Pressability'
 
-// re-exports all of @tamagui/web just adds hooks
-export * from '@tamagui/web'
-// fixes issues with TS saying internal type usage is breaking
-// see https://discord.com/channels/909986013848412191/1146150253490348112/1146150253490348112
-export * from './reactNativeTypes'
-
-// adds extra types to Stack/Text:
+// adds extra types to View/Stack/Text:
 
 type RNExclusiveViewProps = Omit<RNViewProps, keyof StackProps>
-
-type ViewType = TamaguiComponent<
+type RNTamaguiView = TamaguiComponent<
   StackProps & RNExclusiveViewProps,
   TamaguiElement,
   StackPropsBase & RNExclusiveViewProps,
   void
 >
 
-// the same:
-export const View = WebView as any as ViewType
-export const Stack = WebStack as any as ViewType
-
 type RNExclusiveTextProps = Omit<RNTextProps, keyof TextProps>
-
-export const Text = WebText as any as TamaguiComponent<
+type RNTamaguiText = TamaguiComponent<
   TextProps & RNExclusiveTextProps,
   TamaguiTextElement,
   TextPropsBase & RNExclusiveTextProps,
   void
 >
 
+// re-exports all of @tamagui/web just adds hooks
+export * from '@tamagui/web'
+// fixes issues with TS saying internal type usage is breaking
+// see https://discord.com/channels/909986013848412191/1146150253490348112/1146150253490348112
+export * from './reactNativeTypes'
+
 const baseViews = getBaseViews()
 
 // setup internal hooks:
@@ -222,3 +216,9 @@ setupHooks({
 const dontComposePressabilityKeys = {
   onClick: true,
 }
+
+// overwrite web versions:
+// putting at the end ensures it overwrites in dist/cjs/index.js
+export const View = WebView as any as RNTamaguiView
+export const Stack = WebStack as any as RNTamaguiView
+export const Text = WebText as any as RNTamaguiText

package/types/helpers/getBoundingClientRect.d.ts

@@ -1,2 +1,2 @@
-export declare const getBoundingClientRect: (node: HTMLElement | null) => void | DOMRect;
+export declare const getBoundingClientRect: (node: HTMLElement | null) => undefined | DOMRect;
 //# sourceMappingURL=getBoundingClientRect.d.ts.map

package/types/helpers/getBoundingClientRect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getBoundingClientRect.d.ts","sourceRoot":"","sources":["../../src/helpers/getBoundingClientRect.tsx"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,SAAU,WAAW,GAAG,IAAI,KAAG,IAAI,GAAG,OAGvE,CAAA"}
+{"version":3,"file":"getBoundingClientRect.d.ts","sourceRoot":"","sources":["../../src/helpers/getBoundingClientRect.tsx"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,SAAU,WAAW,GAAG,IAAI,KAAG,SAAS,GAAG,OAG5E,CAAA"}

package/types/index.d.ts

@@ -1,16 +1,12 @@
-/// <reference types="react" />
-import type { StackProps, StackPropsBase, TamaguiComponent, TamaguiElement, TamaguiTextElement, TextProps } from '@tamagui/web';
+import type { StackProps, StackPropsBase, TamaguiComponent, TamaguiElement, TamaguiTextElement, TextProps, TextPropsBase } from '@tamagui/web';
 import { RNTextProps, RNViewProps } from './reactNativeTypes';
-export * from '@tamagui/web';
-export * from './reactNativeTypes';
 type RNExclusiveViewProps = Omit<RNViewProps, keyof StackProps>;
-type ViewType = TamaguiComponent<StackProps & RNExclusiveViewProps, TamaguiElement, StackPropsBase & RNExclusiveViewProps, void>;
-export declare const View: ViewType;
-export declare const Stack: ViewType;
+type RNTamaguiView = TamaguiComponent<StackProps & RNExclusiveViewProps, TamaguiElement, StackPropsBase & RNExclusiveViewProps, void>;
 type RNExclusiveTextProps = Omit<RNTextProps, keyof TextProps>;
-export declare const Text: TamaguiComponent<Omit<import("react-native").TextProps, "style" | "children" | ("onLayout" | keyof import("react-native").GestureResponderHandlers)> & import("@tamagui/web").ExtendBaseTextProps & import("@tamagui/web").WebOnlyPressEvents & import("@tamagui/web").TamaguiComponentPropsBaseBase & {
-    style?: import("@tamagui/web").StyleProp<import("react-native").TextStyle | import("react").CSSProperties | (import("react").CSSProperties & import("react-native").TextStyle)>;
-} & import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>> & import("@tamagui/web").PseudoProps<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>>> & import("@tamagui/web").MediaProps<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>> & import("@tamagui/web").PseudoProps<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>>>> & RNExclusiveTextProps, TamaguiTextElement, Omit<import("react-native").TextProps, "style" | "children" | ("onLayout" | keyof import("react-native").GestureResponderHandlers)> & import("@tamagui/web").ExtendBaseTextProps & import("@tamagui/web").WebOnlyPressEvents & import("@tamagui/web").TamaguiComponentPropsBaseBase & {
-    style?: import("@tamagui/web").StyleProp<import("react-native").TextStyle | import("react").CSSProperties | (import("react").CSSProperties & import("react-native").TextStyle)>;
-} & import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>> & RNExclusiveTextProps, void>;
+type RNTamaguiText = TamaguiComponent<TextProps & RNExclusiveTextProps, TamaguiTextElement, TextPropsBase & RNExclusiveTextProps, void>;
+export * from '@tamagui/web';
+export * from './reactNativeTypes';
+export declare const View: RNTamaguiView;
+export declare const Stack: RNTamaguiView;
+export declare const Text: RNTamaguiText;
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":";AACA,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAClB,SAAS,EAEV,MAAM,cAAc,CAAA;AAcrB,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAI7D,cAAc,cAAc,CAAA;AAG5B,cAAc,oBAAoB,CAAA;AAIlC,KAAK,oBAAoB,GAAG,IAAI,CAAC,WAAW,EAAE,MAAM,UAAU,CAAC,CAAA;AAE/D,KAAK,QAAQ,GAAG,gBAAgB,CAC9B,UAAU,GAAG,oBAAoB,EACjC,cAAc,EACd,cAAc,GAAG,oBAAoB,EACrC,IAAI,CACL,CAAA;AAGD,eAAO,MAAM,IAAI,UAA6B,CAAA;AAC9C,eAAO,MAAM,KAAK,UAA8B,CAAA;AAEhD,KAAK,oBAAoB,GAAG,IAAI,CAAC,WAAW,EAAE,MAAM,SAAS,CAAC,CAAA;AAE9D,eAAO,MAAM,IAAI;;;;8OAKhB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAClB,SAAS,EACT,aAAa,EACd,MAAM,cAAc,CAAA;AAcrB,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAK7D,KAAK,oBAAoB,GAAG,IAAI,CAAC,WAAW,EAAE,MAAM,UAAU,CAAC,CAAA;AAC/D,KAAK,aAAa,GAAG,gBAAgB,CACnC,UAAU,GAAG,oBAAoB,EACjC,cAAc,EACd,cAAc,GAAG,oBAAoB,EACrC,IAAI,CACL,CAAA;AAED,KAAK,oBAAoB,GAAG,IAAI,CAAC,WAAW,EAAE,MAAM,SAAS,CAAC,CAAA;AAC9D,KAAK,aAAa,GAAG,gBAAgB,CACnC,SAAS,GAAG,oBAAoB,EAChC,kBAAkB,EAClB,aAAa,GAAG,oBAAoB,EACpC,IAAI,CACL,CAAA;AAGD,cAAc,cAAc,CAAA;AAG5B,cAAc,oBAAoB,CAAA;AA6KlC,eAAO,MAAM,IAAI,eAAkC,CAAA;AACnD,eAAO,MAAM,KAAK,eAAmC,CAAA;AACrD,eAAO,MAAM,IAAI,eAAkC,CAAA"}