@ntbjs/react-components 1.2.0-rc.73 → 1.2.0-rc.75

package/{AssetGallery-6064e6df.js → AssetGallery-ad882f6f.js}

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

package/{Instructions-242c8df0.js → Instructions-eea791d6.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-734991c9.js');
+var TextArea = require('./TextArea-72a3f301.js');
 var styled = require('styled-components');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

package/{TextArea-734991c9.js → TextArea-72a3f301.js}

@@ -2,6 +2,8 @@
 
 var defaultTheme = require('./defaultTheme-ea44e34a.js');
 var React = require('react');
+var useMergedRefs = require('./useMergedRefs-b6d2f8fc.js');
+var nanoid = require('nanoid');
 require('./Alert-13b75102.js');
 require('./Badge-aec841c8.js');
 require('./Popover-569cd272.js');
@@ -9,8 +11,6 @@ require('./Tab-f499ecbc.js');
 require('./Tabs-ea48ce3e.js');
 var Tooltip = require('./Tooltip-66daf6e3.js');
 require('./VerificationStatusIcon-6fe95a92.js');
-var nanoid = require('nanoid');
-var useMergedRefs = require('./useMergedRefs-b6d2f8fc.js');
 var editNote = require('./edit-note-c47d292e.js');
 var styled = require('styled-components');
 
@@ -208,12 +208,13 @@ var TextArea = React__default['default'].forwardRef(function TextArea(_ref, forw
       lightBackground = _ref.lightBackground,
       noBorder = _ref.noBorder,
       instructionsTextArea = _ref.instructionsTextArea,
+      isExpanded = _ref.isExpanded,
       loadingIcon = _ref.loadingIcon,
       successIcon = _ref.successIcon,
       padding = _ref.padding,
       descriptionToolTip = _ref.descriptionToolTip,
       resetExpansion = _ref.resetExpansion,
-      rest = defaultTheme._objectWithoutProperties(_ref, ["value", "defaultValue", "name", "label", "placeholder", "required", "disabled", "hidden", "readOnly", "edit", "showMore", "showMoreText", "showLessText", "autoComplete", "description", "type", "icon", "rows", "className", "style", "onChange", "onBlur", "lightBackground", "noBorder", "instructionsTextArea", "loadingIcon", "successIcon", "padding", "descriptionToolTip", "resetExpansion"]);
+      rest = defaultTheme._objectWithoutProperties(_ref, ["value", "defaultValue", "name", "label", "placeholder", "required", "disabled", "hidden", "readOnly", "edit", "showMore", "showMoreText", "showLessText", "autoComplete", "description", "type", "icon", "rows", "className", "style", "onChange", "onBlur", "lightBackground", "noBorder", "instructionsTextArea", "isExpanded", "loadingIcon", "successIcon", "padding", "descriptionToolTip", "resetExpansion"]);
 
   var textInputDomNode = React.useRef(null);
   var textInputRef = useMergedRefs.useMergedRefs(forwardedRef, textInputDomNode);
@@ -228,45 +229,79 @@ var TextArea = React__default['default'].forwardRef(function TextArea(_ref, forw
       defaultInput = _useState4[0],
       setDefaultInput = _useState4[1];
 
-  var _useState5 = React.useState(false),
+  var _useState5 = React.useState(''),
       _useState6 = defaultTheme._slicedToArray(_useState5, 2),
-      expanded = _useState6[0],
-      setExpanded = _useState6[1];
+      maxContentRows = _useState6[0],
+      setMaxContentRows = _useState6[1];
 
-  var _useState7 = React.useState(nanoid.nanoid()),
-      _useState8 = defaultTheme._slicedToArray(_useState7, 1),
-      uniqueId = _useState8[0];
+  var _useState7 = React.useState(false),
+      _useState8 = defaultTheme._slicedToArray(_useState7, 2),
+      expanded = _useState8[0],
+      setExpanded = _useState8[1];
 
-  var _useState9 = React.useState(false),
+  var _useState9 = React.useState(''),
       _useState10 = defaultTheme._slicedToArray(_useState9, 2),
-      showMoreVisible = _useState10[0],
-      setShowMoreVisible = _useState10[1];
+      maxHeight = _useState10[0],
+      setMaxHeight = _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 initialHeightRef = React.useRef(null);
+
+  var _useState17 = React.useState(nanoid.nanoid()),
+      _useState18 = defaultTheme._slicedToArray(_useState17, 1),
+      uniqueId = _useState18[0];
+
+  var memoizedDescriptionToolTip = React.useMemo(function () {
+    return descriptionToolTip;
+  }, [descriptionToolTip]);
   React.useEffect(function () {
+    resetHeightToDefaultRows();
     setExpanded(false);
-    calculateHeight();
   }, []);
   React.useEffect(function () {
     setExpanded(false);
     setDefaultInput(value || defaultValue);
+    resetHeightToDefaultRows();
   }, [resetExpansion]);
+  React.useEffect(function () {
+    console.log('Expanded state:', expanded);
+    isExpanded(expanded);
+  }, [expanded]);
   React.useLayoutEffect(function () {
-    calculateHeight();
-    setExpanded(true);
+    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(true);
+    }
   }, [value, defaultValue, rows]);
+  React.useEffect(function () {
+    setAutoFocus(false);
+    initialHeightRef.current = null;
+  }, [rows]);
 
-  var calculateHeight = function calculateHeight() {
+  var resetHeightToDefaultRows = function resetHeightToDefaultRows() {
     var textareaRefCurrent = textInputDomNode.current;
 
     if (textareaRefCurrent !== null) {
-      textareaRefCurrent.style.height = 'auto';
-      var newHeight = textareaRefCurrent.scrollHeight;
-
-      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)) {
-        textareaRefCurrent.style.height = "".concat(newHeight, "px");
-      }
-
-      setShowMoreVisible(newHeight > rows * 16);
+      textareaRefCurrent.style.height = "".concat(defaultHeight, "px");
+      console.log('textareaRefCurrent.style.height state:', textareaRefCurrent.style.height);
+      console.log('defaultHeight state:', defaultHeight);
     }
   };
 
@@ -275,6 +310,10 @@ var TextArea = React__default['default'].forwardRef(function TextArea(_ref, forw
 
     if (textareaRefCurrent !== null) {
       textareaRefCurrent.style.height = "".concat(textareaRefCurrent.scrollHeight, "px");
+      console.log('textareaRefCurrent.style.height on click state:', textareaRefCurrent.style.height);
+    }
+
+    if (!expanded) {
       setExpanded(true);
     }
   };
@@ -286,9 +325,47 @@ 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));
+      setExpanded(newHeight > (initialHeightRef.current || 0));
+    }
+  };
+
   var onKeyDown = React.useCallback(function (event) {
     if (event.key === 'Enter') {
       event.stopPropagation();
@@ -303,9 +380,12 @@ var TextArea = React__default['default'].forwardRef(function TextArea(_ref, forw
       className: className,
       style: style
     }, React__default['default'].createElement(TextInputFieldIconAlert, null, icon), React__default['default'].createElement(TextInputField, defaultTheme._extends({
+      autoFocus: autoFocus,
       ref: textInputRef,
       rows: rows,
       expanded: expanded,
+      defaultHeight: defaultHeight,
+      maxHeight: maxHeight,
       value: value,
       defaultValue: defaultValue,
       name: name,
@@ -316,6 +396,7 @@ 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),
@@ -327,19 +408,26 @@ var TextArea = React__default['default'].forwardRef(function TextArea(_ref, forw
       onChange: function onChange(e) {
         if (e.target.value) {
           setInputIsEmpty(false);
+
+          if (!autoFocus) {
+            setAutoFocus(true);
+          }
         } else {
           setInputIsEmpty(true);
+
+          if (!autoFocus) {
+            setAutoFocus(true);
+          }
         }
 
         _onChange(e);
-
-        calculateHeight();
       },
       onKeyDown: onKeyDown,
       onBlur: onBlur,
-      onClick: handleTextAreaClick,
       noBorder: noBorder
-    }, rest)), (type === 'loading' || type === 'success') && React__default['default'].createElement(SuccessContainer, null, type === 'loading' && loadingIcon, type === 'success' && successIcon), !readOnly && noBorder && React__default['default'].createElement(InputIconContainer, {
+    }, rest, {
+      onClick: handleTextAreaClick
+    })), (type === 'loading' || type === 'success') && React__default['default'].createElement(SuccessContainer, null, type === 'loading' && loadingIcon, type === 'success' && successIcon), !readOnly && noBorder && React__default['default'].createElement(InputIconContainer, {
       disabled: disabled
     }, React__default['default'].createElement(editNote.SvgEditNote, {
       className: padding === 'small' ? 'smallPadingIcon' : undefined
@@ -348,34 +436,39 @@ var TextArea = React__default['default'].forwardRef(function TextArea(_ref, forw
       hasPlaceholder: Boolean(placeholder),
       hasIcon: Boolean(icon),
       inputIsEmpty: inputIsEmpty
-    }, label, required && ' *'), description && React__default['default'].createElement(Description, {
+    }, label, required && ' *'), typeof description === 'string' && description.length > 0 && React__default['default'].createElement(Description, {
       type: type
-    }, description), showMore && showMoreVisible && React__default['default'].createElement(ShowMoreText, {
-      onClick: handleTextAreaShowLess,
+    }, description), maxContentRows > rows && showMore && React__default['default'].createElement(ShowMoreText, {
+      onClick: showMore ? handleTextAreaShowLess : undefined,
       expanded: expanded
-    }, !expanded ? showMoreText : showLessText));
+    }, !expanded ? showMoreText : expanded ? showLessText : null));
   };
 
   if (hidden) return null;
-  return React__default['default'].createElement(React__default['default'].Fragment, null, !descriptionToolTip ? input() : React__default['default'].createElement(Tooltip.Tooltip, {
-    content: descriptionToolTip,
+  return React__default['default'].createElement(React__default['default'].Fragment, null, !memoizedDescriptionToolTip && input(), memoizedDescriptionToolTip && React__default['default'].createElement("div", null, React__default['default'].createElement(Tooltip.Tooltip, {
+    content: memoizedDescriptionToolTip,
+    key: "tooltipTextArea1",
     placement: "bottom-end",
-    trigger: "mouseenter",
+    trigger: 'mouseenter',
     zIndex: 999999
-  }, input()));
+  }, input())));
 });
 TextArea.defaultProps = {
   rows: 4,
   noBorder: false,
   readOnly: false,
+  edit: false,
   hidden: false,
   showMore: false,
-  showMoreText: 'Show More',
-  showLessText: 'Show Less',
+  showMoreText: '',
+  showLessText: '',
   type: '',
   padding: 'medium',
+  instructionsTextArea: false,
   descriptionToolTip: '',
-  onChange: function onChange() {}
+  isExpanded: function isExpanded() {},
+  onChange: function onChange() {},
+  resetExpansion: ''
 };
 TextArea.propTypes = process.env.NODE_ENV !== "production" ? {
   value: defaultTheme.PropTypes.string,

package/inputs/TextArea/index.js

@@ -1,9 +1,11 @@
 'use strict';
 
-var TextArea = require('../../TextArea-734991c9.js');
+var TextArea = require('../../TextArea-72a3f301.js');
 require('../../defaultTheme-ea44e34a.js');
 require('styled-components');
 require('react');
+require('../../useMergedRefs-b6d2f8fc.js');
+require('nanoid');
 require('../../Alert-13b75102.js');
 require('lodash');
 require('../../Badge-aec841c8.js');
@@ -16,8 +18,6 @@ require('../../Tab-f499ecbc.js');
 require('../../Tabs-ea48ce3e.js');
 require('../../Tooltip-66daf6e3.js');
 require('../../VerificationStatusIcon-6fe95a92.js');
-require('nanoid');
-require('../../useMergedRefs-b6d2f8fc.js');
 require('../../edit-note-c47d292e.js');
 
 

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-734991c9.js');
+var TextArea = require('../TextArea-72a3f301.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.73",
+  "version": "1.2.0-rc.75",
   "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-6064e6df.js');
+var AssetGallery = require('../../AssetGallery-ad882f6f.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-734991c9.js');
+require('../../TextArea-72a3f301.js');
 require('../../Switch-4a41585f.js');
 require('../../ContextMenuItem-ba2b697e.js');
 

package/widgets/Instructions/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Instructions = require('../../Instructions-242c8df0.js');
+var Instructions = require('../../Instructions-eea791d6.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-734991c9.js');
+require('../../TextArea-72a3f301.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-6064e6df.js');
+var AssetGallery = require('../AssetGallery-ad882f6f.js');
 var ContextMenu = require('../ContextMenu-4ec3d9f3.js');
 var AssetPreviewTopBar = require('../AssetPreviewTopBar-c28715f7.js');
-var Instructions = require('../Instructions-242c8df0.js');
+var Instructions = require('../Instructions-eea791d6.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-734991c9.js');
+require('../TextArea-72a3f301.js');
 require('../Switch-4a41585f.js');
 require('../ContextMenuItem-ba2b697e.js');