diff --git a/editors/editoria/src/layout/EditorElements.js b/editors/editoria/src/layout/EditorElements.js
index 8c0fdee23853c0d1eea6504a05aefb48b8805375..deec1057692687c96a3c84d2567ae6642b424c29 100644
--- a/editors/editoria/src/layout/EditorElements.js
+++ b/editors/editoria/src/layout/EditorElements.js
@@ -29,7 +29,8 @@ export default css`
h3 span::selection,
h4 span::selection,
code span::selection,
- figcaption span::selection {
+ custom-tag-block::selection,
+ custom-tag-inline::selection {
background-color: transparent;
}
@@ -101,9 +102,9 @@ export default css`
figure {
display: table;
- flex-direction: column;
margin-left: auto;
margin-right: auto;
+ word-break: break-word;
img {
cursor: default;
@@ -124,8 +125,8 @@ export default css`
&:focus {
outline: none;
}
- &: before {
- content: 'Caption : ';
+ &:before {
+ content: 'Caption: ';
font-weight: bold;
}
}
@@ -136,6 +137,10 @@ export default css`
line-height: 0;
}
+ strong {
+ font-weight: bold;
+ }
+
/* Tables */
table {
@@ -272,7 +277,7 @@ export default css`
[data-track]::before {
content: '';
position: absolute;
- border-left: 2px solid blue;
+ border-left: 2px solid royalblue;
left: -10px;
height: 100%;
}
@@ -445,16 +450,24 @@ export default css`
p[data-type='block']:before {
color: #006f19;
- content: '|';
+ content: '⌜';
display: inline;
font-weight: 600;
+ font-size: 22px;
+ position: relative;
+ top: 2px;
+ left: 6px;
}
p[data-type='block']:after {
color: #006f19;
- content: '|';
+ content: '⌟';
display: inline;
font-weight: 600;
+ font-size: 22px;
+ position: relative;
+ top: 5px;
+ right: 6px;
}
.transform-icon {
diff --git a/editors/editoria/src/layout/EditoriaLayout.js b/editors/editoria/src/layout/EditoriaLayout.js
index be563e198c5954d9c8ea8def0b74b76751c4a897..795cbcb426b35cfe777e63f557d2a4b97997c06a 100644
--- a/editors/editoria/src/layout/EditoriaLayout.js
+++ b/editors/editoria/src/layout/EditoriaLayout.js
@@ -32,7 +32,7 @@ const Wrapper = styled.div`
background: ${th('colorBackground')};
font-family: ${th('fontInterface')};
font-size: ${th('fontSizeBase')};
-
+ line-height: ${grid(4)};
display: flex;
flex-direction: column;
@@ -41,18 +41,24 @@ const Wrapper = styled.div`
overflow: hidden;
${divider}
+
+ * {
+ box-sizing: border-box;
+ }
`;
const Main = styled.div`
display: flex;
flex-grow: 1;
+ height: calc(100% - 40px);
`;
const TopMenu = styled.div`
display: flex;
min-height: 40px;
user-select: none;
- background: ${th('colorBackgroundToolBar')}
+ background: ${th('colorBackgroundToolBar')};
+ border-top: ${th('borderWidth')} ${th('borderStyle')} ${th('colorBorder')};
border-bottom: ${th('borderWidth')} ${th('borderStyle')} ${th('colorBorder')};
> div:not(:last-child) {
@@ -60,8 +66,7 @@ const TopMenu = styled.div`
${th('colorFurniture')};
}
-
- > div:nth-last-of-type(-n+2) {
+ > div:nth-last-of-type(-n + 2) {
margin-left: auto;
}
@@ -70,7 +75,7 @@ const TopMenu = styled.div`
margin-right: ${grid(5)};
}
- > div[data-name="Tables"]{
+ > div[data-name='Tables'] {
border-right: none;
}
`;
@@ -79,7 +84,7 @@ const SideMenu = styled.div`
background: ${th('colorBackgroundToolBar')}
border-right: ${th('borderWidth')} ${th('borderStyle')} ${th('colorBorder')};
min-width: 250px;
- height: 81%;
+ height: calc(100% - 16px);
`;
const EditorArea = styled.div`
@@ -103,7 +108,7 @@ const EditorContainer = styled.div`
.ProseMirror {
box-shadow: 0 0 8px #ecedf1;
- min-height: 90%;
+ min-height: 98%;
padding: ${grid(10)};
}
`;
diff --git a/wax-prosemirror-components/package.json b/wax-prosemirror-components/package.json
index 04badee26d3ccf5124f19150f1baa32b42e0c973..b673d810655bda6f386db838c0a3ddf1cc22d530 100644
--- a/wax-prosemirror-components/package.json
+++ b/wax-prosemirror-components/package.json
@@ -4,7 +4,7 @@
"version": "0.0.39",
"description": "Wax prosemirror UI components",
"license": "MIT",
- "main": "dist/index.js",
+ "main": "index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-components/src/components/EditorInfo/EditorShortCutsTool.js b/wax-prosemirror-components/src/components/EditorInfo/EditorShortCutsTool.js
index 37703d25f5fdbfcdedeaea0b40ace7d493b4032d..74756082a411b30ae45321a2ac78946113dac7c1 100644
--- a/wax-prosemirror-components/src/components/EditorInfo/EditorShortCutsTool.js
+++ b/wax-prosemirror-components/src/components/EditorInfo/EditorShortCutsTool.js
@@ -1,8 +1,7 @@
-import React, { useMemo, useState, useRef, useContext, useEffect } from 'react';
+import React, { useMemo, useState, useRef } from 'react';
import styled from 'styled-components';
import { grid, th } from '@pubsweet/ui-toolkit';
import { v4 as uuidv4 } from 'uuid';
-import { WaxContext } from 'wax-prosemirror-core';
import MenuButton from '../../ui/buttons/MenuButton';
import useOnClickOutside from '../../helpers/useOnClickOutside';
@@ -78,10 +77,6 @@ const EditorShortCutsTool = ({ view: { state }, item }) => {
const [isOpen, setIsOpen] = useState(false);
const ref = useRef();
- const {
- activeView,
- view: { main },
- } = useContext(WaxContext);
useOnClickOutside(ref, () => setIsOpen(false));
@@ -117,6 +112,9 @@ const EditorShortCutsTool = ({ view: { state }, item }) => {
<li>
<span>Ctrl + f </span> : Search and replace
</li>
+ <li>
+ <span>Shift + Enter </span> : Exit code block
+ </li>
</ShortCutsList>
</ShortCutsContainer>
);
diff --git a/wax-prosemirror-components/src/components/HeadingsDropDown.js b/wax-prosemirror-components/src/components/HeadingsDropDown.js
index 18d1a5712be65f19f96ec19f5b60fbc4f3df1f6e..79bdab12bc81a8d7d33f4154f42627f20e397d91 100644
--- a/wax-prosemirror-components/src/components/HeadingsDropDown.js
+++ b/wax-prosemirror-components/src/components/HeadingsDropDown.js
@@ -20,12 +20,12 @@ const dropDownOptions = [
const HeadingsDropDown = ({ dispatch, state, item }) => (
<DropdownStyled
- options={dropDownOptions}
onChange={option => {
Commands.setBlockType(state.config.schema.nodes.heading, {
level: option.value,
})(state, dispatch);
}}
+ options={dropDownOptions}
placeholder="Choose heading"
select={item.select && item.select(state)}
/>
diff --git a/wax-prosemirror-components/src/components/TableDropDown.js b/wax-prosemirror-components/src/components/TableDropDown.js
index defad65363e502cf8096506d640d6ce31e78ca18..5fa779bc529d363d5519b8c2606a7173cdf48559 100644
--- a/wax-prosemirror-components/src/components/TableDropDown.js
+++ b/wax-prosemirror-components/src/components/TableDropDown.js
@@ -1,5 +1,6 @@
/* eslint react/prop-types: 0 */
-import React, { useMemo, useContext } from 'react';
+import React, { useMemo, useContext, useState } from 'react';
+import { TextSelection } from 'prosemirror-state';
import styled from 'styled-components';
import * as tablesFn from 'prosemirror-tables';
import { WaxContext } from 'wax-prosemirror-core';
@@ -51,22 +52,32 @@ const dropDownOptions = [
{ label: 'Toggle header cells', value: 'toggleHeaderCell' },
];
-const TableDropDown = ({ view: { dispatch, state }, item }) => {
+const TableDropDown = ({ item }) => {
const { activeView } = useContext(WaxContext);
+ const [selectedOption, setSelectedOption] = useState('');
const isDisabled = item.select(activeView.state);
const TableDropDownComponent = useMemo(
() => (
<DropdownStyled
- options={dropDownOptions}
onChange={option => {
- item.run(state, dispatch, tablesFn[option.value]);
+ item.run(
+ activeView.state,
+ activeView.dispatch,
+ tablesFn[option.value],
+ );
+ setSelectedOption(option.value);
+
+ setTimeout(() => {
+ activeView.focus();
+ });
}}
+ options={dropDownOptions}
placeholder="Table Options"
select={isDisabled}
/>
),
- [isDisabled],
+ [isDisabled, selectedOption],
);
return TableDropDownComponent;
diff --git a/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js b/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js
index 6c499c69be0534b6e7d79a46f65499cdabf67d84..9baaf43bab7b0a8774ac0f6ff88eaf5ffa4f9786 100644
--- a/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js
+++ b/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js
@@ -43,19 +43,38 @@ const InputLabel = styled.div`
padding: ${grid(2)} ${grid(0)} ${grid(2)} ${grid(0)};
`;
-const SearchInputWrapper = styled.div`
- input {
- padding: ${grid(1)} ${grid(10)} ${grid(1)} ${grid(1)};
- width: 89%;
+const InputWrapper = styled.div`
+ display: flex;
+
+ #search-input {
+ padding: ${grid(1)} ${grid(11)} ${grid(1)} ${grid(1)};
+ }
+`;
+
+const FindReplaceInput = styled.input`
+ border: none;
+ box-shadow: inset 0 0 0 1px rgba(27, 43, 75, 0.28);
+ display: flex;
+ flex-grow: 1;
+ font-size: 15px;
+ font-weight: 400;
+ padding: ${grid(1)};
+
+ ::placeholder {
+ color: #d8dae0;
+ }
+
+ &:focus {
+ outline: none;
}
`;
const CounterInput = styled.span`
font-size: 12px;
position: absolute;
- right: 14px;
+ right: 19px;
-webkit-text-fill-color: rgba(27, 43, 75, 0.28);
- top: 72px;
+ top: 69px;
z-index: 1;
`;
@@ -69,23 +88,6 @@ const CloseWrapper = styled.div`
margin-left: auto;
`;
-const FindReplaceInput = styled.input`
- border: none;
- box-shadow: inset 0 0 0 1px rgba(27, 43, 75, 0.28);
- font-size: 15px;
- font-weight: 400;
- padding: ${grid(1)};
- width: 98%;
-
- ::placeholder {
- color: #d8dae0;
- }
-
- &:focus {
- outline: none;
- }
-`;
-
const CheckBoxWrapper = styled.div`
margin-top: 20px;
`;
@@ -93,7 +95,7 @@ const CheckBoxWrapper = styled.div`
const ControlContainer = styled.div`
display: flex;
flex-direction: row;
- margin-top: 70px;
+ margin-top: 62px;
`;
const ButtonReplace = styled.button`
@@ -120,6 +122,7 @@ const PreviousNextContainer = styled.div`
margin: 3px 0 0 auto;
svg {
+ box-sizing: unset !important;
padding: ${grid(2)};
&:hover {
@@ -293,25 +296,31 @@ const ExpandedFindAndReplaceComponent = ({
<StyledIcon name="close" />
</CloseWrapper>
</TitleContainer>
+
<InputLabel>Find</InputLabel>
- <SearchInputWrapper>
+ <InputWrapper>
<FindReplaceInput
onChange={onChangeSearchInput}
+ id="search-input"
placeholder="Something is this doc"
ref={searchRef}
type="text"
value={searchValue}
/>
<CounterInput> {counterText} </CounterInput>
- </SearchInputWrapper>
+ </InputWrapper>
+
<InputLabel>Replace with</InputLabel>
- <FindReplaceInput
- onChange={onChangeReplaceInput}
- placeholder="Replace text"
- ref={replaceRef}
- type="text"
- />
+ <InputWrapper>
+ <FindReplaceInput
+ onChange={onChangeReplaceInput}
+ placeholder="Replace text"
+ ref={replaceRef}
+ type="text"
+ />
+ </InputWrapper>
+
<CheckBoxWrapper>
<CheckBox
checked={matchCaseOption}
@@ -324,20 +333,15 @@ const ExpandedFindAndReplaceComponent = ({
<ButtonReplace onClick={replace}>Replace</ButtonReplace>
<ButtonReplaceAll onClick={replaceAll}>Replace All</ButtonReplaceAll>
<PreviousNextContainer>
- <PreviousNextButton
+ <StyledIcon
+ name="navigatePrevious"
onClick={() => findPreviousMatch(searchValue, matchCaseOption)}
- role="button"
- tabIndex="0"
- >
- <StyledIcon name="navigatePrevious" />
- </PreviousNextButton>
- <PreviousNextButton
+ />
+
+ <StyledIcon
+ name="navigateNext"
onClick={() => findNextMatch(searchValue, matchCaseOption)}
- role="button"
- tabIndex="0"
- >
- <StyledIcon name="navigateNext" />
- </PreviousNextButton>
+ />
</PreviousNextContainer>
</ControlContainer>
</Wrapper>
diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceTool.js b/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceTool.js
index 395bcb2c1f256ba83f2d87af9ba3c545078de641..a478e389c2088980381badb089bc4f981297b803 100644
--- a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceTool.js
+++ b/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceTool.js
@@ -36,7 +36,7 @@ const FindAndReplaceTool = ({ view = {}, item }) => {
const dropElement = useRef();
const [isOpen, setIsOpen] = useState(false);
- let styles = { right: '-205px' };
+ let styles = { right: '-190px' };
const [style, setStyle] = useState(styles);
let isDisabled = false;
@@ -65,7 +65,7 @@ const FindAndReplaceTool = ({ view = {}, item }) => {
if (!dropElement.current) return;
const { right } = dropElement.current.getBoundingClientRect();
if (right > window.window.innerWidth) {
- const newRight = -205 + (right - window.window.innerWidth) + 15;
+ const newRight = -175 + (right - window.window.innerWidth);
styles = { right: `${newRight}px` };
setStyle(styles);
}
diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js b/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js
index b36e2aa366c717a2e7114cff608009c96e5d8d73..462ddf56954212b5a612dce4f3c9c8a2f5eca22f 100644
--- a/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js
+++ b/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js
@@ -27,10 +27,11 @@ const Wrapper = styled.div`
const SingleRow = styled.div`
display: flex;
flex-direction: row;
+ width: 100%;
`;
const SearchInputWrapper = styled.div`
- width: 75%;
+ width: 266px;
`;
const SearchInput = styled.input`
@@ -40,7 +41,7 @@ const SearchInput = styled.input`
font-size: 15px;
font-weight: 400;
padding: ${grid(1)} ${grid(10)} ${grid(1)} ${grid(1)};
- width: 78%;
+ width: 100%;
::placeholder {
color: #d8dae0;
@@ -51,10 +52,16 @@ const SearchInput = styled.input`
}
`;
+const ControlsWrapper = styled.div`
+ display: flex;
+ margin-left: auto;
+ width: 126px;
+`;
+
const CounterInput = styled.span`
font-size: 12px;
position: absolute;
- right: 155px;
+ right: 141px;
-webkit-text-fill-color: rgba(27, 43, 75, 0.28);
top: 13px;
z-index: 1;
@@ -230,34 +237,36 @@ const FindComponent = ({
/>
<CounterInput> {counterText} </CounterInput>
</SearchInputWrapper>
- <IconWrapper onClick={matchCase} role="button" tabIndex="0">
- <Svg active={matchCaseSearch} fill="none" viewBox="0 0 24 24">
- <title> Match Case </title>
- <path d="M2.5,4v3h5v12h3V7h5V4H2.5z M21.5,9h-9v3h3v7h3v-7h3V9z" />
- </Svg>
- </IconWrapper>
- <IconWrapper
- onClick={() => findPreviousMatch(searchValue, matchCaseSearch)}
- role="button"
- tabIndex="0"
- >
- <StyledIcon name="navigatePrevious" />
- </IconWrapper>
- <IconWrapper
- onClick={() => findNextMatch(searchValue, matchCaseSearch)}
- role="button"
- tabIndex="0"
- >
- <StyledIcon name="navigateNext" />
- </IconWrapper>
-
- <ExpandedWrapper onClick={showExpanded}>
- <StyledIcon name="more" />
- </ExpandedWrapper>
-
- <CloseWrapper onClick={closeFind}>
- <StyledIcon name="close" />
- </CloseWrapper>
+ <ControlsWrapper>
+ <IconWrapper onClick={matchCase} role="button" tabIndex="0">
+ <Svg active={matchCaseSearch} fill="none" viewBox="0 0 24 24">
+ <title> Match Case </title>
+ <path d="M2.5,4v3h5v12h3V7h5V4H2.5z M21.5,9h-9v3h3v7h3v-7h3V9z" />
+ </Svg>
+ </IconWrapper>
+ <IconWrapper
+ onClick={() => findPreviousMatch(searchValue, matchCaseSearch)}
+ role="button"
+ tabIndex="0"
+ >
+ <StyledIcon name="navigatePrevious" />
+ </IconWrapper>
+ <IconWrapper
+ onClick={() => findNextMatch(searchValue, matchCaseSearch)}
+ role="button"
+ tabIndex="0"
+ >
+ <StyledIcon name="navigateNext" />
+ </IconWrapper>
+
+ <ExpandedWrapper onClick={showExpanded}>
+ <StyledIcon name="more" />
+ </ExpandedWrapper>
+
+ <CloseWrapper onClick={closeFind}>
+ <StyledIcon name="close" />
+ </CloseWrapper>
+ </ControlsWrapper>
</SingleRow>
</Wrapper>
);
diff --git a/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js b/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js
index f9e8748d0238219cb9fca2b53724c97a98a2fabb..2bc6ea0fe689458a35b4494d79f2faaff22f8429 100644
--- a/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js
+++ b/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js
@@ -34,11 +34,11 @@ const ShowComments = styled.div`
color: #bdc2ca;
display: flex;
flex-direction: row;
- height: 23px;
+ height: 25px;
padding-top: ${grid(2)};
svg {
- bottom: 12px;
+ bottom: 14px;
cursor: not-allowed;
fill: #85adff;
height: 45px !important;
@@ -118,7 +118,6 @@ const AcceptRejectAllControls = styled.div`
const AcceptRejectAllRow = styled.div`
background: none;
border: none;
- cursor: pointer;
padding-bottom: 3px;
padding-top: 8px;
text-align: start;
diff --git a/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js b/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js
index dc944776207fd6e2d3d2386b6cd97dcf5e62d30f..d385794bb303136d0779f147a83b80ca18e24ee2 100644
--- a/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js
+++ b/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js
@@ -68,10 +68,10 @@ const Text = styled.span``;
const Icon = styled.div`
border-radius: 3px;
display: inline-block;
- height: 16px;
+ height: 20px;
padding: 4px;
transition: background 0.1s ease-in;
- width: 16px;
+ width: 20px;
&:hover {
background: #bfc4cd;
diff --git a/wax-prosemirror-components/src/ui/inputs/CheckBox.js b/wax-prosemirror-components/src/ui/inputs/CheckBox.js
index 970f02f7c8d1ef0336ff57894ceedd8793d2c0df..644f7ff1e530cf512bd45c16d2f3c89d83074066 100644
--- a/wax-prosemirror-components/src/ui/inputs/CheckBox.js
+++ b/wax-prosemirror-components/src/ui/inputs/CheckBox.js
@@ -1,84 +1,84 @@
import React from 'react';
import PropTypes from 'prop-types';
-import styled, { css } from 'styled-components';
+import styled from 'styled-components';
-import { th, override } from '@pubsweet/ui-toolkit';
+import { th } from '@pubsweet/ui-toolkit';
const CheckBoxContainer = styled.div`
display: flex;
flex-direction: row;
`;
const CheckBoxLabel = styled.label`
- display: block;
- position: relative;
- margin-right: 10px;
+ clear: both;
cursor: pointer;
+ display: block;
font-size: 18px;
- line-height: 20px;
height: 20px;
+ line-height: 20px;
+ margin-right: 10px;
+ position: relative;
width: 20px;
- clear: both;
input {
- position: absolute;
- opacity: 0;
cursor: pointer;
+ opacity: 0;
+ position: absolute;
}
input:checked ~ span {
background-color: #ffffff;
+ border: 2px solid #4b5871;
border-radius: 5px;
+ opacity: 1;
-webkit-transform: rotate(0deg) scale(1);
-ms-transform: rotate(0deg) scale(1);
transform: rotate(0deg) scale(1);
- opacity: 1;
- border: 2px solid #4b5871;
}
input:checked ~ span::after {
+ background-color: transparent;
+ border: solid ${th('colorBackgroundButton')};
+ border-radius: 0;
+ border-width: 0 2px 2px 0;
+ height: 12px;
+ left: 4px;
+ opacity: 1;
+ top: -1px;
-webkit-transform: rotate(45deg) scale(1);
-ms-transform: rotate(45deg) scale(1);
transform: rotate(45deg) scale(1);
- opacity: 1;
- left: 6px;
- top: 1px;
width: 6px;
- height: 12px;
- border: solid ${th('colorBackgroundButton')};
- border-width: 0 2px 2px 0;
- background-color: transparent;
- border-radius: 0;
}
`;
const CheckboxCustom = styled.span`
- position: absolute;
- top: 0px;
- left: 0px;
- height: 20px;
- width: 20px;
background-color: transparent;
+ border: 2px solid #4b5871;
border-radius: 5px;
+ height: 20px;
+ left: 0px;
+ position: absolute;
+ top: 0px;
transition: all 0.3s ease-out;
+ width: 20px;
-webkit-transition: all 0.3s ease-out;
-moz-transition: all 0.3s ease-out;
-ms-transition: all 0.3s ease-out;
-o-transition: all 0.3s ease-out;
- border: 2px solid #4b5871;
&:after {
- position: absolute;
+ border: solid ${th('colorBackgroundButton')};
+ border-radius: 5px;
+ border-width: 0 3px 3px 0;
content: '';
+ height: 0px;
left: 12px;
+ opacity: 1;
+ position: absolute;
top: 12px;
- height: 0px;
width: 0px;
- border-radius: 5px;
- border: solid ${th('colorBackgroundButton')};
- border-width: 0 3px 3px 0;
-webkit-transform: rotate(0deg) scale(0);
-ms-transform: rotate(0deg) scale(0);
transform: rotate(0deg) scale(0);
- opacity: 1;
transition: all 0.3s ease-out;
-webkit-transition: all 0.3s ease-out;
-moz-transition: all 0.3s ease-out;
@@ -88,10 +88,10 @@ const CheckboxCustom = styled.span`
`;
const CheckboxTitle = styled.div`
color: #4b5871;
- position: relative;
- top: 2px;
font-size: 15px;
margin-left: 30px;
+ position: relative;
+ top: 2px;
width: 200px;
`;
@@ -117,9 +117,12 @@ const CheckBox = props => {
CheckBox.propTypes = {
name: PropTypes.string.isRequired,
label: PropTypes.string,
+ checked: PropTypes.bool,
+ onChange: PropTypes.func.isRequired,
};
CheckBox.defaultProps = {
+ checked: false,
label: null,
};
diff --git a/wax-prosemirror-core/package.json b/wax-prosemirror-core/package.json
index fb007fde162d3c902ea6b674cfd78cb2397ebe3b..d21fd247eb5cc1d600404610762ec8d319473b65 100644
--- a/wax-prosemirror-core/package.json
+++ b/wax-prosemirror-core/package.json
@@ -4,7 +4,7 @@
"version": "0.0.39",
"description": "Wax prosemirror core",
"license": "MIT",
- "main": "dist/index.js",
+ "main": "index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-plugins/package.json b/wax-prosemirror-plugins/package.json
index 5e2e25919b13b1e3f471f1591d48266e0657277d..c2a4e62ae0909d0e0cead2d82fb74e4954402d50 100644
--- a/wax-prosemirror-plugins/package.json
+++ b/wax-prosemirror-plugins/package.json
@@ -4,7 +4,7 @@
"version": "0.0.39",
"description": "Wax prosemirror plugins",
"license": "MIT",
- "main": "dist/index.js",
+ "main": "index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-schema/package.json b/wax-prosemirror-schema/package.json
index 98e91636725d91aa03559fb576acf1491ec638ee..2f75217b8a85856a8071dce8725fede039b05cfd 100644
--- a/wax-prosemirror-schema/package.json
+++ b/wax-prosemirror-schema/package.json
@@ -4,7 +4,7 @@
"version": "0.0.39",
"description": "Wax prosemirror schema",
"license": "MIT",
- "main": "dist/index.js",
+ "main": "index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-services/package.json b/wax-prosemirror-services/package.json
index f8dc92f93d0877d20c39d62028cf809e9f0fc8a3..62c81d1f744c95809eee7962c5e63891d0acec13 100644
--- a/wax-prosemirror-services/package.json
+++ b/wax-prosemirror-services/package.json
@@ -4,7 +4,7 @@
"version": "0.0.39",
"description": "Wax prosemirror services",
"license": "MIT",
- "main": "dist/index.js",
+ "main": "index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-services/src/MenuService/Menu.js b/wax-prosemirror-services/src/MenuService/Menu.js
index 13bde15572bcd2f3898f05a00c1353ab5b9bc088..aa4d67a40eaadf9e445147084fad97ecff8f5b32 100644
--- a/wax-prosemirror-services/src/MenuService/Menu.js
+++ b/wax-prosemirror-services/src/MenuService/Menu.js
@@ -35,11 +35,9 @@ class Menu {
render() {
return () => {
- const {
- view: { main },
- activeView,
- } = useContext(WaxContext);
+ const { activeView } = useContext(WaxContext);
const Bar = useMemo(() => (
+ // eslint-disable-next-line react/no-this-in-sfc
<MenuWrapper items={this.toolGroups} view={activeView || {}} />
));
return <>{Bar}</>;
diff --git a/wax-prosemirror-utilities/package.json b/wax-prosemirror-utilities/package.json
index fab5e31649687e8aaa5230e65ee21885739b510e..4abef9a97bee90563ba727a80cf24c2033e4122f 100644
--- a/wax-prosemirror-utilities/package.json
+++ b/wax-prosemirror-utilities/package.json
@@ -4,7 +4,7 @@
"version": "0.0.39",
"description": "Wax prosemirror utilities",
"license": "MIT",
- "main": "dist/index.js",
+ "main": "index.js",
"files": [
"dist"
],