From 69eedbb1c5214ac3090a5cb053c25d45a5e009b2 Mon Sep 17 00:00:00 2001
From: telamonian <mklein@jhu.edu>
Date: Mon, 29 Apr 2019 20:10:06 -0400
Subject: [PATCH] simplification

---
 .../src/components}/lineForm.tsx              | 11 +--
 packages/statusbar/src/defaults/lineCol.tsx   |  6 +-
 packages/statusbar/src/style/lineForm.ts      | 23 ++++++
 packages/ui-components/src/icon/icon.tsx      |  2 +
 packages/ui-components/src/icon/index.ts      |  1 -
 packages/ui-components/src/style/lineForm.ts  | 82 -------------------
 6 files changed, 30 insertions(+), 95 deletions(-)
 rename packages/{ui-components/src/icon => statusbar/src/components}/lineForm.tsx (74%)
 delete mode 100644 packages/ui-components/src/style/lineForm.ts

diff --git a/packages/ui-components/src/icon/lineForm.tsx b/packages/statusbar/src/components/lineForm.tsx
similarity index 74%
rename from packages/ui-components/src/icon/lineForm.tsx
rename to packages/statusbar/src/components/lineForm.tsx
index 575b2f8ef528..956916491f4d 100644
--- a/packages/ui-components/src/icon/lineForm.tsx
+++ b/packages/statusbar/src/components/lineForm.tsx
@@ -9,8 +9,6 @@ import {
   lineFormButton
 } from '../style/lineForm';
 
-import LineFormSvg from '../../style/icons/line-form.svg';
-
 /**
  * A namespace for LineFormButtonItem statics.
  */
@@ -36,7 +34,7 @@ export namespace LineFormButtonItem {
   }
 }
 
-export function GenericButton(
+export function LineFormButtonItem(
   props: LineFormButtonItem.IProps &
     React.HTMLAttributes<SVGElement> &
     React.HTMLAttributes<HTMLInputElement>
@@ -49,10 +47,3 @@ export function GenericButton(
     </div>
   );
 }
-
-export function LineFormButton(
-  props: { type: string; value: string } & React.HTMLAttributes<SVGElement> &
-    React.HTMLAttributes<HTMLInputElement>
-): React.ReactElement<LineFormButtonItem.IProps> {
-  return <GenericButton SVG={LineFormSvg} {...props} />;
-}
diff --git a/packages/statusbar/src/defaults/lineCol.tsx b/packages/statusbar/src/defaults/lineCol.tsx
index 249368ef5ea0..66d52d44b303 100644
--- a/packages/statusbar/src/defaults/lineCol.tsx
+++ b/packages/statusbar/src/defaults/lineCol.tsx
@@ -7,7 +7,7 @@ import { VDomRenderer, VDomModel, ReactWidget } from '@jupyterlab/apputils';
 
 import { CodeEditor } from '@jupyterlab/codeeditor';
 
-import { LineFormButton } from '@jupyterlab/ui-components';
+import { LineFormSvg } from '@jupyterlab/ui-components';
 
 import { classes } from 'typestyle/lib';
 
@@ -21,6 +21,8 @@ import {
   lineFormCaption
 } from '../style/lineForm';
 
+import { LineFormButtonItem } from '../components/lineForm';
+
 /**
  * A namespace for LineFormComponent statics.
  */
@@ -112,7 +114,7 @@ class LineFormComponent extends React.Component<
                 this._textInput = input;
               }}
             />
-            <LineFormButton type="submit" value="" />
+            <LineFormButtonItem SVG={LineFormSvg} type="submit" value="" />
           </div>
           <label className={lineFormCaption}>
             Go to line number between 1 and {this.props.maxLine}
diff --git a/packages/statusbar/src/style/lineForm.ts b/packages/statusbar/src/style/lineForm.ts
index 2d62f5c4a12c..37b12d548034 100644
--- a/packages/statusbar/src/style/lineForm.ts
+++ b/packages/statusbar/src/style/lineForm.ts
@@ -35,6 +35,29 @@ export const baseLineForm: NestedCSSProperties = {
   right: '0px'
 };
 
+export const lineFormButtonDiv = style(baseLineForm, {
+  top: '4px',
+  right: '8px',
+  height: '24px',
+  padding: '0px 12px',
+  width: '12px'
+});
+
+export const lineFormButtonIcon = style(baseLineForm, {
+  backgroundColor: 'var(--jp-brand-color1)',
+  height: '100%',
+  width: '100%',
+  boxSizing: 'border-box',
+  padding: '4px 6px'
+});
+
+export const lineFormButton = style(baseLineForm, {
+  backgroundColor: 'transparent',
+  height: '100%',
+  width: '100%',
+  boxSizing: 'border-box'
+});
+
 export const lineFormWrapper = style({
   overflow: 'hidden',
   padding: '0px 8px',
diff --git a/packages/ui-components/src/icon/icon.tsx b/packages/ui-components/src/icon/icon.tsx
index a7243b30da7c..0cc440273700 100644
--- a/packages/ui-components/src/icon/icon.tsx
+++ b/packages/ui-components/src/icon/icon.tsx
@@ -10,6 +10,7 @@ import icon from '../style/icon';
 // icon svg imports
 
 import KernelSvg from '../../style/icons/kernel-icon.svg';
+import _LineFormSvg from '../../style/icons/line-form.svg';
 import TerminalSvg from '../../style/icons/terminal-icon.svg';
 
 // functions for setting up icons
@@ -49,4 +50,5 @@ export function IconFactory(
 // functions that produce the actual icon React elements
 
 export const KernelIcon = IconFactory({ Svg: KernelSvg });
+export const LineFormSvg = _LineFormSvg;
 export const TerminalIcon = IconFactory({ Svg: TerminalSvg });
diff --git a/packages/ui-components/src/icon/index.ts b/packages/ui-components/src/icon/index.ts
index 5c7813bda609..e6e4ba467cb9 100644
--- a/packages/ui-components/src/icon/index.ts
+++ b/packages/ui-components/src/icon/index.ts
@@ -2,4 +2,3 @@
 // Distributed under the terms of the Modified BSD License.
 
 export * from './icon';
-export * from './lineForm';
diff --git a/packages/ui-components/src/style/lineForm.ts b/packages/ui-components/src/style/lineForm.ts
deleted file mode 100644
index 37b12d548034..000000000000
--- a/packages/ui-components/src/style/lineForm.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-import { style } from 'typestyle/lib';
-import { NestedCSSProperties } from 'typestyle/lib/types';
-
-export const hoverItem = style({
-  boxShadow: '0px 4px 4px rgba(0, 0, 0, 0.25)'
-});
-
-export const lineFormSearch = style({
-  padding: '4px 12px',
-  backgroundColor: 'var(--jp-layout-color2)',
-  boxShadow: 'var(--jp-toolbar-box-shadow)',
-  zIndex: 2,
-  fontSize: 'var(--jp-ui-font-size1)'
-});
-
-export const lineFormCaption = style({
-  fontSize: 'var(--jp-ui-font-size0)',
-  lineHeight: 'var(--jp-ui-font-size1)',
-  marginTop: '4px',
-  color: 'var(--jp-ui-font-color0)'
-});
-
-export const baseLineForm: NestedCSSProperties = {
-  border: 'none',
-  borderRadius: '0px',
-  position: 'absolute',
-  backgroundSize: '16px',
-  backgroundRepeat: 'no-repeat',
-  backgroundPosition: 'center',
-  outline: 'none',
-  top: '0px',
-  right: '0px'
-};
-
-export const lineFormButtonDiv = style(baseLineForm, {
-  top: '4px',
-  right: '8px',
-  height: '24px',
-  padding: '0px 12px',
-  width: '12px'
-});
-
-export const lineFormButtonIcon = style(baseLineForm, {
-  backgroundColor: 'var(--jp-brand-color1)',
-  height: '100%',
-  width: '100%',
-  boxSizing: 'border-box',
-  padding: '4px 6px'
-});
-
-export const lineFormButton = style(baseLineForm, {
-  backgroundColor: 'transparent',
-  height: '100%',
-  width: '100%',
-  boxSizing: 'border-box'
-});
-
-export const lineFormWrapper = style({
-  overflow: 'hidden',
-  padding: '0px 8px',
-  border: '1px solid var(--jp-border-color0)',
-  backgroundColor: 'var(--jp-input-active-background)',
-  height: '22px'
-});
-
-export const lineFormWrapperFocusWithin = style({
-  border: 'var(--jp-border-width) solid var(--md-blue-500)',
-  boxShadow: 'inset 0 0 4px var(--md-blue-300)'
-});
-
-export const lineFormInput = style({
-  background: 'transparent',
-  width: '200px',
-  height: '100%',
-  border: 'none',
-  outline: 'none',
-  color: 'var(--jp-ui-font-color0)',
-  lineHeight: '28px'
-});