Skip to content

Improve File Block text handling and flexibility #38198

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

Closed
aurooba wants to merge 5 commits into from
Closed

Improve File Block text handling and flexibility #38198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96768d7
switch richtext to plain text and add anchor
aurooba Jan 25, 2022
5fe7340
add RichText back because it's still needed
aurooba Jan 25, 2022
1e9ba7c
update style for textarea and download button
aurooba Jan 25, 2022
8688a16
replace RichText filename with anchor and plaintext value
aurooba Jan 25, 2022
2b7a0a1
Merge branch 'trunk' of https://github.com/aurooba/gutenberg into fix…
aurooba Jan 28, 2022
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
7 changes: 3 additions & 4 deletions packages/block-library/src/file/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
MediaPlaceholder,
MediaReplaceFlow,
RichText,
PlainText,
useBlockProps,
store as blockEditorStore,
} from '@wordpress/block-editor';
Expand Down Expand Up @@ -279,16 +280,14 @@ function FileEdit( {
</ResizableBox>
) }
<div className={ 'wp-block-file__content-wrapper' }>
<RichText
tagName="a"
<PlainText
value={ fileName }
placeholder={ __( 'Write file name…' ) }
withoutInteractiveFormatting
onChange={ ( text ) =>
setAttributes( { fileName: text } )
}
href={ textLinkHref }
/>

{ showDownloadButton && (
<div
className={
Expand Down
10 changes: 10 additions & 0 deletions packages/block-library/src/file/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.wp-block-file {
/* prettier-ignore */
.wp-block[data-align="left"] > &,
.wp-block[data-align="right"] > & {
// Stop file block from collapsing when floated.
Expand Down Expand Up @@ -30,7 +31,16 @@
}

.wp-block-file__content-wrapper {
display: flex;
align-items: center;
flex-grow: 1;
textarea {
width: min-content;
&:focus {
border: none;
box-shadow: none;
}
}
}

a {
Expand Down
6 changes: 3 additions & 3 deletions packages/block-library/src/file/save.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default function save( { attributes } ) {
/>
</>
) }
{ ! RichText.isEmpty( fileName ) && (
{
<a
id={ fileId }
href={ textLinkHref }
Expand All @@ -51,9 +51,9 @@ export default function save( { attributes } ) {
textLinkTarget ? 'noreferrer noopener' : undefined
}
>
<RichText.Content value={ fileName } />
{ fileName }
</a>
) }
}
{ showDownloadButton && (
<a
href={ href }
Expand Down