maxjhandsome
/
react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a bug with illegal invocation for Trusted Types (#17083) 

* Fixed a bug with illegal invocation.

* Fixed the test.
This commit is contained in:
Krzysztof Kotowicz 2019-10-15 12:41:42 +02:00 committed by Dan Abramov
parent a8c6a1b34e
commit fdba0e5ce7
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/react-dom/src/client/ToStringValue.js vendored
View File

@ -53,15 +53,14 @@ export opaque type TrustedValue: {toString(): string, valueOf(): string} = {
*/
export let toStringOrTrustedType: any => string | TrustedValue = toString;
if (enableTrustedTypesIntegration && typeof trustedTypes !== 'undefined') {
const isHTML = trustedTypes.isHTML;
const isScript = trustedTypes.isScript;
const isScriptURL = trustedTypes.isScriptURL;
// TrustedURLs are deprecated and will be removed soon: https://github.com/WICG/trusted-types/pull/204
const isURL = trustedTypes.isURL ? trustedTypes.isURL : value => false;
toStringOrTrustedType = value => {
if (
typeof value === 'object' &&
(isHTML(value) || isScript(value) || isScriptURL(value) || isURL(value))
(trustedTypes.isHTML(value) ||
trustedTypes.isScript(value) ||
trustedTypes.isScriptURL(value) ||
/* TrustedURLs are deprecated and will be removed soon: https://github.com/WICG/trusted-types/pull/204 */
(trustedTypes.isURL && trustedTypes.isURL(value)))
) {
// Pass Trusted Types through.
return value;

7
packages/react-dom/src/client/__tests__/trustedTypes-test.internal.js
View File

@ -22,7 +22,12 @@ describe('when Trusted Types are available in global object', () => {
container = document.createElement('div');
const fakeTTObjects = new Set();
window.trustedTypes = {
isHTML: value => fakeTTObjects.has(value),
isHTML: function(value) {
if (this !== window.trustedTypes) {
throw new Error(this);
}
return fakeTTObjects.has(value);
},
isScript: () => false,
isScriptURL: () => false,
};