yapp 4.0.115 → 4.0.117

package/src/{lineNumbers.js → div/lineNumbers.js}

@@ -4,10 +4,10 @@ import withStyle from "easy-with-style";  ///
 
 import { Element } from "easy";
 
-import { EMPTY_STRING } from "./constants";
-import { lineCountFromTokens } from "./utilities/tokens";
+import { EMPTY_STRING } from "../constants";
+import { lineCountFromTokens } from "../utilities/tokens";
 
-class LineNumbers extends Element {
+class LineNumbersDiv extends Element {
   update(tokens) {
     let html = EMPTY_STRING;
 
@@ -30,12 +30,12 @@ class LineNumbers extends Element {
   }
 
   parentContext() {
-	  const scrollLineNumbers = this.scroll.bind(this), ///
-          updateLineNumbers = this.update.bind(this);  ///
+	  const scrollLineNumbersDiv = this.scroll.bind(this), ///
+          updateLineNumbersDiv = this.update.bind(this);  ///
 
     return ({
-      scrollLineNumbers,
-      updateLineNumbers
+      scrollLineNumbersDiv,
+      updateLineNumbersDiv
     });
   }
 
@@ -46,7 +46,7 @@ class LineNumbers extends Element {
   };
 }
 
-export default withStyle(LineNumbers)`
+export default withStyle(LineNumbersDiv)`
 
   margin: 0 6px 0 6px;
   position: relative;

package/src/{highlights.js → div/overlay.js}

@@ -4,17 +4,17 @@ import withStyle from "easy-with-style";  ///
 
 import { Element } from "easy";
 
-import Syntax from "./syntax";
+import SyntaxDiv from "../div/syntax";
 
-import { MARGIN_RIGHT, MARGIN_BOTTOM } from "./constants";
+import { MARGIN_RIGHT, MARGIN_BOTTOM } from "../constants";
 
-class Highlights extends Element {
+class OverlayDiv extends Element {
   update(tokens) {
-    this.updateSyntax(tokens);
+    this.updateSyntaxDiv(tokens);
   }
 
   scroll(scrollTop, scrollLeft) {
-    this.scrollSyntax(scrollTop, scrollLeft);
+    this.scrollSyntaxDiv(scrollTop, scrollLeft);
   }
 
   didMount() {
@@ -33,27 +33,27 @@ class Highlights extends Element {
   childElements() {
     return (
 
-      <Syntax/>
+      <SyntaxDiv/>
 
     );
   }
 
   parentContext() {
 	  const context = this.getContext(),
-          updateHighlights = this.update.bind(this),  ///
-				  scrollHighlights = this.scroll.bind(this);  ///
+          updateOverlayDiv = this.update.bind(this),  ///
+				  scrollOverlayDiv = this.scroll.bind(this);  ///
 
     return ({
       ...context,
-      updateHighlights,
-      scrollHighlights
+      updateOverlayDiv,
+      scrollOverlayDiv
     });
   }
 
   initialise() {
     this.assignContext([
-      "updateSyntax",
-      "scrollSyntax"
+      "updateSyntaxDiv",
+      "scrollSyntaxDiv"
     ]);
   }
 
@@ -64,18 +64,18 @@ class Highlights extends Element {
   ];
 
   static defaultProperties = {
-    className: "highlights"
+    className: "overlay"
   };
 }
 
-export default withStyle(Highlights)`
+export default withStyle(OverlayDiv)`
 
   z-index: 0;
   width: auto;
   height: auto;
   overflow: hidden;
   position: relative;
-  grid-area: highlights-rich-textarea;
+  grid-area: overlay-rich-textarea;
 
   color: inherit;
   font-size: inherit;

package/src/{syntax.js → div/syntax.js}

@@ -4,9 +4,9 @@ import withStyle from "easy-with-style";  ///
 
 import { Element } from "easy";
 
-import { EMPTY_STRING } from "./constants";
+import { EMPTY_STRING } from "../constants";
 
-class Syntax extends Element {
+class SyntaxDiv extends Element {
   setLanguage(language) {
     const state = {
       language
@@ -72,13 +72,13 @@ class Syntax extends Element {
 
   parentContext() {
 	  const setLanguage = this.setLanguage.bind(this),
-          updateSyntax = this.update.bind(this), ///
-				  scrollSyntax = this.scroll.bind(this);  ///
+          updateSyntaxDiv = this.update.bind(this), ///
+				  scrollSyntaxDiv = this.scroll.bind(this);  ///
 
     return ({
       setLanguage,
-      updateSyntax,
-      scrollSyntax
+      updateSyntaxDiv,
+      scrollSyntaxDiv
     });
   }
 
@@ -93,7 +93,7 @@ class Syntax extends Element {
   };
 }
 
-export default withStyle(Syntax)`
+export default withStyle(SyntaxDiv)`
 
   position: relative;
   white-space: pre;

package/src/prettyPrinter.js

@@ -4,8 +4,8 @@ import withStyle from "easy-with-style";  ///
 
 import { React, Element } from "easy";
 
-import Gutter from "./gutter";
-import Highlights from "./highlights";
+import GutterDiv from "./div/gutter";
+import OverlayDiv from "./div/overlay";
 import RichTextarea from "./richTextarea";
 
 import { getScrollbarThickness } from "./utilities/scrollbar";
@@ -16,15 +16,15 @@ class PrettyPrinter extends Element {
           scrollTop = richTextarea.getScrollTop(),
           scrollLeft = richTextarea.getScrollLeft();
 
-    this.scrollGutter(scrollTop ,scrollLeft);
+    this.scrollGutterDiv(scrollTop ,scrollLeft);
 
-    this.scrollHighlights(scrollTop, scrollLeft);
+    this.scrollOverlayDiv(scrollTop, scrollLeft);
   }
 
   update(tokens) {
-    this.updateGutter(tokens);
+    this.updateGutterDiv(tokens);
 
-    this.updateHighlights(tokens);
+    this.updateOverlayDiv(tokens);
   }
 
   childElements() {
@@ -36,8 +36,8 @@ class PrettyPrinter extends Element {
 
     return ([
 
-      <Gutter hidden={hidden} />,
-      <Highlights scrollbarThickness={scrollbarThickness} />,
+      <GutterDiv hidden={hidden} />,
+      <OverlayDiv scrollbarThickness={scrollbarThickness} />,
       <RichTextarea onScroll={this.scrollHandler} onChange={changeHandler} fancyScrollbars={fancyScrollbars} hiddenScrollbars={hiddenScrollbars} readOnly={readOnly} />
 
     ]);
@@ -55,10 +55,10 @@ class PrettyPrinter extends Element {
 
   initialise() {
     this.assignContext([
-      "updateGutter",
-      "scrollGutter",
-      "updateHighlights",
-      "scrollHighlights"
+      "updateGutterDiv",
+      "scrollGutterDiv",
+      "updateOverlayDiv",
+      "scrollOverlayDiv"
     ]);
   }
 
@@ -72,7 +72,6 @@ class PrettyPrinter extends Element {
     "onChange",
     "editable",
     "hiddenGutter",
-    "hiddenGutter",
     "noScrollbars",
     "fancyScrollbars"
   ];
@@ -85,7 +84,7 @@ export default withStyle(PrettyPrinter)`
   display: grid;
   overflow: hidden;
   grid-template-rows: auto;
-  grid-template-areas: "gutter highlights-rich-textarea";
+  grid-template-areas: "gutter overlay-rich-textarea";
   grid-template-columns: min-content auto;  
 
   color: inherit;

package/src/richTextarea.js

@@ -69,7 +69,7 @@ export default withStyle(class extends RichTextarea {
   tab-size: 2;
   overflow: scroll;
   position: relative;
-  grid-area: highlights-rich-textarea;
+  grid-area: overlay-rich-textarea;
   white-space: pre;
   overflow-wrap: normal;
   background-color: transparent;