Skip to content
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

Jump to bottom

fix: ComposerPopupPreview trespassing the composer limit #28896

Merged
merged 9 commits into from
Apr 14, 2023
Merged

fix: ComposerPopupPreview trespassing the composer limit #28896

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
446096e
fix: visual changes
dougfabris Apr 13, 2023
582893f
chore: review
dougfabris Apr 13, 2023
65b052c
Merge branch 'develop' into fix/composer-popup-preview
kodiakhq[bot] Apr 13, 2023
808f86a
Merge branch 'develop' into fix/composer-popup-preview
kodiakhq[bot] Apr 13, 2023
d222cfd
Merge branch 'develop' into fix/composer-popup-preview
kodiakhq[bot] Apr 14, 2023
12a6a5e
Merge branch 'develop' into fix/composer-popup-preview
kodiakhq[bot] Apr 14, 2023
d960cac
Merge branch 'develop' into fix/composer-popup-preview
kodiakhq[bot] Apr 14, 2023
bcc62d6
Merge branch 'develop' into fix/composer-popup-preview
dougfabris Apr 14, 2023
1c1ee41
Merge branch 'develop' into fix/composer-popup-preview
kodiakhq[bot] Apr 14, 2023
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
4 changes: 2 additions & 2 deletions apps/meteor/app/ui-message/client/popup/ComposerBoxPopup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ const ComposerBoxPopup = <

return (
<Box className='message-popup-position' position='relative'>
<Tile className='message-popup' padding={0} role='menu' mbe='x2' maxHeight='20rem' aria-labelledby={id}>
<Tile className='message-popup' padding={0} role='menu' mbe='x8' aria-labelledby={id}>
{title && (
<Box bg='tint' pi='x16' pb='x8' id={id}>
{title}
</Box>
)}
<Box pb='x8'>
<Box pb='x8' maxHeight='20rem'>
{!isLoading && itemsFlat.length === 0 && <Option>{t('No_results_found')}</Option>}
{itemsFlat.map((item, index) => {
return (
Expand Down
7 changes: 2 additions & 5 deletions ...pp/ui-message/client/popup/components/composerBoxPopupPreview/ComposerBoxPopupPreview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,8 @@ const ComposerBoxPopupPreview = forwardRef<

return (
<Box className='message-popup-position' position='relative'>
<Tile className='message-popup' padding='x8' role='menu' mbe='x2' aria-labelledby={id}>
{/* <Box bg='tint' pi='x16' pb='x8' id={id}>
{isLoading ? <Skeleton /> : data?.i18nTitle}
</Box> */}
<Box role='listbox' display='flex' overflow='auto' fontSize={0} aria-busy={isLoading}>
<Tile className='message-popup' padding='x8' role='menu' mbe='x8' aria-labelledby={id}>
<Box role='listbox' display='flex' overflow='auto' fontSize={0} width={0} flexGrow={1} aria-busy={isLoading}>
{isLoading &&
Array(5)
.fill(5)
Expand Down