From 88171efcc501b42b5c3de1e7540fcd97495be3e8 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Wed, 16 Nov 2022 13:02:00 +0200
Subject: [PATCH] image fixes
---
.../src/components/images/ImageUpload.js | 5 ++++-
.../src/ImageService/fileUpload.js | 9 ++++++++-
.../DropDownComponent.js | 16 ++++++++--------
3 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/wax-prosemirror-components/src/components/images/ImageUpload.js b/wax-prosemirror-components/src/components/images/ImageUpload.js
index 0cde24a0d..ac9c5be5e 100644
--- a/wax-prosemirror-components/src/components/images/ImageUpload.js
+++ b/wax-prosemirror-components/src/components/images/ImageUpload.js
@@ -85,7 +85,10 @@ const ImageUpload = ({ item, fileUpload, view }) => {
<input
id="file-upload"
- onChange={e => fileUpload(e.target.files[0])}
+ onChange={e => {
+ fileUpload(e.target.files[0]);
+ if (inputRef.current) inputRef.current.value = '';
+ }}
ref={inputRef}
type="file"
/>
diff --git a/wax-prosemirror-services/src/ImageService/fileUpload.js b/wax-prosemirror-services/src/ImageService/fileUpload.js
index de699b77a..584c9c82b 100644
--- a/wax-prosemirror-services/src/ImageService/fileUpload.js
+++ b/wax-prosemirror-services/src/ImageService/fileUpload.js
@@ -22,7 +22,14 @@ export default (view, fileUpload, placeholderPlugin) => file => {
view.dispatch(tr);
fileUpload(file).then(
- (url, extraData = {}) => {
+ fileData => {
+ let url = fileData;
+ let extraData = {};
+ if (typeof fileData === 'object') {
+ url = fileData.url;
+ extraData = fileData.extraData;
+ }
+
const pos = findPlaceholder(view.state, id, placeholderPlugin);
// If the content around the placeholder has been deleted, drop
// the image
diff --git a/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js b/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js
index c017952ab..db18e8ebf 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js
@@ -53,42 +53,42 @@ const DropDownComponent = ({ view, tools }) => {
const dropDownOptions = [
{
- label: '1. Multiple Choice',
+ label: 'Multiple Choice',
value: '0',
item: tools[0],
},
{
- label: '2. Multiple Choice (single correct)',
+ label: 'Multiple Choice (single correct)',
value: '1',
item: tools[1],
},
{
- label: '3. True/False',
+ label: 'True/False',
value: '2',
item: tools[2],
},
{
- label: '4. True/False (single correct)',
+ label: 'True/False (single correct)',
value: '3',
item: tools[3],
},
{
- label: '5. Matching',
+ label: 'Matching',
value: '4',
item: tools[4],
},
{
- label: '6. Essay',
+ label: 'Essay',
value: '5',
item: tools[5],
},
{
- label: '7. Multiple DropDown',
+ label: 'Multiple DropDown',
value: '6',
item: tools[6],
},
{
- label: '8. Fill The Gap',
+ label: 'Fill The Gap',
value: '7',
item: tools[7],
},
--
GitLab