@tamagui/helpers-icon 1.68.6 → 1.69.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.
@@ -24,10 +24,19 @@ function themed(Component, opts = {
24
24
  fallbackColor: "#000"
25
25
  }) {
26
26
  return (propsIn) => {
27
- const props = (0, import_core.useProps)(propsIn), theme = (0, import_core.useTheme)(), defaultColor = props.color ?? opts.defaultThemeColor, color = (0, import_core.getVariable)(
28
- (defaultColor ? theme[defaultColor] : void 0) || props.color || (props.disableTheme ? null : theme.color) || opts.fallbackColor
27
+ const [props, style] = (0, import_core.usePropsAndStyle)(propsIn), theme = (0, import_core.useTheme)(), defaultColor = style.color ?? opts.defaultThemeColor, color = (0, import_core.getVariable)(
28
+ (defaultColor ? theme[defaultColor] : void 0) || style.color || (props.disableTheme ? null : theme.color) || opts.fallbackColor
29
29
  ), size = typeof props.size == "string" ? (0, import_core.getTokenValue)(props.size, "size") : props.size, strokeWidth = typeof props.strokeWidth == "string" ? (0, import_core.getTokenValue)(props.strokeWidth, "size") : props.strokeWidth ?? `${opts.defaultStrokeWidth}`;
30
- return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...props, color, size, strokeWidth });
30
+ return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
31
+ Component,
32
+ {
33
+ ...props,
34
+ color,
35
+ size,
36
+ strokeWidth,
37
+ style
38
+ }
39
+ );
31
40
  };
32
41
  }
33
42
  // Annotate the CommonJS export names for ESM import in node:
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/themed.tsx"],
4
- "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA+D,0BAyCpD;AA9BJ,SAAS,OACd,WACA,OAAsB;AAAA,EACpB,mBAAmB,QAAQ,IAAI,4BAA4B;AAAA,EAC3D,oBAAoB;AAAA,EACpB,eAAe;AACjB,GACA;AA0BA,SAzBgB,CAAC,YAAuB;AACtC,UAAM,YAAQ,sBAAS,OAAO,GACxB,YAAQ,sBAAS,GAEjB,eAAe,MAAM,SAAS,KAAK,mBACnC,YAAQ;AAAA,OACX,eAAe,MAAM,YAAY,IAAI,WACpC,MAAM,UACJ,MAAM,eAA6B,OAAd,MAAM,UAC7B,KAAK;AAAA,IACT,GAEM,OACJ,OAAO,MAAM,QAAS,eAClB,2BAAc,MAAM,MAAa,MAAM,IACvC,MAAM,MAEN,cACJ,OAAO,MAAM,eAAgB,eACzB,2BAAc,MAAM,aAAoB,MAAM,IAC9C,MAAM,eAAe,GAAG,KAAK,kBAAkB;AAErD,WAAO,4CAAC,aAAW,GAAG,OAAO,OAAc,MAAY,aAA0B;AAAA,EACnF;AAGF;",
4
+ "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAuE,0BA0CjE;AA/BC,SAAS,OACd,WACA,OAAsB;AAAA,EACpB,mBAAmB,QAAQ,IAAI,4BAA4B;AAAA,EAC3D,oBAAoB;AAAA,EACpB,eAAe;AACjB,GACA;AAkCA,SAjCgB,CAAC,YAAuB;AACtC,UAAM,CAAC,OAAO,KAAK,QAAI,8BAAiB,OAAO,GACzC,YAAQ,sBAAS,GAEjB,eAAe,MAAM,SAAS,KAAK,mBACnC,YAAQ;AAAA,OACX,eAAe,MAAM,YAAY,IAAI,WACpC,MAAM,UACJ,MAAM,eAA6B,OAAd,MAAM,UAC7B,KAAK;AAAA,IACT,GAEM,OACJ,OAAO,MAAM,QAAS,eAClB,2BAAc,MAAM,MAAa,MAAM,IACvC,MAAM,MAEN,cACJ,OAAO,MAAM,eAAgB,eACzB,2BAAc,MAAM,aAAoB,MAAM,IAC9C,MAAM,eAAe,GAAG,KAAK,kBAAkB;AAErD,WACE;AAAA,MAAC;AAAA;AAAA,QACE,GAAG;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA;AAAA,IACF;AAAA,EAEJ;AAGF;",
5
5
  "names": []
6
6
  }
@@ -25,10 +25,19 @@ function themed(Component, opts = {
25
25
  fallbackColor: "#000"
26
26
  }) {
27
27
  return (propsIn) => {
28
- const props = (0, import_core.useProps)(propsIn), theme = (0, import_core.useTheme)(), defaultColor = props.color ?? opts.defaultThemeColor, color = (0, import_core.getVariable)(
29
- (defaultColor ? theme[defaultColor] : void 0) || props.color || (props.disableTheme ? null : theme.color) || opts.fallbackColor
28
+ const [props, style] = (0, import_core.usePropsAndStyle)(propsIn), theme = (0, import_core.useTheme)(), defaultColor = style.color ?? opts.defaultThemeColor, color = (0, import_core.getVariable)(
29
+ (defaultColor ? theme[defaultColor] : void 0) || style.color || (props.disableTheme ? null : theme.color) || opts.fallbackColor
30
30
  ), size = typeof props.size == "string" ? (0, import_core.getTokenValue)(props.size, "size") : props.size, strokeWidth = typeof props.strokeWidth == "string" ? (0, import_core.getTokenValue)(props.strokeWidth, "size") : props.strokeWidth ?? `${opts.defaultStrokeWidth}`;
31
- return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...props, color, size, strokeWidth });
31
+ return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
32
+ Component,
33
+ {
34
+ ...props,
35
+ color,
36
+ size,
37
+ strokeWidth,
38
+ style
39
+ }
40
+ );
32
41
  };
33
42
  }
34
43
  // Annotate the CommonJS export names for ESM import in node:
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/themed.tsx"],
4
- "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA+D,0BAyCpD;AA9BJ,SAAS,OACd,WACA,OAAsB;AAAA,EACpB,mBAAmB,QAAQ,IAAI,4BAA4B;AAAA,EAC3D,oBAAoB;AAAA,EACpB,eAAe;AACjB,GACA;AA0BA,SAzBgB,CAAC,YAAuB;AACtC,UAAM,YAAQ,sBAAS,OAAO,GACxB,YAAQ,sBAAS,GAEjB,eAAe,MAAM,SAAS,KAAK,mBACnC,YAAQ;AAAA,OACX,eAAe,MAAM,YAAY,IAAI,WACpC,MAAM,UACJ,MAAM,eAA6B,OAAd,MAAM,UAC7B,KAAK;AAAA,IACT,GAEM,OACJ,OAAO,MAAM,QAAS,eAClB,2BAAc,MAAM,MAAa,MAAM,IACvC,MAAM,MAEN,cACJ,OAAO,MAAM,eAAgB,eACzB,2BAAc,MAAM,aAAoB,MAAM,IAC9C,MAAM,eAAe,GAAG,KAAK,kBAAkB;AAErD,WAAO,4CAAC,aAAW,GAAG,OAAO,OAAc,MAAY,aAA0B;AAAA,EACnF;AAGF;",
4
+ "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAuE,0BA0CjE;AA/BC,SAAS,OACd,WACA,OAAsB;AAAA,EACpB,mBAAmB,QAAQ,IAAI,4BAA4B;AAAA,EAC3D,oBAAoB;AAAA,EACpB,eAAe;AACjB,GACA;AAkCA,SAjCgB,CAAC,YAAuB;AACtC,UAAM,CAAC,OAAO,KAAK,QAAI,8BAAiB,OAAO,GACzC,YAAQ,sBAAS,GAEjB,eAAe,MAAM,SAAS,KAAK,mBACnC,YAAQ;AAAA,OACX,eAAe,MAAM,YAAY,IAAI,WACpC,MAAM,UACJ,MAAM,eAA6B,OAAd,MAAM,UAC7B,KAAK;AAAA,IACT,GAEM,OACJ,OAAO,MAAM,QAAS,eAClB,2BAAc,MAAM,MAAa,MAAM,IACvC,MAAM,MAEN,cACJ,OAAO,MAAM,eAAgB,eACzB,2BAAc,MAAM,aAAoB,MAAM,IAC9C,MAAM,eAAe,GAAG,KAAK,kBAAkB;AAErD,WACE;AAAA,MAAC;AAAA;AAAA,QACE,GAAG;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA;AAAA,IACF;AAAA,EAEJ;AAGF;",
5
5
  "names": []
6
6
  }
@@ -1,4 +1,4 @@
1
- import { getTokenValue, getVariable, useProps, useTheme } from "@tamagui/core";
1
+ import { getTokenValue, getVariable, usePropsAndStyle, useTheme } from "@tamagui/core";
2
2
  import { jsx } from "react/jsx-runtime";
3
3
  function themed(Component, opts = {
4
4
  defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || "$color",
@@ -6,10 +6,19 @@ function themed(Component, opts = {
6
6
  fallbackColor: "#000"
7
7
  }) {
8
8
  return (propsIn) => {
9
- const props = useProps(propsIn), theme = useTheme(), defaultColor = props.color ?? opts.defaultThemeColor, color = getVariable(
10
- (defaultColor ? theme[defaultColor] : void 0) || props.color || (props.disableTheme ? null : theme.color) || opts.fallbackColor
9
+ const [props, style] = usePropsAndStyle(propsIn), theme = useTheme(), defaultColor = style.color ?? opts.defaultThemeColor, color = getVariable(
10
+ (defaultColor ? theme[defaultColor] : void 0) || style.color || (props.disableTheme ? null : theme.color) || opts.fallbackColor
11
11
  ), size = typeof props.size == "string" ? getTokenValue(props.size, "size") : props.size, strokeWidth = typeof props.strokeWidth == "string" ? getTokenValue(props.strokeWidth, "size") : props.strokeWidth ?? `${opts.defaultStrokeWidth}`;
12
- return /* @__PURE__ */ jsx(Component, { ...props, color, size, strokeWidth });
12
+ return /* @__PURE__ */ jsx(
13
+ Component,
14
+ {
15
+ ...props,
16
+ color,
17
+ size,
18
+ strokeWidth,
19
+ style
20
+ }
21
+ );
13
22
  };
14
23
  }
15
24
  export {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/themed.tsx"],
4
- "mappings": "AAAA,SAAS,eAAe,aAAa,UAAU,gBAAgB;AAyCpD;AA9BJ,SAAS,OACd,WACA,OAAsB;AAAA,EACpB,mBAAmB,QAAQ,IAAI,4BAA4B;AAAA,EAC3D,oBAAoB;AAAA,EACpB,eAAe;AACjB,GACA;AA0BA,SAzBgB,CAAC,YAAuB;AACtC,UAAM,QAAQ,SAAS,OAAO,GACxB,QAAQ,SAAS,GAEjB,eAAe,MAAM,SAAS,KAAK,mBACnC,QAAQ;AAAA,OACX,eAAe,MAAM,YAAY,IAAI,WACpC,MAAM,UACJ,MAAM,eAA6B,OAAd,MAAM,UAC7B,KAAK;AAAA,IACT,GAEM,OACJ,OAAO,MAAM,QAAS,WAClB,cAAc,MAAM,MAAa,MAAM,IACvC,MAAM,MAEN,cACJ,OAAO,MAAM,eAAgB,WACzB,cAAc,MAAM,aAAoB,MAAM,IAC9C,MAAM,eAAe,GAAG,KAAK,kBAAkB;AAErD,WAAO,oBAAC,aAAW,GAAG,OAAO,OAAc,MAAY,aAA0B;AAAA,EACnF;AAGF;",
4
+ "mappings": "AAAA,SAAS,eAAe,aAAa,kBAAkB,gBAAgB;AA0CjE;AA/BC,SAAS,OACd,WACA,OAAsB;AAAA,EACpB,mBAAmB,QAAQ,IAAI,4BAA4B;AAAA,EAC3D,oBAAoB;AAAA,EACpB,eAAe;AACjB,GACA;AAkCA,SAjCgB,CAAC,YAAuB;AACtC,UAAM,CAAC,OAAO,KAAK,IAAI,iBAAiB,OAAO,GACzC,QAAQ,SAAS,GAEjB,eAAe,MAAM,SAAS,KAAK,mBACnC,QAAQ;AAAA,OACX,eAAe,MAAM,YAAY,IAAI,WACpC,MAAM,UACJ,MAAM,eAA6B,OAAd,MAAM,UAC7B,KAAK;AAAA,IACT,GAEM,OACJ,OAAO,MAAM,QAAS,WAClB,cAAc,MAAM,MAAa,MAAM,IACvC,MAAM,MAEN,cACJ,OAAO,MAAM,eAAgB,WACzB,cAAc,MAAM,aAAoB,MAAM,IAC9C,MAAM,eAAe,GAAG,KAAK,kBAAkB;AAErD,WACE;AAAA,MAAC;AAAA;AAAA,QACE,GAAG;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA;AAAA,IACF;AAAA,EAEJ;AAGF;",
5
5
  "names": []
6
6
  }
@@ -1,14 +1,20 @@
1
- import { getTokenValue, getVariable, useProps, useTheme } from "@tamagui/core";
1
+ import { getTokenValue, getVariable, usePropsAndStyle, useTheme } from "@tamagui/core";
2
2
  function themed(Component, opts = {
3
3
  defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || "$color",
4
4
  defaultStrokeWidth: 2,
5
5
  fallbackColor: "#000"
6
6
  }) {
7
7
  return (propsIn) => {
8
- const props = useProps(propsIn), theme = useTheme(), defaultColor = props.color ?? opts.defaultThemeColor, color = getVariable(
9
- (defaultColor ? theme[defaultColor] : void 0) || props.color || (props.disableTheme ? null : theme.color) || opts.fallbackColor
8
+ const [props, style] = usePropsAndStyle(propsIn), theme = useTheme(), defaultColor = style.color ?? opts.defaultThemeColor, color = getVariable(
9
+ (defaultColor ? theme[defaultColor] : void 0) || style.color || (props.disableTheme ? null : theme.color) || opts.fallbackColor
10
10
  ), size = typeof props.size == "string" ? getTokenValue(props.size, "size") : props.size, strokeWidth = typeof props.strokeWidth == "string" ? getTokenValue(props.strokeWidth, "size") : props.strokeWidth ?? `${opts.defaultStrokeWidth}`;
11
- return <Component {...props} color={color} size={size} strokeWidth={strokeWidth} />;
11
+ return <Component
12
+ {...props}
13
+ color={color}
14
+ size={size}
15
+ strokeWidth={strokeWidth}
16
+ style={style}
17
+ />;
12
18
  };
13
19
  }
14
20
  export {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/themed.tsx"],
4
- "mappings": "AAAA,SAAS,eAAe,aAAa,UAAU,gBAAgB;AAWxD,SAAS,OACd,WACA,OAAsB;AAAA,EACpB,mBAAmB,QAAQ,IAAI,4BAA4B;AAAA,EAC3D,oBAAoB;AAAA,EACpB,eAAe;AACjB,GACA;AA0BA,SAzBgB,CAAC,YAAuB;AACtC,UAAM,QAAQ,SAAS,OAAO,GACxB,QAAQ,SAAS,GAEjB,eAAe,MAAM,SAAS,KAAK,mBACnC,QAAQ;AAAA,OACX,eAAe,MAAM,YAAY,IAAI,WACpC,MAAM,UACJ,MAAM,eAA6B,OAAd,MAAM,UAC7B,KAAK;AAAA,IACT,GAEM,OACJ,OAAO,MAAM,QAAS,WAClB,cAAc,MAAM,MAAa,MAAM,IACvC,MAAM,MAEN,cACJ,OAAO,MAAM,eAAgB,WACzB,cAAc,MAAM,aAAoB,MAAM,IAC9C,MAAM,eAAe,GAAG,KAAK,kBAAkB;AAErD,WAAO,CAAC,cAAc,OAAO,OAAO,OAAO,MAAM,MAAM,aAAa,aAAa;AAAA,EACnF;AAGF;",
4
+ "mappings": "AAAA,SAAS,eAAe,aAAa,kBAAkB,gBAAgB;AAWhE,SAAS,OACd,WACA,OAAsB;AAAA,EACpB,mBAAmB,QAAQ,IAAI,4BAA4B;AAAA,EAC3D,oBAAoB;AAAA,EACpB,eAAe;AACjB,GACA;AAkCA,SAjCgB,CAAC,YAAuB;AACtC,UAAM,CAAC,OAAO,KAAK,IAAI,iBAAiB,OAAO,GACzC,QAAQ,SAAS,GAEjB,eAAe,MAAM,SAAS,KAAK,mBACnC,QAAQ;AAAA,OACX,eAAe,MAAM,YAAY,IAAI,WACpC,MAAM,UACJ,MAAM,eAA6B,OAAd,MAAM,UAC7B,KAAK;AAAA,IACT,GAEM,OACJ,OAAO,MAAM,QAAS,WAClB,cAAc,MAAM,MAAa,MAAM,IACvC,MAAM,MAEN,cACJ,OAAO,MAAM,eAAgB,WACzB,cAAc,MAAM,aAAoB,MAAM,IAC9C,MAAM,eAAe,GAAG,KAAK,kBAAkB;AAErD,WACE,CAAC;AAAA,UACK;AAAA,MACJ,OAAO;AAAA,MACP,MAAM;AAAA,MACN,aAAa;AAAA,MACb,OAAO;AAAA,IACT;AAAA,EAEJ;AAGF;",
5
5
  "names": []
6
6
  }
@@ -1,14 +1,20 @@
1
- import { getTokenValue, getVariable, useProps, useTheme } from "@tamagui/core";
1
+ import { getTokenValue, getVariable, usePropsAndStyle, useTheme } from "@tamagui/core";
2
2
  function themed(Component, opts = {
3
3
  defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || "$color",
4
4
  defaultStrokeWidth: 2,
5
5
  fallbackColor: "#000"
6
6
  }) {
7
7
  return (propsIn) => {
8
- const props = useProps(propsIn), theme = useTheme(), defaultColor = props.color ?? opts.defaultThemeColor, color = getVariable(
9
- (defaultColor ? theme[defaultColor] : void 0) || props.color || (props.disableTheme ? null : theme.color) || opts.fallbackColor
8
+ const [props, style] = usePropsAndStyle(propsIn), theme = useTheme(), defaultColor = style.color ?? opts.defaultThemeColor, color = getVariable(
9
+ (defaultColor ? theme[defaultColor] : void 0) || style.color || (props.disableTheme ? null : theme.color) || opts.fallbackColor
10
10
  ), size = typeof props.size == "string" ? getTokenValue(props.size, "size") : props.size, strokeWidth = typeof props.strokeWidth == "string" ? getTokenValue(props.strokeWidth, "size") : props.strokeWidth ?? `${opts.defaultStrokeWidth}`;
11
- return <Component {...props} color={color} size={size} strokeWidth={strokeWidth} />;
11
+ return <Component
12
+ {...props}
13
+ color={color}
14
+ size={size}
15
+ strokeWidth={strokeWidth}
16
+ style={style}
17
+ />;
12
18
  };
13
19
  }
14
20
  export {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/themed.tsx"],
4
- "mappings": "AAAA,SAAS,eAAe,aAAa,UAAU,gBAAgB;AAWxD,SAAS,OACd,WACA,OAAsB;AAAA,EACpB,mBAAmB,QAAQ,IAAI,4BAA4B;AAAA,EAC3D,oBAAoB;AAAA,EACpB,eAAe;AACjB,GACA;AA0BA,SAzBgB,CAAC,YAAuB;AACtC,UAAM,QAAQ,SAAS,OAAO,GACxB,QAAQ,SAAS,GAEjB,eAAe,MAAM,SAAS,KAAK,mBACnC,QAAQ;AAAA,OACX,eAAe,MAAM,YAAY,IAAI,WACpC,MAAM,UACJ,MAAM,eAA6B,OAAd,MAAM,UAC7B,KAAK;AAAA,IACT,GAEM,OACJ,OAAO,MAAM,QAAS,WAClB,cAAc,MAAM,MAAa,MAAM,IACvC,MAAM,MAEN,cACJ,OAAO,MAAM,eAAgB,WACzB,cAAc,MAAM,aAAoB,MAAM,IAC9C,MAAM,eAAe,GAAG,KAAK,kBAAkB;AAErD,WAAO,CAAC,cAAc,OAAO,OAAO,OAAO,MAAM,MAAM,aAAa,aAAa;AAAA,EACnF;AAGF;",
4
+ "mappings": "AAAA,SAAS,eAAe,aAAa,kBAAkB,gBAAgB;AAWhE,SAAS,OACd,WACA,OAAsB;AAAA,EACpB,mBAAmB,QAAQ,IAAI,4BAA4B;AAAA,EAC3D,oBAAoB;AAAA,EACpB,eAAe;AACjB,GACA;AAkCA,SAjCgB,CAAC,YAAuB;AACtC,UAAM,CAAC,OAAO,KAAK,IAAI,iBAAiB,OAAO,GACzC,QAAQ,SAAS,GAEjB,eAAe,MAAM,SAAS,KAAK,mBACnC,QAAQ;AAAA,OACX,eAAe,MAAM,YAAY,IAAI,WACpC,MAAM,UACJ,MAAM,eAA6B,OAAd,MAAM,UAC7B,KAAK;AAAA,IACT,GAEM,OACJ,OAAO,MAAM,QAAS,WAClB,cAAc,MAAM,MAAa,MAAM,IACvC,MAAM,MAEN,cACJ,OAAO,MAAM,eAAgB,WACzB,cAAc,MAAM,aAAoB,MAAM,IAC9C,MAAM,eAAe,GAAG,KAAK,kBAAkB;AAErD,WACE,CAAC;AAAA,UACK;AAAA,MACJ,OAAO;AAAA,MACP,MAAM;AAAA,MACN,aAAa;AAAA,MACb,OAAO;AAAA,IACT;AAAA,EAEJ;AAGF;",
5
5
  "names": []
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/helpers-icon",
3
- "version": "1.68.6",
3
+ "version": "1.69.1",
4
4
  "sideEffects": false,
5
5
  "description": "Utilities for icon packages",
6
6
  "source": "src/index.ts",
@@ -21,14 +21,14 @@
21
21
  },
22
22
  "license": "MIT",
23
23
  "dependencies": {
24
- "@tamagui/core": "1.68.6"
24
+ "@tamagui/core": "1.69.1"
25
25
  },
26
26
  "peerDependencies": {
27
27
  "react": "*",
28
28
  "react-native-svg": ">=12"
29
29
  },
30
30
  "devDependencies": {
31
- "@tamagui/build": "1.68.6",
31
+ "@tamagui/build": "1.69.1",
32
32
  "react": "^18.2.0",
33
33
  "react-native-svg": "^13.9.0"
34
34
  }
package/src/IconProps.ts CHANGED
@@ -6,7 +6,7 @@ export type BaseIconProps = {
6
6
  strokeWidth?: number | SizeTokens
7
7
  color?: (ColorTokens | ThemeTokens | (string & {})) | null
8
8
  disableTheme?: boolean
9
- style?: any
9
+ style?: SvgProps['style']
10
10
  }
11
11
 
12
- export type IconProps = SvgProps & Omit<SvgProps, keyof BaseIconProps> & BaseIconProps
12
+ export type IconProps = Omit<SvgProps, keyof BaseIconProps> & BaseIconProps
package/src/themed.tsx CHANGED
@@ -1,4 +1,4 @@
1
- import { getTokenValue, getVariable, useProps, useTheme } from '@tamagui/core'
1
+ import { getTokenValue, getVariable, usePropsAndStyle, useTheme } from '@tamagui/core'
2
2
  import React from 'react'
3
3
 
4
4
  import { IconProps } from './IconProps'
@@ -18,13 +18,13 @@ export function themed(
18
18
  }
19
19
  ) {
20
20
  const wrapped = (propsIn: IconProps) => {
21
- const props = useProps(propsIn)
21
+ const [props, style] = usePropsAndStyle(propsIn)
22
22
  const theme = useTheme()
23
23
 
24
- const defaultColor = props.color ?? opts.defaultThemeColor
24
+ const defaultColor = style.color ?? opts.defaultThemeColor
25
25
  const color = getVariable(
26
26
  (defaultColor ? theme[defaultColor] : undefined) ||
27
- props.color ||
27
+ style.color ||
28
28
  (!props.disableTheme ? theme.color : null) ||
29
29
  opts.fallbackColor
30
30
  )
@@ -39,7 +39,15 @@ export function themed(
39
39
  ? getTokenValue(props.strokeWidth as any, 'size')
40
40
  : props.strokeWidth ?? `${opts.defaultStrokeWidth}`
41
41
 
42
- return <Component {...props} color={color} size={size} strokeWidth={strokeWidth} />
42
+ return (
43
+ <Component
44
+ {...props}
45
+ color={color}
46
+ size={size}
47
+ strokeWidth={strokeWidth}
48
+ style={style as any}
49
+ />
50
+ )
43
51
  }
44
52
 
45
53
  return wrapped
@@ -5,7 +5,7 @@ export type BaseIconProps = {
5
5
  strokeWidth?: number | SizeTokens;
6
6
  color?: (ColorTokens | ThemeTokens | (string & {})) | null;
7
7
  disableTheme?: boolean;
8
- style?: any;
8
+ style?: SvgProps['style'];
9
9
  };
10
- export type IconProps = SvgProps & Omit<SvgProps, keyof BaseIconProps> & BaseIconProps;
10
+ export type IconProps = Omit<SvgProps, keyof BaseIconProps> & BaseIconProps;
11
11
  //# sourceMappingURL=IconProps.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"IconProps.d.ts","sourceRoot":"","sources":["../src/IconProps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAE3C,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAAA;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,UAAU,CAAA;IACjC,KAAK,CAAC,EAAE,CAAC,WAAW,GAAG,WAAW,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,CAAA;IAC1D,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,KAAK,CAAC,EAAE,GAAG,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,aAAa,CAAC,GAAG,aAAa,CAAA"}
1
+ {"version":3,"file":"IconProps.d.ts","sourceRoot":"","sources":["../src/IconProps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAE3C,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAAA;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,UAAU,CAAA;IACjC,KAAK,CAAC,EAAE,CAAC,WAAW,GAAG,WAAW,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,CAAA;IAC1D,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,KAAK,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,aAAa,CAAC,GAAG,aAAa,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"themed.d.ts","sourceRoot":"","sources":["../src/themed.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,KAAK,aAAa,GAAG;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAED,wBAAgB,MAAM,CACpB,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,EAC9B,IAAI,GAAE,aAIL,aAEyB,SAAS,iBA0BpC"}
1
+ {"version":3,"file":"themed.d.ts","sourceRoot":"","sources":["../src/themed.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,KAAK,aAAa,GAAG;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAED,wBAAgB,MAAM,CACpB,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,EAC9B,IAAI,GAAE,aAIL,aAEyB,SAAS,iBAkCpC"}