mirror of
https://github.com/zoriya/react-native-svg.git
synced 2026-06-09 17:30:58 +00:00
Simplify project structure
This commit is contained in:
+3
-7
@@ -2,7 +2,7 @@ import React, { Component } from "react";
|
||||
import PropTypes from "prop-types";
|
||||
import { requireNativeComponent } from "react-native";
|
||||
import { numberProp } from "../lib/props";
|
||||
import PATTERN_UNITS from "../lib/PATTERN_UNITS";
|
||||
import units from "../lib/units";
|
||||
import { MaskAttributes } from "../lib/attributes";
|
||||
import extractTransform from "../lib/extract/extractTransform";
|
||||
|
||||
@@ -62,13 +62,9 @@ export default class extends Component {
|
||||
height={height}
|
||||
matrix={extractedTransform}
|
||||
maskTransform={extractedTransform}
|
||||
maskUnits={
|
||||
maskUnits !== undefined ? PATTERN_UNITS[maskUnits] : 0
|
||||
}
|
||||
maskUnits={maskUnits !== undefined ? units[maskUnits] : 0}
|
||||
maskContentUnits={
|
||||
maskContentUnits !== undefined
|
||||
? PATTERN_UNITS[maskContentUnits]
|
||||
: 1
|
||||
maskContentUnits !== undefined ? units[maskContentUnits] : 1
|
||||
}
|
||||
>
|
||||
{children}
|
||||
|
||||
+3
-3
@@ -2,7 +2,7 @@ import React, { Component } from "react";
|
||||
import PropTypes from "prop-types";
|
||||
import { requireNativeComponent } from "react-native";
|
||||
import { numberProp } from "../lib/props";
|
||||
import PATTERN_UNITS from "../lib/PATTERN_UNITS";
|
||||
import units from "../lib/units";
|
||||
import { PatternAttributes } from "../lib/attributes";
|
||||
import extractTransform from "../lib/extract/extractTransform";
|
||||
import extractViewBox from "../lib/extract/extractViewBox";
|
||||
@@ -67,9 +67,9 @@ export default class extends Component {
|
||||
height={height}
|
||||
matrix={extractedTransform}
|
||||
patternTransform={extractedTransform}
|
||||
patternUnits={PATTERN_UNITS[patternUnits] || 0}
|
||||
patternUnits={units[patternUnits] || 0}
|
||||
patternContentUnits={
|
||||
patternContentUnits ? PATTERN_UNITS[patternContentUnits] : 1
|
||||
patternContentUnits ? units[patternContentUnits] : 1
|
||||
}
|
||||
{...extractViewBox({ viewBox, preserveAspectRatio })}
|
||||
>
|
||||
|
||||
@@ -4,8 +4,21 @@ import Color from "color";
|
||||
|
||||
import extractOpacity from "./extractOpacity";
|
||||
import extractTransform from "./extractTransform";
|
||||
import PATTERN_UNITS from "../PATTERN_UNITS";
|
||||
import percentToFloat from "../percentToFloat";
|
||||
import units from "../units";
|
||||
|
||||
const percentReg = /^([+\-]?\d+(?:\.\d+)?(?:[eE][+\-]?\d+)?)(%?)$/;
|
||||
|
||||
function percentToFloat(percent) {
|
||||
const matched = percent.match(percentReg);
|
||||
if (!matched) {
|
||||
console.warn(
|
||||
`\`${percent}\` is not a valid number or percentage string.`,
|
||||
);
|
||||
return 0;
|
||||
}
|
||||
|
||||
return matched[2] ? matched[1] / 100 : +matched[1];
|
||||
}
|
||||
|
||||
export default function(props) {
|
||||
if (!props.id) {
|
||||
@@ -58,6 +71,6 @@ export default function(props) {
|
||||
gradient,
|
||||
name: props.id,
|
||||
gradientTransform,
|
||||
gradientUnits: PATTERN_UNITS[props.gradientUnits] || 0,
|
||||
gradientUnits: units[props.gradientUnits] || 0,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
const percentReg = /^([+\-]?\d+(?:\.\d+)?(?:[eE][+\-]?\d+)?)(%?)$/;
|
||||
export default function(percent) {
|
||||
const matched = percent.match(percentReg);
|
||||
if (!matched) {
|
||||
console.warn(
|
||||
`\`${percent}\` is not a valid number or percentage string.`
|
||||
);
|
||||
return 0;
|
||||
}
|
||||
|
||||
return matched[2] ? matched[1] / 100 : +matched[1];
|
||||
}
|
||||
Reference in New Issue
Block a user