-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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.
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
feature: add consistant illustrator to audio block #66838
Open
up1512001
wants to merge
4
commits into
WordPress:trunk
Choose a base branch
from
up1512001:gh/66828-audio
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -13,10 +13,10 @@ import { | |||||
SelectControl, | ||||||
Spinner, | ||||||
ToggleControl, | ||||||
Placeholder, | ||||||
} from '@wordpress/components'; | ||||||
import { | ||||||
BlockControls, | ||||||
BlockIcon, | ||||||
InspectorControls, | ||||||
MediaPlaceholder, | ||||||
MediaReplaceFlow, | ||||||
|
@@ -27,6 +27,7 @@ import { useDispatch } from '@wordpress/data'; | |||||
import { audio as icon } from '@wordpress/icons'; | ||||||
import { store as noticesStore } from '@wordpress/notices'; | ||||||
import { useState } from '@wordpress/element'; | ||||||
import { useResizeObserver } from '@wordpress/compose'; | ||||||
|
||||||
/** | ||||||
* Internal dependencies | ||||||
|
@@ -44,6 +45,7 @@ function AudioEdit( { | |||||
onReplace, | ||||||
isSelected: isSingleSelected, | ||||||
insertBlocksAfter, | ||||||
blockEditingMode, | ||||||
} ) { | ||||||
const { id, autoplay, loop, preload, src } = attributes; | ||||||
const [ temporaryURL, setTemporaryURL ] = useState( attributes.blob ); | ||||||
|
@@ -127,19 +129,60 @@ function AudioEdit( { | |||||
className: classes, | ||||||
} ); | ||||||
|
||||||
const [ placeholderResizeListener, { width: placeholderWidth } ] = | ||||||
useResizeObserver(); | ||||||
|
||||||
const isSmallContainer = placeholderWidth && placeholderWidth < 160; | ||||||
|
||||||
const isContentOnlyMode = blockEditingMode === 'contentOnly'; | ||||||
|
||||||
const autioReplaceFlow = isSingleSelected && ( | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Additionally, the code here should also be replaced with this component. |
||||||
<BlockControls group={ isContentOnlyMode ? 'inline' : 'other' }> | ||||||
<MediaReplaceFlow | ||||||
name={ ! src ? __( 'Add audio' ) : __( 'Replace' ) } | ||||||
mediaId={ id } | ||||||
mediaURL={ src } | ||||||
allowedTypes={ ALLOWED_MEDIA_TYPES } | ||||||
accept="audio/*" | ||||||
onSelect={ onSelectAudio } | ||||||
onSelectURL={ onSelectURL } | ||||||
onError={ onUploadError } | ||||||
onReset={ () => onSelectAudio( undefined ) } | ||||||
/> | ||||||
</BlockControls> | ||||||
); | ||||||
|
||||||
if ( ! src && ! temporaryURL ) { | ||||||
return ( | ||||||
<div { ...blockProps }> | ||||||
<MediaPlaceholder | ||||||
icon={ <BlockIcon icon={ icon } /> } | ||||||
onSelect={ onSelectAudio } | ||||||
onSelectURL={ onSelectURL } | ||||||
accept="audio/*" | ||||||
allowedTypes={ ALLOWED_MEDIA_TYPES } | ||||||
value={ attributes } | ||||||
onError={ onUploadError } | ||||||
/> | ||||||
</div> | ||||||
<> | ||||||
{ autioReplaceFlow } | ||||||
<div { ...blockProps }> | ||||||
<MediaPlaceholder | ||||||
onSelect={ onSelectAudio } | ||||||
onSelectURL={ onSelectURL } | ||||||
accept="audio/*" | ||||||
allowedTypes={ ALLOWED_MEDIA_TYPES } | ||||||
value={ attributes } | ||||||
onError={ onUploadError } | ||||||
placeholder={ ( content ) => ( | ||||||
<Placeholder | ||||||
className="block-editor-media-placeholder" | ||||||
icon={ ! isSmallContainer && icon } | ||||||
withIllustration={ | ||||||
! isSingleSelected || isSmallContainer | ||||||
} | ||||||
label={ ! isSmallContainer && __( 'Audio' ) } | ||||||
instructions={ __( | ||||||
'Upload or drag an audio file here, or pick one from your library.' | ||||||
) } | ||||||
> | ||||||
{ ! isSmallContainer && content } | ||||||
{ placeholderResizeListener } | ||||||
</Placeholder> | ||||||
) } | ||||||
/> | ||||||
</div> | ||||||
</> | ||||||
); | ||||||
} | ||||||
|
||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -16,4 +16,8 @@ | |||||
margin-top: -9px; | ||||||
margin-left: -9px; | ||||||
} | ||||||
|
||||||
.components-placeholder.has-illustration { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Selectors with the |
||||||
min-height: 60px; | ||||||
} | ||||||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is this? It should not be related to this PR.