@twreporter/react-article-components 1.6.4-rc.3 → 1.6.4-rc.4

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.4-rc.4](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-article-components@1.6.4-rc.3...@twreporter/react-article-components@1.6.4-rc.4) (2022-09-05)
+
+
+### Bug Fixes
+
+* make `useSnackBar` headless ([ddaf3dd](https://github.com/twreporter/twreporter-npm-packages/commit/ddaf3ddbd44abba3684f9209fc1b9e8b4c678c15))
+
+
+
+
+
 ## [1.6.4-rc.3](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-article-components@1.6.4-rc.2...@twreporter/react-article-components@1.6.4-rc.3) (2022-08-25)
 
 

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

@@ -65,7 +65,7 @@ var _ = {
   isNil: _isNil["default"]
 }; // global var
 
-var HideTextContext = /*#__PURE__*/(0, _react.createContext)();
+var ToolBarContext = /*#__PURE__*/(0, _react.createContext)();
 var defaultFbAppID = '962589903815787';
 
 var defaultFunc = function defaultFunc() {};
@@ -90,8 +90,8 @@ var OptionContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
 var SnackBarContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "mobile-tool-bar__SnackBarContainer",
   componentId: "do65sv-3"
-})(["z-index:5;opacity:", ";position:absolute;left:50%;transform:translateX(-50%);transition:opacity 100ms;"], function (props) {
-  return props.showSnackBar ? '1' : '0';
+})(["z-index:5;position:absolute;left:50%;transform:translateX(-50%);transition:opacity 100ms;opacity:", ";"], function (props) {
+  return props.showSnackBar ? 1 : 0;
 });
 
 var ToolBarContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
@@ -246,12 +246,10 @@ var ShareBy = function ShareBy(_ref4) {
       showOption = _useState2[0],
       setShowState = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      showSnackBar = _useState4[0],
-      setSnackBar = _useState4[1];
+  var _useContext = (0, _react.useContext)(ToolBarContext),
+      hideText = _useContext.hideText,
+      toastr = _useContext.toastr;
 
-  var hideText = (0, _react.useContext)(HideTextContext);
   var themeContext = (0, _react.useContext)(_styledComponents.ThemeContext);
   var theme = themeContext.name === _theme["default"].article.v2.photo ? 'photography' : 'normal';
   var releaseBranch = themeContext.releaseBranch;
@@ -261,10 +259,10 @@ var ShareBy = function ShareBy(_ref4) {
       return;
     }
 
-    setSnackBar(true);
-    setTimeout(function () {
-      setSnackBar(false);
-    }, 3000);
+    toastr({
+      text: '已複製',
+      timeout: 3000
+    });
   };
 
   var onButtonClick = function onButtonClick() {
@@ -294,11 +292,6 @@ var ShareBy = function ShareBy(_ref4) {
     appID: fbAppID
   }), /*#__PURE__*/_react["default"].createElement(LineShare, null), /*#__PURE__*/_react["default"].createElement(TwitterShare, null), /*#__PURE__*/_react["default"].createElement(CopyUrl, {
     onclick: onCopyUrl
-  })), /*#__PURE__*/_react["default"].createElement(SnackBarContainer, {
-    showSnackBar: showSnackBar
-  }, /*#__PURE__*/_react["default"].createElement(_snackBar.SnackBar, {
-    text: "\u5DF2\u8907\u88FD",
-    theme: theme
   })));
 };
 
@@ -308,7 +301,10 @@ ShareBy.propTypes = {
 
 var FontLevel = function FontLevel(_ref5) {
   var changeFontLevel = _ref5.changeFontLevel;
-  var hideText = (0, _react.useContext)(HideTextContext);
+
+  var _useContext2 = (0, _react.useContext)(ToolBarContext),
+      hideText = _useContext2.hideText;
+
   var themeContext = (0, _react.useContext)(_styledComponents.ThemeContext);
   var theme = themeContext.name === _theme["default"].article.v2.photo ? 'photography' : 'normal';
   var releaseBranch = themeContext.releaseBranch;
@@ -331,17 +327,10 @@ FontLevel.propTypes = {
 var BookmarkBlock = function BookmarkBlock(_ref6) {
   var articleMeta = _ref6.articleMeta;
 
-  var _useState5 = (0, _react.useState)(false),
-      _useState6 = _slicedToArray(_useState5, 2),
-      showSnackBar = _useState6[0],
-      setSnackBar = _useState6[1];
+  var _useContext3 = (0, _react.useContext)(ToolBarContext),
+      hideText = _useContext3.hideText,
+      toastr = _useContext3.toastr;
 
-  var _useState7 = (0, _react.useState)(''),
-      _useState8 = _slicedToArray(_useState7, 2),
-      snackbarText = _useState8[0],
-      setSnackbarText = _useState8[1];
-
-  var hideText = (0, _react.useContext)(HideTextContext);
   var themeContext = (0, _react.useContext)(_styledComponents.ThemeContext);
   var theme = themeContext.name === _theme["default"].article.v2.photo ? 'photography' : 'normal';
   var releaseBranch = themeContext.releaseBranch;
@@ -373,7 +362,7 @@ var BookmarkBlock = function BookmarkBlock(_ref6) {
                 console.error('add bookmark fail', _context2.t0);
 
               case 9:
-                toastr(isBookmarked);
+                onClickButton(isBookmarked);
 
               case 10:
               case "end":
@@ -402,24 +391,19 @@ var BookmarkBlock = function BookmarkBlock(_ref6) {
     }));
   };
 
-  var toastr = function toastr(isBookmarked) {
-    setSnackbarText(isBookmarked ? '已取消書籤' : '已儲存');
-    setSnackBar(true);
-    setTimeout(function () {
-      setSnackBar(false);
-    }, 3000);
+  var onClickButton = function onClickButton(isBookmarked) {
+    var text = isBookmarked ? '已取消書籤' : '已儲存';
+    toastr({
+      text: text,
+      timeout: 3000
+    });
   };
 
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_bookmarkWidget["default"], {
     toAutoCheck: false,
     articleMeta: articleMeta,
     renderIcon: renderIcon
-  }), /*#__PURE__*/_react["default"].createElement(SnackBarContainer, {
-    showSnackBar: showSnackBar
-  }, /*#__PURE__*/_react["default"].createElement(_snackBar.SnackBar, {
-    text: snackbarText,
-    theme: theme
-  })));
+  }));
 };
 
 BookmarkBlock.propTypes = {
@@ -428,7 +412,10 @@ BookmarkBlock.propTypes = {
 
 var BackToTopic = function BackToTopic(_ref8) {
   var backToTopic = _ref8.backToTopic;
-  var hideText = (0, _react.useContext)(HideTextContext);
+
+  var _useContext4 = (0, _react.useContext)(ToolBarContext),
+      hideText = _useContext4.hideText;
+
   var themeContext = (0, _react.useContext)(_styledComponents.ThemeContext);
   var theme = themeContext.name === _theme["default"].article.v2.photo ? 'photography' : 'normal';
   var releaseBranch = themeContext.releaseBranch;
@@ -452,7 +439,9 @@ BackToTopic.propTypes = {
 };
 
 var RelatedPost = function RelatedPost() {
-  var hideText = (0, _react.useContext)(HideTextContext);
+  var _useContext5 = (0, _react.useContext)(ToolBarContext),
+      hideText = _useContext5.hideText;
+
   var themeContext = (0, _react.useContext)(_styledComponents.ThemeContext);
   var theme = themeContext.name === _theme["default"].article.v2.photo ? 'photography' : 'normal';
   var releaseBranch = themeContext.releaseBranch;
@@ -479,10 +468,10 @@ var ToolBar = function ToolBar(_ref9) {
       onFontLevelChange = _ref9.onFontLevelChange,
       className = _ref9.className;
 
-  var _useState9 = (0, _react.useState)('init'),
-      _useState10 = _slicedToArray(_useState9, 2),
-      scrollDirection = _useState10[0],
-      setScrollDirection = _useState10[1];
+  var _useState3 = (0, _react.useState)('init'),
+      _useState4 = _slicedToArray(_useState3, 2),
+      scrollDirection = _useState4[0],
+      setScrollDirection = _useState4[1];
 
   (0, _react.useEffect)(function () {
     var threshold = 8;
@@ -523,17 +512,27 @@ var ToolBar = function ToolBar(_ref9) {
     };
   }, [scrollDirection]);
   var themeContext = (0, _react.useContext)(_styledComponents.ThemeContext);
+  var theme = themeContext.name === _theme["default"].article.v2.photo ? 'photography' : 'normal';
 
   var _getToolBarTheme = (0, _theme2.getToolBarTheme)(themeContext.name),
       bgColor = _getToolBarTheme.bgColor,
       shadow = _getToolBarTheme.shadow;
 
+  var _useSnackBar = (0, _snackBar.useSnackBar)(),
+      showSnackBar = _useSnackBar.showSnackBar,
+      snackBarText = _useSnackBar.snackBarText,
+      toastr = _useSnackBar.toastr;
+
   var backToTopicJSX = backToTopic ? /*#__PURE__*/_react["default"].createElement(BackToTopic, {
     backToTopic: backToTopic
   }) : null;
   var hideText = scrollDirection === 'down';
-  return /*#__PURE__*/_react["default"].createElement(HideTextContext.Provider, {
-    value: hideText
+  var contextValue = {
+    hideText: hideText,
+    toastr: toastr
+  };
+  return /*#__PURE__*/_react["default"].createElement(ToolBarContext.Provider, {
+    value: contextValue
   }, /*#__PURE__*/_react["default"].createElement(ToolBarContainer, {
     bgColor: bgColor,
     shadow: shadow,
@@ -545,7 +544,12 @@ var ToolBar = function ToolBar(_ref9) {
     fbAppID: fbAppID
   }), /*#__PURE__*/_react["default"].createElement(BookmarkBlock, {
     articleMeta: articleMetaForBookmark
-  }), /*#__PURE__*/_react["default"].createElement(RelatedPost, null), backToTopicJSX));
+  }), /*#__PURE__*/_react["default"].createElement(RelatedPost, null), backToTopicJSX, /*#__PURE__*/_react["default"].createElement(SnackBarContainer, {
+    showSnackBar: showSnackBar
+  }, /*#__PURE__*/_react["default"].createElement(_snackBar.SnackBar, {
+    text: snackBarText,
+    theme: theme
+  }))));
 };
 
 ToolBar.propTypes = _aside["default"].tools;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/react-article-components",
-  "version": "1.6.4-rc.3",
+  "version": "1.6.4-rc.4",
   "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.6.0-rc.0",
-    "@twreporter/react-components": "^8.12.1-rc.1",
+    "@twreporter/react-components": "^8.13.0-rc.0",
     "@twreporter/redux": "^7.3.0-rc.0",
-    "@twreporter/universal-header": "^2.2.14-rc.1",
+    "@twreporter/universal-header": "^2.2.14-rc.2",
     "howler": "^2.2.3",
     "lodash": "^4.17.11",
     "memoize-one": "^5.0.5",
@@ -40,5 +40,5 @@
   "files": [
     "lib"
   ],
-  "gitHead": "d106f6a077497c6df608a6699e44b05b80274069"
+  "gitHead": "a94c5e961dbe609191117cd9e67b0b5a6d883e31"
 }