@carbon/react 1.29.0 → 1.30.0-rc.0

package/lib/components/CodeSnippet/CodeSnippet.js

@@ -36,7 +36,6 @@ const defaultMaxCollapsedNumberOfRows = 15;
 const defaultMaxExpandedNumberOfRows = 0;
 const defaultMinCollapsedNumberOfRows = 3;
 const defaultMinExpandedNumberOfRows = 16;
-
 function CodeSnippet(_ref) {
   let {
     className,
@@ -75,7 +74,6 @@ function CodeSnippet(_ref) {
     if (type === 'single') {
       return codeContainerRef;
     }
-
     if (type === 'multi') {
       return codeContentRef;
     }
@@ -95,10 +93,9 @@ function CodeSnippet(_ref) {
     };
   }, [getCodeRef]);
   const handleScroll = React.useCallback(() => {
-    if (type === 'inline' || type === 'single' && !(codeContainerRef !== null && codeContainerRef !== void 0 && codeContainerRef.current) || type === 'multi' && !(codeContentRef !== null && codeContentRef !== void 0 && codeContentRef.current)) {
+    if (type === 'inline' || type === 'single' && !codeContainerRef?.current || type === 'multi' && !codeContentRef?.current) {
       return;
     }
-
     const {
       horizontalOverflow,
       codeClientWidth,
@@ -111,23 +108,20 @@ function CodeSnippet(_ref) {
   useResizeObserver__default["default"]({
     ref: getCodeRef(),
     onResize: () => {
-      if (codeContentRef !== null && codeContentRef !== void 0 && codeContentRef.current && type === 'multi') {
+      if (codeContentRef?.current && type === 'multi') {
         const {
           height
         } = codeContentRef.current.getBoundingClientRect();
-
         if (maxCollapsedNumberOfRows > 0 && (maxExpandedNumberOfRows <= 0 || maxExpandedNumberOfRows > maxCollapsedNumberOfRows) && height > maxCollapsedNumberOfRows * rowHeightInPixels) {
           setShouldShowMoreLessBtn(true);
         } else {
           setShouldShowMoreLessBtn(false);
         }
-
         if (expandedCode && minExpandedNumberOfRows > 0 && height <= minExpandedNumberOfRows * rowHeightInPixels) {
           setExpandedCode(false);
         }
       }
-
-      if (codeContentRef !== null && codeContentRef !== void 0 && codeContentRef.current && type === 'multi' || codeContainerRef !== null && codeContainerRef !== void 0 && codeContainerRef.current && type === 'single') {
+      if (codeContentRef?.current && type === 'multi' || codeContainerRef?.current && type === 'single') {
         handleScroll();
       }
     }
@@ -135,19 +129,14 @@ function CodeSnippet(_ref) {
   React.useEffect(() => {
     handleScroll();
   }, [handleScroll]);
-
   const handleCopyClick = evt => {
-    if (copyText || innerCodeRef !== null && innerCodeRef !== void 0 && innerCodeRef.current) {
-      var _innerCodeRef$current;
-
-      copy__default["default"](copyText ?? (innerCodeRef === null || innerCodeRef === void 0 ? void 0 : (_innerCodeRef$current = innerCodeRef.current) === null || _innerCodeRef$current === void 0 ? void 0 : _innerCodeRef$current.innerText));
+    if (copyText || innerCodeRef?.current) {
+      copy__default["default"](copyText ?? innerCodeRef?.current?.innerText);
     }
-
     if (onClick) {
       onClick(evt);
     }
   };
-
   const codeSnippetClasses = cx__default["default"](className, `${prefix}--snippet`, {
     [`${prefix}--snippet--${type}`]: type,
     [`${prefix}--snippet--disabled`]: type !== 'inline' && disabled,
@@ -158,7 +147,6 @@ function CodeSnippet(_ref) {
     [`${prefix}--snippet--has-right-overflow`]: type == 'multi' && hasRightOverflow
   });
   const expandCodeBtnText = expandedCode ? showLessText : showMoreText;
-
   if (type === 'inline') {
     if (hideCopyButton) {
       return /*#__PURE__*/React__default["default"].createElement("span", {
@@ -168,7 +156,6 @@ function CodeSnippet(_ref) {
         ref: innerCodeRef
       }, children));
     }
-
     return /*#__PURE__*/React__default["default"].createElement(Copy["default"], _rollupPluginBabelHelpers["extends"]({}, rest, {
       onClick: handleCopyClick,
       "aria-label": deprecatedAriaLabel || ariaLabel,
@@ -181,17 +168,13 @@ function CodeSnippet(_ref) {
       ref: innerCodeRef
     }, children));
   }
-
   let containerStyle = {};
-
   if (type === 'multi') {
     const styles = {};
-
     if (expandedCode) {
       if (maxExpandedNumberOfRows > 0) {
         styles.maxHeight = maxExpandedNumberOfRows * rowHeightInPixels;
       }
-
       if (minExpandedNumberOfRows > 0) {
         styles.minHeight = minExpandedNumberOfRows * rowHeightInPixels;
       }
@@ -199,17 +182,14 @@ function CodeSnippet(_ref) {
       if (maxCollapsedNumberOfRows > 0) {
         styles.maxHeight = maxCollapsedNumberOfRows * rowHeightInPixels;
       }
-
       if (minCollapsedNumberOfRows > 0) {
         styles.minHeight = minCollapsedNumberOfRows * rowHeightInPixels;
       }
     }
-
     if (Object.keys(styles).length) {
       containerStyle.style = styles;
     }
   }
-
   return /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({}, rest, {
     className: codeSnippetClasses
   }), /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({
@@ -250,111 +230,92 @@ function CodeSnippet(_ref) {
     role: "img"
   })));
 }
-
 CodeSnippet.propTypes = {
   /**
    * Specify a label to be read by screen readers on the containing <textbox>
    * node
    */
   ['aria-label']: PropTypes__default["default"].string,
-
   /**
    * Deprecated, please use `aria-label` instead.
    * Specify a label to be read by screen readers on the containing <textbox>
    * node
    */
   ariaLabel: deprecate["default"](PropTypes__default["default"].string, 'This prop syntax has been deprecated. Please use the new `aria-label`.'),
-
   /**
    * Provide the content of your CodeSnippet as a node or string
    */
   children: PropTypes__default["default"].node,
-
   /**
    * Specify an optional className to be applied to the container node
    */
   className: PropTypes__default["default"].string,
-
   /**
    * Specify the description for the Copy Button
    */
   copyButtonDescription: PropTypes__default["default"].string,
-
   /**
    * Optional text to copy. If not specified, the `children` node's `innerText`
    * will be used as the copy value.
    */
   copyText: PropTypes__default["default"].string,
-
   /**
    * Specify whether or not the CodeSnippet should be disabled
    */
   disabled: PropTypes__default["default"].bool,
-
   /**
    * Specify the string displayed when the snippet is copied
    */
   feedback: PropTypes__default["default"].string,
-
   /**
    * Specify the time it takes for the feedback message to timeout
    */
   feedbackTimeout: PropTypes__default["default"].number,
-
   /**
    * Specify whether or not a copy button should be used/rendered.
    */
   hideCopyButton: PropTypes__default["default"].bool,
-
   /**
    * Specify whether you are using the light variant of the Code Snippet,
    * typically used for inline snippet to display an alternate color
    */
-  light: deprecate["default"](PropTypes__default["default"].bool, 'The `light` prop for `CodeSnippet` has ' + 'been deprecated in favor of the new `Layer` component. It will be removed in the next major release.'),
 
+  light: deprecate["default"](PropTypes__default["default"].bool, 'The `light` prop for `CodeSnippet` has ' + 'been deprecated in favor of the new `Layer` component. It will be removed in the next major release.'),
   /**
    * Specify the maximum number of rows to be shown when in collapsed view
    */
   maxCollapsedNumberOfRows: PropTypes__default["default"].number,
-
   /**
    * Specify the maximum number of rows to be shown when in expanded view
    */
   maxExpandedNumberOfRows: PropTypes__default["default"].number,
-
   /**
    * Specify the minimum number of rows to be shown when in collapsed view
    */
   minCollapsedNumberOfRows: PropTypes__default["default"].number,
-
   /**
    * Specify the minimum number of rows to be shown when in expanded view
    */
   minExpandedNumberOfRows: PropTypes__default["default"].number,
-
   /**
    * An optional handler to listen to the `onClick` even fired by the Copy
    * Button
    */
   onClick: PropTypes__default["default"].func,
-
   /**
    * Specify a string that is displayed when the Code Snippet has been
    * interacted with to show more lines
    */
   showLessText: PropTypes__default["default"].string,
-
   /**
    * Specify a string that is displayed when the Code Snippet text is more
    * than 15 lines
    */
   showMoreText: PropTypes__default["default"].string,
-
   /**
    * Provide the type of Code Snippet
    */
   type: PropTypes__default["default"].oneOf(['single', 'inline', 'multi']),
-
   /**
    * Specify whether or not to wrap the text.
    */