@tamagui/web 1.43.17 → 1.45.0

package/dist/cjs/styled.js

@@ -59,6 +59,12 @@ function styled(ComponentIn, options, staticExtractionOptions) {
         context,
         ...defaultProps
       } = options;
+      if (defaultVariants) {
+        defaultProps = {
+          ...defaultVariants,
+          ...defaultProps
+        };
+      }
       if (parentStaticConfig) {
         const avoid = parentStaticConfig.isHOC && !parentStaticConfig.isStyledHOC;
         if (!avoid) {
@@ -71,12 +77,6 @@ function styled(ComponentIn, options, staticExtractionOptions) {
           variants = (0, import_mergeVariants.mergeVariants)(parentStaticConfig.variants, variants);
         }
       }
-      if (defaultVariants) {
-        defaultProps = {
-          ...defaultProps,
-          ...defaultVariants
-        };
-      }
       if (parentStaticConfig == null ? void 0 : parentStaticConfig.isHOC) {
         if (name) {
           defaultProps.componentName = name;

package/dist/cjs/styled.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/styled.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAA8B;AAE9B,6BAAgC;AAEhC,2BAA8B;AAC9B,8BAAqC;AAuC9B,SAAS,OAId,aAEA,SAOA,yBACA;AAEA,MAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,QAAI,CAAC,aAAa;AAChB,YAAM,IAAI,MAAM,gCAAgC;AAAA,IAClD;AACA,QAAI,mCAAS,UAAU;AACrB,iBAAW,OAAO,QAAQ,UAAU;AAClC,YAAI,OAAO,8BAAe;AACxB,kBAAQ;AAAA,YACN,gDAAgD;AAAA,UAClD;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,qBAAqB,YAAY,cAAc;AAErD,QAAM,yBACJ,CAAC,CAAC,sBACF,EAAE,mBAAmB,iBAAiB,mBAAmB;AAE3D,QAAM,kBAAiB,yDAAoB,UAAS,EAAC,yDAAoB;AAEzE,MAAI,YACF,kBAAkB,yBACd,eACA,yDAAoB,cAAa;AAEvC,QAAM,wBAAoB,8CAAqB,SAAS;AACxD,QAAM,gBAAgB;AAAA,IACpB,sBACE,mEAAyB,mBACzB,yDAAoB,sBACpB,8CAAqB,yDAAoB,SAAS;AAAA,EACtD;AAEA,QAAM,qBAAqB,MAAM;AAhGnC;AAiGI,QAAI,SAAS;AACX,UAAI;AAAA,QACF;AAAA,QACA;AAAA,QACA;AAAA,QACA,kBAAkB;AAAA,QAClB;AAAA,QACA,GAAG;AAAA,MACL,IAAI;AAEJ,UAAI,oBAAoB;AACtB,cAAM,QAAQ,mBAAmB,SAAS,CAAC,mBAAmB;AAC9D,YAAI,CAAC,OAAO;AACV,yBAAe;AAAA,YACb,GAAG,mBAAmB;AAAA,YACtB,GAAG;AAAA,UACL;AAAA,QACF;AAEA,YAAI,mBAAmB,UAAU;AAC/B,yBAAW,oCAAc,mBAAmB,UAAU,QAAQ;AAAA,QAChE;AAAA,MACF;AAEA,UAAI,iBAAiB;AACnB,uBAAe;AAAA,UACb,GAAG;AAAA,UACH,GAAG;AAAA,QACL;AAAA,MACF;AAEA,UAAI,yDAAoB,OAAO;AAE7B,YAAI,MAAM;AAER,uBAAa,gBAAgB;AAAA,QAC/B;AAAA,MACF;AAEA,YAAM,SAAS;AAAA,SACb,mEAAyB,YAAU,yDAAoB;AAAA,MACzD;AAEA,YAAM,mBACJ,yBACC,0BACC,kBACC,yDAAoB,WAAS,yDAAoB;AAEtD,UAAI,QAAQ,IAAI,aAAa,eAAe;AAE1C,cAAI,8DAAoB,iBAApB,mBAAkC,UAAS,CAAC,QAAQ,OAAO;AAC7D,iBAAO,aAAa;AAAA,QACtB;AAAA,MACF;AAEA,YAAM,OAA8B;AAAA,QAClC,GAAG;AAAA,QACH,GAAG;AAAA,QACH,GAAI,CAAC,0BAA0B;AAAA,UAC7B;AAAA,QACF;AAAA;AAAA;AAAA,QAGA;AAAA,QACA;AAAA,QACA;AAAA,QACA,eAAe,SAAQ,yDAAoB;AAAA,QAC3C;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,GAAG;AAAA,QACH,aAAa,QAAQ,yDAAoB,KAAK;AAAA,QAC9C;AAAA,MACF;AAGA,UAAI,aAAa,YAAY,CAAC,oBAAoB,SAAS;AACzD,aAAK,eAAe;AAAA,MACtB;AAEA,aAAO;AAAA,IACT;AAAA,EACF,GAAG;AAEH,QAAM,gBAAY,wCAAgB,qBAAqB,CAAC,CAAC;AAwCzD,aAAW,OAAO,aAAa;AAC7B,QAAI,OAAO;AAAW;AAEtB,cAAU,GAAG,IAAI,YAAY,GAAG;AAAA,EAClC;AAEA,SAAO;AACT;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAA8B;AAE9B,6BAAgC;AAEhC,2BAA8B;AAC9B,8BAAqC;AAuC9B,SAAS,OAId,aAEA,SAOA,yBACA;AAEA,MAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,QAAI,CAAC,aAAa;AAChB,YAAM,IAAI,MAAM,gCAAgC;AAAA,IAClD;AACA,QAAI,mCAAS,UAAU;AACrB,iBAAW,OAAO,QAAQ,UAAU;AAClC,YAAI,OAAO,8BAAe;AACxB,kBAAQ;AAAA,YACN,gDAAgD;AAAA,UAClD;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,qBAAqB,YAAY,cAAc;AAErD,QAAM,yBACJ,CAAC,CAAC,sBACF,EAAE,mBAAmB,iBAAiB,mBAAmB;AAE3D,QAAM,kBAAiB,yDAAoB,UAAS,EAAC,yDAAoB;AAEzE,MAAI,YACF,kBAAkB,yBACd,eACA,yDAAoB,cAAa;AAEvC,QAAM,wBAAoB,8CAAqB,SAAS;AACxD,QAAM,gBAAgB;AAAA,IACpB,sBACE,mEAAyB,mBACzB,yDAAoB,sBACpB,8CAAqB,yDAAoB,SAAS;AAAA,EACtD;AAEA,QAAM,qBAAqB,MAAM;AAhGnC;AAiGI,QAAI,SAAS;AACX,UAAI;AAAA,QACF;AAAA,QACA;AAAA,QACA;AAAA,QACA,kBAAkB;AAAA,QAClB;AAAA,QACA,GAAG;AAAA,MACL,IAAI;AAEJ,UAAI,iBAAiB;AACnB,uBAAe;AAAA,UACb,GAAG;AAAA,UACH,GAAG;AAAA,QACL;AAAA,MACF;AAEA,UAAI,oBAAoB;AACtB,cAAM,QAAQ,mBAAmB,SAAS,CAAC,mBAAmB;AAC9D,YAAI,CAAC,OAAO;AACV,yBAAe;AAAA,YACb,GAAG,mBAAmB;AAAA,YACtB,GAAG;AAAA,UACL;AAAA,QACF;AAEA,YAAI,mBAAmB,UAAU;AAC/B,yBAAW,oCAAc,mBAAmB,UAAU,QAAQ;AAAA,QAChE;AAAA,MACF;AAEA,UAAI,yDAAoB,OAAO;AAE7B,YAAI,MAAM;AAER,uBAAa,gBAAgB;AAAA,QAC/B;AAAA,MACF;AAEA,YAAM,SAAS;AAAA,SACb,mEAAyB,YAAU,yDAAoB;AAAA,MACzD;AAEA,YAAM,mBACJ,yBACC,0BACC,kBACC,yDAAoB,WAAS,yDAAoB;AAEtD,UAAI,QAAQ,IAAI,aAAa,eAAe;AAE1C,cAAI,8DAAoB,iBAApB,mBAAkC,UAAS,CAAC,QAAQ,OAAO;AAC7D,iBAAO,aAAa;AAAA,QACtB;AAAA,MACF;AAEA,YAAM,OAA8B;AAAA,QAClC,GAAG;AAAA,QACH,GAAG;AAAA,QACH,GAAI,CAAC,0BAA0B;AAAA,UAC7B;AAAA,QACF;AAAA;AAAA;AAAA,QAGA;AAAA,QACA;AAAA,QACA;AAAA,QACA,eAAe,SAAQ,yDAAoB;AAAA,QAC3C;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,GAAG;AAAA,QACH,aAAa,QAAQ,yDAAoB,KAAK;AAAA,QAC9C;AAAA,MACF;AAGA,UAAI,aAAa,YAAY,CAAC,oBAAoB,SAAS;AACzD,aAAK,eAAe;AAAA,MACtB;AAEA,aAAO;AAAA,IACT;AAAA,EACF,GAAG;AAEH,QAAM,gBAAY,wCAAgB,qBAAqB,CAAC,CAAC;AAqDzD,aAAW,OAAO,aAAa;AAC7B,QAAI,OAAO;AAAW;AAEtB,cAAU,GAAG,IAAI,YAAY,GAAG;AAAA,EAClC;AAEA,SAAO;AACT;",
   "names": []
 }

package/dist/esm/styled.js

@@ -36,6 +36,12 @@ function styled(ComponentIn, options, staticExtractionOptions) {
         context,
         ...defaultProps
       } = options;
+      if (defaultVariants) {
+        defaultProps = {
+          ...defaultVariants,
+          ...defaultProps
+        };
+      }
       if (parentStaticConfig) {
         const avoid = parentStaticConfig.isHOC && !parentStaticConfig.isStyledHOC;
         if (!avoid) {
@@ -48,12 +54,6 @@ function styled(ComponentIn, options, staticExtractionOptions) {
           variants = mergeVariants(parentStaticConfig.variants, variants);
         }
       }
-      if (defaultVariants) {
-        defaultProps = {
-          ...defaultProps,
-          ...defaultVariants
-        };
-      }
       if (parentStaticConfig == null ? void 0 : parentStaticConfig.isHOC) {
         if (name) {
           defaultProps.componentName = name;

package/dist/esm/styled.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/styled.tsx"],
-  "mappings": "AAAA,SAAS,qBAAqB;AAE9B,SAAS,uBAAuB;AAEhC,SAAS,qBAAqB;AAC9B,SAAS,4BAA4B;AAuC9B,SAAS,OAId,aAEA,SAOA,yBACA;AAEA,MAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,QAAI,CAAC,aAAa;AAChB,YAAM,IAAI,MAAM,gCAAgC;AAAA,IAClD;AACA,QAAI,mCAAS,UAAU;AACrB,iBAAW,OAAO,QAAQ,UAAU;AAClC,YAAI,OAAO,eAAe;AACxB,kBAAQ;AAAA,YACN,gDAAgD;AAAA,UAClD;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,qBAAqB,YAAY,cAAc;AAErD,QAAM,yBACJ,CAAC,CAAC,sBACF,EAAE,mBAAmB,iBAAiB,mBAAmB;AAE3D,QAAM,kBAAiB,yDAAoB,UAAS,EAAC,yDAAoB;AAEzE,MAAI,YACF,kBAAkB,yBACd,eACA,yDAAoB,cAAa;AAEvC,QAAM,oBAAoB,qBAAqB,SAAS;AACxD,QAAM,gBAAgB;AAAA,IACpB,sBACE,mEAAyB,mBACzB,yDAAoB,kBACpB,qBAAqB,yDAAoB,SAAS;AAAA,EACtD;AAEA,QAAM,qBAAqB,MAAM;AAhGnC;AAiGI,QAAI,SAAS;AACX,UAAI;AAAA,QACF;AAAA,QACA;AAAA,QACA;AAAA,QACA,kBAAkB;AAAA,QAClB;AAAA,QACA,GAAG;AAAA,MACL,IAAI;AAEJ,UAAI,oBAAoB;AACtB,cAAM,QAAQ,mBAAmB,SAAS,CAAC,mBAAmB;AAC9D,YAAI,CAAC,OAAO;AACV,yBAAe;AAAA,YACb,GAAG,mBAAmB;AAAA,YACtB,GAAG;AAAA,UACL;AAAA,QACF;AAEA,YAAI,mBAAmB,UAAU;AAC/B,qBAAW,cAAc,mBAAmB,UAAU,QAAQ;AAAA,QAChE;AAAA,MACF;AAEA,UAAI,iBAAiB;AACnB,uBAAe;AAAA,UACb,GAAG;AAAA,UACH,GAAG;AAAA,QACL;AAAA,MACF;AAEA,UAAI,yDAAoB,OAAO;AAE7B,YAAI,MAAM;AAER,uBAAa,gBAAgB;AAAA,QAC/B;AAAA,MACF;AAEA,YAAM,SAAS;AAAA,SACb,mEAAyB,YAAU,yDAAoB;AAAA,MACzD;AAEA,YAAM,mBACJ,yBACC,0BACC,kBACC,yDAAoB,WAAS,yDAAoB;AAEtD,UAAI,QAAQ,IAAI,aAAa,eAAe;AAE1C,cAAI,8DAAoB,iBAApB,mBAAkC,UAAS,CAAC,QAAQ,OAAO;AAC7D,iBAAO,aAAa;AAAA,QACtB;AAAA,MACF;AAEA,YAAM,OAA8B;AAAA,QAClC,GAAG;AAAA,QACH,GAAG;AAAA,QACH,GAAI,CAAC,0BAA0B;AAAA,UAC7B;AAAA,QACF;AAAA;AAAA;AAAA,QAGA;AAAA,QACA;AAAA,QACA;AAAA,QACA,eAAe,SAAQ,yDAAoB;AAAA,QAC3C;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,GAAG;AAAA,QACH,aAAa,QAAQ,yDAAoB,KAAK;AAAA,QAC9C;AAAA,MACF;AAGA,UAAI,aAAa,YAAY,CAAC,oBAAoB,SAAS;AACzD,aAAK,eAAe;AAAA,MACtB;AAEA,aAAO;AAAA,IACT;AAAA,EACF,GAAG;AAEH,QAAM,YAAY,gBAAgB,qBAAqB,CAAC,CAAC;AAwCzD,aAAW,OAAO,aAAa;AAC7B,QAAI,OAAO;AAAW;AAEtB,cAAU,GAAG,IAAI,YAAY,GAAG;AAAA,EAClC;AAEA,SAAO;AACT;",
+  "mappings": "AAAA,SAAS,qBAAqB;AAE9B,SAAS,uBAAuB;AAEhC,SAAS,qBAAqB;AAC9B,SAAS,4BAA4B;AAuC9B,SAAS,OAId,aAEA,SAOA,yBACA;AAEA,MAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,QAAI,CAAC,aAAa;AAChB,YAAM,IAAI,MAAM,gCAAgC;AAAA,IAClD;AACA,QAAI,mCAAS,UAAU;AACrB,iBAAW,OAAO,QAAQ,UAAU;AAClC,YAAI,OAAO,eAAe;AACxB,kBAAQ;AAAA,YACN,gDAAgD;AAAA,UAClD;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,qBAAqB,YAAY,cAAc;AAErD,QAAM,yBACJ,CAAC,CAAC,sBACF,EAAE,mBAAmB,iBAAiB,mBAAmB;AAE3D,QAAM,kBAAiB,yDAAoB,UAAS,EAAC,yDAAoB;AAEzE,MAAI,YACF,kBAAkB,yBACd,eACA,yDAAoB,cAAa;AAEvC,QAAM,oBAAoB,qBAAqB,SAAS;AACxD,QAAM,gBAAgB;AAAA,IACpB,sBACE,mEAAyB,mBACzB,yDAAoB,kBACpB,qBAAqB,yDAAoB,SAAS;AAAA,EACtD;AAEA,QAAM,qBAAqB,MAAM;AAhGnC;AAiGI,QAAI,SAAS;AACX,UAAI;AAAA,QACF;AAAA,QACA;AAAA,QACA;AAAA,QACA,kBAAkB;AAAA,QAClB;AAAA,QACA,GAAG;AAAA,MACL,IAAI;AAEJ,UAAI,iBAAiB;AACnB,uBAAe;AAAA,UACb,GAAG;AAAA,UACH,GAAG;AAAA,QACL;AAAA,MACF;AAEA,UAAI,oBAAoB;AACtB,cAAM,QAAQ,mBAAmB,SAAS,CAAC,mBAAmB;AAC9D,YAAI,CAAC,OAAO;AACV,yBAAe;AAAA,YACb,GAAG,mBAAmB;AAAA,YACtB,GAAG;AAAA,UACL;AAAA,QACF;AAEA,YAAI,mBAAmB,UAAU;AAC/B,qBAAW,cAAc,mBAAmB,UAAU,QAAQ;AAAA,QAChE;AAAA,MACF;AAEA,UAAI,yDAAoB,OAAO;AAE7B,YAAI,MAAM;AAER,uBAAa,gBAAgB;AAAA,QAC/B;AAAA,MACF;AAEA,YAAM,SAAS;AAAA,SACb,mEAAyB,YAAU,yDAAoB;AAAA,MACzD;AAEA,YAAM,mBACJ,yBACC,0BACC,kBACC,yDAAoB,WAAS,yDAAoB;AAEtD,UAAI,QAAQ,IAAI,aAAa,eAAe;AAE1C,cAAI,8DAAoB,iBAApB,mBAAkC,UAAS,CAAC,QAAQ,OAAO;AAC7D,iBAAO,aAAa;AAAA,QACtB;AAAA,MACF;AAEA,YAAM,OAA8B;AAAA,QAClC,GAAG;AAAA,QACH,GAAG;AAAA,QACH,GAAI,CAAC,0BAA0B;AAAA,UAC7B;AAAA,QACF;AAAA;AAAA;AAAA,QAGA;AAAA,QACA;AAAA,QACA;AAAA,QACA,eAAe,SAAQ,yDAAoB;AAAA,QAC3C;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,GAAG;AAAA,QACH,aAAa,QAAQ,yDAAoB,KAAK;AAAA,QAC9C;AAAA,MACF;AAGA,UAAI,aAAa,YAAY,CAAC,oBAAoB,SAAS;AACzD,aAAK,eAAe;AAAA,MACtB;AAEA,aAAO;AAAA,IACT;AAAA,EACF,GAAG;AAEH,QAAM,YAAY,gBAAgB,qBAAqB,CAAC,CAAC;AAqDzD,aAAW,OAAO,aAAa;AAC7B,QAAI,OAAO;AAAW;AAEtB,cAAU,GAAG,IAAI,YAAY,GAAG;AAAA,EAClC;AAEA,SAAO;AACT;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.43.17",
+  "version": "1.45.0",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,19 +27,19 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.43.17",
-    "@tamagui/constants": "1.43.17",
-    "@tamagui/helpers": "1.43.17",
-    "@tamagui/normalize-css-color": "1.43.17",
-    "@tamagui/use-did-finish-ssr": "1.43.17",
-    "@tamagui/use-event": "1.43.17",
-    "@tamagui/use-force-update": "1.43.17"
+    "@tamagui/compose-refs": "1.45.0",
+    "@tamagui/constants": "1.45.0",
+    "@tamagui/helpers": "1.45.0",
+    "@tamagui/normalize-css-color": "1.45.0",
+    "@tamagui/use-did-finish-ssr": "1.45.0",
+    "@tamagui/use-event": "1.45.0",
+    "@tamagui/use-force-update": "1.45.0"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.43.17",
+    "@tamagui/build": "1.45.0",
     "@testing-library/react": "^13.4.0",
     "csstype": "^3.0.10",
     "react": "^18.2.0",

package/src/styled.tsx

@@ -105,6 +105,13 @@ export function styled<
         ...defaultProps
       } = options
 
+      if (defaultVariants) {
+        defaultProps = {
+          ...defaultVariants,
+          ...defaultProps,
+        }
+      }
+
       if (parentStaticConfig) {
         const avoid = parentStaticConfig.isHOC && !parentStaticConfig.isStyledHOC
         if (!avoid) {
@@ -119,13 +126,6 @@ export function styled<
         }
       }
 
-      if (defaultVariants) {
-        defaultProps = {
-          ...defaultProps,
-          ...defaultVariants,
-        }
-      }
-
       if (parentStaticConfig?.isHOC) {
         // if HOC we map name => componentName as we have a difference in how we name prop vs styled() there
         if (name) {
@@ -192,13 +192,26 @@ export function styled<
 
   type VariantProps = Omit<ParentVariants, keyof OurVariantProps> & OurVariantProps
   type OurPropsBaseBase = ParentPropsBase & VariantProps
-  type OurPropsBase = OurPropsBaseBase & PseudoProps<Partial<OurPropsBaseBase>>
+
+  /**
+   * de-opting a bit of type niceness because were hitting depth issues too soon
+   * before we had:
+   *
+   * type OurPropsBase = OurPropsBaseBase & PseudoProps<Partial<OurPropsBaseBase>>
+   * and then below in type Props you would remove the PseudoProps line
+   * that would give you nicely merged psuedo sub-styles but its just too much for TS
+   * so now psuedos wont be nicely typed inside media queries, but at least we can nest
+   */
+
+  type OurPropsBase = OurPropsBaseBase
 
   type Props = Variants extends void
     ? GetProps<ParentComponent>
     : // start with base props
       OurPropsBase &
-        // add in media (+ pseudos nested)
+        // add in psuedo
+        PseudoProps<Partial<OurPropsBaseBase>> &
+        // add in media
         MediaProps<Partial<OurPropsBase>>
 
   type ParentStaticProperties = {

package/types/styled.d.ts

@@ -11,6 +11,6 @@ export declare function styled<ParentComponent extends StylableComponent, Varian
     defaultVariants?: GetVariantAcceptedValues<Variants>;
     context?: StyledContext;
     acceptsClassName?: boolean;
-}, staticExtractionOptions?: Partial<StaticConfig>): TamaguiComponent<Variants extends void ? GetProps<ParentComponent> : GetBaseProps<ParentComponent> & Omit<GetVariantProps<ParentComponent>, keyof (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)> & (Variants extends void ? {} : GetVariantAcceptedValues<Variants>) & PseudoProps<Partial<GetBaseProps<ParentComponent> & Omit<GetVariantProps<ParentComponent>, keyof (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)> & (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)>> & MediaProps<Partial<GetBaseProps<ParentComponent> & Omit<GetVariantProps<ParentComponent>, keyof (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)> & (Variants extends void ? {} : GetVariantAcceptedValues<Variants>) & PseudoProps<Partial<GetBaseProps<ParentComponent> & Omit<GetVariantProps<ParentComponent>, keyof (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)> & (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)>>>>, GetRef<ParentComponent>, GetBaseProps<ParentComponent>, GetVariantProps<ParentComponent> & (Variants extends void ? {} : GetVariantAcceptedValues<Variants>), { [Key in Exclude<keyof ParentComponent, "defaultProps" | "staticConfig" | "propTypes" | "extractable" | "styleable" | "$$typeof">]: ParentComponent[Key]; }>;
+}, staticExtractionOptions?: Partial<StaticConfig>): TamaguiComponent<Variants extends void ? GetProps<ParentComponent> : GetBaseProps<ParentComponent> & Omit<GetVariantProps<ParentComponent>, keyof (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)> & (Variants extends void ? {} : GetVariantAcceptedValues<Variants>) & PseudoProps<Partial<GetBaseProps<ParentComponent> & Omit<GetVariantProps<ParentComponent>, keyof (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)> & (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)>> & MediaProps<Partial<GetBaseProps<ParentComponent> & Omit<GetVariantProps<ParentComponent>, keyof (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)> & (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)>>, GetRef<ParentComponent>, GetBaseProps<ParentComponent>, GetVariantProps<ParentComponent> & (Variants extends void ? {} : GetVariantAcceptedValues<Variants>), { [Key in Exclude<keyof ParentComponent, "defaultProps" | "staticConfig" | "propTypes" | "extractable" | "styleable" | "$$typeof">]: ParentComponent[Key]; }>;
 export {};
 //# sourceMappingURL=styled.d.ts.map

package/types/styled.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../src/styled.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAG7D,OAAO,KAAK,EACV,QAAQ,EACR,MAAM,EACN,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAEhB,KAAK,YAAY,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CACzE,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,QAAQ,CAAC,CAAC,CAAC,CAAA;AAEf,KAAK,eAAe,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CAC5E,GAAG,EACH,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,EAAE,CAAA;AAEN,KAAK,wBAAwB,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAC/C;KACG,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GACnE,GAAG,GACH,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;CACnC,GACD,SAAS,CAAA;AAEb,wBAAgB,MAAM,CACpB,eAAe,SAAS,iBAAiB,EACzC,QAAQ,SAAS,kBAAkB,CAAC,eAAe,CAAC,GAAG,IAAI,GAAG,kBAAkB,CAAC,eAAe,CAAC,GAAG,IAAI,EAExG,WAAW,EAAE,eAAe,EAE5B,OAAO,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG;IACpC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;IAC/B,eAAe,CAAC,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAA;IACpD,OAAO,CAAC,EAAE,aAAa,CAAA;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,EACD,uBAAuB,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,4xCA6KhD"}
+{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../src/styled.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAG7D,OAAO,KAAK,EACV,QAAQ,EACR,MAAM,EACN,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAEhB,KAAK,YAAY,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CACzE,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,QAAQ,CAAC,CAAC,CAAC,CAAA;AAEf,KAAK,eAAe,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CAC5E,GAAG,EACH,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,EAAE,CAAA;AAEN,KAAK,wBAAwB,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAC/C;KACG,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GACnE,GAAG,GACH,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;CACnC,GACD,SAAS,CAAA;AAEb,wBAAgB,MAAM,CACpB,eAAe,SAAS,iBAAiB,EACzC,QAAQ,SAAS,kBAAkB,CAAC,eAAe,CAAC,GAAG,IAAI,GAAG,kBAAkB,CAAC,eAAe,CAAC,GAAG,IAAI,EAExG,WAAW,EAAE,eAAe,EAE5B,OAAO,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG;IACpC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;IAC/B,eAAe,CAAC,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAA;IACpD,OAAO,CAAC,EAAE,aAAa,CAAA;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,EACD,uBAAuB,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,gjCA0LhD"}

package/dist/cjs/helpers/extendStaticConfig.js

@@ -1,94 +0,0 @@
-"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 extendStaticConfig_exports = {};
-__export(extendStaticConfig_exports, {
-  extendStaticConfig: () => extendStaticConfig,
-  mergeVariants: () => mergeVariants,
-  parseStaticConfig: () => parseStaticConfig
-});
-module.exports = __toCommonJS(extendStaticConfig_exports);
-var import_helpers = require("@tamagui/helpers");
-var import_createPropMapper = require("./createPropMapper");
-var import_mergeProps = require("./mergeProps");
-function extendStaticConfig(config, parent) {
-  if (!(parent && "staticConfig" in parent)) {
-    return parseStaticConfig(config);
-  }
-  const parentStaticConfig = parent.staticConfig;
-  const variants = mergeVariants(parentStaticConfig.variants, config.variants);
-  const parentNames = [...parentStaticConfig.parentNames || []];
-  if (parentStaticConfig.componentName) {
-    parentNames.push(parentStaticConfig.componentName);
-  }
-  const deoptProps = config.deoptProps || /* @__PURE__ */ new Set();
-  const merged = {
-    ...config.defaultProps,
-    ...config.defaultVariants
-  };
-  const defaultProps = parentStaticConfig.isHOC ? merged : (0, import_mergeProps.mergeProps)(parentStaticConfig.defaultProps, merged)[0];
-  return parseStaticConfig({
-    ...parentStaticConfig,
-    ...config,
-    parentStaticConfig,
-    deoptProps,
-    variants,
-    parentNames,
-    validStyles: config.validStyles ? {
-      ...parentStaticConfig.validStyles,
-      ...config.validStyles
-    } : parentStaticConfig.validStyles || import_helpers.stylePropsView,
-    defaultProps
-  });
-}
-const mergeVariants = (parentVariants, ourVariants) => {
-  const variants = {
-    ...parentVariants
-  };
-  if (ourVariants) {
-    for (const key in ourVariants) {
-      if (key in variants) {
-        variants[key] = {
-          ...variants[key],
-          ...ourVariants[key]
-        };
-      } else {
-        variants[key] = ourVariants[key];
-      }
-    }
-  }
-  return variants;
-};
-const parseStaticConfig = (config) => {
-  const parsed = {
-    defaultProps: {},
-    ...config,
-    parsed: true
-  };
-  return {
-    ...parsed,
-    propMapper: (0, import_createPropMapper.createPropMapper)(parsed)
-  };
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  extendStaticConfig,
-  mergeVariants,
-  parseStaticConfig
-});
-//# sourceMappingURL=extendStaticConfig.js.map

package/dist/cjs/helpers/extendStaticConfig.js.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/helpers/extendStaticConfig.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAA+B;AAQ/B,8BAAiC;AACjC,wBAA2B;AAEpB,SAAS,mBACd,QACA,QACA;AACA,MAAI,EAAE,UAAU,kBAAkB,SAAS;AACzC,WAAO,kBAAkB,MAAM;AAAA,EACjC;AAEA,QAAM,qBAAqB,OAAO;AAGlC,QAAM,WAAW,cAAc,mBAAmB,UAAU,OAAO,QAAQ;AAG3E,QAAM,cAAc,CAAC,GAAI,mBAAmB,eAAe,CAAC,CAAE;AAC9D,MAAI,mBAAmB,eAAe;AACpC,gBAAY,KAAK,mBAAmB,aAAa;AAAA,EACnD;AAEA,QAAM,aAAa,OAAO,cAAc,oBAAI,IAAY;AAExD,QAAM,SAAS;AAAA,IACb,GAAG,OAAO;AAAA,IACV,GAAG,OAAO;AAAA,EACZ;AAEA,QAAM,eAAe,mBAAmB,QACpC,aACA,8BAAW,mBAAmB,cAAc,MAAM,EAAE,CAAC;AAEzD,SAAO,kBAAkB;AAAA,IACvB,GAAG;AAAA,IACH,GAAG;AAAA,IACH;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,aAAa,OAAO,cAChB;AAAA,MACE,GAAG,mBAAmB;AAAA,MACtB,GAAG,OAAO;AAAA,IACZ,IACA,mBAAmB,eAAe;AAAA,IACtC;AAAA,EACF,CAAC;AACH;AAEO,MAAM,gBAAgB,CAC3B,gBACA,gBACG;AACH,QAAM,WAAW;AAAA,IACf,GAAG;AAAA,EACL;AAEA,MAAI,aAAa;AACf,eAAW,OAAO,aAAa;AAC7B,UAAI,OAAO,UAAU;AACnB,iBAAS,GAAG,IAAI;AAAA,UACd,GAAG,SAAS,GAAG;AAAA,UACf,GAAG,YAAY,GAAG;AAAA,QACpB;AAAA,MACF,OAAO;AACL,iBAAS,GAAG,IAAI,YAAY,GAAG;AAAA,MACjC;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;AAEO,MAAM,oBAAoB,CAAC,WAAsD;AACtF,QAAM,SAAS;AAAA,IACb,cAAc,CAAC;AAAA,IACf,GAAG;AAAA,IACH,QAAQ;AAAA,EACV;AACA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,gBAAY,0CAAiB,MAA4B;AAAA,EAC3D;AACF;",
-  "names": []
-}

package/dist/cjs/helpers/styledToStaticConfig.js

@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=styledToStaticConfig.js.map

package/dist/cjs/helpers/styledToStaticConfig.js.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": [],
-  "mappings": "",
-  "names": []
-}

package/dist/cjs/helpers/warnOnce.js

@@ -1,38 +0,0 @@
-"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 warnOnce_exports = {};
-__export(warnOnce_exports, {
-  warnOnce: () => warnOnce
-});
-module.exports = __toCommonJS(warnOnce_exports);
-let hasWarned;
-function warnOnce(key, warning) {
-  if (process.env.NODE_ENV === "development") {
-    hasWarned ?? (hasWarned = {});
-    if (!hasWarned[key]) {
-      hasWarned[key] = true;
-      console.warn(warning);
-    }
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  warnOnce
-});
-//# sourceMappingURL=warnOnce.js.map

package/dist/cjs/helpers/warnOnce.js.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/helpers/warnOnce.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAAI;AAEG,SAAS,SAAS,KAAa,SAAiB;AACrD,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,8BAAc,CAAC;AACf,QAAI,CAAC,UAAU,GAAG,GAAG;AACnB,gBAAU,GAAG,IAAI;AACjB,cAAQ,KAAK,OAAO;AAAA,IACtB;AAAA,EACF;AACF;",
-  "names": []
-}

package/dist/esm/helpers/extendStaticConfig.js

@@ -1,68 +0,0 @@
-import { stylePropsView } from "@tamagui/helpers";
-import { createPropMapper } from "./createPropMapper";
-import { mergeProps } from "./mergeProps";
-function extendStaticConfig(config, parent) {
-  if (!(parent && "staticConfig" in parent)) {
-    return parseStaticConfig(config);
-  }
-  const parentStaticConfig = parent.staticConfig;
-  const variants = mergeVariants(parentStaticConfig.variants, config.variants);
-  const parentNames = [...parentStaticConfig.parentNames || []];
-  if (parentStaticConfig.componentName) {
-    parentNames.push(parentStaticConfig.componentName);
-  }
-  const deoptProps = config.deoptProps || /* @__PURE__ */ new Set();
-  const merged = {
-    ...config.defaultProps,
-    ...config.defaultVariants
-  };
-  const defaultProps = parentStaticConfig.isHOC ? merged : mergeProps(parentStaticConfig.defaultProps, merged)[0];
-  return parseStaticConfig({
-    ...parentStaticConfig,
-    ...config,
-    parentStaticConfig,
-    deoptProps,
-    variants,
-    parentNames,
-    validStyles: config.validStyles ? {
-      ...parentStaticConfig.validStyles,
-      ...config.validStyles
-    } : parentStaticConfig.validStyles || stylePropsView,
-    defaultProps
-  });
-}
-const mergeVariants = (parentVariants, ourVariants) => {
-  const variants = {
-    ...parentVariants
-  };
-  if (ourVariants) {
-    for (const key in ourVariants) {
-      if (key in variants) {
-        variants[key] = {
-          ...variants[key],
-          ...ourVariants[key]
-        };
-      } else {
-        variants[key] = ourVariants[key];
-      }
-    }
-  }
-  return variants;
-};
-const parseStaticConfig = (config) => {
-  const parsed = {
-    defaultProps: {},
-    ...config,
-    parsed: true
-  };
-  return {
-    ...parsed,
-    propMapper: createPropMapper(parsed)
-  };
-};
-export {
-  extendStaticConfig,
-  mergeVariants,
-  parseStaticConfig
-};
-//# sourceMappingURL=extendStaticConfig.js.map

package/dist/esm/helpers/extendStaticConfig.js.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/helpers/extendStaticConfig.ts"],
-  "mappings": "AAAA,SAAS,sBAAsB;AAQ/B,SAAS,wBAAwB;AACjC,SAAS,kBAAkB;AAEpB,SAAS,mBACd,QACA,QACA;AACA,MAAI,EAAE,UAAU,kBAAkB,SAAS;AACzC,WAAO,kBAAkB,MAAM;AAAA,EACjC;AAEA,QAAM,qBAAqB,OAAO;AAGlC,QAAM,WAAW,cAAc,mBAAmB,UAAU,OAAO,QAAQ;AAG3E,QAAM,cAAc,CAAC,GAAI,mBAAmB,eAAe,CAAC,CAAE;AAC9D,MAAI,mBAAmB,eAAe;AACpC,gBAAY,KAAK,mBAAmB,aAAa;AAAA,EACnD;AAEA,QAAM,aAAa,OAAO,cAAc,oBAAI,IAAY;AAExD,QAAM,SAAS;AAAA,IACb,GAAG,OAAO;AAAA,IACV,GAAG,OAAO;AAAA,EACZ;AAEA,QAAM,eAAe,mBAAmB,QACpC,SACA,WAAW,mBAAmB,cAAc,MAAM,EAAE,CAAC;AAEzD,SAAO,kBAAkB;AAAA,IACvB,GAAG;AAAA,IACH,GAAG;AAAA,IACH;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,aAAa,OAAO,cAChB;AAAA,MACE,GAAG,mBAAmB;AAAA,MACtB,GAAG,OAAO;AAAA,IACZ,IACA,mBAAmB,eAAe;AAAA,IACtC;AAAA,EACF,CAAC;AACH;AAEO,MAAM,gBAAgB,CAC3B,gBACA,gBACG;AACH,QAAM,WAAW;AAAA,IACf,GAAG;AAAA,EACL;AAEA,MAAI,aAAa;AACf,eAAW,OAAO,aAAa;AAC7B,UAAI,OAAO,UAAU;AACnB,iBAAS,GAAG,IAAI;AAAA,UACd,GAAG,SAAS,GAAG;AAAA,UACf,GAAG,YAAY,GAAG;AAAA,QACpB;AAAA,MACF,OAAO;AACL,iBAAS,GAAG,IAAI,YAAY,GAAG;AAAA,MACjC;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;AAEO,MAAM,oBAAoB,CAAC,WAAsD;AACtF,QAAM,SAAS;AAAA,IACb,cAAc,CAAC;AAAA,IACf,GAAG;AAAA,IACH,QAAQ;AAAA,EACV;AACA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,YAAY,iBAAiB,MAA4B;AAAA,EAC3D;AACF;",
-  "names": []
-}

package/dist/esm/helpers/styledToStaticConfig.js

@@ -1 +0,0 @@
-//# sourceMappingURL=styledToStaticConfig.js.map

package/dist/esm/helpers/styledToStaticConfig.js.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": [],
-  "mappings": "",
-  "names": []
-}

package/dist/esm/helpers/warnOnce.js

@@ -1,14 +0,0 @@
-let hasWarned;
-function warnOnce(key, warning) {
-  if (process.env.NODE_ENV === "development") {
-    hasWarned ??= {};
-    if (!hasWarned[key]) {
-      hasWarned[key] = true;
-      console.warn(warning);
-    }
-  }
-}
-export {
-  warnOnce
-};
-//# sourceMappingURL=warnOnce.js.map

package/dist/esm/helpers/warnOnce.js.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/helpers/warnOnce.tsx"],
-  "mappings": "AAAA,IAAI;AAEG,SAAS,SAAS,KAAa,SAAiB;AACrD,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,kBAAc,CAAC;AACf,QAAI,CAAC,UAAU,GAAG,GAAG;AACnB,gBAAU,GAAG,IAAI;AACjB,cAAQ,KAAK,OAAO;AAAA,IACtB;AAAA,EACF;AACF;",
-  "names": []
-}