-
Notifications
You must be signed in to change notification settings - Fork 80
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
feat: add component preview to library authoring [FC-0062] #1242
Changes from 12 commits
2a03de9
a9023ba
70cd2ef
1c509b6
ab56de4
68de1a1
31c6ccb
ffa566f
30f60cf
990815c
395e6f6
0e9b907
a70323d
0ed8e02
a5bd650
d2edd55
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,3 +9,7 @@ | |
.mw-300px { | ||
max-width: 300px; | ||
} | ||
|
||
.right-0 { | ||
right: 0; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
/* eslint-disable react/require-default-props */ | ||
import React, { useEffect, useRef, useState } from 'react'; | ||
import { getConfig } from '@edx/frontend-platform'; | ||
|
||
interface LibraryBlockProps { | ||
onBlockNotification?: (event: { eventType: string; [key: string]: any }) => void; | ||
usageKey: string; | ||
} | ||
/** | ||
* React component that displays an XBlock in a sandboxed IFrame. | ||
* | ||
* The IFrame is resized responsively so that it fits the content height. | ||
* | ||
* We use an IFrame so that the XBlock code, including user-authored HTML, | ||
* cannot access things like the user's cookies, nor can it make GET/POST | ||
* requests as the user. However, it is allowed to call any XBlock handlers. | ||
*/ | ||
const LibraryBlock = ({ onBlockNotification, usageKey }: LibraryBlockProps) => { | ||
const iframeRef = useRef<HTMLIFrameElement>(null); | ||
const [iFrameHeight, setIFrameHeight] = useState(600); | ||
const lmsBaseUrl = getConfig().LMS_BASE_URL; | ||
|
||
/** | ||
* Handle any messages we receive from the XBlock Runtime code in the IFrame. | ||
* See wrap.ts to see the code that sends these messages. | ||
*/ | ||
/* istanbul ignore next */ | ||
const receivedWindowMessage = async (event) => { | ||
if (!iframeRef.current || event.source !== iframeRef.current.contentWindow) { | ||
return; // This is some other random message. | ||
} | ||
|
||
const { method, replyKey, ...args } = event.data; | ||
// const frame = iframeRef.current.contentWindow; | ||
// const sendReply = async (data) => { | ||
// frame?.postMessage({ ...data, replyKey }, '*'); | ||
// }; | ||
|
||
if (method === 'update_frame_height') { | ||
setIFrameHeight(args.height); | ||
} else if (method?.indexOf('xblock:') === 0) { | ||
// This is a notification from the XBlock's frontend via 'runtime.notify(event, args)' | ||
if (onBlockNotification) { | ||
onBlockNotification({ | ||
eventType: method.substr(7), // Remove the 'xblock:' prefix that we added in wrap.ts | ||
...args, | ||
}); | ||
} | ||
} | ||
}; | ||
|
||
/** | ||
* Load the XBlock data from the LMS and then inject it into our IFrame. | ||
rpenido marked this conversation as resolved.
Show resolved
Hide resolved
|
||
*/ | ||
useEffect(() => { | ||
// Prepare to receive messages from the IFrame. | ||
rpenido marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// Messages are the only way that the code in the IFrame can communicate | ||
// with the surrounding UI. | ||
window.addEventListener('message', receivedWindowMessage); | ||
|
||
return () => { | ||
window.removeEventListener('message', receivedWindowMessage); | ||
}; | ||
}, []); | ||
|
||
return ( | ||
<div style={{ | ||
height: `${iFrameHeight}px`, | ||
boxSizing: 'content-box', | ||
position: 'relative', | ||
overflow: 'hidden', | ||
minHeight: '200px', | ||
}} | ||
> | ||
<iframe | ||
ref={iframeRef} | ||
title="preview" // FIXME: i18n needed | ||
src={`${lmsBaseUrl}/xblocks/v2/${usageKey}/embed/student_view/`} | ||
data-testid="block-preview" | ||
style={{ | ||
width: '100%', | ||
height: '100%', | ||
minHeight: '200px', | ||
border: '0 none', | ||
}} | ||
// allowing 'autoplay' is required to allow the video XBlock to control the YouTube iframe it has. | ||
allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" | ||
|
||
/> | ||
</div> | ||
); | ||
}; | ||
|
||
export default LibraryBlock; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
/* eslint-disable-next-line import/prefer-default-export */ | ||
export { default as LibraryBlock } from './LibraryBlock'; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
.component-preview-modal { | ||
min-width: map-get($grid-breakpoints, "md"); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
import React from 'react'; | ||
import { useIntl } from '@edx/frontend-platform/i18n'; | ||
import { Button, StandardModal, useToggle } from '@openedx/paragon'; | ||
import { OpenInFull } from '@openedx/paragon/icons'; | ||
|
||
import { LibraryBlock } from '../LibraryBlock'; | ||
import messages from './messages'; | ||
|
||
// This is a simple overlay to prevent interaction with the preview | ||
const PreviewOverlay = () => ( | ||
<div className="position-absolute w-100 h-100 zindex-9" /> | ||
); | ||
|
||
interface ModalComponentPreviewProps { | ||
isOpen: boolean; | ||
close: () => void; | ||
usageKey: string; | ||
} | ||
|
||
const ModalComponentPreview = ({ isOpen, close, usageKey }: ModalComponentPreviewProps) => { | ||
const intl = useIntl(); | ||
|
||
return ( | ||
<StandardModal | ||
title={intl.formatMessage(messages.previewModalTitle)} | ||
isOpen={isOpen} | ||
onClose={close} | ||
footerNode={( | ||
<Button variant="tertiary" onClick={close}> | ||
{intl.formatMessage(messages.previewModalCloseButtonTitle)} | ||
</Button> | ||
)} | ||
className="component-preview-modal" | ||
> | ||
<LibraryBlock usageKey={usageKey} /> | ||
</StandardModal> | ||
); | ||
}; | ||
|
||
interface ComponentPreviewProps { | ||
usageKey: string; | ||
} | ||
|
||
const ComponentPreview = ({ usageKey }: ComponentPreviewProps) => { | ||
const intl = useIntl(); | ||
|
||
const [isModalOpen, openModal, closeModal] = useToggle(); | ||
|
||
return ( | ||
<> | ||
<div className="position-relative m-2"> | ||
<PreviewOverlay /> | ||
<Button | ||
size="sm" | ||
variant="light" | ||
iconBefore={OpenInFull} | ||
onClick={openModal} | ||
className="position-absolute right-0 zindex-10 m-1" | ||
> | ||
{intl.formatMessage(messages.previewExpandButtonTitle)} | ||
</Button> | ||
<LibraryBlock usageKey={usageKey} /> | ||
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. In the future, it would be awesome to use something like react-reverse-portal to "re-parent" the 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. Sure! I will mention that! |
||
</div> | ||
<ModalComponentPreview isOpen={isModalOpen} close={closeModal} usageKey={usageKey} /> | ||
</> | ||
); | ||
}; | ||
|
||
export default ComponentPreview; |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -53,11 +53,10 @@ export const libraryAuthoringQueryKeys = { | |
'libraryBlockTypes', | ||
], | ||
xblockFields: (contentLibraryId: string, usageKey: string) => [ | ||
...libraryAuthoringQueryKeys.all, | ||
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. @rpenido Why is this being deleted? If the query 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. Sorry. Not intended! This was fixed after I merged the last changes. |
||
...libraryAuthoringQueryKeys.contentLibrary(contentLibraryId), | ||
'content', | ||
'xblockFields', | ||
usageKey, | ||
'xblockFields', | ||
], | ||
}; | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
@import "library-authoring/component-info/ComponentPreview"; | ||
@import "library-authoring/components/ComponentCard"; | ||
@import "library-authoring/library-info/LibraryPublishStatus"; | ||
@import "library-authoring/LibraryAuthoringPage"; |
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.
I think we can delete this commented code?
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.
Fixed here: 0ed8e02