Skip to content
Snippets Groups Projects
Commit 5068dd86 authored by Christos's avatar Christos
Browse files

Merge branch 'fixes' into 'master'

Fixes

See merge request !434
parents 5dd3b66d 240b2bf1
No related branches found
No related tags found
1 merge request!434Fixes
import styled, { css } from "styled-components";
import styled, { css } from 'styled-components';
export default css`
background: #fff;
......
......@@ -73,7 +73,7 @@ const Editors = () => {
case 'oen':
return <OEN />;
default:
return <Editoria />;
return <HHMI />;
}
};
......
......@@ -63,6 +63,7 @@ export default {
SchemaService: DefaultSchema,
RulesService: [emDash, ellipsis],
ImageService: { showAlt: true },
PmPlugins: [columnResizing(), tableEditing(), invisibles([hardBreak()])],
services: [
......
/* eslint-disable react/prop-types */
import React, { useContext, useLayoutEffect, useRef, useState } from 'react';
import styled from 'styled-components';
import { WaxContext } from 'wax-prosemirror-core';
......@@ -65,10 +66,14 @@ export default ({ setPosition, position }) => {
const imageConfig = app.config.get('config.ImageService');
const showAlt = imageConfig && imageConfig.showAlt;
const autoFocus =
activeView.state.selection &&
activeView.state.selection.node &&
activeView.state.selection.node.attrs.alt === '';
return !readOnly && showAlt ? (
<StyledInputAlt
autoFocus="autoFocus"
autoFocus={autoFocus}
key="alt"
onChange={altTextOnChange}
placeholder="Alt Text"
......
......@@ -85,7 +85,7 @@ const SpecialCharacter = styled.div`
min-width: 25px;
height: 25px;
display: inline-grid;
background: ${th('colorPrimary')}
background: white;
cursor: pointer;
border: 1px solid ${th('colorPrimary')};
border-radius: 50%;
......@@ -102,8 +102,7 @@ const SpecialCharacter = styled.div`
color: #fff;
}
}
${override('Wax.SpecialCharacterButton')}
${override('Wax.SpecialCharacterButton')}
`;
const SpecialCharactersComponent = ({ close }) => {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment