@twreporter/react-article-components 1.12.2-rc.4 → 1.13.0-rc.0

package/lib/components/table-of-contents/index.js

@@ -7,17 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var Styled = _interopRequireWildcard(require("./styled"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _react = _interopRequireDefault(require("react"));
-
 var _tableOfContents = _interopRequireDefault(require("@twreporter/react-components/lib/table-of-contents"));
 
+var _anchor = require("../../constants/anchor");
+
+var Styled = _interopRequireWildcard(require("./styled"));
+
 var _map = _interopRequireDefault(require("lodash/map"));
 
-var _anchor = require("../../constants/anchor");
+var _isNil = _interopRequireDefault(require("lodash/isNil"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -25,27 +27,17 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+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 _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+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); }
 
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var Tab = function Tab(props) {
   return /*#__PURE__*/_react["default"].createElement("svg", props, /*#__PURE__*/_react["default"].createElement("path", {
@@ -61,150 +53,119 @@ Tab.defaultProps = {
   width: "29",
   height: "120",
   viewBox: "0 0 29 120"
-};
+}; // lodash
+
 var _ = {
-  map: _map["default"]
+  map: _map["default"],
+  isNil: _isNil["default"]
 };
 
-var TableOfContents = /*#__PURE__*/function (_React$PureComponent) {
-  _inherits(TableOfContents, _React$PureComponent);
+var TableOfContents = function TableOfContents(_ref) {
+  var className = _ref.className,
+      manager = _ref.manager,
+      onStartScrollingToAnchor = _ref.onStartScrollingToAnchor,
+      onToggleTabExpanded = _ref.onToggleTabExpanded,
+      scrollStage = _ref.scrollStage;
 
-  var _super = _createSuper(TableOfContents);
+  var _useState = (0, _react.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      isExpanded = _useState2[0],
+      setIsExpanded = _useState2[1];
 
-  function TableOfContents(props) {
-    var _this;
+  var tocRef = (0, _react.useRef)(null);
 
-    _classCallCheck(this, TableOfContents);
+  var handleMouseEnter = function handleMouseEnter() {
+    return setIsExpanded(true);
+  };
 
-    _this = _super.call(this, props);
-    _this.state = {
-      isExpanded: false
-    };
-    _this.handleMouseEnter = _this._setIsExpanded.bind(_assertThisInitialized(_this), true);
-    _this.handleMouseLeave = _this._setIsExpanded.bind(_assertThisInitialized(_this), false);
-    _this.handleTabClick = _this._toggleIsExpanded.bind(_assertThisInitialized(_this));
-    _this.handleTouchOutside = _this._handleTouchOutside.bind(_assertThisInitialized(_this));
-    _this._ref = /*#__PURE__*/_react["default"].createRef();
-    return _this;
-  }
+  var handleMouseLeave = function handleMouseLeave() {
+    return setIsExpanded(false);
+  };
 
-  _createClass(TableOfContents, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      document.addEventListener('touchstart', this.handleTouchOutside, {
-        passive: true,
-        capture: true
-      });
+  var handleTabClick = function handleTabClick() {
+    return setIsExpanded(!isExpanded);
+  };
+
+  var handleTouchOutside = function handleTouchOutside(e) {
+    try {
+      if (tocRef.current && !tocRef.current.contains(e.target) && isExpanded) {
+        setIsExpanded(false);
+      }
+    } catch (error) {
+      console.warn('TableOfContents#handleTouchOutside error:', error);
     }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      document.removeEventListener('touchstart', this.handleTouchOutside, {
+  };
+
+  (0, _react.useEffect)(function () {
+    document.addEventListener('touchstart', handleTouchOutside, {
+      passive: true,
+      capture: true
+    });
+    return function () {
+      document.removeEventListener('touchstart', handleTouchOutside, {
         passive: true,
         capture: true
       });
-    }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(_prevProps, prevStates) {
-      if (prevStates.isExpanded !== this.state.isExpanded) {
-        this.props.onToggleTabExpanded(this.state.isExpanded);
-      }
-    }
-  }, {
-    key: "_setIsExpanded",
-    value: function _setIsExpanded(isExpanded) {
-      this.setState({
-        isExpanded: isExpanded
-      });
-    }
-  }, {
-    key: "_toggleIsExpanded",
-    value: function _toggleIsExpanded(e) {
-      this.setState({
-        isExpanded: !this.state.isExpanded
+    };
+  }, []);
+  (0, _react.useEffect)(function () {
+    onToggleTabExpanded(isExpanded);
+  }, [isExpanded, onToggleTabExpanded]);
+  var hideTOC = scrollStage === 3;
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "hidden-print",
+    ref: tocRef
+  }, /*#__PURE__*/_react["default"].createElement(_tableOfContents["default"].React.TableOfContents, {
+    className: className,
+    manager: manager,
+    scrollDuration: _anchor.ANCHOR_SCROLL_DURATION,
+    render: function render(anchors, highlightAnchor, handleAnchorClick) {
+      var anchorsJSX = _.map(anchors, function (anchor) {
+        var toHighlight = anchor === highlightAnchor;
+        return /*#__PURE__*/_react["default"].createElement(Styled.TOCRow, {
+          key: anchor.anchorID,
+          onClick: function onClick() {
+            onStartScrollingToAnchor(true, function () {
+              return handleAnchorClick(anchor.anchorID, function () {
+                // Wait for a short time to avoid trigger waypoint's onEnter() of infogram embed close to the anchor
+                setTimeout(function () {
+                  return onStartScrollingToAnchor(false);
+                }, _anchor.WAIT_AFTER_REACH_ANCHOR);
+              });
+            });
+          }
+        }, /*#__PURE__*/_react["default"].createElement(Styled.TOCIndicator, {
+          toHighlight: toHighlight,
+          isExpanded: isExpanded
+        }), /*#__PURE__*/_react["default"].createElement(Styled.TOCText, {
+          toHighlight: toHighlight
+        }, anchor.anchorLable));
       });
-    }
-  }, {
-    key: "_handleTouchOutside",
-    value: function _handleTouchOutside(e) {
-      try {
-        if (!this._ref.current.contains(e.target) && this.state.isExpanded) {
-          this.setState({
-            isExpanded: false
-          });
-        }
-      } catch (e) {
-        console.warn('TableOfContents#handleTouchOutside occurs error:', e);
-      }
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this2 = this;
-
-      var _this$props = this.props,
-          className = _this$props.className,
-          manager = _this$props.manager,
-          onStartScrollingToAnchor = _this$props.onStartScrollingToAnchor;
-      var isExpanded = this.state.isExpanded;
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        className: "hidden-print",
-        ref: this._ref
-      }, /*#__PURE__*/_react["default"].createElement(_tableOfContents["default"].React.TableOfContents, {
-        className: className,
-        manager: manager,
-        scrollDuration: _anchor.ANCHOR_SCROLL_DURATION,
-        render: function render(anchors, highlightAnchor, handleAnchorClick) {
-          var anchorsJSX = _.map(anchors, function (anchor) {
-            var toHighlight = anchor === highlightAnchor;
-            return /*#__PURE__*/_react["default"].createElement(Styled.TOCRow, {
-              key: anchor.anchorID,
-              onClick: function onClick() {
-                onStartScrollingToAnchor(true, function () {
-                  return handleAnchorClick(anchor.anchorID, function () {
-                    // Wait for a short time to avoid trigger waypoint's onEnter() of infogram embed close to the anchor
-                    setTimeout(function () {
-                      return onStartScrollingToAnchor(false);
-                    }, _anchor.WAIT_AFTER_REACH_ANCHOR);
-                  });
-                });
-              }
-            }, /*#__PURE__*/_react["default"].createElement(Styled.TOCIndicator, {
-              toHighlight: toHighlight,
-              isExpanded: isExpanded
-            }), /*#__PURE__*/_react["default"].createElement(Styled.TOCText, {
-              toHighlight: toHighlight
-            }, anchor.anchorLable));
-          });
-
-          return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(Styled.TOCTab, {
-            onClick: _this2.handleTabClick,
-            isExpanded: isExpanded
-          }, /*#__PURE__*/_react["default"].createElement("div", null, "\u7D22\u5F15"), /*#__PURE__*/_react["default"].createElement(Tab, null)), /*#__PURE__*/_react["default"].createElement(Styled.TOCBackground, {
-            onMouseEnter: _this2.handleMouseEnter,
-            onMouseLeave: _this2.handleMouseLeave,
-            isExpanded: isExpanded
-          }, /*#__PURE__*/_react["default"].createElement(Styled.TOCBlock, null, anchorsJSX)));
-        }
-      }));
-    }
-  }]);
 
-  return TableOfContents;
-}(_react["default"].PureComponent);
+      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(Styled.TOCTabWrapper, {
+        isHidden: hideTOC
+      }, /*#__PURE__*/_react["default"].createElement(Styled.TOCTab, {
+        onClick: handleTabClick,
+        isExpanded: isExpanded
+      }, /*#__PURE__*/_react["default"].createElement("div", null, "\u7D22\u5F15"), /*#__PURE__*/_react["default"].createElement(Tab, null))), /*#__PURE__*/_react["default"].createElement(Styled.TOCBackground, {
+        onMouseEnter: handleMouseEnter,
+        onMouseLeave: handleMouseLeave,
+        isExpanded: isExpanded
+      }, /*#__PURE__*/_react["default"].createElement(Styled.TOCBlock, null, anchorsJSX)));
+    }
+  }));
+};
 
-_defineProperty(TableOfContents, "propTypes", {
+TableOfContents.propTypes = {
   className: _propTypes["default"].string,
   manager: _tableOfContents["default"].React.TableOfContents.propTypes.manager,
   onStartScrollingToAnchor: _propTypes["default"].func,
-  onToggleTabExpanded: _propTypes["default"].func
-});
-
-_defineProperty(TableOfContents, "defaultProps", {
+  onToggleTabExpanded: _propTypes["default"].func,
+  scrollStage: _propTypes["default"].number
+};
+TableOfContents.defaultProps = {
   className: ''
-});
-
+};
 var _default = {
   createManager: function createManager(props) {
     return new _tableOfContents["default"].Manager(props);

package/lib/components/table-of-contents/styled.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TOCText = exports.TOCTab = exports.TOCRow = exports.TOCIndicator = exports.TOCBlock = exports.TOCBackground = void 0;
+exports.TOCText = exports.TOCTabWrapper = exports.TOCTab = exports.TOCRow = exports.TOCIndicator = exports.TOCBlock = exports.TOCBackground = void 0;
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
@@ -67,20 +67,29 @@ var TOCRow = /*#__PURE__*/_styledComponents["default"].div.withConfig({
 
 exports.TOCRow = TOCRow;
 
+var TOCTabWrapper = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  displayName: "styled__TOCTabWrapper",
+  componentId: "sc-1guo9zm-4"
+})(["", " ", ""], _mediaQuery["default"].tabletAndBelow(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    width: 30px;\n    position: fixed;\n    z-index: ", ";\n    top: 20%;\n    left: 0;\n    transition: transform 200ms;\n    transform: ", ";\n  "])), _zIndex["default"].toc, function (props) {
+  return props.isHidden || false ? 'translateX(-100%)' : 'translateX(0%)';
+}), _mediaQuery["default"].desktopAndAbove(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n    display: none;\n  "]))));
+
+exports.TOCTabWrapper = TOCTabWrapper;
+
 var TOCTab = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "styled__TOCTab",
-  componentId: "sc-1guo9zm-4"
-})(["", " ", ""], _mediaQuery["default"].tabletAndBelow(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    width: 30px;\n    position: fixed;\n    z-index: ", ";\n    top: 20%;\n    left: 0;\n    transition: transform 0.1s ease-in-out 0.1s;\n    transform: ", ";\n\n    > div {\n      opacity: 0.6;\n      color: ", ";\n      font-size: 14px;\n      width: 14px;\n      position: absolute;\n      top: 50%;\n      left: 50%;\n      transform: translate(-50%, -50%);\n    }\n  "])), _zIndex["default"].toc, function (props) {
+  componentId: "sc-1guo9zm-5"
+})(["transition:transform 0.1s ease-in-out 0.1s;transform:", ";> div{opacity:0.6;color:", ";font-size:14px;width:14px;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);}"], function (props) {
   return props.isExpanded ? "translateX(".concat(tocWidth, "px)") : 'translateX(0px)';
 }, function (props) {
   return props.theme.colors.base.lightText;
-}), _mediaQuery["default"].desktopAndAbove(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n    display: none;\n  "]))));
+});
 
 exports.TOCTab = TOCTab;
 
 var TOCBackground = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "styled__TOCBackground",
-  componentId: "sc-1guo9zm-5"
+  componentId: "sc-1guo9zm-6"
 })(["position:fixed;z-index:", ";top:0;left:0;height:100%;width:", "px;background-color:", ";transition:transform 0.1s ease-in-out 0.1s;", " ", ""], _zIndex["default"].toc, tocWidth, function (props) {
   return props.theme.colors.toc.background;
 }, _mediaQuery["default"].tabletAndBelow(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n    transform: ", ";\n  "])), function (props) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/react-article-components",
-  "version": "1.12.2-rc.4",
+  "version": "1.13.0-rc.0",
   "description": "The Reporter react article components, which are used in article page",
   "main": "lib/components/article-page.js",
   "repository": "https://github.com/twreporter/twreporter-npm-packages.git",
@@ -40,5 +40,5 @@
   "files": [
     "lib"
   ],
-  "gitHead": "a4db42b17a22cc11d5f60f9a473a65acda82b2a6"
+  "gitHead": "125db159f6267ceab5dbc4e719825a080cf00e98"
 }