Media: Correctly import EditorMediaModalDetail #18705
Merged
Conversation
This file contains hidden or 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
ockham
added
[Feature] Media
|
Test live: https://calypso.live/?branch=fix/media-modal |
coderkevin
reviewed
Oct 10, 2017
| @@ -15,7 +15,7 @@ import { localize } from 'i18n-calypso'; | |||
| import MediaLibrary from 'my-sites/media-library'; | |||
| import SidebarNavigation from 'my-sites/sidebar-navigation'; | |||
| import Dialog from 'components/dialog'; | |||
| import { EditorMediaModalDetail } from 'post-editor/media-modal/detail'; | |||
| import EditorMediaModalDetail from 'post-editor/media-modal/detail'; | |||
There was a problem hiding this comment.
Can the export const be removed from this file as well?
There was a problem hiding this comment.
Hmm, good point. I was foolishly assuming it was being exported separately for testing, but that assumption doesn't seem to hold...
matticbot
removed
the
[Status] Needs Review
|
It fixed the problem 👍 |
This was referenced Oct 10, 2017
Closed
ockham
added a commit
that referenced
this pull request
Oct 11, 2017
Re-introduce the un-`connect()`ed named export of `EditorMediaModalDetail` again, and use that in `media/main`. Rationale: Quoting a comment I'm adding to `post-editor/media-modal/detail/index.jsx`: > The default export is only used by the post editor, which displays the image or > video editor depending on Redux state, which is set by the actions below. > In the Media library (i.e. `/media`) OTOH, we're explicitly passing `onEditImageItem` > and `onEditVideoItem` as props to the _named_ export (above), and use them to set > component state there to conditionally display the image/video editor. > (This is also the reason why we're `localize()`ing the named export.) > TODO: Fix this mess, rely on Redux state everywhere. Fixes #18727, which was caused by #18705 (tangential: #18707).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes a bug I introduced with #18590, as reported by @jorgefilipecosta in Slack:
Turns out that
EditorMediaModalDetailis properlylocalize()d, butmy-sites/media/mainwas importing the unlocalized version of the component.To test: Verify that the above error is gone, and that everything else works as before.