Skip to content

feat(ui): make media library responsive #7820

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

Open
delucis wants to merge 8 commits into
base: main
Choose a base branch
from
Open

feat(ui): make media library responsive #7820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7f6ebd7
fix: support small viewport in virtualized media grid
delucis May 20, 2026
629a571
fix: rework layout of media modal header to be responsive
delucis May 20, 2026
afe4cd2
feat: use icons for copy & download buttons in small screens
delucis May 20, 2026
43eb947
fix: let modal layout adapt to varying header heights
delucis May 20, 2026
dbed762
fix: make minimum width of modal responsive
delucis May 20, 2026
5a88052
feat: use full viewport width for modal on small screens
delucis May 20, 2026
1abbe0a
fix: revert accidental style deletion
delucis May 20, 2026
30e27ef
test: fix test snapshot for card grid changes
delucis May 20, 2026
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
46 changes: 39 additions & 7 deletions packages/decap-cms-core/src/components/MediaLibrary/MediaLibraryButtons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,33 @@ import PropTypes from 'prop-types';
import { css } from '@emotion/react';
import styled from '@emotion/styled';
import { isAbsolutePath } from 'decap-cms-lib-util';
import { buttons, shadows, zIndex } from 'decap-cms-ui-default';
import { buttons, Icon, shadows, zIndex } from 'decap-cms-ui-default';

import { FileUploadButton } from '../UI';

const styles = {
button: css`
${buttons.button};
${buttons.default};
display: inline-block;
margin-left: 15px;
margin-right: 2px;
display: inline-flex;
align-items: center;

&[disabled] {
${buttons.disabled};
cursor: default;
}
`,
// Hides an element without removing it from the accessibility tree.
visuallyHidden: css`
position: absolute;
width: 1px;
height: 1px;
padding: 0;
margin: -1px;
overflow: hidden;
clip: rect(0, 0, 0, 0);
white-space: nowrap;
`,
};

export const UploadButton = styled(FileUploadButton)`
Expand Down Expand Up @@ -68,7 +78,27 @@ const ActionButton = styled.button`
`}
`;

export const DownloadButton = ActionButton;
function ResponsiveActionButton({ children, icon, ...props }) {
return (
<ActionButton {...props}>
<Icon
type={icon}
size="small"
aria-hidden="true"
css={{ '@media (min-width: 600px)': styles.visuallyHidden }}
/>
<span css={{ '@media (max-width: 599px)': styles.visuallyHidden }}>{children}</span>
</ActionButton>
);
}

export function DownloadButton({ children, ...props }) {
return (
<ResponsiveActionButton {...props} icon="download">
{children}
</ResponsiveActionButton>
);
}

export class CopyToClipBoardButton extends React.Component {
mounted = false;
Expand Down Expand Up @@ -115,13 +145,15 @@ export class CopyToClipBoardButton extends React.Component {
return t('mediaLibrary.mediaLibraryCard.copyPath');
};

getIcon = () => (this.state.copied ? 'check' : 'copy');

render() {
const { disabled } = this.props;

return (
<ActionButton disabled={disabled} onClick={this.handleCopy}>
<ResponsiveActionButton disabled={disabled} onClick={this.handleCopy} icon={this.getIcon()}>
{this.getTitle()}
</ActionButton>
</ResponsiveActionButton>
);
}
}
Expand Down
4 changes: 1 addition & 3 deletions packages/decap-cms-core/src/components/MediaLibrary/MediaLibraryCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ class MediaLibraryCard extends React.Component {
text,
onClick,
draftText,
width,
height,
margin,
isPrivate,
Expand All @@ -83,7 +82,7 @@ class MediaLibraryCard extends React.Component {
<Card
isSelected={isSelected}
onClick={onClick}
width={width}
width="100%"
height={height}
margin={margin}
tabIndex="-1"
Expand Down Expand Up @@ -115,7 +114,6 @@ MediaLibraryCard.propTypes = {
text: PropTypes.string.isRequired,
onClick: PropTypes.func.isRequired,
draftText: PropTypes.string.isRequired,
width: PropTypes.string.isRequired,
height: PropTypes.string.isRequired,
margin: PropTypes.string.isRequired,
isPrivate: PropTypes.bool,
Expand Down
4 changes: 2 additions & 2 deletions packages/decap-cms-core/src/components/MediaLibrary/MediaLibraryCardGrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ function VirtualizedGrid(props) {
const cardWidth = parseInt(props.cardWidth, 10);
const cardHeight = parseInt(props.cardHeight, 10);
const gutter = parseInt(props.cardMargin, 10);
const columnWidth = cardWidth + gutter;
const columnWidth = Math.min(width, cardWidth + gutter);
const rowHeight = cardHeight + gutter;
const columnCount = Math.floor(width / columnWidth);
const columnCount = Math.max(1, Math.floor(width / columnWidth));
const rowCount = Math.ceil(mediaItems.length / columnCount);
return (
<Grid
Expand Down
49 changes: 32 additions & 17 deletions packages/decap-cms-core/src/components/MediaLibrary/MediaLibraryHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,54 @@ import PropTypes from 'prop-types';
import styled from '@emotion/styled';
import { Icon, shadows, colors, buttons } from 'decap-cms-ui-default';

const HeaderContainer = styled.div`
@media (max-width: 499px) {
width: 100%;
display: flex;
justify-content: space-between;
flex-direction: row-reverse;
}
`;

const CloseButton = styled.button`
${buttons.button};
${shadows.dropMiddle};
position: absolute;
margin-right: -40px;
left: -40px;
top: -40px;
width: 40px;
height: 40px;
border-radius: 50%;
background-color: white;
padding: 0;
display: flex;
justify-content: center;
align-items: center;
@media (min-width: 500px) {
${shadows.dropMiddle};
position: absolute;
margin-right: -40px;
left: -40px;
top: -40px;
width: 40px;
height: 40px;
border-radius: 50%;
padding: 0;
display: flex;
justify-content: center;
align-items: center;
}
`;

const LibraryTitle = styled.h1`
line-height: 36px;
font-size: 22px;
font-size: 18px;
line-height: 28px;
text-align: left;
margin-bottom: 25px;
@media (min-width: 500px) {
font-size: 22px;
line-height: 36px;
}
margin-bottom: 0;
color: ${props => props.isPrivate && colors.textFieldBorder};
`;

function MediaLibraryHeader({ onClose, title, isPrivate, t }) {
return (
<div>
<HeaderContainer>
<CloseButton aria-label={t('mediaLibrary.mediaLibraryModal.close')} onClick={onClose}>
<Icon type="close" />
</CloseButton>
<LibraryTitle isPrivate={isPrivate}>{title}</LibraryTitle>
</div>
</HeaderContainer>
);
}

Expand Down
12 changes: 8 additions & 4 deletions packages/decap-cms-core/src/components/MediaLibrary/MediaLibraryModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,18 @@ const cardMargin = `10px`;
*/
const cardOutsideWidth = `300px`;

/** Calculated to be as wide as possible without cutting off the 40px-wide close button. */
const minimumCardWidth = `calc(100% - 40px)`;

const StyledModal = styled(Modal)`
display: grid;
grid-template-rows: 120px auto;
width: calc(${cardOutsideWidth} + 20px);
width: 100%;
grid-template-rows: auto 1fr;
gap: 20px;
background-color: ${props => props.isPrivate && colors.grayDark};

@media (min-width: 800px) {
width: calc(${cardOutsideWidth} * 2 + 20px);
@media (min-width: 500px) {
width: min(${minimumCardWidth}, calc(${cardOutsideWidth} * 2 + 20px));
}

@media (min-width: 1120px) {
Expand Down
4 changes: 3 additions & 1 deletion packages/decap-cms-core/src/components/MediaLibrary/MediaLibrarySearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ const SearchContainer = styled.div`
display: flex;
align-items: center;
position: relative;
width: 400px;
flex: 1 1 150px;
max-width: 460px;
`;

const SearchInput = styled.input`
Expand All @@ -33,6 +34,7 @@ const SearchIcon = styled(Icon)`
left: 6px;
z-index: ${zIndex.zIndex2};
transform: translate(0, -50%);
pointer-events: none;
`;

function MediaLibrarySearch({ value, onChange, onKeyDown, placeholder, disabled }) {
Expand Down
20 changes: 19 additions & 1 deletion packages/decap-cms-core/src/components/MediaLibrary/MediaLibraryTop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { css } from '@emotion/react';
import styled from '@emotion/styled';

import MediaLibrarySearch from './MediaLibrarySearch';
Expand All @@ -12,19 +13,36 @@ import {
InsertButton,
} from './MediaLibraryButtons';

const styles = {
flexSpacing: css`
gap: 8px;
@media (min-width: 500px) {
gap: 15px;
}
`,
};

const LibraryTop = styled.div`
position: relative;
display: flex;
flex-direction: column;
${styles.flexSpacing};
`;

const RowContainer = styled.div`
display: flex;
align-items: center;
justify-content: space-between;
flex-wrap: wrap;
${styles.flexSpacing};
`;

const ButtonsContainer = styled.div`
flex-shrink: 0;
display: flex;
align-items: center;
justify-content: stretch;
flex-wrap: wrap;
${styles.flexSpacing};
`;

function MediaLibraryTop({
Expand Down
12 changes: 6 additions & 6 deletions ...ms-core/src/components/MediaLibrary/__tests__/__snapshots__/MediaLibraryCard.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`MediaLibraryCard should match snapshot for draft image 1`] = `
<DocumentFragment>
.emotion-0 {
width: 100px;
width: 100%;
height: 240px;
margin: 10px;
border: solid 2px #dfdfe3;
Expand Down Expand Up @@ -70,7 +70,7 @@ exports[`MediaLibraryCard should match snapshot for draft image 1`] = `
class="emotion-0 emotion-1"
height="240px"
tabindex="-1"
width="100px"
width="100%"
>
<div
class="emotion-2 emotion-3"
Expand Down Expand Up @@ -99,7 +99,7 @@ exports[`MediaLibraryCard should match snapshot for draft image 1`] = `
exports[`MediaLibraryCard should match snapshot for non draft image 1`] = `
<DocumentFragment>
.emotion-0 {
width: 100px;
width: 100%;
height: 240px;
margin: 10px;
border: solid 2px #dfdfe3;
Expand Down Expand Up @@ -158,7 +158,7 @@ exports[`MediaLibraryCard should match snapshot for non draft image 1`] = `
class="emotion-0 emotion-1"
height="240px"
tabindex="-1"
width="100px"
width="100%"
>
<div
class="emotion-2 emotion-3"
Expand All @@ -181,7 +181,7 @@ exports[`MediaLibraryCard should match snapshot for non draft image 1`] = `
exports[`MediaLibraryCard should match snapshot for non viewable image 1`] = `
<DocumentFragment>
.emotion-0 {
width: 100px;
width: 100%;
height: 240px;
margin: 10px;
border: solid 2px #dfdfe3;
Expand Down Expand Up @@ -242,7 +242,7 @@ exports[`MediaLibraryCard should match snapshot for non viewable image 1`] = `
class="emotion-0 emotion-1"
height="240px"
tabindex="-1"
width="100px"
width="100%"
>
<div
class="emotion-2 emotion-3"
Expand Down
13 changes: 10 additions & 3 deletions packages/decap-cms-core/src/components/UI/Modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@ const styleStrings = {
modalBody: `
${shadows.dropDeep};
background-color: #fff;
border-radius: ${lengths.borderRadius};
height: 80%;
border-radius: ${lengths.borderRadius} ${lengths.borderRadius} 0 0;
height: 90%;
@media (min-width: 500px) {
border-radius: ${lengths.borderRadius};
height: 80%;
}
text-align: center;
max-width: 2200px;
padding: 20px;
Expand All @@ -39,7 +43,10 @@ const styleStrings = {
bottom: 0;
display: flex;
justify-content: center;
align-items: center;
align-items: flex-end;
@media (min-width: 500px) {
align-items: center;
}
opacity: 0;
background-color: rgba(0, 0, 0, 0);
transition: background-color ${transitions.main}, opacity ${transitions.main};
Expand Down
4 changes: 4 additions & 0 deletions packages/decap-cms-ui-default/src/Icon/images/_index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import iconCircle from './circle.svg';
import iconClose from './close.svg';
import iconCode from './code.svg';
import iconCodeBlock from './code-block.svg';
import iconCopy from './copy.svg';
import iconDownload from './download.svg';
import iconDragHandle from './drag-handle.svg';
import iconEye from './eye.svg';
import iconFolder from './folder.svg';
Expand Down Expand Up @@ -63,6 +65,8 @@ const images = {
close: iconClose,
code: iconCode,
'code-block': iconCodeBlock,
copy: iconCopy,
download: iconDownload,
'drag-handle': iconDragHandle,
eye: iconEye,
folder: iconFolder,
Expand Down
1 change: 1 addition & 0 deletions packages/decap-cms-ui-default/src/Icon/images/copy.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/decap-cms-ui-default/src/Icon/images/download.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading