@tamagui/image 1.0.1-beta.165 → 1.0.1-beta.166

package/dist/cjs/Image.js

@@ -46,10 +46,9 @@ const StyledImage = (0, import_core.styled)(
 );
 const Image = StyledImage.extractable((inProps) => {
   const props = (0, import_core.getExpandedShorthands)(inProps);
-  const { src, width, height, ...rest } = props;
-  const source = typeof src === "string" ? { uri: src, ...import_core.isWeb && { width, height } } : src;
+  const { src, ...rest } = props;
+  const source = typeof src === "string" ? { uri: src, ...import_core.isWeb && { width: props.width, height: props.height } } : src;
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(StyledImage, {
-    ...!import_core.isWeb && { style: { width, height } },
     source,
     ...rest
   });

package/dist/cjs/Image.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Image.tsx"],
-  "sourcesContent": ["import { GetProps, StackProps, getExpandedShorthands, isWeb, styled } from '@tamagui/core'\nimport React from 'react'\nimport { Image as RNImage } from 'react-native'\n\nReact['createElement']\n\nconst StyledImage = styled(\n  RNImage,\n  {\n    name: 'Image',\n    position: 'relative',\n    source: { uri: '' },\n    zIndex: 1,\n  },\n  {\n    inlineProps: new Set(['src', 'width', 'height']),\n  }\n)\n\ntype StyledImageProps = GetProps<typeof StyledImage>\n\ntype BaseProps = Omit<StyledImageProps, 'source' | 'width' | 'height' | 'style' | 'onLayout'> & {\n  width: number | string\n  height: number | string\n  src: string | StyledImageProps['source']\n}\n\nexport type ImageProps = BaseProps & Omit<StackProps, keyof BaseProps>\n\nexport const Image: React.FC<ImageProps> = StyledImage.extractable((inProps) => {\n  const props = getExpandedShorthands(inProps)\n  const { src, width, height, ...rest } = props\n  const source = typeof src === 'string' ? { uri: src, ...(isWeb && { width, height }) } : src\n\n  // must set defaultSource to allow SSR, default it to the same as src\n  return (\n    <StyledImage {...(!isWeb && { style: { width, height } })} source={source} {...(rest as any)} />\n  )\n})\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAoCI;AApCJ,kBAA2E;AAC3E,mBAAkB;AAClB,0BAAiC;AAEjC,aAAAA,QAAM;AAEN,MAAM,kBAAc;AAAA,EAClB,oBAAAC;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,UAAU;AAAA,IACV,QAAQ,EAAE,KAAK,GAAG;AAAA,IAClB,QAAQ;AAAA,EACV;AAAA,EACA;AAAA,IACE,aAAa,oBAAI,IAAI,CAAC,OAAO,SAAS,QAAQ,CAAC;AAAA,EACjD;AACF;AAYO,MAAM,QAA8B,YAAY,YAAY,CAAC,YAAY;AAC9E,QAAM,YAAQ,mCAAsB,OAAO;AAC3C,QAAM,EAAE,KAAK,OAAO,WAAW,KAAK,IAAI;AACxC,QAAM,SAAS,OAAO,QAAQ,WAAW,EAAE,KAAK,KAAK,GAAI,qBAAS,EAAE,OAAO,OAAO,EAAG,IAAI;AAGzF,SACE,4CAAC;AAAA,IAAa,GAAI,CAAC,qBAAS,EAAE,OAAO,EAAE,OAAO,OAAO,EAAE;AAAA,IAAI;AAAA,IAAiB,GAAI;AAAA,GAAc;AAElG,CAAC;",
+  "sourcesContent": ["import { GetProps, StackProps, getExpandedShorthands, isWeb, styled } from '@tamagui/core'\nimport React from 'react'\nimport { Image as RNImage } from 'react-native'\n\nReact['createElement']\n\nconst StyledImage = styled(\n  RNImage,\n  {\n    name: 'Image',\n    position: 'relative',\n    source: { uri: '' },\n    zIndex: 1,\n  },\n  {\n    inlineProps: new Set(['src', 'width', 'height']),\n  }\n)\n\ntype StyledImageProps = GetProps<typeof StyledImage>\n\ntype BaseProps = Omit<StyledImageProps, 'source' | 'width' | 'height' | 'style' | 'onLayout'> & {\n  width: number | string\n  height: number | string\n  src: string | StyledImageProps['source']\n}\n\nexport type ImageProps = BaseProps & Omit<StackProps, keyof BaseProps>\n\nexport const Image: React.FC<ImageProps> = StyledImage.extractable((inProps) => {\n  const props = getExpandedShorthands(inProps)\n  const { src, ...rest } = props\n  const source =\n    typeof src === 'string'\n      ? { uri: src, ...(isWeb && { width: props.width, height: props.height }) }\n      : src\n\n  // must set defaultSource to allow SSR, default it to the same as src\n  return <StyledImage source={source} {...(rest as any)} />\n})\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAsCS;AAtCT,kBAA2E;AAC3E,mBAAkB;AAClB,0BAAiC;AAEjC,aAAAA,QAAM;AAEN,MAAM,kBAAc;AAAA,EAClB,oBAAAC;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,UAAU;AAAA,IACV,QAAQ,EAAE,KAAK,GAAG;AAAA,IAClB,QAAQ;AAAA,EACV;AAAA,EACA;AAAA,IACE,aAAa,oBAAI,IAAI,CAAC,OAAO,SAAS,QAAQ,CAAC;AAAA,EACjD;AACF;AAYO,MAAM,QAA8B,YAAY,YAAY,CAAC,YAAY;AAC9E,QAAM,YAAQ,mCAAsB,OAAO;AAC3C,QAAM,EAAE,QAAQ,KAAK,IAAI;AACzB,QAAM,SACJ,OAAO,QAAQ,WACX,EAAE,KAAK,KAAK,GAAI,qBAAS,EAAE,OAAO,MAAM,OAAO,QAAQ,MAAM,OAAO,EAAG,IACvE;AAGN,SAAO,4CAAC;AAAA,IAAY;AAAA,IAAiB,GAAI;AAAA,GAAc;AACzD,CAAC;",
   "names": ["React", "RNImage"]
 }

package/dist/esm/Image.js

@@ -17,10 +17,9 @@ const StyledImage = styled(
 );
 const Image = StyledImage.extractable((inProps) => {
   const props = getExpandedShorthands(inProps);
-  const { src, width, height, ...rest } = props;
-  const source = typeof src === "string" ? { uri: src, ...isWeb && { width, height } } : src;
+  const { src, ...rest } = props;
+  const source = typeof src === "string" ? { uri: src, ...isWeb && { width: props.width, height: props.height } } : src;
   return /* @__PURE__ */ jsx(StyledImage, {
-    ...!isWeb && { style: { width, height } },
     source,
     ...rest
   });

package/dist/esm/Image.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Image.tsx"],
-  "sourcesContent": ["import { GetProps, StackProps, getExpandedShorthands, isWeb, styled } from '@tamagui/core'\nimport React from 'react'\nimport { Image as RNImage } from 'react-native'\n\nReact['createElement']\n\nconst StyledImage = styled(\n  RNImage,\n  {\n    name: 'Image',\n    position: 'relative',\n    source: { uri: '' },\n    zIndex: 1,\n  },\n  {\n    inlineProps: new Set(['src', 'width', 'height']),\n  }\n)\n\ntype StyledImageProps = GetProps<typeof StyledImage>\n\ntype BaseProps = Omit<StyledImageProps, 'source' | 'width' | 'height' | 'style' | 'onLayout'> & {\n  width: number | string\n  height: number | string\n  src: string | StyledImageProps['source']\n}\n\nexport type ImageProps = BaseProps & Omit<StackProps, keyof BaseProps>\n\nexport const Image: React.FC<ImageProps> = StyledImage.extractable((inProps) => {\n  const props = getExpandedShorthands(inProps)\n  const { src, width, height, ...rest } = props\n  const source = typeof src === 'string' ? { uri: src, ...(isWeb && { width, height }) } : src\n\n  // must set defaultSource to allow SSR, default it to the same as src\n  return (\n    <StyledImage {...(!isWeb && { style: { width, height } })} source={source} {...(rest as any)} />\n  )\n})\n"],
-  "mappings": "AAoCI;AApCJ,SAA+B,uBAAuB,OAAO,cAAc;AAC3E,OAAO,WAAW;AAClB,SAAS,SAAS,eAAe;AAEjC,MAAM;AAEN,MAAM,cAAc;AAAA,EAClB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,UAAU;AAAA,IACV,QAAQ,EAAE,KAAK,GAAG;AAAA,IAClB,QAAQ;AAAA,EACV;AAAA,EACA;AAAA,IACE,aAAa,oBAAI,IAAI,CAAC,OAAO,SAAS,QAAQ,CAAC;AAAA,EACjD;AACF;AAYO,MAAM,QAA8B,YAAY,YAAY,CAAC,YAAY;AAC9E,QAAM,QAAQ,sBAAsB,OAAO;AAC3C,QAAM,EAAE,KAAK,OAAO,WAAW,KAAK,IAAI;AACxC,QAAM,SAAS,OAAO,QAAQ,WAAW,EAAE,KAAK,KAAK,GAAI,SAAS,EAAE,OAAO,OAAO,EAAG,IAAI;AAGzF,SACE,oBAAC;AAAA,IAAa,GAAI,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,OAAO,EAAE;AAAA,IAAI;AAAA,IAAiB,GAAI;AAAA,GAAc;AAElG,CAAC;",
+  "sourcesContent": ["import { GetProps, StackProps, getExpandedShorthands, isWeb, styled } from '@tamagui/core'\nimport React from 'react'\nimport { Image as RNImage } from 'react-native'\n\nReact['createElement']\n\nconst StyledImage = styled(\n  RNImage,\n  {\n    name: 'Image',\n    position: 'relative',\n    source: { uri: '' },\n    zIndex: 1,\n  },\n  {\n    inlineProps: new Set(['src', 'width', 'height']),\n  }\n)\n\ntype StyledImageProps = GetProps<typeof StyledImage>\n\ntype BaseProps = Omit<StyledImageProps, 'source' | 'width' | 'height' | 'style' | 'onLayout'> & {\n  width: number | string\n  height: number | string\n  src: string | StyledImageProps['source']\n}\n\nexport type ImageProps = BaseProps & Omit<StackProps, keyof BaseProps>\n\nexport const Image: React.FC<ImageProps> = StyledImage.extractable((inProps) => {\n  const props = getExpandedShorthands(inProps)\n  const { src, ...rest } = props\n  const source =\n    typeof src === 'string'\n      ? { uri: src, ...(isWeb && { width: props.width, height: props.height }) }\n      : src\n\n  // must set defaultSource to allow SSR, default it to the same as src\n  return <StyledImage source={source} {...(rest as any)} />\n})\n"],
+  "mappings": "AAsCS;AAtCT,SAA+B,uBAAuB,OAAO,cAAc;AAC3E,OAAO,WAAW;AAClB,SAAS,SAAS,eAAe;AAEjC,MAAM;AAEN,MAAM,cAAc;AAAA,EAClB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,UAAU;AAAA,IACV,QAAQ,EAAE,KAAK,GAAG;AAAA,IAClB,QAAQ;AAAA,EACV;AAAA,EACA;AAAA,IACE,aAAa,oBAAI,IAAI,CAAC,OAAO,SAAS,QAAQ,CAAC;AAAA,EACjD;AACF;AAYO,MAAM,QAA8B,YAAY,YAAY,CAAC,YAAY;AAC9E,QAAM,QAAQ,sBAAsB,OAAO;AAC3C,QAAM,EAAE,QAAQ,KAAK,IAAI;AACzB,QAAM,SACJ,OAAO,QAAQ,WACX,EAAE,KAAK,KAAK,GAAI,SAAS,EAAE,OAAO,MAAM,OAAO,QAAQ,MAAM,OAAO,EAAG,IACvE;AAGN,SAAO,oBAAC;AAAA,IAAY;AAAA,IAAiB,GAAI;AAAA,GAAc;AACzD,CAAC;",
   "names": []
 }

package/dist/jsx/Image.js

@@ -16,9 +16,9 @@ const StyledImage = styled(
 );
 const Image = StyledImage.extractable((inProps) => {
   const props = getExpandedShorthands(inProps);
-  const { src, width, height, ...rest } = props;
-  const source = typeof src === "string" ? { uri: src, ...isWeb && { width, height } } : src;
-  return <StyledImage {...!isWeb && { style: { width, height } }} source={source} {...rest} />;
+  const { src, ...rest } = props;
+  const source = typeof src === "string" ? { uri: src, ...isWeb && { width: props.width, height: props.height } } : src;
+  return <StyledImage source={source} {...rest} />;
 });
 export {
   Image

package/dist/jsx/Image.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Image.tsx"],
-  "sourcesContent": ["import { GetProps, StackProps, getExpandedShorthands, isWeb, styled } from '@tamagui/core'\nimport React from 'react'\nimport { Image as RNImage } from 'react-native'\n\nReact['createElement']\n\nconst StyledImage = styled(\n  RNImage,\n  {\n    name: 'Image',\n    position: 'relative',\n    source: { uri: '' },\n    zIndex: 1,\n  },\n  {\n    inlineProps: new Set(['src', 'width', 'height']),\n  }\n)\n\ntype StyledImageProps = GetProps<typeof StyledImage>\n\ntype BaseProps = Omit<StyledImageProps, 'source' | 'width' | 'height' | 'style' | 'onLayout'> & {\n  width: number | string\n  height: number | string\n  src: string | StyledImageProps['source']\n}\n\nexport type ImageProps = BaseProps & Omit<StackProps, keyof BaseProps>\n\nexport const Image: React.FC<ImageProps> = StyledImage.extractable((inProps) => {\n  const props = getExpandedShorthands(inProps)\n  const { src, width, height, ...rest } = props\n  const source = typeof src === 'string' ? { uri: src, ...(isWeb && { width, height }) } : src\n\n  // must set defaultSource to allow SSR, default it to the same as src\n  return (\n    <StyledImage {...(!isWeb && { style: { width, height } })} source={source} {...(rest as any)} />\n  )\n})\n"],
-  "mappings": "AAAA,SAA+B,uBAAuB,OAAO,cAAc;AAC3E,OAAO,WAAW;AAClB,SAAS,SAAS,eAAe;AAEjC,MAAM;AAEN,MAAM,cAAc;AAAA,EAClB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,UAAU;AAAA,IACV,QAAQ,EAAE,KAAK,GAAG;AAAA,IAClB,QAAQ;AAAA,EACV;AAAA,EACA;AAAA,IACE,aAAa,oBAAI,IAAI,CAAC,OAAO,SAAS,QAAQ,CAAC;AAAA,EACjD;AACF;AAYO,MAAM,QAA8B,YAAY,YAAY,CAAC,YAAY;AAC9E,QAAM,QAAQ,sBAAsB,OAAO;AAC3C,QAAM,EAAE,KAAK,OAAO,WAAW,KAAK,IAAI;AACxC,QAAM,SAAS,OAAO,QAAQ,WAAW,EAAE,KAAK,KAAK,GAAI,SAAS,EAAE,OAAO,OAAO,EAAG,IAAI;AAGzF,SACE,CAAC,gBAAiB,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,OAAO,EAAE,GAAI,QAAQ,YAAa,MAAc;AAElG,CAAC;",
+  "sourcesContent": ["import { GetProps, StackProps, getExpandedShorthands, isWeb, styled } from '@tamagui/core'\nimport React from 'react'\nimport { Image as RNImage } from 'react-native'\n\nReact['createElement']\n\nconst StyledImage = styled(\n  RNImage,\n  {\n    name: 'Image',\n    position: 'relative',\n    source: { uri: '' },\n    zIndex: 1,\n  },\n  {\n    inlineProps: new Set(['src', 'width', 'height']),\n  }\n)\n\ntype StyledImageProps = GetProps<typeof StyledImage>\n\ntype BaseProps = Omit<StyledImageProps, 'source' | 'width' | 'height' | 'style' | 'onLayout'> & {\n  width: number | string\n  height: number | string\n  src: string | StyledImageProps['source']\n}\n\nexport type ImageProps = BaseProps & Omit<StackProps, keyof BaseProps>\n\nexport const Image: React.FC<ImageProps> = StyledImage.extractable((inProps) => {\n  const props = getExpandedShorthands(inProps)\n  const { src, ...rest } = props\n  const source =\n    typeof src === 'string'\n      ? { uri: src, ...(isWeb && { width: props.width, height: props.height }) }\n      : src\n\n  // must set defaultSource to allow SSR, default it to the same as src\n  return <StyledImage source={source} {...(rest as any)} />\n})\n"],
+  "mappings": "AAAA,SAA+B,uBAAuB,OAAO,cAAc;AAC3E,OAAO,WAAW;AAClB,SAAS,SAAS,eAAe;AAEjC,MAAM;AAEN,MAAM,cAAc;AAAA,EAClB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,UAAU;AAAA,IACV,QAAQ,EAAE,KAAK,GAAG;AAAA,IAClB,QAAQ;AAAA,EACV;AAAA,EACA;AAAA,IACE,aAAa,oBAAI,IAAI,CAAC,OAAO,SAAS,QAAQ,CAAC;AAAA,EACjD;AACF;AAYO,MAAM,QAA8B,YAAY,YAAY,CAAC,YAAY;AAC9E,QAAM,QAAQ,sBAAsB,OAAO;AAC3C,QAAM,EAAE,QAAQ,KAAK,IAAI;AACzB,QAAM,SACJ,OAAO,QAAQ,WACX,EAAE,KAAK,KAAK,GAAI,SAAS,EAAE,OAAO,MAAM,OAAO,QAAQ,MAAM,OAAO,EAAG,IACvE;AAGN,SAAO,CAAC,YAAY,QAAQ,YAAa,MAAc;AACzD,CAAC;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/image",
-  "version": "1.0.1-beta.165",
+  "version": "1.0.1-beta.166",
   "sideEffects": [
     "*.css"
   ],
@@ -23,14 +23,14 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/core": "^1.0.1-beta.165"
+    "@tamagui/core": "^1.0.1-beta.166"
   },
   "peerDependencies": {
     "react": "*",
     "react-native": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.1-beta.165",
+    "@tamagui/build": "^1.0.1-beta.166",
     "react": "*",
     "react-native": "*"
   },

package/src/Image.tsx

@@ -29,11 +29,12 @@ export type ImageProps = BaseProps & Omit<StackProps, keyof BaseProps>
 
 export const Image: React.FC<ImageProps> = StyledImage.extractable((inProps) => {
   const props = getExpandedShorthands(inProps)
-  const { src, width, height, ...rest } = props
-  const source = typeof src === 'string' ? { uri: src, ...(isWeb && { width, height }) } : src
+  const { src, ...rest } = props
+  const source =
+    typeof src === 'string'
+      ? { uri: src, ...(isWeb && { width: props.width, height: props.height }) }
+      : src
 
   // must set defaultSource to allow SSR, default it to the same as src
-  return (
-    <StyledImage {...(!isWeb && { style: { width, height } })} source={source} {...(rest as any)} />
-  )
+  return <StyledImage source={source} {...(rest as any)} />
 })