@ntbjs/react-components 1.2.0-rc.66 → 1.2.0-rc.68

package/{AssetGallery-fe6cab8a.js → AssetGallery-f0fe5431.js}

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

package/{Instructions-4874a9f7.js → Instructions-6a089fcf.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-e97f4790.js');
+var TextArea = require('./TextArea-85663f8d.js');
 var styled = require('styled-components');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

package/{TextArea-e97f4790.js → TextArea-85663f8d.js}

@@ -35,14 +35,14 @@ var InputIconContainer = styled__default['default'].div.attrs(defaultTheme.apply
 }, function (props) {
   return props.disabled && styled.css(_templateObject6 || (_templateObject6 = defaultTheme._taggedTemplateLiteral(["\n        display: none;\n      "])));
 });
-var TextInputField = styled__default['default'].textarea.attrs(defaultTheme.applyDefaultTheme)(_templateObject7 || (_templateObject7 = defaultTheme._taggedTemplateLiteral(["\n  width: 100%;\n  font-family: inherit;\n  font-size: 0.875rem;\n  border-radius: 2px;\n  padding: 5px 10px;\n  resize: vertical;\n  z-index: 0;\n  border-radius: 3px;\n  box-sizing: border-box;\n  appearance: none;\n  border: 1px solid;\n\n  ", "\n\n  ", "\n\n  ", "\n\n  ", "\n  ", "\n\n    transition: height 550ms ease-in-out; border-color 350ms;\n\n  ", "\n\n  ", "\n\n  ", "\n\n  ", "\n  \n  ", "\n \n  ", "\n\n   ", "\n     \n  ", "\n\n  ", "\n\n  ", " \n\n  ", "  \n\n  ", "  \n  \n\n  ", "   \n    \n  ", "\n\n  ", "\n\n      ", "       \n\n  ", "\n    \n  \n    ", "\n\n  ", "\n\n  ", ";\n\n  ", ";\n\n  ", ";\n\n  ", ";\n\n \n  ", "\n\n  &&:hover:not(:focus) {\n    ", ";\n\n    ", ";\n\n    ", "\n\n    ", ";\n\n  \n     ", "; \n\n\n    ", ";\n    transition: background 350ms;\n    & + ", " {\n      opacity: 1;\n      ", ";\n      transition: opacity 350ms;\n    }\n  }\n\n  &::placeholder {\n    ", "\n\n    ", "\n  }\n\n  &&:focus {\n    outline: none;\n    ", "\n\n    ", ";\n\n        \n    ", "  \n      \n    ", "\n\n  }\n\n  &&:not(:hover):not(:focus) {\n    ", ";\n\n    ", ";\n\n        ", ";\n  }\n"])), function (props) {
+var TextInputField = styled__default['default'].textarea.attrs(defaultTheme.applyDefaultTheme)(_templateObject7 || (_templateObject7 = defaultTheme._taggedTemplateLiteral(["\n  width: 100%;\n  font-family: inherit;\n  font-size: 0.875rem;\n  border-radius: 2px;\n  padding: 5px 10px;\n  resize: vertical;\n  z-index: 0;\n  border-radius: 3px;\n  box-sizing: border-box;\n  appearance: none;\n  border: 1px solid;\n\n  ", "\n\n  ", "\n\n  ", "\n\n  ", "\n    \n  ", "\n\n    transition: height 550ms ease-in-out; border-color 350ms;\n\n  ", "\n\n  ", "\n\n  ", "\n\n  ", "\n  \n  ", "\n \n  ", "\n\n   ", "\n     \n  ", "\n\n  ", "\n\n  ", " \n\n  ", "  \n\n  ", "  \n  \n\n  ", "   \n    \n  ", "\n\n  ", "\n\n      ", "       \n\n  ", "\n    \n  \n    ", "\n\n  ", "\n\n  ", ";\n\n  ", ";\n\n  ", ";\n\n  ", ";\n\n \n  ", "\n\n  &&:hover:not(:focus) {\n    ", ";\n\n    ", ";\n\n    ", "\n\n    ", ";\n\n  \n     ", "; \n\n\n    ", ";\n    transition: background 350ms;\n    & + ", " {\n      opacity: 1;\n      ", ";\n      transition: opacity 350ms;\n    }\n  }\n\n  &::placeholder {\n    ", "\n\n    ", "\n  }\n\n  &&:focus {\n    outline: none;\n    ", "\n\n    ", ";\n\n        \n    ", "  \n      \n    ", "\n\n  }\n\n  &&:not(:hover):not(:focus) {\n    ", ";\n\n    ", ";\n\n        ", ";\n  }\n"])), function (props) {
   return props.padding === 'small' && styled.css(_templateObject8 || (_templateObject8 = defaultTheme._taggedTemplateLiteral(["\n      padding: 5px 10px;\n    "])));
 }, function (props) {
   return props.padding === 'medium' && styled.css(_templateObject9 || (_templateObject9 = defaultTheme._taggedTemplateLiteral(["\n      padding: 13px 15px;\n    "])));
 }, function (props) {
   return props.padding === 'large' && styled.css(_templateObject10 || (_templateObject10 = defaultTheme._taggedTemplateLiteral(["\n      padding: 15px 55px;\n    "])));
 }, function (props) {
-  return props.showMore && !props.expanded && props.defaultHeight < props.maxHeight && styled.css(_templateObject11 || (_templateObject11 = defaultTheme._taggedTemplateLiteral(["\n      -webkit-mask-image: linear-gradient(0deg, transparent 5px, white 45px);\n    "])));
+  return props.showMore && !props.expanded && props.scrollHeightExceedsRows && styled.css(_templateObject11 || (_templateObject11 = defaultTheme._taggedTemplateLiteral(["\n      -webkit-mask-image: linear-gradient(0deg, transparent 5px, white 45px);\n    "])));
 }, function (props) {
   return props.expanded && styled.css(_templateObject12 || (_templateObject12 = defaultTheme._taggedTemplateLiteral(["\n      height: ", "px;\n    "])), props.maxHeight);
 }, function (props) {
@@ -265,27 +265,19 @@ var TextArea = React__default['default'].forwardRef(function TextArea(_ref, forw
     return descriptionToolTip;
   }, [descriptionToolTip]);
   React.useEffect(function () {
-    setExpanded(false);
-    isExpanded(false);
-    setAutoFocus(false);
-  }, []);
+    isExpanded(expanded);
+  }, [expanded]);
   React.useEffect(function () {
-    setExpanded(false);
-    isExpanded(false);
     setAutoFocus(false);
     calculateRows();
     calculateHeight();
-  }, [value, defaultValue]);
+  }, [value, defaultValue, rows]);
   React.useEffect(function () {
-    setExpanded(false);
-    isExpanded(false);
     setAutoFocus(false);
     initialHeightRef.current = null;
-  }, [rows, isExpanded]);
+  }, [rows]);
 
   var handleTextAreaChange = function handleTextAreaChange() {
-    setExpanded(true);
-    isExpanded(true);
     var textareaRefCurrent = textInputDomNode.current;
 
     if (textareaRefCurrent !== null) {
@@ -305,7 +297,6 @@ var TextArea = React__default['default'].forwardRef(function TextArea(_ref, forw
     }
 
     setExpanded(!expanded);
-    isExpanded(!expanded);
   };
 
   var calculateRows = function calculateRows() {
@@ -340,6 +331,12 @@ var TextArea = React__default['default'].forwardRef(function TextArea(_ref, forw
       }
 
       setScrollHeightExceedsRows(newHeight > initialHeightRef.current);
+
+      if (newHeight > (initialHeightRef.current || 0)) {
+        setExpanded(true);
+      } else {
+        setExpanded(false);
+      }
     }
   };
 
@@ -373,6 +370,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),
@@ -420,7 +418,7 @@ var TextArea = React__default['default'].forwardRef(function TextArea(_ref, forw
     }, description), maxContentRows > rows && showMore && React__default['default'].createElement(ShowMoreText, {
       onClick: showMore ? handleTextAreaShowLess : undefined,
       expanded: expanded
-    }, !expanded && scrollHeightExceedsRows ? showMoreText : scrollHeightExceedsRows ? showLessText : null));
+    }, !expanded && scrollHeightExceedsRows ? showMoreText : expanded && scrollHeightExceedsRows ? showLessText : null));
   };
 
   if (hidden) return null;

package/inputs/TextArea/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var TextArea = require('../../TextArea-e97f4790.js');
+var TextArea = require('../../TextArea-85663f8d.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-e97f4790.js');
+var TextArea = require('../TextArea-85663f8d.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.66",
+  "version": "1.2.0-rc.68",
   "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-fe6cab8a.js');
+var AssetGallery = require('../../AssetGallery-f0fe5431.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-e97f4790.js');
+require('../../TextArea-85663f8d.js');
 require('../../Switch-4a41585f.js');
 require('../../ContextMenuItem-ba2b697e.js');
 

package/widgets/Instructions/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Instructions = require('../../Instructions-4874a9f7.js');
+var Instructions = require('../../Instructions-6a089fcf.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-e97f4790.js');
+require('../../TextArea-85663f8d.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-fe6cab8a.js');
+var AssetGallery = require('../AssetGallery-f0fe5431.js');
 var ContextMenu = require('../ContextMenu-4ec3d9f3.js');
 var AssetPreviewTopBar = require('../AssetPreviewTopBar-c28715f7.js');
-var Instructions = require('../Instructions-4874a9f7.js');
+var Instructions = require('../Instructions-6a089fcf.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-e97f4790.js');
+require('../TextArea-85663f8d.js');
 require('../Switch-4a41585f.js');
 require('../ContextMenuItem-ba2b697e.js');