@ntbjs/react-components 1.2.0-rc.76 → 1.2.0-rc.77

package/{AssetGallery-3d52ddb9.js → AssetGallery-0bbf5926.js}

@@ -24,7 +24,7 @@ require('./CompactStarRating-a754fc6f.js');
 require('./CompactTextInput-baf13d5c.js');
 require('./MultiSelect-4b8d3d0d.js');
 require('./Radio-32d0513a.js');
-require('./TextArea-e1444a0b.js');
+require('./TextArea-100beee3.js');
 require('./TextInput-0d109708.js');
 require('./Switch-4a41585f.js');
 var ContextMenu = require('./ContextMenu-4ec3d9f3.js');

package/{Instructions-8b2df6f8.js → Instructions-94419fe8.js}

@@ -5,7 +5,7 @@ var lodash = require('lodash');
 var React = require('react');
 var warningCircle = require('./warning-circle-24522402.js');
 var CompactAutocompleteSelect = require('./CompactAutocompleteSelect-5982dcf2.js');
-var TextArea = require('./TextArea-e1444a0b.js');
+var TextArea = require('./TextArea-100beee3.js');
 var styled = require('styled-components');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

package/{TextArea-e1444a0b.js → TextArea-100beee3.js}

@@ -228,87 +228,85 @@ var TextArea = React__default['default'].forwardRef(function TextArea(_ref, forw
       defaultInput = _useState4[0],
       setDefaultInput = _useState4[1];
 
-  var _useState5 = React.useState(''),
+  var _useState5 = React.useState(false),
       _useState6 = defaultTheme._slicedToArray(_useState5, 2),
-      maxContentRows = _useState6[0],
-      setMaxContentRows = _useState6[1];
+      expanded = _useState6[0],
+      setExpanded = _useState6[1];
 
   var _useState7 = React.useState(false),
       _useState8 = defaultTheme._slicedToArray(_useState7, 2),
-      expanded = _useState8[0],
-      setExpanded = _useState8[1];
+      autoFocus = _useState8[0],
+      setAutoFocus = _useState8[1];
 
-  var _useState9 = React.useState(''),
+  var _useState9 = React.useState(false),
       _useState10 = defaultTheme._slicedToArray(_useState9, 2),
-      maxHeight = _useState10[0],
-      setMaxHeight = _useState10[1];
+      scrollHeightExceedsRows = _useState10[0],
+      setScrollHeightExceedsRows = _useState10[1];
 
-  var _useState11 = React.useState(''),
-      _useState12 = defaultTheme._slicedToArray(_useState11, 2),
-      defaultHeight = _useState12[0],
-      setDefaultHeight = _useState12[1];
-
-  var _useState13 = React.useState(false),
-      _useState14 = defaultTheme._slicedToArray(_useState13, 2),
-      autoFocus = _useState14[0],
-      setAutoFocus = _useState14[1];
-
-  var _useState15 = React.useState(false),
-      _useState16 = defaultTheme._slicedToArray(_useState15, 2),
-      scrollHeightExceedsRows = _useState16[0],
-      setScrollHeightExceedsRows = _useState16[1];
+  var _useState11 = React.useState(nanoid.nanoid()),
+      _useState12 = defaultTheme._slicedToArray(_useState11, 1),
+      uniqueId = _useState12[0];
 
   var initialHeightRef = React.useRef(null);
-
-  var _useState17 = React.useState(nanoid.nanoid()),
-      _useState18 = defaultTheme._slicedToArray(_useState17, 1),
-      uniqueId = _useState18[0];
-
+  var defaultHeight = rows * 16;
+  console.log('scrollHeightExceedsRows', scrollHeightExceedsRows);
   var memoizedDescriptionToolTip = React.useMemo(function () {
     return descriptionToolTip;
   }, [descriptionToolTip]);
+
+  var defaultHeightFunction = function defaultHeightFunction() {
+    var textareaRefCurrent = textInputDomNode.current;
+    textareaRefCurrent.style.height = "".concat(defaultHeight, "px");
+    setScrollHeightExceedsRows(false);
+  };
+
+  var adjustHeighToScroll = function adjustHeighToScroll() {
+    var textareaRefCurrent = textInputDomNode === null || textInputDomNode === void 0 ? void 0 : textInputDomNode.current;
+
+    if (textareaRefCurrent !== null) {
+      textareaRefCurrent.style.height = 'auto';
+      var newHeight = textareaRefCurrent.scrollHeight;
+      textareaRefCurrent.style.height = "".concat(newHeight, "px");
+      setScrollHeightExceedsRows(newHeight > initialHeightRef.current);
+    }
+  };
+
   React.useEffect(function () {
-    resetHeightToDefaultRows();
+    defaultHeightFunction();
+    setDefaultInput(value || defaultValue);
     setExpanded(false);
+    adjustHeighToScroll();
+
+    if ((value || defaultValue) != defaultInput) {
+      adjustHeighToScroll();
+    }
   }, []);
   React.useEffect(function () {
-    setExpanded(false);
+    var textareaRefCurrent = textInputDomNode.current;
+    var newHeight = textareaRefCurrent.scrollHeight;
+    setScrollHeightExceedsRows(newHeight > defaultHeight);
+    defaultHeightFunction();
     setDefaultInput(value || defaultValue);
-    resetHeightToDefaultRows();
+    setExpanded(false);
   }, [resetExpansion]);
-  React.useLayoutEffect(function () {
-    calculateRows();
-    setAutoFocus(false);
-
-    if (defaultValue !== null && defaultValue !== void 0 && defaultValue.length || (value === null || value === void 0 ? void 0 : value.length) != (defaultInput === null || defaultInput === void 0 ? void 0 : defaultInput.length)) {
-      calculateHeight();
-      setExpanded(false);
-    }
-  }, [value, defaultValue, rows]);
   React.useEffect(function () {
-    setAutoFocus(false);
-    initialHeightRef.current = null;
-  }, [rows]);
-
-  var resetHeightToDefaultRows = function resetHeightToDefaultRows() {
-    var textareaRefCurrent = textInputDomNode.current;
+    defaultHeightFunction();
 
-    if (textareaRefCurrent !== null) {
-      textareaRefCurrent.style.height = "".concat(defaultHeight, "px");
-      console.log('textareaRefCurrent.style.height state:', textareaRefCurrent.style.height);
-      console.log('defaultHeight state:', defaultHeight);
+    if ((value || defaultValue) != defaultInput) {
+      adjustHeighToScroll();
     }
-  };
+  }, [value, defaultValue]);
 
   var handleTextAreaClick = function handleTextAreaClick() {
     var textareaRefCurrent = textInputDomNode.current;
 
     if (textareaRefCurrent !== null) {
       textareaRefCurrent.style.height = "".concat(textareaRefCurrent.scrollHeight, "px");
-      console.log('textareaRefCurrent.style.height on click state:', textareaRefCurrent.style.height);
     }
 
-    setExpanded(!expanded);
+    if (!expanded) {
+      setExpanded(true);
+    }
   };
 
   var handleTextAreaShowLess = function handleTextAreaShowLess() {
@@ -318,46 +316,9 @@ var TextArea = React__default['default'].forwardRef(function TextArea(_ref, forw
       textareaRefCurrent.style.height = expanded ? "".concat(rows * 16, "px") : "".concat(textareaRefCurrent.scrollHeight, "px");
     }
 
-    console.log('textareaRefCurrent.style.height on handleTextAreaShowLess :', textareaRefCurrent.style.height);
     setExpanded(!expanded);
   };
 
-  var calculateRows = function calculateRows() {
-    var textareaRefCurrent = textInputDomNode.current;
-
-    if (textareaRefCurrent !== null) {
-      var textAreaHeight = textareaRefCurrent.scrollHeight;
-      console.log('textAreaHeight :', textAreaHeight);
-      var lineHeight = 16;
-      var calculatedRows = Math.floor(textAreaHeight / lineHeight);
-      var defaultRowsHeight = rows * lineHeight;
-      setMaxContentRows(calculatedRows);
-
-      if (calculatedRows > rows) {
-        setDefaultHeight(defaultRowsHeight);
-        setMaxHeight(textAreaHeight);
-      } else {
-        setMaxHeight('');
-      }
-    }
-  };
-
-  var calculateHeight = function calculateHeight() {
-    var textareaRefCurrent = textInputDomNode === null || textInputDomNode === void 0 ? void 0 : textInputDomNode.current;
-
-    if (textareaRefCurrent !== null) {
-      textareaRefCurrent.style.height = 'auto';
-      var newHeight = textareaRefCurrent.scrollHeight;
-      textareaRefCurrent.style.height = "".concat(newHeight, "px");
-
-      if (initialHeightRef.current === null) {
-        initialHeightRef.current = newHeight;
-      }
-
-      setScrollHeightExceedsRows(newHeight > (initialHeightRef.current || 0));
-    }
-  };
-
   var onKeyDown = React.useCallback(function (event) {
     if (event.key === 'Enter') {
       event.stopPropagation();
@@ -377,7 +338,6 @@ var TextArea = React__default['default'].forwardRef(function TextArea(_ref, forw
       rows: rows,
       expanded: expanded,
       defaultHeight: defaultHeight,
-      maxHeight: maxHeight,
       value: value,
       defaultValue: defaultValue,
       name: name,
@@ -388,7 +348,6 @@ var TextArea = React__default['default'].forwardRef(function TextArea(_ref, forw
       edit: edit,
       instructionsTextArea: instructionsTextArea,
       showMore: showMore,
-      scrollHeightExceedsRows: scrollHeightExceedsRows,
       type: type,
       autoComplete: autoComplete,
       hasIcon: Boolean(icon),
@@ -430,7 +389,7 @@ var TextArea = React__default['default'].forwardRef(function TextArea(_ref, forw
       inputIsEmpty: inputIsEmpty
     }, label, required && ' *'), typeof description === 'string' && description.length > 0 && React__default['default'].createElement(Description, {
       type: type
-    }, description), maxContentRows > rows && showMore && React__default['default'].createElement(ShowMoreText, {
+    }, description), showMore && React__default['default'].createElement(ShowMoreText, {
       onClick: showMore ? handleTextAreaShowLess : undefined,
       expanded: expanded
     }, !expanded ? showMoreText : expanded ? showLessText : null));
@@ -458,6 +417,7 @@ TextArea.defaultProps = {
   padding: 'medium',
   instructionsTextArea: false,
   descriptionToolTip: '',
+  isExpanded: function isExpanded() {},
   onChange: function onChange() {},
   resetExpansion: ''
 };
@@ -488,6 +448,7 @@ TextArea.propTypes = process.env.NODE_ENV !== "production" ? {
   onChange: defaultTheme.PropTypes.func,
   onBlur: defaultTheme.PropTypes.func,
   noBorder: defaultTheme.PropTypes.bool,
+  isExpanded: defaultTheme.PropTypes.func,
   type: defaultTheme.PropTypes.oneOf(['', 'error', 'error-border', 'warning-border', 'warning', 'instructions-warning', 'loading', 'success']),
   instructionsTextArea: defaultTheme.PropTypes.bool,
   loadingIcon: defaultTheme.PropTypes.element,

package/inputs/TextArea/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var TextArea = require('../../TextArea-e1444a0b.js');
+var TextArea = require('../../TextArea-100beee3.js');
 require('../../defaultTheme-ea44e34a.js');
 require('styled-components');
 require('react');

package/inputs/index.js

@@ -10,7 +10,7 @@ var CompactStarRating = require('../CompactStarRating-a754fc6f.js');
 var CompactTextInput = require('../CompactTextInput-baf13d5c.js');
 var MultiSelect = require('../MultiSelect-4b8d3d0d.js');
 var Radio = require('../Radio-32d0513a.js');
-var TextArea = require('../TextArea-e1444a0b.js');
+var TextArea = require('../TextArea-100beee3.js');
 var TextInput = require('../TextInput-0d109708.js');
 var Switch = require('../Switch-4a41585f.js');
 var MultiLevelCheckboxSelect = require('../MultiLevelCheckboxSelect-24c88aaa.js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ntbjs/react-components",
-  "version": "1.2.0-rc.76",
+  "version": "1.2.0-rc.77",
   "description": "NTBs common front-end design utilities and React components.",
   "scripts": {
     "build": "cross-env NODE_ENV=production rollup -c",

package/widgets/AssetGallery/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var AssetGallery = require('../../AssetGallery-3d52ddb9.js');
+var AssetGallery = require('../../AssetGallery-0bbf5926.js');
 require('../../defaultTheme-ea44e34a.js');
 require('styled-components');
 require('lodash');
@@ -41,7 +41,7 @@ require('../../CompactStarRating-a754fc6f.js');
 require('../../CompactTextInput-baf13d5c.js');
 require('../../MultiSelect-4b8d3d0d.js');
 require('../../Radio-32d0513a.js');
-require('../../TextArea-e1444a0b.js');
+require('../../TextArea-100beee3.js');
 require('../../Switch-4a41585f.js');
 require('../../ContextMenuItem-ba2b697e.js');
 

package/widgets/Instructions/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Instructions = require('../../Instructions-8b2df6f8.js');
+var Instructions = require('../../Instructions-94419fe8.js');
 require('../../defaultTheme-ea44e34a.js');
 require('styled-components');
 require('lodash');
@@ -25,7 +25,7 @@ require('../../react-select-creatable.esm-2f23d6c6.js');
 require('react-dom');
 require('../../close-ebf2f3cf.js');
 require('../../expand-more-94585605.js');
-require('../../TextArea-e1444a0b.js');
+require('../../TextArea-100beee3.js');
 require('../../useMergedRefs-b6d2f8fc.js');
 require('../../edit-note-c47d292e.js');
 

package/widgets/index.js

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var AssetGallery = require('../AssetGallery-3d52ddb9.js');
+var AssetGallery = require('../AssetGallery-0bbf5926.js');
 var ContextMenu = require('../ContextMenu-4ec3d9f3.js');
 var AssetPreviewTopBar = require('../AssetPreviewTopBar-c28715f7.js');
-var Instructions = require('../Instructions-8b2df6f8.js');
+var Instructions = require('../Instructions-94419fe8.js');
 require('../defaultTheme-ea44e34a.js');
 require('styled-components');
 require('lodash');
@@ -45,7 +45,7 @@ require('../CompactStarRating-a754fc6f.js');
 require('../CompactTextInput-baf13d5c.js');
 require('../MultiSelect-4b8d3d0d.js');
 require('../Radio-32d0513a.js');
-require('../TextArea-e1444a0b.js');
+require('../TextArea-100beee3.js');
 require('../Switch-4a41585f.js');
 require('../ContextMenuItem-ba2b697e.js');