@micromag/screen-share 0.3.239 → 0.3.246

package/es/index.js

@@ -30,6 +30,8 @@ var propTypes = {
   spacing: PropTypes.number,
   background: PropTypes$1.backgroundElement,
   callToAction: PropTypes$1.callToAction,
+  id: PropTypes.string,
+  index: PropTypes.number,
   current: PropTypes.bool,
   active: PropTypes.bool,
   transitions: PropTypes$1.transitions,
@@ -47,6 +49,8 @@ var defaultProps = {
   spacing: 20,
   background: null,
   callToAction: null,
+  id: null,
+  index: null,
   current: true,
   active: true,
   transitions: null,
@@ -67,6 +71,8 @@ var ShareScreen = function ShareScreen(_ref) {
       spacing = _ref.spacing,
       background = _ref.background,
       callToAction = _ref.callToAction,
+      id = _ref.id,
+      index = _ref.index,
       current = _ref.current,
       active = _ref.active,
       transitions = _ref.transitions,
@@ -112,8 +118,24 @@ var ShareScreen = function ShareScreen(_ref) {
         _ref2$pathname = _ref2.pathname,
         pathname = _ref2$pathname === void 0 ? null : _ref2$pathname;
 
-    return hostname + pathname;
-  }, []);
+    var parts = pathname.split('/');
+    /**
+     * for the last portion of the path, if it's equal to the screen index,
+     * or the screen id, then don't include it in the share URL.
+     * This makes sure we're not doing a `.replace()` that might remove a part
+     * from the slug of the current Micromag.
+     * (e.g. if the url is `/10-reasons-to-lorem-ipsum` and the share screen
+     * is on screen 10, then a string replace would remove the `/10` from the
+     * URL)
+     */
+
+    return parts.reduce(function (acc, part, i) {
+      return (// it's equal to the screen index, or equal to the screen ID, or it's empty
+        i === parts.length - 1 && parseInt(part, 10) === index || part === id || part === '' ? acc : "".concat(acc, "/").concat(part)
+      );
+    }, hostname);
+  }, [index, id]); // if not share URl was specified, default to the currentURL (without the screen index/id part)
+
   var finalShareURL = shareUrl || currentUrl;
   var defaultOptions = options !== null ? ['email', 'facebook', 'twitter', 'linkedin', 'whatsapp', 'facebookMessenger'] : [];
   var selectedOptions = options !== null ? Object.keys(options).reduce(function (acc, key) {
@@ -125,11 +147,10 @@ var ShareScreen = function ShareScreen(_ref) {
   var onClickShare = useCallback(function (type) {
     if (trackingEnabled) {
       trackEvent('click_share', type, {
-        shareUrl: shareUrl
+        shareUrl: finalShareURL
       });
     }
-  }, [trackEvent]); // Create elements
-
+  }, [trackEvent]);
   var items = [/*#__PURE__*/React.createElement(ScreenElement, {
     key: "title",
     placeholder: "title",

package/lib/index.js

@@ -49,6 +49,8 @@ var propTypes = {
   spacing: PropTypes__default["default"].number,
   background: core.PropTypes.backgroundElement,
   callToAction: core.PropTypes.callToAction,
+  id: PropTypes__default["default"].string,
+  index: PropTypes__default["default"].number,
   current: PropTypes__default["default"].bool,
   active: PropTypes__default["default"].bool,
   transitions: core.PropTypes.transitions,
@@ -66,6 +68,8 @@ var defaultProps = {
   spacing: 20,
   background: null,
   callToAction: null,
+  id: null,
+  index: null,
   current: true,
   active: true,
   transitions: null,
@@ -86,6 +90,8 @@ var ShareScreen = function ShareScreen(_ref) {
       spacing = _ref.spacing,
       background = _ref.background,
       callToAction = _ref.callToAction,
+      id = _ref.id,
+      index = _ref.index,
       current = _ref.current,
       active = _ref.active,
       transitions = _ref.transitions,
@@ -131,8 +137,24 @@ var ShareScreen = function ShareScreen(_ref) {
         _ref2$pathname = _ref2.pathname,
         pathname = _ref2$pathname === void 0 ? null : _ref2$pathname;
 
-    return hostname + pathname;
-  }, []);
+    var parts = pathname.split('/');
+    /**
+     * for the last portion of the path, if it's equal to the screen index,
+     * or the screen id, then don't include it in the share URL.
+     * This makes sure we're not doing a `.replace()` that might remove a part
+     * from the slug of the current Micromag.
+     * (e.g. if the url is `/10-reasons-to-lorem-ipsum` and the share screen
+     * is on screen 10, then a string replace would remove the `/10` from the
+     * URL)
+     */
+
+    return parts.reduce(function (acc, part, i) {
+      return (// it's equal to the screen index, or equal to the screen ID, or it's empty
+        i === parts.length - 1 && parseInt(part, 10) === index || part === id || part === '' ? acc : "".concat(acc, "/").concat(part)
+      );
+    }, hostname);
+  }, [index, id]); // if not share URl was specified, default to the currentURL (without the screen index/id part)
+
   var finalShareURL = shareUrl || currentUrl;
   var defaultOptions = options !== null ? ['email', 'facebook', 'twitter', 'linkedin', 'whatsapp', 'facebookMessenger'] : [];
   var selectedOptions = options !== null ? Object.keys(options).reduce(function (acc, key) {
@@ -144,11 +166,10 @@ var ShareScreen = function ShareScreen(_ref) {
   var onClickShare = React.useCallback(function (type) {
     if (trackingEnabled) {
       trackEvent('click_share', type, {
-        shareUrl: shareUrl
+        shareUrl: finalShareURL
       });
     }
-  }, [trackEvent]); // Create elements
-
+  }, [trackEvent]);
   var items = [/*#__PURE__*/React__default["default"].createElement(components.ScreenElement, {
     key: "title",
     placeholder: "title",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/screen-share",
-    "version": "0.3.239",
+    "version": "0.3.246",
     "description": "",
     "keywords": [
         "javascript"
@@ -53,15 +53,15 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.13.10",
-        "@micromag/core": "^0.3.239",
-        "@micromag/element-background": "^0.3.239",
-        "@micromag/element-call-to-action": "^0.3.239",
-        "@micromag/element-container": "^0.3.239",
-        "@micromag/element-heading": "^0.3.239",
-        "@micromag/element-layout": "^0.3.239",
-        "@micromag/element-share-options": "^0.3.239",
-        "@micromag/element-text": "^0.3.239",
-        "@micromag/transforms": "^0.3.239",
+        "@micromag/core": "^0.3.246",
+        "@micromag/element-background": "^0.3.246",
+        "@micromag/element-call-to-action": "^0.3.246",
+        "@micromag/element-container": "^0.3.246",
+        "@micromag/element-heading": "^0.3.246",
+        "@micromag/element-layout": "^0.3.246",
+        "@micromag/element-share-options": "^0.3.246",
+        "@micromag/element-text": "^0.3.246",
+        "@micromag/transforms": "^0.3.246",
         "classnames": "^2.2.6",
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
@@ -71,5 +71,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "04097fe48e3c87d66d8bdacb0961976d4802d753"
+    "gitHead": "473a4ad55684e54d3f1e62e760792ed6e003f8e7"
 }