@times-components/caption 3.3.0 → 3.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,31 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [3.3.2](https://github.com/newsuk/times-components/compare/@times-components/caption@3.3.1...@times-components/caption@3.3.2) (2022-10-13)
7
+
8
+ **Note:** Version bump only for package @times-components/caption
9
+
10
+
11
+
12
+
13
+
14
+ ## [3.3.1](https://github.com/newsuk/times-components/compare/@times-components/caption@3.3.0...@times-components/caption@3.3.1) (2022-09-23)
15
+
16
+
17
+ ### Bug Fixes
18
+
19
+ * **TDP-2487:** inline image special characters ([d9d2c22](https://github.com/newsuk/times-components/commit/d9d2c2256f86be3b951590135aac27c2b0ae0767))
20
+ * **TDP-2487:** inline image special characters re merging ([#3160](https://github.com/newsuk/times-components/issues/3160)) ([44c4c92](https://github.com/newsuk/times-components/commit/44c4c92dad8aeacd99a94eac7f60036919fa7d95))
21
+
22
+
23
+ ### Reverts
24
+
25
+ * Revert "fix(TDP-2487): inline image special characters" (#3159) ([7e54d2f](https://github.com/newsuk/times-components/commit/7e54d2fc7003b74b9050915e87eed1e09866ab40)), closes [#3159](https://github.com/newsuk/times-components/issues/3159)
26
+
27
+
28
+
29
+
30
+
6
31
  # [3.3.0](https://github.com/newsuk/times-components/compare/@times-components/caption@3.2.8...@times-components/caption@3.3.0) (2022-08-18)
7
32
 
8
33
 
package/dist/caption.js CHANGED
@@ -13,6 +13,8 @@ exports["default"] = void 0;
13
13
 
14
14
  var _react = _interopRequireDefault(require("react"));
15
15
 
16
+ var _xss = _interopRequireDefault(require("xss"));
17
+
16
18
  var _utils = require("@times-components/utils");
17
19
 
18
20
  var _captionPropTypes = require("./caption-prop-types");
@@ -34,9 +36,24 @@ var renderCredits = function renderCredits(style, credits) {
34
36
  return null;
35
37
  }
36
38
 
39
+ var sanitisedText = (0, _xss["default"])(credits.toUpperCase(), {
40
+ whiteList: {
41
+ p: [],
42
+ a: ["href"],
43
+ br: [],
44
+ img: [],
45
+ b: [],
46
+ strong: []
47
+ },
48
+ stripIgnoreTag: true,
49
+ stripIgnoreTagBody: ["script"]
50
+ });
37
51
  return /*#__PURE__*/_react["default"].createElement(_utils.TcText, {
38
- style: (0, _utils.checkStylesForUnits)(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, _styles["default"].text), _styles["default"].credits), style.text), style.credits))
39
- }, credits.toUpperCase());
52
+ style: (0, _utils.checkStylesForUnits)(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, _styles["default"].text), _styles["default"].credits), style.text), style.credits)),
53
+ dangerouslySetInnerHTML: {
54
+ __html: sanitisedText
55
+ }
56
+ });
40
57
  };
41
58
 
42
59
  var renderText = function renderText(style, text) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@times-components/caption",
3
- "version": "3.3.0",
3
+ "version": "3.3.2",
4
4
  "description": "Media caption component",
5
5
  "main": "dist/caption",
6
6
  "dev": "src/caption",
@@ -31,16 +31,17 @@
31
31
  },
32
32
  "homepage": "https://github.com/newsuk/times-components#readme",
33
33
  "dependencies": {
34
- "@times-components/ts-styleguide": "1.37.0",
35
- "@times-components/utils": "6.15.0",
36
- "prop-types": "15.7.2"
34
+ "@times-components/ts-styleguide": "1.37.1",
35
+ "@times-components/utils": "6.15.1",
36
+ "prop-types": "15.7.2",
37
+ "xss": "^1.0.10"
37
38
  },
38
39
  "devDependencies": {
39
40
  "@babel/core": "7.4.4",
40
41
  "@times-components/eslint-config-thetimes": "0.8.18",
41
42
  "@times-components/jest-configurator-web": "0.8.0",
42
- "@times-components/jest-serializer": "3.4.0",
43
- "@times-components/storybook": "4.5.0",
43
+ "@times-components/jest-serializer": "3.4.1",
44
+ "@times-components/storybook": "4.5.1",
44
45
  "@times-components/test-utils": "2.4.0",
45
46
  "@times-components/webpack-configurator": "2.1.0",
46
47
  "babel-jest": "24.8.0",
@@ -65,5 +66,5 @@
65
66
  "publishConfig": {
66
67
  "access": "public"
67
68
  },
68
- "gitHead": "fe2f12b7448a88662c53f840772282cd97756c5c"
69
+ "gitHead": "d33c3115e165e09794ffdfd7931e217620f7ce07"
69
70
  }
package/rnw.js CHANGED
@@ -1 +1 @@
1
- module.exports=function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}return r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=4)}([function(e,t){e.exports=require("@times-components/ts-styleguide/rnw")},function(e,t){e.exports=require("react")},function(e,t){e.exports=require("@times-components/utils/rnw")},function(e,t){e.exports=require("prop-types")},function(e,t,r){"use strict";r.r(t);var n=r(1),o=r.n(n),c=r(2),i=r(3),u=r.n(i),l=u.a.string.style,a=u.a.object.style,p=(u.a.element,u.a.string,u.a.shape({container:a,text:l}),u.a.string,{children:null,credits:"",style:{},text:""}),s=r(0);function f(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function b(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var O={container:{paddingTop:Object(s.spacing)(2)},credits:{color:s.colours.functional.primary,fontSize:s.fontSizes.credits,fontWeight:"400",letterSpacing:1,lineHeight:16},text:function(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?f(Object(r),!0).forEach((function(t){b(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):f(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}({color:s.colours.functional.secondary},Object(s.fontFactory)({font:"supporting",fontSize:"caption"}))};function y(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function j(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?y(Object(r),!0).forEach((function(t){d(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):y(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}function d(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var g=j(j({},O),{},{credits:j(j({},O.credits),{},{lineHeight:17}),text:j(j({},O.text),{},{lineHeight:17})});function P(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function v(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?P(Object(r),!0).forEach((function(t){m(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):P(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}function m(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var w=function(e){var t=e.children,r=e.credits,n=e.style,c=e.text;return o.a.createElement(T,{credits:r,style:v(v({},n),{},{text:v(v({},n.text),{},{paddingHorizontal:Object(s.spacing)(2),textAlign:"center"})}),text:c},t)};w.defaultProps=p;var h=w;function x(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function S(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?x(Object(r),!0).forEach((function(t){D(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):x(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}function D(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}r.d(t,"CentredCaption",(function(){return h}));var E=function(e){var t=e.children,r=e.credits,n=e.style,i=e.text;return o.a.createElement(c.TcView,null,t,o.a.createElement(c.TcView,{style:S(S({},g.container),n.container)},function(e,t){return t&&""!==t?o.a.createElement(c.TcText,{style:Object(c.checkStylesForUnits)(S(S(S({},g.text),e.text),e.caption))},t):null}(n,i),function(e,t){return t&&""!==t?o.a.createElement(c.TcText,{style:Object(c.checkStylesForUnits)(S(S(S(S({},g.text),g.credits),e.text),e.credits))},t.toUpperCase()):null}(n,r)))};E.defaultProps=p;var T=t.default=E}]);
1
+ module.exports=function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}return r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=5)}([function(e,t){e.exports=require("@times-components/ts-styleguide/rnw")},function(e,t){e.exports=require("react")},function(e,t){e.exports=require("@times-components/utils/rnw")},function(e,t){e.exports=require("prop-types")},function(e,t){e.exports=require("xss")},function(e,t,r){"use strict";r.r(t);var n=r(1),o=r.n(n),c=r(4),i=r.n(c),u=r(2),a=r(3),l=r.n(a),s=l.a.string.style,p=l.a.object.style,f=(l.a.element,l.a.string,l.a.shape({container:p,text:s}),l.a.string,{children:null,credits:"",style:{},text:""}),b=r(0);function O(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function y(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var j={container:{paddingTop:Object(b.spacing)(2)},credits:{color:b.colours.functional.primary,fontSize:b.fontSizes.credits,fontWeight:"400",letterSpacing:1,lineHeight:16},text:function(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?O(Object(r),!0).forEach((function(t){y(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):O(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}({color:b.colours.functional.secondary},Object(b.fontFactory)({font:"supporting",fontSize:"caption"}))};function g(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function d(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?g(Object(r),!0).forEach((function(t){P(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):g(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}function P(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var v=d(d({},j),{},{credits:d(d({},j.credits),{},{lineHeight:17}),text:d(d({},j.text),{},{lineHeight:17})});function m(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function w(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?m(Object(r),!0).forEach((function(t){h(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):m(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}function h(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var x=function(e){var t=e.children,r=e.credits,n=e.style,c=e.text;return o.a.createElement(k,{credits:r,style:w(w({},n),{},{text:w(w({},n.text),{},{paddingHorizontal:Object(b.spacing)(2),textAlign:"center"})}),text:c},t)};x.defaultProps=f;var S=x;function D(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function E(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?D(Object(r),!0).forEach((function(t){T(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):D(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}function T(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}r.d(t,"CentredCaption",(function(){return S}));var _=function(e){var t=e.children,r=e.credits,n=e.style,c=e.text;return o.a.createElement(u.TcView,null,t,o.a.createElement(u.TcView,{style:E(E({},v.container),n.container)},function(e,t){return t&&""!==t?o.a.createElement(u.TcText,{style:Object(u.checkStylesForUnits)(E(E(E({},v.text),e.text),e.caption))},t):null}(n,c),function(e,t){if(!t||""===t)return null;var r=i()(t.toUpperCase(),{whiteList:{p:[],a:["href"],br:[],img:[],b:[],strong:[]},stripIgnoreTag:!0,stripIgnoreTagBody:["script"]});return o.a.createElement(u.TcText,{style:Object(u.checkStylesForUnits)(E(E(E(E({},v.text),v.credits),e.text),e.credits)),dangerouslySetInnerHTML:{__html:r}})}(n,r)))};_.defaultProps=f;var k=t.default=_}]);