From c4d03fd32b175bc2627860d6a3c49d6947bf1f15 Mon Sep 17 00:00:00 2001
From: Albin Henriksson <albhe428@student.liu.se>
Date: Thu, 22 Apr 2021 12:39:35 +0200
Subject: [PATCH] Fix incorrect merge
---
.../components/SlideSettings.tsx | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/client/src/pages/presentationEditor/components/SlideSettings.tsx b/client/src/pages/presentationEditor/components/SlideSettings.tsx
index 15dec420..a588be13 100644
--- a/client/src/pages/presentationEditor/components/SlideSettings.tsx
+++ b/client/src/pages/presentationEditor/components/SlideSettings.tsx
@@ -6,6 +6,7 @@ import {
DialogContent,
DialogContentText,
DialogTitle,
+ Divider,
FormControl,
InputLabel,
List,
@@ -26,7 +27,8 @@ import { useParams } from 'react-router-dom'
import { getEditorCompetition } from '../../../actions/editor'
import { useAppDispatch, useAppSelector } from '../../../hooks'
import { QuestionAlternative, TextComponent } from '../../../interfaces/ApiModels'
-import { HiddenInput } from './styled'
+import { HiddenInput, TextCard } from './styled'
+import TextComponentEdit from './TextComponentEdit'
const useStyles = makeStyles((theme: Theme) =>
createStyles({
@@ -389,13 +391,13 @@ const SlideSettings: React.FC = () => {
</ListItem>
{texts &&
texts.map((text) => (
- <div key={text.id}>
- <ListItem divider>
- <TextField className={classes.textInput} label={text.data.text} variant="outlined" />
- <CloseIcon className={classes.clickableIcon} />
- </ListItem>
- </div>
+ <TextCard elevation={4} key={text.id}>
+ <TextComponentEdit component={text} />
+
+ <Divider />
+ </TextCard>
))}
+
<ListItem className={classes.center} button onClick={handleAddText}>
<Typography className={classes.addButtons} variant="button">
Lägg till text
--
GitLab