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

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.4](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-article-components@1.6.4-rc.5...@twreporter/react-article-components@1.6.4) (2022-09-14)
+
+**Note:** Version bump only for package @twreporter/react-article-components
+
+
+
+
+
+## [1.6.4-rc.5](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-article-components@1.6.4-rc.4...@twreporter/react-article-components@1.6.4-rc.5) (2022-09-08)
+
+**Note:** Version bump only for package @twreporter/react-article-components
+
+
+
+
+
 ## [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)
 
 

package/lib/components/body/embedded-code.js

@@ -21,12 +21,14 @@ var _get = _interopRequireDefault(require("lodash/get"));
 
 var _merge = _interopRequireDefault(require("lodash/merge"));
 
-var _theme = _interopRequireDefault(require("../../constants/theme"));
-
 var _color = _interopRequireDefault(require("../../constants/color"));
 
 var _body = _interopRequireDefault(require("../../constants/prop-types/body"));
 
+var _theme = _interopRequireDefault(require("../../constants/theme"));
+
+var _positionZIndex = _interopRequireDefault(require("../../constants/position-z-index"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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); }
@@ -74,11 +76,17 @@ var _ = {
   get: _get["default"],
   merge: _merge["default"]
 };
+var embedNamespace = {
+  infogram: 'infogram',
+  twreporter: '__twreporterEmbeddedData'
+};
 
 var Block = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "embedded-code__Block",
   componentId: "tkafgt-0"
-})(["position:relative;img.img-responsive{margin:0 auto;max-width:100%;height:auto;display:block;}"]);
+})(["position:relative;z-index:", ";img.img-responsive{margin:0 auto;max-width:100%;height:auto;display:block;}"], function (props) {
+  return props.shouldEscalateZIndex ? _positionZIndex["default"].embed : 0;
+});
 
 exports.Block = Block;
 
@@ -112,8 +120,6 @@ function dispatchWindowLoadEvent() {
   window.dispatchEvent(loadEvent);
 }
 
-var infogramEmbed = 'infogram';
-
 var EmbeddedCode = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(EmbeddedCode, _React$PureComponent);
 
@@ -127,7 +133,8 @@ var EmbeddedCode = /*#__PURE__*/function (_React$PureComponent) {
     _this = _super.call(this, props);
 
     _defineProperty(_assertThisInitialized(_this), "state", {
-      isLoaded: false
+      isLoaded: false,
+      shouldEscalateZIndex: false
     });
 
     _defineProperty(_assertThisInitialized(_this), "executeScript", function () {
@@ -188,23 +195,32 @@ var EmbeddedCode = /*#__PURE__*/function (_React$PureComponent) {
 
     var _$get = _.get(_this.props, ['data', 'content', 0], {}),
         caption = _$get.caption,
+        embeddedCode = _$get.embeddedCode,
         embeddedCodeWithoutScript = _$get.embeddedCodeWithoutScript;
 
     _this._caption = caption;
     _this._embeddedCodeWithoutScript = embeddedCodeWithoutScript;
+    _this._embeddedCode = embeddedCode;
     return _this;
   }
 
   _createClass(EmbeddedCode, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _this$_embeddedCodeWi;
+      var _this$_embeddedCodeWi, _this$_embeddedCode;
 
       // Delay loading infogram in loadEmbed()
-      if (!((_this$_embeddedCodeWi = this._embeddedCodeWithoutScript) !== null && _this$_embeddedCodeWi !== void 0 && _this$_embeddedCodeWi.includes(infogramEmbed))) {
+      if (!((_this$_embeddedCodeWi = this._embeddedCodeWithoutScript) !== null && _this$_embeddedCodeWi !== void 0 && _this$_embeddedCodeWi.includes(embedNamespace.infogram))) {
         this.setState({
           isLoaded: true
         }, this.executeScript);
+      } // Deliberately set z-index for embeded from @twreporter
+
+
+      if ((_this$_embeddedCode = this._embeddedCode) !== null && _this$_embeddedCode !== void 0 && _this$_embeddedCode.includes(embedNamespace.twreporter)) {
+        this.setState({
+          shouldEscalateZIndex: true
+        });
       }
     }
   }, {
@@ -212,6 +228,7 @@ var EmbeddedCode = /*#__PURE__*/function (_React$PureComponent) {
     value: function componentWillUnmount() {
       this._embedded = null;
       this._caption = null;
+      this._embeddedCode = null;
       this._embeddedCodeWithoutScript = null;
     }
   }, {
@@ -220,17 +237,19 @@ var EmbeddedCode = /*#__PURE__*/function (_React$PureComponent) {
       var _this$_embeddedCodeWi2;
 
       var className = this.props.className;
+      var shouldEscalateZIndex = this.state.shouldEscalateZIndex;
 
       var embed = /*#__PURE__*/_react["default"].createElement("div", {
         className: className
       }, /*#__PURE__*/_react["default"].createElement(Block, {
         ref: this._embedded,
+        shouldEscalateZIndex: shouldEscalateZIndex,
         dangerouslySetInnerHTML: {
           __html: this._embeddedCodeWithoutScript
         }
       }), this._caption ? /*#__PURE__*/_react["default"].createElement(Caption, null, this._caption) : null);
 
-      if ((_this$_embeddedCodeWi2 = this._embeddedCodeWithoutScript) !== null && _this$_embeddedCodeWi2 !== void 0 && _this$_embeddedCodeWi2.includes(infogramEmbed)) {
+      if ((_this$_embeddedCodeWi2 = this._embeddedCodeWithoutScript) !== null && _this$_embeddedCodeWi2 !== void 0 && _this$_embeddedCodeWi2.includes(embedNamespace.infogram)) {
         return this.state.isLoaded ? embed : null;
       }
 

package/lib/constants/position-z-index.js

@@ -9,6 +9,10 @@ var _default = {
   // z-index is set for covering web-push & header.
   // Set z-index to 1002 because web-push has z-index 1001,
   // And header has z-index 1000.
-  toc: 1002
+  toc: 1002,
+  // embeded code
+  // when z-index is escalated, it is above toolbar
+  // but under the header hamburger menu which has z-index 1000
+  embed: 999
 };
 exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/react-article-components",
-  "version": "1.6.4-rc.4",
+  "version": "1.6.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",
@@ -24,10 +24,10 @@
     "webpack-dev-server": "^3.7.2"
   },
   "dependencies": {
-    "@twreporter/core": "^1.6.0-rc.0",
-    "@twreporter/react-components": "^8.13.0-rc.0",
-    "@twreporter/redux": "^7.3.0-rc.0",
-    "@twreporter/universal-header": "^2.2.14-rc.2",
+    "@twreporter/core": "^1.6.0",
+    "@twreporter/react-components": "^8.13.0",
+    "@twreporter/redux": "^7.3.0",
+    "@twreporter/universal-header": "^2.2.14",
     "howler": "^2.2.3",
     "lodash": "^4.17.11",
     "memoize-one": "^5.0.5",
@@ -40,5 +40,5 @@
   "files": [
     "lib"
   ],
-  "gitHead": "a94c5e961dbe609191117cd9e67b0b5a6d883e31"
+  "gitHead": "26c77ca4dbdfdd65e156c41c5fb96149f820b304"
 }