@tamagui/shapes 2.7.7 → 3.0.0-beta.643.1

package/dist/jsx/getShapeSize.mjs

@@ -1,16 +1,19 @@
-const getShapeSize = (size, {
-  tokens
-}) => {
-  const width = tokens.size[size] ?? size;
-  const height = tokens.size[size] ?? size;
-  return {
-    width,
-    height,
-    minWidth: width,
-    maxWidth: width,
-    maxHeight: height,
-    minHeight: height
-  };
+import { resolveSizeToken } from "@tamagui/size";
+
+const getShapeSize = (size, { tokens }) => {
+	const sizeToken = resolveSizeToken(size, "size");
+	const resolved = typeof sizeToken === "number" ? sizeToken : tokens.size[sizeToken] ?? sizeToken;
+	const width = resolved;
+	const height = resolved;
+	return {
+		width,
+		height,
+		minWidth: width,
+		maxWidth: width,
+		maxHeight: height,
+		minHeight: height
+	};
 };
+
 export { getShapeSize };
 //# sourceMappingURL=getShapeSize.mjs.map

package/dist/jsx/getShapeSize.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["getShapeSize","size","tokens","width","height","minWidth","maxWidth","maxHeight","minHeight"],"sources":["../../src/getShapeSize.tsx"],"sourcesContent":[null],"mappings":"AAGO,MAAMA,YAAA,GAA6DA,CACxEC,IAAA,EACA;EAAEC;AAAO,MACN;EACH,MAAMC,KAAA,GAAQD,MAAA,CAAOD,IAAA,CAAKA,IAAI,KAAKA,IAAA;EACnC,MAAMG,MAAA,GAASF,MAAA,CAAOD,IAAA,CAAKA,IAAI,KAAKA,IAAA;EACpC,OAAO;IACLE,KAAA;IACAC,MAAA;IACAC,QAAA,EAAUF,KAAA;IACVG,QAAA,EAAUH,KAAA;IACVI,SAAA,EAAWH,MAAA;IACXI,SAAA,EAAWJ;EACb;AACF","ignoreList":[]}
+{"version":3,"file":"getShapeSize.js","names":[],"sources":["jsx/getShapeSize.js"],"sourcesContent":["import { resolveSizeToken } from \"@tamagui/size\";\nconst getShapeSize = (size, { tokens }) => {\n  const sizeToken = resolveSizeToken(size, \"size\");\n  const resolved = typeof sizeToken === \"number\" ? sizeToken : tokens.size[sizeToken] ?? sizeToken;\n  const width = resolved;\n  const height = resolved;\n  return {\n    width,\n    height,\n    minWidth: width,\n    maxWidth: width,\n    maxHeight: height,\n    minHeight: height\n  };\n};\nexport {\n  getShapeSize\n};\n//# sourceMappingURL=getShapeSize.js.map\n"],"mappings":";;;AACA,MAAM,gBAAgB,MAAM,EAAE,aAAa;CACzC,MAAM,YAAY,iBAAiB,MAAM,MAAM;CAC/C,MAAM,WAAW,OAAO,cAAc,WAAW,YAAY,OAAO,KAAK,cAAc;CACvF,MAAM,QAAQ;CACd,MAAM,SAAS;CACf,OAAO;EACL;EACA;EACA,UAAU;EACV,UAAU;EACV,WAAW;EACX,WAAW;CACb;AACF"}

package/dist/jsx/getShapeSize.native.cjs

@@ -0,0 +1,43 @@
+"use strict";
+
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+};
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: () => from[key],
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var getShapeSize_exports = {};
+__export(getShapeSize_exports, { getShapeSize: () => getShapeSize });
+module.exports = __toCommonJS(getShapeSize_exports);
+var import_size = require("@tamagui/size");
+var getShapeSize = function(size, param) {
+	var { tokens } = param;
+	var sizeToken = (0, import_size.resolveSizeToken)(size, "size");
+	var _tokens_size_sizeToken;
+	var resolved = typeof sizeToken === "number" ? sizeToken : (_tokens_size_sizeToken = tokens.size[sizeToken]) !== null && _tokens_size_sizeToken !== void 0 ? _tokens_size_sizeToken : sizeToken;
+	var width = resolved;
+	var height = resolved;
+	return {
+		width,
+		height,
+		minWidth: width,
+		maxWidth: width,
+		maxHeight: height,
+		minHeight: height
+	};
+};

package/dist/jsx/getShapeSize.native.js

@@ -1,47 +1,45 @@
 "use strict";
 
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-  for (var name in all) __defProp(target, name, {
-    get: all[name],
-    enumerable: true
-  });
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
 };
 var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-      get: () => from[key],
-      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-    });
-  }
-  return to;
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: () => from[key],
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
 };
-var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: true
-}), mod);
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var getShapeSize_exports = {};
-__export(getShapeSize_exports, {
-  getShapeSize: () => getShapeSize
-});
+__export(getShapeSize_exports, { getShapeSize: () => getShapeSize });
 module.exports = __toCommonJS(getShapeSize_exports);
-var getShapeSize = function (size, param) {
-  var {
-    tokens
-  } = param;
-  var _tokens_size_size;
-  var width = (_tokens_size_size = tokens.size[size]) !== null && _tokens_size_size !== void 0 ? _tokens_size_size : size;
-  var _tokens_size_size1;
-  var height = (_tokens_size_size1 = tokens.size[size]) !== null && _tokens_size_size1 !== void 0 ? _tokens_size_size1 : size;
-  return {
-    width,
-    height,
-    minWidth: width,
-    maxWidth: width,
-    maxHeight: height,
-    minHeight: height
-  };
+var import_size = require("@tamagui/size");
+var getShapeSize = function(size, param) {
+	var { tokens } = param;
+	var sizeToken = (0, import_size.resolveSizeToken)(size, "size");
+	var _tokens_size_sizeToken;
+	var resolved = typeof sizeToken === "number" ? sizeToken : (_tokens_size_sizeToken = tokens.size[sizeToken]) !== null && _tokens_size_sizeToken !== void 0 ? _tokens_size_sizeToken : sizeToken;
+	var width = resolved;
+	var height = resolved;
+	return {
+		width,
+		height,
+		minWidth: width,
+		maxWidth: width,
+		maxHeight: height,
+		minHeight: height
+	};
 };
+
 //# sourceMappingURL=getShapeSize.native.js.map

package/dist/jsx/getShapeSize.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key"],"sources":["../../src/getShapeSize.tsx"],"sourcesContent":[null],"mappings":"AAGO,YAAM;;AAIX,IAAAA,SAAM,GAAQC,MAAA,CAAOC,cAAc;AACnC,IAAAC,gBAAe,GAAAF,MAAY,CAAAG,wBAAS;AACpC,IAAAC,iBAAO,GAAAJ,MAAA,CAAAK,mBAAA;AAAA,IACLC,YAAA,GAAAN,MAAA,CAAAO,SAAA,CAAAC,cAAA;AAAA,IACAC,QAAA,GAAAA,CAAAC,MAAA,EAAAC,GAAA;EAAA,KACA,IAAAC,IAAU,IAAAD,GAAA,EACVZ,SAAA,CAAUW,MAAA,EAAAE,IAAA;IAAAC,GAAA,EAAAF,GAAA,CAAAC,IAAA;IAAAE,UAAA;EAAA;AAAA;AACC,IACXC,WAAW,GAAAA,CAAAC,EAAA,EAAAC,IAAA,EAAAC,MAAA,EAAAC,IAAA;EACb,IAAAF,IAAA,WAAAA,IAAA,wBAAAA,IAAA;IACF,SAAAG,GAAA,IAAAhB,iBAAA,CAAAa,IAAA,G","ignoreList":[]}
+{"version":3,"file":"getShapeSize.native.js","names":[],"sources":["jsx/getShapeSize.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar getShapeSize_exports = {};\n__export(getShapeSize_exports, {\n  getShapeSize: () => getShapeSize\n});\nmodule.exports = __toCommonJS(getShapeSize_exports);\nvar import_size = require(\"@tamagui/size\");\nvar getShapeSize = function(size, param) {\n  var { tokens } = param;\n  var sizeToken = (0, import_size.resolveSizeToken)(size, \"size\");\n  var _tokens_size_sizeToken;\n  var resolved = typeof sizeToken === \"number\" ? sizeToken : (_tokens_size_sizeToken = tokens.size[sizeToken]) !== null && _tokens_size_sizeToken !== void 0 ? _tokens_size_sizeToken : sizeToken;\n  var width = resolved;\n  var height = resolved;\n  return {\n    width,\n    height,\n    minWidth: width,\n    maxWidth: width,\n    maxHeight: height,\n    minHeight: height\n  };\n};\n//# sourceMappingURL=getShapeSize.js.map\n"],"mappings":";;;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,uBAAuB,CAAC;AAC5B,SAAS,sBAAsB,EAC7B,oBAAoB,aACtB,CAAC;AACD,OAAO,UAAU,aAAa,oBAAoB;AAClD,IAAI,cAAc,QAAQ,eAAe;AACzC,IAAI,eAAe,SAAS,MAAM,OAAO;CACvC,IAAI,EAAE,WAAW;CACjB,IAAI,aAAa,GAAG,YAAY,kBAAkB,MAAM,MAAM;CAC9D,IAAI;CACJ,IAAI,WAAW,OAAO,cAAc,WAAW,aAAa,yBAAyB,OAAO,KAAK,gBAAgB,QAAQ,2BAA2B,KAAK,IAAI,yBAAyB;CACtL,IAAI,QAAQ;CACZ,IAAI,SAAS;CACb,OAAO;EACL;EACA;EACA,UAAU;EACV,UAAU;EACV,WAAW;EACX,WAAW;CACb;AACF"}

package/dist/jsx/index.js

@@ -1,4 +1,5 @@
-export * from "./Square.mjs";
-export * from "./Circle.mjs";
-export * from "./getShapeSize.mjs";
-//# sourceMappingURL=index.js.map
+export * from "./Square.mjs"
+
+export * from "./Circle.mjs"
+
+export * from "./getShapeSize.mjs"

package/dist/jsx/index.mjs

@@ -1,4 +1,5 @@
-export * from "./Square.mjs";
-export * from "./Circle.mjs";
-export * from "./getShapeSize.mjs";
-//# sourceMappingURL=index.mjs.map
+export * from "./Square.mjs"
+
+export * from "./Circle.mjs"
+
+export * from "./getShapeSize.mjs"

package/dist/jsx/index.native.cjs

@@ -0,0 +1,23 @@
+"use strict";
+
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: () => from[key],
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var index_exports = {};
+module.exports = __toCommonJS(index_exports);
+__reExport(index_exports, require("./Square.native.js"), module.exports);
+__reExport(index_exports, require("./Circle.native.js"), module.exports);
+__reExport(index_exports, require("./getShapeSize.native.js"), module.exports);

package/dist/jsx/index.native.js

@@ -1,25 +1,25 @@
 "use strict";
 
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-      get: () => from[key],
-      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-    });
-  }
-  return to;
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: () => from[key],
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: true
-}), mod);
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var index_exports = {};
 module.exports = __toCommonJS(index_exports);
 __reExport(index_exports, require("./Square.native.js"), module.exports);
 __reExport(index_exports, require("./Circle.native.js"), module.exports);
 __reExport(index_exports, require("./getShapeSize.native.js"), module.exports);
+
 //# sourceMappingURL=index.native.js.map

package/dist/jsx/index.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;AACA,IAAAA,SAAA,GAAcC,MAAA,CAAAC,cAAA;AACd,IAAAC,gBAAc,GAAAF,MAAA,CAAAG,wBAAA","ignoreList":[]}
+{"version":3,"file":"index.native.js","names":[],"sources":["jsx/index.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, \"default\"), secondTarget && __copyProps(secondTarget, mod, \"default\"));\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar index_exports = {};\nmodule.exports = __toCommonJS(index_exports);\n__reExport(index_exports, require(\"./Square\"), module.exports);\n__reExport(index_exports, require(\"./Circle\"), module.exports);\n__reExport(index_exports, require(\"./getShapeSize\"), module.exports);\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,cAAc,QAAQ,KAAK,kBAAkB,YAAY,QAAQ,KAAK,SAAS,GAAG,gBAAgB,YAAY,cAAc,KAAK,SAAS;AAC9I,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,gBAAgB,CAAC;AACrB,OAAO,UAAU,aAAa,aAAa;AAC3C,WAAW,eAAe,QAAQ,oBAAU,GAAG,OAAO,OAAO;AAC7D,WAAW,eAAe,QAAQ,oBAAU,GAAG,OAAO,OAAO;AAC7D,WAAW,eAAe,QAAQ,0BAAgB,GAAG,OAAO,OAAO"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/shapes",
-  "version": "2.7.7",
+  "version": "3.0.0-beta.643.1",
   "source": "src/index.ts",
   "files": [
     "src",
@@ -34,11 +34,12 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/stacks": "2.7.7",
-    "@tamagui/web": "2.7.7"
+    "@tamagui/size": "3.0.0-beta.643.1",
+    "@tamagui/stacks": "3.0.0-beta.643.1",
+    "@tamagui/web": "3.0.0-beta.643.1"
   },
   "devDependencies": {
-    "@tamagui/build": "2.7.7",
+    "@tamagui/build": "3.0.0-beta.643.1",
     "react": ">=19"
   },
   "peerDependencies": {

package/src/Circle.tsx

@@ -4,7 +4,7 @@ import { styled } from '@tamagui/web'
 import { Square } from './Square'
 
 export const Circle = styled(Square, {
-  name: 'Circle',
+  displayName: 'Circle',
   borderRadius: 100_000_000,
 })
 

package/src/Square.tsx

@@ -1,20 +1,33 @@
-import { ThemeableStack } from '@tamagui/stacks'
+import { YStack } from '@tamagui/stacks'
 import type { GetProps } from '@tamagui/web'
 import { styled } from '@tamagui/web'
 
 import { getShapeSize } from './getShapeSize'
 
 export const Square = styled(
-  ThemeableStack,
+  YStack,
   {
-    name: 'Square',
+    displayName: 'Square',
     alignItems: 'center',
     justifyContent: 'center',
 
     variants: {
       size: {
-        '...size': getShapeSize,
-        ':number': getShapeSize,
+        number: getShapeSize,
+        Size: getShapeSize,
+      },
+
+      // shape modifiers formerly inherited from ThemeableStack (now removed).
+      circular: {
+        true: {
+          borderRadius: 100_000,
+        },
+      },
+
+      transparent: {
+        true: {
+          backgroundColor: 'transparent',
+        },
       },
     } as const,
   },

package/src/getShapeSize.tsx

@@ -1,12 +1,20 @@
-import type { SizableStackProps } from '@tamagui/stacks'
+import type { YStackProps } from '@tamagui/stacks'
+import { resolveSizeToken } from '@tamagui/size'
 import type { SizeVariantSpreadFunction } from '@tamagui/web'
 
-export const getShapeSize: SizeVariantSpreadFunction<SizableStackProps> = (
+export const getShapeSize: SizeVariantSpreadFunction<YStackProps> = (
   size,
   { tokens }
 ) => {
-  const width = tokens.size[size] ?? size
-  const height = tokens.size[size] ?? size
+  const sizeToken = resolveSizeToken(size, 'size')
+  // a numeric size is a literal pixel value, never a token index. the size
+  // scale is keyed by numeric-looking strings ('60'), so indexing it with a
+  // number silently turns <Square size={60} /> into that token's value.
+  // resolveTokenSize in @tamagui/size draws the same line.
+  const resolved =
+    typeof sizeToken === 'number' ? sizeToken : (tokens.size[sizeToken] ?? sizeToken)
+  const width = resolved
+  const height = resolved
   return {
     width,
     height,

package/types/Circle.d.ts

@@ -1,15 +1,29 @@
 import type { GetProps } from '@tamagui/web';
-export declare const Circle: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiElement, import("@tamagui/core").RNTamaguiViewNonStyleProps, import("@tamagui/web").StackStyleBase, {
-    elevation?: number | import("@tamagui/web").SizeTokens | undefined;
-    size?: number | import("@tamagui/web").SizeTokens | undefined;
+export declare const Circle: import("react").FunctionComponent<Omit<import("@tamagui/core").RNTamaguiViewNonStyleProps, "circular" | "elevation" | "size" | "transparent" | keyof import("@tamagui/web").StackStyleBase> & import("@tamagui/web").WithThemeValues<import("@tamagui/web").StackStyleBase> & {
+    circular?: boolean | undefined;
+    elevation?: number | import("@tamagui/web").Size | undefined;
+    size?: number | import("@tamagui/web").Size | undefined;
     transparent?: boolean | undefined;
-    fullscreen?: boolean | undefined;
+} & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").StackStyleBase>> & {
+    ref?: import("react").Ref<import("@tamagui/web").TamaguiElement> | undefined;
+}> & import("@tamagui/web").StaticComponentObject<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiElement, import("@tamagui/core").RNTamaguiViewNonStyleProps, import("@tamagui/web").StackStyleBase, {
     circular?: boolean | undefined;
-    elevate?: boolean | undefined;
-    bordered?: boolean | undefined;
-    chromeless?: boolean | "all" | undefined;
+    elevation?: number | import("@tamagui/web").Size | undefined;
+    size?: number | import("@tamagui/web").Size | undefined;
+    transparent?: boolean | undefined;
 }, import("@tamagui/web").StaticConfigPublic & {
     memo: true;
-}>;
+}> & Omit<import("@tamagui/web").StaticConfigPublic & {
+    memo: true;
+}, "staticConfig"> & {
+    __tama: [import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiElement, import("@tamagui/core").RNTamaguiViewNonStyleProps, import("@tamagui/web").StackStyleBase, {
+        circular?: boolean | undefined;
+        elevation?: number | import("@tamagui/web").Size | undefined;
+        size?: number | import("@tamagui/web").Size | undefined;
+        transparent?: boolean | undefined;
+    }, import("@tamagui/web").StaticConfigPublic & {
+        memo: true;
+    }];
+};
 export type CircleProps = GetProps<typeof Circle>;
 //# sourceMappingURL=Circle.d.ts.map

package/types/Circle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Circle.d.ts","sourceRoot":"","sources":["../src/Circle.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAK5C,eAAO,MAAM,MAAM;;;;;;;;;;;EAGjB,CAAA;AAEF,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,MAAM,CAAC,CAAA"}
+{"version":3,"file":"Circle.d.ts","sourceRoot":"","sources":["../src/Circle.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAK5C,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;CAGjB,CAAA;AAEF,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,MAAM,CAAC,CAAA"}

package/types/Square.d.ts

@@ -1,15 +1,29 @@
 import type { GetProps } from '@tamagui/web';
-export declare const Square: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiElement, import("@tamagui/core").RNTamaguiViewNonStyleProps, import("@tamagui/web").StackStyleBase, {
-    elevation?: number | import("@tamagui/web").SizeTokens | undefined;
-    size?: number | import("@tamagui/web").SizeTokens | undefined;
+export declare const Square: import("react").FunctionComponent<Omit<import("@tamagui/core").RNTamaguiViewNonStyleProps, "circular" | "elevation" | "size" | "transparent" | keyof import("@tamagui/web").StackStyleBase> & import("@tamagui/web").WithThemeValues<import("@tamagui/web").StackStyleBase> & {
+    circular?: boolean | undefined;
+    elevation?: number | import("@tamagui/web").Size | undefined;
+    size?: number | import("@tamagui/web").Size | undefined;
     transparent?: boolean | undefined;
-    fullscreen?: boolean | undefined;
+} & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").StackStyleBase>> & {
+    ref?: import("react").Ref<import("@tamagui/web").TamaguiElement> | undefined;
+}> & import("@tamagui/web").StaticComponentObject<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiElement, import("@tamagui/core").RNTamaguiViewNonStyleProps, import("@tamagui/web").StackStyleBase, {
     circular?: boolean | undefined;
-    elevate?: boolean | undefined;
-    bordered?: boolean | undefined;
-    chromeless?: boolean | "all" | undefined;
+    elevation?: number | import("@tamagui/web").Size | undefined;
+    size?: number | import("@tamagui/web").Size | undefined;
+    transparent?: boolean | undefined;
 }, import("@tamagui/web").StaticConfigPublic & {
     memo: true;
-}>;
+}> & Omit<import("@tamagui/web").StaticConfigPublic & {
+    memo: true;
+}, "staticConfig"> & {
+    __tama: [import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiElement, import("@tamagui/core").RNTamaguiViewNonStyleProps, import("@tamagui/web").StackStyleBase, {
+        circular?: boolean | undefined;
+        elevation?: number | import("@tamagui/web").Size | undefined;
+        size?: number | import("@tamagui/web").Size | undefined;
+        transparent?: boolean | undefined;
+    }, import("@tamagui/web").StaticConfigPublic & {
+        memo: true;
+    }];
+};
 export type SquareProps = GetProps<typeof Square>;
 //# sourceMappingURL=Square.d.ts.map

package/types/Square.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Square.d.ts","sourceRoot":"","sources":["../src/Square.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAK5C,eAAO,MAAM,MAAM;;;;;;;;;;;EAiBlB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,MAAM,CAAC,CAAA"}
+{"version":3,"file":"Square.d.ts","sourceRoot":"","sources":["../src/Square.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAK5C,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;CA8BlB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,MAAM,CAAC,CAAA"}

package/types/getShapeSize.d.ts

@@ -1,4 +1,4 @@
-import type { SizableStackProps } from '@tamagui/stacks';
+import type { YStackProps } from '@tamagui/stacks';
 import type { SizeVariantSpreadFunction } from '@tamagui/web';
-export declare const getShapeSize: SizeVariantSpreadFunction<SizableStackProps>;
+export declare const getShapeSize: SizeVariantSpreadFunction<YStackProps>;
 //# sourceMappingURL=getShapeSize.d.ts.map

package/types/getShapeSize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getShapeSize.d.ts","sourceRoot":"","sources":["../src/getShapeSize.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACxD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAA;AAE7D,eAAO,MAAM,YAAY,EAAE,yBAAyB,CAAC,iBAAiB,CAcrE,CAAA"}
+{"version":3,"file":"getShapeSize.d.ts","sourceRoot":"","sources":["../src/getShapeSize.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAElD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAA;AAE7D,eAAO,MAAM,YAAY,EAAE,yBAAyB,CAAC,WAAW,CAqB/D,CAAA"}

package/dist/esm/index.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AACd,cAAc","ignoreList":[]}

package/dist/esm/index.mjs.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AACd,cAAc","ignoreList":[]}

package/dist/esm/index.native.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AACd,cAAc","ignoreList":[]}

package/dist/jsx/index.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AACd,cAAc","ignoreList":[]}

package/dist/jsx/index.mjs.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AACd,cAAc","ignoreList":[]}