react-inlinesvg 3.0.1 → 3.0.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/README.md +9 -11
- package/esm/index.js +12 -7
- package/esm/index.js.map +1 -1
- package/esm/types.d.ts +5 -5
- package/lib/index.js +12 -7
- package/lib/index.js.map +1 -1
- package/lib/types.d.ts +5 -5
- package/package.json +18 -18
- package/src/index.tsx +11 -7
- package/src/types.ts +1 -1
package/README.md
CHANGED
|
@@ -23,20 +23,18 @@ npm i react-inlinesvg
|
|
|
23
23
|
And import it into your code:
|
|
24
24
|
|
|
25
25
|
```tsx
|
|
26
|
-
import React
|
|
27
|
-
import SVG
|
|
28
|
-
|
|
29
|
-
const Logo = React.forwardRef<SVGElement, SVGProps>((props, ref) => (
|
|
30
|
-
<SVG innerRef={ref} title="MyLogo" {...props} />
|
|
31
|
-
));
|
|
32
|
-
|
|
33
|
-
export function App() {
|
|
34
|
-
const logo = useRef<SVGElement>(null);
|
|
26
|
+
import React from 'react';
|
|
27
|
+
import SVG from 'react-inlinesvg';
|
|
35
28
|
|
|
29
|
+
export default function App() {
|
|
36
30
|
return (
|
|
37
31
|
<main>
|
|
38
|
-
<SVG
|
|
39
|
-
|
|
32
|
+
<SVG
|
|
33
|
+
src="https://cdn.svgporn.com/logos/react.svg"
|
|
34
|
+
width={128}
|
|
35
|
+
height="auto"
|
|
36
|
+
title="React"
|
|
37
|
+
/>
|
|
40
38
|
</main>
|
|
41
39
|
);
|
|
42
40
|
}
|
package/esm/index.js
CHANGED
|
@@ -79,11 +79,13 @@ var InlineSVG = /** @class */ (function (_super) {
|
|
|
79
79
|
enumerable: true,
|
|
80
80
|
configurable: true,
|
|
81
81
|
writable: true,
|
|
82
|
-
value: function (content) {
|
|
82
|
+
value: function (content, hasCache) {
|
|
83
|
+
if (hasCache === void 0) { hasCache = false; }
|
|
83
84
|
/* istanbul ignore else */
|
|
84
85
|
if (_this.isActive) {
|
|
85
86
|
_this.setState({
|
|
86
87
|
content: content,
|
|
88
|
+
hasCache: hasCache,
|
|
87
89
|
status: STATUS.LOADED,
|
|
88
90
|
}, _this.getElement);
|
|
89
91
|
}
|
|
@@ -257,18 +259,20 @@ var InlineSVG = /** @class */ (function (_super) {
|
|
|
257
259
|
if (originalDesc && originalDesc.parentNode) {
|
|
258
260
|
originalDesc.parentNode.removeChild(originalDesc);
|
|
259
261
|
}
|
|
260
|
-
var descElement = document.
|
|
262
|
+
var descElement = document.createElementNS('http://www.w3.org/2000/svg', 'desc');
|
|
261
263
|
descElement.innerHTML = description;
|
|
262
264
|
svg.prepend(descElement);
|
|
263
265
|
}
|
|
264
|
-
if (title) {
|
|
266
|
+
if (typeof title !== 'undefined') {
|
|
265
267
|
var originalTitle = svg.querySelector('title');
|
|
266
268
|
if (originalTitle && originalTitle.parentNode) {
|
|
267
269
|
originalTitle.parentNode.removeChild(originalTitle);
|
|
268
270
|
}
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
271
|
+
if (title) {
|
|
272
|
+
var titleElement = document.createElementNS('http://www.w3.org/2000/svg', 'title');
|
|
273
|
+
titleElement.innerHTML = title;
|
|
274
|
+
svg.prepend(titleElement);
|
|
275
|
+
}
|
|
272
276
|
}
|
|
273
277
|
return svg;
|
|
274
278
|
}
|
|
@@ -309,12 +313,13 @@ var InlineSVG = /** @class */ (function (_super) {
|
|
|
309
313
|
this.setState({
|
|
310
314
|
content: '',
|
|
311
315
|
element: null,
|
|
316
|
+
hasCache: false,
|
|
312
317
|
status: STATUS.LOADING,
|
|
313
318
|
}, function () {
|
|
314
319
|
var _a = _this.props, cacheRequests = _a.cacheRequests, src = _a.src;
|
|
315
320
|
var cache = cacheRequests && cacheStore[src];
|
|
316
321
|
if (cache && cache.status === STATUS.LOADED) {
|
|
317
|
-
_this.handleLoad(cache.content);
|
|
322
|
+
_this.handleLoad(cache.content, true);
|
|
318
323
|
return;
|
|
319
324
|
}
|
|
320
325
|
var dataURI = src.match(/data:image\/svg[^,]*?(;base64)?,(.*)/);
|
package/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,OAAO,MAAM,gBAAgB,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAG1F,MAAM,CAAC,IAAM,UAAU,GAAmC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAE9E;IAAuC,6BAAiC;IAUtE,mBAAY,KAAY;QAAxB,YACE,kBAAM,KAAK,CAAC,SAUb;QApBD;;;;mBAAwB,KAAK;WAAC;QAC9B;;;;mBAAmB,KAAK;WAAC;QACzB;;;;;WAA8B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"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"}
|
package/esm/types.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
-
export
|
|
3
|
-
export
|
|
4
|
-
export
|
|
5
|
-
export
|
|
2
|
+
export type ErrorCallback = (error: Error | FetchError) => void;
|
|
3
|
+
export type LoadCallback = (src: string, isCached: boolean) => void;
|
|
4
|
+
export type PlainObject<T = unknown> = Record<string | number | symbol, T>;
|
|
5
|
+
export type PreProcessorCallback = (code: string) => string;
|
|
6
6
|
export interface Props extends Omit<React.SVGProps<SVGElement>, 'onLoad' | 'onError' | 'ref'> {
|
|
7
7
|
baseURL?: string;
|
|
8
8
|
cacheRequests?: boolean;
|
|
@@ -15,7 +15,7 @@ export interface Props extends Omit<React.SVGProps<SVGElement>, 'onLoad' | 'onEr
|
|
|
15
15
|
onLoad?: LoadCallback;
|
|
16
16
|
preProcessor?: PreProcessorCallback;
|
|
17
17
|
src: string;
|
|
18
|
-
title?: string;
|
|
18
|
+
title?: string | null;
|
|
19
19
|
uniqueHash?: string;
|
|
20
20
|
uniquifyIDs?: boolean;
|
|
21
21
|
}
|
package/lib/index.js
CHANGED
|
@@ -96,11 +96,13 @@ var InlineSVG = /** @class */ (function (_super) {
|
|
|
96
96
|
enumerable: true,
|
|
97
97
|
configurable: true,
|
|
98
98
|
writable: true,
|
|
99
|
-
value: function (content) {
|
|
99
|
+
value: function (content, hasCache) {
|
|
100
|
+
if (hasCache === void 0) { hasCache = false; }
|
|
100
101
|
/* istanbul ignore else */
|
|
101
102
|
if (_this.isActive) {
|
|
102
103
|
_this.setState({
|
|
103
104
|
content: content,
|
|
105
|
+
hasCache: hasCache,
|
|
104
106
|
status: helpers_1.STATUS.LOADED,
|
|
105
107
|
}, _this.getElement);
|
|
106
108
|
}
|
|
@@ -274,18 +276,20 @@ var InlineSVG = /** @class */ (function (_super) {
|
|
|
274
276
|
if (originalDesc && originalDesc.parentNode) {
|
|
275
277
|
originalDesc.parentNode.removeChild(originalDesc);
|
|
276
278
|
}
|
|
277
|
-
var descElement = document.
|
|
279
|
+
var descElement = document.createElementNS('http://www.w3.org/2000/svg', 'desc');
|
|
278
280
|
descElement.innerHTML = description;
|
|
279
281
|
svg.prepend(descElement);
|
|
280
282
|
}
|
|
281
|
-
if (title) {
|
|
283
|
+
if (typeof title !== 'undefined') {
|
|
282
284
|
var originalTitle = svg.querySelector('title');
|
|
283
285
|
if (originalTitle && originalTitle.parentNode) {
|
|
284
286
|
originalTitle.parentNode.removeChild(originalTitle);
|
|
285
287
|
}
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
288
|
+
if (title) {
|
|
289
|
+
var titleElement = document.createElementNS('http://www.w3.org/2000/svg', 'title');
|
|
290
|
+
titleElement.innerHTML = title;
|
|
291
|
+
svg.prepend(titleElement);
|
|
292
|
+
}
|
|
289
293
|
}
|
|
290
294
|
return svg;
|
|
291
295
|
}
|
|
@@ -326,12 +330,13 @@ var InlineSVG = /** @class */ (function (_super) {
|
|
|
326
330
|
this.setState({
|
|
327
331
|
content: '',
|
|
328
332
|
element: null,
|
|
333
|
+
hasCache: false,
|
|
329
334
|
status: helpers_1.STATUS.LOADING,
|
|
330
335
|
}, function () {
|
|
331
336
|
var _a = _this.props, cacheRequests = _a.cacheRequests, src = _a.src;
|
|
332
337
|
var cache = cacheRequests && exports.cacheStore[src];
|
|
333
338
|
if (cache && cache.status === helpers_1.STATUS.LOADED) {
|
|
334
|
-
_this.handleLoad(cache.content);
|
|
339
|
+
_this.handleLoad(cache.content, true);
|
|
335
340
|
return;
|
|
336
341
|
}
|
|
337
342
|
var dataURI = src.match(/data:image\/svg[^,]*?(;base64)?,(.*)/);
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA+B;AAC/B,iDAAqC;AAErC,qCAA0F;AAG7E,QAAA,UAAU,GAAmC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAE9E;IAAuC,6BAAiC;IAUtE,mBAAY,KAAY;QAAxB,YACE,kBAAM,KAAK,CAAC,SAUb;QApBD;;;;mBAAwB,KAAK;WAAC;QAC9B;;;;mBAAmB,KAAK;WAAC;QACzB;;;;;WAA8B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"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"}
|
package/lib/types.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
-
export
|
|
3
|
-
export
|
|
4
|
-
export
|
|
5
|
-
export
|
|
2
|
+
export type ErrorCallback = (error: Error | FetchError) => void;
|
|
3
|
+
export type LoadCallback = (src: string, isCached: boolean) => void;
|
|
4
|
+
export type PlainObject<T = unknown> = Record<string | number | symbol, T>;
|
|
5
|
+
export type PreProcessorCallback = (code: string) => string;
|
|
6
6
|
export interface Props extends Omit<React.SVGProps<SVGElement>, 'onLoad' | 'onError' | 'ref'> {
|
|
7
7
|
baseURL?: string;
|
|
8
8
|
cacheRequests?: boolean;
|
|
@@ -15,7 +15,7 @@ export interface Props extends Omit<React.SVGProps<SVGElement>, 'onLoad' | 'onEr
|
|
|
15
15
|
onLoad?: LoadCallback;
|
|
16
16
|
preProcessor?: PreProcessorCallback;
|
|
17
17
|
src: string;
|
|
18
|
-
title?: string;
|
|
18
|
+
title?: string | null;
|
|
19
19
|
uniqueHash?: string;
|
|
20
20
|
uniquifyIDs?: boolean;
|
|
21
21
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-inlinesvg",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.2",
|
|
4
4
|
"description": "An SVG loader for React",
|
|
5
5
|
"author": "Gil Barbara <gilbarbara@gmail.com>",
|
|
6
6
|
"contributors": [
|
|
@@ -39,38 +39,38 @@
|
|
|
39
39
|
"react-from-dom": "^0.6.2"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@gilbarbara/eslint-config": "^0.3.
|
|
42
|
+
"@gilbarbara/eslint-config": "^0.3.7",
|
|
43
43
|
"@gilbarbara/helpers": "^0.6.3",
|
|
44
44
|
"@gilbarbara/prettier-config": "^0.1.0",
|
|
45
45
|
"@gilbarbara/tsconfig": "^0.1.1",
|
|
46
|
-
"@size-limit/preset-small-lib": "^8.
|
|
46
|
+
"@size-limit/preset-small-lib": "^8.2.4",
|
|
47
47
|
"@testing-library/jest-dom": "^5.16.5",
|
|
48
|
-
"@testing-library/react": "^
|
|
48
|
+
"@testing-library/react": "^14.0.0",
|
|
49
49
|
"@types/exenv": "^1.2.0",
|
|
50
50
|
"@types/fetch-mock": "^7.3.5",
|
|
51
|
-
"@types/jest": "^
|
|
52
|
-
"@types/node": "^18.
|
|
51
|
+
"@types/jest": "^29.4.0",
|
|
52
|
+
"@types/node": "^18.14.1",
|
|
53
53
|
"@types/node-fetch": "^2.6.2",
|
|
54
|
-
"@types/react": "^18.0.
|
|
55
|
-
"@types/react-dom": "^18.0.
|
|
54
|
+
"@types/react": "^18.0.28",
|
|
55
|
+
"@types/react-dom": "^18.0.11",
|
|
56
56
|
"cross-fetch": "^3.1.5",
|
|
57
57
|
"del-cli": "^5.0.0",
|
|
58
58
|
"http-server": "^14.1.1",
|
|
59
|
-
"husky": "^8.0.
|
|
60
|
-
"jest": "^
|
|
61
|
-
"jest-environment-jsdom": "^
|
|
62
|
-
"jest-extended": "^3.
|
|
59
|
+
"husky": "^8.0.3",
|
|
60
|
+
"jest": "^29.4.3",
|
|
61
|
+
"jest-environment-jsdom": "^29.4.3",
|
|
62
|
+
"jest-extended": "^3.2.4",
|
|
63
63
|
"jest-fetch-mock": "^3.0.3",
|
|
64
64
|
"jest-serializer-html": "^7.1.0",
|
|
65
|
-
"jest-watch-typeahead": "^2.
|
|
65
|
+
"jest-watch-typeahead": "^2.2.2",
|
|
66
66
|
"react": "^18.2.0",
|
|
67
67
|
"react-dom": "^18.2.0",
|
|
68
68
|
"repo-tools": "^0.2.2",
|
|
69
|
-
"size-limit": "^8.
|
|
70
|
-
"start-server-and-test": "^1.
|
|
71
|
-
"ts-jest": "^
|
|
69
|
+
"size-limit": "^8.2.4",
|
|
70
|
+
"start-server-and-test": "^1.15.4",
|
|
71
|
+
"ts-jest": "^29.0.5",
|
|
72
72
|
"ts-node": "^10.9.1",
|
|
73
|
-
"typescript": "^4.
|
|
73
|
+
"typescript": "^4.9.5"
|
|
74
74
|
},
|
|
75
75
|
"scripts": {
|
|
76
76
|
"build": "npm run clean && npm run build:cjs && npm run build:esm",
|
|
@@ -80,7 +80,7 @@
|
|
|
80
80
|
"watch:cjs": "npm run build:cjs -- -w",
|
|
81
81
|
"watch:esm": "npm run build:esm -- -w",
|
|
82
82
|
"start": "http-server test/__fixtures__ -p 1337 --cors",
|
|
83
|
-
"test": "start-server-and-test start http://
|
|
83
|
+
"test": "start-server-and-test start http://127.0.0.1:1337 test:coverage",
|
|
84
84
|
"test:coverage": "jest --coverage --bail",
|
|
85
85
|
"test:watch": "jest --watchAll --verbose",
|
|
86
86
|
"lint": "eslint --ext .ts,.tsx src test",
|
package/src/index.tsx
CHANGED
|
@@ -111,23 +111,25 @@ export default class InlineSVG extends React.PureComponent<Props, State> {
|
|
|
111
111
|
originalDesc.parentNode.removeChild(originalDesc);
|
|
112
112
|
}
|
|
113
113
|
|
|
114
|
-
const descElement = document.
|
|
114
|
+
const descElement = document.createElementNS('http://www.w3.org/2000/svg', 'desc');
|
|
115
115
|
|
|
116
116
|
descElement.innerHTML = description;
|
|
117
117
|
svg.prepend(descElement);
|
|
118
118
|
}
|
|
119
119
|
|
|
120
|
-
if (title) {
|
|
120
|
+
if (typeof title !== 'undefined') {
|
|
121
121
|
const originalTitle = svg.querySelector('title');
|
|
122
122
|
|
|
123
123
|
if (originalTitle && originalTitle.parentNode) {
|
|
124
124
|
originalTitle.parentNode.removeChild(originalTitle);
|
|
125
125
|
}
|
|
126
126
|
|
|
127
|
-
|
|
127
|
+
if (title) {
|
|
128
|
+
const titleElement = document.createElementNS('http://www.w3.org/2000/svg', 'title');
|
|
128
129
|
|
|
129
|
-
|
|
130
|
-
|
|
130
|
+
titleElement.innerHTML = title;
|
|
131
|
+
svg.prepend(titleElement);
|
|
132
|
+
}
|
|
131
133
|
}
|
|
132
134
|
|
|
133
135
|
return svg;
|
|
@@ -154,12 +156,13 @@ export default class InlineSVG extends React.PureComponent<Props, State> {
|
|
|
154
156
|
}
|
|
155
157
|
}
|
|
156
158
|
|
|
157
|
-
private handleLoad = (content: string) => {
|
|
159
|
+
private handleLoad = (content: string, hasCache = false) => {
|
|
158
160
|
/* istanbul ignore else */
|
|
159
161
|
if (this.isActive) {
|
|
160
162
|
this.setState(
|
|
161
163
|
{
|
|
162
164
|
content,
|
|
165
|
+
hasCache,
|
|
163
166
|
status: STATUS.LOADED,
|
|
164
167
|
},
|
|
165
168
|
this.getElement,
|
|
@@ -256,6 +259,7 @@ export default class InlineSVG extends React.PureComponent<Props, State> {
|
|
|
256
259
|
{
|
|
257
260
|
content: '',
|
|
258
261
|
element: null,
|
|
262
|
+
hasCache: false,
|
|
259
263
|
status: STATUS.LOADING,
|
|
260
264
|
},
|
|
261
265
|
() => {
|
|
@@ -263,7 +267,7 @@ export default class InlineSVG extends React.PureComponent<Props, State> {
|
|
|
263
267
|
const cache = cacheRequests && cacheStore[src];
|
|
264
268
|
|
|
265
269
|
if (cache && cache.status === STATUS.LOADED) {
|
|
266
|
-
this.handleLoad(cache.content);
|
|
270
|
+
this.handleLoad(cache.content, true);
|
|
267
271
|
|
|
268
272
|
return;
|
|
269
273
|
}
|
package/src/types.ts
CHANGED
|
@@ -17,7 +17,7 @@ export interface Props extends Omit<React.SVGProps<SVGElement>, 'onLoad' | 'onEr
|
|
|
17
17
|
onLoad?: LoadCallback;
|
|
18
18
|
preProcessor?: PreProcessorCallback;
|
|
19
19
|
src: string;
|
|
20
|
-
title?: string;
|
|
20
|
+
title?: string | null;
|
|
21
21
|
uniqueHash?: string;
|
|
22
22
|
uniquifyIDs?: boolean;
|
|
23
23
|
}
|