@twreporter/react-components 8.11.0 → 8.11.1-rc.0

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.11.1-rc.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-components@8.11.0...@twreporter/react-components@8.11.1-rc.0) (2022-07-27)
+
+**Note:** Version bump only for package @twreporter/react-components
+
+
+
+
+
 # [8.11.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-components@8.11.0-rc.0...@twreporter/react-components@8.11.0) (2022-07-21)
 
 **Note:** Version bump only for package @twreporter/react-components

package/lib/side-bar/index.js

@@ -14,12 +14,12 @@ var _react = _interopRequireDefault(require("react"));
 
 var _hoistNonReactStatics = _interopRequireDefault(require("hoist-non-react-statics"));
 
-var _smoothscroll = _interopRequireDefault(require("smoothscroll"));
-
 var _reactWaypoint = require("react-waypoint");
 
 var _get = _interopRequireDefault(require("lodash/get"));
 
+var _smoothScroll = _interopRequireDefault(require("@twreporter/core/lib/utils/smooth-scroll"));
+
 var _excluded = ["children"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -185,8 +185,7 @@ function decorateSideBar(DecoratedComponent) {
         var node = this.moduleMap[moduleID];
 
         if (node) {
-          // scroll to the section
-          return (0, _smoothscroll["default"])(node.offsetTop);
+          (0, _smoothScroll["default"])(node.offsetTop);
         }
 
         return null;

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

@@ -7,17 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
+var _react = _interopRequireDefault(require("react"));
+
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _react = _interopRequireDefault(require("react"));
+var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 
-var _get = _interopRequireDefault(require("lodash/get"));
+var _reactWaypoint = require("react-waypoint");
 
-var _indexOf = _interopRequireDefault(require("lodash/indexOf"));
+var _smoothScroll = _interopRequireDefault(require("@twreporter/core/lib/utils/smooth-scroll"));
 
-var _memoizeOne = _interopRequireDefault(require("memoize-one"));
+var _get = _interopRequireDefault(require("lodash/get"));
 
-var _smoothscroll = _interopRequireDefault(require("smoothscroll"));
+var _indexOf = _interopRequireDefault(require("lodash/indexOf"));
 
 var _some = _interopRequireDefault(require("lodash/some"));
 
@@ -25,8 +27,6 @@ var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
 
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
 
-var _reactWaypoint = require("react-waypoint");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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 } }); if (superClass) _setPrototypeOf(subClass, superClass); }
@@ -420,7 +420,7 @@ _defineProperty(Anchor, "defaultProps", {
   topOffset: '30%'
 });
 
-var smoothScrollDuration = 500;
+var defaultScrollDuration = 500;
 
 var TableOfContents = /*#__PURE__*/function (_React$PureComponent2) {
   _inherits(TableOfContents, _React$PureComponent2);
@@ -462,10 +462,12 @@ var TableOfContents = /*#__PURE__*/function (_React$PureComponent2) {
 
   }, {
     key: "_handleAnchorClick",
-    value: function _handleAnchorClick(anchorID) {
+    value: function _handleAnchorClick(anchorID, callback) {
       var _this4 = this;
 
-      var manager = this.props.manager;
+      var _this$props2 = this.props,
+          manager = _this$props2.manager,
+          scrollDuration = _this$props2.scrollDuration;
       var anchors = manager.anchors;
 
       _.some(anchors, function (anchor) {
@@ -474,8 +476,12 @@ var TableOfContents = /*#__PURE__*/function (_React$PureComponent2) {
             highlightAnchor: anchor
           }, function () {
             manager.toStopAutoUpdateHighlightAnchor = true;
-            (0, _smoothscroll["default"])(anchor.getViewportTop(), smoothScrollDuration, function () {
-              return manager.toStopAutoUpdateHighlightAnchor = false;
+            (0, _smoothScroll["default"])(anchor.getViewportTop(), scrollDuration || defaultScrollDuration, function () {
+              manager.toStopAutoUpdateHighlightAnchor = false;
+
+              if (callback) {
+                callback();
+              }
             });
           });
 
@@ -488,9 +494,9 @@ var TableOfContents = /*#__PURE__*/function (_React$PureComponent2) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props2 = this.props,
-          manager = _this$props2.manager,
-          render = _this$props2.render;
+      var _this$props3 = this.props,
+          manager = _this$props3.manager,
+          render = _this$props3.render;
       var highlightAnchor = this.state.highlightAnchor;
       var anchors = manager.anchors;
       var orderedAnchors = manager.memoizeSortAnchorsByViewportTop(anchors);
@@ -519,7 +525,8 @@ _defineProperty(TableOfContents, "propTypes", {
    *  @param {?Anchor} highlightAnchor
    *  @param {Function} handleAnchorClick - callback function for handling clicking anchor
    */
-  render: _propTypes["default"].func
+  render: _propTypes["default"].func,
+  scrollDuration: _propTypes["default"].number
 });
 
 var _default = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/react-components",
-  "version": "8.11.0",
+  "version": "8.11.1-rc.0",
   "main": "lib/index.js",
   "repository": "https://github.com/twreporter/twreporter-npm-packages.git",
   "author": "twreporter <developer@twreporter.org>",
@@ -15,7 +15,7 @@
     "chromatic": "npx chromatic --exit-zero-on-changes"
   },
   "dependencies": {
-    "@twreporter/core": "^1.4.1",
+    "@twreporter/core": "^1.4.2-rc.0",
     "@twreporter/redux": "^7.2.2",
     "hoist-non-react-statics": "^2.3.1",
     "lodash": "^4.0.0",
@@ -26,7 +26,6 @@
     "react-router-dom": "^5.1.2",
     "react-transition-group": "^2.0.0",
     "react-waypoint": "^9.0.2",
-    "smoothscroll": "^0.3.0",
     "styled-components": "^4.0.0"
   },
   "files": [
@@ -44,5 +43,5 @@
     "babel-loader": "^8.2.4",
     "chromatic": "^6.5.4"
   },
-  "gitHead": "22127d74e0d0433e87b427aed82394972cade963"
+  "gitHead": "adbbd91639cb9a74438108b97083294acf57d8cf"
 }