umputun#299 add list format buttons

Mavrin · Apr 14, 2019 · abeca3c · abeca3c
1 parent b38bbf4
commit abeca3c
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 0 deletions.
diff --git a/web/app/@types/markdown-toolbar-element/index.d.ts b/web/app/@types/markdown-toolbar-element/index.d.ts
@@ -11,5 +11,7 @@ declare namespace JSX {
     'md-quote': any;
     'md-code': any;
     'md-link': any;
+    'md-unordered-list': any;
+    'md-ordered-list': any;
   }
 }
diff --git a/web/app/components/input/markdown-toolbar-icons/ordered-list-icon.tsx b/web/app/components/input/markdown-toolbar-icons/ordered-list-icon.tsx
@@ -0,0 +1,13 @@
+/** @jsx h */
+import { h } from 'preact';
+
+export default function OrderedListIcon() {
+  return (
+    <svg className="input__toolbar-icon" viewBox="0 0 12 16" version="1.1" width="12" height="16" aria-hidden="true">
+      <path
+        fill-rule="evenodd"
+        d="M12.01 13c0 .59 0 1-.59 1H4.6c-.59 0-.59-.41-.59-1 0-.59 0-1 .59-1h6.81c.59 0 .59.41.59 1h.01zM4.6 4h6.81C12 4 12 3.59 12 3c0-.59 0-1-.59-1H4.6c-.59 0-.59.41-.59 1 0 .59 0 1 .59 1zm6.81 3H4.6c-.59 0-.59.41-.59 1 0 .59 0 1 .59 1h6.81C12 9 12 8.59 12 8c0-.59 0-1-.59-1zm-9.4-6h-.72c-.3.19-.58.25-1.03.34V2h.75v2.14H.17V5h2.84v-.86h-1V1zm.392 8.12c-.129 0-.592.04-.802.07.53-.56 1.14-1.25 1.14-1.89C2.72 6.52 2.18 6 1.38 6c-.59 0-.97.2-1.38.64l.58.58c.19-.19.38-.38.64-.38.28 0 .48.16.48.52 0 .53-.77 1.2-1.7 2.06V10h3v-.88h-.598zm-.222 3.79v-.03c.44-.19.64-.47.64-.86 0-.7-.56-1.11-1.44-1.11-.48 0-.89.19-1.28.52l.55.64c.25-.2.44-.31.69-.31.27 0 .42.13.42.36 0 .27-.2.44-.86.44v.75c.83 0 .98.17.98.47 0 .25-.23.38-.58.38-.28 0-.56-.14-.81-.38l-.48.66c.3.36.77.56 1.41.56.83 0 1.53-.41 1.53-1.16 0-.5-.31-.81-.77-.94v.01z"
+      />
+    </svg>
+  );
+}
diff --git a/web/app/components/input/markdown-toolbar-icons/unordered-list-icon.tsx b/web/app/components/input/markdown-toolbar-icons/unordered-list-icon.tsx
@@ -0,0 +1,13 @@
+/** @jsx h */
+import { h } from 'preact';
+
+export default function UnorderedListIcon() {
+  return (
+    <svg className="input__toolbar-icon" viewBox="0 0 12 16" version="1.1" width="12" height="16" aria-hidden="true">
+      <path
+        fill-rule="evenodd"
+        d="M2 13c0 .59 0 1-.59 1H.59C0 14 0 13.59 0 13c0-.59 0-1 .59-1h.81c.59 0 .59.41.59 1H2zm2.59-9h6.81c.59 0 .59-.41.59-1 0-.59 0-1-.59-1H4.59C4 2 4 2.41 4 3c0 .59 0 1 .59 1zM1.41 7H.59C0 7 0 7.41 0 8c0 .59 0 1 .59 1h.81c.59 0 .59-.41.59-1 0-.59 0-1-.59-1h.01zm0-5H.59C0 2 0 2.41 0 3c0 .59 0 1 .59 1h.81c.59 0 .59-.41.59-1 0-.59 0-1-.59-1h.01zm10 5H4.59C4 7 4 7.41 4 8c0 .59 0 1 .59 1h6.81c.59 0 .59-.41.59-1 0-.59 0-1-.59-1h.01zm0 5H4.59C4 12 4 12.41 4 13c0 .59 0 1 .59 1h6.81c.59 0 .59-.41.59-1 0-.59 0-1-.59-1h.01z"
+      />
+    </svg>
+  );
+}
diff --git a/web/app/components/input/markdown-toolbar.tsx b/web/app/components/input/markdown-toolbar.tsx
@@ -7,6 +7,8 @@ import ItalicIcon from './markdown-toolbar-icons/italic-icon';
 import QuoteIcon from './markdown-toolbar-icons/quote-icon';
 import CodeIcon from './markdown-toolbar-icons/code-icon';
 import LinkIcon from './markdown-toolbar-icons/link-icon';
+import UnorderedListIcon from './markdown-toolbar-icons/unordered-list-icon';
+import OrderedListIcon from './markdown-toolbar-icons/ordered-list-icon';
 
 interface Props {
   textareaId: string;
@@ -18,6 +20,8 @@ const italicLabel = 'Add italic text <cmd-i>';
 const quoteLabel = 'Insert a quote';
 const codeLabel = 'Insert a code';
 const linkLabel = 'Add a link <cmd-k>';
+const unorderedListLabel = 'Add a bulleted list';
+const orderedListLabel = 'Add a numbered list';
 
 export default class MarkdownToolbar extends Component<Props> {
   render(props: RenderableProps<Props>) {
@@ -45,6 +49,14 @@ export default class MarkdownToolbar extends Component<Props> {
             <LinkIcon />
           </md-link>
         </div>
+        <div className="input__toolbar-group">
+          <md-unordered-list className="input__toolbar-item" title={unorderedListLabel} aria-label={unorderedListLabel}>
+            <UnorderedListIcon />
+          </md-unordered-list>
+          <md-ordered-list className="input__toolbar-item" title={orderedListLabel} aria-label={orderedListLabel}>
+            <OrderedListIcon />
+          </md-ordered-list>
+        </div>
       </markdown-toolbar>
     );
   }