yapp 2.1.2 → 2.1.8

package/src/yapp.js

@@ -6,9 +6,9 @@ import { React, Element } from "easy";
 
 import RichTextarea from "./richTextarea";
 import PrettyPrinter from "./prettyPrinter";
-import scrollBarThickness from "./scrollbarThickness";
 
 import { stripPixels } from "./utilities/css";
+import { getScrollbarThickness } from "./utilities/scrollbarThickness";
 import { pluginFromLanguageAndPlugin } from "./utilities/plugin";
 import { TOP, LEFT, RIGHT, LINE_HEIGHT, BOTTOM } from "./constants";
 import { propertiesFromContentLanguagePluginAndOptions } from "./utilities/properties";
@@ -62,6 +62,14 @@ class Yapp extends Element {
     return borderLeftWidth;
   }
 
+  getInitialLineCount() {
+    const content = this.getContent(),
+          lineCount = lineCountFromContent(content),
+          initialLineCount = lineCount; ///
+
+    return initialLineCount;
+  }
+
   getBorderRightWidth() {
     const side = RIGHT,
           borderRightWidth = this.getBorderWidth(side);
@@ -76,6 +84,13 @@ class Yapp extends Element {
     return borderBottomWidth;
   }
 
+  getScrollbarThickness() {
+    const { fancyScrollbars = DEFAULT_FANCY_SCROLLBARS } = this.properties,
+          scrollbarThickness = getScrollbarThickness(fancyScrollbars);
+
+    return scrollbarThickness;
+  }
+
   setLexer(lexer) { this.plugin.setLexer(lexer); }
 
   setParser(parser) { this.plugin.setParser(parser); }
@@ -138,12 +153,12 @@ class Yapp extends Element {
   }
 
   render() {
-    const content = this.getContent(),
-          lineCount = lineCountFromContent(content),
-          lineHeight = this.getLineHeight(),
+    const lineHeight = this.getLineHeight(),
           borderTopWidth = this.getBorderTopWidth(),
+          initialLineCount = this.getInitialLineCount(),
           borderBottomWidth = this.getBorderBottomWidth(),
-          height = lineCount * lineHeight + scrollBarThickness + borderTopWidth + borderBottomWidth;
+          scrollbarThickness = this.getScrollbarThickness(),
+          height = initialLineCount * lineHeight + borderTopWidth + borderBottomWidth + scrollbarThickness;
 
     this.setHeight(height);
 
@@ -177,11 +192,12 @@ class Yapp extends Element {
   childElements() {
     const { hiddenGutter = DEFAULT_HIDDEN_GUTTER, fancyScrollbars = DEFAULT_FANCY_SCROLLBARS } = this.properties,
           changeHandler = this.changeHandler.bind(this),
-          scrollHandler = this.scrollHandler.bind(this);
+          scrollHandler = this.scrollHandler.bind(this),
+          scrollbarThickness = this.getScrollbarThickness();
 
     return ([
 
-      <PrettyPrinter hiddenGutter={hiddenGutter} />,
+      <PrettyPrinter hiddenGutter={hiddenGutter} scrollbarThickness={scrollbarThickness} />,
       <RichTextarea onChange={changeHandler} onScroll={scrollHandler} fancyScrollbars={fancyScrollbars} active />
 
     ]);

package/lib/scrollbarThickness.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-exports.default = void 0;
-var _easy = require("easy");
-var body = new _easy.Body(), style = {
-    width: "50px",
-    height: "50px",
-    overflow: "scroll"
-}, outerDiv = /*#__PURE__*/ _easy.React.createElement("div", {
-    style: style
-}), innerDiv = /*#__PURE__*/ _easy.React.createElement("div", null);
-outerDiv.append(innerDiv);
-body.append(outerDiv);
-var outerDivWidth = outerDiv.getWidth(), innerDivWidth = innerDiv.getWidth(), scrollbarThickness = outerDivWidth - innerDivWidth; ///
-outerDiv.remove();
-var _default = scrollbarThickness;
-exports.default = _default;
-
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9zY3JvbGxiYXJUaGlja25lc3MuanMiXSwibmFtZXMiOlsiUmVhY3QiLCJCb2R5IiwiYm9keSIsInN0eWxlIiwid2lkdGgiLCJoZWlnaHQiLCJvdmVyZmxvdyIsIm91dGVyRGl2IiwiZGl2IiwiaW5uZXJEaXYiLCJhcHBlbmQiLCJvdXRlckRpdldpZHRoIiwiZ2V0V2lkdGgiLCJpbm5lckRpdldpZHRoIiwic2Nyb2xsYmFyVGhpY2tuZXNzIiwicmVtb3ZlIl0sIm1hcHBpbmdzIjoiQUFBQSxDQUFZOzs7OztBQUVnQixHQUFNLENBQU4sS0FBTTtBQUVsQyxHQUFLLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FGWSxLQUFNLFNBRzVCLEtBQUssR0FBRyxDQUFDO0lBQ1AsS0FBSyxFQUFFLENBQU07SUFDYixNQUFNLEVBQUUsQ0FBTTtJQUNkLFFBQVEsRUFBRSxDQUFRO0FBQ3BCLENBQUMsRUFDRCxRQUFRLGlCQVJjLEtBQU0scUJBVXpCLENBQUc7SUFBQyxLQUFLLEVBQUUsS0FBSztJQUduQixRQUFRLGlCQWJjLEtBQU0scUJBZXpCLENBQUc7QUFJWixRQUFRLENBQUMsTUFBTSxDQUFDLFFBQVE7QUFFeEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRO0FBRXBCLEdBQUssQ0FBQyxhQUFhLEdBQUcsUUFBUSxDQUFDLFFBQVEsSUFDakMsYUFBYSxHQUFHLFFBQVEsQ0FBQyxRQUFRLElBQ2pDLGtCQUFrQixHQUFHLGFBQWEsR0FBRyxhQUFhLENBQUUsQ0FBRyxBQUFILEVBQUcsQUFBSCxDQUFHO0FBRTdELFFBQVEsQ0FBQyxNQUFNO2VBRUEsa0JBQWtCIiwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IFJlYWN0LCBCb2R5IH0gZnJvbSBcImVhc3lcIjtcblxuY29uc3QgYm9keSA9IG5ldyBCb2R5KCksXG4gICAgICBzdHlsZSA9IHtcbiAgICAgICAgd2lkdGg6IFwiNTBweFwiLFxuICAgICAgICBoZWlnaHQ6IFwiNTBweFwiLFxuICAgICAgICBvdmVyZmxvdzogXCJzY3JvbGxcIlxuICAgICAgfSxcbiAgICAgIG91dGVyRGl2ID1cblxuICAgICAgICA8ZGl2IHN0eWxlPXtzdHlsZX0gLz5cblxuICAgICAgLFxuICAgICAgaW5uZXJEaXYgPVxuXG4gICAgICAgIDxkaXYgLz5cblxuICAgICAgO1xuXG5vdXRlckRpdi5hcHBlbmQoaW5uZXJEaXYpO1xuXG5ib2R5LmFwcGVuZChvdXRlckRpdik7XG5cbmNvbnN0IG91dGVyRGl2V2lkdGggPSBvdXRlckRpdi5nZXRXaWR0aCgpLFxuICAgICAgaW5uZXJEaXZXaWR0aCA9IGlubmVyRGl2LmdldFdpZHRoKCksXG4gICAgICBzY3JvbGxiYXJUaGlja25lc3MgPSBvdXRlckRpdldpZHRoIC0gaW5uZXJEaXZXaWR0aDsgLy8vXG5cbm91dGVyRGl2LnJlbW92ZSgpO1xuXG5leHBvcnQgZGVmYXVsdCBzY3JvbGxiYXJUaGlja25lc3M7XG4iXX0=

package/src/scrollbarThickness.js

@@ -1,32 +0,0 @@
-"use strict";
-
-import { React, Body } from "easy";
-
-const body = new Body(),
-      style = {
-        width: "50px",
-        height: "50px",
-        overflow: "scroll"
-      },
-      outerDiv =
-
-        <div style={style} />
-
-      ,
-      innerDiv =
-
-        <div />
-
-      ;
-
-outerDiv.append(innerDiv);
-
-body.append(outerDiv);
-
-const outerDivWidth = outerDiv.getWidth(),
-      innerDivWidth = innerDiv.getWidth(),
-      scrollbarThickness = outerDivWidth - innerDivWidth; ///
-
-outerDiv.remove();
-
-export default scrollbarThickness;