Skip to content

Commit

Permalink
feat: remove list 'active:' modifiers in m3 theme
Browse files Browse the repository at this point in the history
  • Loading branch information
nolimits4web committed Aug 8, 2022
1 parent f39f544 commit 80f4c85
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
5 changes: 3 additions & 2 deletions src/shared/classes/ListButtonClasses.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import { cls } from '../cls.js';
import { positionClass } from '../position-class.js';

export const ListButtonClasses = (props, colors, classes) => {
export const ListButtonClasses = (props, colors, classes, theme) => {
const { hairlines } = props;
return {
base: ``,
button: {
common: cls(
positionClass('relative', classes),
hairlines && 'hairline-b active:hairline-transparent',
`flex items-center justify-center px-4 space-x-1 active:bg-opacity-15 w-full duration-300 active:duration-0 focus:outline-none ${colors.text} ${colors.activeBg} ${colors.touchRipple} overflow-hidden select-none`
`flex items-center justify-center px-4 space-x-1 w-full duration-300 active:duration-0 focus:outline-none ${colors.text} ${colors.touchRipple} overflow-hidden select-none`,
theme === 'ios' && `${colors.activeBg} active:bg-opacity-15`
),
ios: 'h-11',
material: 'h-12',
Expand Down
12 changes: 7 additions & 5 deletions src/shared/classes/ListItemClasses.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export const ListItemClasses = (
props,
colors,
{
theme,
textColor,
needsTouchRipple,
isMenuListItemActive,
Expand Down Expand Up @@ -36,18 +37,19 @@ export const ListItemClasses = (
),
link: cls(
'duration-300 active:duration-0 cursor-pointer select-none',
hairlines && 'active:hairline-transparent',
hairlines && theme === 'ios' && 'active:hairline-transparent',
needsTouchRipple &&
cls(
`relative overflow-hidden`,
darkClasses('dark:touch-ripple-white z-10')
),
isMenuListItemActive
? cls(colors.menuListItemActiveBg, 'bg-opacity-15')
: cls(
`active:bg-black active:bg-opacity-10`,
darkClasses('dark:active:bg-white dark:active:bg-opacity-10')
)
: theme === 'ios' &&
cls(
`active:bg-black active:bg-opacity-10`,
darkClasses('dark:active:bg-white dark:active:bg-opacity-10')
)
),
},

Expand Down

0 comments on commit 80f4c85

Please sign in to comment.