Skip to content

fix(image-cloze-association): fix PossibleResponse dragging style PD… #2917

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
PatriciaRomaniuc wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(image-cloze-association): fix PossibleResponse dragging style PD… #2917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions packages/image-cloze-association/src/possible-response.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ const StyledSpan = styled(StaticHTMLSpan)(() => ({
},
}));

const PossibleResponse = ({ canDrag, containerStyle, data, onDragBegin, answerChoiceTransparency }) => {
const PossibleResponse = ({ canDrag, containerStyle, data, onDragBegin, answerChoiceTransparency, isOverlay }) => {
const rootRef = useRef(null);
const longPressTimer = useRef(null);

const { setNodeRef, attributes, listeners } = useDraggable({
const { setNodeRef, attributes, listeners, isDragging } = useDraggable({
id: `possible-response-${data.id}`,
data: {
id: data.id,
Expand Down Expand Up @@ -110,9 +110,9 @@ const PossibleResponse = ({ canDrag, containerStyle, data, onDragBegin, answerCh
const containsImage = imgRegex.test(data.value);

const containerClassNames = classNames({
answerChoiceTransparency,
answerChoiceTransparency: answerChoiceTransparency && !isDragging,
[correctnessClass]: !!correctnessClass,
textAnswerChoiceStyle: !containsImage,
textAnswerChoiceStyle: !containsImage && !isOverlay,
});

const promptClassNames = classNames({ hiddenSpan: data.hidden });
Expand Down Expand Up @@ -140,11 +140,13 @@ PossibleResponse.propTypes = {
data: PropTypes.object.isRequired,
onDragBegin: PropTypes.func.isRequired,
answerChoiceTransparency: PropTypes.bool,
isOverlay: PropTypes.bool,
};

PossibleResponse.defaultProps = {
containerStyle: {},
answerChoiceTransparency: false,
isOverlay: false,
};

export default PossibleResponse;
27 changes: 16 additions & 11 deletions packages/image-cloze-association/src/root.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,18 +121,23 @@ export class ImageClozeAssociationComponent extends React.Component {

if (!draggingElement.id) return null;

if (draggingElement.id) {
return (
<PossibleResponse
key={draggingElement.id}
data={draggingElement}
answerChoiceTransparency={model.answerChoiceTransparency}
containerStyle={{ margin: '4px' }}
/>
);
}
// check if the response contains an image
const imgRegex = /<img[^>]+src="([^">]+)"/;
const containsImage = imgRegex.test(draggingElement.value);

return null;
return (
<PossibleResponse
key={draggingElement.id}
canDrag={false}
data={draggingElement}
onDragBegin={() => {}}
isOverlay
containerStyle={{
...(model.answerChoiceTransparency ? { opacity: '0.8' } : {}),
...(!containsImage ? { padding: '0 10px', margin: '4px 6px !important' } : {}),
}}
/>
);
};

filterPossibleAnswers = (possibleResponses, answer) =>
Expand Down
Loading