From 12530a6b7b714bd103479fbee3592dd50099dff2 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Sun, 7 Feb 2021 08:08:23 +0200 Subject: [PATCH] cleanup file --- .../src/ui/tabs/BlockElementGroup.js | 13 +++++-------- .../CustomTagBlockToolGroup.js | 14 +++++++------- .../DisplayTextToolGroupService/DisplayText.js | 13 ++++++++++--- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/wax-prosemirror-components/src/ui/tabs/BlockElementGroup.js b/wax-prosemirror-components/src/ui/tabs/BlockElementGroup.js index 11ecff2d1..44f5243c2 100644 --- a/wax-prosemirror-components/src/ui/tabs/BlockElementGroup.js +++ b/wax-prosemirror-components/src/ui/tabs/BlockElementGroup.js @@ -6,8 +6,6 @@ import CustomTagBlockComponent from '../../components/customtag/CustomTagBlockCo import BlockElement from './BlockElement'; import Icon from '../../helpers/Icon'; -const Wrapper = styled.div``; - const GroupName = styled.div` font-size: 14px; margin-bottom: 4px; @@ -28,12 +26,11 @@ const FlexDiv = styled.div` const StyledIcon = styled(Icon)` cursor: pointer; fill: ${th('colorPrimary')}; - height: 10px; - width: 10px; + height: 14px; + width: 14px; `; -const BlockElementGroup = props => { - const { groupName, items, view } = props; +const BlockElementGroup = ({ groupName, items, view }) => { const [isIconClicked, setIconClicked] = useState(false); const onIconClick = () => { @@ -41,7 +38,7 @@ const BlockElementGroup = props => { }; return ( - <Wrapper> + <> {groupName !== 'Custom Block' && ( <> <GroupName>{groupName}</GroupName> @@ -72,7 +69,7 @@ const BlockElementGroup = props => { </ListWrapper> </> )} - </Wrapper> + </> ); }; diff --git a/wax-prosemirror-services/src/WaxToolGroups/CustomTagToolGroupService/CustomTagBlockToolGroupService/CustomTagBlockToolGroup.js b/wax-prosemirror-services/src/WaxToolGroups/CustomTagToolGroupService/CustomTagBlockToolGroupService/CustomTagBlockToolGroup.js index ca0a4c5b1..a19a5ac45 100644 --- a/wax-prosemirror-services/src/WaxToolGroups/CustomTagToolGroupService/CustomTagBlockToolGroupService/CustomTagBlockToolGroup.js +++ b/wax-prosemirror-services/src/WaxToolGroups/CustomTagToolGroupService/CustomTagBlockToolGroupService/CustomTagBlockToolGroup.js @@ -4,13 +4,13 @@ import { LeftMenuTitle } from '../../../../../wax-prosemirror-components/src/com @injectable() class CustomTagBlockToolGroup extends ToolGroup { - tools = []; - title = "Custom Block"; + tools = []; + title = 'Custom Block'; - constructor(@inject('CustomTagBlockTool') customTagBlock) { - super(); - this.tools = [customTagBlock]; - } + constructor(@inject('CustomTagBlockTool') customTagBlock) { + super(); + this.tools = [customTagBlock]; + } } -export default CustomTagBlockToolGroup; \ No newline at end of file +export default CustomTagBlockToolGroup; diff --git a/wax-prosemirror-services/src/WaxToolGroups/DisplayTextToolGroupService/DisplayText.js b/wax-prosemirror-services/src/WaxToolGroups/DisplayTextToolGroupService/DisplayText.js index 1d2f708fe..7bb8915e2 100644 --- a/wax-prosemirror-services/src/WaxToolGroups/DisplayTextToolGroupService/DisplayText.js +++ b/wax-prosemirror-services/src/WaxToolGroups/DisplayTextToolGroupService/DisplayText.js @@ -16,7 +16,11 @@ class DisplayText extends ToolGroup { tools = []; toolGroups = []; - constructor(@inject('Display') display, @inject('Text') text, @inject('CustomTagBlockToolGroup') blockTag) { + constructor( + @inject('Display') display, + @inject('Text') text, + @inject('CustomTagBlockToolGroup') blockTag, + ) { super(); this.toolGroups = [ { @@ -27,7 +31,7 @@ class DisplayText extends ToolGroup { } renderTools(view) { - if (isEmpty(view)) return null; + if (isEmpty(view)) return null; const first = { id: '1', @@ -37,7 +41,10 @@ class DisplayText extends ToolGroup { component: ( <BlockLevelTools groups={this._toolGroups[0].groups.map(group => ({ - groupName: group.title === 'Custom Block' ? group.title : group.title.props.title, + groupName: + group.title === 'Custom Block' + ? group.title + : group.title.props.title, items: group._tools, }))} view={view} -- GitLab