@tamagui/toggle-group 2.4.6 → 2.5.1

package/dist/cjs/Toggle.cjs

@@ -134,12 +134,12 @@ const Toggle = React.forwardRef(function Toggle2(props, forwardedRef) {
     ...(active && !activeStyle && !unstyled && {
       defaultActiveStyle: true
     }),
+    ...buttonProps,
     ...(active && activeStyle && {
       ...activeStyle,
       hoverStyle: activeStyle,
       focusStyle: activeStyle
     }),
-    ...buttonProps,
     ref: forwardedRef,
     onPress: (0, import_helpers.composeEventHandlers)(props.onPress ?? void 0, () => {
       if (!props.disabled) {

package/dist/cjs/Toggle.native.js

@@ -140,12 +140,16 @@ var Toggle = /* @__PURE__ */React.forwardRef(function Toggle2(props, forwardedRe
     ...(active && !activeStyle && !unstyled && {
       defaultActiveStyle: true
     }),
+    ...buttonProps,
+    // spread activeStyle after buttonProps so it wins when active: a styled()
+    // variant (e.g. a resting `backgroundColor`) forwards that value as a plain
+    // prop into buttonProps, which would otherwise clobber the activeStyle merge
+    // on overlapping keys and leave the active item stuck at its resting style.
     ...(active && activeStyle && {
       ...activeStyle,
       hoverStyle: activeStyle,
       focusStyle: activeStyle
     }),
-    ...buttonProps,
     ref: forwardedRef,
     onPress: (0, import_helpers.composeEventHandlers)((_props_onPress = props.onPress) !== null && _props_onPress !== void 0 ? _props_onPress : void 0, function () {
       if (!props.disabled) {

package/dist/cjs/Toggle.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Toggle_exports","__export","Toggle","ToggleFrame","module","exports","import_jsx_runtime","require","import_helpers","import_use_controllable_state","import_web","React","__toESM","import_context","NAME","styled","View","name","render","context","variants","unstyled","false","size","alignItems","justifyContent","display","backgroundColor","borderColor","borderWidth","margin","hoverStyle","pressStyle","focusVisibleStyle","outlineColor","outlineWidth","outlineStyle","zIndex","...size","val","param","tokens","width","height",":number","defaultActiveStyle","true","focusStyle","defaultVariants","process","env","TAMAGUI_HEADLESS","accept","activeStyle","forwardRef","Toggle2","props","forwardedRef","active","activeProp","defaultActive","onActiveChange","activeTheme","buttonProps","setActive","useControllableState","prop","onChange","defaultProp","_props_onPress","jsx","theme","disabled","ref","onPress","composeEventHandlers","prev"],"sources":["../../src/Toggle.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Toggle_exports","__export","Toggle","ToggleFrame","module","exports","import_jsx_runtime","require","import_helpers","import_use_controllable_state","import_web","React","__toESM","import_context","NAME","styled","View","name","render","context","variants","unstyled","false","size","alignItems","justifyContent","display","backgroundColor","borderColor","borderWidth","margin","hoverStyle","pressStyle","focusVisibleStyle","outlineColor","outlineWidth","outlineStyle","zIndex","...size","val","param","tokens","width","height",":number","defaultActiveStyle","true","focusStyle","defaultVariants","process","env","TAMAGUI_HEADLESS","accept","activeStyle","forwardRef","Toggle2","props","forwardedRef","active","activeProp","defaultActive","onActiveChange","activeTheme","buttonProps","setActive","useControllableState","prop","onChange","defaultProp","_props_onPress","jsx","theme","disabled","ref","onPress","composeEventHandlers","prev"],"sources":["../../src/Toggle.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/Toggle.mjs

@@ -95,12 +95,12 @@ const Toggle = React.forwardRef(function Toggle2(props, forwardedRef) {
     ...(active && !activeStyle && !unstyled && {
       defaultActiveStyle: true
     }),
+    ...buttonProps,
     ...(active && activeStyle && {
       ...activeStyle,
       hoverStyle: activeStyle,
       focusStyle: activeStyle
     }),
-    ...buttonProps,
     ref: forwardedRef,
     onPress: composeEventHandlers(props.onPress ?? void 0, () => {
       if (!props.disabled) {

package/dist/esm/Toggle.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["composeEventHandlers","useControllableState","styled","View","React","context","jsx","NAME","ToggleFrame","name","render","variants","unstyled","false","size","alignItems","justifyContent","display","backgroundColor","borderColor","borderWidth","margin","hoverStyle","pressStyle","focusVisibleStyle","outlineColor","outlineWidth","outlineStyle","zIndex","...size","val","tokens","width","height","defaultActiveStyle","true","focusStyle","defaultVariants","process","env","TAMAGUI_HEADLESS","accept","activeStyle","Toggle","forwardRef","props","forwardedRef","active","activeProp","defaultActive","onActiveChange","activeTheme","buttonProps","setActive","prop","onChange","defaultProp","theme","disabled","ref","onPress","prev"],"sources":["../../src/Toggle.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["composeEventHandlers","useControllableState","styled","View","React","context","jsx","NAME","ToggleFrame","name","render","variants","unstyled","false","size","alignItems","justifyContent","display","backgroundColor","borderColor","borderWidth","margin","hoverStyle","pressStyle","focusVisibleStyle","outlineColor","outlineWidth","outlineStyle","zIndex","...size","val","tokens","width","height","defaultActiveStyle","true","focusStyle","defaultVariants","process","env","TAMAGUI_HEADLESS","accept","activeStyle","Toggle","forwardRef","props","forwardedRef","active","activeProp","defaultActive","onActiveChange","activeTheme","buttonProps","setActive","prop","onChange","defaultProp","theme","disabled","ref","onPress","prev"],"sources":["../../src/Toggle.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/Toggle.native.js

@@ -99,12 +99,16 @@ var Toggle = /* @__PURE__ */React.forwardRef(function Toggle2(props, forwardedRe
     ...(active && !activeStyle && !unstyled && {
       defaultActiveStyle: true
     }),
+    ...buttonProps,
+    // spread activeStyle after buttonProps so it wins when active: a styled()
+    // variant (e.g. a resting `backgroundColor`) forwards that value as a plain
+    // prop into buttonProps, which would otherwise clobber the activeStyle merge
+    // on overlapping keys and leave the active item stuck at its resting style.
     ...(active && activeStyle && {
       ...activeStyle,
       hoverStyle: activeStyle,
       focusStyle: activeStyle
     }),
-    ...buttonProps,
     ref: forwardedRef,
     onPress: composeEventHandlers((_props_onPress = props.onPress) !== null && _props_onPress !== void 0 ? _props_onPress : void 0, function () {
       if (!props.disabled) {

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

@@ -1 +1 @@
-{"version":3,"names":["jsx","_jsx","composeEventHandlers","useControllableState","styled","View","React","context","NAME","ToggleFrame","name","render","variants","unstyled","false","size","alignItems","justifyContent","display","backgroundColor","borderColor","borderWidth","margin","hoverStyle","pressStyle","focusVisibleStyle","outlineColor","outlineWidth","outlineStyle","zIndex","...size","val","param","tokens","width","height",":number","defaultActiveStyle","true","focusStyle","defaultVariants","process","env","TAMAGUI_HEADLESS","accept","activeStyle","Toggle","forwardRef","Toggle2","props","forwardedRef","active","activeProp","defaultActive","onActiveChange","activeTheme","buttonProps","setActive","prop","onChange","defaultProp","_props_onPress","theme","disabled","ref","onPress","prev"],"sources":["../../src/Toggle.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,GAAA,IAAAC,IAAA,2BAA4B;AACrC,SAASC,oBAAA,QAA4B;AAErC,SAASC,oBAAoB;AAC7B,SAAAC,MAAY,EAAAC,IAAA,QAAW;AACvB,YAASC,KAAA,aAAe;AAmHlB,SAAAC,OAAA;AA7GN,IAAAC,IAAM,WAAO;AAEN,IAAAC,WAAM,GAAAL,MAAc,CAAAC,IAAA;EACzBK,IAAA,EAAAF,IAAA;EACAG,MAAA;EAAAJ,OACE;EAAMK,QACN,EAAQ;IACRC,QAAA;MAEAC,KAAA;QACEC,IAAA,SAAU;QACRC,UAAO;QAAAC,cACC;QAAAC,OACN,QAAY;QAAAC,eACZ,eAAgB;QAAAC,WACP;QAAAC,WACT;QAAiBC,MACjB;QAAaC,UACb;UACAJ,eAAQ;UACRC,WAAA,EAAY;QAAA;QACOI,UACjB;UACFL,eAAA;UACAC,WAAA,EAAY;QAAA;QACOK,iBACJ;UACfC,YAAA;UACAC,YAAA;UAAmBC,YACjB,SAAc;UAAAC,MACd;QAAc;MACA;IACN;IACVd,IACF;MACF,oBAAAe,CAAAC,GAAA,EAAAC,KAAA;QAEA,IAAM;UAAAC;QAAA,IAAAD,KAAA;QACJ,KAAAD,GAAA;QACE,OAAK;UACLG,KAAA,EAAOD,MAAA,CAAAlB,IAAA,CAAAgB,GAAA;UAAAI,MACL,EAAAF,MAAO,CAAAlB,IAAO,CAAAgB,GAAK;QAAG;MACC;MACzB,SACF,WAAAK,CAAAL,GAAA;QACA;UACEG,KAAA,EAAOH,GAAA;UACPI,MAAA,EAAQJ;QACV;MACF;IAAA;IAEoBM,kBACZ;MAAAC,IACJ;QAAiBnB,eACL;QAAAI,UACV;UACFJ,eAAA;QAAA;QACYoB,UACV;UACFpB,eAAA;QACF;MACF;IACF;EAAA;EAEiBqB,eACL;IACZ3B,QAAA,EAAA4B,OAAA,CAAAC,GAAA,CAAAC,gBAAA;EACF;AAAA,GACA;EAAAC,MACE;IAAQC,WACN;EAAa;AACf,EACF;AACF,IAAAC,MAAA,kBAAAxC,KAAA,CAAAyC,UAAA,UAAAC,QAAAC,KAAA,EAAAC,YAAA;EAiBO,IAAM;IAAAC,MAAA,EAASC,UAAM;IAAAP,WAAA;IAAAQ,aAAA;IAAAC,cAAA;IAAAC,WAAA;IAAA1C,QAAA;IAAA,GAAA2C;EAAA,IAAAP,KAAA;EAC1B,KAAAE,MAAS,QAAO,EAAAM,SAAO,IAAAtD,oBAAc;IACnCuD,IAAA,EAAMN,UAAA;IAAAO,QACJ,EAAQL,cAAA;IAAAM,WACR,EAAAP;EAAA;EACgB,IAChBQ,cAAA;EAAA,OACA,eAAA5D,IAAA,CAAAQ,WAAA;IAAAqD,KACA,EAAAP,WAAW,aAAAA,WAAA,cAAAA,WAAA;IAAA,cACR,EAAAJ,MAAA;IACL,YAAI,EAAAA,MAAA;IAEJ,eAAO,EAASF,KAAA,CAAOc,QAAA,GAAS,EAAI;IAAqBlD,QACjD;IAAA,IACNsC,MAAA,IAAU,CAAAN,WAAA,KAAAhC,QAAA;MACVwB,kBAAa;IACf,CAAC;IAED,IAAAc,MACE,IAAAN,WAAA;MAAC,GAAAA,WAAA;MAAAtB,UAAA,EAAAsB,WAAA;MAAAN,UACQ,EAAAM;IAAe;IACR,GAAAW,WACd;IAA4BQ,GAAA,EAC5Bd,YAAA;IAAqCe,OACrC,EAAA/D,oBAAA,EAAA2D,cAAA,GAAAZ,KAAA,CAAAgB,OAAA,cAAAJ,cAAA,cAAAA,cAAA;MAAA,IACC,CAAIZ,KAAA,CAAAc,QACF;QACYN,SACX,WAAAS,IAAoB;UACtB,QAAAA,IAAA;QACD;MACgB;IACT;EACQ;AACA;AACd,SACEpB,MACJ,EAAKrC,WACL","ignoreList":[]}
+{"version":3,"names":["jsx","_jsx","composeEventHandlers","useControllableState","styled","View","React","context","NAME","ToggleFrame","name","render","variants","unstyled","false","size","alignItems","justifyContent","display","backgroundColor","borderColor","borderWidth","margin","hoverStyle","pressStyle","focusVisibleStyle","outlineColor","outlineWidth","outlineStyle","zIndex","...size","val","param","tokens","width","height",":number","defaultActiveStyle","true","focusStyle","defaultVariants","process","env","TAMAGUI_HEADLESS","accept","activeStyle","Toggle","forwardRef","Toggle2","props","forwardedRef","active","activeProp","defaultActive","onActiveChange","activeTheme","buttonProps","setActive","prop","onChange","defaultProp","_props_onPress","theme","disabled","ref","onPress","prev"],"sources":["../../src/Toggle.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/jsx/Toggle.mjs

@@ -95,12 +95,12 @@ const Toggle = React.forwardRef(function Toggle2(props, forwardedRef) {
     ...(active && !activeStyle && !unstyled && {
       defaultActiveStyle: true
     }),
+    ...buttonProps,
     ...(active && activeStyle && {
       ...activeStyle,
       hoverStyle: activeStyle,
       focusStyle: activeStyle
     }),
-    ...buttonProps,
     ref: forwardedRef,
     onPress: composeEventHandlers(props.onPress ?? void 0, () => {
       if (!props.disabled) {

package/dist/jsx/Toggle.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["composeEventHandlers","useControllableState","styled","View","React","context","jsx","NAME","ToggleFrame","name","render","variants","unstyled","false","size","alignItems","justifyContent","display","backgroundColor","borderColor","borderWidth","margin","hoverStyle","pressStyle","focusVisibleStyle","outlineColor","outlineWidth","outlineStyle","zIndex","...size","val","tokens","width","height","defaultActiveStyle","true","focusStyle","defaultVariants","process","env","TAMAGUI_HEADLESS","accept","activeStyle","Toggle","forwardRef","props","forwardedRef","active","activeProp","defaultActive","onActiveChange","activeTheme","buttonProps","setActive","prop","onChange","defaultProp","theme","disabled","ref","onPress","prev"],"sources":["../../src/Toggle.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["composeEventHandlers","useControllableState","styled","View","React","context","jsx","NAME","ToggleFrame","name","render","variants","unstyled","false","size","alignItems","justifyContent","display","backgroundColor","borderColor","borderWidth","margin","hoverStyle","pressStyle","focusVisibleStyle","outlineColor","outlineWidth","outlineStyle","zIndex","...size","val","tokens","width","height","defaultActiveStyle","true","focusStyle","defaultVariants","process","env","TAMAGUI_HEADLESS","accept","activeStyle","Toggle","forwardRef","props","forwardedRef","active","activeProp","defaultActive","onActiveChange","activeTheme","buttonProps","setActive","prop","onChange","defaultProp","theme","disabled","ref","onPress","prev"],"sources":["../../src/Toggle.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/jsx/Toggle.native.js

@@ -140,12 +140,16 @@ var Toggle = /* @__PURE__ */React.forwardRef(function Toggle2(props, forwardedRe
     ...(active && !activeStyle && !unstyled && {
       defaultActiveStyle: true
     }),
+    ...buttonProps,
+    // spread activeStyle after buttonProps so it wins when active: a styled()
+    // variant (e.g. a resting `backgroundColor`) forwards that value as a plain
+    // prop into buttonProps, which would otherwise clobber the activeStyle merge
+    // on overlapping keys and leave the active item stuck at its resting style.
     ...(active && activeStyle && {
       ...activeStyle,
       hoverStyle: activeStyle,
       focusStyle: activeStyle
     }),
-    ...buttonProps,
     ref: forwardedRef,
     onPress: (0, import_helpers.composeEventHandlers)((_props_onPress = props.onPress) !== null && _props_onPress !== void 0 ? _props_onPress : void 0, function () {
       if (!props.disabled) {

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

@@ -1 +1 @@
-{"version":3,"names":["__create","Object","create","__defProp","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__getProtoOf","getPrototypeOf","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toESM","mod","isNodeMode","__esModule","value","__toCommonJS","Toggle_exports","Toggle","ToggleFrame","module","exports","import_jsx_runtime","require","import_helpers","import_use_controllable_state","import_web","React","import_context","NAME","styled","View","render","context","variants","unstyled","false","size","alignItems","justifyContent","display","backgroundColor","borderColor","borderWidth","margin","hoverStyle","pressStyle","focusVisibleStyle","outlineColor","outlineWidth","outlineStyle","zIndex","...size","val","param","tokens","width","height",":number","defaultActiveStyle","true","focusStyle","defaultVariants","process","env","TAMAGUI_HEADLESS","accept","activeStyle","forwardRef","Toggle2","props","forwardedRef","active","activeProp","defaultActive","onActiveChange","activeTheme","buttonProps","setActive","useControllableState","prop","onChange","defaultProp","_props_onPress","jsx","theme"],"sources":["../../src/Toggle.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__create","Object","create","__defProp","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__getProtoOf","getPrototypeOf","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toESM","mod","isNodeMode","__esModule","value","__toCommonJS","Toggle_exports","Toggle","ToggleFrame","module","exports","import_jsx_runtime","require","import_helpers","import_use_controllable_state","import_web","React","import_context","NAME","styled","View","render","context","variants","unstyled","false","size","alignItems","justifyContent","display","backgroundColor","borderColor","borderWidth","margin","hoverStyle","pressStyle","focusVisibleStyle","outlineColor","outlineWidth","outlineStyle","zIndex","...size","val","param","tokens","width","height",":number","defaultActiveStyle","true","focusStyle","defaultVariants","process","env","TAMAGUI_HEADLESS","accept","activeStyle","forwardRef","Toggle2","props","forwardedRef","active","activeProp","defaultActive","onActiveChange","activeTheme","buttonProps","setActive","useControllableState","prop","onChange","defaultProp","_props_onPress","jsx","theme"],"sources":["../../src/Toggle.tsx"],"sourcesContent":[null],"mappings":"AAAA,YAAS;;AACT,IAAAA,QAAS,GAAAC,MAAA,CAAAC,MAAA;AAET,IAAAC,SAAS,GAAAF,MAAQ,CAAAG,cAAY;AAC7B,IAAAC,gBAAY,GAAWJ,MAAA,CAAAK,wBAAA;AACvB,IAAAC,iBAAS,GAAeN,MAAA,CAAAO,mBAAA;AAmHlB,IAAAC,YAAA,GAAAR,MAAA,CAAAS,cAAA;AA7GN,IAAAC,YAAa,GAAAV,MAAA,CAAAW,SAAA,CAAAC,cAAA;AAEN,IAAAC,QAAM,GAAAA,CAAAC,MAAc,EAAAC,GAAA;EACzB,SAAAC,IAAA,IAAAD,GAAA,EACAb,SAAA,CAAAY,MAAA,EAAAE,IAAA;IAAAC,GAAA,EAAAF,GAAA,CAAAC,IAAA;IAAAE,UAAA;EAAA;AAAA;AACQ,IACNC,WAAQ,GAAAA,CAAAC,EAAA,EAAAC,IAAA,EAAAC,MAAA,EAAAC,IAAA;EAAA,IACRF,IAAA,WAAAA,IAAA,wBAAAA,IAAA;IAEA,SAAAG,GAAU,IAAAlB,iBAAA,CAAAe,IAAA,GACR,KAAAX,YAAU,CAAAe,IAAA,CAAAL,EAAA,EAAAI,GAAA,KAAAA,GAAA,KAAAF,MAAA,EACRpB,SAAO,CAAAkB,EAAA,EAAAI,GAAA;MAAAP,GAAA,EAAAA,CAAA,KAAAI,IAAA,CAAAG,GAAA;MAAAN,UAAA,IAAAK,IAAA,GAAAnB,gBAAA,CAAAiB,IAAA,EAAAG,GAAA,MAAAD,IAAA,CAAAL;IAAA;EAAA;EACC,OAAAE,EACN;AAAY;AACI,IAAAM,OAChB,GAAAA,CAAAC,GAAA,EAASC,UAAA,EAAAd,MAAA,MAAAA,MAAA,GAAAa,GAAA,WAAA5B,QAAA,CAAAS,YAAA,CAAAmB,GAAA,SAAAR,WAAA;AAAA;AACQ;AACJ;AACA;AACLS,UACR,KAAAD,GAAA,IAAY,CAAAA,GAAA,CAAAE,UAAA,GAAA3B,SAAA,CAAAY,MAAA;EAAAgB,KAAA,EAAAH,GAAA;EAAAT,UAAA;AAAA,KAAAJ,MAAA,EAAAa,GACO;AACJ,IAAAI,YACf,GAAAJ,GAAA,IAAAR,WAAA,CAAAjB,SAAA;EAAA4B,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAK,cACA,IAAY;AAAAnB,QAAA,CAAAmB,cACV;EAAiBC,MAAA,EAAAA,CAAA,KACjBA,MAAA;EAAaC,WACf,EAAAA,CAAA,KAAAA;AAAA;AACmBC,MAAA,CAAAC,OACjB,GAAAL,YAAc,CAAAC,cAAA;AAAA,IAAAK,kBACd,GAAAC,OAAc;AAAA,IAAAC,cACd,GAAAD,OAAc;AAAA,IAAAE,6BACN,GAAAF,OAAA;AAAA,IAAAG,UACV,GAAAH,OAAA;AAAA,IAAAI,KACF,GAAAhB,OAAA,CAAAY,OAAA;AAAA,IAAAK,cACF,GAAAL,OAAA;AAAA,IAAAM,IAEA,WAAM;AAAA,IAAAV,WACJ,IAAW,CAAC,EAAAO,UAAO,CAAAI,MAAO,EAAMJ,UAAA,CAAAK,IAAA;EAC9B9B,IAAA,EAAA4B,IAAA;EACAG,MAAA,UAAO;EAAAC,OAAA,EAAAL,cACE,CAAOK,OAAK;EAAGC,QAAA,EACtB;IAAuBC,QACzB;MAAAC,KACF;QACAC,IAAA,SAAY;QAASC,UACZ;QAAAC,cACC;QACVC,OAAA;QACFC,eAAA;QAEAC,WAAA,gBAAoB;QAClBC,WAAM;QAAAC,MACJ;QAAiBC,UACjB;UAAYJ,eACV,oBAAiB;UACnBC,WAAA;QAAA;QACYI,UACV;UACFL,eAAA;UACFC,WAAA;QACF;QACFK,iBAAA;UAEAC,YAAiB;UACfC,YAAU,EAAQ;UACpBC,YAAA;UACFC,MAAA;QACA;MACE;IAAQ;IAERd,IAAA;MACF,oBAAAe,CAAAC,GAAA,EAAAC,KAAA;QACF;UAAAC;QAAA,IAAAD,KAAA;QAiBa,KAAAD,GAAS;QACpB,OAAS;UACDG,KAAA,EAAAD,MAAA,CAAAlB,IAAA,CAAAgB,GAAA;UACJI,MAAQ,EAAAF,MAAA,CAAAlB,IAAA,CAAAgB,GAAA;QACR;MACA;MACA,oBAAAK,CAAAL,GAAA;QACA;UACAG,KAAA,EAAWH,GAAA;UACRI,MAAA,EAAAJ;QACD;MAEJ;IAAyD;IACjDM,kBACI;MACVC,IAAA;QACDnB,eAAA;QAEDI,UACE;UAACJ,eAAA;QAAA;QACCoB,UAAO;UACPpB,eAAc;QACd;MAA4B;IACS;EACrC;EAGeqB,eACX;IAAoB3B,QACtB,EAAA4B,OAAA,CAAAC,GAAA,CAAAC,gBAAA;EAAA;AACE;EAMaC,MAAA,EACb;IAAIC,WACJ;EAAY;AACA;AACd,IAAAjD,MACF,GAAK,eAAAS,KAAA,CAAAyC,UAAA,UAAAC,QAAAC,KAAA,EAAAC,YAAA;EAAA;IACLC,MAAA,EAAAC,UAAS;IAAAN,WAAqB;IAAAO,aAAM,GAAW;IAAWC,cAAM;IAAAC,WAAA;IAAAzC,QAAA;IAAA,GAAA0C;EAAA,IAAAP,KAAA;EAC9D,KAAAE,MAAA,GAAK,KAAM,EAAAM,SAAU,QAAArD,6BAAA,CAAAsD,oBAAA;IACnBC,IAAA,EAAAP,UAAA;IAAyBQ,QAC3B,EAAAN,cAAA;IAAAO,WACD,EAAAR;EAAA;EAAA,IACHS,cAAA;EAEJ,0BAAA7D,kBAAA,CAAA8D,GAAA,EAAAjE,WAAA;IACFkE,KAAA,EAAAT,WAAA,aAAAA,WAAA,cAAAA,WAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/toggle-group",
-  "version": "2.4.6",
+  "version": "2.5.1",
   "source": "src/index.ts",
   "files": [
     "src",
@@ -34,26 +34,31 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/constants": "2.4.6",
-    "@tamagui/create-context": "2.4.6",
-    "@tamagui/focusable": "2.4.6",
-    "@tamagui/get-token": "2.4.6",
-    "@tamagui/helpers": "2.4.6",
-    "@tamagui/helpers-tamagui": "2.4.6",
-    "@tamagui/roving-focus": "2.4.6",
-    "@tamagui/sizable-context": "2.4.6",
-    "@tamagui/stacks": "2.4.6",
-    "@tamagui/use-controllable-state": "2.4.6",
-    "@tamagui/use-direction": "2.4.6",
-    "@tamagui/font-size": "2.4.6",
-    "@tamagui/web": "2.4.6"
+    "@tamagui/constants": "2.5.1",
+    "@tamagui/create-context": "2.5.1",
+    "@tamagui/focusable": "2.5.1",
+    "@tamagui/get-token": "2.5.1",
+    "@tamagui/helpers": "2.5.1",
+    "@tamagui/helpers-tamagui": "2.5.1",
+    "@tamagui/roving-focus": "2.5.1",
+    "@tamagui/sizable-context": "2.5.1",
+    "@tamagui/stacks": "2.5.1",
+    "@tamagui/use-controllable-state": "2.5.1",
+    "@tamagui/use-direction": "2.5.1",
+    "@tamagui/font-size": "2.5.1",
+    "@tamagui/web": "2.5.1"
   },
   "devDependencies": {
-    "@tamagui/build": "2.4.6",
+    "@tamagui/build": "2.5.1",
     "react": ">=19"
   },
   "peerDependencies": {
     "react": ">=19"
   },
-  "module:jsx": "dist/jsx"
+  "module:jsx": "dist/jsx",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tamagui/tamagui.git",
+    "directory": "code/ui/toggle-group"
+  }
 }

package/src/Toggle.tsx

@@ -129,13 +129,17 @@ export const Toggle = React.forwardRef<TamaguiElement, ToggleProps>(
           !unstyled && {
             defaultActiveStyle: true,
           })}
+        {...buttonProps}
+        // spread activeStyle after buttonProps so it wins when active: a styled()
+        // variant (e.g. a resting `backgroundColor`) forwards that value as a plain
+        // prop into buttonProps, which would otherwise clobber the activeStyle merge
+        // on overlapping keys and leave the active item stuck at its resting style.
         {...(active &&
           activeStyle && {
             ...(activeStyle as any),
             hoverStyle: activeStyle,
             focusStyle: activeStyle,
           })}
-        {...buttonProps}
         ref={forwardedRef}
         onPress={composeEventHandlers(props.onPress ?? undefined, () => {
           if (!props.disabled) {

package/types/Toggle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Toggle.d.ts","sourceRoot":"","sources":["../src/Toggle.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAEvE,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAS9B,eAAO,MAAM,WAAW;;;;;;;;;;;;;;EAuEvB,CAAA;AAED,KAAK,gBAAgB,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,CAAA;AAEpD,KAAK,oBAAoB,GAAG;IAC1B,WAAW,CAAC,EAAE,YAAY,GAAG,UAAU,CAAA;IACvC,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,cAAc,CAAC,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAA;IACtC,WAAW,CAAC,EAAE,SAAS,GAAG,IAAI,CAAA;IAC9B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,gBAAgB,GAAG,oBAAoB,CAAA;AAEjE,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iEA8ClB,CAAA"}
+{"version":3,"file":"Toggle.d.ts","sourceRoot":"","sources":["../src/Toggle.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAEvE,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAS9B,eAAO,MAAM,WAAW;;;;;;;;;;;;;;EAuEvB,CAAA;AAED,KAAK,gBAAgB,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,CAAA;AAEpD,KAAK,oBAAoB,GAAG;IAC1B,WAAW,CAAC,EAAE,YAAY,GAAG,UAAU,CAAA;IACvC,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,cAAc,CAAC,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAA;IACtC,WAAW,CAAC,EAAE,SAAS,GAAG,IAAI,CAAA;IAC9B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,gBAAgB,GAAG,oBAAoB,CAAA;AAEjE,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iEAkDlB,CAAA"}