react-show-more-text 1.7.0 → 1.7.2-rc.0

package/README.md

@@ -1,4 +1,4 @@
-# React Show More Text 1.7.0
+# React Show More Text 1.7.1
 
 [![NPM version][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]

package/lib/ShowMoreText.js

@@ -7,10 +7,11 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = require("prop-types");
 var _Truncate = _interopRequireDefault(require("./Truncate"));
-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 (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 _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 class ShowMoreText extends _react.Component {
   constructor(props) {
     super(props);
@@ -101,10 +102,10 @@ class ShowMoreText extends _react.Component {
           key: i + "br"
         })];
       }
-    }) : children), !truncated && expanded && /*#__PURE__*/_react.default.createElement("span", null, " ", /*#__PURE__*/_react.default.createElement("span", {
+    }) : children, !truncated && expanded && /*#__PURE__*/_react.default.createElement("span", null, " ", /*#__PURE__*/_react.default.createElement("span", {
       className: anchorClass,
       onClick: this.toggleLines
-    }, less)));
+    }, less))));
   }
 }
 _defineProperty(ShowMoreText, "defaultProps", {
@@ -135,5 +136,4 @@ _defineProperty(ShowMoreText, "propTypes", {
   expandByClick: _propTypes.PropTypes.bool,
   onTruncate: _propTypes.PropTypes.func
 });
-var _default = ShowMoreText;
-exports.default = _default;
+var _default = exports.default = ShowMoreText;

package/lib/Truncate.js

@@ -6,9 +6,26 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } /**
+ * LICENSE
+ * https://github.com/pablosichert/react-truncate/blob/master/LICENSE.md
+ *
+ * ISC License
+Copyright (c) 2016, One.com
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is
+hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE
+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */ // Initial version of react-truncate module (v2.4.0)
 class Truncate extends _react.default.Component {
   constructor() {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -34,6 +51,10 @@ class Truncate extends _react.default.Component {
       });
       return this.createMarkup(content);
     });
+    _defineProperty(this, "stripHtmlTags", str => {
+      return str.replace(/<[^>]*>/g, " ");
+    });
+    // Shim innerText to consistently break lines at <br/> but not at \n
     _defineProperty(this, "innerText", node => {
       const div = document.createElement("div");
       const contentKey = "innerText" in window.HTMLElement.prototype ? "innerText" : "textContent";
@@ -94,7 +115,7 @@ class Truncate extends _react.default.Component {
       }, callback);
     });
     _defineProperty(this, "measureWidth", text => {
-      return this.canvasContext.measureText(text).width;
+      return this.canvasContext.measureText(this.stripHtmlTags(text)).width;
     });
     _defineProperty(this, "ellipsisWidth", node => {
       return node.offsetWidth;
@@ -319,7 +340,7 @@ class Truncate extends _react.default.Component {
     }), /*#__PURE__*/_react.default.createElement("span", {
       style: {
         display: "block",
-        maxWidth: "".concat(spanProps.width, "px")
+        maxWidth: spanProps.width > 0 ? `${spanProps.width}px` : "unset"
       }
     }, text), /*#__PURE__*/_react.default.createElement("span", {
       ref: textEl => {

package/package.json

@@ -1,24 +1,21 @@
 {
   "name": "react-show-more-text",
-  "version": "1.7.0",
+  "version": "1.7.2-rc.0",
   "description": "The text surrounded by the component will be truncated. Anything surrounded by the component could be evaluated as text. The component react-show-more-text/ShowMoreText is fork of react-show-more/ShowMore, applied improvements, works with React 16.x.x, added onClick event.",
   "main": "lib/ShowMoreText.js",
   "files": [
     "lib"
   ],
   "scripts": {
-    "compile": "./node_modules/.bin/babel src/ShowMoreText.js src/Truncate.js --out-dir lib",
+    "compile": "babel src/ShowMoreText.js src/Truncate.js --out-dir lib",
     "compile:watch": "onchange \"src/**/*.js\" -- npm run compile --silent --source-maps",
     "coverage": "nyc npm test && nyc report --reporter=text-lcov",
     "lint": "eslint .",
-    "prepublish": "rm -rf ./lib && npm run compile",
     "preversion": "npm run test",
     "report-coverage": "npm run coverage | coveralls",
-    "test": "./node_modules/.bin/jest",
-    "test:watch": "./node_modules/.bin/jest --watch",
-    "travis": "npm run compile && npm run test",
-    "storybook": "start-storybook -p 6006",
-    "build-storybook": "build-storybook"
+    "test": "jest --runInBand",
+    "test:watch": "jest --watch --runInBand",
+    "travis": "npm run compile && npm run test"
   },
   "repository": {
     "type": "git",
@@ -43,47 +40,30 @@
     "react": "16 - 18.x"
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.1",
-    "@babel/core": "^7.12.3",
+    "@babel/cli": "^7.22.10",
+    "@babel/core": "^7.22.10",
+    "@babel/eslint-parser": "^7.22.10",
     "@babel/plugin-proposal-class-properties": "^7.12.1",
-    "@babel/preset-env": "^7.12.1",
-    "@babel/preset-react": "^7.12.1",
-    "@storybook/addon-actions": "^6.5.12",
-    "@storybook/addon-essentials": "^6.4.22",
-    "@storybook/addon-interactions": "^6.5.12",
-    "@storybook/addon-links": "^6.5.12",
-    "@storybook/builder-webpack4": "^6.5.12",
-    "@storybook/manager-webpack4": "^6.5.12",
-    "@storybook/react": "^6.1.21",
-    "@storybook/testing-library": "^0.0.13",
-    "babel-eslint": "^10.1.0",
-    "babel-loader": "^8.2.5",
-    "babel-preset-minify": "^0.5.1",
-    "canvas": "^2.8.0",
-    "core-js": "^3.6.5",
-    "coveralls": "^3.0.7",
+    "@babel/preset-env": "^7.22.10",
+    "@babel/preset-react": "^7.22.10",
+    "babel-jest": "^29.6.4",
+    "cheerio": "0.22.0",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.5",
-    "eslint": "^8.24.0",
-    "eslint-config-onelint": "^3.0.0",
-    "eslint-config-onelint-react": "^2.0.1",
-    "eslint-config-react-app": "^6.0.0",
-    "eslint-plugin-flowtype": "^5.8.1",
-    "eslint-plugin-import": "^2.23.4",
-    "eslint-plugin-jest": "^23.20.0",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-react": "^7.21.5",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "jest": "^29.1.2",
-    "jest-environment-jsdom": "^29.1.2",
-    "jest-enzyme": "^4.2.0",
-    "nyc": "^14.1.1",
-    "onchange": "^6.1.1",
+    "eslint": "^8.50.0",
+    "jest": "^29.6.4",
+    "jest-environment-jsdom": "^30.2.0",
+    "onchange": "^7.0.0",
     "react": "^16.14.0",
-    "react-dom": "^16.14.0"
+    "react-dom": "^16.14.0",
+    "react-test-renderer": "^16.14.0"
   },
   "dependencies": {
     "prop-types": "^15.7.2"
   },
   "browserslist": "> 0.25%, not dead"
+  ,
+  "overrides": {
+    "cheerio": "0.22.0"
+  }
 }