@twreporter/react-components 8.10.0-rc.1 → 8.10.0-rc.2

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [8.10.0-rc.2](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-components@8.10.0-rc.1...@twreporter/react-components@8.10.0-rc.2) (2022-06-30)
+
+
+### Bug Fixes
+
+* new bookmark should be fetched when mount ([9bb438f](https://github.com/twreporter/twreporter-npm-packages/commit/9bb438f81bd321fee47f55c872589091d8db8be6))
+* remove redundant code ([7468cfa](https://github.com/twreporter/twreporter-npm-packages/commit/7468cfab10a51d092548191d14ab7eeb7839c871))
+
+
+
+
+
 # [8.10.0-rc.1](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-components@8.10.0-rc.0...@twreporter/react-components@8.10.0-rc.1) (2022-06-14)
 
 

package/lib/bookmark-list/index.js

@@ -13,7 +13,7 @@ var _CSSTransition = _interopRequireDefault(require("react-transition-group/CSST
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
@@ -39,31 +39,25 @@ var _get = _interopRequireDefault(require("lodash/get"));
 
 var _map = _interopRequireDefault(require("lodash/map"));
 
+var _slice = _interopRequireDefault(require("lodash/slice"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-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); 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 } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+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 _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 _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 _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 _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 _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+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 _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 _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var _twreporterRedux$acti = _redux["default"].actions,
     deleteSingleBookmark = _twreporterRedux$acti.deleteSingleBookmark,
@@ -72,7 +66,8 @@ var reduxStatePropKeys = _redux["default"].reduxStateFields;
 var _ = {
   findIndex: _findIndex["default"],
   get: _get["default"],
-  map: _map["default"]
+  map: _map["default"],
+  slice: _slice["default"]
 };
 var defaultLimit = 5;
 var defaultSort = 'created_at';
@@ -109,163 +104,131 @@ var Container = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   componentId: "w84xlj-1"
 })(["", ""], reactTransitionCSS);
 
-var BookmarkList = /*#__PURE__*/function (_React$Component) {
-  _inherits(BookmarkList, _React$Component);
+var BookmarkList = function BookmarkList(_ref) {
+  var _ref$releaseBranch = _ref.releaseBranch,
+      releaseBranch = _ref$releaseBranch === void 0 ? _releaseBranch["default"].master : _ref$releaseBranch,
+      bookmarks = _ref.bookmarks,
+      total = _ref.total,
+      getMultipleBookmarks = _ref.getMultipleBookmarks,
+      deleteSingleBookmark = _ref.deleteSingleBookmark,
+      isAuthed = _ref.isAuthed,
+      jwt = _ref.jwt,
+      userID = _ref.userID;
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      showConfirmation = _useState2[0],
+      setShowConfirmation = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      idToBeDeleted = _useState4[0],
+      setIdToBeDeleted = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(total <= defaultLimit ? total : defaultLimit),
+      _useState6 = _slicedToArray(_useState5, 2),
+      numberToShow = _useState6[0],
+      setNumberToShow = _useState6[1];
+
+  var _useState7 = (0, _react.useState)(bookmarks),
+      _useState8 = _slicedToArray(_useState7, 2),
+      bookmarkToShow = _useState8[0],
+      setBookmarkToShow = _useState8[1];
+
+  var _defaultBodyOverflow = 'scroll';
+  (0, _react.useEffect)(function () {
+    // check authorization
+    // redirect to singin page if user has not been authorized
+    if (!isAuthed || !jwt) {
+      var currentHref = typeof window === 'undefined' ? '' : window.location.href;
+      window.location.href = (0, _signInHref.getSignInHref)(currentHref);
+    } // set overflow value
+
+
+    _defaultBodyOverflow = _.get(document, 'body.style.overflow', _defaultBodyOverflow); // check bookmark update
+
+    var offset = 0;
+    getMultipleBookmarks(jwt, userID, offset, defaultLimit, defaultSort);
+  }, []);
+  (0, _react.useEffect)(function () {
+    document.body.style.overflow = showConfirmation ? 'hidden' : _defaultBodyOverflow;
+  }, [showConfirmation]);
+  (0, _react.useEffect)(function () {
+    setBookmarkToShow(_.slice(bookmarks, 0, numberToShow));
+  }, [numberToShow, bookmarks]);
+  (0, _react.useEffect)(function () {
+    if (total - numberToShow < defaultLimit) {
+      setNumberToShow(total);
+    }
+  }, [total]);
 
-  var _super = _createSuper(BookmarkList);
+  var loadMoreBookmarks = function loadMoreBookmarks() {
+    var nextNumberToShow = numberToShow + defaultLimit < total ? numberToShow + defaultLimit : total;
 
-  function BookmarkList(props) {
-    var _this;
+    if (total === bookmarks.length) {
+      setNumberToShow(nextNumberToShow);
+    } else if (numberToShow < total) {
+      var offset = numberToShow;
+      getMultipleBookmarks(jwt, userID, offset, defaultLimit, defaultSort);
+      setNumberToShow(nextNumberToShow);
+    }
+  };
 
-    _classCallCheck(this, BookmarkList);
+  var hideComfirmation = function hideComfirmation() {
+    setShowConfirmation(false);
+  };
 
-    _this = _super.call(this, props);
-    _this.state = {
-      showConfirmation: false,
-      idToBeDeleted: null
-    };
-    _this.loadMoreBookmarks = _this.loadMoreBookmarks.bind(_assertThisInitialized(_this));
-    _this.handleDeleteButtonClicked = _this.handleDeleteButtonClicked.bind(_assertThisInitialized(_this));
-    _this.hideComfirmation = _this.hideComfirmation.bind(_assertThisInitialized(_this));
-    _this.handleDeletingConfirmed = _this.handleDeletingConfirmed.bind(_assertThisInitialized(_this));
-    _this._defaultBodyOverflow = 'scroll';
-    return _this;
-  }
+  var showComfirmation = function showComfirmation() {
+    setShowConfirmation(true);
+  };
 
-  _createClass(BookmarkList, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      this.checkAuthorization();
-      this._defaultBodyOverflow = _.get(document, 'body.style.overflow', this._defaultBodyOverflow);
-      var bookmarks = this.props.bookmarks;
-      var _this$props = this.props,
-          jwt = _this$props.jwt,
-          userID = _this$props.userID,
-          getMultipleBookmarks = _this$props.getMultipleBookmarks;
-      var offset = bookmarks.length;
-      getMultipleBookmarks(jwt, userID, offset, defaultLimit, defaultSort);
-    } // Redirect to singin page if user has not been authorized
-
-  }, {
-    key: "checkAuthorization",
-    value: function checkAuthorization() {
-      var _this$props2 = this.props,
-          isAuthed = _this$props2.isAuthed,
-          jwt = _this$props2.jwt;
-
-      if (!isAuthed || !jwt) {
-        var currentHref = typeof window === 'undefined' ? '' : window.location.href;
-        window.location.href = (0, _signInHref.getSignInHref)(currentHref);
-      }
-    }
-  }, {
-    key: "loadMoreBookmarks",
-    value: function loadMoreBookmarks() {
-      var _this$props3 = this.props,
-          total = _this$props3.total,
-          bookmarks = _this$props3.bookmarks,
-          jwt = _this$props3.jwt,
-          userID = _this$props3.userID,
-          getMultipleBookmarks = _this$props3.getMultipleBookmarks;
-      var offset = bookmarks.length;
-
-      if (offset < total) {
-        getMultipleBookmarks(jwt, userID, offset, defaultLimit, defaultSort);
-      }
-    }
-  }, {
-    key: "handleDeleteButtonClicked",
-    value: function handleDeleteButtonClicked(bookmarkID) {
-      this.setRecordToBeDeleted(bookmarkID);
-      this.showConfirmation();
-    }
-  }, {
-    key: "setRecordToBeDeleted",
-    value: function setRecordToBeDeleted(bookmarkID) {
-      this.setState({
-        idToBeDeleted: bookmarkID
-      });
-    }
-  }, {
-    key: "handleDeletingConfirmed",
-    value: function handleDeletingConfirmed() {
-      this.hideComfirmation();
-      var idToBeDeleted = this.state.idToBeDeleted;
-
-      if (typeof idToBeDeleted === 'number') {
-        var _this$props4 = this.props,
-            jwt = _this$props4.jwt,
-            userID = _this$props4.userID,
-            _deleteSingleBookmark = _this$props4.deleteSingleBookmark;
-
-        _deleteSingleBookmark(jwt, userID, idToBeDeleted);
-      } else {
-        console.error("Deleting bookmark failed. Bookmark id should be a number, but is ".concat(idToBeDeleted)); // eslint-disable-line no-console
-      }
-
-      this.setRecordToBeDeleted(null);
-    }
-  }, {
-    key: "hideComfirmation",
-    value: function hideComfirmation() {
-      var _this2 = this;
-
-      this.setState({
-        showConfirmation: false
-      }, function () {
-        document.body.style.overflow = _this2._defaultBodyOverflow;
-      });
-    }
-  }, {
-    key: "showConfirmation",
-    value: function showConfirmation() {
-      this.setState({
-        showConfirmation: true
-      }, function () {
-        document.body.style.overflow = 'hidden';
-      });
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$props5 = this.props,
-          isAuthed = _this$props5.isAuthed,
-          jwt = _this$props5.jwt;
-      if (!isAuthed || !jwt) return /*#__PURE__*/_react["default"].createElement(_redirectToSignIn["default"], null, "\u60A8\u5C1A\u672A\u767B\u5165\uFF0C\u5C07\u8DF3\u8F49\u81F3\u767B\u5165\u9801");
-      var _this$props6 = this.props,
-          bookmarks = _this$props6.bookmarks,
-          total = _this$props6.total,
-          releaseBranch = _this$props6.releaseBranch;
-      return /*#__PURE__*/_react["default"].createElement(Container, null, /*#__PURE__*/_react["default"].createElement(_bookmarks["default"], {
-        bookmarks: bookmarks,
-        handleDelete: this.handleDeleteButtonClicked,
-        total: total,
-        releaseBranch: releaseBranch
-      }), /*#__PURE__*/_react["default"].createElement(MoreContainer, {
-        hasMore: bookmarks.length < total
-      }, /*#__PURE__*/_react["default"].createElement(_more["default"], {
-        loadMore: this.loadMoreBookmarks
-      }, /*#__PURE__*/_react["default"].createElement("span", null, text.loadMore))), /*#__PURE__*/_react["default"].createElement(_CSSTransition["default"], {
-        classNames: transitionName,
-        "in": this.state.showConfirmation,
-        timeout: {
-          enter: transitionDuration.enter,
-          exit: transitionDuration.leave
-        },
-        mountOnEnter: true,
-        unmountOnExit: true
-      }, /*#__PURE__*/_react["default"].createElement(_confirmation["default"], {
-        onCancel: this.hideComfirmation,
-        onConfirm: this.handleDeletingConfirmed,
-        content: text.dialog.content,
-        confirm: text.dialog.confirm,
-        cancel: text.dialog.cancel
-      })));
+  var handleDeleteButtonClicked = function handleDeleteButtonClicked(bookmarkID) {
+    setIdToBeDeleted(bookmarkID);
+    showComfirmation();
+  };
+
+  var handleDeletingConfirmed = function handleDeletingConfirmed() {
+    hideComfirmation();
+
+    if (typeof idToBeDeleted === 'number') {
+      deleteSingleBookmark(jwt, userID, idToBeDeleted);
+    } else {
+      console.error("Deleting bookmark failed. Bookmark id should be a number, but is ".concat(idToBeDeleted)); // eslint-disable-line no-console
     }
-  }]);
 
-  return BookmarkList;
-}(_react["default"].Component);
+    setIdToBeDeleted(null);
+  };
+
+  if (!isAuthed || !jwt) {
+    return /*#__PURE__*/_react["default"].createElement(_redirectToSignIn["default"], null, "\u60A8\u5C1A\u672A\u767B\u5165\uFF0C\u5C07\u8DF3\u8F49\u81F3\u767B\u5165\u9801");
+  }
+
+  return /*#__PURE__*/_react["default"].createElement(Container, null, /*#__PURE__*/_react["default"].createElement(_bookmarks["default"], {
+    bookmarks: bookmarkToShow,
+    handleDelete: handleDeleteButtonClicked,
+    total: total,
+    releaseBranch: releaseBranch
+  }), /*#__PURE__*/_react["default"].createElement(MoreContainer, {
+    hasMore: numberToShow < total
+  }, /*#__PURE__*/_react["default"].createElement(_more["default"], {
+    loadMore: loadMoreBookmarks
+  }, /*#__PURE__*/_react["default"].createElement("span", null, text.loadMore))), /*#__PURE__*/_react["default"].createElement(_CSSTransition["default"], {
+    classNames: transitionName,
+    "in": showConfirmation,
+    timeout: {
+      enter: transitionDuration.enter,
+      exit: transitionDuration.leave
+    },
+    mountOnEnter: true,
+    unmountOnExit: true
+  }, /*#__PURE__*/_react["default"].createElement(_confirmation["default"], {
+    onCancel: hideComfirmation,
+    onConfirm: handleDeletingConfirmed,
+    content: text.dialog.content,
+    confirm: text.dialog.confirm,
+    cancel: text.dialog.cancel
+  })));
+};
 
 BookmarkList.propTypes = {
   releaseBranch: _propTypes2["default"].releaseBranch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/react-components",
-  "version": "8.10.0-rc.1",
+  "version": "8.10.0-rc.2",
   "main": "lib/index.js",
   "repository": "https://github.com/twreporter/twreporter-npm-packages.git",
   "author": "twreporter <developer@twreporter.org>",
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@twreporter/core": "^1.4.1",
-    "@twreporter/redux": "^7.2.1",
+    "@twreporter/redux": "^7.2.2-rc.0",
     "hoist-non-react-statics": "^2.3.1",
     "lodash": "^4.0.0",
     "memoize-one": "^5.0.5",
@@ -44,5 +44,5 @@
     "babel-loader": "^8.2.4",
     "chromatic": "^6.5.4"
   },
-  "gitHead": "648da942082304faa56026b9d5a5e597dc86fca4"
+  "gitHead": "e09f2e6df336ce4eb476ad56c5353a96f32159ac"
 }