From c5257f90e1b555b458a98d9f518d4cd7f8c95a8c Mon Sep 17 00:00:00 2001
From: Shawn <shawn@kafei.io>
Date: Wed, 14 Nov 2018 18:54:30 -0600
Subject: [PATCH] Fix flex/dimensions, begin adding toolbar

---
 client/src/components/Creatify/index.js | 32 +++++++++++++++++++++----
 client/src/containers/Dropzone/view.jsx | 13 ++++------
 package.json                            |  3 +++
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/client/src/components/Creatify/index.js b/client/src/components/Creatify/index.js
index 867183f0..c1ea9e4b 100644
--- a/client/src/components/Creatify/index.js
+++ b/client/src/components/Creatify/index.js
@@ -1,9 +1,17 @@
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+
 import React, { Component } from 'react';
 import Select from 'react-select'
 
 import RichDraggable from './RichDraggable';
 import EditableFontface, { PRESETS as FontPresets } from './EditableFontface';
 
+import {
+  faFont
+} from '@fortawesome/free-solid-svg-icons'
+library.add(faFont);
+
 const getRasterizedCanvas = (contents, width, height) => {
   return new Promise((resolve) => {
     // Parse to xHTML for SVG/foreignObject rendering
@@ -102,22 +110,36 @@ export default class Creatify extends Component {
   }
 
   componentDidMount() {
+    // TODO: Fix bounds
+    /*
     const bounds = this.contents.current.getBoundingClientRect();
 
     this.setState({
       bounds,
     });
+
+    console.log({
+      bounds
+    })
+    */
   }
 
   renderContents() {
     const me = this;
 
-    let contents = me.contents.current.outerHTML;
+    const contentsElement = me.contents.current;
+    let contents = contentsElement.outerHTML;
 
     // Cheap border/handles removal
     contents = `<style>.creatifyDecor{border-color:transparent!important;background-color:transparent!important}</style>` + contents;
 
-    getRasterizedCanvas(contents, 600, 500).then((element) => {
+    const contentsWidth = contentsElement.offsetWidth;
+    const contentsHeight = contentsElement.offsetHeight;
+
+    // Fix the dimensions, fixes when flex is used.
+    contents = `<div style="height:${contentsHeight}px;width:${contentsWidth}px">${contents}</div>`;
+
+    getRasterizedCanvas(contents, contentsWidth, contentsHeight).then((element) => {
       document.body.appendChild(element);
     });
   }
@@ -130,12 +152,12 @@ export default class Creatify extends Component {
     } = this;
 
     return (
-      <div style={{ flex: 1, display: 'flex' }}>
-        <div>
+      <div style={{ position: 'relative', flex: props.flex === true ? 1 : props.flex, display: props.flex ? 'flex' : 'block' }}>
+        <div style={{ position: 'absolute', top: 0, left: 0, right: 0, background: '#333', zIndex: 2 }}>
           <button onClick={() => this.renderContents()}>Rasterize</button>
           <Select isSearchable={false} options={state.fontOptions} onChange={(option) => this.setFont(option.fontName)} />
         </div>
-        <div ref={me.contents} style={{ height: '600px', width: '500px', fontSize: '22px', overflow: 'hidden', transform: 'translateZ(0)' }}>
+        <div ref={me.contents} style={{ fontSize: '22px', overflow: 'hidden', transform: 'translateZ(0)', flex: 1 }}>
           <RichDraggable bounds={state.bounds}>
             <EditableFontface fontFace={FontPresets[state.fontName]} value="Hello from LBRY" />
           </RichDraggable>
diff --git a/client/src/containers/Dropzone/view.jsx b/client/src/containers/Dropzone/view.jsx
index 3d9f2743..161e8736 100644
--- a/client/src/containers/Dropzone/view.jsx
+++ b/client/src/containers/Dropzone/view.jsx
@@ -148,18 +148,13 @@ class Dropzone extends React.Component {
     };
 
     let memeify = file && filePreview ? (
-      <Creatify>
-        <img src={filePreview} />
+      <Creatify flex>
+        <div style={{ background: '#fff', flex: 1 }}>
+          <img style={{ width: '100%' }} src={filePreview} />
+        </div>
       </Creatify>
     ) : null;
 
-    console.log({
-      file,
-      thumbnail,
-      sourceUrl,
-      filePreview,
-    });
-
     const dropZoneClassName = 'dropzone' + (dragOver ? ' dropzone--drag-over' : '');
 
     return (
diff --git a/package.json b/package.json
index a0576b28..6cf18c8b 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,9 @@
   },
   "homepage": "https://github.com/lbryio/spee.ch#readme",
   "dependencies": {
+    "@fortawesome/fontawesome-svg-core": "^1.2.8",
+    "@fortawesome/free-solid-svg-icons": "^5.5.0",
+    "@fortawesome/react-fontawesome": "^0.1.3",
     "axios": "^0.18.0",
     "bcrypt": "^2.0.1",
     "body-parser": "^1.18.3",