@tamagui/web 1.15.40 → 1.16.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.
- package/dist/cjs/createComponent.js +17 -3
- package/dist/cjs/createComponent.js.map +1 -1
- package/dist/cjs/helpers/createPropMapper.js +5 -0
- package/dist/cjs/helpers/createPropMapper.js.map +1 -1
- package/dist/cjs/helpers/expandStyle.js +3 -0
- package/dist/cjs/helpers/expandStyle.js.map +1 -1
- package/dist/cjs/helpers/getSplitStyles.js +17 -0
- package/dist/cjs/helpers/getSplitStyles.js.map +1 -1
- package/dist/cjs/helpers/themeable.js +2 -2
- package/dist/cjs/helpers/themeable.js.map +1 -1
- package/dist/cjs/styled.js.map +1 -1
- package/dist/cjs/views/ThemeDebug.js.map +1 -1
- package/dist/cjs/views/ThemeDebug.native.js +35 -0
- package/dist/cjs/views/ThemeDebug.native.js.map +6 -0
- package/dist/esm/createComponent.js +17 -3
- package/dist/esm/createComponent.js.map +1 -1
- package/dist/esm/createComponent.mjs +17 -3
- package/dist/esm/createComponent.mjs.map +1 -1
- package/dist/esm/helpers/createPropMapper.js +6 -1
- package/dist/esm/helpers/createPropMapper.js.map +1 -1
- package/dist/esm/helpers/createPropMapper.mjs +6 -1
- package/dist/esm/helpers/createPropMapper.mjs.map +1 -1
- package/dist/esm/helpers/expandStyle.js +4 -1
- package/dist/esm/helpers/expandStyle.js.map +1 -1
- package/dist/esm/helpers/expandStyle.mjs +4 -1
- package/dist/esm/helpers/expandStyle.mjs.map +1 -1
- package/dist/esm/helpers/getSplitStyles.js +18 -0
- package/dist/esm/helpers/getSplitStyles.js.map +1 -1
- package/dist/esm/helpers/getSplitStyles.mjs +18 -0
- package/dist/esm/helpers/getSplitStyles.mjs.map +1 -1
- package/dist/esm/helpers/themeable.js +2 -2
- package/dist/esm/helpers/themeable.js.map +1 -1
- package/dist/esm/helpers/themeable.mjs +2 -2
- package/dist/esm/helpers/themeable.mjs.map +1 -1
- package/dist/esm/styled.js.map +1 -1
- package/dist/esm/styled.mjs.map +1 -1
- package/dist/esm/views/ThemeDebug.js.map +1 -1
- package/dist/esm/views/ThemeDebug.mjs.map +1 -1
- package/dist/esm/views/ThemeDebug.native.js +11 -0
- package/dist/esm/views/ThemeDebug.native.js.map +6 -0
- package/dist/esm/views/ThemeDebug.native.mjs +11 -0
- package/dist/esm/views/ThemeDebug.native.mjs.map +6 -0
- package/package.json +9 -9
- package/src/createComponent.tsx +27 -5
- package/src/helpers/createPropMapper.ts +7 -1
- package/src/helpers/expandStyle.ts +9 -1
- package/src/helpers/getSplitStyles.tsx +22 -0
- package/src/helpers/themeable.tsx +4 -4
- package/src/styled.tsx +6 -1
- package/src/types.tsx +18 -7
- package/src/views/ThemeDebug.native.tsx +16 -0
- package/src/views/ThemeDebug.tsx +1 -1
- package/types/createComponent.d.ts.map +1 -1
- package/types/helpers/createPropMapper.d.ts.map +1 -1
- package/types/helpers/expandStyle.d.ts.map +1 -1
- package/types/helpers/getSplitStyles.d.ts.map +1 -1
- package/types/helpers/themeable.d.ts +2 -4
- package/types/helpers/themeable.d.ts.map +1 -1
- package/types/styled.d.ts +1 -1
- package/types/styled.d.ts.map +1 -1
- package/types/types.d.ts +5 -3
- package/types/types.d.ts.map +1 -1
- package/types/views/ThemeDebug.native.d.ts +8 -0
- package/types/views/ThemeDebug.native.d.ts.map +1 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/themeable.tsx"],
|
|
4
|
-
"mappings": "AAsBM;AAtBN,OAAO,SAAS,
|
|
4
|
+
"mappings": "AAsBM;AAtBN,OAAO,SAAS,kBAAkB;AAGlC,SAAS,aAAa;AAUf,SAAS,UACd,WACA,cACA;AACA,QAAM,qBAAqB,WAAW,SAAS,UAAU,OAAuB,KAAK;AACnF,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI;AACpE,UAAM,UAAU,MAAM,cAAc,WAAW,EAAE,GAAG,MAAM,IAAI,CAAQ;AAEtE,WACE;AAAA,MAAC;AAAA;AAAA,QACC,SAAS;AAAA,QACT,eAAe,kBAAiB,6CAAc;AAAA,QAC9C,MAAO,SAAiB;AAAA,QACxB,uBAAmB;AAAA,QACnB,OAAO,MAAM;AAAA,QACb,OAAO,MAAM;AAAA,QAEZ;AAAA;AAAA,IACH;AAAA,EAEJ,CAAC;AAED,QAAM,YAAiB;AACvB,YAAU,cAAc,WACrB,uCAAmB,iBAAgB,uCAAmB,SAAQ;AAGjE,SAAO;AAGT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { jsx } from "react/jsx-runtime";
|
|
2
2
|
import React, { forwardRef } from "react";
|
|
3
3
|
import { Theme } from "../views/Theme.js";
|
|
4
|
-
function themeable(component,
|
|
4
|
+
function themeable(component, staticConfig) {
|
|
5
5
|
const withThemeComponent = forwardRef(function WithTheme(props, ref) {
|
|
6
6
|
const { themeInverse, theme, componentName, themeReset, ...rest } = props;
|
|
7
7
|
const element = React.createElement(component, { ...rest, ref });
|
|
@@ -9,7 +9,7 @@ function themeable(component, opts) {
|
|
|
9
9
|
Theme,
|
|
10
10
|
{
|
|
11
11
|
inverse: themeInverse,
|
|
12
|
-
componentName: componentName || (
|
|
12
|
+
componentName: componentName || (staticConfig == null ? void 0 : staticConfig.componentName),
|
|
13
13
|
name: theme || null,
|
|
14
14
|
"disable-child-theme": true,
|
|
15
15
|
debug: props.debug,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/themeable.tsx"],
|
|
4
|
-
"mappings": "AAsBM;AAtBN,OAAO,SAAS,
|
|
4
|
+
"mappings": "AAsBM;AAtBN,OAAO,SAAS,kBAAkB;AAGlC,SAAS,aAAa;AAUf,SAAS,UACd,WACA,cACA;AACA,QAAM,qBAAqB,WAAW,SAAS,UAAU,OAAuB,KAAK;AACnF,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI;AACpE,UAAM,UAAU,MAAM,cAAc,WAAW,EAAE,GAAG,MAAM,IAAI,CAAQ;AAEtE,WACE;AAAA,MAAC;AAAA;AAAA,QACC,SAAS;AAAA,QACT,eAAe,kBAAiB,6CAAc;AAAA,QAC9C,MAAO,SAAiB;AAAA,QACxB,uBAAmB;AAAA,QACnB,OAAO,MAAM;AAAA,QACb,OAAO,MAAM;AAAA,QAEZ;AAAA;AAAA,IACH;AAAA,EAEJ,CAAC;AAED,QAAM,YAAiB;AACvB,YAAU,cAAc,WACrB,uCAAmB,iBAAgB,uCAAmB,SAAQ;AAGjE,SAAO;AAGT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/styled.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/styled.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,qBAAqB;AAE9B,SAAS,uBAAuB;AAChC,SAAS,gCAAgC;AAuClC,SAAS,OAId,aAEA,SAMA,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,qBACJ,kBAAkB,cAAe,YAAY,eAAgC;AAE/E,QAAM,yBACJ,CAAC,CAAC,sBACF,EAAE,mBAAmB,iBAAiB,mBAAmB;AAE3D,QAAM,YAAiB,yBACnB,eACA,yDAAoB,cAAa;AAErC,QAAM,gBAAgB;AAAA,IACpB,yBAAyB,IAAI,SAAS,MACpC,mEAAyB,kBACzB,yBAAyB,IAAI,yDAAoB,SAAS,MAC1D,yDAAoB;AAAA,EACxB;AAEA,QAAM,qBAAqB,MAAM;AAC/B,QAAI,SAAS;AACX,YAAM;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA,kBAAkB;AAAA,QAClB,GAAG;AAAA,MACL,IAAI;AACJ,UAAI,iBAAiB;AACnB,eAAO,OAAO,cAAc,eAAe;AAAA,MAC7C;AAEA,YAAM,aACH,iBAAiB,yBAAyB,IAAI,SAAS,KAAM;AAEhE,YAAM,SAAS;AAAA,SACb,mEAAyB,YAAU,yDAAoB;AAAA,MACzD;AACA,YAAM,mBACJ,yBACC,0BACC,kBACC,yDAAoB,WAAS,yDAAoB;AAEtD,YAAM,OAA8B;AAAA,QAClC,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,GAAG;AAAA,MACL;AAGA,UAAI,aAAa,YAAY,CAAC,kBAAkB;AAC9C,aAAK,eAAe;AAAA,MACtB;AAEA,aAAO;AAAA,IACT;AAAA,EACF,GAAG;AAEH,QAAM,YAAY,gBAAgB,qBAAqB,CAAC,GAAG,SAAS;
|
|
4
|
+
"mappings": "AAAA,SAAS,qBAAqB;AAE9B,SAAS,uBAAuB;AAChC,SAAS,gCAAgC;AAuClC,SAAS,OAId,aAEA,SAMA,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,qBACJ,kBAAkB,cAAe,YAAY,eAAgC;AAE/E,QAAM,yBACJ,CAAC,CAAC,sBACF,EAAE,mBAAmB,iBAAiB,mBAAmB;AAE3D,QAAM,YAAiB,yBACnB,eACA,yDAAoB,cAAa;AAErC,QAAM,gBAAgB;AAAA,IACpB,yBAAyB,IAAI,SAAS,MACpC,mEAAyB,kBACzB,yBAAyB,IAAI,yDAAoB,SAAS,MAC1D,yDAAoB;AAAA,EACxB;AAEA,QAAM,qBAAqB,MAAM;AAC/B,QAAI,SAAS;AACX,YAAM;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA,kBAAkB;AAAA,QAClB,GAAG;AAAA,MACL,IAAI;AACJ,UAAI,iBAAiB;AACnB,eAAO,OAAO,cAAc,eAAe;AAAA,MAC7C;AAEA,YAAM,aACH,iBAAiB,yBAAyB,IAAI,SAAS,KAAM;AAEhE,YAAM,SAAS;AAAA,SACb,mEAAyB,YAAU,yDAAoB;AAAA,MACzD;AACA,YAAM,mBACJ,yBACC,0BACC,kBACC,yDAAoB,WAAS,yDAAoB;AAEtD,YAAM,OAA8B;AAAA,QAClC,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,GAAG;AAAA,MACL;AAGA,UAAI,aAAa,YAAY,CAAC,kBAAkB;AAC9C,aAAK,eAAe;AAAA,MACtB;AAEA,aAAO;AAAA,IACT;AAAA,EACF,GAAG;AAEH,QAAM,YAAY,gBAAgB,qBAAqB,CAAC,GAAG,SAAS;AAyCpE,aAAW,OAAO,aAAa;AAC7B,QAAI,OAAO;AAAW;AAEtB,cAAU,GAAG,IAAI,YAAY,GAAG;AAAA,EAClC;AAEA,SAAO;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/styled.mjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/styled.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,qBAAqB;AAE9B,SAAS,uBAAuB;AAChC,SAAS,gCAAgC;AAuClC,SAAS,OAId,aAEA,SAMA,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,qBACJ,kBAAkB,cAAe,YAAY,eAAgC;AAE/E,QAAM,yBACJ,CAAC,CAAC,sBACF,EAAE,mBAAmB,iBAAiB,mBAAmB;AAE3D,QAAM,YAAiB,yBACnB,eACA,yDAAoB,cAAa;AAErC,QAAM,gBAAgB;AAAA,IACpB,yBAAyB,IAAI,SAAS,MACpC,mEAAyB,kBACzB,yBAAyB,IAAI,yDAAoB,SAAS,MAC1D,yDAAoB;AAAA,EACxB;AAEA,QAAM,qBAAqB,MAAM;AAC/B,QAAI,SAAS;AACX,YAAM;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA,kBAAkB;AAAA,QAClB,GAAG;AAAA,MACL,IAAI;AACJ,UAAI,iBAAiB;AACnB,eAAO,OAAO,cAAc,eAAe;AAAA,MAC7C;AAEA,YAAM,aACH,iBAAiB,yBAAyB,IAAI,SAAS,KAAM;AAEhE,YAAM,SAAS;AAAA,SACb,mEAAyB,YAAU,yDAAoB;AAAA,MACzD;AACA,YAAM,mBACJ,yBACC,0BACC,kBACC,yDAAoB,WAAS,yDAAoB;AAEtD,YAAM,OAA8B;AAAA,QAClC,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,GAAG;AAAA,MACL;AAGA,UAAI,aAAa,YAAY,CAAC,kBAAkB;AAC9C,aAAK,eAAe;AAAA,MACtB;AAEA,aAAO;AAAA,IACT;AAAA,EACF,GAAG;AAEH,QAAM,YAAY,gBAAgB,qBAAqB,CAAC,GAAG,SAAS;
|
|
4
|
+
"mappings": "AAAA,SAAS,qBAAqB;AAE9B,SAAS,uBAAuB;AAChC,SAAS,gCAAgC;AAuClC,SAAS,OAId,aAEA,SAMA,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,qBACJ,kBAAkB,cAAe,YAAY,eAAgC;AAE/E,QAAM,yBACJ,CAAC,CAAC,sBACF,EAAE,mBAAmB,iBAAiB,mBAAmB;AAE3D,QAAM,YAAiB,yBACnB,eACA,yDAAoB,cAAa;AAErC,QAAM,gBAAgB;AAAA,IACpB,yBAAyB,IAAI,SAAS,MACpC,mEAAyB,kBACzB,yBAAyB,IAAI,yDAAoB,SAAS,MAC1D,yDAAoB;AAAA,EACxB;AAEA,QAAM,qBAAqB,MAAM;AAC/B,QAAI,SAAS;AACX,YAAM;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA,kBAAkB;AAAA,QAClB,GAAG;AAAA,MACL,IAAI;AACJ,UAAI,iBAAiB;AACnB,eAAO,OAAO,cAAc,eAAe;AAAA,MAC7C;AAEA,YAAM,aACH,iBAAiB,yBAAyB,IAAI,SAAS,KAAM;AAEhE,YAAM,SAAS;AAAA,SACb,mEAAyB,YAAU,yDAAoB;AAAA,MACzD;AACA,YAAM,mBACJ,yBACC,0BACC,kBACC,yDAAoB,WAAS,yDAAoB;AAEtD,YAAM,OAA8B;AAAA,QAClC,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,GAAG;AAAA,MACL;AAGA,UAAI,aAAa,YAAY,CAAC,kBAAkB;AAC9C,aAAK,eAAe;AAAA,MACtB;AAEA,aAAO;AAAA,IACT;AAAA,EACF,GAAG;AAEH,QAAM,YAAY,gBAAgB,qBAAqB,CAAC,GAAG,SAAS;AAyCpE,aAAW,OAAO,aAAa;AAC7B,QAAI,OAAO;AAAW;AAEtB,cAAU,GAAG,IAAI,YAAY,GAAG;AAAA,EAClC;AAEA,SAAO;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/ThemeDebug.tsx"],
|
|
4
|
-
"mappings": "AA4DM,mBA+BE,KA7BE,YAFJ;AA5DN,SAAS,sBAAsB;AAC/B,SAAS,WAAW,
|
|
4
|
+
"mappings": "AA4DM,mBA+BE,KA7BE,YAFJ;AA5DN,SAAS,sBAAsB;AAC/B,SAAS,WAAW,OAAO,gBAAgB;AAC3C,SAAS,oBAAoB;AAK7B,IAAI;AAEG,SAAS,WAAW;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AACF,GAIG;AAjBH;AAmBE,MAAI,WAAW,qBAAqB,GAAG;AACrC,WAAO;AAAA,EACT;AAEA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,UAAM,CAAC,eAAe,gBAAgB,IAAI,SAAS,CAAC;AACpD,UAAM,WAAW,eAAe;AAChC,UAAM,KAAK,MAAM;AAEjB,QAAI,QAAQ,IAAI,aAAa,iBAAiB,OAAO,aAAa,aAAa;AAC7E,UAAI,CAAC,MAAM;AACT,eAAO,SAAS,cAAc,KAAK;AACnC,aAAK,MAAM,SAAS;AACpB,aAAK,MAAM,YAAY;AACvB,aAAK,MAAM,WAAW;AACtB,aAAK,MAAM,SAAS;AACpB,aAAK,MAAM,MAAM;AACjB,aAAK,MAAM,OAAO;AAClB,aAAK,MAAM,QAAQ;AACnB,aAAK,MAAM,UAAU;AACrB,aAAK,MAAM,SAAS;AACpB,aAAK,MAAM,gBAAgB;AAC3B,aAAK,MAAM,aAAa;AACxB,iBAAS,KAAK,YAAY,IAAI;AAAA,MAChC;AAAA,IACF;AAEA,cAAU,MAAM;AA9CpB,UAAAA,KAAAC;AA+CM,OAAAA,OAAAD,MAAA,WAAW,iBAAX,gBAAAA,IAAyB,kBAAzB,gBAAAC,IAAwC,cAAc,CAAC,MAAM,YAAY;AACvE,yBAAiB,CAAC,MAAM,EAAE,CAAC;AAC3B,gBAAQ,KAAK,iBAAiB,IAAI;AAAA,MACpC;AAAA,IACF,GAAG,CAAC,WAAW,YAAY,CAAC;AAE5B,cAAU,MAAM;AAEd,YAAM,KAAK,YAAY,UAAU,GAAG;AACpC,aAAO,MAAM,aAAa,EAAE;AAAA,IAC9B,GAAG,CAAC,CAAC;AAEL,WACE,iCACG;AAAA;AAAA,QACC;AAAA,UAAC;AAAA;AAAA,YACC,OAAO;AAAA,cACL,YAAY;AAAA,YACd;AAAA,YACD;AAAA;AAAA,cACY;AAAA,cAAG;AAAA,cACb,KAAK;AAAA,gBACJ;AAAA,kBACE,MAAM,WAAW;AAAA,kBACjB,WAAW,WAAW;AAAA,kBACtB,SAAS,WAAW;AAAA,kBACpB,gBAAgB,WAAW;AAAA,kBAC3B,SAAQ,gBAAW,iBAAX,mBAAyB,MAAM;AAAA,kBACvC,KAAI,gBAAW,iBAAX,mBAAyB;AAAA,kBAC7B,WAAU,sBAAW,iBAAX,mBAAyB,kBAAzB,mBAAwC;AAAA,kBAClD,OAAO,WAAW;AAAA,kBAClB;AAAA,kBACA,WAAW,CAAC,KAAI,gBAAW,iBAAX,mBAA0B,qBAAoB,CAAC,CAAE,EAAE;AAAA,oBACjE;AAAA,kBACF;AAAA,kBACA,uBAAsB,gBAAW,iBAAX,mBAA0B;AAAA,gBAClD;AAAA,gBACA;AAAA,gBACA;AAAA,cACF;AAAA;AAAA;AAAA,QACF;AAAA,QACA;AAAA,MACF;AAAA,MAEA,oBAAC,SAAI,OAAO,EAAE,OAAO,MAAM,GAAI,cAAG;AAAA,MAEjC;AAAA,OACH;AAAA,EAEJ;AACA,SAAO;AACT;",
|
|
5
5
|
"names": ["_a", "_b"]
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/ThemeDebug.tsx"],
|
|
4
|
-
"mappings": "AA4DM,mBA+BE,KA7BE,YAFJ;AA5DN,SAAS,sBAAsB;AAC/B,SAAS,WAAW,
|
|
4
|
+
"mappings": "AA4DM,mBA+BE,KA7BE,YAFJ;AA5DN,SAAS,sBAAsB;AAC/B,SAAS,WAAW,OAAO,gBAAgB;AAC3C,SAAS,oBAAoB;AAK7B,IAAI;AAEG,SAAS,WAAW;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AACF,GAIG;AAjBH;AAmBE,MAAI,WAAW,qBAAqB,GAAG;AACrC,WAAO;AAAA,EACT;AAEA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,UAAM,CAAC,eAAe,gBAAgB,IAAI,SAAS,CAAC;AACpD,UAAM,WAAW,eAAe;AAChC,UAAM,KAAK,MAAM;AAEjB,QAAI,QAAQ,IAAI,aAAa,iBAAiB,OAAO,aAAa,aAAa;AAC7E,UAAI,CAAC,MAAM;AACT,eAAO,SAAS,cAAc,KAAK;AACnC,aAAK,MAAM,SAAS;AACpB,aAAK,MAAM,YAAY;AACvB,aAAK,MAAM,WAAW;AACtB,aAAK,MAAM,SAAS;AACpB,aAAK,MAAM,MAAM;AACjB,aAAK,MAAM,OAAO;AAClB,aAAK,MAAM,QAAQ;AACnB,aAAK,MAAM,UAAU;AACrB,aAAK,MAAM,SAAS;AACpB,aAAK,MAAM,gBAAgB;AAC3B,aAAK,MAAM,aAAa;AACxB,iBAAS,KAAK,YAAY,IAAI;AAAA,MAChC;AAAA,IACF;AAEA,cAAU,MAAM;AA9CpB,UAAAA,KAAAC;AA+CM,OAAAA,OAAAD,MAAA,WAAW,iBAAX,gBAAAA,IAAyB,kBAAzB,gBAAAC,IAAwC,cAAc,CAAC,MAAM,YAAY;AACvE,yBAAiB,CAAC,MAAM,EAAE,CAAC;AAC3B,gBAAQ,KAAK,iBAAiB,IAAI;AAAA,MACpC;AAAA,IACF,GAAG,CAAC,WAAW,YAAY,CAAC;AAE5B,cAAU,MAAM;AAEd,YAAM,KAAK,YAAY,UAAU,GAAG;AACpC,aAAO,MAAM,aAAa,EAAE;AAAA,IAC9B,GAAG,CAAC,CAAC;AAEL,WACE,iCACG;AAAA;AAAA,QACC;AAAA,UAAC;AAAA;AAAA,YACC,OAAO;AAAA,cACL,YAAY;AAAA,YACd;AAAA,YACD;AAAA;AAAA,cACY;AAAA,cAAG;AAAA,cACb,KAAK;AAAA,gBACJ;AAAA,kBACE,MAAM,WAAW;AAAA,kBACjB,WAAW,WAAW;AAAA,kBACtB,SAAS,WAAW;AAAA,kBACpB,gBAAgB,WAAW;AAAA,kBAC3B,SAAQ,gBAAW,iBAAX,mBAAyB,MAAM;AAAA,kBACvC,KAAI,gBAAW,iBAAX,mBAAyB;AAAA,kBAC7B,WAAU,sBAAW,iBAAX,mBAAyB,kBAAzB,mBAAwC;AAAA,kBAClD,OAAO,WAAW;AAAA,kBAClB;AAAA,kBACA,WAAW,CAAC,KAAI,gBAAW,iBAAX,mBAA0B,qBAAoB,CAAC,CAAE,EAAE;AAAA,oBACjE;AAAA,kBACF;AAAA,kBACA,uBAAsB,gBAAW,iBAAX,mBAA0B;AAAA,gBAClD;AAAA,gBACA;AAAA,gBACA;AAAA,cACF;AAAA;AAAA;AAAA,QACF;AAAA,QACA;AAAA,MACF;AAAA,MAEA,oBAAC,SAAI,OAAO,EAAE,OAAO,MAAM,GAAI,cAAG;AAAA,MAEjC;AAAA,OACH;AAAA,EAEJ;AACA,SAAO;AACT;",
|
|
5
5
|
"names": ["_a", "_b"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.16.1",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -27,19 +27,19 @@
|
|
|
27
27
|
"reset.css"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@tamagui/compose-refs": "1.
|
|
31
|
-
"@tamagui/constants": "1.
|
|
32
|
-
"@tamagui/helpers": "1.
|
|
33
|
-
"@tamagui/normalize-css-color": "1.
|
|
34
|
-
"@tamagui/use-did-finish-ssr": "1.
|
|
35
|
-
"@tamagui/use-event": "1.
|
|
36
|
-
"@tamagui/use-force-update": "1.
|
|
30
|
+
"@tamagui/compose-refs": "1.16.1",
|
|
31
|
+
"@tamagui/constants": "1.16.1",
|
|
32
|
+
"@tamagui/helpers": "1.16.1",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.16.1",
|
|
34
|
+
"@tamagui/use-did-finish-ssr": "1.16.1",
|
|
35
|
+
"@tamagui/use-event": "1.16.1",
|
|
36
|
+
"@tamagui/use-force-update": "1.16.1"
|
|
37
37
|
},
|
|
38
38
|
"peerDependencies": {
|
|
39
39
|
"react": "*"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@tamagui/build": "1.
|
|
42
|
+
"@tamagui/build": "1.16.1",
|
|
43
43
|
"@testing-library/react": "^13.4.0",
|
|
44
44
|
"csstype": "^3.0.10",
|
|
45
45
|
"react": "^18.2.0",
|
package/src/createComponent.tsx
CHANGED
|
@@ -24,6 +24,7 @@ import { extendStaticConfig, parseStaticConfig } from './helpers/extendStaticCon
|
|
|
24
24
|
import { useSplitStyles } from './helpers/getSplitStyles.js'
|
|
25
25
|
import { mergeProps } from './helpers/mergeProps.js'
|
|
26
26
|
import { proxyThemeVariables } from './helpers/proxyThemeVariables.js'
|
|
27
|
+
import { themeable } from './helpers/themeable.js'
|
|
27
28
|
import { useShallowSetState } from './helpers/useShallowSetState.js'
|
|
28
29
|
import { useAnimationDriver } from './hooks/useAnimationDriver.js'
|
|
29
30
|
import { setMediaShouldUpdate, useMedia } from './hooks/useMedia.js'
|
|
@@ -895,7 +896,9 @@ export function createComponent<
|
|
|
895
896
|
}
|
|
896
897
|
})
|
|
897
898
|
|
|
898
|
-
|
|
899
|
+
type ComponentType = TamaguiComponent<ComponentPropTypes, Ref, BaseProps>
|
|
900
|
+
|
|
901
|
+
let res: ComponentType = component as any
|
|
899
902
|
|
|
900
903
|
if (configIn.memo) {
|
|
901
904
|
res = memo(res) as any
|
|
@@ -906,24 +909,43 @@ export function createComponent<
|
|
|
906
909
|
...staticConfig,
|
|
907
910
|
}
|
|
908
911
|
|
|
909
|
-
|
|
910
|
-
res.extractable = (Component: any, conf?: Partial<StaticConfig>) => {
|
|
912
|
+
function extendStyledConfig(Component: any, conf?: Partial<StaticConfig>) {
|
|
911
913
|
Component.staticConfig = extendStaticConfig(
|
|
912
914
|
{
|
|
913
|
-
Component,
|
|
915
|
+
Component: Component as any,
|
|
914
916
|
...conf,
|
|
915
917
|
neverFlatten: true,
|
|
916
918
|
isHOC: true,
|
|
917
919
|
defaultProps: {
|
|
918
|
-
...Component
|
|
920
|
+
...Component['defaultProps'],
|
|
919
921
|
...conf?.defaultProps,
|
|
920
922
|
},
|
|
921
923
|
},
|
|
922
924
|
res
|
|
923
925
|
)
|
|
926
|
+
}
|
|
927
|
+
|
|
928
|
+
function extractable(Component, conf?: Partial<StaticConfig>) {
|
|
929
|
+
extendStyledConfig(Component, conf)
|
|
924
930
|
return Component
|
|
925
931
|
}
|
|
926
932
|
|
|
933
|
+
function styleable(Component, conf?: Partial<StaticConfig>) {
|
|
934
|
+
const isForwardedRefAlready = Component.render?.length === 2
|
|
935
|
+
const ComponentForwardedRef = isForwardedRefAlready
|
|
936
|
+
? (Component as any)
|
|
937
|
+
: forwardRef(Component as any)
|
|
938
|
+
|
|
939
|
+
const out = themeable(ComponentForwardedRef, staticConfig) as any
|
|
940
|
+
|
|
941
|
+
extendStyledConfig(out, conf)
|
|
942
|
+
|
|
943
|
+
return out
|
|
944
|
+
}
|
|
945
|
+
|
|
946
|
+
res.extractable = extractable
|
|
947
|
+
res.styleable = styleable
|
|
948
|
+
|
|
927
949
|
return res
|
|
928
950
|
}
|
|
929
951
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isWeb } from '@tamagui/constants'
|
|
1
|
+
import { isAndroid, isWeb } from '@tamagui/constants'
|
|
2
2
|
|
|
3
3
|
import { getConfig } from '../config.js'
|
|
4
4
|
import { isDevTools } from '../constants/isDevTools.js'
|
|
@@ -50,6 +50,12 @@ export const createPropMapper = (staticConfig: StaticConfigParsed) => {
|
|
|
50
50
|
) => {
|
|
51
51
|
conf ||= getConfig()
|
|
52
52
|
|
|
53
|
+
if (!(process.env.TAMAGUI_TARGET === 'native' && isAndroid)) {
|
|
54
|
+
if (key === 'elevationAndroid') {
|
|
55
|
+
return
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
53
59
|
const props = state.fallbackProps || propsIn
|
|
54
60
|
const returnVariablesAs = getReturnVariablesAs(props, state)
|
|
55
61
|
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright (c) Nicolas Gallagher licensed under the MIT license.
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
|
-
import { isWeb } from '@tamagui/constants'
|
|
6
|
+
import { isAndroid, isWeb } from '@tamagui/constants'
|
|
7
7
|
|
|
8
8
|
export function expandStyle(key: string, value: any) {
|
|
9
9
|
if (process.env.TAMAGUI_TARGET === 'web') {
|
|
@@ -26,6 +26,14 @@ export function expandStyle(key: string, value: any) {
|
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
+
if (
|
|
30
|
+
process.env.TAMAGUI_TARGET === 'native' &&
|
|
31
|
+
isAndroid &&
|
|
32
|
+
key === 'elevationAndroid'
|
|
33
|
+
) {
|
|
34
|
+
return [['elevation', value]]
|
|
35
|
+
}
|
|
36
|
+
|
|
29
37
|
const longKey = EXPANSIONS[key]
|
|
30
38
|
if (longKey) {
|
|
31
39
|
return longKey.map((key) => {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
|
+
isAndroid,
|
|
2
3
|
isClient,
|
|
3
4
|
isRSC,
|
|
4
5
|
isServer,
|
|
@@ -334,6 +335,10 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
334
335
|
}
|
|
335
336
|
|
|
336
337
|
if (process.env.TAMAGUI_TARGET === 'native') {
|
|
338
|
+
if (!isAndroid) {
|
|
339
|
+
// only works in android
|
|
340
|
+
if (keyInit === 'elevationAndroid') return
|
|
341
|
+
}
|
|
337
342
|
// map userSelect to native prop
|
|
338
343
|
if (keyInit === 'userSelect') {
|
|
339
344
|
keyInit = 'selectable'
|
|
@@ -343,6 +348,10 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
343
348
|
}
|
|
344
349
|
}
|
|
345
350
|
|
|
351
|
+
if (process.env.TAMAGUI_TARGET === 'web') {
|
|
352
|
+
if (keyInit === 'elevationAndroid') return
|
|
353
|
+
}
|
|
354
|
+
|
|
346
355
|
if (!staticConfig.isHOC) {
|
|
347
356
|
if (keyInit in skipProps) {
|
|
348
357
|
return
|
|
@@ -856,6 +865,13 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
856
865
|
if (key in validStyleProps) {
|
|
857
866
|
mergeStyle(styleState, flatTransforms, key, val)
|
|
858
867
|
continue
|
|
868
|
+
} else if (
|
|
869
|
+
process.env.TAMAGUI_TARGET === 'native' &&
|
|
870
|
+
isAndroid &&
|
|
871
|
+
key === 'elevation'
|
|
872
|
+
) {
|
|
873
|
+
mergeStyle(styleState, flatTransforms, key, val)
|
|
874
|
+
continue
|
|
859
875
|
}
|
|
860
876
|
|
|
861
877
|
// pass to view props
|
|
@@ -906,6 +922,12 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
906
922
|
}
|
|
907
923
|
}
|
|
908
924
|
}
|
|
925
|
+
if (process.env.TAMAGUI_TARGET === 'native') {
|
|
926
|
+
if ('elevationAndroid' in style) {
|
|
927
|
+
style['elevation'] = style.elevationAndroid
|
|
928
|
+
delete style.elevationAndroid
|
|
929
|
+
}
|
|
930
|
+
}
|
|
909
931
|
}
|
|
910
932
|
|
|
911
933
|
// always do this at the very end to preserve the order strictly (animations, origin)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import React, { forwardRef
|
|
1
|
+
import React, { forwardRef } from 'react'
|
|
2
2
|
|
|
3
|
-
import { DebugProp, ThemeName } from '../types.js'
|
|
3
|
+
import { DebugProp, StaticConfig, ThemeName } from '../types.js'
|
|
4
4
|
import { Theme } from '../views/Theme.js'
|
|
5
5
|
|
|
6
6
|
export interface ThemeableProps {
|
|
@@ -13,7 +13,7 @@ export interface ThemeableProps {
|
|
|
13
13
|
|
|
14
14
|
export function themeable<Component extends (props: any) => any>(
|
|
15
15
|
component: Component,
|
|
16
|
-
|
|
16
|
+
staticConfig?: Partial<StaticConfig>
|
|
17
17
|
) {
|
|
18
18
|
const withThemeComponent = forwardRef(function WithTheme(props: ThemeableProps, ref) {
|
|
19
19
|
const { themeInverse, theme, componentName, themeReset, ...rest } = props
|
|
@@ -22,7 +22,7 @@ export function themeable<Component extends (props: any) => any>(
|
|
|
22
22
|
return (
|
|
23
23
|
<Theme
|
|
24
24
|
inverse={themeInverse}
|
|
25
|
-
componentName={componentName ||
|
|
25
|
+
componentName={componentName || staticConfig?.componentName}
|
|
26
26
|
name={(theme as any) || null}
|
|
27
27
|
disable-child-theme
|
|
28
28
|
debug={props.debug}
|
package/src/styled.tsx
CHANGED
|
@@ -163,7 +163,12 @@ export function styled<
|
|
|
163
163
|
type ParentStaticProperties = {
|
|
164
164
|
[Key in Exclude<
|
|
165
165
|
keyof ParentComponent,
|
|
166
|
-
|
|
166
|
+
| 'defaultProps'
|
|
167
|
+
| 'propTypes'
|
|
168
|
+
| '$$typeof'
|
|
169
|
+
| 'staticConfig'
|
|
170
|
+
| 'extractable'
|
|
171
|
+
| 'styleable'
|
|
167
172
|
>]: ParentComponent[Key]
|
|
168
173
|
}
|
|
169
174
|
|
package/src/types.tsx
CHANGED
|
@@ -24,6 +24,7 @@ import type {
|
|
|
24
24
|
import type { Variable } from './createVariable.js'
|
|
25
25
|
import type { ResolveVariableTypes } from './helpers/createPropMapper.js'
|
|
26
26
|
import type { FontLanguageProps } from './views/FontLanguage.types.js'
|
|
27
|
+
import { Stack } from './views/Stack.js'
|
|
27
28
|
import type { ThemeProviderProps } from './views/ThemeProvider.js'
|
|
28
29
|
|
|
29
30
|
export type { MediaStyleObject, StyleObject } from '@tamagui/helpers'
|
|
@@ -890,16 +891,26 @@ export type TamaguiComponent<
|
|
|
890
891
|
BaseProps = {},
|
|
891
892
|
VariantProps = {},
|
|
892
893
|
ParentStaticProperties = {}
|
|
893
|
-
> = ReactComponentWithRef<Props, Ref> &
|
|
894
|
+
> = ReactComponentWithRef<Props, Ref> &
|
|
895
|
+
StaticComponentObject<Props, Ref> &
|
|
896
|
+
ParentStaticProperties
|
|
894
897
|
|
|
895
|
-
type StaticComponentObject = {
|
|
898
|
+
type StaticComponentObject<Props, Ref> = {
|
|
896
899
|
staticConfig: StaticConfigParsed
|
|
900
|
+
|
|
901
|
+
/** @deprecated use `styleable` instead (same functionality, better name) */
|
|
902
|
+
extractable: <X>(a: X, opts?: Partial<StaticConfig>) => X
|
|
897
903
|
/*
|
|
898
|
-
*
|
|
899
|
-
* If you create a styled frame component this is a HoC to extract
|
|
900
|
-
* styles from all parents.
|
|
904
|
+
* If you want your HOC of a styled() component to also be able to be styled(), you need this to wrap it.
|
|
901
905
|
*/
|
|
902
|
-
|
|
906
|
+
styleable: <
|
|
907
|
+
CustomProps extends Object,
|
|
908
|
+
X extends FunctionComponent<Props & CustomProps> = FunctionComponent<
|
|
909
|
+
Props & CustomProps
|
|
910
|
+
>
|
|
911
|
+
>(
|
|
912
|
+
a: X
|
|
913
|
+
) => ReactComponentWithRef<CustomProps & Omit<Props, keyof CustomProps>, Ref>
|
|
903
914
|
}
|
|
904
915
|
|
|
905
916
|
export type TamaguiProviderProps = Partial<Omit<ThemeProviderProps, 'children'>> & {
|
|
@@ -1000,7 +1011,7 @@ export type StaticConfigPublic = {
|
|
|
1000
1011
|
}
|
|
1001
1012
|
|
|
1002
1013
|
type StaticConfigBase = StaticConfigPublic & {
|
|
1003
|
-
Component?: FunctionComponent<any> & StaticComponentObject
|
|
1014
|
+
Component?: FunctionComponent<any> & StaticComponentObject<any, any>
|
|
1004
1015
|
|
|
1005
1016
|
variants?: GenericVariantDefinitions
|
|
1006
1017
|
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { ChangedThemeResponse } from '../hooks/useTheme'
|
|
2
|
+
import { ThemeProps } from '../types'
|
|
3
|
+
|
|
4
|
+
export function ThemeDebug({
|
|
5
|
+
themeState,
|
|
6
|
+
themeProps,
|
|
7
|
+
children,
|
|
8
|
+
}: {
|
|
9
|
+
themeState: ChangedThemeResponse
|
|
10
|
+
themeProps: ThemeProps
|
|
11
|
+
children: any
|
|
12
|
+
}) {
|
|
13
|
+
// empty
|
|
14
|
+
|
|
15
|
+
return children
|
|
16
|
+
}
|
package/src/views/ThemeDebug.tsx
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useForceUpdate } from '@tamagui/use-force-update'
|
|
2
|
-
import { useEffect, useId,
|
|
2
|
+
import { useEffect, useId, useState } from 'react'
|
|
3
3
|
import { createPortal } from 'react-dom'
|
|
4
4
|
|
|
5
5
|
import { ChangedThemeResponse } from '../hooks/useTheme.js'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,KAYN,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,KAYN,MAAM,OAAO,CAAA;AAkBd,OAAO,EACL,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,qBAAqB,EAErB,cAAc,EAIf,MAAM,SAAS,CAAA;AAsBhB,eAAO,MAAM,qBAAqB,EAAE,qBAMnC,CAAA;AAeD,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA8B3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EAEjB,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,EACpD,eAAe,CAAC,EAAE,iBAAiB,wDAqzBpC;AAGD,eAAO,MAAM,QAAQ;YAAW;QAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;KAAE;;CAAmB,CAAA;AAMrE,eAAO,MAAM,MAAM,sDA8CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAAA;IACnC,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAA;IAC1B,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createPropMapper.d.ts","sourceRoot":"","sources":["../../src/helpers/createPropMapper.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAGV,UAAU,EACV,eAAe,EACf,kBAAkB,EAClB,qBAAqB,EAEtB,MAAM,aAAa,CAAA;AAQpB,MAAM,MAAM,oBAAoB,GAC5B,MAAM,GACN,OAAO,GACP,UAAU,GACV,MAAM,GACN,iBAAiB,CAAA;AAErB,eAAO,MAAM,oBAAoB,UAAW,GAAG,SAAS,QAAQ,eAAe,CAAC,qBAE/E,CAAA;AAED,eAAO,MAAM,gBAAgB,iBAAkB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"createPropMapper.d.ts","sourceRoot":"","sources":["../../src/helpers/createPropMapper.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAGV,UAAU,EACV,eAAe,EACf,kBAAkB,EAClB,qBAAqB,EAEtB,MAAM,aAAa,CAAA;AAQpB,MAAM,MAAM,oBAAoB,GAC5B,MAAM,GACN,OAAO,GACP,UAAU,GACV,MAAM,GACN,iBAAiB,CAAA;AAErB,eAAO,MAAM,oBAAoB,UAAW,GAAG,SAAS,QAAQ,eAAe,CAAC,qBAE/E,CAAA;AAED,eAAO,MAAM,gBAAgB,iBAAkB,kBAAkB,eAsGhE,CAAA;AA+GD,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBA2BtF;AAMD,eAAO,MAAM,uBAAuB,cAAe,GAAG,QAErD,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expandStyle.d.ts","sourceRoot":"","sources":["../../src/helpers/expandStyle.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"expandStyle.d.ts","sourceRoot":"","sources":["../../src/helpers/expandStyle.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,uBAmClD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EACV,gBAAgB,EAChB,SAAS,EACT,cAAc,EAMd,eAAe,EACf,kBAAkB,EAElB,qBAAqB,EACrB,cAAc,EACd,WAAW,EAEZ,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EACV,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,gCAAgC,CAAA;AAkBvC,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,cAAc,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,UAAU,EAAE,gBAAgB,CAAA;IAC5B,YAAY,EAAE,kBAAkB,CAAA;IAChC,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,KAAK,EAAE,eAAe,CAAA;IACtB,IAAI,EAAE,qBAAqB,CAAA;IAC3B,eAAe,CAAC,EAAE,iBAAiB,CAAA;IACnC,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AA0FhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,kBAAkB,EAChC,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,eAAe,EACtB,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,eAAe,CAAC,EAAE,mBAAmB,EAErC,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,KACd,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AAqB7B,eAAO,MAAM,cAAc,EAAE,aAw0B5B,CAAA;AA0FD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,sBACK,OAAO,wBACL,OAAO,KAC5B,cAkCF,CAAA;AAOD,eAAO,MAAM,cAAc,EAAE,aAU5B,CAAA;AA2BD,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DebugProp, ThemeName } from '../types.js';
|
|
1
|
+
import { DebugProp, StaticConfig, ThemeName } from '../types.js';
|
|
2
2
|
export interface ThemeableProps {
|
|
3
3
|
theme?: ThemeName | null;
|
|
4
4
|
themeInverse?: boolean;
|
|
@@ -6,7 +6,5 @@ export interface ThemeableProps {
|
|
|
6
6
|
componentName?: string;
|
|
7
7
|
debug?: DebugProp;
|
|
8
8
|
}
|
|
9
|
-
export declare function themeable<Component extends (props: any) => any>(component: Component,
|
|
10
|
-
componentName?: string;
|
|
11
|
-
}): Component extends (props: infer P) => infer R ? (props: Omit<P, "theme" | "themeInverse"> & ThemeableProps) => R : unknown;
|
|
9
|
+
export declare function themeable<Component extends (props: any) => any>(component: Component, staticConfig?: Partial<StaticConfig>): Component extends (props: infer P) => infer R ? (props: Omit<P, "theme" | "themeInverse"> & ThemeableProps) => R : unknown;
|
|
12
10
|
//# sourceMappingURL=themeable.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"themeable.d.ts","sourceRoot":"","sources":["../../src/helpers/themeable.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"themeable.d.ts","sourceRoot":"","sources":["../../src/helpers/themeable.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAGhE,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,SAAS,GAAG,IAAI,CAAA;IACxB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB;AAED,wBAAgB,SAAS,CAAC,SAAS,SAAS,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,EAC7D,SAAS,EAAE,SAAS,EACpB,YAAY,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,8HA4BrC"}
|
package/types/styled.d.ts
CHANGED
|
@@ -9,6 +9,6 @@ export declare function styled<ParentComponent extends StylableComponent, Varian
|
|
|
9
9
|
variants?: Variants | undefined;
|
|
10
10
|
defaultVariants?: GetVariantAcceptedValues<Variants>;
|
|
11
11
|
acceptsClassName?: boolean;
|
|
12
|
-
}, 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>) & 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>)>>, TamaguiElement, GetBaseProps<ParentComponent>, GetVariantProps<ParentComponent> & (Variants extends void ? {} : GetVariantAcceptedValues<Variants>), { [Key in Exclude<keyof ParentComponent, "defaultProps" | "
|
|
12
|
+
}, 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>) & 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>)>>, TamaguiElement, GetBaseProps<ParentComponent>, GetVariantProps<ParentComponent> & (Variants extends void ? {} : GetVariantAcceptedValues<Variants>), { [Key in Exclude<keyof ParentComponent, "defaultProps" | "staticConfig" | "propTypes" | "extractable" | "styleable" | "$$typeof">]: ParentComponent[Key]; }>;
|
|
13
13
|
export {};
|
|
14
14
|
//# sourceMappingURL=styled.d.ts.map
|
package/types/styled.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../src/styled.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,QAAQ,EACR,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,YAAY,CAAA;AAEnB,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,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,EACD,uBAAuB,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../src/styled.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,QAAQ,EACR,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,YAAY,CAAA;AAEnB,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,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,EACD,uBAAuB,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,uiCAuIhD"}
|
package/types/types.d.ts
CHANGED
|
@@ -468,10 +468,12 @@ export type TextNonStyleProps = Omit<ReactTextProps, 'children' | OmitRemovedNon
|
|
|
468
468
|
export type TextPropsBase = TextNonStyleProps & WithThemeAndShorthands<TextStylePropsBase>;
|
|
469
469
|
export type TextStyleProps = WithThemeShorthandsPseudosMediaAnimation<TextStylePropsBase>;
|
|
470
470
|
export type TextProps = TextNonStyleProps & TextStyleProps;
|
|
471
|
-
export type TamaguiComponent<Props = any, Ref = any, BaseProps = {}, VariantProps = {}, ParentStaticProperties = {}> = ReactComponentWithRef<Props, Ref> & StaticComponentObject & ParentStaticProperties;
|
|
472
|
-
type StaticComponentObject = {
|
|
471
|
+
export type TamaguiComponent<Props = any, Ref = any, BaseProps = {}, VariantProps = {}, ParentStaticProperties = {}> = ReactComponentWithRef<Props, Ref> & StaticComponentObject<Props, Ref> & ParentStaticProperties;
|
|
472
|
+
type StaticComponentObject<Props, Ref> = {
|
|
473
473
|
staticConfig: StaticConfigParsed;
|
|
474
|
+
/** @deprecated use `styleable` instead (same functionality, better name) */
|
|
474
475
|
extractable: <X>(a: X, opts?: Partial<StaticConfig>) => X;
|
|
476
|
+
styleable: <CustomProps extends Object, X extends FunctionComponent<Props & CustomProps> = FunctionComponent<Props & CustomProps>>(a: X) => ReactComponentWithRef<CustomProps & Omit<Props, keyof CustomProps>, Ref>;
|
|
475
477
|
};
|
|
476
478
|
export type TamaguiProviderProps = Partial<Omit<ThemeProviderProps, 'children'>> & {
|
|
477
479
|
config: TamaguiInternalConfig;
|
|
@@ -550,7 +552,7 @@ export type StaticConfigPublic = {
|
|
|
550
552
|
acceptsClassName?: boolean;
|
|
551
553
|
};
|
|
552
554
|
type StaticConfigBase = StaticConfigPublic & {
|
|
553
|
-
Component?: FunctionComponent<any> & StaticComponentObject
|
|
555
|
+
Component?: FunctionComponent<any> & StaticComponentObject<any, any>;
|
|
554
556
|
variants?: GenericVariantDefinitions;
|
|
555
557
|
/**
|
|
556
558
|
* Used for applying sub theme style
|