@twreporter/react-article-components 1.6.0-rc.2 → 1.6.1

package/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.1](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-article-components@1.6.1-rc.0...@twreporter/react-article-components@1.6.1) (2022-07-27)
+
+**Note:** Version bump only for package @twreporter/react-article-components
+
+
+
+
+
+## [1.6.1-rc.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-article-components@1.6.0...@twreporter/react-article-components@1.6.1-rc.0) (2022-07-25)
+
+
+### Bug Fixes
+
+* add id for bookmark & fix icon releaseBranch ([760a8ba](https://github.com/twreporter/twreporter-npm-packages/commit/760a8bab17f85ba1f04f7d4853dbb4b722992778))
+* pop out snackbar asynchrously ([00988cc](https://github.com/twreporter/twreporter-npm-packages/commit/00988cc6eb76cebb83818c81befbfeba2f47e843))
+
+
+
+
+
+# [1.6.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-article-components@1.6.0-rc.2...@twreporter/react-article-components@1.6.0) (2022-07-21)
+
+**Note:** Version bump only for package @twreporter/react-article-components
+
+
+
+
+
 # [1.6.0-rc.2](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-article-components@1.6.0-rc.1...@twreporter/react-article-components@1.6.0-rc.2) (2022-07-20)
 
 **Note:** Version bump only for package @twreporter/react-article-components

package/lib/components/aside/desktop-tools.js

@@ -11,7 +11,7 @@ var _dynamicComponentsContext = _interopRequireDefault(require("../../contexts/d
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
@@ -104,6 +104,9 @@ var ToolsBlock = /*#__PURE__*/_styledComponents["default"].div.withConfig({
 });
 
 function FBShareBT(props) {
+  var themeContext = (0, _react.useContext)(_styledComponents.ThemeContext);
+  var releaseBranch = themeContext.releaseBranch;
+
   var handleClick = function handleClick() {
     var currentURL = window.location.href;
     var location = 'https://www.facebook.com/dialog/feed?' + 'display=page' + "&app_id=".concat(props.appID) + "&link=".concat(encodeURIComponent(currentURL)) + "&redirect_uri=".concat(encodeURIComponent('https://www.facebook.com/'));
@@ -113,7 +116,8 @@ function FBShareBT(props) {
   return /*#__PURE__*/_react["default"].createElement(ShareIconBlock, {
     id: "fb-share"
   }, /*#__PURE__*/_react["default"].createElement(_icon.Facebook, {
-    onClick: handleClick
+    onClick: handleClick,
+    releaseBranch: releaseBranch
   }));
 }
 
@@ -122,6 +126,9 @@ FBShareBT.propTypes = {
 };
 
 function TwitterShareBT(props) {
+  var themeContext = (0, _react.useContext)(_styledComponents.ThemeContext);
+  var releaseBranch = themeContext.releaseBranch;
+
   var handleClick = function handleClick() {
     var currentURL = window.location.href;
     var location = 'https://twitter.com/intent/tweet?' + "url=".concat(encodeURIComponent(currentURL), "&text=").concat(encodeURIComponent(document.title + ' #報導者'));
@@ -131,11 +138,15 @@ function TwitterShareBT(props) {
   return /*#__PURE__*/_react["default"].createElement(ShareIconBlock, {
     id: "twitter-share"
   }, /*#__PURE__*/_react["default"].createElement(_icon.Twitter, {
-    onClick: handleClick
+    onClick: handleClick,
+    releaseBranch: releaseBranch
   }));
 }
 
 function LineShareBT(props) {
+  var themeContext = (0, _react.useContext)(_styledComponents.ThemeContext);
+  var releaseBranch = themeContext.releaseBranch;
+
   var handleClick = function handleClick() {
     var currentURL = window.location.href;
     var location = "https://social-plugins.line.me/lineit/share?url=".concat(encodeURIComponent(currentURL));
@@ -145,33 +156,69 @@ function LineShareBT(props) {
   return /*#__PURE__*/_react["default"].createElement(ShareIconBlock, {
     id: "line-share"
   }, /*#__PURE__*/_react["default"].createElement(_icon.Line, {
-    onClick: handleClick
+    onClick: handleClick,
+    releaseBranch: releaseBranch
   }));
 }
 
-function BookmarkIcon(isBookmarked, addAction, removeAction) {
-  var iconType = isBookmarked ? 'saved' : 'add';
-  return /*#__PURE__*/_react["default"].createElement(BookmarkIconBlock, {
-    onClick: isBookmarked ? removeAction : addAction,
-    isBookmarked: isBookmarked
-  }, /*#__PURE__*/_react["default"].createElement(_icon.Bookmark, {
-    type: iconType
-  }));
-}
+var BookmarkBlock = function BookmarkBlock(_ref) {
+  var articleMeta = _ref.articleMeta;
+  var themeContext = (0, _react.useContext)(_styledComponents.ThemeContext);
+  var releaseBranch = themeContext.releaseBranch;
+
+  var renderIcon = function renderIcon(isBookmarked, addAction, removeAction) {
+    var iconType = isBookmarked ? 'saved' : 'add';
+    var id = isBookmarked ? 'remove-bookmark' : 'add-bookmark';
+    return /*#__PURE__*/_react["default"].createElement(BookmarkIconBlock, {
+      onClick: isBookmarked ? removeAction : addAction,
+      isBookmarked: isBookmarked,
+      id: id
+    }, /*#__PURE__*/_react["default"].createElement(_icon.Bookmark, {
+      type: iconType,
+      releaseBranch: releaseBranch
+    }));
+  };
 
-var defaultFbAppID = '962589903815787';
+  return /*#__PURE__*/_react["default"].createElement(_bookmarkWidget["default"], {
+    toAutoCheck: false,
+    articleMeta: articleMeta,
+    renderIcon: renderIcon
+  });
+};
 
-var Tools = function Tools(_ref) {
-  var backToTopic = _ref.backToTopic,
-      fbAppID = _ref.fbAppID,
-      height = _ref.height,
-      onFontLevelChange = _ref.onFontLevelChange,
-      articleMetaForBookmark = _ref.articleMetaForBookmark;
-  var backToTopicJSX = backToTopic ? /*#__PURE__*/_react["default"].createElement(_dynamicComponentsContext["default"].Consumer, null, function (components) {
+BookmarkBlock.propTypes = {
+  articleMeta: _aside["default"].tools.articleMetaForBookmark
+};
+
+var BackToTopic = function BackToTopic(_ref2) {
+  var backToTopic = _ref2.backToTopic;
+  var themeContext = (0, _react.useContext)(_styledComponents.ThemeContext);
+  var releaseBranch = themeContext.releaseBranch;
+  return /*#__PURE__*/_react["default"].createElement(_dynamicComponentsContext["default"].Consumer, null, function (components) {
     return /*#__PURE__*/_react["default"].createElement(components.Link, {
       to: backToTopic,
       target: "_self"
-    }, /*#__PURE__*/_react["default"].createElement(BackToTopicBlock, null, /*#__PURE__*/_react["default"].createElement(_icon.Topic, null)));
+    }, /*#__PURE__*/_react["default"].createElement(BackToTopicBlock, null, /*#__PURE__*/_react["default"].createElement(_icon.Topic, {
+      releaseBranch: releaseBranch
+    })));
+  });
+};
+
+BackToTopic.propTypes = {
+  backToTopic: _aside["default"].tools.backToTopic
+};
+var defaultFbAppID = '962589903815787';
+
+var Tools = function Tools(_ref3) {
+  var backToTopic = _ref3.backToTopic,
+      fbAppID = _ref3.fbAppID,
+      height = _ref3.height,
+      onFontLevelChange = _ref3.onFontLevelChange,
+      articleMetaForBookmark = _ref3.articleMetaForBookmark;
+  var themeContext = (0, _react.useContext)(_styledComponents.ThemeContext);
+  var releaseBranch = themeContext.releaseBranch;
+  var backToTopicJSX = backToTopic ? /*#__PURE__*/_react["default"].createElement(BackToTopic, {
+    backToTopic: backToTopic
   }) : null;
 
   var onPrinterClick = function onPrinterClick() {
@@ -180,14 +227,14 @@ var Tools = function Tools(_ref) {
 
   return /*#__PURE__*/_react["default"].createElement(ToolsBlock, {
     height: height
-  }, backToTopicJSX, /*#__PURE__*/_react["default"].createElement(_bookmarkWidget["default"], {
-    toAutoCheck: false,
-    articleMeta: articleMetaForBookmark,
-    renderIcon: BookmarkIcon
+  }, backToTopicJSX, /*#__PURE__*/_react["default"].createElement(BookmarkBlock, {
+    articleMeta: articleMetaForBookmark
   }), /*#__PURE__*/_react["default"].createElement(TextIconBlock, null, /*#__PURE__*/_react["default"].createElement(_icon.Text, {
-    onClick: onFontLevelChange
+    onClick: onFontLevelChange,
+    releaseBranch: releaseBranch
   })), /*#__PURE__*/_react["default"].createElement(PrintIconBlock, null, /*#__PURE__*/_react["default"].createElement(_icon.Printer, {
-    onClick: onPrinterClick
+    onClick: onPrinterClick,
+    releaseBranch: releaseBranch
   })), /*#__PURE__*/_react["default"].createElement(FBShareBT, {
     appID: fbAppID || defaultFbAppID
   }), /*#__PURE__*/_react["default"].createElement(TwitterShareBT, null), /*#__PURE__*/_react["default"].createElement(LineShareBT, null));

package/lib/components/aside/mobile-tool-bar.js

@@ -347,17 +347,48 @@ var BookmarkBlock = function BookmarkBlock(_ref6) {
   var renderIcon = function renderIcon(isBookmarked, addAction, removeAction) {
     var iconType = isBookmarked ? 'saved' : 'add';
     var text = isBookmarked ? '已儲存' : '加入書籤';
+    var id = isBookmarked ? 'remove-bookmark' : 'add-bookmark';
+
+    var handleClick = /*#__PURE__*/function () {
+      var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+        var action;
+        return regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                action = isBookmarked ? removeAction : addAction;
+                _context2.prev = 1;
+                _context2.next = 4;
+                return action();
+
+              case 4:
+                _context2.next = 9;
+                break;
+
+              case 6:
+                _context2.prev = 6;
+                _context2.t0 = _context2["catch"](1);
+                console.error('add bookmark fail', _context2.t0);
+
+              case 9:
+                toastr(isBookmarked);
+
+              case 10:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, null, [[1, 6]]);
+      }));
 
-    var handleClick = function handleClick() {
-      var action = isBookmarked ? removeAction : addAction;
-      action();
-      setTimeout(function () {
-        toastr(isBookmarked);
-      }, 500);
-    };
+      return function handleClick() {
+        return _ref7.apply(this, arguments);
+      };
+    }();
 
     return /*#__PURE__*/_react["default"].createElement(ButtonContainer, {
-      onClick: handleClick
+      onClick: handleClick,
+      id: id
     }, /*#__PURE__*/_react["default"].createElement(_button.IconWithTextButton, {
       text: text,
       iconComponent: /*#__PURE__*/_react["default"].createElement(_icon.Bookmark, {
@@ -393,8 +424,8 @@ BookmarkBlock.propTypes = {
   articleMeta: _aside["default"].tools.articleMetaForBookmark
 };
 
-var BackToTopic = function BackToTopic(_ref7) {
-  var backToTopic = _ref7.backToTopic;
+var BackToTopic = function BackToTopic(_ref8) {
+  var backToTopic = _ref8.backToTopic;
   var hideText = (0, _react.useContext)(HideTextContext);
   var themeContext = (0, _react.useContext)(_styledComponents.ThemeContext);
   var theme = themeContext.name === _theme["default"].article.v2.photo ? 'photography' : 'normal';
@@ -443,13 +474,13 @@ var RelatedPost = function RelatedPost() {
   }));
 };
 
-var ToolBar = function ToolBar(_ref8) {
-  var backToTopic = _ref8.backToTopic,
-      _ref8$fbAppID = _ref8.fbAppID,
-      fbAppID = _ref8$fbAppID === void 0 ? defaultFbAppID : _ref8$fbAppID,
-      articleMetaForBookmark = _ref8.articleMetaForBookmark,
-      onFontLevelChange = _ref8.onFontLevelChange,
-      className = _ref8.className;
+var ToolBar = function ToolBar(_ref9) {
+  var backToTopic = _ref9.backToTopic,
+      _ref9$fbAppID = _ref9.fbAppID,
+      fbAppID = _ref9$fbAppID === void 0 ? defaultFbAppID : _ref9$fbAppID,
+      articleMetaForBookmark = _ref9.articleMetaForBookmark,
+      onFontLevelChange = _ref9.onFontLevelChange,
+      className = _ref9.className;
 
   var _useState9 = (0, _react.useState)('init'),
       _useState10 = _slicedToArray(_useState9, 2),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/react-article-components",
-  "version": "1.6.0-rc.2",
+  "version": "1.6.1",
   "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",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@twreporter/core": "^1.4.1",
-    "@twreporter/react-components": "^8.11.0-rc.0",
+    "@twreporter/react-components": "^8.11.0",
     "@twreporter/redux": "^7.2.2",
-    "@twreporter/universal-header": "^2.2.11-rc.0",
+    "@twreporter/universal-header": "^2.2.11",
     "howler": "^2.2.3",
     "lodash": "^4.17.11",
     "memoize-one": "^5.0.5",
@@ -40,5 +40,5 @@
   "files": [
     "lib"
   ],
-  "gitHead": "fd9df4910781396b141caba06abffb051c5b6500"
+  "gitHead": "244cb67b289aa61d0c847dc2f07036d2472269c6"
 }