From ba614a115d40e80073d20f13e316e11ca99051d8 Mon Sep 17 00:00:00 2001
From: muerwre <gotham48@gmail.com>
Date: Fri, 9 Aug 2019 15:35:17 +0700
Subject: [PATCH] fixed grid

---
 src/components/flow/Cell/index.tsx           |  6 +++---
 src/components/flow/Cell/styles.scss         | 18 ++++++++++++++++++
 src/components/flow/TestGrid/index.tsx       |  6 +++---
 src/containers/dialogs/LoginDialog/index.tsx |  2 +-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/components/flow/Cell/index.tsx b/src/components/flow/Cell/index.tsx
index 7b220ac4..ceefc795 100644
--- a/src/components/flow/Cell/index.tsx
+++ b/src/components/flow/Cell/index.tsx
@@ -18,10 +18,10 @@ const Cell: FC<IProps> = ({
   is_hero,
 }) => (
   <div
-    className={classNames(styles.cell, { is_hero })}
+    className={classNames(styles.cell, `vert-${height}`, `hor-${width}`)}
     style={{
-      gridRowEnd: `span ${height}`,
-      gridColumnEnd: `span ${width}`,
+      // gridRowEnd: `span ${height}`,
+      // gridColumnEnd: `span ${width}`,
     }}
   >
     { title && <div className={styles.title}>{title}</div> }
diff --git a/src/components/flow/Cell/styles.scss b/src/components/flow/Cell/styles.scss
index 33ddfdca..64b8df26 100644
--- a/src/components/flow/Cell/styles.scss
+++ b/src/components/flow/Cell/styles.scss
@@ -32,3 +32,21 @@
   width: 100%;
   box-sizing: border-box;
 }
+
+:global {
+  .vert-1 {
+    grid-row-end: span 1;
+  }
+
+  .vert-2 {
+    grid-row-end: span 2;
+  }
+
+  .hor-1 {
+    grid-column-end: span 1;
+  }
+
+  .hor-2 {
+    grid-column-end: span 2;
+  }
+}
diff --git a/src/components/flow/TestGrid/index.tsx b/src/components/flow/TestGrid/index.tsx
index 459580c0..62546cc5 100644
--- a/src/components/flow/TestGrid/index.tsx
+++ b/src/components/flow/TestGrid/index.tsx
@@ -23,7 +23,7 @@ export const TestGrid = () => (
     <div className={styles.grid_test}>
       <div
         style={{
-          gridRow: '2 / 4',
+          gridRow: '1 / 3',
           gridColumn: '-2 / -1',
           background: '#090909',
           borderRadius: 4,
@@ -34,8 +34,8 @@ export const TestGrid = () => (
 
       {range(1, 20).map(el => (
         <Cell
-          width={Math.floor(Math.random() * 3)}
-          height={Math.floor(Math.random() * 3)}
+          width={Math.floor(Math.random() * 2 + 1)}
+          height={Math.floor(Math.random() * 2 + 1)}
           title={`Cell ${el}`}
           key={el}
         />
diff --git a/src/containers/dialogs/LoginDialog/index.tsx b/src/containers/dialogs/LoginDialog/index.tsx
index ddff1322..29639765 100644
--- a/src/containers/dialogs/LoginDialog/index.tsx
+++ b/src/containers/dialogs/LoginDialog/index.tsx
@@ -60,7 +60,7 @@ const LoginDialogUnconnected: FC<IProps> = ({
               <div />
               <div />
 
-              <InputText title="Логин" handler={setUserName} value={username} />
+              <InputText title="Логин" handler={setUserName} value={username} autoFocus />
               <InputText title="Пароль" handler={setPassword} value={password} />
             </Group>
           </div>