Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support dataUri for android platform #2396

Merged
merged 6 commits into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/test-examples/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import React from 'react';
import ColorTest from './src/ColorTest';
import PointerEventsBoxNone from './src/PointerEventsBoxNone';
import MountUnmount from './src/MountUnmount';
import Test1318 from './src/Test1318';
import Test1374 from './src/Test1374';
import Test1442 from './src/Test1442';
import Test1451 from './src/Test1451';
Expand Down
31 changes: 31 additions & 0 deletions apps/test-examples/src/Test1318.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import React from 'react';
import {SvgUri} from 'react-native-svg';
import {SvgCssUri} from 'react-native-svg/css';

export default function Test() {
return (
<>
<SvgCssUri
height={100}
width={100}
uri={
'data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20100%20100%22%3E%3Cpath%20fill%3D%22%2354b847%22%20d%3D%22M0%200h100v100H0z%22%2F%3E%3Cpath%20fill%3D%22%23fff%22%20d%3D%22M61.6%2069.1h-17V38.3h8.6v25.4h8.2c5.7%200%208.1-3.9%208.1-14.1S66.8%2036.4%2061%2036.4H42.2v32.7h-8.4V36.3H21.4v-5.4h42.3c10.2%200%2015%205.3%2015%2018.6-.1%2017.4-7.3%2019.6-17.1%2019.6%22%2F%3E%3C%2Fsvg%3E'
}
/>
<SvgCssUri
height={100}
width={100}
uri={
'data:image/svg+xml;utf8,%3Csvg%20width%3D%22300%22%20height%3D%22700%22%20viewBox%3D%2250%2050%20100%20100%22%20preserveAspectRatio%3D%22xMidYMid%20meet%22%3E%3Crect%20x%3D%2250%22%20y%3D%2250%22%20width%3D%22100%22%20height%3D%22100%22%20fill%3D%22yellow%22%3E%3C%2Frect%3E%3C%2Fsvg%3E'
}
/>
<SvgUri
height={100}
width={100}
uri={
'data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22100%22%20height%3D%22100%22%20viewBox%3D%220%200%20100%20100%22%3E%3Cpolygon%20points%3D%2250%2C15%2061%2C40%2088%2C40%2066%2C57%2075%2C84%2050%2C68%2025%2C84%2034%2C57%2012%2C40%2039%2C40%22%20fill%3D%22gold%22%2F%3E%3C%2Fsvg%3E'
}
/>
</>
);
}
3 changes: 2 additions & 1 deletion src/ReactNativeSVG.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import Shape from './elements/Shape';
import {
AstProps,
camelCase,
fetchText,
JsxAST,
Middleware,
parse,
Expand All @@ -19,6 +18,8 @@ import {
XmlState,
} from './xml';

import { fetchText } from './utils/fetchData';

import {
RNSVGCircle,
RNSVGClipPath,
Expand Down
3 changes: 2 additions & 1 deletion src/ReactNativeSVG.web.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {
AstProps,
camelCase,
fetchText,
JsxAST,
Middleware,
parse,
Expand All @@ -18,6 +17,8 @@ import {
XmlState,
} from './xml';

import { fetchText } from './utils/fetchData';

export {
inlineStyles,
loadLocalRawResource,
Expand Down
37 changes: 37 additions & 0 deletions src/utils/fetchData.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { Platform } from 'react-native';

export function fetchText(uri?: string): Promise<string | null> {
if (
uri &&
bohdanprog marked this conversation as resolved.
Show resolved Hide resolved
uri.startsWith('data:image/svg+xml;utf8') &&
Platform.OS === 'android'
) {
return new Promise((resolve) => {
resolve(dataUriToXml(uri));
});
} else {
return fetchUriData(uri);
}
}

function dataUriToXml(uri: string): string | null {
try {
// decode and remove data:image/svg+xml;utf8, prefix
const xml = decodeURIComponent(uri).split(',').slice(1).join(',');
return xml;
} catch (error) {
console.log('error', error);
bohdanprog marked this conversation as resolved.
Show resolved Hide resolved
return null;
}
}

async function fetchUriData(uri?: string) {
if (!uri) {
return null;
}
const response = await fetch(uri);
if (response.ok || (response.status === 0 && uri.startsWith('file://'))) {
return await response.text();
}
throw new Error(`Fetching ${uri} failed with status ${response.status}`);
}
12 changes: 1 addition & 11 deletions src/xml.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { ComponentType, ComponentProps } from 'react';
import * as React from 'react';
import { Component, useEffect, useMemo, useState } from 'react';
import { fetchText } from './utils/fetchData';
import type { SvgProps } from './elements/Svg';
import { tags } from './xmlTags';

Expand Down Expand Up @@ -78,17 +79,6 @@ export function SvgXml(props: XmlProps) {
}
}

export async function fetchText(uri?: string) {
if (!uri) {
return null;
}
const response = await fetch(uri);
if (response.ok || (response.status === 0 && uri.startsWith('file://'))) {
return await response.text();
}
throw new Error(`Fetching ${uri} failed with status ${response.status}`);
}

export function SvgUri(props: UriProps) {
const { onError = err, uri, onLoad, fallback } = props;
const [xml, setXml] = useState<string | null>(null);
Expand Down
Loading