@sb1/ffe-collapse-react 2.0.14 → 3.0.1

package/es/Collapse.js

@@ -1,11 +1,5 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["className", "style", "isOpen", "onRest"];
+var _excluded = ["className", "isOpen", "onRest", "children"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -14,87 +8,51 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React, { useRef, useState, useEffect } from 'react';
-import { string, bool, func, object } from 'prop-types';
+import React, { useRef, useEffect, useState } from 'react';
+import { string, bool, func, node } from 'prop-types';
 import classNames from 'classnames';
-var Collapse = function Collapse(_ref) {
+export var Collapse = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var className = _ref.className,
-    style = _ref.style,
     isOpen = _ref.isOpen,
     onRest = _ref.onRest,
+    children = _ref.children,
     rest = _objectWithoutProperties(_ref, _excluded);
-  var content = useRef();
-  var _useState = useState(function () {
-      return isOpen ? 'auto' : '0';
-    }),
+  var internalRef = useRef();
+  var collapse = ref !== null && ref !== void 0 ? ref : internalRef;
+  var _useState = useState(!isOpen),
     _useState2 = _slicedToArray(_useState, 2),
-    height = _useState2[0],
-    setHeight = _useState2[1];
-  var _useState3 = useState(function () {
-      return isOpen ? 'visible' : 'hidden';
-    }),
-    _useState4 = _slicedToArray(_useState3, 2),
-    overflow = _useState4[0],
-    setOverflow = _useState4[1];
-  var _useState5 = useState(function () {
-      return isOpen ? 'visible' : 'hidden';
-    }),
-    _useState6 = _slicedToArray(_useState5, 2),
-    visibility = _useState6[0],
-    setVisibility = _useState6[1];
-  var setExpanded = function setExpanded() {
-    setHeight('auto');
-    setOverflow('visible');
-  };
-  var setCollapsed = function setCollapsed() {
-    setVisibility('hidden');
-  };
+    isHidden = _useState2[0],
+    setIsHidden = _useState2[1];
   useEffect(function () {
-    if (content.current) {
-      if (isOpen && height !== 'auto') {
-        setHeight("".concat(content.current.scrollHeight, "px"));
-        setVisibility('visible');
-      } else if (!isOpen && height !== '0') {
-        setHeight("".concat(content.current.scrollHeight, "px"));
-        window.requestAnimationFrame(function () {
-          return setTimeout(function () {
-            setHeight('0');
-            setOverflow('hidden');
-          });
-        });
-      }
+    if (isOpen) {
+      setIsHidden(false);
     }
-  }, [isOpen, height]);
-  var onTransitionEnd = function onTransitionEnd(e) {
-    if (e.target === content.current && e.propertyName === 'height') {
-      if (isOpen) {
-        setExpanded();
-      } else {
-        setCollapsed();
-      }
-      if (onRest) {
-        onRest();
+  }, [isOpen]);
+  return /*#__PURE__*/React.createElement("div", _extends({}, rest, {
+    ref: collapse,
+    className: classNames('ffe-collapse', className, {
+      'ffe-collapse--open': isOpen,
+      'ffe-collapse--hidden': isHidden
+    }),
+    onTransitionEnd: function onTransitionEnd(e) {
+      if (e.target === collapse.current && e.propertyName === 'grid-template-rows') {
+        if (onRest) {
+          onRest();
+        }
+        if (!isOpen) {
+          setIsHidden(true);
+        }
       }
     }
-  };
-  var mergedStyles = _objectSpread(_objectSpread({}, style), {}, {
-    willChange: 'height',
-    height: height,
-    overflow: overflow,
-    visibility: visibility
-  });
-  return /*#__PURE__*/React.createElement("div", _extends({}, rest, {
-    ref: content,
-    style: mergedStyles,
-    className: classNames('ffe-collapse-transition', className),
-    onTransitionEnd: onTransitionEnd
-  }));
-};
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "ffe-collapse__inner"
+  }, children));
+});
 Collapse.displayName = 'Collapse';
 Collapse.propTypes = {
   className: string,
-  style: object,
   isOpen: bool,
-  onRest: func
-};
-export default Collapse;
+  onRest: func,
+  /** The content to appear when expanded */
+  children: node.isRequired
+};

package/es/index.js

@@ -1 +1 @@
-export { default } from './Collapse';
+export { Collapse } from './Collapse';

package/less/collapse.less

@@ -1,3 +1,18 @@
-.ffe-collapse-transition {
-    transition: height @ffe-transition-duration @ffe-ease;
+.ffe-collapse {
+    display: grid;
+    grid-template-rows: 0fr;
+    transition: grid-template-rows var(--ffe-transition-duration)
+        var(--ffe-ease);
+}
+
+.ffe-collapse--hidden {
+    visibility: hidden;
+}
+
+.ffe-collapse--open {
+    grid-template-rows: 1fr;
+}
+
+.ffe-collapse__inner {
+    overflow: hidden;
 }

package/lib/Collapse.js

@@ -4,20 +4,15 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.Collapse = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = require("prop-types");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _excluded = ["className", "style", "isOpen", "onRest"];
+var _excluded = ["className", "isOpen", "onRest", "children"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -26,84 +21,48 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-var Collapse = function Collapse(_ref) {
+var Collapse = exports.Collapse = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   var className = _ref.className,
-    style = _ref.style,
     isOpen = _ref.isOpen,
     onRest = _ref.onRest,
+    children = _ref.children,
     rest = _objectWithoutProperties(_ref, _excluded);
-  var content = (0, _react.useRef)();
-  var _useState = (0, _react.useState)(function () {
-      return isOpen ? 'auto' : '0';
-    }),
+  var internalRef = (0, _react.useRef)();
+  var collapse = ref !== null && ref !== void 0 ? ref : internalRef;
+  var _useState = (0, _react.useState)(!isOpen),
     _useState2 = _slicedToArray(_useState, 2),
-    height = _useState2[0],
-    setHeight = _useState2[1];
-  var _useState3 = (0, _react.useState)(function () {
-      return isOpen ? 'visible' : 'hidden';
-    }),
-    _useState4 = _slicedToArray(_useState3, 2),
-    overflow = _useState4[0],
-    setOverflow = _useState4[1];
-  var _useState5 = (0, _react.useState)(function () {
-      return isOpen ? 'visible' : 'hidden';
-    }),
-    _useState6 = _slicedToArray(_useState5, 2),
-    visibility = _useState6[0],
-    setVisibility = _useState6[1];
-  var setExpanded = function setExpanded() {
-    setHeight('auto');
-    setOverflow('visible');
-  };
-  var setCollapsed = function setCollapsed() {
-    setVisibility('hidden');
-  };
+    isHidden = _useState2[0],
+    setIsHidden = _useState2[1];
   (0, _react.useEffect)(function () {
-    if (content.current) {
-      if (isOpen && height !== 'auto') {
-        setHeight("".concat(content.current.scrollHeight, "px"));
-        setVisibility('visible');
-      } else if (!isOpen && height !== '0') {
-        setHeight("".concat(content.current.scrollHeight, "px"));
-        window.requestAnimationFrame(function () {
-          return setTimeout(function () {
-            setHeight('0');
-            setOverflow('hidden');
-          });
-        });
-      }
+    if (isOpen) {
+      setIsHidden(false);
     }
-  }, [isOpen, height]);
-  var onTransitionEnd = function onTransitionEnd(e) {
-    if (e.target === content.current && e.propertyName === 'height') {
-      if (isOpen) {
-        setExpanded();
-      } else {
-        setCollapsed();
-      }
-      if (onRest) {
-        onRest();
+  }, [isOpen]);
+  return /*#__PURE__*/_react.default.createElement("div", _extends({}, rest, {
+    ref: collapse,
+    className: (0, _classnames.default)('ffe-collapse', className, {
+      'ffe-collapse--open': isOpen,
+      'ffe-collapse--hidden': isHidden
+    }),
+    onTransitionEnd: function onTransitionEnd(e) {
+      if (e.target === collapse.current && e.propertyName === 'grid-template-rows') {
+        if (onRest) {
+          onRest();
+        }
+        if (!isOpen) {
+          setIsHidden(true);
+        }
       }
     }
-  };
-  var mergedStyles = _objectSpread(_objectSpread({}, style), {}, {
-    willChange: 'height',
-    height: height,
-    overflow: overflow,
-    visibility: visibility
-  });
-  return /*#__PURE__*/_react.default.createElement("div", _extends({}, rest, {
-    ref: content,
-    style: mergedStyles,
-    className: (0, _classnames.default)('ffe-collapse-transition', className),
-    onTransitionEnd: onTransitionEnd
-  }));
-};
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: "ffe-collapse__inner"
+  }, children));
+});
 Collapse.displayName = 'Collapse';
 Collapse.propTypes = {
   className: _propTypes.string,
-  style: _propTypes.object,
   isOpen: _propTypes.bool,
-  onRest: _propTypes.func
-};
-var _default = exports.default = Collapse;
+  onRest: _propTypes.func,
+  /** The content to appear when expanded */
+  children: _propTypes.node.isRequired
+};

package/lib/index.js

@@ -3,11 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "default", {
+Object.defineProperty(exports, "Collapse", {
   enumerable: true,
   get: function get() {
-    return _Collapse.default;
+    return _Collapse.Collapse;
   }
 });
-var _Collapse = _interopRequireDefault(require("./Collapse"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _Collapse = require("./Collapse");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sb1/ffe-collapse-react",
-    "version": "2.0.14",
+    "version": "3.0.1",
     "description": "React component for expand/collapse",
     "keywords": [
         "ffe"
@@ -29,7 +29,7 @@
         "test:watch": "ffe-buildtool jest --watch"
     },
     "dependencies": {
-        "@sb1/ffe-core": "^27.3.5",
+        "@sb1/ffe-core": "^27.3.6",
         "classnames": "^2.3.1"
     },
     "devDependencies": {
@@ -45,5 +45,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "8bfc6dca847a163f4057ce4d75e2e2dc43b293dc"
+    "gitHead": "d9726eae887f19598f051c2f205506a0710b89e8"
 }

package/types/index.d.ts

@@ -1,10 +1,10 @@
 import * as React from 'react';
 
-export interface CollapseProps extends React.HTMLProps<HTMLDivElement> {
+export interface CollapseProps extends React.ComponentProps<'div'> {
     isOpen: boolean;
     onRest?: () => void;
 }
 
 declare class Collapse extends React.Component<CollapseProps, any> {}
 
-export default Collapse;
+export { Collapse };