Merge branch 'buttons' into 'master'

Buttons

See merge request !171

wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js

@@ -6,7 +6,7 @@ export default
 @injectable()
 class Heading2 extends Tools {
   title = 'Change to heading level 2';
-  content = 'Heading 2';
+  label = 'Heading 2';
   name = 'Heading2';
 
   get run() {

wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js

@@ -6,7 +6,7 @@ export default
 @injectable()
 class Heading3 extends Tools {
   title = 'Change to heading level 3';
-  content = 'Heading 3';
+  label = 'Heading 3';
   name = 'Heading3';
 
   get run() {

wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js

-import Tools from '../../lib/Tools';
 import { injectable } from 'inversify';
 import { Commands } from 'wax-prosemirror-utilities';
+import Tools from '../../lib/Tools';
 
+export default
 @injectable()
-export default class SubTitle extends Tools {
+class SubTitle extends Tools {
   title = 'Change to Subtitle';
-  content = 'Subtitle';
+  label = 'Subtitle';
   name = 'SubTitle';
 
   get run() {

wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js

@@ -2,10 +2,11 @@ import Tools from '../../lib/Tools';
 import { injectable } from 'inversify';
 import { Commands } from 'wax-prosemirror-utilities';
 
+export default 
 @injectable()
-export default class Title extends Tools {
+class Title extends Tools {
   title = 'Change to Title';
-  content = 'Title';
+  label = 'Title';
   name = 'Title';
 
   get run() {

wax-prosemirror-services/src/ImageService/Image.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { v4 as uuidv4 } from 'uuid';
 import { isEmpty } from 'lodash';
 import { injectable } from 'inversify';
-import { icons, ImageUpload } from 'wax-prosemirror-components';
+import { ImageUpload } from 'wax-prosemirror-components';
 import { Commands } from 'wax-prosemirror-utilities';
 import Tools from '../lib/Tools';
 import fileUpload from './fileUpload';
@@ -11,7 +11,7 @@ export default
 @injectable()
 class Image extends Tools {
   title = 'Insert image';
-  content = icons.image;
+  icon = 'image';
   name = 'Image';
 
   get run() {

wax-prosemirror-services/src/InlineAnnotations/CodeService/Code.js

 import { toggleMark } from 'prosemirror-commands';
 import { Commands } from 'wax-prosemirror-utilities';
 import { injectable } from 'inversify';
-import { icons } from 'wax-prosemirror-components';
 import Tools from '../../lib/Tools';
 
 export default
 @injectable()
 class Code extends Tools {
   title = 'Toggle code';
-  content = icons.code;
+  icon = 'code';
   name = 'Code';
 
   get run() {

wax-prosemirror-services/src/InlineAnnotations/EmphasisService/Emphasis.js

 import { toggleMark } from 'prosemirror-commands';
 import { Commands } from 'wax-prosemirror-utilities';
 import { injectable } from 'inversify';
-import { icons } from 'wax-prosemirror-components';
 import Tools from '../../lib/Tools';
 
 export default
 @injectable()
 class Emphasis extends Tools {
   title = 'Toggle emphasis';
-  content = icons.em;
+  icon = 'italic';
   name = 'Emphasis';
 
   get run() {

wax-prosemirror-services/src/InlineAnnotations/SmallCapsService/SmallCaps.js

 import { toggleMark } from 'prosemirror-commands';
 import { Commands } from 'wax-prosemirror-utilities';
-import Tools from '../../lib/Tools';
 import { injectable } from 'inversify';
-import { icons } from 'wax-prosemirror-components';
+import Tools from '../../lib/Tools';
 
+export default
 @injectable()
-export default class SmallCaps extends Tools {
+class SmallCaps extends Tools {
   title = 'Toggle Small Caps';
-  content = icons.small_caps;
+  icon = 'smallCaps';
   name = 'SmallCaps';
 
   get run() {

wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/StrikeThrough.js

 import { toggleMark } from 'prosemirror-commands';
 import { Commands } from 'wax-prosemirror-utilities';
 import { injectable } from 'inversify';
-import { icons } from 'wax-prosemirror-components';
 import Tools from '../../lib/Tools';
 
 export default
 @injectable()
 class StrikeThrough extends Tools {
   title = 'Toggle strikethrough';
-  content = icons.strikethrough;
+  icon = 'strikethrough';
   name = 'StrikeThrough';
 
   get run() {

wax-prosemirror-services/src/InlineAnnotations/StrongService/Strong.js

@@ -2,13 +2,12 @@ import { toggleMark } from 'prosemirror-commands';
 import { Commands } from 'wax-prosemirror-utilities';
 import Tools from '../../lib/Tools';
 import { injectable } from 'inversify';
-import { icons } from 'wax-prosemirror-components';
 
 export default
 @injectable()
 class Strong extends Tools {
   title = 'Toggle strong';
-  content = icons.strong;
+  icon = 'bold';
   name = 'Strong';
 
   get run() {

wax-prosemirror-services/src/InlineAnnotations/SubscriptService/Subscript.js

 import { toggleMark } from 'prosemirror-commands';
 import { Commands } from 'wax-prosemirror-utilities';
 import { injectable } from 'inversify';
-import { icons } from 'wax-prosemirror-components';
 import Tools from '../../lib/Tools';
 
 export default
 @injectable()
 class Subscript extends Tools {
   title = 'Toggle subscript';
-  content = icons.subscript;
+  icon = 'subscript';
   name = 'Subscript';
 
   get run() {

wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/Superscript.js

 import { toggleMark } from 'prosemirror-commands';
 import { Commands } from 'wax-prosemirror-utilities';
 import { injectable } from 'inversify';
-import { icons } from 'wax-prosemirror-components';
 import Tools from '../../lib/Tools';
 
 export default
 @injectable()
 class Superscript extends Tools {
   title = 'Toggle superscript';
-  content = icons.superscript;
+  icon = 'superscript';
   name = 'Superscript';
 
   get run() {

wax-prosemirror-services/src/InlineAnnotations/UnderlineService/Underline.js

 import { toggleMark } from 'prosemirror-commands';
 import { Commands } from 'wax-prosemirror-utilities';
 import { injectable } from 'inversify';
-import { icons } from 'wax-prosemirror-components';
 import Tools from '../../lib/Tools';
 
 export default
 @injectable()
 class Underline extends Tools {
   title = 'Toggle underline';
-  content = icons.underline;
+  // content = icons.underline;
+  icon = 'underline';
   name = 'Underline';
 
   get run() {

wax-prosemirror-services/src/LinkService/LinkTool.js

@@ -2,12 +2,11 @@ import { injectable } from 'inversify';
 import { toggleMark } from 'prosemirror-commands';
 import { Commands } from 'wax-prosemirror-utilities';
 import Tools from '../lib/Tools';
-import { icons } from 'wax-prosemirror-components';
 
 @injectable()
 export default class LinkTool extends Tools {
   title = 'Add or remove link';
-  content = icons.link;
+  icon = 'link';
   name = 'LinkTool';
 
   get run() {

wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js

@@ -9,6 +9,7 @@ export default
 class BulletList extends Tools {
   title = 'Wrap in bullet list';
   content = icons.bullet_list;
+  icon = 'bulletList';
   name = 'BulletList';
 
   get run() {

wax-prosemirror-services/src/ListsService/JoinUpService/JoinUp.js

 import { joinUp } from 'prosemirror-commands';
-import Tools from '../../lib/Tools';
 import { injectable } from 'inversify';
-import { icons } from 'wax-prosemirror-components';
+import Tools from '../../lib/Tools';
 
 export default
 @injectable()
 class JoinUp extends Tools {
   title = 'Join with above block';
-  content = icons.join_up;
+  icon = 'arrowUp';
   name = 'JoinUp';
 
   get run() {
     return joinUp;
   }
 
-  get enable() {
-    return joinUp;
-  }
-
   select(state) {
     return joinUp(state);
   }
+
+  get enable() {
+    return joinUp;
+  }
 }

wax-prosemirror-services/src/ListsService/LiftService/Lift.js

 import { lift } from 'prosemirror-commands';
-import Tools from '../../lib/Tools';
 import { injectable } from 'inversify';
-import { icons } from 'wax-prosemirror-components';
+import Tools from '../../lib/Tools';
 
 export default
 @injectable()
 class Lift extends Tools {
   title = 'Lift out of enclosing block';
-  content = icons.lift;
+  icon = 'indentDecrease';
   name = 'Lift';
 
+  select(state) {
+    return lift(state);
+  }
+
   get run() {
     return lift;
   }

wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js

-import Tools from '../../lib/Tools';
 import { injectable } from 'inversify';
-import { icons } from 'wax-prosemirror-components';
 import { wrapInList } from 'prosemirror-schema-list';
 import { Commands } from 'wax-prosemirror-utilities';
+import Tools from '../../lib/Tools';
 
+export default 
 @injectable()
-export default class OrderedList extends Tools {
+class OrderedList extends Tools {
   title = 'Wrap in ordered list';
-  content = icons.ordered_list;
+  icon = 'numberedList';
   name = 'OrderedList';
 
   get run() {

wax-prosemirror-services/src/MenuService/MenuWrapper.js

-import React from 'react';
-import styled from 'styled-components';
+/* eslint no-underscore-dangle: 0 */
+/* eslint react/prop-types: 0 */
 
+import React from 'react';
+import { v4 as uuidv4 } from 'uuid';
 import { map } from 'lodash';
-
-const MainMenu = styled.div`
-  display: flex;
-  flex-wrap: wrap;
-  background: #fff;
-  padding: 2px 2px 2px 0;
-  position: relative;
-`;
+import { ToolGroupComponent, ToolGroups } from 'wax-prosemirror-components';
 
 const MainMenuBar = ({ items = [], view }) => {
-  return (
-    <MainMenu key="MainMenu">
-      {map(items, item => item.renderTools(view))}
-    </MainMenu>
-  );
+  return <>{map(items, item => item.renderTools(view))}</>;
 };
 
 export default MainMenuBar;

wax-prosemirror-services/src/NoteService/Note.js

 import Tools from '../lib/Tools';
 import { injectable } from 'inversify';
-import { icons } from 'wax-prosemirror-components';
 import { Fragment } from 'prosemirror-model';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -8,7 +7,7 @@ export default
 @injectable()
 class Note extends Tools {
   title = 'Insert Note';
-  content = icons.footnote;
+  icon = 'note';
   name = 'Note';
 
   get run() {
@@ -35,7 +34,7 @@ class Note extends Tools {
 
   get enable() {
     return state => {
-      return true;
+      return false;
     };
   }
 }