diff --git a/Sources/Mistica/Components/Button/ButtonStyle+Toolkit.swift b/Sources/Mistica/Components/Button/ButtonStyle+Toolkit.swift index f2a5fd08..fa562d3c 100644 --- a/Sources/Mistica/Components/Button/ButtonStyle+Toolkit.swift +++ b/Sources/Mistica/Components/Button/ButtonStyle+Toolkit.swift @@ -31,7 +31,7 @@ public extension Button.Style { allowsBleedingAlignment: false, stateStyleByState: [ .normal: Button.StateStyle(textColor: .textButtonPrimary, backgroundColor: .buttonPrimaryBackground, borderColor: .buttonPrimaryBackground), - .selected: Button.StateStyle(textColor: .textButtonPrimary, backgroundColor: .buttonPrimaryBackgroundSelected, borderColor: .buttonPrimaryBackgroundSelected), + .selected: Button.StateStyle(textColor: .textButtonPrimary, backgroundColor: .buttonPrimaryBackgroundPressed, borderColor: .buttonPrimaryBackgroundPressed), .disabled: Button.StateStyle(textColor: .textButtonPrimary, backgroundColor: .buttonPrimaryBackground, borderColor: .buttonPrimaryBackground), .loading: Button.StateStyle(textColor: .textButtonPrimary, backgroundColor: .buttonPrimaryBackground, borderColor: .buttonPrimaryBackground) ] @@ -45,7 +45,7 @@ public extension Button.Style { allowsBleedingAlignment: false, stateStyleByState: [ .normal: Button.StateStyle(textColor: .textButtonSecondary, backgroundColor: backgroundColor, borderColor: .buttonSecondaryBorder), - .selected: Button.StateStyle(textColor: .textButtonSecondarySelected, backgroundColor: backgroundColor, borderColor: .buttonSecondaryBackgroundSelected), + .selected: Button.StateStyle(textColor: .textButtonSecondaryPressed, backgroundColor: backgroundColor, borderColor: .buttonSecondaryBackgroundPressed), .disabled: Button.StateStyle(textColor: .textButtonSecondary, backgroundColor: backgroundColor, borderColor: .buttonSecondaryBorder), .loading: Button.StateStyle(textColor: .textButtonSecondary, backgroundColor: backgroundColor, borderColor: .buttonSecondaryBorder) ] @@ -59,7 +59,7 @@ public extension Button.Style { allowsBleedingAlignment: false, stateStyleByState: [ .normal: Button.StateStyle(textColor: textColor, backgroundColor: .buttonDangerBackground, borderColor: .buttonDangerBackground), - .selected: Button.StateStyle(textColor: textColor, backgroundColor: .buttonDangerBackgroundSelected, borderColor: .buttonDangerBackgroundSelected), + .selected: Button.StateStyle(textColor: textColor, backgroundColor: .buttonDangerBackgroundPressed, borderColor: .buttonDangerBackgroundPressed), .disabled: Button.StateStyle(textColor: textColor, backgroundColor: .buttonDangerBackground, borderColor: .buttonDangerBackground), .loading: Button.StateStyle(textColor: textColor, backgroundColor: .buttonDangerBackground, borderColor: .buttonDangerBackground) ] @@ -73,7 +73,7 @@ public extension Button.Style { allowsBleedingAlignment: true, stateStyleByState: [ .normal: Button.StateStyle(textColor: .textLink, backgroundColor: backgroundColor, borderColor: backgroundColor), - .selected: Button.StateStyle(textColor: .textLink, backgroundColor: .buttonLinkBackgroundSelected, borderColor: backgroundColor), + .selected: Button.StateStyle(textColor: .textLink, backgroundColor: .buttonLinkBackgroundPressed, borderColor: backgroundColor), .disabled: Button.StateStyle(textColor: .textLink, backgroundColor: backgroundColor, borderColor: backgroundColor), .loading: Button.StateStyle(textColor: .textLink, backgroundColor: backgroundColor, borderColor: backgroundColor) ] @@ -89,7 +89,7 @@ public extension Button.Style { allowsBleedingAlignment: true, stateStyleByState: [ .normal: Button.StateStyle(textColor: .textLinkDanger, backgroundColor: .clear, borderColor: .clear), - .selected: Button.StateStyle(textColor: .textLinkDanger, backgroundColor: .buttonLinkDangerBackgroundSelected, borderColor: .clear), + .selected: Button.StateStyle(textColor: .textLinkDanger, backgroundColor: .buttonLinkDangerBackgroundPressed, borderColor: .clear), .disabled: Button.StateStyle(textColor: .textLinkDanger, backgroundColor: .clear, borderColor: .clear), .loading: Button.StateStyle(textColor: .textLinkDanger, backgroundColor: .clear, borderColor: .clear) ] @@ -105,7 +105,7 @@ public extension Button.Style { allowsBleedingAlignment: true, stateStyleByState: [ .normal: Button.StateStyle(textColor: .textLinkDanger, backgroundColor: .buttonLinkDangerBackgroundInverse, borderColor: .clear), - .selected: Button.StateStyle(textColor: .textLinkDanger, backgroundColor: .buttonLinkDangerBackgroundInverseSelected, borderColor: .clear), + .selected: Button.StateStyle(textColor: .textLinkDanger, backgroundColor: .buttonLinkDangerBackgroundInversePressed, borderColor: .clear), .disabled: Button.StateStyle(textColor: .textLinkDanger, backgroundColor: .clear, borderColor: .clear), .loading: Button.StateStyle(textColor: .textLinkDanger, backgroundColor: .clear, borderColor: .clear) ] @@ -121,7 +121,7 @@ public extension Button.Style { allowsBleedingAlignment: false, stateStyleByState: [ .normal: Button.StateStyle(textColor: .textButtonPrimaryInverse, backgroundColor: .buttonPrimaryBackgroundInverse, borderColor: .buttonPrimaryBackgroundInverse), - .selected: Button.StateStyle(textColor: .textButtonPrimaryInverseSelected, backgroundColor: .buttonPrimaryBackgroundInverseSelected, borderColor: .buttonPrimaryBackgroundInverseSelected), + .selected: Button.StateStyle(textColor: .textButtonPrimaryInversePressed, backgroundColor: .buttonPrimaryBackgroundInversePressed, borderColor: .buttonPrimaryBackgroundInversePressed), .disabled: Button.StateStyle(textColor: .textButtonPrimaryInverse, backgroundColor: .buttonPrimaryBackgroundInverse, borderColor: .buttonPrimaryBackgroundInverse), .loading: Button.StateStyle(textColor: .textButtonPrimaryInverse, backgroundColor: .buttonPrimaryBackgroundInverse, borderColor: .buttonPrimaryBackgroundInverse) ] @@ -133,7 +133,7 @@ public extension Button.Style { allowsBleedingAlignment: false, stateStyleByState: [ .normal: Button.StateStyle(textColor: .textButtonSecondaryInverse, backgroundColor: .clear, borderColor: .buttonSecondaryBorderInverse), - .selected: Button.StateStyle(textColor: .textButtonSecondaryInverseSelected, backgroundColor: .clear, borderColor: .buttonSecondaryBorderInverseSelected), + .selected: Button.StateStyle(textColor: .textButtonSecondaryInversePressed, backgroundColor: .clear, borderColor: .buttonSecondaryBorderInversePressed), .disabled: Button.StateStyle(textColor: .textButtonSecondaryInverse, backgroundColor: .clear, borderColor: .buttonSecondaryBorderInverse), .loading: Button.StateStyle(textColor: .textButtonSecondaryInverse, backgroundColor: .clear, borderColor: .buttonSecondaryBorderInverse) ] @@ -146,7 +146,7 @@ public extension Button.Style { allowsBleedingAlignment: true, stateStyleByState: [ .normal: Button.StateStyle(textColor: .textLinkInverse, backgroundColor: backgroundColor, borderColor: backgroundColor), - .selected: Button.StateStyle(textColor: .textLinkInverse, backgroundColor: .buttonLinkBackgroundInverseSelected, borderColor: backgroundColor), + .selected: Button.StateStyle(textColor: .textLinkInverse, backgroundColor: .buttonLinkBackgroundInversePressed, borderColor: backgroundColor), .disabled: Button.StateStyle(textColor: .textLinkInverse, backgroundColor: backgroundColor, borderColor: backgroundColor), .loading: Button.StateStyle(textColor: .textLinkInverse, backgroundColor: backgroundColor, borderColor: backgroundColor) ] diff --git a/Sources/Mistica/Components/Crouton/Domain/CroutonConfig.swift b/Sources/Mistica/Components/Crouton/Domain/CroutonConfig.swift index 6238193e..bd7aa3b2 100644 --- a/Sources/Mistica/Components/Crouton/Domain/CroutonConfig.swift +++ b/Sources/Mistica/Components/Crouton/Domain/CroutonConfig.swift @@ -50,7 +50,7 @@ private extension Button.Style { allowsBleedingAlignment: true, stateStyleByState: [ .normal: Button.StateStyle(textColor: .textLinkSnackbar, backgroundColor: backgroundColor, borderColor: backgroundColor), - .selected: Button.StateStyle(textColor: .textLinkSnackbar, backgroundColor: .buttonLinkBackgroundSelected, borderColor: backgroundColor), + .selected: Button.StateStyle(textColor: .textLinkSnackbar, backgroundColor: .buttonLinkBackgroundPressed, borderColor: backgroundColor), .disabled: Button.StateStyle(textColor: .textLinkSnackbar, backgroundColor: backgroundColor, borderColor: backgroundColor), .loading: Button.StateStyle(textColor: .textLinkSnackbar, backgroundColor: backgroundColor, borderColor: backgroundColor) ] diff --git a/Sources/MisticaSwiftUI/Components/Button/MisticaButtonStyle.swift b/Sources/MisticaSwiftUI/Components/Button/MisticaButtonStyle.swift index 95978e01..81a735ec 100644 --- a/Sources/MisticaSwiftUI/Components/Button/MisticaButtonStyle.swift +++ b/Sources/MisticaSwiftUI/Components/Button/MisticaButtonStyle.swift @@ -51,8 +51,8 @@ public extension ButtonStyle where Self == MisticaButtonStyle { ), .selected: MisticaButton.StateStyle( textColor: .textButtonPrimary, - backgroundColor: .buttonPrimaryBackgroundSelected, - borderColor: .buttonPrimaryBackgroundSelected + backgroundColor: .buttonPrimaryBackgroundPressed, + borderColor: .buttonPrimaryBackgroundPressed ), .disabled: MisticaButton.StateStyle( textColor: .textButtonPrimary, @@ -85,9 +85,9 @@ public extension ButtonStyle where Self == MisticaButtonStyle { borderColor: .buttonPrimaryBackgroundInverse ), .selected: MisticaButton.StateStyle( - textColor: .textButtonPrimaryInverseSelected, - backgroundColor: .buttonPrimaryBackgroundInverseSelected, - borderColor: .buttonPrimaryBackgroundInverseSelected + textColor: .textButtonPrimaryInversePressed, + backgroundColor: .buttonPrimaryBackgroundInversePressed, + borderColor: .buttonPrimaryBackgroundInversePressed ), .disabled: MisticaButton.StateStyle( textColor: .textButtonPrimaryInverse, @@ -120,9 +120,9 @@ public extension ButtonStyle where Self == MisticaButtonStyle { borderColor: .buttonSecondaryBorder ), .selected: MisticaButton.StateStyle( - textColor: .textButtonSecondarySelected, + textColor: .textButtonSecondaryPressed, backgroundColor: .clear, - borderColor: .buttonSecondaryBackgroundSelected + borderColor: .buttonSecondaryBackgroundPressed ), .disabled: MisticaButton.StateStyle( textColor: .textButtonSecondary.opacity(opacity), @@ -155,9 +155,9 @@ public extension ButtonStyle where Self == MisticaButtonStyle { borderColor: .buttonSecondaryBorderInverse ), .selected: MisticaButton.StateStyle( - textColor: .textButtonSecondaryInverseSelected, + textColor: .textButtonSecondaryInversePressed, backgroundColor: .clear, - borderColor: .buttonSecondaryBorderInverseSelected + borderColor: .buttonSecondaryBorderInversePressed ), .disabled: MisticaButton.StateStyle( textColor: .textButtonSecondaryInverse.opacity(opacity), @@ -191,8 +191,8 @@ public extension ButtonStyle where Self == MisticaButtonStyle { ), .selected: MisticaButton.StateStyle( textColor: .textButtonPrimary, - backgroundColor: .buttonDangerBackgroundSelected, - borderColor: .buttonDangerBackgroundSelected + backgroundColor: .buttonDangerBackgroundPressed, + borderColor: .buttonDangerBackgroundPressed ), .disabled: MisticaButton.StateStyle( textColor: .textButtonPrimary, @@ -228,7 +228,7 @@ public extension ButtonStyle where Self == MisticaButtonStyle { ), .selected: MisticaButton.StateStyle( textColor: .textLink, - backgroundColor: .buttonLinkBackgroundSelected, + backgroundColor: .buttonLinkBackgroundPressed, borderColor: .clear ), .disabled: MisticaButton.StateStyle( @@ -265,7 +265,7 @@ public extension ButtonStyle where Self == MisticaButtonStyle { ), .selected: MisticaButton.StateStyle( textColor: .textLinkInverse, - backgroundColor: .buttonLinkBackgroundInverseSelected, + backgroundColor: .buttonLinkBackgroundInversePressed, borderColor: .clear ), .disabled: MisticaButton.StateStyle( @@ -301,7 +301,7 @@ public extension ButtonStyle where Self == MisticaButtonStyle { ), .selected: MisticaButton.StateStyle( textColor: .textLinkSnackbar, - backgroundColor: .buttonLinkBackgroundSelected, + backgroundColor: .buttonLinkBackgroundPressed, borderColor: .clear ), .disabled: MisticaButton.StateStyle(