Skip to content

Fix button group with modal trigger #2048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
joshhanley wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix button group with modal trigger #2048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions stubs/resources/views/flux/button/group.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
'[&>[data-flux-input]:has(+[data-flux-input-group-suffix])>[data-flux-group-target]:not([data-invalid])]:border-e-0',

// Selects and date pickers borders...
'[&>*:last-child:not(:first-child)>[data-flux-group-target]:not([data-invalid])]:border-s-0',
'[&>*:not(:first-child):not(:last-child)>[data-flux-group-target]:not([data-invalid])]:border-s-0',
'[&>*:has(+[data-flux-input-group-suffix])>[data-flux-group-target]:not([data-invalid])]:border-e-0',
'[&>*:last-child:not(:first-child)_[data-flux-group-target]:not([data-invalid])]:border-s-0',
'[&>*:not(:first-child):not(:last-child)_[data-flux-group-target]:not([data-invalid])]:border-s-0',
'[&>*:has(+[data-flux-input-group-suffix])_[data-flux-group-target]:not([data-invalid])]:border-e-0',

// Buttons borders...
'[&>[data-flux-group-target]:last-child:not(:first-child)]:border-s-0',
Expand All @@ -30,14 +30,9 @@
'[&>[data-flux-group-target]:last-child:not(:first-child)]:rounded-s-none',

// "Weld" borders for sub-children of group targets (button element inside ui-select element, etc.)...
'[&>*:not(:first-child):not(:last-child):not(:only-child)>[data-flux-group-target]]:rounded-none',
'[&>*:first-child:not(:last-child)>[data-flux-group-target]]:rounded-e-none',
'[&>*:last-child:not(:first-child)>[data-flux-group-target]]:rounded-s-none',

// "Weld" borders for sub-sub-children of group targets (input element inside div inside ui-select element (combobox))...
'[&>*:not(:first-child):not(:last-child):not(:only-child)>[data-flux-input]>[data-flux-group-target]]:rounded-none',
'[&>*:first-child:not(:last-child)>[data-flux-input]>[data-flux-group-target]]:rounded-e-none',
'[&>*:last-child:not(:first-child)>[data-flux-input]>[data-flux-group-target]]:rounded-s-none',
'[&>*:not(:first-child):not(:last-child):not(:only-child)_[data-flux-group-target]]:rounded-none',
'[&>*:first-child:not(:last-child)_[data-flux-group-target]]:rounded-e-none',
'[&>*:last-child:not(:first-child)_[data-flux-group-target]]:rounded-s-none',
])
;
@endphp
Expand Down
17 changes: 6 additions & 11 deletions stubs/resources/views/flux/input/group/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
'[&>[data-flux-input]:has(+[data-flux-input-group-suffix])>[data-flux-group-target]:not([data-invalid])]:border-e-0',

// Selects and date pickers borders...
'[&>*:last-child:not(:first-child)>[data-flux-group-target]:not([data-invalid])]:border-s-0',
'[&>*:not(:first-child):not(:last-child)>[data-flux-group-target]:not([data-invalid])]:border-s-0',
'[&>*:has(+[data-flux-input-group-suffix])>[data-flux-group-target]:not([data-invalid])]:border-e-0',
'[&>*:last-child:not(:first-child)_[data-flux-group-target]:not([data-invalid])]:border-s-0',
'[&>*:not(:first-child):not(:last-child)_[data-flux-group-target]:not([data-invalid])]:border-s-0',
'[&>*:has(+[data-flux-input-group-suffix])_[data-flux-group-target]:not([data-invalid])]:border-e-0',

// Buttons borders...
'[&>[data-flux-group-target]:last-child:not(:first-child)]:border-s-0',
Expand All @@ -33,14 +33,9 @@
'[&>[data-flux-group-target]:last-child:not(:first-child)]:rounded-s-none',

// "Weld" borders for sub-children of group targets (button element inside ui-select element, etc.)...
'[&>*:not(:first-child):not(:last-child):not(:only-child)>[data-flux-group-target]]:rounded-none',
'[&>*:first-child:not(:last-child)>[data-flux-group-target]]:rounded-e-none',
'[&>*:last-child:not(:first-child)>[data-flux-group-target]]:rounded-s-none',

// "Weld" borders for sub-sub-children of group targets (input element inside div inside ui-select element (combobox))...
'[&>*:not(:first-child):not(:last-child):not(:only-child)>[data-flux-input]>[data-flux-group-target]]:rounded-none',
'[&>*:first-child:not(:last-child)>[data-flux-input]>[data-flux-group-target]]:rounded-e-none',
'[&>*:last-child:not(:first-child)>[data-flux-input]>[data-flux-group-target]]:rounded-s-none',
'[&>*:not(:first-child):not(:last-child):not(:only-child)_[data-flux-group-target]]:rounded-none',
'[&>*:first-child:not(:last-child)_[data-flux-group-target]]:rounded-e-none',
'[&>*:last-child:not(:first-child)_[data-flux-group-target]]:rounded-s-none',
])
;
@endphp
Expand Down